update inputs

This commit is contained in:
chayleaf 2023-08-16 05:10:49 +07:00
parent dd45e51bc1
commit c0cc98e541
2 changed files with 20 additions and 13 deletions

View file

@ -69,11 +69,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1690933134, "lastModified": 1688254665,
"narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=", "narHash": "sha256-8FHEgBrr7gYNiS/NzCxIO3m4hvtLRW9YY1nYo1ivm3o=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb", "rev": "267149c58a14d15f7f81b4d737308421de9d7152",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -260,11 +260,11 @@
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1690881714, "lastModified": 1688049487,
"narHash": "sha256-h/nXluEqdiQHs1oSgkOOWF+j8gcJMWhwnZ9PFabN6q0=", "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9e1960bc196baf6881340d53dccb203a951745a2", "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -30,6 +30,12 @@ in
} else pkgs.linux-firmware; } else pkgs.linux-firmware;
inherit (nix-gaming) faf-client osu-lazer-bin; inherit (nix-gaming) faf-client osu-lazer-bin;
inherit nixForNixPlugins; inherit nixForNixPlugins;
nix = nixForNixPlugins;
nixVersions = pkgs.nixVersions.extend (self: super: {
stable = nixForNixPlugins;
unstable = nixForNixPlugins;
});
# Various patches to change Nix version of existing packages so they don't error out because of nix-plugins in nix.conf
nix-plugins = pkgs.nix-plugins.overrideAttrs (old: { nix-plugins = pkgs.nix-plugins.overrideAttrs (old: {
version = "12.0.0"; version = "12.0.0";
patches = [ patches = [
@ -39,13 +45,14 @@ in
}) })
]; ];
}); });
nix = nixForNixPlugins; harmonia = (pkgs.harmonia.override { nix = nixForNixPlugins; }).overrideAttrs {
nixVersions = pkgs.nixVersions.extend (self: super: { patches = [
stable = nixForNixPlugins; (pkgs.fetchpatch {
unstable = nixForNixPlugins; url = "https://github.com/nix-community/harmonia/pull/145/commits/394c939a45fa9c590347e149400876c318610b1e.patch";
}); hash = "sha256-DvyE7/0PW3XRtFgIrl4IQa7RIQLQZoKLddxCZvhpu3I=";
# Various patches to change Nix version of existing packages so they don't error out because of nix-plugins in nix.conf })
harmonia = pkgs.harmonia.override { nix = nixForNixPlugins; }; ];
};
nix-init = pkgs.nix-init.override { nix = nixForNixPlugins; }; nix-init = pkgs.nix-init.override { nix = nixForNixPlugins; };
nix-serve = pkgs.nix-serve.override { nix = nixForNixPlugins; }; nix-serve = pkgs.nix-serve.override { nix = nixForNixPlugins; };
nix-serve-ng = pkgs.nix-serve-ng.override { nix = nixForNixPlugins; }; nix-serve-ng = pkgs.nix-serve-ng.override { nix = nixForNixPlugins; };