Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #59779 from AmineChikhaoui/cherrypick-nixops-1.7
cherry pick nixops update to 1.7
- Loading branch information
Showing
5 changed files
with
42 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,9 @@ | ||
{ callPackage, newScope, pkgs, fetchurl }: | ||
|
||
callPackage ./generic.nix (rec { | ||
version = "1.6.1"; | ||
version = "1.7"; | ||
src = fetchurl { | ||
url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; | ||
sha256 = "0lfx5fhyg3z6725ydsk0ibg5qqzp5s0x9nbdww02k8s307axiah3"; | ||
}; | ||
# nixops is incompatible with the most recent versions of listed | ||
# azure-mgmt-* packages, therefore we are pinning them to | ||
# package-private versions, so that they don't get trampled by | ||
# updates. | ||
# see | ||
# https://github.com/NixOS/nixops/issues/1065 | ||
python2Packages = pkgs.python2Packages.override { | ||
overrides = (self: super: let callPackage = newScope self; in { | ||
azure-mgmt-compute = callPackage ./azure-mgmt-compute { }; | ||
azure-mgmt-network = callPackage ./azure-mgmt-network { }; | ||
azure-mgmt-nspkg = callPackage ./azure-mgmt-nspkg { }; | ||
azure-mgmt-resource = callPackage ./azure-mgmt-resource { }; | ||
azure-mgmt-storage = callPackage ./azure-mgmt-storage { }; | ||
}); | ||
url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; | ||
sha256 = "091c0b5bca57d4aa20be20e826ec161efe3aec9c788fbbcf3806a734a517f0f3"; | ||
}; | ||
}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
{ callPackage, newScope, pkgs, fetchurl }: | ||
|
||
callPackage ./generic.nix (rec { | ||
version = "1.6.1"; | ||
src = fetchurl { | ||
url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; | ||
sha256 = "0lfx5fhyg3z6725ydsk0ibg5qqzp5s0x9nbdww02k8s307axiah3"; | ||
}; | ||
nixopsAzurePackages = with python2Packages; [ | ||
azure-storage | ||
azure-mgmt-compute | ||
azure-mgmt-network | ||
azure-mgmt-resource | ||
azure-mgmt-storage | ||
]; | ||
# nixops is incompatible with the most recent versions of listed | ||
# azure-mgmt-* packages, therefore we are pinning them to | ||
# package-private versions, so that they don't get trampled by | ||
# updates. | ||
# see | ||
# https://github.com/NixOS/nixops/issues/1065 | ||
python2Packages = pkgs.python2Packages.override { | ||
overrides = (self: super: let callPackage = newScope self; in { | ||
azure-mgmt-compute = callPackage ./azure-mgmt-compute { }; | ||
azure-mgmt-network = callPackage ./azure-mgmt-network { }; | ||
azure-mgmt-nspkg = callPackage ./azure-mgmt-nspkg { }; | ||
azure-mgmt-resource = callPackage ./azure-mgmt-resource { }; | ||
azure-mgmt-storage = callPackage ./azure-mgmt-storage { }; | ||
}); | ||
}; | ||
}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters