jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
191,599 Commits 266 Branches 122 Tags 5.3 GiB
8ba94a8fe8
Commit Graph

3737 Commits

Author SHA1 Message Date
Sam Doshi
d3188e90a0 supercollider: Use qt5's own mkDerivation 2019-08-31 23:27:43 -04:00
Frederik Rietdijk
fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
zimbatm
80a3988150
remove empty nix file 
Nix repl hangs when evaluating empty files.

    find -name "*.nix" -empty -delete
 2019-08-31 00:00:29 +02:00
Maximilian Bosch
819696bb0c
evcxr: 0.4.3 -> 0.4.4 
https://github.com/google/evcxr/releases/tag/v0.4.4
 2019-08-29 01:51:25 +02:00
Frederik Rietdijk
98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
Marek Mahut
ee62ec62ec python2: CVE-2018-20852 
Fixes #67200

(cherry picked from commit 302cac35f586d0cc4813ae0cf5d124f1375deecf)
 2019-08-27 10:04:55 +02:00
Matthew Bauer
48d0e9401e cpython: skip macOS system frameworks 
We don’t want cpython picking up /Library/Frameworks and
/System/Library/Frameworks which contains Tcl.framework. Instead it
should use the one provided by Nix. this would not be an issue if
sandboxing was enabled, but unfortunately that has its own issues.

Fixes #66647
 2019-08-25 20:35:19 -04:00
Vladimír Čunát
985d1ac425
Merge branch 'master' into staging-next 
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
 2019-08-25 14:57:11 +02:00
Maximilian Bosch
62b75df413
evcxr: 0.3.3 -> 0.4.3 
The current version fails to build: https://hydra.nixos.org/build/99189245

Please note that the releases aren't tracked by Git, but the currently
used rev points to `0.4.3` at crates.io: https://crates.io/crates/evcxr/0.4.3
 2019-08-25 09:36:06 +02:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next 
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
 2019-08-24 08:55:37 +02:00
Robin Gloster
c7e75df21f
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-23 02:00:31 +02:00
Vika
ba83c08610 php: disable mhash 
Per https://www.php.net/manual/en/intro.mhash.php, mhash extension
is obsolete, so disabling it here. (Also it doesn't cross-compile)

**Warning**: This could be a breaking change for some packages that
are very old and rely on this extension, maintainer discretion is
advised.
 2019-08-21 20:37:06 +03:00
Florian Klink
65b1948be2
Merge pull request #66762 from adisbladis/python-minimal 
python3Minimal: Add top-level for a minimal Python 3 build
 2019-08-21 15:04:52 +02:00
adisbladis
99e6ca2bdc python3Minimal: Add top-level for a minimal Python 3 build 
This builds Python without optional dependencies.

We can't just use python3.override, as things like
python3Minimal.withPackages would pass the wrong python derivation into
these modules.
 2019-08-21 14:52:49 +02:00
Robin Gloster
f4fc845e5b
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-21 14:25:13 +02:00
Michael Raskin
d38d6aba1f
Merge pull request #66883 from kisik21/lua-cross-compile-fix 
lua: fix cross-compilation; fixes #66742
 2019-08-20 08:13:33 +00:00
Marek Mahut
2aedbd056a
Merge pull request #66920 from r-ryantm/auto-update/janet 
janet: 1.1.0 -> 1.2.0
 2019-08-19 20:38:29 +02:00
Marek Mahut
047f8d612b
Merge pull request #66904 from r-ryantm/auto-update/groovy 
groovy: 2.5.7 -> 2.5.8
 2019-08-19 19:22:38 +02:00
Marek Mahut
b1b3ea751a
Merge pull request #66913 from r-ryantm/auto-update/jruby 
jruby: 9.2.7.0 -> 9.2.8.0
 2019-08-19 19:19:48 +02:00
R. RyanTM
9c2088181a janet: 1.1.0 -> 1.2.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/janet/versions
 2019-08-19 06:37:04 -07:00
R. RyanTM
632c4b870d jruby: 9.2.7.0 -> 9.2.8.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-08-19 05:40:32 -07:00
R. RyanTM
6e718f1ab4 groovy: 2.5.7 -> 2.5.8 
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-08-19 04:29:43 -07:00
Vika
68847aeef4 lua: fix cross-compilation; fixes #66742 
The makefile isn't able to find the toolchain when cross-compiling. I
helped it a little bit by adding the parameters explicitly.
 2019-08-19 12:04:26 +03:00
worldofpeace
62f8fd7513
Merge pull request #66418 from jlesquembre/clj 
clojure: 1.10.1.466 -> 1.10.1.469
 2019-08-18 22:58:26 -04:00
Florian Klink
100eae3b77 python: allow stripping tkinter 2019-08-19 00:11:17 +02:00
Florian Klink
db087f226d python: allow stripping bytecode 2019-08-18 23:47:44 +02:00
Florian Klink
52fcbbff44 python: make rebuilding bytecode optional 2019-08-18 23:47:44 +02:00
Florian Klink
8335f3dd5c python: allow stripping config 2019-08-18 23:47:43 +02:00
Florian Klink
d03283c029 python: allow stripping tests 2019-08-18 23:47:30 +02:00
Florian Klink
414cde4df4 python: allow stripping IDLE 2019-08-18 23:47:16 +02:00
Frederik Rietdijk
f65aa21bb2 Merge master into staging-next 2019-08-18 12:53:44 +02:00
adisbladis
5c0d493df4
python: Enable building without openssl 2019-08-18 08:18:58 +01:00
Frederik Rietdijk
295888c622
Merge pull request #66381 from NixOS/staging-next 
Staging next
 2019-08-18 08:54:45 +02:00
Frederik Rietdijk
113dbfeb27
Merge pull request #66596 from emilazy/update-pypy-and-eda-tools 
Update PyPy and FOSS EDA tools
 2019-08-17 17:48:21 +02:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Frederik Rietdijk
fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00
Frederik Rietdijk
c68f58d95c Merge master into staging-next 2019-08-17 09:30:16 +02:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585) 
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
 2019-08-15 13:41:18 +01:00
