about summary refs log tree commit diff
Commit message (Collapse)AuthorAge
* SmartOS: Fix w3m buildDanny Wilson2015-11-16
|
* Use the nix provided shell.Danny Wilson2015-11-16
| | | | | This is guaranteed to be bash, SmartOS has ksh by default and doesn't work.
* libpng: security and maintenance 1.6.18 -> 1.6.19Vladimír Čunát2015-11-16
| | | | Fixes #11030, CVE-2015-{7981,8126}.
* Revert "python: skip build at install phase"Domen Kožar2015-11-15
| | | | | | | This reverts commit d34f5b657051e268e41084e9751996d16f7f0a1a. PIL and NumPy don't like this change and I'd rather spend time on bringing wheels to Nix than fixing old infrastructure.
* buildPythonPackage: clean up shellHookDomen Kožar2015-11-15
|
* Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-11-14
|\
| * syslinux: 6.03 -> 2015-11-09William A. Kennington III2015-11-14
| |
| * Merge remote-tracking branch 'upstream/master' into master.upstreamWilliam A. Kennington III2015-11-14
| |\
| | * pommed: mark as broken, src hash changedLuca Bruno2015-11-14
| | | | | | | | | | | | cc @shlevy
| | * lighttpd: fix mod_rewrite appearing twiceGuillaume Maudoux2015-11-14
| | |
| * | Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""William A. Kennington III2015-11-14
| |/ | | | | | | | | | | This reverts commit 741bf840dad05cd1728481045466811ae8ae8281. This reverts the fallout from reverting the major changes.
| * lightdm: 1.16.3 -> 1.16.5William A. Kennington III2015-11-14
| |
| * Merge pull request #11015 from DamienCassou/elisp-ffi-1.0.0Damien Cassou2015-11-13
| |\ | | | | | | elisp-ffi: git-20141103 → 1.0.0
| | * elisp-ffi: git-20141103 → 1.0.0Damien Cassou2015-11-13
| | |
* | | udisks: add missing libgudevDomen Kožar2015-11-14
| | |
* | | cheese: libgudevDomen Kožar2015-11-14
| | |
* | | fix cython buildDomen Kožar2015-11-14
| | |
* | | networkmanager098: add libgudevDomen Kožar2015-11-14
| | |
* | | cmake: 3.3.2 -> 3.4.0William A. Kennington III2015-11-13
| | |
* | | gtk3: 3.18.3 -> 3.18.4William A. Kennington III2015-11-13
| | |
* | | Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-11-13
|\| |
| * | Merge commit 'cb21b77' into master.upstreamWilliam A. Kennington III2015-11-13
| |\ \ | | | | | | | | | | | | This is a partial merge of staging for builds which are working
| * \ \ Merge pull request #11010 from FRidh/bcryptDomen Kožar2015-11-13
| |\ \ \ | | | | | | | | | | python bcrypt: 1.0.2 -> 2.0.0
| | * | | python bcrypt: 1.0.2 -> 2.0.0Frederik Rietdijk2015-11-13
| | | | |
| * | | | Merge pull request #10999 from noctuid/zscrollArseniy Seroka2015-11-14
| |\ \ \ \ | | | | | | | | | | | | zscroll: init at 1.0
| | * | | | zscroll: init at 1.0noctuid2015-11-13
| | | | | |
| * | | | | clipgrab 3.5.2 -> 3.5.4Tobias Geerinckx-Rice2015-11-13
| | | | | |
| * | | | | Merge pull request #11011 from ikervagyok/xmonadPeter Simons2015-11-13
| |\ \ \ \ \ | | | | | | | | | | | | | | fix: ihaskell's and xmonad's dependence on haskell-ng
| | * | | | | fix: ihaskell's and xmonad's dependence on haskell-ngLengyel Balázs2015-11-13
| | | | | | |
| * | | | | | xf86-video-intel: 2015-11-10 -> 2015-11-13William A. Kennington III2015-11-13
| |/ / / / /
| * | | | | Merge pull request #10807 from joachifm/fix-hyperdex-hashesArseniy Seroka2015-11-13
| |\ \ \ \ \ | | | | | | | | | | | | | | hyperdex: blindly fix hashes of local dependencies
| | * | | | | hyperdex: blindly fix hashes of local dependenciesJoachim Fasting2015-11-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch blindly fixes the source archive checksums for the local dependencies of hyperdex. I have not looked into why those hashes changed, but I have verified that the hyperdex package now builds successfully.
| * | | | | | Merge pull request #10771 from demin-dmitriy/pulseaudio-panel-pluginArseniy Seroka2015-11-13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | xfce4-pulseaudio-plugin: init at 0.2.3
| | * | | | | | xfce4-pulseaudio-plugin: init at 0.2.3Demin Dmitriy2015-11-01
| | | | | | | |
| | * | | | | | libxfce4ui xfce4panel: add gtk3 supportDemin Dmitriy2015-11-01
| | | | | | | |
| * | | | | | | Merge pull request #10977 from sjourdois/ffmpegArseniy Seroka2015-11-13
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | darwin: ffmpeg-full and deps: darwin fixes
| | * | | | | | | darwin: ffmpeg-full: add some missing darwin depsStéphane Jourdois2015-11-11
| | | | | | | | |
| | * | | | | | | darwin: wavpack: add missing darwin depsStéphane Jourdois2015-11-11
| | | | | | | | |
| | * | | | | | | darwin: libsndfile: add missing darwin depsStéphane Jourdois2015-11-11
| | | | | | | | |
| | * | | | | | | darwin: libdc1394: add missing darwin depsStéphane Jourdois2015-11-11
| | | | | | | | |
| * | | | | | | | Merge pull request #10974 from datakurre/datakurre-numbaArseniy Seroka2015-11-13
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | darwin: numba: fix build on darwin
| | * | | | | | | | darwin: numba: fix buildAsko Soukka2015-11-11
| | | | | | | | | |
| * | | | | | | | | Merge pull request #10972 from matthiasbeyer/update-dwmArseniy Seroka2015-11-13
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | dwm: 6.0 -> 6.1
| | * | | | | | | | | dwm: 6.0 -> 6.1Matthias Beyer2015-11-12
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #10990 from rnhmjoj/imvArseniy Seroka2015-11-13
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | imv: init at 1.0.0
| | * | | | | | | | | | imv: init at 1.0.0rnhmjoj2015-11-12
| | | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #10992 from oxij/package-macopixArseniy Seroka2015-11-13
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | macopix: init at 1.7.4
| | * | | | | | | | | | | macopix: init at 1.7.4Jan Malakhovski2015-11-12
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #10993 from oxij/nixos-actkbd-tinyfixArseniy Seroka2015-11-13
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [trivial] nixos: add actkbd package to environment in actkbd module
| | * | | | | | | | | | | | nixos: add actkbd package to environment in actkbd moduleJan Malakhovski2015-11-12
| | |/ / / / / / / / / / /