1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 06:01:15 +00:00
Commit graph

119866 commits

Author SHA1 Message Date
Maximilian Bosch 161e80e3fd
treewide: get rid of invalid buildPhases argument
I don't know where this comes from (I accidentally did that as well
once), but some derivations seem to use `buildPhases` rather than
`phases` in their derivations.

This kills all improper usages as the lack of a `phases` argument
didn't break the build, so this can be safely removed.
2017-11-08 21:38:06 +01:00
Michael Raskin 27f7999280 glucose, glucose-syrup: 4.0 -> 4.1 2017-11-08 09:55:29 +01:00
Orivej Desh 2aeb612326
Merge pull request #31385 from dtzWill/update/gnuplot-5.2.1
gnuplot: 5.2.0 -> 5.2.1
2017-11-08 08:07:04 +00:00
Bjørn Forsman 6c7c3beea3 keepassxc: rename from keepassx-community
I think the new name is more appropriate, see https://keepassxc.org/.
2017-11-08 08:48:54 +01:00
Will Dietz 7390087b78 gnuplot: 5.2.0 -> 5.2.1 2017-11-08 01:48:40 -06:00
aszlig b9b5942e2b
uqm: Remove the -lgcc_s hack
This is no longer needed and I've verified this by building and running
the game.

Signed-off-by: aszlig <aszlig@nix.build>
2017-11-08 06:48:57 +01:00
aszlig 7603da33de
uqm: Fix build against glibc 2.26
I've bisected the introduction of the build failure to be the glibc 2.26
upgrade with commit 9bb67d5c1e.

At first I was somewhat stumped why an glibc update could cause
undeclared identifiers, but after looking at the changes of glibc and
the source code of The Ur-Quan Masters the problem quickly turned out to
be this very change:

https://sourceware.org/git/?p=glibc.git;a=commit;h=7b037c095e31c2396d0a9b0e6356bc566ee4812f

So string.h now in turn includes strings.h, which in theory wouldn't be
a problem.

However, both strings.h and the strings.h in the uqm source code use
constant _STRINGS_H, which causes the glibc strings.h to be included but
the one from uqm basically includes an empty file.

Signed-off-by: aszlig <aszlig@nix.build>
2017-11-08 06:48:15 +01:00
aszlig 3429d8cbbf
uqm: Clean up package expression style
The only functional change here is that I've dropped unzip, because that
dependency doesn't seem to be necessary at all. Despite the broken build
state I've tried building and running The Ur-Quan Masters with an older
nixpkgs revision and it works fine.

Other than that there are no references in the source code for unzip
except in the binary installer and some of the INSTALL files.

The reason why I'm removing the "with pkgs.lib;" is that it makes it
easier to quickly check for errors with "nix-instantiate --parse".

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @jcumming
2017-11-08 05:55:35 +01:00
Orivej Desh 6b1161ebc0
Merge pull request #31302 from adisbladis/emacsPackages.font-lock-plus
emacsPackages.font-lock-plus: init at 20170222.1755
2017-11-08 02:51:03 +00:00
Peter Hoeg 0f68e1328b syncthing: 0.14.39 -> 0.14.40 2017-11-08 10:42:57 +08:00
Joachim Fasting cd722e1678
surf: use https 2017-11-08 01:04:13 +01:00
Renaud 792dc7a859
Merge pull request #31252 from shaunren/compton
compton: change extraOptions type to types.lines
2017-11-07 23:10:41 +01:00
Daiderd Jordan 80ae60a34b
Merge pull request #31348 from Tehnix/master
PHP: Specify CXXFLAGS for macOS, fixes #31059
2017-11-07 22:27:57 +01:00
Christian Kjær 233a0b3f36
php: specify CXXFLAGS for macOS
Fixes #31059
2017-11-07 22:20:17 +01:00
Orivej Desh 6fb8bac12f
Merge pull request #31341 from orivej/rednotebook
Restore and update RedNotebook
2017-11-07 21:17:53 +00:00
Robert Helgesson c638dacf4b
eclipse-plugin-bytecode-outline: 2.4.3 -> 2.5.0 2017-11-07 22:00:55 +01:00
Orivej Desh 67b4e7a4c0
Merge pull request #31373 from kamilchm/pony-stable
pony-stable: 0.0.1 -> 0.1.1
2017-11-07 20:34:02 +00:00
Tuomas Tynkkynen 0364cf6620 rpcbind: Fix build with libnsl 2017-11-07 21:34:51 +02:00
Kamil Chmielewski 653624061c pony-stable: 0.0.1 -> 0.1.1 2017-11-07 20:21:55 +01:00
Jörg Thalheim 15e42939cc
Merge pull request #31361 from yegortimoshenko/lmms/1.2.0-rc4
lmms: 1.1.90 -> 1.2.0-rc4, Qt5, optional lame, libsoundio, portaudio
2017-11-07 19:03:49 +00:00
Jörg Thalheim 82e0fabbe2
Merge pull request #31285 from volth/patch-70
opera:	46.0.2597.39	->	48.0.2685.52
2017-11-07 19:02:11 +00:00
Tuomas Tynkkynen 34f3ef2c4d tcp_wrappers: Use libnsl to fix build after new glibc
https://hydra.nixos.org/build/63759192

