Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | 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 | ||
| * | shadowsocks-libev: Fix 'lib.optional' use | Tuomas Tynkkynen | 2016-08-30 |
| | | | | | | | | Produces buildInputs having lists of lists. | ||
| * | treewide: Use explicit 'dev' references to glibc | Tuomas Tynkkynen | 2016-08-30 |
| | | |||
| * | treewide: Shuffle outputs | Tuomas Tynkkynen | 2016-08-29 |
| | | | | | | | | Make either 'bin' or 'out' the first output. | ||
* | | socat2pre: enable ip6 on darwin | Robin Gloster | 2016-08-31 |
| | | |||
* | | aria2: 1.24.0 -> 1.26.1 | José Romildo Malaquias | 2016-08-30 |
|/ | |||
* | 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 | ||
| * | Merge pull request #17908 from Mic92/ferm | Graham Christensen | 2016-08-25 |
| |\ | | | | | | | Ferm | ||
| | * | ferm: init at 2.3 | Jörg Thalheim | 2016-08-25 |
| | | | |||
| * | | dhcpcd: 6.10.1 -> 6.11.3 | Franz Pletz | 2016-08-25 |
| | | | |||
| * | | Merge pull request #17651 from leenaars/argus | Jaka Hudoklin | 2016-08-24 |
| |\ \ | | | | | | | | | Argus + Argus-clients: init at 3.0.8.2 | ||
| | * | | argus-clients: init at 3.0.8.2 | Michiel Leenaars | 2016-08-24 |
| | | | | |||
| | * | | argus: init at 3.0.8.2 | Michiel Leenaars | 2016-08-22 |
| | | | | |||
* | | | | easyrsa: use autoreconfHook | Robin Gloster | 2016-08-24 |
| | | | | |||
* | | | | flannel: disable fortify hardening | Robin Gloster | 2016-08-24 |
| | | | | |||
* | | | | Merge branch 'master' into staging | obadz | 2016-08-24 |
|\| | | | |||
| * | | | Merge pull request #17685 from matthewbauer/darwin-misc2 | Daniel Peebles | 2016-08-24 |
| |\ \ \ | | | | | | | | | | | Darwin misc. fixes | ||
| | * | | | tlsdate: dont build on darwin | Matthew Bauer | 2016-08-16 |
| | | | | | | | | | | | | | | | | | | | | There was a typo previously adding these in. | ||
* | | | | | Merge branch 'hardened-stdenv' into staging | obadz | 2016-08-23 |
|\ \ \ \ \ | |||
| * | | | | | lsh: fix gcc5 build | Joachim Fasting | 2016-08-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | The build fails with c11 (also tested c99), but works with gnu90. | ||
| * | | | | | Revert "Remove lsh, broken & unmaintained" | Robin Gloster | 2016-08-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 73f4c2bdf89ca02d70e614631531af307d056fef. | ||
| * | | | | | Merge remote-tracking branch 'origin/master' into hardened-stdenv | Franz Pletz | 2016-08-17 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fixes #17801 and #17802. | ||
* | \ \ \ \ \ | Merge branch 'master' into staging | obadz | 2016-08-23 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| * | | | | | | mosh: 1.2.5 -> 1.2.6 (#17939) | Zero King | 2016-08-23 |
| | | | | | | | |||
| * | | | | | | wrk: 4.0.0 -> 4.0.2 | zimbatm | 2016-08-23 |
| | | | | | | | |||
| * | | | | | | Merge pull request #17935 from DamienCassou/offlineimap-7.0.6 | Eelco Dolstra | 2016-08-23 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | offlineimap: 7.0.5 -> 7.0.6 | ||
| | * | | | | | | offlineimap: 7.0.5 -> 7.0.6 | Damien Cassou | 2016-08-23 |
| | | | | | | | | |||
| * | | | | | | | treewide: Fix output references to gnome3.gtk | Tuomas Tynkkynen | 2016-08-23 |
| | | | | | | | | |||
| * | | | | | | | treewide: Make explicit that 'dev' output of readline is used | Tuomas Tynkkynen | 2016-08-23 |
| | | | | | | | | |||
| * | | | | | | | treewide: Make explicit that 'dev' output of bind is used | Tuomas Tynkkynen | 2016-08-23 |
| |/ / / / / / | |||
| * | | | | | | treewide: Use more makeBinPath | Tuomas Tynkkynen | 2016-08-23 |
| | | | | | | | |||
| * | | | | | | treewide: Use makeBinPath | Tuomas Tynkkynen | 2016-08-23 |
| | | | | | | | |||
* | | | | | | | Merge branch 'hardened-stdenv' into staging | obadz | 2016-08-22 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | | | | | | | | | | | | | | Closes #12895 Amazing work by @globin & @fpletz getting hardened compiler flags by enabled default on the whole package set | ||
| * | | | | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-08-16 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'master' into hardened-stdenv | Franz Pletz | 2016-08-13 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-08-12 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||
| * | | | | | | | vlan: disable format hardening | Franz Pletz | 2016-08-04 |
| | | | | | | | | |||
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-08-03 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-08-02 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-07-31 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-07-25 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-07-21 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-07-19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-07-15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-06-10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-05-30 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into hardened-stdenv | Franz Pletz | 2016-05-18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-05-02 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-04-18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-04-07 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |