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

nixops: 1.6.1 -> 1.7

Browse Source 
Add release 1.7, also keep version 1.6.1 available for Azure
backend users. Azure backend was disabled in v1.7 due to the
python API changes.
This commit is contained in:
AmineChikhaoui 2019-04-17 10:18:03 -04:00
parent eb970c5887
commit 0db54f93fb
No known key found for this signature in database
GPG Key ID: C0C8C84C15BCCD1C
4 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,24 +1,9 @@
{ callPackage, newScope, pkgs, fetchurl }: { callPackage, newScope, pkgs, fetchurl }:
callPackage ./generic.nix (rec { callPackage ./generic.nix (rec {
version = "1.6.1"; version = "1.7";
src = fetchurl { src = fetchurl {
url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; url = "https://hydra.nixos.org/build/92372310/download/2/nixops-1.7.tar.bz2";
sha256 = "0lfx5fhyg3z6725ydsk0ibg5qqzp5s0x9nbdww02k8s307axiah3"; sha256 = "091c0b5bca57d4aa20be20e826ec161efe3aec9c788fbbcf3806a734a517f0f3";
};
# 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 { };
});
}; };
}) })

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

@ -1,4 +1,4 @@
{ lib, python2Packages, libxslt, docbook_xsl_ns, openssh, cacert { lib, python2Packages, libxslt, docbook_xsl_ns, openssh, cacert, nixopsAzurePackages ? []
# version args # version args
, src, version , src, version
, meta ? {} , meta ? {}
@ -16,11 +16,6 @@ python2Packages.buildPythonApplication {
boto3 boto3
hetzner hetzner
libcloud libcloud
azure-storage
azure-mgmt-compute
azure-mgmt-network
azure-mgmt-resource
azure-mgmt-storage
adal adal
# Go back to sqlite once Python 2.7.13 is released # Go back to sqlite once Python 2.7.13 is released
pysqlite pysqlite
@ -28,7 +23,7 @@ python2Packages.buildPythonApplication {
digital-ocean digital-ocean
libvirt libvirt
typing typing
]; ] ++ nixopsAzurePackages;
checkPhase = checkPhase =
# Ensure, that there are no (python) import errors # Ensure, that there are no (python) import errors
@ -53,7 +48,7 @@ python2Packages.buildPythonApplication {
meta = { meta = {
homepage = https://github.com/NixOS/nixops; homepage = https://github.com/NixOS/nixops;
description = "NixOS cloud provisioning and deployment tool"; description = "NixOS cloud provisioning and deployment tool";
maintainers = with lib.maintainers; [ eelco rob domenkozar ]; maintainers = with lib.maintainers; [ aminechikhaoui eelco rob domenkozar ];
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
license = lib.licenses.lgpl3; license = lib.licenses.lgpl3;
} // meta; } // meta;

31
pkgs/tools/package-management/nixops/nixops-v1_6_1.nix Normal file
View File

@ -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 { };
});
};
})

2
pkgs/top-level/all-packages.nix
View File

@ -22907,6 +22907,8 @@ in
nixops = callPackage ../tools/package-management/nixops { }; nixops = callPackage ../tools/package-management/nixops { };
nixops_1_6_1 = callPackage ../tools/package-management/nixops/nixops-v1_6_1.nix {};
nixopsUnstable = lowPrio (callPackage ../tools/package-management/nixops/unstable.nix { }); nixopsUnstable = lowPrio (callPackage ../tools/package-management/nixops/unstable.nix { });
nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { }; nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { };