Try bumping to nix 2.4
This commit is contained in:
parent
4204994418
commit
e917fb1e5a
|
@ -75,7 +75,7 @@
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"branch": "4045d5f",
|
"branch": "master",
|
||||||
"description": "A collection of NixOS modules covering hardware quirks.",
|
"description": "A collection of NixOS modules covering hardware quirks.",
|
||||||
"homepage": "",
|
"homepage": "",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
|
|
|
@ -5,6 +5,7 @@ in
|
||||||
{
|
{
|
||||||
inherit unstable;
|
inherit unstable;
|
||||||
inherit (unstable) cachix nix-output-monitor cabal2nix;
|
inherit (unstable) cachix nix-output-monitor cabal2nix;
|
||||||
|
nix = unstable.nix;
|
||||||
unstableHaskellPackages = unstable.haskellPackages;
|
unstableHaskellPackages = unstable.haskellPackages;
|
||||||
unstableGhc = unstable.ghc;
|
unstableGhc = unstable.ghc;
|
||||||
mautrix-signal = unstable.mautrix-signal;
|
mautrix-signal = unstable.mautrix-signal;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
self: super: {
|
self: super: {
|
||||||
# pkgs assumed to be present on a non nixos host
|
# 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 = {
|
core-system-pkgs = {
|
||||||
inherit (self)
|
inherit (self)
|
||||||
gitFull gnumake mkpasswd file wget curl wireguard gnupg mutt bind liboping
|
gitFull gnumake mkpasswd file wget curl wireguard gnupg mutt bind liboping
|
||||||
|
|
Loading…
Reference in a new issue