diff options
| -rw-r--r-- | flake.nix | 3 | ||||
| -rw-r--r-- | hosts/richese/default.nix | 10 | ||||
| -rw-r--r-- | overlays/default.nix | 7 |
3 files changed, 11 insertions, 9 deletions
@@ -23,6 +23,7 @@ # per https://nixos-and-flakes.thiscute.world/nixos-with-flakes/downgrade-or-upgrade-packages nixpkgs-67e692392.url = "github:nixos/nixpkgs/67e69239226f37168d1adb8d29bd61150756a03e"; nixpkgs-master.url = "github:nixos/nixpkgs"; + nixpkgs-pr363651.url = "github:SuperSandro2000/nixpkgs/openstack-socks"; nixpkgs-stable.url = "github:nixos/nixpkgs/release-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -38,7 +39,7 @@ }; - outputs = { disko, home-manager-stable, home-manager, nixos-hardware, nixpkgs-67e692392, nixpkgs-master, nixpkgs-stable, nixpkgs, nvidia-patch, self, sops-nix, ... } @ inputs: let + outputs = { disko, home-manager-stable, home-manager, nixos-hardware, nixpkgs-67e692392, nixpkgs-master, nixpkgs-pr363651, nixpkgs-stable, nixpkgs, nvidia-patch, self, sops-nix, ... } @ inputs: let inherit (self) outputs; systems = [ #"aarch64-linux" diff --git a/hosts/richese/default.nix b/hosts/richese/default.nix index 0db3656..7b7d15d 100644 --- a/hosts/richese/default.nix +++ b/hosts/richese/default.nix @@ -9,7 +9,7 @@ environment.systemPackages = with pkgs; [ git-review - openstackclient-full + pr363651.openstackclient-full ]; imports = [ @@ -38,16 +38,10 @@ config.allowUnfree = true; hostPlatform = "x86_64-linux"; overlays = [ - (final: prev: { - pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ (pyfinal: pyprev: { - python-openstackclient = pyprev.python-openstackclient.overridePythonAttrs (oldAttrs: { - dependencies = oldAttrs.dependencies ++ [ pkgs.python311Packages.pysocks ]; - }); - })]; - }) outputs.overlays.additions outputs.overlays.modifications outputs.overlays.master-packages + outputs.overlays.pr363651-packages outputs.overlays.stable-packages ]; }; diff --git a/overlays/default.nix b/overlays/default.nix index aaab968..18b3d48 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -38,6 +38,13 @@ }; }; + pr363651-packages = final: _prev: { + pr363651 = import inputs.nixpkgs-pr363651 { + inherit (final) system; + config.allowUnfree = true; + }; + }; + # When applied, the stable nixpkgs set (declared in the flake inputs) will # be accessible through 'pkgs.stable' stable-packages = final: _prev: { |