public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixops: add patch to follow redirects in nixos-infect

Browse Source
This commit is contained in:
Mario Rodas 2020-11-05 04:20:00 +00:00
parent 981e163aa3
commit 94a810c56d
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/package-management/nixops/default.nix
View File

@ -1,4 +1,4 @@
{ callPackage, fetchurl }: { callPackage, fetchurl, fetchpatch }:
callPackage ./generic.nix (rec { callPackage ./generic.nix (rec {
version = "1.7"; version = "1.7";
@ -6,4 +6,11 @@ callPackage ./generic.nix (rec {
url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
sha256 = "091c0b5bca57d4aa20be20e826ec161efe3aec9c788fbbcf3806a734a517f0f3"; sha256 = "091c0b5bca57d4aa20be20e826ec161efe3aec9c788fbbcf3806a734a517f0f3";
}; };
patches = [
# follow redirect in nixos-infect. Remove with the next release.
(fetchpatch {
url = "https://github.com/NixOS/nixops/commit/fb6d4665e8efd858a215bbaaf079ec3f5ebc49b8.patch";
sha256 = "1hbhykl811zsqlaj3y5m9d8lfsal6ps6n5p16ah6lqy2s18ap9d0";
})
];
}) })

3
pkgs/tools/package-management/nixops/generic.nix
View File

@ -2,11 +2,12 @@
# version args # version args
, src, version , src, version
, meta ? {} , meta ? {}
, patches ? null
}: }:
python2Packages.buildPythonApplication { python2Packages.buildPythonApplication {
name = "nixops-${version}"; name = "nixops-${version}";
inherit version src; inherit version src patches;
buildInputs = [ libxslt ]; buildInputs = [ libxslt ];