darkkirb/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Track nixpkgs master once again

Browse source 
For kicad, I use yet another nixpkgs fork
This is to be removed when #165630 hits
This commit is contained in:
Charlotte 🦝 Delenk 2022-03-25 15:43:36 +01:00
parent 07978ebfc2
commit 4cf9dd176d
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
3 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/workarounds/default.nix
View file

@ -1,6 +1,7 @@
{ nixpkgs-soundtouch, system, pkgs, nixpkgs, nixpkgs-bcachefs, hydra, ... }: with pkgs;
{ nixpkgs-soundtouch, nixpkgs-kicad, system, pkgs, nixpkgs, nixpkgs-bcachefs, hydra, ... }: with pkgs;
let
bcachefs = import nixpkgs-bcachefs { inherit system; };
n-kicad = import nixpkgs-kicad { inherit system; };
hydra-pkg = hydra.defaultPackage.${system};
rtf-tokenize = with python3Packages; buildPythonPackage rec {
pname = "rtf_tokenize";
@ -98,6 +99,7 @@ in
sha256 = "09mvk9zxclkf4wrkkfzg0p2hx1f74gpymr0a0l3pckmk6za2n3d1";
};
});
kicad = n-kicad.kicad; # TODO: remove when #165630 hits
})
];
}

24
flake.lock
View file

@ -484,6 +484,22 @@
"type": "github"
}
},
"nixpkgs-kicad": {
"locked": {
"lastModified": 1648031101,
"narHash": "sha256-CHNIOo6b9xmJH1DcqyvGCU+aJwusVgVl9yj7AtncdNg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f4998c542d68a8a6e3d345d5c106e5915f430a16",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f4998c542d68a8a6e3d345d5c106e5915f430a16",
"type": "github"
}
},
"nixpkgs-soundtouch": {
"locked": {
"lastModified": 1643388593,
@ -595,17 +611,16 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1648031101,
"narHash": "sha256-CHNIOo6b9xmJH1DcqyvGCU+aJwusVgVl9yj7AtncdNg=",
"lastModified": 1648217324,
"narHash": "sha256-HCdeNnQla3jJj6JPK7m8G4HyS2kuOe4rwASEZI0docA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f4998c542d68a8a6e3d345d5c106e5915f430a16",
"rev": "511e56d76cf528afcbff2e5c7930a791e5484eee",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f4998c542d68a8a6e3d345d5c106e5915f430a16",
"type": "github"
}
},
@ -708,6 +723,7 @@
"nixpkgs": "nixpkgs_7",
"nixpkgs-bcachefs": "nixpkgs-bcachefs",
"nixpkgs-hydra": "nixpkgs-hydra",
"nixpkgs-kicad": "nixpkgs-kicad",
"nixpkgs-soundtouch": "nixpkgs-soundtouch",
"nur": "nur",
"polymc": "polymc",

3
flake.nix
View file

@ -3,7 +3,8 @@ rec {
# Use NixOS unstable
inputs = {
nixpkgs.url = github:NixOS/nixpkgs/f4998c542d68a8a6e3d345d5c106e5915f430a16;
nixpkgs.url = github:NixOS/nixpkgs;
nixpkgs-kicad.url = github:NixOS/nixpkgs/f4998c542d68a8a6e3d345d5c106e5915f430a16;
nixpkgs-soundtouch.url = "github:darkkirb/nixpkgs?ref=soundtouch-2.3.1";
nixpkgs-bcachefs.url = github:darkkirb/nixpkgs?ref=update-bcachefs;
flake-utils.url = github:numtide/flake-utils;