Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0379e97193d6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 77edcf88dca0
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 3, 2019

  1. nixopsUnstable: mark as broken 

    Unstable should probably be working towards updating to the most
recent version, so marking as broken, instead of using the pinned
version, like stable does.

see #52550
see NixOS/nixops#1065
see #52547
    @bendlas
    bendlas committed Mar 3, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    GPG key ID: 472BFCCA96BD0EDA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    77edcf8 View commit details
Showing with 19 additions and 1 deletion.
  1. +2 −1 pkgs/tools/package-management/nixops/generic.nix
  2. +17 −0 pkgs/tools/package-management/nixops/unstable.nix
3 changes: 2 additions & 1 deletion pkgs/tools/package-management/nixops/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib, python2Packages, libxslt, docbook_xsl_ns, openssh, cacert
# version args
, src, version
, meta ? {}
}:

python2Packages.buildPythonApplication {
@@ -55,5 +56,5 @@ python2Packages.buildPythonApplication {
maintainers = with lib.maintainers; [ eelco rob domenkozar ];
platforms = lib.platforms.unix;
license = lib.licenses.lgpl3;
};
} // meta;
}
17 changes: 17 additions & 0 deletions pkgs/tools/package-management/nixops/unstable.nix
View file
Original file line number Diff line number Diff line change
@@ -10,4 +10,21 @@ callPackage ./generic.nix (rec {
url = "https://hydra.nixos.org/build/88329589/download/2/nixops-${version}.tar.bz2";
sha256 = "1ppnhqmsbiijm6r77h86abv3fjny5iq35yvj207s520kjwzaj7kc";
};
# # 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;
})