diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-12-31 09:47:26 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-12-31 09:53:02 +0100 |
commit | f9f6f41bff2213e199bded515e9b66d1e5c4d7dd (patch) | |
tree | 29c5a75228e31f305f42c5b761709a186e406776 /pkgs/tools/package-management | |
parent | bbcf127c7c9029cba43493d7d25a9d1c65d59152 (diff) | |
parent | 468f698f609e123bb0ffae67181d07ac99eb2204 (diff) | |
download | nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.gz nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.bz2 nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.lz nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.xz nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.zst nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.zip |
Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5 on master, and I'm deferring pointing to correct outputs to later.
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/package-management/nixops/default.nix | 44 | ||||
-rw-r--r-- | pkgs/tools/package-management/nixops/generic.nix | 43 | ||||
-rw-r--r-- | pkgs/tools/package-management/nixops/unstable.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/package-management/rpm/default.nix | 5 |
5 files changed, 65 insertions, 42 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 9006785c3fcc..0bbb70bef116 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -97,10 +97,10 @@ in rec { }; nixUnstable = lib.lowPrio (common rec { - name = "nix-1.11pre4334_7431932"; + name = "nix-1.11pre4345_b8258a4"; src = fetchurl { - url = "http://hydra.nixos.org/build/28747184/download/4/${name}.tar.xz"; - sha256 = "ccb0c5be03b9af1bf89e79758868b0cd62c79fd7a0f0791cdb99df86e4240fc4"; + url = "http://hydra.nixos.org/build/29615957/download/4/${name}.tar.xz"; + sha256 = "06944da78e46d8f2cbeeb02c1ab3127a06935e984bcf7a972041c7d91814f0f2"; }; }); diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index 12e1989525d9..4388cbc5b3da 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -1,43 +1,9 @@ -{ lib, pythonPackages, fetchurl, libxslt, docbook5_xsl, openssh }: - -pythonPackages.buildPythonPackage rec { - name = "nixops-1.3"; - namePrefix = ""; +{ callPackage, fetchurl }: +callPackage ./generic.nix (rec { + version = "1.3"; src = fetchurl { - url = "http://nixos.org/releases/nixops/${name}/${name}.tar.bz2"; + url = "http://nixos.org/releases/nixops/nixops/nixops-${version}.tar.bz2"; sha256 = "d80b0fe3bb31bb84a8545f9ea804ec8137172c8df44f03326ed7639e5a4bad55"; }; - - buildInputs = [ libxslt ]; - - pythonPath = - [ pythonPackages.prettytable - pythonPackages.boto - pythonPackages.sqlite3 - pythonPackages.hetzner - pythonPackages.libcloud - ]; - - doCheck = false; - - postInstall = - '' - make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \ - docdir=$out/share/doc/nixops mandir=$out/share/man - - mkdir -p $out/share/nix/nixops - cp -av "nix/"* $out/share/nix/nixops - - # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL - # the version of openssh is causing errors when have big networks (40+) - wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin" - ''; - - meta = { - homepage = https://github.com/NixOS/nixops; - description = "NixOS cloud provisioning and deployment tool"; - maintainers = [ lib.maintainers.eelco lib.maintainers.rob ]; - platforms = lib.platforms.unix; - }; -} +}) diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix new file mode 100644 index 000000000000..b9b9eee8d160 --- /dev/null +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -0,0 +1,43 @@ +{ lib, pythonPackages, fetchurl, libxslt, docbook5_xsl, openssh +# version args +, src, version +}: + +pythonPackages.buildPythonPackage { + name = "nixops-${version}"; + namePrefix = ""; + + src = src; + + buildInputs = [ libxslt ]; + + pythonPath = + [ pythonPackages.prettytable + pythonPackages.boto + pythonPackages.sqlite3 + pythonPackages.hetzner + pythonPackages.libcloud + ]; + + doCheck = false; + + postInstall = + '' + make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \ + docdir=$out/share/doc/nixops mandir=$out/share/man + + mkdir -p $out/share/nix/nixops + cp -av "nix/"* $out/share/nix/nixops + + # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL + # the version of openssh is causing errors when have big networks (40+) + wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin" + ''; + + meta = { + homepage = https://github.com/NixOS/nixops; + description = "NixOS cloud provisioning and deployment tool"; + maintainers = [ lib.maintainers.eelco lib.maintainers.rob ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix new file mode 100644 index 000000000000..40d56518b3dc --- /dev/null +++ b/pkgs/tools/package-management/nixops/unstable.nix @@ -0,0 +1,9 @@ +{ callPackage, fetchurl }: + +callPackage ./generic.nix (rec { + version = "2015-12-18"; + src = fetchurl { + url = "http://hydra.nixos.org/build/29118371/download/2/nixops-1.3.1pre1673_a0d5681.tar.bz2"; + sha256 = "177lnlfz32crcc0gjmh1gn5y2xs142kmb4b68k4raxcxxw118kw9"; + }; +}) diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 0397723a2252..24346fb0eb70 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { NIX_CFLAGS_LINK = "-L${elfutils}/lib"; + postPatch = '' + # For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here + substituteInPlace configure --replace 'python''${PYTHON_VERSION}' ${python.executable} + ''; + configureFlags = "--with-external-db --without-lua --enable-python"; meta = with stdenv.lib; { |