mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity
72510 commits 312 branches 124 tags 6.5 GiB
Commit graph

72510 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vladimír Čunát 333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01:00
William A. Kennington III b809f886c0 libinput: 1.0.1 -> 1.1.1 2015-11-17 21:11:53 -08:00
William A. Kennington III 6e9f0df8bd gtk: 3.18.4 -> 3.18.5 2015-11-17 21:11:53 -08:00
aszlig 96648a8526
bzip2: Get rid of the custom builder.sh. 
Everything the builder.sh did can be done with the generic builder which
makes it easier to override attributes and also easier to read.

The reason I've done this is because of #10820, which tries to override
the preBuild hook, but the latter is hardcoded in the builder.sh of
bzip2.

I have compared the output of this against the previous version and the
only things that were different were timestamps in libbz2.a.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-11-17 16:25:56 +01:00
Vladimír Čunát cc86857601 libpng: security and maintenance 1.6.18 -> 1.6.19 
Fixes #11030, CVE-2015-{7981,8126}.
 2015-11-16 08:12:08 +01:00
Domen Kožar b666ac3e9f Revert "python: skip build at install phase" 
This reverts commit d34f5b6570.

PIL and NumPy don't like this change and I'd rather spend time on
bringing wheels to Nix than fixing old infrastructure.
 2015-11-15 13:50:04 +01:00
Domen Kožar 5a16c0e6e4 buildPythonPackage: clean up shellHook 2015-11-15 13:50:04 +01:00
William A. Kennington III 453f7c7218 Merge branch 'master.upstream' into staging.upstream 2015-11-14 12:39:32 -08:00
William A. Kennington III 6e18a33183 syslinux: 6.03 -> 2015-11-09 2015-11-14 12:38:56 -08:00
William A. Kennington III 4ead61ca39 Merge remote-tracking branch 'upstream/master' into master.upstream 2015-11-14 12:33:53 -08:00
William A. Kennington III 6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06"" 
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
 2015-11-14 12:32:51 -08:00
Luca Bruno fb864b8898 pommed: mark as broken, src hash changed 
cc @shlevy
 2015-11-14 18:57:51 +01:00
Domen Kožar fc8562c785 udisks: add missing libgudev 2015-11-14 16:50:23 +01:00
Domen Kožar b87dad2839 cheese: libgudev 2015-11-14 16:50:23 +01:00
Domen Kožar 5e21f4e20b fix cython build 2015-11-14 16:50:23 +01:00
Domen Kožar 15913feb97 networkmanager098: add libgudev 2015-11-14 16:50:23 +01:00
Guillaume Maudoux 60ba5ad479 lighttpd: fix mod_rewrite appearing twice 2015-11-14 15:52:25 +01:00
William A. Kennington III e4feccce81 lightdm: 1.16.3 -> 1.16.5 2015-11-14 02:28:06 -08:00
Damien Cassou 971b90e98d Merge pull request #11015 from DamienCassou/elisp-ffi-1.0.0 
elisp-ffi: git-20141103 → 1.0.0
 2015-11-13 22:33:36 -03:00
William A. Kennington III 050bebb8c4 cmake: 3.3.2 -> 3.4.0 2015-11-13 15:55:44 -08:00
William A. Kennington III cdf65ba19e gtk3: 3.18.3 -> 3.18.4 2015-11-13 15:55:33 -08:00
William A. Kennington III 8f45d18a71 Merge branch 'master.upstream' into staging.upstream 2015-11-13 15:54:10 -08:00
William A. Kennington III 9579c9ec7f Merge commit 'cb21b77' into master.upstream 
This is a partial merge of staging for builds which are working
 2015-11-13 15:53:10 -08:00
Damien Cassou 195246c316 elisp-ffi: git-20141103 → 1.0.0 2015-11-13 20:08:42 -03:00
Domen Kožar 83aeb00a78 Merge pull request #11010 from FRidh/bcrypt 
python bcrypt: 1.0.2 -> 2.0.0
 2015-11-13 23:18:47 +01:00
Arseniy Seroka 0125adc392 Merge pull request #10999 from noctuid/zscroll 
zscroll: init at 1.0
 2015-11-14 00:55:48 +03:00
