about summary refs log tree commit diff
Commit message (Collapse)AuthorAge
* keepass: improvementsRaymond Gauthier2016-03-03
| | | | | | | | | | | | | | | | `*.desktop` file now: - Refers to an icon. - Is placed in the proper category (based on comparison with `keepassx2`. - Has proper mime type (also based on comparison). Also, now use `icoutils` to extract icons from the application ressouces and transform them from `*.ico` to `*.png`. Created and used a generic script that has the ability to move the extracted `*.png` to their appropriate standard freedesktop location. Tested this on nixos. `keepass` now has a icon and is categorized in the same bin as `keepassx2`. The program still execute and function prefectly.
* maintainers: add a maintainer to the setRaymond Gauthier2016-03-03
|
* azure-image: provide configuration.nix which allows nixos-rebuild to build a ↵Evgeny Egorochkin2016-03-03
| | | | working generation and add helpful comments
* filezilla: 3.15.0.2 -> 3.16.0Pascal Wittmann2016-03-02
|
* mcabber: 1.0.1 -> 1.0.2Pascal Wittmann2016-03-02
|
* Merge pull request #13600 from MtP76/masterTuomas Tynkkynen2016-03-02
|\ | | | | Enabling Media PCI adapters (needed for PCI DVB cards)
| * Enabling Media PCI adapters (needed for PCI DVB cards)Marko Poikonen2016-03-01
| |
* | Merge pull request #13548 from joelmo/nixos-unstablejoachifm2016-03-02
|\ \ | | | | | | avahi: fix test
| * | avahi: fix testJoel Moberg2016-02-28
| | | | | | | | | | | | Reflects module changes made by cdd7310a503481e3c40266be45b6b8256d95ecbd
* | | Merge pull request #11860 from nathan7/systemd-binfmtjoachifm2016-03-02
|\ \ \ | | | | | | | | systemd: copy systemd-binfmt.service in
| * | | systemd: enable upstream systemd-binfmt.serviceNathan Zadoks2016-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we don't restart sysinit.service in switch-to-configuration, this additionally overrides systemd-binfmt.service to depend on proc-sys-fs-binfmt_misc.automount, which is normally provided by sysinit.service.
* | | | Merge pull request #13541 from romildo/update.tint2joachifm2016-03-02
|\ \ \ \ | | | | | | | | | | tint2: 0.12 -> 0.12.7
| * | | | tint2: 0.12 -> 0.12.7José Romildo Malaquias2016-03-02
| | | | |
* | | | | cudatoolkit: Add version 7.5.18Eelco Dolstra2016-03-02
| | | | |
* | | | | cudatoolkit: Merge into one file and use callPackagesEelco Dolstra2016-03-02
| | | | |
* | | | | Merge pull request #11898 from aboseley/flex-cross-notestsPeter Simons2016-03-02
|\ \ \ \ \ | |_|/ / / |/| | | | flex: disable tests when cross compiling
| * | | | flex: disable tests when cross compilingAdam Boseley2015-12-23
| | | | | | | | | | | | | | | | | | | | | | | | | When cross compiling we can't run the test executables on the build machine
* | | | | Merge pull request #12996 from kragniz/#12106joachifm2016-03-02
|\ \ \ \ \ | | | | | | | | | | | | clutter: add gtk3 as a build input
| * | | | | clutter: add gtk3 as a build inputLouis Taylor2016-02-14
| | | | | | | | | | | | | | | | | | | | | | | | This fixes #12106.
* | | | | | Merge pull request #13565 from valeriangalliat/go2nixjoachifm2016-03-02
|\ \ \ \ \ \ | | | | | | | | | | | | | | go2nix: init at dd513f1
| * | | | | | go2nix: init at dd513f1Valérian Galliat2016-02-29
| | | | | | |
* | | | | | | Merge pull request #13572 from agbell/masterjoachifm2016-03-02
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | postgis 2.1.4 -> 2.2.1
| * | | | | | | Updating to postgis 2.2.1Adam Bell2016-02-26
| | | | | | | |
* | | | | | | | Merge pull request #13619 from anderslundstedt/transmissionumaskjoachifm2016-03-02
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Respect umask settings in Transmission config
| * | | | | | | Respect umask settings in Transmission configAnders Lundstedt2016-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In NixOS/nixpkgs@da6bc44 @thoughtpolice made the Transmission NixOS module override the umask setting in the Transmission config. This commit removes that override. I want a different umask setting and I guess it is possible that other people might want it to. Thus I think it is a good idea to respect the umask settings in the Transmission config.
* | | | | | | | Merge pull request #13580 from matthewbauer/openal-darwinvbgl2016-03-02
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | openal darwin fixes
| * | | | | | | | openal: fix darwin buildsMatthew Bauer2016-02-29
| | | | | | | | |
| * | | | | | | | openal: 1.16.0 -> 1.17.2Matthew Bauer2016-02-29
| | | | | | | | |
* | | | | | | | | Merge pull request #13621 from DamienCassou/add-gentium-book-basicvbgl2016-03-02
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | gentium-book-basic: init at 1.102
| * | | | | | | | | gentium-book-basic: init at 1.102Damien Cassou2016-03-02
| | | | | | | | | |
* | | | | | | | | | Merge pull request #13617 from cleverca22/multimc-masterDomen Kožar2016-03-02
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | multimc: fix building under chroot
| * | | | | | | | | | multimc: fix building under chrootmichael bishop2016-03-02
|/ / / / / / / / / /
* | | / / / / / / / Attempt to fix transient grub1 test kernel panicsDomen Kožar2016-03-02
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Example: http://hydra.nixos.org/build/32469819/nixlog/26/raw
* | | | | | | | | Merge pull request #13018 from tathougies/masterjoachifm2016-03-02
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Bump tint2 to 0.12
| * | | | | | | | | tints: 0.11 -> 0.12Travis Athougies2016-02-16
| | | | | | | | | |
* | | | | | | | | | remove lvm_33, fixes #12310Domen Kožar2016-03-02
| | | | | | | | | |
* | | | | | | | | | Remove unmaintained gnupdate scriptEelco Dolstra2016-03-02
| | | | | | | | | |
* | | | | | | | | | libreswan: specify that we don't support parallel buildingNikolay Amiantov2016-03-02
| | | | | | | | | |
* | | | | | | | | | Merge commit 'refs/pull/13412/head' of git://github.com/NixOS/nixpkgsNikolay Amiantov2016-03-02
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | libreswan: add package and service to nixosAlex Franchuk2016-03-02
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #13614 from artuuge/epson-escpr-1.6.4joachifm2016-03-02
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | epson-escpr: 1.6.3 -> 1.6.4
| * | | | | | | | | | | epson-escpr: 1.6.3 -> 1.6.4artuuge2016-03-02
| | | | | | | | | | | |
* | | | | | | | | | | | Revert "rubygems: 2.4.8 -> 2.5.2"Robin Gloster2016-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7e8faf022f343901301c912c5f0c7fa1d830a08d. This breaks the rake call in gitlab see https://github.com/NixOS/nixpkgs/pull/13468#issuecomment-191286066
* | | | | | | | | | | | Merge pull request #13613 from mbakke/dnscrypt-proxy-1.6.1joachifm2016-03-02
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | dnscrypt-proxy: 1.6.0 -> 1.6.1
| * | | | | | | | | | | | dnscrypt-proxy: 1.6.0 -> 1.6.1Marius Bakke2016-03-02
| | | | | | | | | | | | |
* | | | | | | | | | | | | Fix Emacs syntax highlighting in NixOS dovecot module.Peter Simons2016-03-02
| | | | | | | | | | | | |
* | | | | | | | | | | | | LWP::Protocol::https: Fix SSL cert handlingEelco Dolstra2016-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We lost this in 9f358f809d1db46f3206d4a09a5366f13c93e777. Updated to use /etc/ssl/certs/ca-certificates.crt if it exists and SSL_CERT_FILE is not set.
* | | | | | | | | | | | | perl-packages.nix: Remove unnecessary variable quotationsEelco Dolstra2016-03-02
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #13510 from lancelotsix/relocate_motu_clientFrederik Rietdijk2016-03-02
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | pkgs.motuclient: move application away from pythonPackages
| * | | | | | | | | | | | pkgs.motuclient: move application away from pythonPackagesLancelot SIX2016-03-02
| | | | | | | | | | | | |