diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-04-23 11:26:47 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-04-23 11:26:47 +0200 |
| commit | 4fc9b1852a7707d5531355b588c3d2edc769b0cb (patch) | |
| tree | ca2336852c3f067960f8631ab2bcc1917ae4beca /pkgs/development/interpreters | |
| parent | 004ecac47b4639c6f8a8419ce2e1dcd18c78268b (diff) | |
| parent | f45f2fb67a4f620938e8b05941e8d8297661fd35 (diff) | |
| download | nixpkgs-4fc9b1852a7707d5531355b588c3d2edc769b0cb.tar nixpkgs-4fc9b1852a7707d5531355b588c3d2edc769b0cb.tar.gz nixpkgs-4fc9b1852a7707d5531355b588c3d2edc769b0cb.tar.bz2 nixpkgs-4fc9b1852a7707d5531355b588c3d2edc769b0cb.tar.lz nixpkgs-4fc9b1852a7707d5531355b588c3d2edc769b0cb.tar.xz nixpkgs-4fc9b1852a7707d5531355b588c3d2edc769b0cb.tar.zst nixpkgs-4fc9b1852a7707d5531355b588c3d2edc769b0cb.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/picolisp/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/3.6/default.nix | 12 |
2 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 04aca84f902..2a5d9d2f574 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -3,10 +3,10 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "picoLisp-${version}"; - version = "16.6"; + version = "16.12"; src = fetchurl { url = "http://www.software-lab.de/${name}.tgz"; - sha256 = "0y9b4wqpgx0j0igbp4h7k0bw3hvp7dnrhl3fsaagjpp305b003z3"; + sha256 = "1k3x6mvk9b34iiyml142bzh3gf241f25ywjlaagbxzb9vklpws75"; }; buildInputs = optional stdenv.is64bit jdk; patchPhase = optionalString stdenv.isArm '' diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 3c96bf38b6a..15078619166 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -26,7 +26,7 @@ with stdenv.lib; let majorVersion = "3.6"; - minorVersion = "0"; + minorVersion = "1"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -47,7 +47,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "08inlbb2vb8lahw6wfq654lqk6l1x7ncpggp6a92vqw5yq2gkidh"; + sha256 = "0ha03sbakxblzyvlramx5fj0ranzmzx4pa2png6nn8gczkfi0650"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; @@ -63,14 +63,6 @@ in stdenv.mkDerivation { substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' ' ''; - patches = [ - (fetchpatch { - name = "glibc-2.25-failed-to-get-random-numbers.patch"; - url = https://github.com/python/cpython/commit/ff558f5aba4.patch; - sha256 = "1k12gpn69np94cm942vaf40sv7gsxqf20rv1m3parzgi1gs4hqa3"; - }) - ]; - postPatch = '' # Determinism substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])" |