Tobias Geerinckx-Rice a2f98ef4ac clipgrab 3.5.2 -> 3.5.4 2015-11-13 22:06:10 +01:00
noctuid b0fd85342b zscroll: init at 1.0 2015-11-13 14:58:19 -05:00
Peter Simons 67271da8cb Merge pull request #11011 from ikervagyok/xmonad 
fix: ihaskell's and xmonad's dependence on haskell-ng
 2015-11-13 20:37:07 +01:00
William A. Kennington III 64f31fbc35 xf86-video-intel: 2015-11-10 -> 2015-11-13 2015-11-13 10:37:27 -08:00
Lengyel Balázs 162542bf8f fix: ihaskell's and xmonad's dependence on haskell-ng 2015-11-13 19:14:40 +01:00
Frederik Rietdijk 31563a291c python bcrypt: 1.0.2 -> 2.0.0 2015-11-13 17:05:28 +01:00
Arseniy Seroka 3087ef37bb Merge pull request #10807 from joachifm/fix-hyperdex-hashes 
hyperdex: blindly fix hashes of local dependencies
 2015-11-13 17:48:08 +03:00
Arseniy Seroka 83ce6db83b Merge pull request #10771 from demin-dmitriy/pulseaudio-panel-plugin 
xfce4-pulseaudio-plugin: init at 0.2.3
 2015-11-13 17:47:00 +03:00
Arseniy Seroka f7bd63dc77 Merge pull request #10977 from sjourdois/ffmpeg 
darwin: ffmpeg-full and deps: darwin fixes
 2015-11-13 17:43:54 +03:00
Arseniy Seroka bb70d1928d Merge pull request #10974 from datakurre/datakurre-numba 
darwin: numba: fix build on darwin
 2015-11-13 17:43:23 +03:00
Arseniy Seroka 2d478090b5 Merge pull request #10972 from matthiasbeyer/update-dwm 
dwm: 6.0 -> 6.1
 2015-11-13 17:43:06 +03:00
Arseniy Seroka 7ee9959984 Merge pull request #10990 from rnhmjoj/imv 
imv: init at 1.0.0
 2015-11-13 17:41:42 +03:00
Arseniy Seroka 6221526b13 Merge pull request #10992 from oxij/package-macopix 
macopix: init at 1.7.4
 2015-11-13 17:40:37 +03:00
Arseniy Seroka 9dd3e5fd3f Merge pull request #10993 from oxij/nixos-actkbd-tinyfix 
[trivial] nixos: add actkbd package to environment in actkbd module
 2015-11-13 17:39:44 +03:00
Arseniy Seroka 9ea4e30327 Merge pull request #10994 from oxij/sdl-pulseaudio 
SDL: better pulseaudioSupport logic
 2015-11-13 17:39:30 +03:00
Arseniy Seroka 6a192b4e98 Merge pull request #10997 from oxij/emacs-packages-metas 
emacs-packages: fix metas, add descriptions, split git-rebase from magit
 2015-11-13 17:38:57 +03:00
Arseniy Seroka 653143b4b1 Merge pull request #11006 from Lassulus/master 
bitlbee-steam: init at 2015-09-10
 2015-11-13 17:37:06 +03:00
Arseniy Seroka f0630abb0d Merge pull request #11008 from makefu/snapraid_init_master 
snapraid: init at 8.1
 2015-11-13 17:36:28 +03:00
Tobias Geerinckx-Rice 519d18b063 libpsl: list 2015-10-11 -> 2015-11-12 2015-11-13 15:07:34 +01:00
makefu a824242830 snapraid: init at 8.1 2015-11-13 15:06:22 +01:00
lassulus 4803b2f31a bitlbee-steam: init at 2015-09-10 2015-11-13 14:37:41 +01:00
Damien Cassou 5c6725b7e3 Merge pull request #10984 from DamienCassou/elisp-ffi 
elisp-ffi: init at git 2014-11-03
 2015-11-13 10:25:50 -03:00
Nikolay Amiantov f4ec8c9dc7 pcsctools: 1.4.23 -> 1.4.25 2015-11-13 15:28:45 +03:00
Nikolay Amiantov 8286d0ba05 pcscperl: init at 1.4.13 2015-11-13 15:28:41 +03:00