JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3de6e5be50
nixpkgs/pkgs/tools
History
obadz 3de6e5be50 Merge branch 'master' into staging 
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
2016-08-27 23:54:54 +01:00
..
admin Merge branch 'master' into staging 2016-08-27 23:54:54 +01:00
archivers cromfs: use default gcc 2016-08-24 22:41:41 +00:00
audio darkice: 1.2 -> 1.3 2016-08-23 18:50:47 +02:00
backup treewide: fix darwin builds by using getOutput 2016-08-25 08:44:20 +00:00
bluetooth treewide: Fix output references to libpulseaudio 2016-08-23 04:53:16 +03:00
bootloaders/refind Merge branch 'master' into staging 2016-08-27 23:54:54 +01:00
cd-dvd Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
compression Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
filesystems xtreemfs: fix substituteInPlace paths 2016-08-27 21:56:45 +00:00
graphics Merge branch 'master' into staging 2016-08-27 23:54:54 +01:00
inputmethods ibus-engines.m17n: use autoreconfHook 2016-08-24 20:18:52 +00:00
misc Merge branch 'master' into staging 2016-08-27 23:54:54 +01:00
networking Merge branch 'master' into staging 2016-08-27 23:54:54 +01:00
package-management Merge branch 'master' into staging 2016-08-27 23:54:54 +01:00
security Merge branch 'master' into staging 2016-08-27 23:54:54 +01:00
system Merge branch 'master' into staging 2016-08-27 23:54:54 +01:00
text Merge branch 'master' into staging 2016-08-27 23:54:54 +01:00
typesetting Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
video Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
virtualization treewide: Use more makeBinPath 2016-08-23 01:18:10 +03:00
X11 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00