public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "all-packages.nix: Provide a shorter way to specify packages"

Browse Source 
This reverts commit ece61b7cc803d374e81b1094bd9c1f6d5a9ca5d0.
This commit is contained in:
Eelco Dolstra 2014-07-22 17:40:24 +02:00
parent ece61b7cc8
commit e7295597d8
2 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/auto-packages.nix
View File

@ -1,16 +0,0 @@
/* A list of file names of package Nix expressions, whose base names
match the intended attribute names, and that do not need to be
called with any overrides. Thus, listing ‘./foo.nix’ here is
equivalent to defining the attribute
foo = callPackage ./foo.nix { };
in all-packages.nix. */
[
build-support/libredirect
development/libraries/libogg
development/libraries/libvorbis
tools/archivers/gnutar
tools/system/acct
]

34
pkgs/top-level/all-packages.nix
View File

@ -130,19 +130,11 @@ let
in pkgs; in pkgs;
# The package compositions. # The package compositions. Yes, this isn't properly indented.
pkgsFun = pkgs: overrides: pkgsFun = pkgs: overrides:
let with helperFunctions;
defaultScope = pkgs // pkgs.xorg; let defaultScope = pkgs // pkgs.xorg; self = self_ // overrides;
autoPackages = lib.listToAttrs self_ = with self; helperFunctions // {
(map (fn: { name = baseNameOf (toString fn); value = pkgs.callPackage fn { }; })
(import ../auto-packages.nix));
self = self_ // autoPackages // overrides;
self_ = with self; helperFunctions //
# Yes, this isn't properly indented.
{
# Make some arguments passed to all-packages.nix available # Make some arguments passed to all-packages.nix available
inherit system stdenvType platform; inherit system stdenvType platform;
@ -369,6 +361,8 @@ let
inherit url; inherit url;
}; };
libredirect = callPackage ../build-support/libredirect { };
makeDesktopItem = import ../build-support/make-desktopitem { makeDesktopItem = import ../build-support/make-desktopitem {
inherit stdenv; inherit stdenv;
}; };
@ -433,6 +427,8 @@ let
### TOOLS ### TOOLS
acct = callPackage ../tools/system/acct { };
acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter {
ffmpeg = ffmpeg_1; ffmpeg = ffmpeg_1;
}; };
@ -1163,6 +1159,8 @@ let
gnused = callPackage ../tools/text/gnused { }; gnused = callPackage ../tools/text/gnused { };
gnutar = callPackage ../tools/archivers/gnutar { };
gnuvd = callPackage ../tools/misc/gnuvd { }; gnuvd = callPackage ../tools/misc/gnuvd { };
goaccess = callPackage ../tools/misc/goaccess { }; goaccess = callPackage ../tools/misc/goaccess { };
@ -5368,6 +5366,8 @@ let
libofx = callPackage ../development/libraries/libofx { }; libofx = callPackage ../development/libraries/libofx { };
libogg = callPackage ../development/libraries/libogg { };
liboggz = callPackage ../development/libraries/liboggz { }; liboggz = callPackage ../development/libraries/liboggz { };
liboil = callPackage ../development/libraries/liboil { }; liboil = callPackage ../development/libraries/liboil { };
@ -5534,6 +5534,8 @@ let
libvterm = callPackage ../development/libraries/libvterm { }; libvterm = callPackage ../development/libraries/libvterm { };
libvorbis = callPackage ../development/libraries/libvorbis { };
libwebp = callPackage ../development/libraries/libwebp { }; libwebp = callPackage ../development/libraries/libwebp { };
libwmf = callPackage ../development/libraries/libwmf { }; libwmf = callPackage ../development/libraries/libwmf { };
@ -10415,13 +10417,13 @@ let
callPackage = newScope pkgs.cinnamon; callPackage = newScope pkgs.cinnamon;
inherit (gnome3) gnome_common libgnomekbd gnome-menus zenity; inherit (gnome3) gnome_common libgnomekbd gnome-menus zenity;
muffin = callPackage ../desktops/cinnamon/muffin.nix { }; muffin = callPackage ../desktops/cinnamon/muffin.nix { } ;
cinnamon-control-center = callPackage ../desktops/cinnamon/cinnamon-control-center.nix { }; cinnamon-control-center = callPackage ../desktops/cinnamon/cinnamon-control-center.nix{ };
cinnamon-settings-daemon = callPackage ../desktops/cinnamon/cinnamon-settings-daemon.nix { }; cinnamon-settings-daemon = callPackage ../desktops/cinnamon/cinnamon-settings-daemon.nix{ };
cinnamon-session = callPackage ../desktops/cinnamon/cinnamon-session.nix { }; cinnamon-session = callPackage ../desktops/cinnamon/cinnamon-session.nix{ } ;
cinnamon-desktop = callPackage ../desktops/cinnamon/cinnamon-desktop.nix { }; cinnamon-desktop = callPackage ../desktops/cinnamon/cinnamon-desktop.nix { };