Lily Ballard
63259057a8 erlang: Fix build error on darwin 
Stop hardcoding 10.10 as the platform when building. Instead we'll use
$MACOSX_DEPLOYMENT_TARGET so erlang doesn't have to be updated again the
next time that's changed.
 2019-08-14 15:56:29 -07:00
Matthew Bauer
81bddd62ca
Merge pull request #62953 from asymmetric/wasmtime-update 
wasmtime: 0.1.0 -> 20190521
 2019-08-14 10:26:54 -04:00
Frederik Rietdijk
8d56f2472e Merge master into staging-next 2019-08-14 13:45:54 +02:00
Emily
ec07b882b3 pypy{2,27,3,35 -> 36}: 7.0.0 -> 7.1.1 2019-08-13 16:49:27 -07:00
Emily
5638dd55e3 pythonInterpreters.pypy{27,35 -> 36}_prebuilt: 6.0.0 -> 7.1.1 2019-08-13 16:49:27 -07:00
Jörg Thalheim
108c57b141
Merge pull request #53734 from yurrriq/update/noweb 
Update noweb (and icon-lang)
 2019-08-13 13:37:08 +01:00
Vladimír Čunát
387e6952d3
Merge #65846: Update php packages 2019-08-10 14:42:37 +02:00
José Luis Lafuente
8c223b58cf
clojure: 1.10.1.466 -> 1.10.1.469 2019-08-10 07:20:54 +02:00
Aaron Andersen
c4ac0a84ba
Merge pull request #66188 from volth/perl-531 
perldevel: 5.30.0 -> 5.31.2
 2019-08-09 16:24:24 -04:00
Frederik Rietdijk
9bd78cb048 Merge master into staging-next 2019-08-09 14:00:27 +02:00
Eric Bailey
31d1ce7e64 icon-lang: rework to support darwin and building without graphics 2019-08-07 14:09:15 -05:00
Ryan Mulligan
e275a6c2f3
Merge pull request #64037 from r-ryantm/auto-update/gnu-apl 
gnuapl: 1.7 -> 1.8
 2019-08-06 21:53:34 -07:00