3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs
Michael Raskin 38933324a6 Merge pull request #25059 from vcunat/p/kdiff3-git-mergetool
kdiff3: fix with git mergetool
2017-04-20 16:55:15 +02:00
..
applications dino: init at unstable-2017-04-20 2017-04-20 15:16:55 +02:00
build-support docker: improve reproducibility of layers 2017-04-16 22:46:24 -04:00
common-updater
data iana-etc: 20170328 -> 20170417 2017-04-19 08:29:31 +02:00
desktops Merge pull request #24992 from romildo/upd.mate 2017-04-18 22:09:01 +02:00
development Disable parallel building 2017-04-19 15:20:51 -05:00
games Merge pull request #24521 from orivej/instead-launcher 2017-04-18 01:36:40 +02:00
misc Merge pull request #25003 from romildo/upd.greybird 2017-04-19 14:01:50 +02:00
os-specific linuxPackages.broadcom-sta: patch file was not named correctly 2017-04-20 08:14:01 +02:00
servers Merge pull request #24974 from Ericson2314/mapNullable 2017-04-17 17:12:14 -04:00
shells Merge pull request #24760 from matthewbauer/linux-only-pkgs 2017-04-09 14:18:10 +02:00
stdenv stdenv: ARM bootstrap: Update bootstrap tarballs to latest hydra-built ones 2017-04-15 01:52:33 +03:00
test
tools Merge pull request #25059 from vcunat/p/kdiff3-git-mergetool 2017-04-20 16:55:15 +02:00
top-level dino: init at unstable-2017-04-20 2017-04-20 15:16:55 +02:00