Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2024-09-19 15:56:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

nix: update nixpkgs

Browse Source
This commit is contained in:
Malte Poll 2023-10-04 10:50:42 +02:00 committed by Malte Poll
parent 1e13da3b71
commit d046ba01ff
3 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
WORKSPACE.bazel
View File

@ -17,8 +17,8 @@ load("@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl", "nixpkgs_flake_package", "n
nixpkgs_git_repository( nixpkgs_git_repository(
name = "nixpkgs", name = "nixpkgs",
revision = "27c6a38e0aa2e57ab914ad8b500582085549c236", revision = "0c7ffbc66e6d78c50c38e717ec91a2a14e0622fb",
sha256 = "875c2e171ab9663ff6ad2b5c75d974776682b3b4075143fc98d73c39a3b8c132", sha256 = "2c8c39259595441e2fe529b75b2e69eba486e0f3457e810bf9bb2b531822743e",
) )
nixpkgs_flake_package( nixpkgs_flake_package(

25
flake.lock
View File

@ -20,11 +20,11 @@
}, },
"nixpkgsUnstable": { "nixpkgsUnstable": {
"locked": { "locked": {
"lastModified": 1695806987, "lastModified": 1696261572,
"narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=", "narHash": "sha256-s8TtSYJ1LBpuITXjbPLUPyxzAKw35LhETcajJjCS5f0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f3dab3509afca932f3f4fd0908957709bb1c1f57", "rev": "0c7ffbc66e6d78c50c38e717ec91a2a14e0622fb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -34,27 +34,10 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgsWorking": {
"locked": {
"lastModified": 1695660025,
"narHash": "sha256-9kCTqG3Coaq5qZMLRRYUVVAVzRrYP6+CPi3WMqGbdKY=",
"owner": "katexochen",
"repo": "nixpkgs",
"rev": "53e5fdfd2399716305b21ee1535590527f7f6e6a",
"type": "github"
},
"original": {
"owner": "katexochen",
"ref": "working",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgsUnstable": "nixpkgsUnstable", "nixpkgsUnstable": "nixpkgsUnstable"
"nixpkgsWorking": "nixpkgsWorking"
} }
}, },
"systems": { "systems": {

9
flake.nix
View File

@ -2,9 +2,6 @@
description = "Constellation"; description = "Constellation";
inputs = { inputs = {
nixpkgsWorking = {
url = "github:katexochen/nixpkgs/working";
};
nixpkgsUnstable = { nixpkgsUnstable = {
url = "github:NixOS/nixpkgs/nixpkgs-unstable"; url = "github:NixOS/nixpkgs/nixpkgs-unstable";
}; };
@ -15,17 +12,15 @@
outputs = outputs =
{ self { self
, nixpkgsWorking
, nixpkgsUnstable , nixpkgsUnstable
, flake-utils , flake-utils
}: }:
flake-utils.lib.eachDefaultSystem (system: flake-utils.lib.eachDefaultSystem (system:
let let
pkgsWorking = import nixpkgsWorking { inherit system; };
pkgsUnstable = import nixpkgsUnstable { inherit system; }; pkgsUnstable = import nixpkgsUnstable { inherit system; };
mkosiDev = (pkgsWorking.mkosi.overrideAttrs (oldAttrs: rec { mkosiDev = (pkgsUnstable.mkosi.overrideAttrs (oldAttrs: rec {
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ (with pkgsWorking; [ propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ (with pkgsUnstable; [
# package management # package management
dnf5 dnf5
rpm rpm