diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-07-14 18:12:49 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-07-14 18:15:30 +0200 |
| commit | 0f01215203e3886d1a57ced4cd49b54475c66f85 (patch) | |
| tree | 3cca5bbb2d7f79724f211d476d6a3e14d0ddf92d /pkgs/development/web | |
| parent | 4bd4e3ef5c13c97ad829d18d8fe99dd753b33da5 (diff) | |
| parent | 6d0578934fb076050b3dcc1b924a90b275f3b27c (diff) | |
| download | nixpkgs-0f01215203e3886d1a57ced4cd49b54475c66f85.tar nixpkgs-0f01215203e3886d1a57ced4cd49b54475c66f85.tar.gz nixpkgs-0f01215203e3886d1a57ced4cd49b54475c66f85.tar.bz2 nixpkgs-0f01215203e3886d1a57ced4cd49b54475c66f85.tar.lz nixpkgs-0f01215203e3886d1a57ced4cd49b54475c66f85.tar.xz nixpkgs-0f01215203e3886d1a57ced4cd49b54475c66f85.tar.zst nixpkgs-0f01215203e3886d1a57ced4cd49b54475c66f85.zip | |
Merge branch 'master' into staging-next
Hydra: ?compare=1468896
Diffstat (limited to 'pkgs/development/web')
| -rw-r--r-- | pkgs/development/web/kcgi/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/web/nodejs/v9.nix | 11 |
2 files changed, 2 insertions, 13 deletions
diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix index 4b04f70a2c2..597b9ab3460 100644 --- a/pkgs/development/web/kcgi/default.nix +++ b/pkgs/development/web/kcgi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "kcgi"; - version = "0.10.6"; + version = "0.10.7"; underscoreVersion = stdenv.lib.replaceChars ["."] ["_"] version; name = "${pname}-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "kristapsdz"; repo = pname; rev = "VERSION_${underscoreVersion}"; - sha256 = "0vaqz7krlvkjlc0189pkcj1al1p5ic577dn6bb4ivca1bss1i3m2"; + sha256 = "1z8gfj1v69hhkiyybr41qw7yv3cdxahgk45nipxfb9nmn18p0k8n"; }; patchPhase = ''substituteInPlace configure \ --replace /usr/local / diff --git a/pkgs/development/web/nodejs/v9.nix b/pkgs/development/web/nodejs/v9.nix deleted file mode 100644 index 117ca774987..00000000000 --- a/pkgs/development/web/nodejs/v9.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, callPackage, lib, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix {}; -in - buildNodejs { - inherit enableNpm; - version = "9.11.2"; - sha256 = "04y2dnbf6jl8j0ykfkdwhir09h274d13k843d7lqfz3bgyn4wj06"; - patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; - } |