Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into staging | Vladimír Čunát | 2017-01-18 |
|\ | |||
| * | icoutils: 0.31.0 -> 0.31.1 | Michael Raskin | 2017-01-11 |
| | | |||
| * | graphviz: add darwin frameworks | Daiderd Jordan | 2017-01-10 |
| | | |||
* | | zbar: use python2 | Frederik Rietdijk | 2017-01-11 |
|/ | |||
* | qrcode: 2014-01-01 -> 2016-08-04 | Peter Hoeg | 2017-01-07 |
| | |||
* | graphviz: 2.38.0 -> 2.40.1 | Michael Raskin | 2017-01-02 |
| | |||
* | netbpm: tell config.mk where to find JPEGLIB and JPEGHDR_DIR or jpegtopnm ↵ | Jeremy Shaw | 2016-12-28 |
| | | | | and friends will not be built. | ||
* | Fix netpbm installation for OS X (#21194) | Paul Liu | 2016-12-16 |
| | | | | * Update meta.platform to linux ++ darwin for netpbm | ||
* | Merge pull request #20486 from pjones/pkg/gromit-mpx | Frederik Rietdijk | 2016-12-10 |
|\ | | | | | gromit-mpx: init at 1.2 | ||
| * | gromit-mpx: init at 1.2 | Peter Jones | 2016-11-16 |
| | | |||
* | | graphviz: Make derivations pure on non-NixOS systems. | Travis Whitaker | 2016-11-24 |
| | | |||
* | | gmic: 1.7.7 -> 1.7.8 | Robert Helgesson | 2016-11-17 |
|/ | |||
* | asymptote: fix build on Darwin | Vincent Laporte | 2016-10-03 |
| | | | | No GLUT and no OSMesa | ||
* | treewide: Fix more 'lib.optional' misuses | Tuomas Tynkkynen | 2016-10-02 |
| | |||
* | wavefunctioncollapse: init at 0.0pre20160930 | Michael Raskin | 2016-10-01 |
| | |||
* | syntex: init at 0.0pre20160915 | Michael Raskin | 2016-10-01 |
| | |||
* | convchain: init at 0.0pre20160901 | Michael Raskin | 2016-10-01 |
| | |||
* | glxinfo: Drop dependency on mesa-noglu.dev and glu.dev | Eelco Dolstra | 2016-09-29 |
| | |||
* | zbar: do not use top-level python packages | Frederik Rietdijk | 2016-09-26 |
| | |||
* | gmic: 1.7.4 -> 1.7.7 | Mica Semrick | 2016-09-23 |
| | |||
* | treewide: explicitly specify gtk and related package versions | Kirill Boltaev | 2016-09-12 |
| | |||
* | neural-style: restrict to 64-bit Linux because it wants too much RAM | Michael Raskin | 2016-09-06 |
| | |||
* | Merge staging into master | Tuomas Tynkkynen | 2016-09-01 |
|\ | | | | | | | | | | | | | | | | | | | | | Brings in: - changed output order for multiple outputs: https://github.com/NixOS/nixpkgs/pull/14766 - audit disabled by default https://github.com/NixOS/nixpkgs/pull/17916 Conflicts: pkgs/development/libraries/openldap/default.nix | ||
| * | Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging | Tuomas Tynkkynen | 2016-08-30 |
| |\ | | | | | | | | | | https://github.com/NixOS/nixpkgs/pull/14766 | ||
| | * | treewide: Shuffle outputs | Tuomas Tynkkynen | 2016-08-29 |
| | | | | | | | | | | | | Make either 'bin' or 'out' the first output. | ||
* | | | fast-neural-doodle: fix script name | Michael Raskin | 2016-08-31 |
| | | | |||
* | | | fast-neural-doodle: init at 0.0pre2016-07-01 | Michael Raskin | 2016-08-31 |
| | | | |||
* | | | neural-style: symlink models so they can be shared easily | Michael Raskin | 2016-08-31 |
|/ / | |||
* / | lprof: add hardeningDisable to environment during build | Robin Gloster | 2016-08-29 |
|/ | |||
* | Merge remote-tracking branch 'upstream/master' into staging | Robin Gloster | 2016-08-29 |
|\ | |||
| * | logstalgia: fix build (#18065) | Kranium Gikos Mendoza | 2016-08-28 |
| | | |||
* | | Merge branch 'master' into staging | obadz | 2016-08-27 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/applications/misc/navit/default.nix pkgs/applications/networking/mailreaders/alpine/default.nix pkgs/applications/networking/mailreaders/realpine/default.nix pkgs/development/compilers/ghc/head.nix pkgs/development/libraries/openssl/default.nix pkgs/games/liquidwar/default.nix pkgs/games/spring/springlobby.nix pkgs/os-specific/linux/kernel/perf.nix pkgs/servers/sip/freeswitch/default.nix pkgs/tools/archivers/cromfs/default.nix pkgs/tools/graphics/plotutils/default.nix | ||
| * | neural-style: init at 0.0pre2016.08.15 | Michael Raskin | 2016-08-27 |
| | | |||
| * | quirc: 2014-11-01 -> 2016-08-16, fix includes for SDL_gfx | Michael Raskin | 2016-08-26 |
| | | |||
| * | plotutils: disable failing test on i686 | Franz Pletz | 2016-08-24 |
| | | | | | | | | | | | | | | Cherry-picked from staging to facilitate merging. See f29214caed21438df6b4d961856ca3fcc4ec6e1b vs. fd6a4d23c993f22dff434233ec50db98c6eaf8ed. | ||
| * | Merge pull request #17910 from womfoo/fix/plotutils-disable-i686-tests | Joachim F | 2016-08-24 |
| |\ | | | | | | | plotutils: disable i686 tests | ||
| | * | plotutils: disable i686 tests | Kranium Gikos Mendoza | 2016-08-22 |
| | | | |||
* | | | plotutils: disable failing test on i686 | Franz Pletz | 2016-08-24 |
| | | | |||
* | | | Merge branch 'master' into staging | obadz | 2016-08-23 |
|\| | | |||
| * | | treewide: Use makeBinPath | Tuomas Tynkkynen | 2016-08-23 |
| |/ | |||
* | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-08-16 |
|\| | |||
| * | quote homepages for better clickability | Nikolay Amiantov | 2016-08-14 |
| | | | | | | | | | | Done while I was traversing packages which I maintain to save extra clicks on urxvt (it captures semicolon as a part of URL). | ||
* | | qrcode: enable fortify hardening, disable warning | Franz Pletz | 2016-08-12 |
| | | |||
* | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-08-12 |
|\| | |||
| * | gmic: 1.6.5 -> 1.7.4 | Mica Semrick | 2016-08-08 |
| | | |||
* | | lprof: disable format hardening | Franz Pletz | 2016-08-04 |
| | | |||
* | | ploticus: disable format hardening | Franz Pletz | 2016-08-04 |
| | | |||
* | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-08-03 |
|\| | |||
| * | treewide: Add lots of meta.platforms | Tuomas Tynkkynen | 2016-08-02 |
| | | | | | | | | Build-tested on x86_64 Linux & Mac. | ||
| * | treewide: Add lots of platforms to packages with no meta | Tuomas Tynkkynen | 2016-08-02 |
| | | | | | | | | Build-tested on x86_64 Linux and on Darwin. |