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: 7eb64f7603d7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1d78dc8a8bfc
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Nov 5, 2020

  1. nixops: fix build on darwin

    @marsam
    marsam committed Nov 5, 2020
    Copy the full SHA
    981e163 View commit details

  2. nixops: add patch to follow redirects in nixos-infect

    @marsam
    marsam committed Nov 5, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    94a810c View commit details

Commits on Nov 6, 2020

  1. Merge pull request #102983 from marsam/fix-nixops-darwin 

    nixops: fix build on darwin
    @domenkozar
    domenkozar authored Nov 6, 2020
    Copy the full SHA
    1d78dc8 View commit details
Showing with 12 additions and 4 deletions.
  1. +2 −2 pkgs/development/libraries/libvirt/5.9.0.nix
  2. +8 −1 pkgs/tools/package-management/nixops/default.nix
  3. +2 −1 pkgs/tools/package-management/nixops/generic.nix
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libvirt/5.9.0.nix
View file
Original file line number Diff line number Diff line change
@@ -36,12 +36,12 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper pkgconfig rpcsvc-proto ];
buildInputs = [
libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib libtirpc
libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib
] ++ optionals (!buildFromTarball) [
libtool autoconf automake
] ++ optionals stdenv.isLinux [
libpciaccess lvm2 utillinux systemd libnl numad zfs
libapparmor libcap_ng numactl attr parted
libapparmor libcap_ng numactl attr parted libtirpc
] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [
xen
] ++ optionals enableIscsi [
9 changes: 8 additions & 1 deletion pkgs/tools/package-management/nixops/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
{ callPackage, fetchurl }:
{ callPackage, fetchurl, fetchpatch }:

callPackage ./generic.nix (rec {
version = "1.7";
src = fetchurl {
url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
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 changes: 2 additions & 1 deletion pkgs/tools/package-management/nixops/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,12 @@
# version args
, src, version
, meta ? {}
, patches ? null
}:

python2Packages.buildPythonApplication {
name = "nixops-${version}";
inherit version src;
inherit version src patches;

buildInputs = [ libxslt ];