all-packages: remove default.nix in callPackage

not needed
This commit is contained in:
Matthew Bauer 2018-05-29 21:35:38 -04:00
parent 8950b14355
commit 58359bab6b

View file

@ -142,7 +142,7 @@ with pkgs;
dotnetbuildhelpers = callPackage ../build-support/dotnetbuildhelpers { };
dotnet-sdk = callPackage ../development/compilers/dotnet/sdk/default.nix { };
dotnet-sdk = callPackage ../development/compilers/dotnet/sdk { };
dispad = callPackage ../tools/X11/dispad { };
@ -358,13 +358,13 @@ with pkgs;
replaceDependency = callPackage ../build-support/replace-dependency.nix { };
nukeReferences = callPackage ../build-support/nuke-references/default.nix { };
nukeReferences = callPackage ../build-support/nuke-references { };
removeReferencesTo = callPackage ../build-support/remove-references-to/default.nix { };
removeReferencesTo = callPackage ../build-support/remove-references-to { };
vmTools = callPackage ../build-support/vm/default.nix { };
vmTools = callPackage ../build-support/vm { };
releaseTools = callPackage ../build-support/release/default.nix { };
releaseTools = callPackage ../build-support/release { };
composableDerivation = callPackage ../../lib/composable-derivation.nix { };
@ -458,7 +458,7 @@ with pkgs;
stdenv = clangStdenv;
};
afpfs-ng = callPackage ../tools/filesystems/afpfs-ng/default.nix { };
afpfs-ng = callPackage ../tools/filesystems/afpfs-ng { };
agrep = callPackage ../tools/text/agrep { };
@ -653,7 +653,7 @@ with pkgs;
git-fire = callPackage ../tools/misc/git-fire { };
gitless = callPackage ../applications/version-management/gitless/default.nix { };
gitless = callPackage ../applications/version-management/gitless { };
grc = callPackage ../tools/misc/grc { };
@ -911,7 +911,7 @@ with pkgs;
btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { };
btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe/default.nix {};
btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe {};
btrbk = callPackage ../tools/backup/btrbk {
asciidoc = asciidoc-full;
@ -2148,7 +2148,7 @@ with pkgs;
s-tar = callPackages ../tools/archivers/s-tar {};
tealdeer = callPackage ../tools/misc/tealdeer/default.nix { };
tealdeer = callPackage ../tools/misc/tealdeer { };
uudeview = callPackage ../tools/misc/uudeview { };
@ -2313,7 +2313,7 @@ with pkgs;
fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { };
fcppt = callPackage ../development/libraries/fcppt/default.nix { };
fcppt = callPackage ../development/libraries/fcppt { };
fcrackzip = callPackage ../tools/security/fcrackzip { };
@ -2417,7 +2417,7 @@ with pkgs;
fortune = callPackage ../tools/misc/fortune { };
fox = callPackage ../development/libraries/fox/default.nix {
fox = callPackage ../development/libraries/fox {
libpng = libpng12;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
@ -3036,7 +3036,7 @@ with pkgs;
iftop = callPackage ../tools/networking/iftop { };
ifuse = callPackage ../tools/filesystems/ifuse/default.nix { };
ifuse = callPackage ../tools/filesystems/ifuse { };
inherit (callPackages ../tools/filesystems/irods rec {
stdenv = llvmPackages_38.libcxxStdenv;
@ -3750,7 +3750,7 @@ with pkgs;
mednafen-server = callPackage ../misc/emulators/mednafen/server.nix { };
mednaffe = callPackage ../misc/emulators/mednaffe/default.nix {
mednaffe = callPackage ../misc/emulators/mednaffe {
gtk2 = null;
};
@ -3758,9 +3758,9 @@ with pkgs;
megatools = callPackage ../tools/networking/megatools { };
memo = callPackage ../applications/misc/memo/default.nix { };
memo = callPackage ../applications/misc/memo { };
mencal = callPackage ../applications/misc/mencal/default.nix { } ;
mencal = callPackage ../applications/misc/mencal { } ;
metamorphose2 = callPackage ../applications/misc/metamorphose2 { };
@ -5362,7 +5362,7 @@ with pkgs;
oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { };
twilight = callPackage ../tools/graphics/twilight/default.nix {
twilight = callPackage ../tools/graphics/twilight {
libX11 = xorg.libX11;
};
@ -6439,7 +6439,7 @@ with pkgs;
stack = haskell.lib.justStaticExecutables haskellPackages.stack;
hlint = haskell.lib.justStaticExecutables haskellPackages.hlint;
all-cabal-hashes = callPackage ../data/misc/hackage/default.nix { };
all-cabal-hashes = callPackage ../data/misc/hackage { };
purescript = haskell.lib.justStaticExecutables haskellPackages.purescript;
psc-package = haskell.lib.justStaticExecutables
@ -6535,7 +6535,7 @@ with pkgs;
intercal = callPackage ../development/compilers/intercal { };
irony-server = callPackage ../development/tools/irony-server/default.nix {
irony-server = callPackage ../development/tools/irony-server {
# The repository of irony to use -- must match the version of the employed emacs
# package. Wishing we could merge it into one irony package, to avoid this issue,
# but its emacs-side expression is autogenerated, and we can't hook into it (other
@ -6887,7 +6887,7 @@ with pkgs;
rgbds = callPackage ../development/compilers/rgbds { };
rtags = callPackage ../development/tools/rtags/default.nix {
rtags = callPackage ../development/tools/rtags {
inherit (darwin) apple_sdk;
};
@ -7961,7 +7961,7 @@ with pkgs;
flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { };
flex_2_6_1 = callPackage ../development/tools/parsing/flex/2.6.1.nix { };
flex = callPackage ../development/tools/parsing/flex/default.nix { };
flex = callPackage ../development/tools/parsing/flex { };
flexcpp = callPackage ../development/tools/parsing/flexc++ { };
@ -9201,7 +9201,7 @@ with pkgs;
gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; });
#GMP ex-satellite, so better keep it near gmp
mpfr = callPackage ../development/libraries/mpfr/default.nix { };
mpfr = callPackage ../development/libraries/mpfr { };
mpfi = callPackage ../development/libraries/mpfi { };
@ -9535,7 +9535,7 @@ with pkgs;
libpng = libpng12;
};
imv = callPackage ../applications/graphics/imv/default.nix { };
imv = callPackage ../applications/graphics/imv { };
iml = callPackage ../development/libraries/iml { };
@ -10492,7 +10492,7 @@ with pkgs;
libunibreak = callPackage ../development/libraries/libunibreak { };
libunique = callPackage ../development/libraries/libunique/default.nix { };
libunique = callPackage ../development/libraries/libunique { };
libunique3 = callPackage ../development/libraries/libunique/3.x.nix { inherit (gnome2) gtkdoc; };
liburcu = callPackage ../development/libraries/liburcu { };
@ -11009,7 +11009,7 @@ with pkgs;
ortp = callPackage ../development/libraries/ortp { };
openrct2 = callPackage ../games/openrct2/default.nix { };
openrct2 = callPackage ../games/openrct2 { };
osm-gps-map = callPackage ../development/libraries/osm-gps-map { };
@ -11966,14 +11966,14 @@ with pkgs;
withMesa = lib.elem system lib.platforms.mesaPlatforms;
};
wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9/default.nix {
wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 {
inherit (gnome2) GConf;
inherit (darwin.stubs) setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
withMesa = lib.elem system lib.platforms.mesaPlatforms;
};
wxGTK30 = callPackage ../development/libraries/wxwidgets/3.0/default.nix {
wxGTK30 = callPackage ../development/libraries/wxwidgets/3.0 {
inherit (gnome2) GConf;
inherit (darwin.stubs) setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
@ -12369,7 +12369,7 @@ with pkgs;
appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { };
archiveopteryx = callPackage ../servers/mail/archiveopteryx/default.nix { };
archiveopteryx = callPackage ../servers/mail/archiveopteryx { };
atlassian-confluence = callPackage ../servers/atlassian/confluence.nix { };
atlassian-crowd = callPackage ../servers/atlassian/crowd.nix { };
@ -12467,7 +12467,7 @@ with pkgs;
exhibitor = callPackage ../servers/exhibitor { };
hyp = callPackage ../servers/http/hyp/default.nix { };
hyp = callPackage ../servers/http/hyp { };
prosody = callPackage ../servers/xmpp/prosody {
# _compat can probably be removed on next minor version after 0.10.0
@ -12562,11 +12562,11 @@ with pkgs;
mediatomb = callPackage ../servers/mediatomb { };
meguca = callPackage ../servers/meguca/default.nix { };
meguca = callPackage ../servers/meguca { };
memcached = callPackage ../servers/memcached {};
meteor = callPackage ../servers/meteor/default.nix { };
meteor = callPackage ../servers/meteor { };
minio = callPackage ../servers/minio { };
@ -12804,12 +12804,12 @@ with pkgs;
vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { };
pgbouncer = callPackage ../servers/sql/pgbouncer/default.nix { };
pgbouncer = callPackage ../servers/sql/pgbouncer { };
pgpool93 = pgpool.override { postgresql = postgresql93; };
pgpool94 = pgpool.override { postgresql = postgresql94; };
pgpool = callPackage ../servers/sql/pgpool/default.nix {
pgpool = callPackage ../servers/sql/pgpool {
pam = if stdenv.isLinux then pam else null;
libmemcached = null; # Detection is broken upstream
};
@ -12878,7 +12878,7 @@ with pkgs;
};
radicale1 = callPackage ../servers/radicale/1.x.nix { };
radicale2 = callPackage ../servers/radicale/default.nix { };
radicale2 = callPackage ../servers/radicale { };
radicale = radicale2;
@ -13053,7 +13053,7 @@ with pkgs;
inherit (darwin.apple_sdk.libs) Xplugin;
};
xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg/default.nix {
xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg {
inherit clangStdenv fetchurl fetchgit fetchpatch stdenv intltool freetype fontconfig
libxslt expat libpng zlib perl mesa_drivers spice-protocol libunwind
dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook
@ -13588,7 +13588,7 @@ with pkgs;
lttng-modules = callPackage ../os-specific/linux/lttng-modules { };
broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { };
broadcom_sta = callPackage ../os-specific/linux/broadcom-sta { };
tbs = callPackage ../os-specific/linux/tbs { };
@ -14155,7 +14155,7 @@ with pkgs;
eudev = callPackage ../os-specific/linux/eudev {};
libudev0-shim = callPackage ../os-specific/linux/libudev0-shim/default.nix { };
libudev0-shim = callPackage ../os-specific/linux/libudev0-shim { };
udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { };
udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { };
@ -14786,7 +14786,7 @@ with pkgs;
useUnrar = config.ahoviewer.useUnrar or false;
};
airwave = callPackage ../applications/audio/airwave/default.nix { };
airwave = callPackage ../applications/audio/airwave { };
alembic = callPackage ../development/libraries/alembic {};
@ -15622,7 +15622,7 @@ with pkgs;
epdfview = callPackage ../applications/misc/epdfview { };
epeg = callPackage ../applications/graphics/epeg/default.nix { };
epeg = callPackage ../applications/graphics/epeg { };
inherit (gnome3) epiphany;
@ -15739,7 +15739,7 @@ with pkgs;
ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { };
gitweb = callPackage ../applications/version-management/git-and-tools/gitweb/default.nix { };
gitweb = callPackage ../applications/version-management/git-and-tools/gitweb { };
gksu = callPackage ../applications/misc/gksu { };
@ -16318,7 +16318,7 @@ with pkgs;
i3lock-fancy = callPackage ../applications/window-managers/i3/lock-fancy.nix { };
i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled/default.nix { };
i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled { };
i3minator = callPackage ../tools/misc/i3minator { };
@ -16446,9 +16446,9 @@ with pkgs;
bip = callPackage ../applications/networking/irc/bip { };
j4-dmenu-desktop = callPackage ../applications/misc/j4-dmenu-desktop/default.nix { };
j4-dmenu-desktop = callPackage ../applications/misc/j4-dmenu-desktop { };
jabref = callPackage ../applications/office/jabref/default.nix { };
jabref = callPackage ../applications/office/jabref { };
jack_capture = callPackage ../applications/audio/jack-capture { };
@ -17469,7 +17469,7 @@ with pkgs;
psi-plus = callPackage ../applications/networking/instant-messengers/psi-plus { };
psol = callPackage ../development/libraries/psol/default.nix { };
psol = callPackage ../development/libraries/psol { };
pstree = callPackage ../applications/misc/pstree { };
@ -17964,7 +17964,7 @@ with pkgs;
ltunify = callPackage ../tools/misc/ltunify { };
src = callPackage ../applications/version-management/src/default.nix {
src = callPackage ../applications/version-management/src {
git = gitMinimal;
};
@ -17995,7 +17995,7 @@ with pkgs;
sublime3-dev = sublime3Packages.sublime3-dev;
inherit (callPackages ../applications/version-management/subversion/default.nix {
inherit (callPackages ../applications/version-management/subversion {
bdbSupport = true;
httpServer = false;
httpSupport = true;
@ -18672,7 +18672,7 @@ with pkgs;
xbindkeys = callPackage ../tools/X11/xbindkeys { };
xbindkeys-config = callPackage ../tools/X11/xbindkeys-config/default.nix {
xbindkeys-config = callPackage ../tools/X11/xbindkeys-config {
gtk = gtk2;
};
@ -19529,7 +19529,7 @@ with pkgs;
tennix = callPackage ../games/tennix { };
terraria-server = callPackage ../games/terraria-server/default.nix { };
terraria-server = callPackage ../games/terraria-server { };
tibia = callPackage_i686 ../games/tibia { };
@ -19565,7 +19565,7 @@ with pkgs;
ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { };
ultrastardx = callPackage ../games/ultrastardx/default.nix {
ultrastardx = callPackage ../games/ultrastardx {
ffmpeg = ffmpeg_2;
};
@ -19874,7 +19874,7 @@ with pkgs;
stdenv = overrideCC stdenv gcc49;
};
bedtools = callPackage ../applications/science/biology/bedtools/default.nix { };
bedtools = callPackage ../applications/science/biology/bedtools { };
bcftools = callPackage ../applications/science/biology/bcftools { };
@ -19906,7 +19906,7 @@ with pkgs;
kallisto = callPackage ../applications/science/biology/kallisto { };
muscle = callPackage ../applications/science/biology/muscle/default.nix { };
muscle = callPackage ../applications/science/biology/muscle { };
n3 = callPackage ../applications/science/biology/N3 {
inherit (perlPackages) perl GetoptTabular MNI-Perllib;
@ -19942,13 +19942,13 @@ with pkgs;
paml = callPackage ../applications/science/biology/paml { };
picard-tools = callPackage ../applications/science/biology/picard-tools/default.nix { };
picard-tools = callPackage ../applications/science/biology/picard-tools { };
platypus = callPackage ../applications/science/biology/platypus/default.nix { };
platypus = callPackage ../applications/science/biology/platypus { };
plink = callPackage ../applications/science/biology/plink/default.nix { };
plink = callPackage ../applications/science/biology/plink { };
plink-ng = callPackage ../applications/science/biology/plink-ng/default.nix { };
plink-ng = callPackage ../applications/science/biology/plink-ng { };
raxml = callPackage ../applications/science/biology/raxml { };
@ -19956,18 +19956,18 @@ with pkgs;
mpi = true;
});
samtools = callPackage ../applications/science/biology/samtools/default.nix { };
samtools = callPackage ../applications/science/biology/samtools { };
samtools_0_1_19 = callPackage ../applications/science/biology/samtools/samtools_0_1_19.nix {
stdenv = gccStdenv;
};
snpeff = callPackage ../applications/science/biology/snpeff/default.nix { };
snpeff = callPackage ../applications/science/biology/snpeff { };
star = callPackage ../applications/science/biology/star { };
varscan = callPackage ../applications/science/biology/varscan/default.nix { };
varscan = callPackage ../applications/science/biology/varscan { };
bwa = callPackage ../applications/science/biology/bwa/default.nix { };
bwa = callPackage ../applications/science/biology/bwa { };
### SCIENCE/MACHINE LEARNING
@ -20252,7 +20252,7 @@ with pkgs;
picosat = callPackage ../applications/science/logic/picosat {};
libpoly = callPackage ../applications/science/logic/poly/default.nix {};
libpoly = callPackage ../applications/science/logic/poly {};
prooftree = (with ocamlPackages_4_01_0;
callPackage ../applications/science/logic/prooftree {