3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

55010 commits

Author SHA1 Message Date
Pascal Wittmann 389f745efb Merge pull request #5429 from joachifm/fix-attic-checksum
attic: fix sha256
2014-12-22 19:03:24 +01:00
Domen Kožar 7541cd1a9b Merge pull request #5438 from henrytill/dunst
dunst: allow user configuration (fixes #5222)
2014-12-22 18:30:38 +01:00
Henry Till 37fb8fb9ca dunst: allow user configuration (fixes #5222)
This commit eliminates a patch which hard-coded an example configuration file as the program's default settings and prevented the program from reading a user's configuration file.
2014-12-22 12:03:59 -05:00
Moritz Ulrich e93c528a01 openttd: Fix build with fix from upstream. 2014-12-22 17:29:30 +01:00
James Cook 656ae7a97c Merge branch 'jasper_vulnerabilities' 2014-12-22 08:17:52 -08:00
lethalman 74fbd2f676 Merge pull request #5436 from mcmtroffaes/feature/easytag-fix-gsettings
easytag: Fix "Using the 'memory' GSettings backend" (see issue  #4415).
2014-12-22 16:14:01 +01:00
lethalman 8b2f701fc0 Merge pull request #5435 from mcmtroffaes/feature/pavucontrol-fix-icons
pavucontrol: use gnome icons (fixes issue #5330).
2014-12-22 13:51:20 +01:00
Benno Fünfstück 914b76bad4 services.mpd: use systemd's user option
For some reason, mpd fails to open the sound card if using mpd's user
option. Starting mpd directly as the mpd user works for me.
2014-12-22 11:22:14 +00:00
Matthias C. M. Troffaes 6c9eb020ab easytag: Fix "Using the 'memory' GSettings backend" (see issue #4415). 2014-12-22 11:17:38 +00:00
Matthias C. M. Troffaes d1a2586077 pavucontrol: use gnome icons (fixes issue #5330). 2014-12-22 10:50:37 +00:00
Peter Simons a9d779aa5d wxmaxima: update to version 14.12.1 2014-12-22 11:20:59 +01:00
Peter Simons 0dd52aba89 maxima: update to version 5.35.1 2014-12-22 11:20:58 +01:00
lethalman d0fdad5f36 Merge pull request #5419 from ehmry/tox-bootstrapd
tox-bootstrapd
2014-12-22 11:16:44 +01:00
lethalman a80f7d7c96 Merge pull request #5434 from mcmtroffaes/feature/shotwell-gsettings-fix
shotwell: use gsettings dconf backend, use hicolor_icon_theme
2014-12-22 10:54:55 +01:00
Matthias C. M. Troffaes 29575e4901 Also install hicolor_icon_theme. 2014-12-22 09:36:20 +00:00
Matthias C. M. Troffaes 1aacda5490 shotwell: Fix "Using the 'memory' GSettings backend" (fix suggested by lethalman, see issue #5433). 2014-12-22 09:36:20 +00:00
lethalman 924b55c6a7 Merge pull request #5432 from mcmtroffaes/feature/shotwell-icons-fix
shotwell: uses icons from gnome3.gnome_icon_theme and gnome3.gnome_icon_theme_symbolic
2014-12-22 10:09:57 +01:00
Matthias C. M. Troffaes 59e22e8879 shotwell: uses icons from gnome3.gnome_icon_theme and gnome3.gnome_icon_theme_symbolic 2014-12-22 08:47:21 +00:00
Joachim Fasting bee4a4e5dc attic: fix sha256 2014-12-22 05:11:58 +01:00
Nicolas B. Pierron 6a7971bee7 Merge pull request #5416 from nbp/nixos-option-include
nixos-option: Support -I option
2014-12-21 15:11:11 -08:00
Nicolas B. Pierron e4fb4168fc Merge pull request #5415 from nbp/nixos-options-submodules
nixos-option: Handle submodules
2014-12-21 15:10:46 -08:00
James Cook 1b5c9c24de jasper: Patch for CVE-2014-8138 via RedHat. 2014-12-21 14:38:00 -08:00
James Cook 951ac10ae1 jasper: Patch for CVE-2014-8137 via RedHat. 2014-12-21 14:36:29 -08:00
James Cook 90162e7dbd jasper: Patch for CVE-2014-9029 via RedHat.
Also update homepage.
2014-12-21 14:26:53 -08:00
Michael Raskin 77436079e9 Pipelight: 0.2.7.3 → 0.2.8, also update Wine 2014-12-21 20:19:33 +03:00
lethalman 91061d287d Merge pull request #5401 from bergey/fonts
No need for squash, merged thanks.
2014-12-21 15:34:58 +01:00
Emery Hemingway 86213a1f23 transmission-remote-gtk: meta fixup (close #5420) 2014-12-21 10:35:24 +01:00
Michael Raskin ed19e6755f ZPAQ: 655 → 660 2014-12-21 11:14:26 +03:00
Michael Raskin 1317dd7e62 Wine: 1.7.30 → 1.7.33 2014-12-21 11:14:25 +03:00
Michael Raskin 641307f553 Drop wrong default.upstream 2014-12-21 11:14:25 +03:00
Michael Raskin 13fbe8150a GlusterFS; 3.6.0 → 3.6.1 2014-12-21 11:14:25 +03:00
Michael Raskin 90b05b8d0e Nginx-unstable: 1.7.7 → 1.7.8 2014-12-21 11:14:25 +03:00
Michael Raskin 32160007ff FreeIPMI: 1.4.6 → 1.4.7 2014-12-21 11:14:25 +03:00
Michael Raskin edadde69b1 sysdig: 0.1.91 → 0.1.93 2014-12-21 11:14:25 +03:00
Michael Raskin 5f451686cb xscreensaver: 5.30 → 5.32 2014-12-21 11:14:25 +03:00
Michael Raskin 16a4882d71 LVM2: 2.02.111 → 2.02.114 2014-12-21 11:14:25 +03:00
Michael Raskin 5997e7edfa Firejail: 0.9.16 → 0.9.18 2014-12-21 11:14:25 +03:00
Michael Raskin 4ee59d8ddf libre: 0.4.10 → 0.4.11 2014-12-21 11:14:24 +03:00
Michael Raskin 447ff811f7 atanks: 6.0 → 6.1 2014-12-21 11:14:24 +03:00
Michael Raskin 4847f44ffd sodium: 1.0.0 → 1.0.1 2014-12-21 11:14:24 +03:00
Michael Raskin ff7d027050 SlimerJS: 0.9.3 → 0.9.4 2014-12-21 11:14:24 +03:00
Michael Raskin ad0efe83ff afflib: 3.7.5 → 3.7.6 2014-12-21 11:14:24 +03:00
Michael Raskin f0a29cd6da eigen: 3.2.2 → 3.2.3 2014-12-21 11:14:24 +03:00
Michael Raskin 19dd1be06c compiz: 0.9.11.2 → 0.9.12.0 2014-12-21 11:14:24 +03:00
Michael Raskin adc28993a7 lib odfgen 0.1.1 → 0.1.2 2014-12-21 11:14:24 +03:00
Michael Raskin 67a97340eb qpdfview 0.4.12 → 0.4.13 2014-12-21 11:14:24 +03:00
Nicolas B. Pierron 91cc22e841 Merge pull request #5405 from nbp/nixos-options-derivation
nixos-option: Print the outPath of derivation for option values.
2014-12-20 16:51:49 -08:00
Nicolas B. Pierron c231506b5a Merge pull request #5362 from nbp/update-channels
Add a script to add git branches for each channel.

To create / update references to remote / local channels, you have to run `./maintainers/scripts/update-channel-branches.sh` while you are at the top-level of nixpkgs work directory.  To make this convenient for Nixpkgs / NixOS developer, one can run the following command:

```
$ git config --add alias.fetch-channels '!sh -c "$(git rev-parse --show-cdup)maintainers/scripts/update-channel-branches.sh"'
```

Which will register the alias fetch-channels such that the script can used from sub-directory of nixpkgs by running `git fetch-channels`.
2014-12-20 16:49:18 -08:00
Nicolas B. Pierron 974edc5056 nixos-option: Use <nixpkgs/nixos> instead of <nixpkgs>. 2014-12-21 01:33:06 +01:00
Emery Hemingway 01910e84f9 nixos: tox-bootstrapd service 2014-12-20 18:20:27 -05:00