1
0
Fork 0

Try bumping to nix 2.4

This commit is contained in:
Malte Brandy 2021-11-19 12:48:36 +01:00
parent 4204994418
commit e917fb1e5a
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
3 changed files with 3 additions and 2 deletions

View file

@ -75,7 +75,7 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixos-hardware": {
"branch": "4045d5f",
"branch": "master",
"description": "A collection of NixOS modules covering hardware quirks.",
"homepage": "",
"owner": "nixos",

View file

@ -5,6 +5,7 @@ in
{
inherit unstable;
inherit (unstable) cachix nix-output-monitor cabal2nix;
nix = unstable.nix;
unstableHaskellPackages = unstable.haskellPackages;
unstableGhc = unstable.ghc;
mautrix-signal = unstable.mautrix-signal;

View file

@ -1,6 +1,6 @@
self: super: {
# pkgs assumed to be present on a non nixos host
nixFlakes = self.writeShellScriptBin "flix" ''exec ${self.nixUnstable}/bin/nix --experimental-features "nix-command flakes" --log-format bar-with-logs "$@"'';
nixFlakes = self.writeShellScriptBin "flix" ''exec ${self.nix}/bin/nix --experimental-features "nix-command flakes" --log-format bar-with-logs "$@"'';
core-system-pkgs = {
inherit (self)
gitFull gnumake mkpasswd file wget curl wireguard gnupg mutt bind liboping