diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 612d432be31ad..0052963d2479a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -321,7 +321,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit IOKit; }; - mix2nix = callPackage ../development/tools/mix2nix/default.nix { }; + mix2nix = callPackage ../development/tools/mix2nix { }; prisma-engines = callPackage ../development/tools/database/prisma-engines { inherit (darwin.apple_sdk.frameworks) Security; @@ -493,7 +493,7 @@ with pkgs; prefer-remote-fetch = import ../build-support/prefer-remote-fetch; - global-platform-pro = callPackage ../development/tools/global-platform-pro/default.nix { }; + global-platform-pro = callPackage ../development/tools/global-platform-pro { }; graph-easy = callPackage ../tools/graphics/graph-easy { }; @@ -1373,7 +1373,7 @@ with pkgs; awless = callPackage ../tools/virtualization/awless { }; - berglas = callPackage ../tools/admin/berglas/default.nix { }; + berglas = callPackage ../tools/admin/berglas { }; betterdiscordctl = callPackage ../tools/misc/betterdiscordctl { }; @@ -1669,7 +1669,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - fitnesstrax = callPackage ../applications/misc/fitnesstrax/default.nix { }; + fitnesstrax = callPackage ../applications/misc/fitnesstrax { }; flavours = callPackage ../applications/misc/flavours { }; @@ -4766,7 +4766,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Security; }; - timeline = callPackage ../applications/office/timeline/default.nix { }; + timeline = callPackage ../applications/office/timeline { }; tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; }; tsm-client-withGui = callPackage ../tools/backup/tsm-client { }; @@ -8079,7 +8079,7 @@ with pkgs; offlineimap = callPackage ../tools/networking/offlineimap { }; - ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim/default.nix { }; + ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim { }; ogdf = callPackage ../development/libraries/ogdf { }; @@ -9424,7 +9424,7 @@ with pkgs; slides = callPackage ../applications/misc/slides { }; - slirp4netns = callPackage ../tools/networking/slirp4netns/default.nix { }; + slirp4netns = callPackage ../tools/networking/slirp4netns { }; slsnif = callPackage ../tools/misc/slsnif { }; @@ -9725,7 +9725,7 @@ with pkgs; swagger-codegen3 = callPackage ../tools/networking/swagger-codegen3 { }; - swapview = callPackage ../os-specific/linux/swapview/default.nix { }; + swapview = callPackage ../os-specific/linux/swapview { }; swtpm = callPackage ../tools/security/swtpm { }; @@ -11452,7 +11452,7 @@ with pkgs; scry = callPackage ../development/tools/scry { }; - dasm = callPackage ../development/compilers/dasm/default.nix { }; + dasm = callPackage ../development/compilers/dasm { }; dbmate = callPackage ../development/tools/database/dbmate { }; @@ -12287,7 +12287,7 @@ with pkgs; javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; - juniper = callPackage ../development/compilers/juniper/default.nix { }; + juniper = callPackage ../development/compilers/juniper { }; julia_10 = callPackage ../development/compilers/julia/1.0.nix { gmp = gmp6; @@ -12890,7 +12890,7 @@ with pkgs; sbcl_2_1_9 = callPackage ../development/compilers/sbcl/2.1.9.nix {}; sbcl = sbcl_2_1_9; - roswell = callPackage ../development/tools/roswell/default.nix { }; + roswell = callPackage ../development/tools/roswell { }; scala_2_10 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.10"; jre = jdk8; }; scala_2_11 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.11"; jre = jdk8; }; @@ -12898,7 +12898,7 @@ with pkgs; scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; jre = jdk8; }; scala = scala_2_13; - scala-runners = callPackage ../development/compilers/scala-runners/default.nix { + scala-runners = callPackage ../development/compilers/scala-runners { coursier = coursier.override { jre = jdk8; }; }; @@ -13161,7 +13161,7 @@ with pkgs; clips = callPackage ../development/interpreters/clips { }; - cliscord = callPackage ../misc/cliscord/default.nix { }; + cliscord = callPackage ../misc/cliscord { }; clisp = callPackage ../development/interpreters/clisp { }; clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { }; @@ -13499,7 +13499,7 @@ with pkgs; setupcfg2nix = python3Packages.callPackage ../development/tools/setupcfg2nix {}; # These pyside tools do not provide any Python modules and are meant to be here. - # See ../development/python-modules/pyside/default.nix for details. + # See ../development/python-modules/pyside for details. pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { }; pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { }; @@ -13740,7 +13740,7 @@ with pkgs; or1k-newlib = callPackage ../development/misc/or1k/newlib.nix {}; - rappel = callPackage ../development/misc/rappel/default.nix { }; + rappel = callPackage ../development/misc/rappel { }; pharo-vms = callPackage ../development/pharo/vm { }; pharo = pharo-vms.multi-vm-wrapper; @@ -14531,9 +14531,9 @@ with pkgs; gnome-usage = callPackage ../applications/misc/gnome-usage {}; - gnome-inform7 = callPackage ../applications/editors/gnome-inform7/default.nix { }; + gnome-inform7 = callPackage ../applications/editors/gnome-inform7 { }; - gnome-latex = callPackage ../applications/editors/gnome-latex/default.nix { }; + gnome-latex = callPackage ../applications/editors/gnome-latex { }; gnome-network-displays = callPackage ../applications/networking/gnome-network-displays { }; @@ -15545,7 +15545,7 @@ with pkgs; assimp = callPackage ../development/libraries/assimp { }; asio_1_10 = callPackage ../development/libraries/asio/1.10.nix { }; - asio = callPackage ../development/libraries/asio/default.nix { }; + asio = callPackage ../development/libraries/asio { }; aspell = callPackage ../development/libraries/aspell { }; @@ -16550,7 +16550,7 @@ with pkgs; then callPackage ../development/libraries/gnu-efi { } else null; - gnutls = callPackage ../development/libraries/gnutls/default.nix { + gnutls = callPackage ../development/libraries/gnutls { inherit (darwin.apple_sdk.frameworks) Security; util-linux = util-linuxMinimal; # break the cyclic dependency autoconf = buildPackages.autoconf269; @@ -20134,7 +20134,7 @@ with pkgs; cppzmq = callPackage ../development/libraries/cppzmq {}; - czmq = callPackage ../development/libraries/czmq/default.nix {}; + czmq = callPackage ../development/libraries/czmq {}; zmqpp = callPackage ../development/libraries/zmqpp { }; @@ -22150,7 +22150,7 @@ with pkgs; enableCmdlib = true; }; - maddy = callPackage ../servers/maddy/default.nix { }; + maddy = callPackage ../servers/maddy { }; mbelib = callPackage ../development/libraries/audio/mbelib { }; @@ -24031,7 +24031,7 @@ with pkgs; gtk = gtk3; }; - bluej = callPackage ../applications/editors/bluej/default.nix { + bluej = callPackage ../applications/editors/bluej { jdk = jetbrains.jdk; }; @@ -24665,7 +24665,7 @@ with pkgs; gpg-mdp = callPackage ../applications/misc/gpg-mdp { }; - greenfoot = callPackage ../applications/editors/greenfoot/default.nix { + greenfoot = callPackage ../applications/editors/greenfoot { jdk = jetbrains.jdk; }; @@ -24819,7 +24819,7 @@ with pkgs; genxword = callPackage ../applications/misc/genxword { }; - geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { }; + geoipupdate = callPackage ../applications/misc/geoipupdate { }; ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; @@ -25311,7 +25311,7 @@ with pkgs; linssid = libsForQt5.callPackage ../applications/networking/linssid { }; - deadd-notification-center = callPackage ../applications/misc/deadd-notification-center/default.nix { }; + deadd-notification-center = callPackage ../applications/misc/deadd-notification-center { }; lollypop = callPackage ../applications/audio/lollypop { }; @@ -25564,7 +25564,7 @@ with pkgs; hpack = haskell.lib.justStaticExecutables haskellPackages.hpack; - hpcg = callPackage ../tools/misc/hpcg/default.nix { }; + hpcg = callPackage ../tools/misc/hpcg { }; hpl = callPackage ../tools/misc/hpl { }; @@ -25637,7 +25637,7 @@ with pkgs; pixelnuke = callPackage ../applications/graphics/pixelnuke { }; - pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap/default.nix { }; + pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { }; shepherd = nodePackages."@nerdwallet/shepherd"; @@ -25767,11 +25767,11 @@ with pkgs; workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { }; - windowchef = callPackage ../applications/window-managers/windowchef/default.nix { }; + windowchef = callPackage ../applications/window-managers/windowchef { }; wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { }; - wmfs = callPackage ../applications/window-managers/wmfs/default.nix { }; + wmfs = callPackage ../applications/window-managers/wmfs { }; i810switch = callPackage ../os-specific/linux/i810switch { }; @@ -25877,7 +25877,7 @@ with pkgs; img2pdf = with python3Packages; toPythonApplication img2pdf; - imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber/default.nix { + imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber { typescript = nodePackages.typescript; }; @@ -26633,7 +26633,7 @@ with pkgs; mop = callPackage ../applications/misc/mop { }; - mopidyPackages = callPackages ../applications/audio/mopidy/default.nix { + mopidyPackages = callPackages ../applications/audio/mopidy { python = python3; }; @@ -27113,9 +27113,9 @@ with pkgs; muchsync = callPackage ../applications/networking/mailreaders/notmuch/muchsync.nix { }; - nufraw = callPackage ../applications/graphics/nufraw/default.nix { }; + nufraw = callPackage ../applications/graphics/nufraw { }; - nufraw-thumbnailer = callPackage ../applications/graphics/nufraw/default.nix { + nufraw-thumbnailer = callPackage ../applications/graphics/nufraw { addThumbnailer = true; }; @@ -28607,7 +28607,7 @@ with pkgs; vimacs = callPackage ../applications/editors/vim/vimacs.nix { }; - vimv = callPackage ../tools/misc/vimv/default.nix { }; + vimv = callPackage ../tools/misc/vimv { }; qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; @@ -29316,7 +29316,7 @@ with pkgs; inherit (gnome2) scrollkeeper libglade; }; - xygrib = libsForQt514.callPackage ../applications/misc/xygrib/default.nix {}; + xygrib = libsForQt514.callPackage ../applications/misc/xygrib {}; xzgv = callPackage ../applications/graphics/xzgv { }; @@ -29793,7 +29793,7 @@ with pkgs; crispyDoom = callPackage ../games/crispy-doom { }; - vintagestory = callPackage ../games/vintagestory/default.nix { }; + vintagestory = callPackage ../games/vintagestory { }; cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { }; cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { }; @@ -31088,7 +31088,7 @@ with pkgs; snpeff = callPackage ../applications/science/biology/snpeff { }; - somafm-cli = callPackage ../tools/misc/somafm-cli/default.nix { }; + somafm-cli = callPackage ../tools/misc/somafm-cli { }; somatic-sniper = callPackage ../applications/science/biology/somatic-sniper { }; @@ -32430,7 +32430,7 @@ with pkgs; nixosTesting.makeTest calledTest; nixosOptionsDoc = attrs: - (import ../../nixos/lib/make-options-doc/default.nix) + (import ../../nixos/lib/make-options-doc) ({ inherit pkgs lib; } // attrs); nixos-install-tools = callPackage ../tools/nix/nixos-install-tools { }; @@ -32746,8 +32746,8 @@ with pkgs; mfcl2740dwlpr = callPackage ../misc/cups/drivers/mfcl2740dwlpr { }; # This driver is only available as a 32 bit proprietary binary driver - mfcl3770cdwlpr = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw/default.nix { }).driver; - mfcl3770cdwcupswrapper = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw/default.nix { }).cupswrapper; + mfcl3770cdwlpr = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw { }).driver; + mfcl3770cdwcupswrapper = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw { }).cupswrapper; mfcl8690cdwcupswrapper = callPackage ../misc/cups/drivers/mfcl8690cdwcupswrapper { }; mfcl8690cdwlpr = callPackage ../misc/cups/drivers/mfcl8690cdwlpr { }; @@ -32755,7 +32755,7 @@ with pkgs; mfc9140cdncupswrapper = callPackage ../misc/cups/drivers/mfc9140cdncupswrapper { }; mfc9140cdnlpr = callPackage ../misc/cups/drivers/mfc9140cdnlpr { }; - samsung-unified-linux-driver_1_00_36 = callPackage ../misc/cups/drivers/samsung/1.00.36/default.nix { }; + samsung-unified-linux-driver_1_00_36 = callPackage ../misc/cups/drivers/samsung/1.00.36 { }; samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { }; samsung-unified-linux-driver_4_00_39 = callPackage ../misc/cups/drivers/samsung/4.00.39 { }; samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { }; @@ -33599,7 +33599,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit; }; - cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix { }; + cagebreak = callPackage ../applications/window-managers/cagebreak { }; psftools = callPackage ../os-specific/linux/psftools {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b97a7007ead83..d24f52972dcd0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4633,7 +4633,7 @@ in { mathlibtools = callPackage ../development/python-modules/mathlibtools { }; - matplotlib = callPackage ../development/python-modules/matplotlib/default.nix { + matplotlib = callPackage ../development/python-modules/matplotlib { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; }; @@ -5305,7 +5305,7 @@ in { openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { }; - openrouteservice = callPackage ../development/python-modules/openrouteservice/default.nix { }; + openrouteservice = callPackage ../development/python-modules/openrouteservice { }; opensensemap-api = callPackage ../development/python-modules/opensensemap-api { }; @@ -5516,7 +5516,7 @@ in { pathvalidate = callPackage ../development/python-modules/pathvalidate { }; - pathy = callPackage ../development/python-modules/pathy/default.nix { }; + pathy = callPackage ../development/python-modules/pathy { }; patiencediff = callPackage ../development/python-modules/patiencediff { }; @@ -8548,7 +8548,7 @@ in { signify = callPackage ../development/python-modules/signify { }; - sip = callPackage ../development/python-modules/sip/default.nix { }; + sip = callPackage ../development/python-modules/sip { }; sip_4 = callPackage ../development/python-modules/sip/4.x.nix { };