diff options
| author | Peter Simons <simons@cryp.to> | 2013-12-10 00:25:54 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-12-10 00:25:54 +0100 |
| commit | 486e7736dfe0ca3b99a98b21bec8090d3e2df5d8 (patch) | |
| tree | 3364a88923232441475d51052a77ff36e51e09c6 /pkgs/top-level/release.nix | |
| parent | 4e385fcda73dd437152d42aefdde4bcb79d23c78 (diff) | |
| parent | 328d59eab6c2cdd94cb358d635fd6b4b64982e73 (diff) | |
| download | nixlib-486e7736dfe0ca3b99a98b21bec8090d3e2df5d8.tar nixlib-486e7736dfe0ca3b99a98b21bec8090d3e2df5d8.tar.gz nixlib-486e7736dfe0ca3b99a98b21bec8090d3e2df5d8.tar.bz2 nixlib-486e7736dfe0ca3b99a98b21bec8090d3e2df5d8.tar.lz nixlib-486e7736dfe0ca3b99a98b21bec8090d3e2df5d8.tar.xz nixlib-486e7736dfe0ca3b99a98b21bec8090d3e2df5d8.tar.zst nixlib-486e7736dfe0ca3b99a98b21bec8090d3e2df5d8.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts: pkgs/tools/networking/p2p/amule/default.nix
Diffstat (limited to 'pkgs/top-level/release.nix')
| -rw-r--r-- | pkgs/top-level/release.nix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 7963277d94a6..ee64a6638d61 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -309,7 +309,6 @@ let vim = linux; vimHugeX = linux; VisualBoyAdvance = linux; - vlc = linux; vncrec = linux; vorbisTools = linux; vpnc = linux; |