diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-12 10:33:41 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-12 10:33:41 +0200 |
| commit | 00df25ee57fcc2227ffdbbff2280b13d898bfd7d (patch) | |
| tree | a2cdc854489799c6d7900b0e5ac215b7b95d762a /pkgs/tools/package-management | |
| parent | 580cab57e4f188d25144e398d7b8e3d5085299a9 (diff) | |
| parent | bb3f7d14a17e88e4341872c55d8b32127c6f8101 (diff) | |
| download | nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.gz nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.bz2 nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.lz nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.xz nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.zst nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.zip | |
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/nix-repl/default.nix | 36 | ||||
| -rw-r--r-- | pkgs/tools/package-management/nixops/generic.nix | 1 |
2 files changed, 1 insertions, 36 deletions
diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix deleted file mode 100644 index 9fe6ec6e291..00000000000 --- a/pkgs/tools/package-management/nix-repl/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, nix, readline }: - -let rev = "a1ea85e92b067a0a42354a28355c633eac7be65c"; in - -stdenv.mkDerivation { - name = "nix-repl-${lib.getVersion nix}-2016-02-28"; - - src = fetchFromGitHub { - owner = "edolstra"; - repo = "nix-repl"; - inherit rev; - sha256 = "0rf9711day64lgg6g6yqc5709x4sgj137zpqyn019k764i7m2xs8"; - }; - - buildInputs = [ nix readline ]; - - dontBuild = true; - - # FIXME: unfortunate cut&paste. - installPhase = '' - mkdir -p $out/bin - $CXX -O3 -Wall -std=c++0x \ - -o $out/bin/nix-repl nix-repl.cc \ - -I${nix.dev}/include/nix \ - -lnixformat -lnixutil -lnixstore -lnixexpr -lnixmain -lreadline -lgc \ - -DNIX_VERSION=\"${(builtins.parseDrvName nix.name).version}\" - ''; - - meta = { - homepage = https://github.com/edolstra/nix-repl; - description = "An interactive environment for evaluating and building Nix expressions"; - maintainers = [ lib.maintainers.eelco ]; - license = lib.licenses.gpl3; - platforms = nix.meta.platforms; - }; -} diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index 105cb6d7ab0..31adac4436c 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -47,5 +47,6 @@ python2Packages.buildPythonApplication { description = "NixOS cloud provisioning and deployment tool"; maintainers = with lib.maintainers; [ eelco rob domenkozar ]; platforms = lib.platforms.unix; + license = lib.licenses.lgpl3; }; } |