alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #59776 from AmineChikhaoui/nixops-release-1.7

Browse source 
nixops: 1.6.1 -> 1.7
This commit is contained in:
Graham Christensen 2019-04-17 11:30:48 -04:00 committed by GitHub
parent 3884afada4 5b5ca459d2
commit 0b3721588e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 42 additions and 46 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 ./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";
};
})

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
, src, version
, meta ? {}
@ -16,11 +16,6 @@ python2Packages.buildPythonApplication {
boto3
hetzner
libcloud
azure-storage
azure-mgmt-compute
azure-mgmt-network
azure-mgmt-resource
azure-mgmt-storage
adal
# Go back to sqlite once Python 2.7.13 is released
pysqlite
@ -28,7 +23,7 @@ python2Packages.buildPythonApplication {
digital-ocean
libvirt
typing
];
] ++ nixopsAzurePackages;
checkPhase =
# Ensure, that there are no (python) import errors
@ -53,7 +48,7 @@ python2Packages.buildPythonApplication {
meta = {
homepage = https://github.com/NixOS/nixops;
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;
license = lib.licenses.lgpl3;
} // 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 { };
});
};
})

23
pkgs/tools/package-management/nixops/unstable.nix
View file

@ -5,26 +5,9 @@
# Then copy the URL to the tarball.
callPackage ./generic.nix (rec {
version = "1.6.1pre2728_8ed39f9";
version = "1.7pre2764_932bf43";
src = fetchurl {
url = "https://hydra.nixos.org/build/88329589/download/2/nixops-${version}.tar.bz2";
sha256 = "1ppnhqmsbiijm6r77h86abv3fjny5iq35yvj207s520kjwzaj7kc";
url = "https://hydra.nixos.org/build/92372343/download/2/nixops-${version}.tar.bz2";
sha256 = "f35bf81bf2805473ea54248d0ee92d163d00a1992f3f75d17e8cf430db1f9919";
};
# # Marking unstable as broken, instead of using the pinned version,
# # like stable does You might be able to use the following code (as
# # in stable), to run unstable against the pinned packages
# 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 { };
# });
# };
# # otherwise
# # see https://github.com/NixOS/nixpkgs/pull/52550
# # see https://github.com/NixOS/nixops/issues/1065
# # see https://github.com/NixOS/nixpkgs/issues/52547
meta.broken = true;
})

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

@ -22909,6 +22909,8 @@ in
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 { });
nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { };