summary refs log tree commit diff
path: root/pkgs/top-level/release.nix
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2013-01-07 00:34:25 +0100
committerEelco Dolstra <e.dolstra@tudelft.nl>2013-01-07 00:34:25 +0100
commitc6c1bc6b0f5b314cd3c70df80033c5dde3565c1c (patch)
treec5c3b9373d0e8f4e29103a042181783d41efc58b /pkgs/top-level/release.nix
parent7364f8b55f1930de57fc35b984888f52cabae5f1 (diff)
parent1e9e2cb2bbd96b323e4c51e7525b2e01dc3e57ad (diff)
downloadnixlib-c6c1bc6b0f5b314cd3c70df80033c5dde3565c1c.tar
nixlib-c6c1bc6b0f5b314cd3c70df80033c5dde3565c1c.tar.gz
nixlib-c6c1bc6b0f5b314cd3c70df80033c5dde3565c1c.tar.bz2
nixlib-c6c1bc6b0f5b314cd3c70df80033c5dde3565c1c.tar.lz
nixlib-c6c1bc6b0f5b314cd3c70df80033c5dde3565c1c.tar.xz
nixlib-c6c1bc6b0f5b314cd3c70df80033c5dde3565c1c.tar.zst
nixlib-c6c1bc6b0f5b314cd3c70df80033c5dde3565c1c.zip
Merge branch 'master' into systemd
Diffstat (limited to 'pkgs/top-level/release.nix')
-rw-r--r--pkgs/top-level/release.nix2
1 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 2148f50a1edf..5aac79bc6c64 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -145,7 +145,6 @@ with (import ./release-lib.nix);
   icewm = linux;
   idutils = all;
   ifplugd = linux;
-  imagemagick = allBut "i686-cygwin";
   impressive = linux;
   inetutils = linux;
   inkscape = linux;
@@ -251,7 +250,6 @@ with (import ./release-lib.nix);
   rubber = allBut "i686-cygwin";
   ruby = all;
   rxvt_unicode = linux;
-  samba = linux;
   screen = linux ++ darwin;
   scrot = linux;
   sdparm = linux;