public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source 
* master: (271 commits)
  pysmbc: clarify license
  pysmbc: fix license
  bazel: 0.5.4 -> 0.6.0 (#29990)
  googler: init at 3.3
  go: declare support for aarch64
  firefox-beta-bin: 56.0b5 -> 57.0b4
  spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26
  gogs: 0.11.19 -> 0.11.29
  grafana: 4.5.1 -> 4.5.2
  mopidy-iris: 3.4.1 -> 3.4.9
  nextcloud: 12.0.2 -> 12.0.3
  haskell-json-autotype: jailbreak to fix build within LTS 9.x
  kore: fix up
  kore: init at 2.0.0
  glusterfs service: fix issues with useRpcbind
  tig: 2.2.2 -> 2.3.0
  haskell-hspec-core: enable test suite again
  hackage-packages.nix: automatic Haskell package set update
  librsvg: fix thumbnailer path
  awscli: 1.11.108 -> 1.11.162
  ...
This commit is contained in:
Orivej Desh
2017-10-02 00:22:12 +00:00
parent 21976d1fbd 6b8806dff7
commit fda26c8476
260 changed files with 9682 additions and 4403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/interpreters/php/default.nix
View File

@@ -331,12 +331,12 @@ in {
};
php70 = generic {
version = "7.0.22";
sha256 = "1ppxdlyb9vapcmzylml447vrlizam72h1w41vvn15pdbd5zv5q48";
version = "7.0.24";
sha256 = "06fgpljz6xpxxkpf4cv9rqz8g504l9ikbw5aq0hqh5sgd611kycv";
};
php71 = generic {
version = "7.1.8";
sha256 = "1y527hs9yh9lmr38q3rf7gkhnvk49vh4nyhci6852mjhjh5a0r3h";
version = "7.1.9";
sha256 = "1blvzm2js8mrdbmwks0v6nlb5wj4789ixzmlxm1l8z6xvw8cqk9i";
};
}

2
pkgs/development/interpreters/racket/default.nix
View File

@@ -82,6 +82,6 @@ stdenv.mkDerivation rec {
homepage = http://racket-lang.org/;
license = licenses.lgpl3;
maintainers = with maintainers; [ kkallio henrytill vrthra ];
platforms = platforms.x86_64;
platforms = [ "x86_64-linux" ];
};
}

8
pkgs/development/interpreters/ruby/default.nix
View File

@@ -205,11 +205,11 @@ in {
};
};
ruby_2_3_4 = generic {
version = rubyVersion "2" "3" "4" "";
ruby_2_3_5 = generic {
version = rubyVersion "2" "3" "5" "";
sha256 = {
src = "1hy0zr4vwkqcjbykh2hp0d6ifkrhgskaxlzy6878sc9kr4bqzqcq";
git = "0jjhgdjv3aayxb0flxjiny7xfzh3ggrqcpvgjv2ydm25padfbqmp";
src = "1k6x4g68lq30i0myip5bn56rcbwjxmqq95j1fkdgbvwbnaxzfqjl";
git = "0spwqz4b5xxqzs13azsd4xz4jkc3is7d9q4s6s2qilb8ib4863jl";
};
};

2
pkgs/development/interpreters/ruby/patchsets.nix
View File

@@ -29,7 +29,7 @@ rec {
"${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch"
];
"2.3.4" = ops useRailsExpress [
"2.3.5" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch"
"${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"