nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-16 01:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
bc1773fe16
nixpkgs/pkgs
History
Eelco Dolstra bc1773fe16 Merge remote-tracking branch 'origin/staging' into systemd-219 
Conflicts:
	pkgs/os-specific/linux/kernel/linux-3.4.nix
	pkgs/os-specific/linux/systemd/default.nix
2015-07-20 22:57:23 +02:00
..
applications Merge remote-tracking branch 'origin/staging' into systemd-219 2015-07-20 22:57:23 +02:00
build-support Merge branch 'staging', discussion #8844 2015-07-19 08:09:29 +02:00
data Merge branch 'master.upstream' into staging.upstream 2015-07-15 02:02:46 -07:00
desktops Merge branch 'staging', discussion #8844 2015-07-19 08:09:29 +02:00
development Merge remote-tracking branch 'origin/staging' into systemd-219 2015-07-20 22:57:23 +02:00
games Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
misc FS-UAE: 2.4.1 -> 2.4.3 2015-07-15 09:35:58 -03:00
os-specific Merge remote-tracking branch 'origin/staging' into systemd-219 2015-07-20 22:57:23 +02:00
servers xkeyboard-config: updates 2015-07-19 13:33:04 +02:00
shells Merge branch 'master.upstream' into staging.upstream 2015-07-15 02:02:46 -07:00
stdenv make bootstrap files buildable in sandbox 2015-07-10 14:00:47 -07:00
test
tools Merge branch 'master.upstream' into staging.upstream 2015-07-19 15:20:04 -07:00
top-level Merge remote-tracking branch 'origin/staging' into systemd-219 2015-07-20 22:57:23 +02:00