Commit graph

3580 commits

Author SHA1 Message Date
Matthieu Coudron 612c816596 buildLuarocksPackage: forcefully create $out
Allows to work around https://github.com/luarocks/luarocks/issues/988 on darwin
2019-04-14 16:41:11 +09:00
volth 03eaa480bd perl: add .withPackages 2019-04-12 09:09:06 +00:00
Frederik Rietdijk c6341c279b Merge staging-next into staging 2019-04-11 07:52:44 +02:00
Frederik Rietdijk 230c67f43b Merge master into staging-next 2019-04-11 07:50:23 +02:00
Matthew Bauer e7f57503e0 v8: 5.4.232 -> 7.4.255 2019-04-11 00:25:12 -04:00
Corbin edd5555029 pypy: Disable broken test on 3.x. 2019-04-09 20:41:08 +02:00
Corbin 9c04b75cf9 pypy: 6.0.0 -> 7.0.0
Note that this bumps both the 2.7 and 3.5 flavors of PyPy.
2019-04-09 20:41:08 +02:00
Corbin 5719f892e1 python: Make .isPyPy flag more accurate.
nix-repl> map (s: s.isPyPy) [ python python3 pypy pypy3 ]
[ false false true true ]
2019-04-09 20:41:08 +02:00
Renaud 8db38cdcd4
Merge pull request #58434 from matthiasbeyer/add-licenses
Add licenses
2019-04-09 19:57:17 +02:00
Matthias Beyer 60752bebcb clisp: Add license
Source: http://ftp.gnu.org/pub/gnu/clisp/release/latest/clisp-2.49.tar.gz
File: GNU-GPL

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2019-04-09 13:23:55 +02:00
Frederik Rietdijk 4a125f6b20 Merge master into staging-next 2019-04-07 08:33:41 +02:00
Will Dietz d1a539fef1 php73: 7.3.3 -> 7.3.4
security release, see:
https://www.php.net/archive/2019.php#id2019-04-04-1
2019-04-06 10:56:58 -05:00
Will Dietz 76394e36ec php72: 7.2.16 -> 7.2.17
security release, see announcement:
https://www.php.net/archive/2019.php#id2019-04-04-2
2019-04-06 10:56:56 -05:00
Will Dietz b8446dcc57 php71: 7.1.27 -> 7.1.28
security release:
https://www.php.net/archive/2019.php#id2019-04-04-3
2019-04-06 10:56:55 -05:00
Jan Tojnar cb1a20499a
Merge branch 'master' into staging 2019-04-05 11:37:15 +02:00
John Ericson 4ccb74011f Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging
There was one conflict in the NixOS manual; I checked that it still
built after resolving it.
2019-04-01 00:40:03 -04:00
andrewchambers 49d4668ff7 janet: init at 0.4.0 (#57549) 2019-03-30 11:47:14 -04:00
Frederik Rietdijk 0ddae82e6a python3: 3.7.2 -> 3.7.3 2019-03-26 16:24:04 +01:00
John Ericson 655a29ff9c ghc, go, guile: Use new pkgs*
`pkgsBuildTarget` allows us to avoid repeated and confusing conditions.
The others merely provide clarity for one the foreign package set's
target platform matters.
2019-03-24 22:12:15 -04:00
volth 39fc981fca
perldevel: 5.29.6 -> 5.29.9 2019-03-24 15:43:16 +01:00
Frederik Rietdijk 23e431387b Merge staging-next into staging 2019-03-23 09:20:09 +01:00
Frederik Rietdijk 2cc6444113 python35 -> 3.5.6 -> 3.5.7 2019-03-23 09:17:35 +01:00
Wael M. Nasreddine 5af0780492
Merge remote-tracking branch 'origin/master' into staging
* origin/master: (693 commits)
  buildGoModule: use go_1_12 instead of go_1_11 (#58103)
  gitAndTools.lab: 0.15.2 -> 0.15.3 (#58091)
  signal-desktop: 1.22.0 -> 1.23.0
  added missing semicolon to documentation
  terminus_font_ttf: 4.46.0 -> 4.47.0
  buildGoModule: remove SSL env vars in favor of cacert in buildInputs (#58071)
  dav1d: init at 0.2.1
  dropbox-cli: 2018.11.28 -> 2019.02.14
  atlassian-confluence: 6.14.1 -> 6.14.2
  maintainers: update email for dywedir
  python.pkgs.hglib: use patch to specify hg path (#57926)
  chkrootkit: 0.52 -> 0.53
  radare2-cutter: 1.7.2 -> 1.8.0
  autorandr: 1.7 -> 1.8
  pythonPackages.pyhepmc: fix build
  llvm-polly/clang-polly: use latest llvm
  apulse: 0.1.11.1 -> 0.1.12, cleanup
  factorio: experimental 0.17.14 → 0.17.16 (#58000)
  sequeler: 0.6.7 -> 0.6.8
  nasc: 0.5.1 -> 0.5.2
  ...
2019-03-21 21:01:25 -07:00
José Luis Lafuente c5c31ef91a clojure: 1.10.411 -> 1.10.442 (#57788) 2019-03-18 00:13:11 +01:00
Alyssa Ross 46026e8247
Merge commit 'refs/pull/57762/head' of https://github.com/NixOS/nixpkgs into master 2019-03-17 10:56:46 +00:00
Sarah Brofeldt 6d9649528c
Merge pull request #55002 from clacke/racket-gl
racket: add libGL and libGLU to libPath
2019-03-16 19:27:50 +01:00
Mario Rodas 342773c78c
ruby_2_6: 2.6.1 -> 2.6.2 2019-03-16 12:41:28 -05:00
Mario Rodas cadc359a0a
ruby_2_5: 2.5.3 -> 2.5.5 2019-03-16 12:40:51 -05:00
Mario Rodas 69d80d7d21
ruby: update RVM patchsets 2019-03-16 12:36:22 -05:00
Elis Hirwing 894eee60a7
Merge pull request #57245 from Izorkin/php-options
php: add custom options
2019-03-14 08:13:22 +01:00
Elis Hirwing eeecb9d00e
Merge pull request #57066 from Izorkin/php
Update php packages
2019-03-11 12:33:24 +01:00
Lancelot SIX 8c03e90831
Merge pull request #56842 from lsix/update_octave
octave: 4.4.1 -> 5.1.0
2019-03-11 11:02:31 +01:00
Izorkin 799f9004a9 php: add custom options 2019-03-10 15:43:45 +03:00
Matthew Glazar 0bf2d63366 python35: fix build on macOS
The upstream patch for distutils does not apply cleanly to Python 3.5's
sources. Fix the patch to make python35 build on macOS.
2019-03-10 13:38:43 +01:00
Vladimír Čunát 8d502fd425
Merge branch 'staging-next' into staging 2019-03-10 08:05:27 +01:00
Izorkin 768bb1724e php73: 7.3.2 -> 7.3.3 2019-03-08 10:21:41 +03:00
Izorkin c6290e381f php72: 7.2.15 -> 7.2.16 2019-03-08 10:16:37 +03:00
Izorkin 627275399c php71: 7.1.26 -> 7.1.27 2019-03-08 10:12:02 +03:00
Matthieu Coudron 16e3574e29 buildLuarocksPackage: adjust the manifest path
the new luarocks 3.0.4 uses different paths for the manifests, hence creating new collisions.
2019-03-08 13:24:23 +09:00
Matthieu Coudron ed7818219a
lua: run postConfigure hook for rock and rockspec
it was previously run only for src.rock
2019-03-07 10:34:01 +00:00
Frederik Rietdijk a2736d27d1 buildPythonPackage: fix building with flit 2019-03-06 13:42:46 +01:00
Frederik Rietdijk 347680df96 python: 2.7.15 -> 2.7.16 2019-03-05 08:30:04 +01:00
Lancelot SIX 9b5b39f3d6
octave: 4.4.1 -> 5.1.0 2019-03-04 20:43:11 +01:00
Michael Raskin fce81a36b7
Merge pull request #56825 from callahad/renpy
renpy: 7.1.3 -> 7.2.0
2019-03-04 19:26:30 +00:00
Dan Callahan 154a7d3cfb
renpy: 7.1.3 -> 7.2.0 2019-03-04 14:46:02 +00:00
Mario Rodas de0373bbe2 ruby_2_6: add missing rvm patchset (#56461) 2019-03-04 12:00:11 +00:00
R. RyanTM 138c15fa52 jruby: 9.2.5.0 -> 9.2.6.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jruby/versions
2019-03-03 20:47:54 +01:00
Sarah Brofeldt bda745e9fc
Merge pull request #55004 from clacke/racket-build-cacert
racket{,-minimal}: add cacert to nativeBuildInputs, silence warnings
2019-03-02 10:10:16 +01:00
Frederik Rietdijk 2fcb11a244 Merge staging-next into master 2019-03-01 09:06:20 +01:00
Vladimír Čunát e52396ce2c
Merge #56143: luajit, lmdb, knot-resolver: cross-fixes 2019-02-26 15:24:17 +01:00
Frederik Rietdijk c2eac6741b Merge master into staging-next 2019-02-24 09:19:12 +01:00
Frederik Rietdijk 1fccd25595 buildPythonPackage: always export LANG=C.UTF-8 2019-02-23 20:08:26 +01:00
Frederik Rietdijk e7b4608d02 buildPythonPackage: initial support for PEP 517 2019-02-23 20:05:19 +01:00
Vladimír Čunát 71f4ba29a3
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1506218
2019-02-22 17:51:01 +01:00
Florian Friesdorf fbef5ab82f Remove myself as maintainer from packages
I'm currently not maintaining any packages.
2019-02-22 16:14:13 +01:00
Vladimír Čunát 5ddfa4183a
luajit: fix cross-compilation, partially
Also clean the expression a bit.
2019-02-21 12:16:04 +01:00
Michael Raskin a059fc7420
Merge pull request #56067 from oxij/tree/fetchurl-boot
treewide: assemble all `fetchurlBoot` uses in overrides to `fetchurl`
2019-02-21 09:43:11 +00:00
Frederik Rietdijk 5871da418f Merge staging into python-unstable 2019-02-21 08:02:10 +01:00
Vladimír Čunát 32767d139f
Merge branch 'staging-next'
This round is without the systemd CVE,
as we don't have binaries for that yet.
BTW, I just ignore darwin binaries these days,
as I'd have to wait for weeks for them.
2019-02-20 09:38:45 +01:00
Elis Hirwing 2407f4cf2b
Merge pull request #55997 from aanderse/php-odbc
php: add pdo odbc support
2019-02-20 08:55:30 +01:00
Jan Malakhovski a1fec8667d treewide: assemble all fetchurlBoot uses in overrides to fetchurl itself
The only outside-curl uses of `fetchurlBoot` left are `stdenv`
and `apple-source-releases`. The latter one can probably be removed
too, but I can't test it.

Pros:

- Aggregates all behind-the-scenes insanity in a single place.

Cons:

- At the cost of 10 more derivations (but 0 new outpaths).
2019-02-19 20:55:59 +00:00
Frederik Rietdijk 815b77cbe6 Merge master into staging-next 2019-02-18 14:18:04 +01:00
Aaron Andersen d5d0b4aceb php: add pdo odbc support 2019-02-18 08:09:20 -05:00
Hlöðver Sigurðsson c388cecf45 nodePackages_10_x: bump webpack-cli (#55814) 2019-02-18 12:13:17 +02:00
Frederik Rietdijk b4acd97729 buildPython*: enable strictDeps 2019-02-17 14:40:48 +01:00
Matthew Bauer 5c09d977c7 Merge remote-tracking branch 'origin/master' into staging 2019-02-09 12:14:06 -05:00
Vladimír Čunát 7f9e3b8206
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1504357
2019-02-09 10:15:17 +01:00
Elis Hirwing a31ce0c69e php73: 7.3.1 -> 7.3.2
Changelog: https://secure.php.net/ChangeLog-7.php#7.3.2
2019-02-08 13:19:41 +00:00
Elis Hirwing 89dec63005 php72: 7.2.14 -> 7.2.15
Changelog: https://secure.php.net/ChangeLog-7.php#7.2.15
2019-02-08 13:19:19 +00:00
Averell Dalton 91aeda1432 python: sysconfig: fix paths 2019-02-07 18:52:08 +01:00
Pascal Wittmann 063e245811
groovy: 2.5.5 -> 2.5.6 2019-02-06 21:12:11 +01:00
Vladimír Čunát ff101946a8
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1503899
2019-02-06 14:24:46 +01:00
Graham Christensen df8b6728a8
perl: make reproducible
Perl likes to capture impure data, needlessly.

 - Configure time (cf_time): make 1 second past epoch
 - Target system (uname): use less uname information
2019-02-04 09:10:22 -05:00
Matthieu Coudron 2ba891788b Lua generate nix packages from luarocks (#54978)
* lua: generate packages from luarocks

* luarocks-nix: update

* removed packages already available in nixpkgs

* adressing reviews

update script can now accept another csv file as input with -c

* Remove obsolete comment
2019-02-04 11:30:58 +00:00
Claes Wallin (韋嘉誠) f81c0c1d8e racket, racket-minimal: 7.1 -> 7.2 (#54994)
The old src/configure has been split into src/lt/configure for
classical Racket and src/cs/c/configure for Racket CS (Racket on Chez
Scheme).
2019-02-04 05:52:59 +00:00
Vladimír Čunát bd9f835bf6
Merge branch 'master' into staging-next
Larger rebuild, probably mainly haskell.
Hydra nixpkgs: ?compare=1503325
2019-02-02 17:13:11 +01:00
Alyssa Ross 4e270f979c
Merge pull request #55005 from clacke/racket-full-no-darwin
racket: remove x86_64-darwin from platforms
2019-02-01 16:37:30 +00:00
Claes Wallin (韋嘉誠) 45c0f8956d racket: mark x86_64-darwin broken
It does not build on this platform, and will not do so any time soon.

Closes #53389
2019-02-01 22:53:23 +08:00
Vladimír Čunát 8ba516664b
Merge branch 'staging-next' into staging 2019-02-01 09:42:53 +01:00
Vladimír Čunát 5effa4e0f9
Merge branch 'master' into staging-next
Comments on conflicts:
- llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is
  to build all targets, so we should be fine
- some pypi hashes: they were equivalent, just base16 vs. base32
2019-02-01 09:22:29 +01:00
Herwig Hochleitner f89f2478b8 pixie: fix build with pypy 2019-01-31 20:06:16 +01:00
Claes Wallin (韋嘉誠) f0fbed5690 racket{,-minimal}: add cacert to nativeBuildInputs, silence warnings
We don't actually perform any network access, but since Racket 7.0,
when certain modules are loaded, they emit an annoying warning.
While compiling the bundled packages, this happens over and over and
pollutes the logs.

Having a correct SSL configuration prevents the warnings.
2019-02-01 01:23:40 +08:00
Claes Wallin (韋嘉誠) e43a4fa9ce racket: add libGL and libGLU to libPath
The sgl collection loads them over FFI.

Closes #52990
2019-02-01 01:17:39 +08:00
Mario Rodas 46415c186c racket: 7.1 -> 7.2 (#54971) 2019-01-31 15:06:23 +00:00
Will Dietz d96dcb66fb lua-5 setup-hook: quiet noisy 'cd -' printing path repeatedly 2019-01-30 13:55:07 -06:00
Alyssa Ross f72d26d8dd
Merge pull request #53959 from ejpcmac/update-elixir_1_8
elixir_1_8: 1.8.0-rc.1 -> 1.8.1
2019-01-30 18:51:58 +00:00
Alyssa Ross 60e279e526
Merge pull request #54939 from alyssais/ruby-2.6.1
ruby_2_6: 2.6.0 -> 2.6.1
2019-01-30 18:07:37 +00:00
Jean-Philippe Cugnet 2407326fd9
elixir_1_8: 1.8.0-rc.1 -> 1.8.1 2019-01-30 18:40:24 +01:00
Matthieu Coudron c4519cf8a6 lua: add withPackages function (#54460)
* lua: add withPackages function

First step towards more automation similar to the haskell backend.
Follow up of https://github.com/NixOS/nixpkgs/pull/33903
2019-01-30 14:13:15 +00:00
Alyssa Ross b89c3b952a
ruby_2_6: 2.6.0 -> 2.6.1 2019-01-30 13:47:28 +00:00
Graham Christensen 18993b3dd1
elixir: remember where a package is defined
A bunch of human-facing things around Nixpkgs depend on knowing where
a package was defined. This PR makes it so ofborg can ping elixir
maintainers.
2019-01-29 12:32:55 -05:00
Nathan van Doorn 28097a54f1 metamath: 0.171 -> 0.172 2019-01-29 10:58:21 +00:00
Matthew Bauer 92f0f8dd68 Merge remote-tracking branch 'NixOS/master' into staging 2019-01-27 00:01:13 -05:00
Jörg Thalheim b5c1deca8a
treewide: remove wkennington as maintainer
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
2019-01-26 10:05:32 +00:00
Vladimír Čunát 3fe32b675e
Merge branch 'master' into staging 2019-01-22 15:59:42 +01:00
Mario Rodas ac1ef106c1
racket: fix gappsWrapperArgs
Otherwise LD_LIBRARY_PATH is unset
2019-01-20 18:56:14 -05:00
Frederik Rietdijk ca2edf79f7 Merge master into staging-next 2019-01-20 18:22:17 +01:00
Dmitry Kalinkin 531bba6182 mujs: enable on darwin 2019-01-19 18:40:06 -05:00
Frederik Rietdijk d531da6f8a
Merge pull request #54094 from rnhmjoj/shell
treewide: use ${stdenv.shell} instead of /bin/sh where possible
2019-01-19 14:15:51 +01:00
adisbladis c0fcae159c
mujs: 2017-01-24 -> 1.0.5 2019-01-19 12:56:01 +00:00
Frederik Rietdijk f8b45e2d84 Merge staging-next into staging 2019-01-19 09:24:01 +01:00
Jörg Thalheim 3ba707d228
Merge pull request #54163 from Mic92/racket
racket: fix drracket crashes on file dialogs
2019-01-18 07:48:48 +00:00
Jan Tojnar af3758e0b5
Merge branch 'master' into staging 2019-01-17 21:49:16 +01:00
Jean-Philippe Cugnet 6750dd66f9
erlangR21: 21.2 -> 21.2.3 2019-01-17 10:50:41 +01:00
Jörg Thalheim 4f9e46af5d
racket: fix drracket crashes on file dialogs 2019-01-17 08:58:34 +00:00
Frederik Rietdijk 9cfae76fc5 Merge staging-next into staging 2019-01-17 09:21:29 +01:00
rnhmjoj bcf54ce5bb
treewide: use ${stdenv.shell} instead of /bin/sh where possible 2019-01-16 20:37:15 +01:00
Anders Kaseorg 004b908ae6 pypy, pypy3: Remove wrapper
The wrapper is not needed because the runpath is already set correctly,
and LD_LIBRARY_PATH was breaking child processes linked against
different libc versions.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2019-01-16 08:36:47 +01:00
Anders Kaseorg 6282071229 pypy: Correct Python version in meta description
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2019-01-16 08:15:50 +01:00
Jörg Thalheim 8c3e66e28a
Merge pull request #53992 from fgaz/dead-links/1
Fix some dead links
2019-01-15 19:47:36 +00:00
Francesco Gazzetta 81e8923186 duktape: update meta urls 2019-01-15 17:18:14 +01:00
Frederik Rietdijk 42d276c6b8 Merge staging-next into staging 2019-01-15 16:59:03 +01:00
Frederik Rietdijk c5d99308de buildPython*: fix nativeBuildInputs 2019-01-15 10:16:11 +01:00
xeji 39af949542
Merge pull request #53778 from etu/php-upgrades
php71: 7.1.25 -> 7.1.26, php72: 7.2.13 -> 7.2.14
2019-01-13 21:42:10 +01:00
Vladimír Čunát bde8efe792
Merge branch 'master' into staging-next
A couple thousand rebuilds have accumulated on master.
2019-01-12 12:19:34 +01:00
Jörg Thalheim efe523725e
Merge pull request #53718 from jlesquembre/clojure
clojure: 1.10.0.403 -> 1.10.0.411
2019-01-11 12:05:09 +00:00
Danylo Hlynskyi 0f69eb3e5b
Merge pull request #53614 from ebzzry/tinyscheme-1.41
tinyscheme: init at 1.41
2019-01-11 02:41:16 +02:00
Elis Hirwing 49538f6b3a
php71: 7.1.25 -> 7.1.26
Changelog: http://php.net/ChangeLog-7.php#7.1.26
2019-01-10 21:23:01 +01:00
Elis Hirwing ab341a18ad
php72: 7.2.13 -> 7.2.14
Changelog: http://php.net/ChangeLog-7.php#7.2.14
2019-01-10 21:22:54 +01:00
Robin Gloster 0af5ce1c8b
php73: 7.3.0 -> 7.3.1 2019-01-10 17:43:14 +01:00
Vladimír Čunát 287144e342
Merge branch 'master' into staging-next 2019-01-10 13:07:21 +01:00
José Luis Lafuente e82f51cded
clojure: 1.10.0.403 -> 1.10.0.411 2019-01-09 23:38:57 +01:00
Rommel MARTINEZ a2db494f6c tinyscheme: init at 1.41 2019-01-08 09:07:02 +08:00
Nathan van Doorn 3a096b4616 metamath: 0.168 -> 0.171 2019-01-07 18:38:22 +00:00
Vladimír Čunát 10a12194e3
Merge #53490: fix treewide linking errors after #51770
Issue #53001.  This might not be all of them, but let's not wait.
2019-01-06 12:14:52 +01:00
Frederik Rietdijk a4250d1478 Merge staging-next into staging 2019-01-06 09:48:31 +01:00
Vladimír Čunát d84a33d85b
Merge branch 'master' into staging-next
A few more rebuilds (~1k on x86_64-linux).
2019-01-05 15:02:04 +01:00
Jörg Thalheim 8832292ace
Merge pull request #52932 from ejpcmac/init-elixir_1_8
elixir_1_8: init at 1.8.0-rc.1
2019-01-05 12:59:33 +01:00
Jean-Philippe Cugnet 5cefef0d12
elixir_1_3: Remove since it is not supported anymore 2019-01-05 12:34:49 +01:00
Frederik Rietdijk 60a3973a55 Merge staging-next into staging 2019-01-05 10:15:00 +01:00
Piotr Bogdan 8bc5a019e8 pure: link with libLLVMJIT explicitly 2019-01-04 21:44:21 +00:00
Piotr Bogdan 46fad2b3b8 gtk-server: link with libdl explicitly 2019-01-04 21:44:19 +00:00
Frederik Rietdijk 9618abe87c Merge master into staging-next 2019-01-04 21:13:19 +01:00
Lengyel Balazs f4a53ff3bc treewide/xorg: replace *proto with xorgproto 2019-01-04 14:38:57 +01:00
Frederik Rietdijk 63bcd07888 python: add isPy2 attribute to passthru
Some packages relied on it. For consistency, also introduce isPy3 (which
is the same as isPy3k).
2019-01-04 12:31:42 +01:00
Frederik Rietdijk d91b496eac pythonInterpreters.pypy{27,35}_prebuilt: init at 6.0.0
These interpreters are prebuilt by upstream and patched using patchelf.
They are primarily added for testing purposes and development on the
non-prebuilt PyPy interpreters as it can speed up translation
significantly.
2019-01-04 10:45:22 +01:00
Frederik Rietdijk 0a2caa41fe Python: drop python.majorVersion
Drop `python.majorVersion`. For Python language version, use `python.pythonVersion`.
For implementation version, use `python.sourceVersion`.

Some expressions were broken. Those that were identified were fixed.

fixup major
2019-01-04 10:45:22 +01:00
Frederik Rietdijk f665828fa3 Python: improve cross-compilation
This changeset allows for cross-compilation of Python packages. Packages
built with buildPythonPackage are not allowed to refer to the build
machine. Executables that have shebangs will refer to the host.
2019-01-04 10:45:22 +01:00
Frederik Rietdijk 613498af97 pypy: merge 2.7 and 3.5 into a single expression
This commit merges the two expressions in a single one, using
the passthru function that is shared with CPython.
2019-01-04 10:45:22 +01:00
Frederik Rietdijk efbe87f3ef CPython: merge expressions of interpreters
Each time a new major/minor version of CPython was released, a new
expression would be written, typically copied from the previous release.
Often fixes are only made in the current/latest release. By merging the
expressions it's more likely that modifications end up in all versions,
as is likely intended.

This commit introduces one expression for Python 3, and another for 2.7.
These two may also be merged, but it will result in a lot of extra
conditionals making the expression harder to follow.

A common passthru is introduced for CPython and PyPy.

python 2.7: use common passthru
2019-01-04 10:45:22 +01:00
Michael Raskin d366e13b8d
Merge pull request #53383 from r-ryantm/auto-update/angelscript
angelscript: 2.32.0 -> 2.33.0
2019-01-04 06:09:26 +00:00
R. RyanTM f985ffd06a angelscript: 2.32.0 -> 2.33.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/angelscript/versions
2019-01-03 20:54:24 -08:00
R. RyanTM 39c376b6f5 groovy: 2.5.4 -> 2.5.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/groovy/versions
2019-01-03 09:52:39 -08:00
Jean-Philippe Cugnet 4345715025
elixir_1_8: init at 1.8.0-rc.1 2019-01-03 06:23:34 +01:00
Frederik Rietdijk 092e3b50a8 Merge master into staging-next 2019-01-02 21:08:27 +01:00
Vladimír Čunát 70bff06140
Merge branch 'master' into staging 2019-01-02 17:19:23 +01:00
Franz Pletz 47587f5d31
python37: fix cross build 2019-01-01 23:00:56 +01:00
volth 098d919425 perldevel: 5.29.4 -> 5.29.6 (#52510) 2019-01-01 19:08:44 +01:00
Frederik Rietdijk 070290bda7 Merge master into staging-next 2018-12-31 12:00:36 +01:00
Joaquim Pedro França Simão 3e69bdcc94
picoLisp 16.12 -> 18.12
{ stdenv, fetchurl, jdk, makeWrapper }:
with stdenv.lib;

stdenv.mkDerivation rec {
  name = "picoLisp-${version}";
  version = "18.12";
  src = fetchurl {
    url = "https://www.software-lab.de/${name}.tgz";
    sha256 = "0hvgq2vc03bki528jqn95xmvv7mw8xx832spfczhxc16wwbrnrhk";
  };
  buildInputs = [makeWrapper] ++ optional stdenv.is64bit jdk;
  patchPhase = ''
    sed -i "s/which java/command -v java/g" mkAsm

    ${optionalString stdenv.isAarch32 ''
      sed -i s/-m32//g Makefile
      cat >>Makefile <<EOF
      ext.o: ext.c
        \$(CC) \$(CFLAGS) -fPIC -D_OS='"\$(OS)"' \$*.c
      ht.o: ht.c
        \$(CC) \$(CFLAGS) -fPIC -D_OS='"\$(OS)"' \$*.c
      EOF
    ''}
  '';
  sourceRoot = ''picoLisp/src${optionalString stdenv.is64bit "64"}'';
  installPhase = ''
    cd ..

    mkdir -p "$out/share/picolisp" "$out/lib" "$out/bin"
    cp -r . "$out/share/picolisp/build-dir"
    ln -s "$out/share/picolisp/build-dir" "$out/lib/picolisp"
    ln -s "$out/lib/picolisp/bin/picolisp" "$out/bin/picolisp"


    makeWrapper $out/bin/picolisp $out/bin/pil \
      --add-flags "$out/lib/picolisp/lib.l" \
      --add-flags "@lib/misc.l" \
      --add-flags "@lib/btree.l" \
      --add-flags "@lib/db.l" \
      --add-flags "@lib/pilog.l"

    mkdir -p "$out/share/emacs"
    ln -s "$out/lib/picolisp/lib/el" "$out/share/emacs/site-lisp"
  '';

  meta = {
    description = "A simple Lisp with an integrated database";
    homepage = https://picolisp.com/;
    license = licenses.mit;
    platforms = platforms.all;
    broken = stdenv.isDarwin; # times out
    maintainers = with maintainers; [ raskin tohl ];
  };

  passthru = {
    updateInfo = {
      downloadPage = "http://www.software-lab.de/down.html";
    };
  };
}
2018-12-28 11:30:57 -03:00