From 3ec0eb4bbd783e6f07175c9703ec5a2a70491da9 Mon Sep 17 00:00:00 2001 From: danbst Date: Sat, 2 Feb 2019 01:27:25 +0200 Subject: all-packages.nix: remove `res.` (next stage super) A bit more consistent version of https://github.com/NixOS/nixpkgs/pull/51527 --- pkgs/top-level/all-packages.nix | 74 ++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 37 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac3f6b64712e..d81e26abe1de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3510,7 +3510,7 @@ in jid = callPackage ../development/tools/jid { }; - jing = res.jing-trang; + jing = jing-trang; jing-trang = callPackage ../tools/text/xml/jing-trang { }; jira-cli = callPackage ../development/tools/jira_cli { }; @@ -4805,23 +4805,23 @@ in libcap = if stdenv.isDarwin then null else libcap; }; - pinentry_ncurses = res.pinentry.override { + pinentry_ncurses = pinentry.override { gtk2 = null; }; - pinentry_emacs = res.pinentry.override { + pinentry_emacs = pinentry.override { enableEmacs = true; }; - pinentry_gnome = res.pinentry.override { + pinentry_gnome = pinentry.override { inherit gcr; }; - pinentry_qt4 = res.pinentry.override { + pinentry_qt4 = pinentry.override { qt = qt4; }; - pinentry_qt5 = res.pinentry.override { + pinentry_qt5 = pinentry.override { qt = qt5.qtbase; }; @@ -8691,11 +8691,11 @@ in gputils = callPackage ../development/tools/misc/gputils { }; gradleGen = callPackage ../development/tools/build-managers/gradle { }; - gradle = res.gradleGen.gradle_latest; - gradle_2_14 = res.gradleGen.gradle_2_14; - gradle_2_5 = res.gradleGen.gradle_2_5; - gradle_3_5 = res.gradleGen.gradle_3_5; - gradle_4_10 = res.gradleGen.gradle_4_10; + gradle = gradleGen.gradle_latest; + gradle_2_14 = gradleGen.gradle_2_14; + gradle_2_5 = gradleGen.gradle_2_5; + gradle_3_5 = gradleGen.gradle_3_5; + gradle_4_10 = gradleGen.gradle_4_10; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. @@ -9179,7 +9179,7 @@ in valgrind = callPackage ../development/tools/analysis/valgrind { inherit (buildPackages.darwin) xnu bootstrap_cmds cctools; }; - valgrind-light = res.valgrind.override { gdb = null; }; + valgrind-light = valgrind.override { gdb = null; }; valkyrie = callPackage ../development/tools/analysis/valkyrie { }; @@ -9753,7 +9753,7 @@ in inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT; }; - fltk = res.fltk13; + fltk = fltk13; flyway = callPackage ../development/tools/flyway { }; @@ -9766,7 +9766,7 @@ in freetts = callPackage ../development/libraries/freetts { }; - frog = res.languageMachines.frog; + frog = languageMachines.frog; fstrcmp = callPackage ../development/libraries/fstrcmp { }; @@ -9840,11 +9840,11 @@ in }; gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix { - gtk = res.gtk2; + gtk = gtk2; }; gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix { - gtk = res.gtk2; + gtk = gtk2; }; geoclue2 = callPackage ../development/libraries/geoclue {}; @@ -10252,7 +10252,7 @@ in gumbo = callPackage ../development/libraries/gumbo { }; gvfs = callPackage ../development/libraries/gvfs { - gnome = res.gnome3; + gnome = gnome3; }; gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { }; @@ -11492,7 +11492,7 @@ in libxml2 = callPackage ../development/libraries/libxml2 { }; libxml2Python = pkgs.buildEnv { # slightly hacky - name = "libxml2+py-${res.libxml2.version}"; + name = "libxml2+py-${libxml2.version}"; paths = with libxml2; [ dev bin py ]; inherit (libxml2) passthru; # the hook to find catalogs is hidden by buildEnv @@ -11937,9 +11937,9 @@ in }; pcre = callPackage ../development/libraries/pcre { }; - pcre16 = res.pcre.override { variant = "pcre16"; }; + pcre16 = pcre.override { variant = "pcre16"; }; # pcre32 seems unused - pcre-cpp = res.pcre.override { variant = "cpp"; }; + pcre-cpp = pcre.override { variant = "cpp"; }; pcre2 = callPackage ../development/libraries/pcre2 { }; @@ -15865,7 +15865,7 @@ in inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; tango-icon-theme = callPackage ../data/icons/tango-icon-theme { - gtk = res.gtk2; + gtk = gtk2; }; themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {}; @@ -16110,18 +16110,18 @@ in libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix { }; - go-ethereum = res.altcoins.go-ethereum; - ethabi = res.altcoins.ethabi; + go-ethereum = altcoins.go-ethereum; + ethabi = altcoins.ethabi; - parity = res.altcoins.parity; - parity-beta = res.altcoins.parity-beta; - parity-ui = res.altcoins.parity-ui; + parity = altcoins.parity; + parity-beta = altcoins.parity-beta; + parity-ui = altcoins.parity-ui; - polkadot = res.altcoins.polkadot; + polkadot = altcoins.polkadot; - stellar-core = res.altcoins.stellar-core; + stellar-core = altcoins.stellar-core; - particl-core = res.altcoins.particl-core; + particl-core = altcoins.particl-core; aumix = callPackage ../applications/audio/aumix { gtkGUI = false; @@ -16907,7 +16907,7 @@ in espeak-classic = callPackage ../applications/audio/espeak { }; espeak-ng = callPackage ../applications/audio/espeak-ng { }; - espeak = res.espeak-ng; + espeak = espeak-ng; espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; @@ -17206,7 +17206,7 @@ in inherit (pkgs.gnome3) defaultIconTheme; }; - firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { + firefox-beta-bin = wrapFirefox firefox-beta-bin-unwrapped { browserName = "firefox"; name = "firefox-beta-bin-" + (builtins.parseDrvName firefox-beta-bin-unwrapped.name).version; @@ -17221,7 +17221,7 @@ in inherit (pkgs.gnome3) defaultIconTheme; }; - firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { + firefox-devedition-bin = wrapFirefox firefox-devedition-bin-unwrapped { browserName = "firefox"; nameSuffix = "-devedition"; name = "firefox-devedition-bin-" + @@ -21117,7 +21117,7 @@ in ut2004Packages = callPackage ../games/ut2004 { }; - ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ]; + ut2004demo = ut2004Packages.ut2004 [ ut2004Packages.ut2004-demo ]; vapor = callPackage ../games/vapor { love = love_0_8; }; @@ -21254,8 +21254,8 @@ in # Included for backwards compatibility libsoup libwnck gtk-doc gnome-doc-utils; - gtk = res.gtk2; - gtkmm = res.gtkmm2; + gtk = gtk2; + gtkmm = gtkmm2; }); gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { }); @@ -22309,7 +22309,7 @@ in fakenes = callPackage ../misc/emulators/fakenes { }; - faust = res.faust2; + faust = faust2; faust1 = callPackage ../applications/audio/faust/faust1.nix { }; @@ -22809,7 +22809,7 @@ in 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 { }; - samsung-unified-linux-driver = res.samsung-unified-linux-driver_4_01_17; + samsung-unified-linux-driver = samsung-unified-linux-driver_4_01_17; sane-backends = callPackage ../applications/graphics/sane/backends { gt68xxFirmware = config.sane.gt68xxFirmware or null; -- cgit 1.4.1