diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-09 15:46:26 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-09 15:46:26 +0200 |
commit | 79a03641d58f351454051bf2320e94508525a41b (patch) | |
tree | 8fa1b8870eb83ffb282848d8cf1363e542fd126d /pkgs/development/interpreters | |
parent | 7cf5909fadf5cf74f3b0e2bc5b227deb8f45f288 (diff) | |
parent | 74c24385cb2864f937031df74af14fc8060e1540 (diff) | |
download | nixlib-79a03641d58f351454051bf2320e94508525a41b.tar nixlib-79a03641d58f351454051bf2320e94508525a41b.tar.gz nixlib-79a03641d58f351454051bf2320e94508525a41b.tar.bz2 nixlib-79a03641d58f351454051bf2320e94508525a41b.tar.lz nixlib-79a03641d58f351454051bf2320e94508525a41b.tar.xz nixlib-79a03641d58f351454051bf2320e94508525a41b.tar.zst nixlib-79a03641d58f351454051bf2320e94508525a41b.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/interpreters')
4 files changed, 128 insertions, 14 deletions
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 4fe1e1820954..8df64de3acb6 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, jdk, rlwrap, makeWrapper }: +{ stdenv, fetchurl, jdk11, rlwrap, makeWrapper }: stdenv.mkDerivation rec { - name = "clojure-${version}"; - version = "1.10.0.442"; + pname = "clojure"; + version = "1.10.1.462"; src = fetchurl { url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "147pkid3pvw60gq8vansid3x6wwfy9pqdbla3wfd5qaxqbcrhclw"; + sha256 = "0mi7fzqvkg2ihigxkkamc742m1iba0yzy8ivciavzmpcnw128sc6"; }; buildInputs = [ makeWrapper ]; @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "prefix" ]; installPhase = let - binPath = stdenv.lib.makeBinPath [ rlwrap jdk ]; + binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ]; in '' mkdir -p $prefix/libexec cp clojure-tools-${version}.jar $prefix/libexec - cp {,example-}deps.edn $prefix + cp example-deps.edn $prefix substituteInPlace clojure --replace PREFIX $prefix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { offers a software transactional memory system and reactive Agent system that ensure clean, correct, multithreaded designs. ''; - maintainers = with maintainers; [ the-kenny ]; + maintainers = with maintainers; [ jlesquembre ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch new file mode 100644 index 000000000000..a1f9d68eb166 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch @@ -0,0 +1,100 @@ +From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk <fridh@fridh.nl> +Date: Mon, 28 Aug 2017 09:24:06 +0200 +Subject: [PATCH] Don't use ldconfig + +--- + Lib/ctypes/util.py | 70 ++---------------------------------------------------- + 1 file changed, 2 insertions(+), 68 deletions(-) + +diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py +index 5e8b31a854..7b45ce6c15 100644 +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -94,46 +94,7 @@ elif os.name == "posix": + import re, tempfile + + def _findLib_gcc(name): +- # Run GCC's linker with the -t (aka --trace) option and examine the +- # library name it prints out. The GCC command will fail because we +- # haven't supplied a proper program with main(), but that does not +- # matter. +- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) +- +- c_compiler = shutil.which('gcc') +- if not c_compiler: +- c_compiler = shutil.which('cc') +- if not c_compiler: +- # No C compiler available, give up +- return None +- +- temp = tempfile.NamedTemporaryFile() +- try: +- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] +- +- env = dict(os.environ) +- env['LC_ALL'] = 'C' +- env['LANG'] = 'C' +- try: +- proc = subprocess.Popen(args, +- stdout=subprocess.PIPE, +- stderr=subprocess.STDOUT, +- env=env) +- except OSError: # E.g. bad executable +- return None +- with proc: +- trace = proc.stdout.read() +- finally: +- try: +- temp.close() +- except FileNotFoundError: +- # Raised if the file was already removed, which is the normal +- # behaviour of GCC if linking fails +- pass +- res = re.search(expr, trace) +- if not res: +- return None +- return os.fsdecode(res.group(0)) ++ return None + + + if sys.platform == "sunos5": +@@ -255,34 +216,7 @@ elif os.name == "posix": + else: + + def _findSoname_ldconfig(name): +- import struct +- if struct.calcsize('l') == 4: +- machine = os.uname().machine + '-32' +- else: +- machine = os.uname().machine + '-64' +- mach_map = { +- 'x86_64-64': 'libc6,x86-64', +- 'ppc64-64': 'libc6,64bit', +- 'sparc64-64': 'libc6,64bit', +- 's390x-64': 'libc6,64bit', +- 'ia64-64': 'libc6,IA-64', +- } +- abi_type = mach_map.get(machine, 'libc6') +- +- # XXX assuming GLIBC's ldconfig (with option -p) +- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s' +- regex = os.fsencode(regex % (re.escape(name), abi_type)) +- try: +- with subprocess.Popen(['/sbin/ldconfig', '-p'], +- stdin=subprocess.DEVNULL, +- stderr=subprocess.DEVNULL, +- stdout=subprocess.PIPE, +- env={'LC_ALL': 'C', 'LANG': 'C'}) as p: +- res = re.search(regex, p.stdout.read()) +- if res: +- return os.fsdecode(res.group(1)) +- except OSError: +- pass ++ return None + + def _findLib_ld(name): + # See issue #9998 for why this is needed +-- +2.15.0 + diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index cb18f99abb4d..42fcae5e179c 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -98,6 +98,19 @@ in { inherit passthruFun; }; + python38 = callPackage ./cpython { + self = python38; + sourceVersion = { + major = "3"; + minor = "8"; + patch = "0"; + suffix = "b2"; + }; + sha256 = "1rh9dz5vmc56y45d6j2wfjw4m7x25i6v8vyld4mrqh06s2gn1hbl"; + inherit (darwin) CF configd; + inherit passthruFun; + }; + pypy27 = callPackage ./pypy { self = pypy27; sourceVersion = { diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index c16b57dcb9c5..057375182f53 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig, alsaLib , libjack2, libsndfile, fftw, curl, gcc -, libXt, qtbase, qttools, qtwebkit, readline -, useSCEL ? false, emacs +, libXt, qtbase, qttools, qtwebengine +, readline, qtwebsockets, useSCEL ? false, emacs }: let optional = stdenv.lib.optional; @@ -9,12 +9,12 @@ in stdenv.mkDerivation rec { name = "supercollider-${version}"; - version = "3.9.3"; + version = "3.10.2"; src = fetchurl { url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2"; - sha256 = "1d8ixfl100jvlialxdizp8wqsl1mp5pi2bam25vp97bhjd59cfdr"; + sha256 = "0ynz1ydcpsd5h57h1n4a7avm6p1cif5a8rkmz4qpr46pr8z9p6iq"; }; hardeningDisable = [ "stackprotector" ]; @@ -27,14 +27,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig qttools ]; buildInputs = [ - gcc libjack2 libsndfile fftw curl libXt qtbase qtwebkit readline ] + gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ] ++ optional (!stdenv.isDarwin) alsaLib ++ optional useSCEL emacs; - meta = { + meta = with stdenv.lib; { description = "Programming language for real time audio synthesis"; homepage = http://supercollider.sourceforge.net/; - license = stdenv.lib.licenses.gpl3Plus; + maintainers = with maintainers; [ mrmebelman ]; + license = licenses.gpl3; platforms = [ "x686-linux" "x86_64-linux" ]; }; } |