https://sourceware.org/ml/libc-alpha/2017-02/msg00478.html
2017-11-07 20:38:41 +02:00
Tuomas Tynkkynen 3b9fbfc162 libnsl: init at 1.1.0
This code was formerly part of glibc, but is now standalone to
be able to link against TI-RPC for IPv6 support.
2017-11-07 20:38:11 +02:00
Jörg Thalheim 9356b8823a
Merge pull request #31370 from schwepp/update/mpw-2.6
mpw: 2.1 -> 2.6
2017-11-07 18:26:17 +00:00
Jörg Thalheim 27d8370743
Merge pull request #31366 from ravloony/procodile
procodile: init at 1.0.17
2017-11-07 18:21:11 +00:00
Samuel Leathers 3641da1ef1
Merge pull request #31114 from jraygauthier/jrg/python_selenium_update
selenium: 2.52.0 -> 3.6.0
2017-11-07 13:17:02 -05:00
Jörg Thalheim 6c27c7e695
Merge pull request #30839 from clefru/python-trezor-fix-master
python-trezor: Move mnemonic dependency to propagatedBuildInputs
2017-11-07 18:12:51 +00:00
Kilian Schweppe 3f3ac8829f mpw: 2.1 -> 2.6 2017-11-07 19:12:48 +01:00
Jörg Thalheim febf9e191e
Merge branch 'master' into python-trezor-fix-master 2017-11-07 18:06:28 +00:00
Joerg Thalheim 05f9a36612 python.pkgs.libagent: enable tests 2017-11-07 18:03:13 +00:00
Joerg Thalheim 8ad6b2e862 python.pkgs.keepkey: 0.7.3 -> 4.0.0 2017-11-07 17:59:24 +00:00
Vladimír Čunát 7e571b9a99
mesos: fixup includes with glibc-2.26 2017-11-07 18:55:12 +01:00
Jörg Thalheim efc46c2836
Merge pull request #28782 from jraygauthier/jrg/vscode_cpptools_init
vscode-extension-ms-vscode-cpptools: Init at 0.12.3
2017-11-07 17:37:09 +00:00
Jörg Thalheim 2e4282d968
Merge pull request #30501 from gnidorah/mailnag
mailnag: use setup.py
2017-11-07 17:31:31 +00:00
Tim Steinbach 45108b47d5
Merge pull request #31368 from NixOS/revert-31354-mathcomp.1.6.4
Revert "coqPackages.{ssreflect,mathcomp}: 1.6.1 -> 1.6.4"
2017-11-07 17:16:33 +00:00
Tim Steinbach 198fd526ca
Revert "coqPackages.{ssreflect,mathcomp}: 1.6.1 -> 1.6.4" 2017-11-07 17:15:09 +00:00
Tim Steinbach cbd458a1b1
Merge pull request #31365 from andir/fix-cvs-CVE-2017-12836
cvs: fix CVE-2017-12836
2017-11-07 17:12:15 +00:00
Tom Macdonald 7b8e40c6b1 procodile: init at 1.0.17 2017-11-07 17:04:50 +01:00
Tim Steinbach 5b84cdfd3c
Merge pull request #31362 from earldouglas/jenkins-2.88
jenkins: 2.87 -> 2.88
2017-11-07 16:02:29 +00:00
Andreas Rammhold d0c8c66068
cvs: fix CVE-2017-12836
This patch is based on the work of the patch from Thorsten Glaser (MirBSD) [1]

[1] http://www.mirbsd.org/cvs.cgi/src/gnu/usr.bin/cvs/src/rsh-client.c.diff?r1=1.6;r2=1.7
2017-11-07 17:01:45 +01:00
Vladimír Čunát 0f8c85d5d0
strongswan: fixup includes with glibc-2.26 2017-11-07 16:40:12 +01:00
Vladimír Čunát 6ffafc78fb
Merge branch 'staging'
Main change: glibc: 2.25-x -> 2.26-y, containing security fixes,
and various features and deprecations.  Unfortunately, some of the
latter still cause (transitively) a couple hundred newly failing jobs.
I'm not delaying anymore, so that we have the security fix on master.
I mainly patched gcc, llvm and icu, but I can't fix everything...
2017-11-07 16:00:35 +01:00
James Earl Douglas 0e5014def9
jenkins: add earldouglas as a maintainer 2017-11-07 07:56:37 -07:00
James Earl Douglas c7e3555d8b
jenkins: 2.87 -> 2.88 2017-11-07 07:56:14 -07:00
Yegor Timoshenko 467b9b7a93 lmms: 1.1.90 -> 1.2.0-rc4, Qt5, optional lame, libsoundio, portaudio 2017-11-07 14:48:20 +00:00
Vladimír Čunát f04b64c1e9
gcc-4.5: fixup build with glibc-2.26
The older the GCC, the easier the backporting :-)
2017-11-07 15:39:24 +01:00
Vladimír Čunát d51f9b364e
checkpolicy: fixup includes with glibc-2.26 2017-11-07 15:27:53 +01:00
Tim Steinbach 4db6d35891
Merge pull request #31208 from afrepues/gitlab-10.1.1
gitlab: 10.0.2 -> 10.1.1
2017-11-07 14:26:27 +00:00
Vladimír Čunát 54c14e2fa3
gcc-4.8: fix with glibc-2.26 2017-11-07 14:53:10 +01:00
Thomas Tuegel 648205e320
Merge pull request #31287 from ttuegel/hplip
hplip: 3.17.9 -> 3.17.10
2017-11-07 07:41:01 -06:00