diff options
| author | Domen Kožar <domen@dev.si> | 2017-05-18 11:40:27 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2017-05-18 11:40:41 +0200 |
| commit | 8ae6797c0e8a1b9c1ad741b13ce2e988578a195f (patch) | |
| tree | ecb984c464e8419380faf7ef797e6580efd899e6 /pkgs/tools | |
| parent | 0eff1d9f2af05353a827a3896ebcc2bce20d2fdd (diff) | |
| download | nixpkgs-8ae6797c0e8a1b9c1ad741b13ce2e988578a195f.tar nixpkgs-8ae6797c0e8a1b9c1ad741b13ce2e988578a195f.tar.gz nixpkgs-8ae6797c0e8a1b9c1ad741b13ce2e988578a195f.tar.bz2 nixpkgs-8ae6797c0e8a1b9c1ad741b13ce2e988578a195f.tar.lz nixpkgs-8ae6797c0e8a1b9c1ad741b13ce2e988578a195f.tar.xz nixpkgs-8ae6797c0e8a1b9c1ad741b13ce2e988578a195f.tar.zst nixpkgs-8ae6797c0e8a1b9c1ad741b13ce2e988578a195f.zip | |
nixopsUnstable: 1.5 -> 2017-05-15
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/package-management/nixops/generic.nix | 25 | ||||
| -rw-r--r-- | pkgs/tools/package-management/nixops/unstable.nix | 6 |
2 files changed, 14 insertions, 17 deletions
diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index 4d67e8a5d6f..d9c9661d41a 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -5,9 +5,7 @@ python2Packages.buildPythonApplication { name = "nixops-${version}"; - namePrefix = ""; - - src = src; + inherit version src; buildInputs = [ libxslt ]; @@ -31,23 +29,22 @@ python2Packages.buildPythonApplication { 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 + 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 + 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" - ''; + # 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 ]; + maintainers = with lib.maintainers; [ eelco rob domenkozar ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix index 820bcbb9a35..7ddc8835a77 100644 --- a/pkgs/tools/package-management/nixops/unstable.nix +++ b/pkgs/tools/package-management/nixops/unstable.nix @@ -1,9 +1,9 @@ { callPackage, fetchurl }: callPackage ./generic.nix (rec { - version = "1.5"; + version = "2017-05-15"; src = fetchurl { - url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; - sha256 = "0z4pzc55wjab8v4bkrff94f8qp1g9ydgxxpl2dvy5130bg1s52wd"; + url = "https://static.domenkozar.com/rf5n6m8qwviaiv06sfmdwl8hndp0hxbp-nixops-1.5.1pre2159_db36cb7.tar.bz2"; + sha256 = "01b4mgql5jxin2fb2ndr1qlc8171vbb1vdljdimy8nz49dgy0gkx"; }; }) |