diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index bcb86f11ead7..8f227c423266 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -51,8 +51,8 @@ let then "fontconfig" else "fontconfig_${version}"; makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; }; - cache = makeCache pkgs."${fcPackage}"; - cache32 = makeCache pkgs.pkgsi686Linux."${fcPackage}"; + cache = makeCache pkgs.${fcPackage}; + cache32 = makeCache pkgs.pkgsi686Linux.${fcPackage}; in pkgs.writeText "fc-00-nixos-cache.conf" '' diff --git a/nixos/modules/hardware/printers.nix b/nixos/modules/hardware/printers.nix index 12ee5516d4ed..56b91933477d 100644 --- a/nixos/modules/hardware/printers.nix +++ b/nixos/modules/hardware/printers.nix @@ -94,8 +94,8 @@ in { ppdOptions = mkOption { type = types.attrsOf types.str; example = { - "PageSize" = "A4"; - "Duplex" = "DuplexNoTumble"; + PageSize = "A4"; + Duplex = "DuplexNoTumble"; }; default = {}; description = '' @@ -110,7 +110,7 @@ in { }; config = mkIf (cfg.ensurePrinters != [] && config.services.printing.enable) { - systemd.services."ensure-printers" = let + systemd.services.ensure-printers = let cupsUnit = if config.services.printing.startWhenNeeded then "cups.socket" else "cups.service"; in { description = "Ensure NixOS-configured CUPS printers"; diff --git a/nixos/modules/programs/x2goserver.nix b/nixos/modules/programs/x2goserver.nix index d9e7b6e4a5c0..77a1a0da7993 100644 --- a/nixos/modules/programs/x2goserver.nix +++ b/nixos/modules/programs/x2goserver.nix @@ -6,7 +6,7 @@ let cfg = config.programs.x2goserver; defaults = { - superenicer = { "enable" = cfg.superenicer.enable; }; + superenicer = { enable = cfg.superenicer.enable; }; }; confText = generators.toINI {} (recursiveUpdate defaults cfg.settings); x2goServerConf = pkgs.writeText "x2goserver.conf" confText; diff --git a/nixos/modules/services/audio/roon-server.nix b/nixos/modules/services/audio/roon-server.nix index d4b0b098b78e..4eda3c5708da 100644 --- a/nixos/modules/services/audio/roon-server.nix +++ b/nixos/modules/services/audio/roon-server.nix @@ -61,8 +61,8 @@ in { }; - users.groups."${cfg.group}" = {}; - users.users."${cfg.user}" = + users.groups.${cfg.group} = {}; + users.users.${cfg.user} = if cfg.user == "roon-server" then { isSystemUser = true; description = "Roon Server user"; diff --git a/nixos/modules/services/cluster/kubernetes/flannel.nix b/nixos/modules/services/cluster/kubernetes/flannel.nix index 74d10d684375..d799e638fc94 100644 --- a/nixos/modules/services/cluster/kubernetes/flannel.nix +++ b/nixos/modules/services/cluster/kubernetes/flannel.nix @@ -47,7 +47,7 @@ in }]; }; - systemd.services."mk-docker-opts" = { + systemd.services.mk-docker-opts = { description = "Pre-Docker Actions"; path = with pkgs; [ gawk gnugrep ]; script = '' @@ -57,7 +57,7 @@ in serviceConfig.Type = "oneshot"; }; - systemd.paths."flannel-subnet-env" = { + systemd.paths.flannel-subnet-env = { wantedBy = [ "flannel.service" ]; pathConfig = { PathModified = "/run/flannel/subnet.env"; diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix index 3dc5b8feef65..656a2d21b868 100644 --- a/nixos/modules/services/network-filesystems/ceph.nix +++ b/nixos/modules/services/network-filesystems/ceph.nix @@ -390,7 +390,7 @@ in systemd.targets = let targets = [ - { "ceph" = { description = "Ceph target allowing to start/stop all ceph service instances at once"; + { ceph = { description = "Ceph target allowing to start/stop all ceph service instances at once"; wantedBy = [ "multi-user.target" ]; }; } ] ++ optional cfg.mon.enable (makeTarget "mon") ++ optional cfg.mds.enable (makeTarget "mds") diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix index ec69cc838da9..ebfdd9f35b72 100644 --- a/nixos/modules/services/networking/pdns-recursor.nix +++ b/nixos/modules/services/networking/pdns-recursor.nix @@ -168,7 +168,7 @@ in { disable-syslog = true; }; - users.users."${username}" = { + users.users.${username} = { home = dataDir; createHome = true; uid = config.ids.uids.pdns-recursor; diff --git a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix index 195ee76ff4e3..d9ad7e9e3d39 100644 --- a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix +++ b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix @@ -165,7 +165,7 @@ in { config = mkIf cfg.enable { services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") { - "${poolName}" = { + ${poolName} = { user = "icingaweb2"; phpOptions = '' extension = ${pkgs.phpPackages.imagick}/lib/php/extensions/imagick.so diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix index f2516c67c6b3..7f71b86a6fe6 100644 --- a/nixos/modules/services/web-apps/moodle.nix +++ b/nixos/modules/services/web-apps/moodle.nix @@ -18,7 +18,7 @@ let global $CFG; $CFG = new stdClass(); - $CFG->dbtype = '${ { "mysql" = "mariadb"; "pgsql" = "pgsql"; }.${cfg.database.type} }'; + $CFG->dbtype = '${ { mysql = "mariadb"; pgsql = "pgsql"; }.${cfg.database.type} }'; $CFG->dblibrary = 'native'; $CFG->dbhost = '${cfg.database.host}'; $CFG->dbname = '${cfg.database.name}'; @@ -92,8 +92,8 @@ in type = types.int; description = "Database host port."; default = { - "mysql" = 3306; - "pgsql" = 5432; + mysql = 3306; + pgsql = 5432; }.${cfg.database.type}; defaultText = "3306"; }; @@ -294,7 +294,7 @@ in systemd.services.httpd.after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service"; - users.users."${user}".group = group; + users.users.${user}.group = group; }; } diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index 11272ed591b8..f220669c9108 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -179,7 +179,7 @@ in config = mkIf cfg.enable { services.phpfpm.pools = { - "${poolName}" = { + ${poolName} = { inherit (cfg) user group; phpOptions = '' diff --git a/nixos/modules/services/web-apps/selfoss.nix b/nixos/modules/services/web-apps/selfoss.nix index d693c401565f..d5a660ebf289 100644 --- a/nixos/modules/services/web-apps/selfoss.nix +++ b/nixos/modules/services/web-apps/selfoss.nix @@ -115,7 +115,7 @@ in config = mkIf cfg.enable { services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") { - "${poolName}" = { + ${poolName} = { user = "nginx"; settings = mapAttrs (name: mkDefault) { "listen.owner" = "nginx"; diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 4daf3ff9f991..abe4748591e9 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -520,7 +520,7 @@ let ]; services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") { - "${poolName}" = { + ${poolName} = { inherit (cfg) user; settings = mapAttrs (name: mkDefault) { "listen.owner" = "nginx"; diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index e95e71e0d997..4ab7e3f0c0a9 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -36,7 +36,7 @@ let poolOpts = { name, ... }: let - poolOpts = cfg.pools."${name}"; + poolOpts = cfg.pools.${name}; in { options = { diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index a21d22261ba3..71df4e8f0a4d 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -243,11 +243,11 @@ in services.geoclue2.enable = mkDefault true; services.geoclue2.enableDemoAgent = false; # GNOME has its own geoclue agent - services.geoclue2.appConfig."gnome-datetime-panel" = { + services.geoclue2.appConfig.gnome-datetime-panel = { isAllowed = true; isSystem = true; }; - services.geoclue2.appConfig."gnome-color-panel" = { + services.geoclue2.appConfig.gnome-color-panel = { isAllowed = true; isSystem = true; }; diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index f5a593211efc..34e270667151 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -72,7 +72,15 @@ in }; in mkMerge [ { enable = true; - networks."99-main" = genericNetwork mkDefault; + networks."99-main" = (genericNetwork mkDefault) // { + # We keep the "broken" behaviour of applying this to all interfaces. + # In general we want to get rid of this workaround but there hasn't + # been any work on that. + # See the following issues for details: + # - https://github.com/NixOS/nixpkgs/issues/18962 + # - https://github.com/NixOS/nixpkgs/issues/61629 + matchConfig = mkDefault { Name = "*"; }; + }; } (mkMerge (forEach interfaces (i: { netdevs = mkIf i.virtual ({ diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix index 9844ad492e88..2a7c063d3033 100644 --- a/nixos/tests/login.nix +++ b/nixos/tests/login.nix @@ -9,6 +9,7 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }: machine = { pkgs, lib, ... }: { boot.kernelPackages = lib.mkIf latestKernel pkgs.linuxPackages_latest; + sound.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then }; testScript = diff --git a/pkgs/applications/audio/AMB-plugins/default.nix b/pkgs/applications/audio/AMB-plugins/default.nix index 720fd0b88be9..d9a05e0bf660 100644 --- a/pkgs/applications/audio/AMB-plugins/default.nix +++ b/pkgs/applications/audio/AMB-plugins/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { longDescription = '' Mono and stereo to B-format panning, horizontal rotator, square, hexagon and cube decoders. ''; - version = "${version}"; + version = version; homepage = http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/FIL-plugins/default.nix b/pkgs/applications/audio/FIL-plugins/default.nix index ed1f05eaf5c6..cf383c1dd495 100644 --- a/pkgs/applications/audio/FIL-plugins/default.nix +++ b/pkgs/applications/audio/FIL-plugins/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { All switches and controls are internally smoothed, so they can be used 'live' whithout any clicks or zipper noises. This should make this plugin a good candidate for use in systems that allow automation of plugin control ports, such as Ardour, or for stage use. ''; - version = "${version}"; + version = version; homepage = http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix index 7f551304df11..fb9b3c9513f8 100644 --- a/pkgs/applications/audio/axoloti/default.nix +++ b/pkgs/applications/audio/axoloti/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "axoloti"; repo = "axoloti"; - rev = "${version}"; + rev = version; sha256 = "1qffis277wshldr3i939b0r2x3a2mlr53samxqmr2nk1sfm2b4w9"; }; diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix index 86e200ab252f..d16d93318216 100644 --- a/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/pkgs/applications/audio/csound/csound-qt/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "CsoundQt"; repo = "CsoundQt"; - rev = "${version}"; + rev = version; sha256 = "007jhkh0k6qk52r77i067999dwdiimazix6ggp2hvyc4pj6n5dip"; }; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index ad1239b22af2..21cd3fbdb25a 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -20,7 +20,7 @@ let src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; - rev = "${version}"; + rev = version; sha256 = "1pci8ac6sqrm3mb3yikmmr3iy35g3nj4iihazif1amqkbdz719rc"; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix index 0ca5988383a6..9d3656a81f97 100644 --- a/pkgs/applications/audio/ir.lv2/default.nix +++ b/pkgs/applications/audio/ir.lv2/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "tomszilagyi"; repo = "ir.lv2"; - rev = "${version}"; + rev = version; sha256 = "1p6makmgr898fakdxzl4agh48qqwgv1k1kwm8cgq187n0mhiknp6"; }; diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index 3d5c6f699dd2..f3abfbca145d 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "sadko4u"; - repo = "${pname}"; + repo = pname; rev = "${pname}-${version}"; sha256 = "1dzpl7f354rwp37bkr9h2yyafykcdn6m1qqfshqg77fj0pcsw8r2"; }; diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix index 6f81ebbb8f1e..8b08aed62b8b 100644 --- a/pkgs/applications/audio/musescore/darwin.nix +++ b/pkgs/applications/audio/musescore/darwin.nix @@ -9,7 +9,7 @@ with lib; stdenv.mkDerivation rec { pname = "musescore-darwin"; - version = "${concatStringsSep "." versionComponents}"; + version = concatStringsSep "." versionComponents; src = fetchurl { url = "ftp://ftp.osuosl.org/pub/musescore/releases/MuseScore-${concatStringsSep "." (take 3 versionComponents)}/MuseScore-${version}.dmg"; diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix index 8dcca85a25c4..768b40a11388 100644 --- a/pkgs/applications/audio/sooperlooper/default.nix +++ b/pkgs/applications/audio/sooperlooper/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { and the engine can be run standalone on a computer without a monitor. ''; - version = "${version}"; + version = version; homepage = http://essej.net/sooperlooper/index.html; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index 3daed9f63501..9035a2a73c57 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "Spotifyd"; repo = "spotifyd"; - rev = "${version}"; + rev = version; sha256 = "1iybk9xrrvhrcl2xl5r2xhyn1ydhrgwnnb8ldhsw5c16b32z03q1"; }; diff --git a/pkgs/applications/audio/ssrc/default.nix b/pkgs/applications/audio/ssrc/default.nix index 9eb71835caa9..1247bbc19f97 100644 --- a/pkgs/applications/audio/ssrc/default.nix +++ b/pkgs/applications/audio/ssrc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { without audible degradation. ''; - version = "${version}"; + version = version; homepage = http://shibatch.sourceforge.net/; license = licenses.gpl2; maintainers = with maintainers; [ leenaars]; diff --git a/pkgs/applications/audio/tambura/default.nix b/pkgs/applications/audio/tambura/default.nix index 2438cf68536d..030bb2c01a72 100644 --- a/pkgs/applications/audio/tambura/default.nix +++ b/pkgs/applications/audio/tambura/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "olilarkin"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "1w80cmiyzca1wirf5gypg3hcix1ky777id8wnd3k92mn1jf4a24y"; }; diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index 382a1a8b2e21..79801f2e99fa 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -30,7 +30,7 @@ python2.pkgs.buildPythonApplication rec { ]; makeWrapperArgs = [ - "--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao utillinux flac sox ]}" + "--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao utillinux flac sox ]) ]; # some tests require internet access diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix index 5b8b17232b90..2b7ae5d9c6e6 100644 --- a/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/pkgs/applications/blockchains/nano-wallet/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cmakeFlags = let options = { - BOOST_ROOT = "${boost}"; + BOOST_ROOT = boost; Boost_USE_STATIC_LIBS = "OFF"; RAIBLOCKS_GUI = "ON"; RAIBLOCKS_TEST = "ON"; diff --git a/pkgs/applications/editors/emacs-modes/emacs2nix.nix b/pkgs/applications/editors/emacs-modes/emacs2nix.nix index 4c1a0dd2312d..cedc56e97ceb 100644 --- a/pkgs/applications/editors/emacs-modes/emacs2nix.nix +++ b/pkgs/applications/editors/emacs-modes/emacs2nix.nix @@ -14,7 +14,7 @@ in pkgs.mkShell { pkgs.bash ]; - EMACS2NIX = "${src}"; + EMACS2NIX = src; shellHook = '' export PATH=$PATH:${src} diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index 545ad5a5e0c3..fd62ea18b713 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -6,7 +6,7 @@ src = pkgs.fetchFromGitHub { owner = "skeeto"; repo = "elisp-ffi"; - rev = "${version}"; + rev = version; sha256 = "0z2n3h5l5fj8wl8i1ilfzv11l3zba14sgph6gz7dx7q12cnp9j22"; }; buildInputs = [ external.libffi ]; diff --git a/pkgs/applications/editors/geany/with-vte.nix b/pkgs/applications/editors/geany/with-vte.nix index ac35560c7f63..f7351454fb8c 100644 --- a/pkgs/applications/editors/geany/with-vte.nix +++ b/pkgs/applications/editors/geany/with-vte.nix @@ -1,7 +1,7 @@ { runCommand, makeWrapper, geany, gnome2 }: let name = builtins.replaceStrings ["geany-"] ["geany-with-vte-"] geany.name; in -runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; inherit (geany.meta); } " +runCommand name { nativeBuildInputs = [ makeWrapper ]; inherit (geany.meta); } " mkdir -p $out ln -s ${geany}/share $out makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome2.vte}/lib diff --git a/pkgs/applications/editors/jupyter/kernel.nix b/pkgs/applications/editors/jupyter/kernel.nix index 205c32d5f806..43cea9fcae93 100644 --- a/pkgs/applications/editors/jupyter/kernel.nix +++ b/pkgs/applications/editors/jupyter/kernel.nix @@ -8,7 +8,7 @@ let in { displayName = "Python 3"; argv = [ - "${env.interpreter}" + env.interpreter "-m" "ipykernel_launcher" "-f" diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index dd49b0a1cf77..d1028ec6ce8d 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -35,7 +35,7 @@ in python.pkgs.buildPythonApplication { src = fetchFromGitHub { owner = "retext-project"; repo = "retext"; - rev = "${version}"; + rev = version; sha256 = "1zcapywspc9v5zf5cxqkcy019np9n41gmryqixj66zsvd544c6si"; }; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index fb0c32f72d7c..40d16733db27 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "x86_64-linux" = "1iz36nhkg78346g5407df6jv4d1ydb22hhgs8hiaxql3hq5z7x3q"; - "x86_64-darwin" = "1iijk0kx90rax39iradbbafyvd3vwnzsgvyb3s13asy42pbhhkky"; + x86_64-linux = "1iz36nhkg78346g5407df6jv4d1ydb22hhgs8hiaxql3hq5z7x3q"; + x86_64-darwin = "1iijk0kx90rax39iradbbafyvd3vwnzsgvyb3s13asy42pbhhkky"; }.${system}; in callPackage ./generic.nix rec { diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 33a6a26d8b35..02d0396a94f5 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "x86_64-linux" = "09rq5jx7aicwp3qqi5pcv6bmyyp1rm5cfa96hvy3f4grhq1fi132"; - "x86_64-darwin" = "1y1lbb3q5myaz7jg21x5sl0in8wr46brqj9zyrg3f16zahsagzr4"; + x86_64-linux = "09rq5jx7aicwp3qqi5pcv6bmyyp1rm5cfa96hvy3f4grhq1fi132"; + x86_64-darwin = "1y1lbb3q5myaz7jg21x5sl0in8wr46brqj9zyrg3f16zahsagzr4"; }.${system}; in callPackage ./generic.nix rec { diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index d4a7e396cb05..ae2db5181ccb 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sourceRoot = "${name}/src"; - IPEPREFIX="${placeholder "out"}"; + IPEPREFIX=placeholder "out"; URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/"; LUA_PACKAGE = "lua"; diff --git a/pkgs/applications/graphics/runwayml/default.nix b/pkgs/applications/graphics/runwayml/default.nix index f96b70a77b47..c527ce2b229a 100644 --- a/pkgs/applications/graphics/runwayml/default.nix +++ b/pkgs/applications/graphics/runwayml/default.nix @@ -16,7 +16,7 @@ let }; binary = appimageTools.wrapType2 { - name = "${pname}"; + name = pname; inherit src; }; # we only use this to extract the icon diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index 13539169dece..a4f6b1ce9881 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -81,7 +81,7 @@ in stdenv.mkDerivation rec { LUPDATE="${qttools.dev}/bin/lupdate"; LRELEASE="${qttools.dev}/bin/lrelease"; MOC="${qtbase.dev}/bin/moc"; - QTDIR="${qtbase.dev}"; + QTDIR=qtbase.dev; RCC="${qtbase.dev}/bin/rcc"; UIC="${qtbase.dev}/bin/uic"; diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix index d0d3c2b424d3..d8b355efe86d 100644 --- a/pkgs/applications/misc/et/default.nix +++ b/pkgs/applications/misc/et/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "geistesk"; repo = "et"; - rev = "${version}"; + rev = version; sha256 = "167w9qwfpd63rgy0xmkkkh5krmd91q42c3ijy3j099krgdfbb9bc"; }; diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index 464e0ba53346..41cdf267f5de 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchsvn { url = http://svn.openstreetmap.org/applications/rendering/gosmore; sha256 = "0qsckpqx7i7f8gkqhkzdamr65250afk1rpnh3nbman35kdv3dsxi"; - rev = "${version}"; + rev = version; ignoreExternals = true; }; diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index f0026cac52e0..273be11ac63a 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = pkgs.fetchFromGitHub { owner = "alexandervdm"; repo = "gummi"; - rev = "${version}"; + rev = version; sha256 = "1vw8rhv8qj82l6l22kpysgm9mxilnki2kjmvxsnajbqcagr6s7cn"; }; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index b1c849b6bcee..22e6cd2f6667 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; - rev = "${version}"; + rev = version; sha256 = "1r63bl0cam04rps1bjr107qvwsmay4254nv00gwhh9n45s6cslac"; }; diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix index ed0bbc4cb488..3749f568aef2 100644 --- a/pkgs/applications/misc/memo/default.nix +++ b/pkgs/applications/misc/memo/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mrVanDalo"; repo = "memo"; - rev = "${version}"; + rev = version; sha256 = "0azx2bx6y7j0637fg3m8zigcw09zfm2mw9wjfg218sx88cm1wdkp"; }; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index e5d73672eb75..a795c4485160 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # xs/src/libnest2d/cmake_modules/FindNLopt.cmake in the package source - # for finding the nlopt library, which doesn't pick up the package in the nix store. # We need to set the path via the NLOPT environment variable instead. - NLOPT = "${nlopt}"; + NLOPT = nlopt; prePatch = '' # In nix ioctls.h isn't available from the standard kernel-headers package diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index 48a05091ca85..1f35643dd761 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -11,7 +11,7 @@ in mkDerivation rec { src = fetchFromGitHub { owner = "shundhammer"; repo = "qdirstat"; - rev = "${version}"; + rev = version; sha256 = "0q4ccjmlbqifg251kyxwys8wspdskr8scqhacyfrs9cmnjxcjqan"; }; diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 71a433bded79..46b446b429bf 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -12,7 +12,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "sieren"; repo = "QSyncthingTray"; - rev = "${version}"; + rev = version; sha256 = "1n9g4j7qznvg9zl6x163pi9f7wsc3x6q76i33psnm7x2v1i22x5w"; }; diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index b6676a0bf70e..7c239a9b7543 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -8,12 +8,12 @@ let description = "A clone of the well-known terminal emulator rxvt"; desktopItem = makeDesktopItem { - name = "${pname}"; + name = pname; exec = "urxvt"; icon = "utilities-terminal"; comment = description; desktopName = "URxvt"; - genericName = "${pname}"; + genericName = pname; categories = "System;TerminalEmulator;"; }; in diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index c116b5874069..9550a8d4fd7b 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "IgnorantGuru"; repo = "spacefm"; - rev = "${version}"; + rev = version; sha256 = "089r6i40lxcwzp60553b18f130asspnzqldlpii53smz52kvpirx"; }; diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix index 6cacb6215179..ba898932f06c 100644 --- a/pkgs/applications/misc/terminal-parrot/default.nix +++ b/pkgs/applications/misc/terminal-parrot/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "jmhobbs"; repo = "terminal-parrot"; - rev = "${version}"; + rev = version; sha256 = "1b4vr4s1zpkpf5kc1r2kdlp3hf88qp1f7h05g8kd62zf4sfbj722"; }; diff --git a/pkgs/applications/misc/todolist/default.nix b/pkgs/applications/misc/todolist/default.nix index 240ad6e5fca4..669c06a9480e 100644 --- a/pkgs/applications/misc/todolist/default.nix +++ b/pkgs/applications/misc/todolist/default.nix @@ -9,7 +9,7 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "gammons"; repo = "todolist"; - rev = "${version}"; + rev = version; sha256 = "0dazfymby5xm4482p9cyj23djmkz5q7g79cqm2d85mczvz7vks8p"; }; diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index df9ed8973702..425ea8d237b3 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; - rev = "${version}"; + rev = version; sha256 = "11dgz082shxpbsxr4i41as040cfqinm5lbcg3bmsxqvc4hsz2nr5"; }; diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index b7c6f938b19e..2e81e9b05d34 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "crosswire"; repo = "xiphos"; - rev = "${version}"; + rev = version; sha256 = "1vwf1ps6nrajxl1qbs6v1cgykmq5wn4j09j10gbcd3b2nvrprf3g"; }; diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index be42127e2548..4d7b54536e4a 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -17,7 +17,7 @@ stdenv'.mkDerivation rec { src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; - rev = "${version}"; + rev = version; sha256 = "1p8hx8gwnv7a49pffq1xmzmrfi3gs6dyra9dn2xi7cl75yn9kfhm"; }; diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix index 4495fc095796..3383d6838f7b 100644 --- a/pkgs/applications/networking/c14/default.nix +++ b/pkgs/applications/networking/c14/default.nix @@ -9,7 +9,7 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "online-net"; repo = "c14-cli"; - rev = "${version}"; + rev = version; sha256 = "0b1piviy6vvdbak8y8bc24rk3c1fi67vv3352pmnzvrhsar2r5yf"; }; diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix index 7938265d1b8d..4de0c3fbd7b6 100644 --- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "xetys"; repo = "hetzner-kube"; - rev = "${version}"; + rev = version; sha256 = "11202i3340vaz8xh59gwj5x0djcgbzq9jfy2214lcpml71qc85f0"; }; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index d665693439f0..cbe32e57f20d 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { patchShebangs ./hack ''; - WHAT="${concatStringsSep " " components}"; + WHAT=concatStringsSep " " components; postBuild = '' ./hack/update-generated-docs.sh diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix index ab8b7deae72d..dcda18f18be6 100644 --- a/pkgs/applications/networking/cluster/kubetail/default.nix +++ b/pkgs/applications/networking/cluster/kubetail/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "johanhaleby"; repo = "kubetail"; - rev = "${version}"; + rev = version; sha256 = "0mcv23p0h1ww9gvax8b4b4x5hmg02shrbgms0v0c72cmw0zf2phr"; }; diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index de683b26484c..ce6c5424fba1 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -10,7 +10,7 @@ buildGoPackage rec { goPackagePath = "github.com/heptio/sonobuoy"; buildFlagsArray = - let t = "${goPackagePath}"; + let t = goPackagePath; in '' -ldflags= -s -X ${t}/pkg/buildinfo.Version=${version} diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 8e9e6691a79e..144d46043ffe 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -11,7 +11,7 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "wercker"; repo = "stern"; - rev = "${version}"; + rev = version; sha256 = "0xndlq0ks8flzx6rdd4lnkxpkbvdy9sj1jwys5yj7p989ls8by3n"; }; diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix index f16b6337d71a..4a4c93128dfe 100644 --- a/pkgs/applications/networking/gdrive/default.nix +++ b/pkgs/applications/networking/gdrive/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { pname = "gdrive"; version = "2.1.0"; - rev = "${version}"; + rev = version; goPackagePath = "github.com/prasmussen/gdrive"; diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 67d5e56a021f..09273b7caa50 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "BelledonneCommunications"; - repo = "${baseName}"; - rev = "${version}"; + repo = baseName; + rev = version; sha256 = "0az2ywrpx11sqfb4s4r2v726avcjf4k15bvrqj7xvhz7hdndmh0j"; }; diff --git a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix index ff260c9161b8..3b3b0c2fd661 100644 --- a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix +++ b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "oysttyer"; repo = "oysttyer"; - rev = "${version}"; + rev = version; sha256 = "0cm1hvi68iqgjsg15xdii271pklgzjn9j9afb1c460z71kgy3wz2"; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix index bb51adfbfee0..3555e5a7197b 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchgit { url = "https://github.com/dreadatour/pidgin-mra"; - rev = "${version}"; + rev = version; sha256 = "1adq57g11kw7bfpivyvfk3nlpjkc8raiw4bzn3gn4nx3m0wl99vw"; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix index 9f73dba2d99d..a2e59f0c0ff2 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchhg { url = "https://bitbucket.org/olegoandreev/purple-vk-plugin"; - rev = "${version}"; + rev = version; sha256 = "02p57fgx8ml00cbrb4f280ak2802svz80836dzk9f1zwm1bcr2qc"; }; diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index bd88962c40df..02be3c24e512 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; - rev = "${version}"; + rev = version; sha256 = "15adg7ndjkzy04lizjmnvv0pf0snhzp6a8x74mndcm0zma0dia0z"; }; diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index b77407bd0c83..16fb1bbab1ed 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; - rev = "${version}"; + rev = version; sha256 = "1nv1ynad2gcn7r8mm2w3kixmahaql7xax1lccsqyxqmj1r0klk8q"; }; diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index af253a5e03f9..869dcb9d29bd 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -18,13 +18,13 @@ let pname = "wire-desktop"; version = { - "x86_64-linux" = "3.10.2904"; - "x86_64-darwin" = "3.10.3133"; + x86_64-linux = "3.10.2904"; + x86_64-darwin = "3.10.3133"; }.${system} or throwSystem; sha256 = { - "x86_64-linux" = "1vrz4568mlhylx17jw4z452f0vrd8yd8qkbpkcvnsbhs6k066xcn"; - "x86_64-darwin" = "0d8g9fl3yciqp3aic374rzcywb5d5yipgni992khsfdfqhcvm3x9"; + x86_64-linux = "1vrz4568mlhylx17jw4z452f0vrd8yd8qkbpkcvnsbhs6k066xcn"; + x86_64-darwin = "0d8g9fl3yciqp3aic374rzcywb5d5yipgni992khsfdfqhcvm3x9"; }.${system} or throwSystem; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index b37e0b00ce76..89231939bfbc 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -7,7 +7,7 @@ python2Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "mailpile"; repo = "Mailpile"; - rev = "${version}"; + rev = version; sha256 = "1z5psh00fjr8gnl4yjcl4m9ywfj24y1ffa2rfb5q8hq4ksjblbdj"; }; diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix index 776255e7a12c..42950f23a843 100644 --- a/pkgs/applications/networking/ndppd/default.nix +++ b/pkgs/applications/networking/ndppd/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "DanielAdolfsson"; repo = "ndppd"; - rev = "${version}"; + rev = version; sha256 = "0niri5q9qyyyw5lmjpxk19pv3v4srjvmvyd5k6ks99mvqczjx9c0"; }; diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix index 002f142a53ed..3a72ae8ce5f9 100644 --- a/pkgs/applications/networking/newsreaders/quiterss/default.nix +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "QuiteRSS"; repo = "quiterss"; - rev = "${version}"; + rev = version; sha256 = "0xav9qr8n6310636nfbgx4iix65fs3ya5rz2isxsf38bkjm7r3pa"; }; diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index bcaea5eb6dcd..bec0507e4a58 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "transmission-remote-gtk"; repo = "transmission-remote-gtk"; - rev = "${version}"; + rev = version; sha256 = "1pipc1f94jdppv597mqmcj2kw2rdvaqcbl512v7z8vir76p1a7gk"; }; diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb/patchwork/default.nix index 8d6d5e2a4f94..349c4f5e799e 100644 --- a/pkgs/applications/networking/ssb/patchwork/default.nix +++ b/pkgs/applications/networking/ssb/patchwork/default.nix @@ -11,7 +11,7 @@ let }; binary = appimageTools.wrapType2 { - name = "${pname}"; + name = pname; inherit src; }; # we only use this to extract the icon diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index b5cfefd78209..f5f53e10496b 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -279,7 +279,7 @@ in stdenv.mkDerivation rec { ''; configureFlags = [ - "${if withHelp then "" else "--without-help"}" + (if withHelp then "" else "--without-help") "--with-boost=${boost.dev}" "--with-boost-libdir=${boost.out}/lib" "--with-beanshell-jar=${bsh}" diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 9f04cd83c10d..eb774a309416 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -279,7 +279,7 @@ in stdenv.mkDerivation rec { ''; configureFlags = [ - "${if withHelp then "" else "--without-help"}" + (if withHelp then "" else "--without-help") "--with-boost=${boost.dev}" "--with-boost-libdir=${boost.out}/lib" "--with-beanshell-jar=${bsh}" diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix index ce8910d76d45..08b01a4a051b 100644 --- a/pkgs/applications/office/libreoffice/wrapper.nix +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -2,7 +2,7 @@ let jdk = libreoffice.jdk; in -(runCommand "${libreoffice.name}" { +(runCommand libreoffice.name { inherit dbus libreoffice jdk bash; } '' mkdir -p "$out/bin" diff --git a/pkgs/applications/office/paperless/withConfig.nix b/pkgs/applications/office/paperless/withConfig.nix index aafdfe67adb4..652d1478c0ca 100644 --- a/pkgs/applications/office/paperless/withConfig.nix +++ b/pkgs/applications/office/paperless/withConfig.nix @@ -39,7 +39,7 @@ let PAPERLESS_CONSUMPTION_DIR = "${dataDir}/consume"; PAPERLESS_MEDIADIR = "${dataDir}/media"; PAPERLESS_STATICDIR = "${dataDir}/static"; - PAPERLESS_DBDIR = "${dataDir}"; + PAPERLESS_DBDIR = dataDir; }) // config; envVarDefs = mapAttrsToList (n: v: ''export ${n}="${toString v}"'') envVars; diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index 3e4ca0ae975f..199f17afda79 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { repo = "wordgrinder"; owner = "davidgiven"; - rev = "${version}"; + rev = version; sha256 = "08lnq5wmspfqdjmqm15gizcq0xr7mg4h62qhvwj63v0sd6ks1cal"; }; diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix index 9b475b04511d..5f25402c3eb6 100644 --- a/pkgs/applications/radio/dablin/default.nix +++ b/pkgs/applications/radio/dablin/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Opendigitalradio"; repo = "dablin"; - rev = "${version}"; + rev = version; sha256 = "04ir7yg7psnnb48s1qfppvvx6lak4s8f6fqdg721y2kd9129jm82"; }; diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/pkgs/applications/radio/multimon-ng/default.nix index f624359c1632..c0f189686ac9 100644 --- a/pkgs/applications/radio/multimon-ng/default.nix +++ b/pkgs/applications/radio/multimon-ng/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "EliasOenal"; repo = "multimon-ng"; - rev = "${version}"; + rev = version; sha256 = "1973xfyvzl1viz19zr83cgqlx5laxbjrca35rqabn6dlb6xb5xk8"; }; diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index a1c1f625bea1..a00ec6c47eb8 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "kantooon"; repo = "qradiolink"; - rev = "${version}"; + rev = version; sha256 = "0xhg5zhjznmls5m3rhpk1qx0dipxmca12s85w15d0i7qwva2f1gi"; }; diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index b3ff0f51f118..4b5c2c683444 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "EttusResearch"; repo = "uhd"; - rev = "${uhdVer}"; + rev = uhdVer; sha256 = "0y1hff4vslfv36vxgvjqajg4862a11d4wgr0vcb0visgh1bi8qgy"; }; diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix index c9a9b55c31e6..e11f4ebf77c5 100644 --- a/pkgs/applications/science/biology/eggnog-mapper/default.nix +++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix @@ -7,7 +7,7 @@ python27Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "eggnogdb"; repo = "eggnog-mapper"; - rev = "${version}"; + rev = version; sha256 = "1aaaflppy84bhkh2hb5gnzm4xgrz0rz0cgfpadr9w8cva8p0sqdv"; }; diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index 7b482d82e2fa..1fc387fcc66d 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -13,8 +13,8 @@ let description = "A Python-enhanced molecular graphics tool"; desktopItem = makeDesktopItem { - name = "${pname}"; - exec = "${pname}"; + name = pname; + exec = pname; desktopName = "PyMol Molecular Graphics System"; genericName = "Molecular Modeler"; comment = description; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 6f0d8e51448f..3d169f501043 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -17,7 +17,7 @@ let src = fetchFromGitHub { owner = "KiCad"; repo = "kicad-${name}"; - rev = "${version}"; + rev = version; inherit sha256 name; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/math/sage/flask-oldsessions.nix b/pkgs/applications/science/math/sage/flask-oldsessions.nix index 85e35736d030..0899c93602b9 100644 --- a/pkgs/applications/science/math/sage/flask-oldsessions.nix +++ b/pkgs/applications/science/math/sage/flask-oldsessions.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mitsuhiko"; repo = "flask-oldsessions"; - rev = "${version}"; + rev = version; sha256 = "04b5m8njjiwld9a0zw55iqwvyjgwcpdbhz1cic8nyhgcmypbicqn"; }; diff --git a/pkgs/applications/science/math/sage/pybrial.nix b/pkgs/applications/science/math/sage/pybrial.nix index f5cb39603c32..092a340bb5b5 100644 --- a/pkgs/applications/science/math/sage/pybrial.nix +++ b/pkgs/applications/science/math/sage/pybrial.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "BRiAl"; repo = "BRiAl"; - rev = "${version}"; + rev = version; sha256 = "0qy4cwy7qrk4zg151cmws5cglaa866z461cnj9wdnalabs7v7qbg"; }; diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index d6e3f05e0e13..610d7494ed80 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -13,7 +13,7 @@ with stdenv.lib; let - optionOnOff = option: "${if option then "on" else "off"}"; + optionOnOff = option: if option then "on" else "off"; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index 83f8b88ba318..234bbdab3158 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "lammps"; repo = "lammps"; - rev = "${version}"; + rev = version; sha256 = "1dlifm9wm1jcw2zwal3fnzzl41ng08c7v48w6hx2mz84zljg1nsj"; }; diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix index ecbf0c703f19..fe5f8790f38f 100644 --- a/pkgs/applications/science/robotics/apmplanner2/default.nix +++ b/pkgs/applications/science/robotics/apmplanner2/default.nix @@ -10,7 +10,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "ArduPilot"; repo = "apm_planner"; - rev = "${version}"; + rev = version; sha256 = "1k0786mjzi49nb6yw4chh9l4dmkf9gybpxg9zqkr5yg019nyzcvd"; }; diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix index c1a40b12cdea..1da8f2a4a5ed 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "awslabs"; repo = "git-secrets"; - rev = "${version}"; + rev = version; sha256 = "10lnxg0q855zi3d6804ivlrn6dc817kilzdh05mmz8a0ccvm2qc7"; }; diff --git a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix index afd90ba49690..b6659b5f539f 100644 --- a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix @@ -18,7 +18,7 @@ in buildEnv { name = "gitweb-${stdenv.lib.getVersion git}"; ignoreCollisions = true; - paths = stdenv.lib.optional gitwebTheme "${gitwebThemeSrc}" + paths = stdenv.lib.optional gitwebTheme gitwebThemeSrc ++ [ "${git}/share/gitweb" ]; meta = git.meta // { diff --git a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix index d0d60b193437..5c4ece7c9e51 100644 --- a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix +++ b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix @@ -7,7 +7,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "languitar"; repo = "pass-git-helper"; - rev = "${version}"; + rev = version; sha256 = "1zccbmq5l6asl9qm1f90vg9467y3spmv3ayrw07qizrj43yfd9ap"; }; diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index 3a7f8632d2cc..c48f455a64a3 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -6,7 +6,7 @@ pythonPackages.buildPythonApplication rec { # Manually set version because prb wants to get it from the git # upstream repository (and we are installing from tarball instead) - PBR_VERSION = "${version}"; + PBR_VERSION = version; src = fetchFromGitHub { owner = "openstack-infra"; diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 35ac8a18c451..fb18fb7941e6 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -7,7 +7,7 @@ let rubyEnv = bundlerEnv rec { name = "gitlab-env-${version}"; inherit ruby; - gemdir = ./rubyEnv- + "${if gitlabEnterprise then "ee" else "ce"}"; + gemdir = ./rubyEnv- + (if gitlabEnterprise then "ee" else "ce"); gemset = let x = import (gemdir + "/gemset.nix"); in x // { diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix index 8b68dddfceb4..ea34617dc8b1 100644 --- a/pkgs/applications/version-management/peru/default.nix +++ b/pkgs/applications/version-management/peru/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "buildinspace"; repo = "peru"; - rev = "${version}"; + rev = version; sha256 = "0p4j51m89glx12cd65lcnbwpvin0v49wkhrx06755skr7v37pm2a"; }; diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index aed5cb807dc7..66b785e43b17 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "TheLocehiliosan"; repo = "yadm"; - rev = "${version}"; + rev = version; sha256 = "0873jgks7dpfkj5km1jchxdrhf7lia70p0f8zsrh9p4crj5f4pc6"; }; diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index dad52ccb9a7c..1900bf3634ce 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -487,7 +487,7 @@ let self = rec { src = fetchFromGitHub { owner = "peak3d"; repo = "inputstream.adaptive"; - rev = "${version}"; + rev = version; sha256 = "09d9b35mpaf3g5m51viyan9hv7d2i8ndvb9wm0j7rs5gwsf0k71z"; }; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index cdcdea3dd26d..5e7cf9353b25 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -42,7 +42,7 @@ in mkDerivation rec { src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; - rev = "${version}"; + rev = version; sha256 = "05brixq2z98mvn1q2rgdl27xj798509nv8yh6h0yzqyk9gly4anz"; }; diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index b7c8e6feeba4..95f89e0eda5a 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { [ imagemagick ffmpeg swig python3 unittest-cpp cppzmq czmqpp qtbase qtmultimedia ]; - LIBOPENSHOT_AUDIO_DIR = "${libopenshot-audio}"; + LIBOPENSHOT_AUDIO_DIR = libopenshot-audio; "UNITTEST++_INCLUDE_DIR" = "${unittest-cpp}/include/UnitTest++"; doCheck = false; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index a5efddc9f1a8..e33610ac4163 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -7,7 +7,7 @@ pythonPackages.buildPythonApplication rec { src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; - rev = "${version}"; + rev = version; sha256 = "1vyf0pifdqygg98azdkfhy5fdckb0w2ca7c46mkrj452gkvmcq33"; }; diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index 5a98e71c9166..5b2b33d6adf3 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -11,7 +11,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "F1ash"; repo = "qt-virt-manager"; - rev = "${version}"; + rev = version; sha256 = "1z2kq88lljvr24z1kizvg3h7ckf545h4kjhhrjggkr0w4wjjwr43"; }; diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index 574e42cc8481..661ca013e240 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "leftwm"; repo = "leftwm"; - rev = "${version}"; + rev = version; sha256 = "0ji7m2npkdg27gm33b19rxr50km0gm1h9czi1f425vxq65mlkl4y"; }; diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index b39585092edd..69b2e6ceb50f 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation { src = fetchgit { url = "https://github.com/stumpwm/stumpwm"; - rev = "${versionSpec.rev}"; - sha256 = "${versionSpec.sha256}"; + rev = versionSpec.rev; + sha256 = versionSpec.sha256; }; # NOTE: The patch needs an update for the next release. diff --git a/pkgs/build-support/dhall-to-nix.nix b/pkgs/build-support/dhall-to-nix.nix index c563b34ff3bc..3805656dfa0e 100644 --- a/pkgs/build-support/dhall-to-nix.nix +++ b/pkgs/build-support/dhall-to-nix.nix @@ -33,6 +33,6 @@ let }; in - import "${drv}"; + import drv; in dhallToNix diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 256c86748d28..0405951a9e40 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -52,7 +52,7 @@ else stdenvNoCC.mkDerivation { inherit name; builder = ./builder.sh; - fetcher = "${./nix-prefetch-git}"; # This must be a string to ensure it's called with bash. + fetcher = ./nix-prefetch-git; # This must be a string to ensure it's called with bash. nativeBuildInputs = [git]; outputHashAlgo = "sha256"; diff --git a/pkgs/build-support/fetchgit/private.nix b/pkgs/build-support/fetchgit/private.nix index 59376f3b0424..6731cf87fbd1 100644 --- a/pkgs/build-support/fetchgit/private.nix +++ b/pkgs/build-support/fetchgit/private.nix @@ -4,7 +4,7 @@ else null; GIT_SSH = let - config = ''${let + config = let sshConfigFile = if (builtins.tryEval ).success then else builtins.trace '' @@ -14,7 +14,7 @@ You may need StrictHostKeyChecking=no in the config file. Since ssh will refuse to use a group-readable private key, if using build-users you will likely want to use something like IdentityFile /some/directory/%u/key and have a directory for each build user accessible to that user. '' "/var/lib/empty/config"; - in builtins.toString sshConfigFile}''; + in builtins.toString sshConfigFile; ssh-wrapped = runCommand "fetchgit-ssh" { nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix index e5ff13f0da9d..48ee2713d1f6 100644 --- a/pkgs/build-support/vm/windows/default.nix +++ b/pkgs/build-support/vm/windows/default.nix @@ -25,7 +25,7 @@ in { bootstrap = bootstrapper attrs.windowsImage; in { requiredSystemFeatures = [ "kvm" ]; - builder = "${pkgs.stdenv.shell}"; + builder = pkgs.stdenv.shell; args = ["-e" (bootstrap.resumeAndRun builder)]; windowsImage = bootstrap.suspendedVM; origArgs = attrs.args; diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index 80e9543f9c85..d7c347a559ef 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -159,8 +159,8 @@ in runCommand "test-writers" { meta.platforms = stdenv.lib.platforms.all; } '' ${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}/bin/test_writers") (lib.attrValues bin)} - ${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}") (lib.attrValues simple)} - ${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}") (lib.attrValues path)} + ${lib.concatMapStringsSep "\n" (test: writeTest "success" test) (lib.attrValues simple)} + ${lib.concatMapStringsSep "\n" (test: writeTest "success" test) (lib.attrValues path)} echo 'nix-writers successfully tested' >&2 touch $out diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix index 81fa0ea945d3..66f1a5033ebe 100644 --- a/pkgs/data/documentation/stdman/default.nix +++ b/pkgs/data/documentation/stdman/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "jeaye"; repo = "stdman"; - rev = "${version}"; + rev = version; sha256 = "1017vwhcwlwi5sa8h6pkhj048in826wxnhl6qarykmzksvidff3r"; }; diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index 8a6ecc5d5e19..7f4f84fa5fe1 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { - packageName = "${pname}"; + packageName = pname; attrPath = "gnome3.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index 1d14481e7783..33acfd245cf5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { - packageName = "${pname}"; + packageName = pname; attrPath = "gnome3.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix index d5bc0bbc83d2..90be6aed1d79 100644 --- a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix +++ b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { (substituteAll { src = ./fix-paths.patch; task = "${taskwarrior}/bin/task"; - shell = "${runtimeShell}"; + shell = runtimeShell; }) ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index c913a9e87294..904edd7e51a7 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { - packageName = "${pname}"; + packageName = pname; attrPath = "gnome3.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index b3e4879fdae4..175f0e45f46e 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./nma.patch; - networkmanagerapplet = "${networkmanagerapplet}"; + networkmanagerapplet = networkmanagerapplet; }) ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 1c90cc0e6627..7bc3f6ba7adb 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./dpms-helper-exec.patch; - elementary_dpms_helper = "${elementary-dpms-helper}"; + elementary_dpms_helper = elementary-dpms-helper; }) ./hardcode-gsettings.patch ]; diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index df12fba645f2..7b0657bcd80b 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -47,7 +47,7 @@ let dockitemAutostart = substituteAll { src = ./default-elementary-dockitems.desktop; - script = "${dockitems-script}"; + script = dockitems-script; }; executable = writeShellScriptBin "pantheon" '' diff --git a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix index 973040a8da64..8e180ca83a66 100644 --- a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix +++ b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./exec-path.patch; - file_roller = "${file-roller}"; - gnome_bluetooth = "${gnome-bluetooth}"; + file_roller = file-roller; + gnome_bluetooth = gnome-bluetooth; }) ]; diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index efc8446b1a10..2897bac06144 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "arduino"; repo = "Arduino"; - rev = "${version}"; + rev = version; sha256 = "0kblq0bqap2zzkflrj6rmdi8dvqxa28fcwwrc3lfmbz2893ni3w4"; }; @@ -72,22 +72,22 @@ stdenv.mkDerivation rec { teensyduino_src = fetchurl { url = "https://www.pjrc.com/teensy/td_${teensyduino_version}/TeensyduinoInstall.${teensy_architecture}"; sha256 = - lib.optionalString ("${teensy_architecture}" == "linux64") + lib.optionalString (teensy_architecture == "linux64") "09ysanip5d2f5axzd81z2l74ayng60zqhjxmxs7xa5098fff46il" - + lib.optionalString ("${teensy_architecture}" == "linux32") + + lib.optionalString (teensy_architecture == "linux32") "1zw3cfv2p62dwg8838vh0gd1934b18cyx7c13azvwmrpj601l0xx" - + lib.optionalString ("${teensy_architecture}" == "linuxarm") + + lib.optionalString (teensy_architecture == "linuxarm") "12421z26ksx84aldw1pq0cakh8jhs33mwafgvfij0zfgn9x0i877"; }; # Used because teensyduino requires jars be a specific size arduino_dist_src = fetchurl { url = "http://downloads.arduino.cc/arduino-${version}-${teensy_architecture}.tar.xz"; sha256 = - lib.optionalString ("${teensy_architecture}" == "linux64") + lib.optionalString (teensy_architecture == "linux64") "1lv4in9j0r8s0cis4zdvbk2637vlj12w69wdxgcxcrwvkcdahkpa" - + lib.optionalString ("${teensy_architecture}" == "linux32") + + lib.optionalString (teensy_architecture == "linux32") "0zla3a6gd9prclgrbbgsmhf8ds8zb221m65x21pvz0y1cwsdvjpm" - + lib.optionalString ("${teensy_architecture}" == "linuxarm") + + lib.optionalString (teensy_architecture == "linuxarm") "1w5m49wfd68zazli0lf3w4zykab8n7mzp3wnbjqfpx2vip80bqnz"; }; diff --git a/pkgs/development/arduino/arduino-mk/default.nix b/pkgs/development/arduino/arduino-mk/default.nix index 827c5137bf8e..f450d4f850f3 100644 --- a/pkgs/development/arduino/arduino-mk/default.nix +++ b/pkgs/development/arduino/arduino-mk/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "sudar"; repo = "Arduino-Makefile"; - rev = "${version}"; + rev = version; sha256 = "0flpl97d2231gp51n3y4qvf3y1l8xzafi1sgpwc305vwc2h4dl2x"; }; diff --git a/pkgs/development/beam-modules/build-erlang-mk.nix b/pkgs/development/beam-modules/build-erlang-mk.nix index 110c06e6f8ad..4dedf782b753 100644 --- a/pkgs/development/beam-modules/build-erlang-mk.nix +++ b/pkgs/development/beam-modules/build-erlang-mk.nix @@ -25,7 +25,7 @@ let }; pkg = self: stdenv.mkDerivation ( attrs // { - app_name = "${name}"; + app_name = name; name = "${name}-${version}"; inherit version; diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index c9698fcad9b4..817f81f9257b 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -35,7 +35,7 @@ let v_base = "5.0.2"; version = "${v_base}-RELEASE"; - version_friendly = "${v_base}"; + version_friendly = v_base; tag = "refs/tags/swift-${version}"; fetch = { repo, sha256, fetchSubmodules ? false }: diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix index ad01fb4be290..f72ec0890543 100644 --- a/pkgs/development/compilers/vlang/default.nix +++ b/pkgs/development/compilers/vlang/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "vlang"; repo = "v"; - rev = "${version}"; + rev = version; sha256 = "0js92v2r1h4vaaha3z1spgi7qynlmr9vls41gxp284w4yhnjzv15"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { vc = fetchFromGitHub { owner = "vlang"; repo = "vc"; - rev = "${version}"; + rev = version; sha256 = "0qx1drs1hr94w7vaaq5w8mkq7j1d3biffnmxkyz63yv8573k03bj"; }; diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix index 19056ec2b6fd..433b6e6b32cb 100644 --- a/pkgs/development/compilers/z88dk/default.nix +++ b/pkgs/development/compilers/z88dk/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { #_FORTIFY_SOURCE requires compiling with optimization (-O) NIX_CFLAGS_COMPILE = "-O"; - short_rev = "${builtins.substring 0 7 src.rev}"; + short_rev = builtins.substring 0 7 src.rev; makeFlags = [ "git_rev=${short_rev}" "version=${version}" diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index 15ee5f403bc3..d4caabc6cb83 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -65,7 +65,7 @@ in stdenv.mkDerivation { rpath = stdenv.lib.strings.makeLibraryPath libraries; passthru = { - home = "${zulu}"; + home = zulu; }; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index 90b28d318316..5f345c87355f 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation { rpath = stdenv.lib.strings.makeLibraryPath libraries; passthru = { - home = "${zulu}"; + home = zulu; }; meta = with stdenv.lib; { diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix index 91fdb8651cc6..524427c109a6 100644 --- a/pkgs/development/coq-modules/contribs/default.nix +++ b/pkgs/development/coq-modules/contribs/default.nix @@ -3,13 +3,13 @@ let mkContrib = repo: revs: param: stdenv.mkDerivation rec { name = "coq${coq.coq-version}-${repo}-${version}"; - version = "${param.version}"; + version = param.version; src = fetchFromGitHub { owner = "coq-contribs"; - repo = "${repo}"; - rev = "${param.rev}"; - sha256 = "${param.sha256}"; + repo = repo; + rev = param.rev; + sha256 = param.sha256; }; buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib coq ]; diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index 38444fe2b061..b6efd3d75a4e 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -38,13 +38,13 @@ in stdenv.mkDerivation rec { name = "coq${coq.coq-version}-equations-${version}"; - version = "${param.version}"; + version = param.version; src = fetchFromGitHub { owner = "mattam82"; repo = "Coq-Equations"; - rev = "${param.rev}"; - sha256 = "${param.sha256}"; + rev = param.rev; + sha256 = param.sha256; }; buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib coq ]; diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index 24266d596765..af71d5cc80d7 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -122,6 +122,6 @@ (stdenv.lib.optionalAttrs (!stdenv.isLinux) { # Work around . - SHELL = "${stdenv.shell}"; - CONFIG_SHELL = "${stdenv.shell}"; + SHELL = stdenv.shell; + CONFIG_SHELL = stdenv.shell; }) diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index bba54c83f5c5..7e90c6dfb287 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchFromBitbucket { owner = "rude"; repo = "love"; - rev = "${version}"; + rev = version; sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym"; }; diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix index 1c64c417cb0c..478b147d1f3d 100644 --- a/pkgs/development/interpreters/love/11.1.nix +++ b/pkgs/development/interpreters/love/11.1.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchFromBitbucket { owner = "rude"; repo = "love"; - rev = "${version}"; + rev = version; sha256 = "0q1lsgc1621czrg49nmabq6am9sgxa9syxrwzlksqqr4dyzw4nmf"; }; diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index 99c763615e3d..02f6d34a0305 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -36,7 +36,7 @@ let buildInputs = libs; PYTHON = if buildWithPypy then "${pypy}/pypy-c/pypy-c" - else "${python2.interpreter}"; + else python2.interpreter; unpackPhase = '' cp -R ${pixie-src} pixie-src mkdir pypy-src diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 1de1c401c37c..32aa355d3aa2 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -129,8 +129,8 @@ in with passthru; stdenv.mkDerivation { substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" ''; - CPPFLAGS = "${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"; - LDFLAGS = "${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}"; + CPPFLAGS = concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs); + LDFLAGS = concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs); LIBS = "${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; # Determinism: We fix the hashes of str, bytes and datetime objects. diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index db68578d62a6..30ac6d2bd5b4 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { pythonPath = [ pygame_sdl2 tkinter ]; - RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: "${path}") [ + RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: path) [ SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU_combined fribidi zlib ]); diff --git a/pkgs/development/libraries/abseil-cpp/default.nix b/pkgs/development/libraries/abseil-cpp/default.nix index 5795d0baa624..b46963f4673e 100644 --- a/pkgs/development/libraries/abseil-cpp/default.nix +++ b/pkgs/development/libraries/abseil-cpp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; - rev = "${rev}"; + rev = rev; sha256 = "1bpz44hxq5fpkv6jlgphzk7mxjiiah526jgb63ih5pd1hd2cfw1r"; }; diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 1e9496c1a1cc..263acfed63a0 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; - rev = "${version}"; + rev = version; sha256 = "1lalbqn4cwf0vp4hiq72gwpd7kq501j21rnjb380mv26pk7r2ivz"; }; diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index ac67a101bc58..d3e18aa776fc 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { version = "2.16.0"; src = fetchFromGitHub { owner = "fredrik-johansson"; - repo = "${pname}"; - rev = "${version}"; + repo = pname; + rev = version; sha256 = "0478671wfwy3gl26sbxh1jq1ih36z4k72waa8y2y2lvn649gb7cd"; }; buildInputs = [mpir gmp mpfr flint]; diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix index 7cb151e4203f..c4c931ecadef 100644 --- a/pkgs/development/libraries/audio/ntk/default.nix +++ b/pkgs/development/libraries/audio/ntk/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Fork of FLTK 1.3.0 with additional functionality"; - version = "${version}"; + version = version; homepage = http://non.tuxfamily.org/; license = stdenv.lib.licenses.lgpl21; maintainers = with stdenv.lib.maintainers; [ magnetophon nico202 ]; diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix index dad36209ed8d..e9238ac2b874 100644 --- a/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/pkgs/development/libraries/audio/rtaudio/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "thestk"; repo = "rtaudio"; - rev = "${version}"; + rev = version; sha256 = "1pglnjz907ajlhnlnig3p0sx7hdkpggr8ss7b3wzf1lykzgv9l52"; }; diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix index 6cd7d06da9df..16527a763c92 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "thestk"; repo = "rtmidi"; - rev = "${version}"; + rev = version; sha256 = "1g31p6a96djlbk9jh5r4pjly3x76lhccva9hrw6xzdma8dsjzgyq"; }; diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix index d91784ce14f4..debe7d56f7b0 100644 --- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix +++ b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = { description = "The successor of clalsadrv, provides easy access to ALSA PCM devices"; - version = "${version}"; + version = version; homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix index 308aa020e363..93bd18abaaef 100644 --- a/pkgs/development/libraries/audio/zita-convolver/default.nix +++ b/pkgs/development/libraries/audio/zita-convolver/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Convolution library by Fons Adriaensen"; - version = "${version}"; + version = version; homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix index 98e272d5dab4..b0b0186af88c 100644 --- a/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Resample library by Fons Adriaensen"; - version = "${version}"; + version = version; homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 5439c7657e08..2730696344e0 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { buildInputs = [cmake mbedtls bcunit srtp]; src = fetchFromGitHub { owner = "BelledonneCommunications"; - repo = "${baseName}"; - rev = "${version}"; + repo = baseName; + rev = version; sha256 = "1cxx243wyzkd4xnvpyqf97n0rjhfckpvw1vhwnbwshq3q6fra909"; }; diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index 093bb811489f..aa6cb8513ae4 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "BelledonneCommunications"; - repo = "${baseName}"; - rev = "${version}"; + repo = baseName; + rev = version; sha256 = "1pwji83vpsdrfma24rnj3rz1x0a0g6zk3v4xjnip7zf2ys3zcnlk"; }; diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 9c124a62601b..d4420e40ab69 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "BelledonneCommunications"; - repo = "${baseName}"; - rev = "${version}"; + repo = baseName; + rev = version; sha256 = "0q70db1klvhca1af29bm9paka3gyii5hfbzrj4178gclsg7cj8fk"; }; diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix index 736c9a2f9e0c..f0557b0379f2 100644 --- a/pkgs/development/libraries/belr/default.nix +++ b/pkgs/development/libraries/belr/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "BelledonneCommunications"; - repo = "${baseName}"; - rev = "${version}"; + repo = baseName; + rev = version; sha256 = "0mf8lsyq1z3b5p47c00lnwc8n7v9nzs1fd2g9c9hnz6fjd2ka44w"; }; diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index 42453848066a..b2dc295db5b7 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "BelledonneCommunications"; - repo = "${baseName}"; - rev = "${version}"; + repo = baseName; + rev = version; sha256 = "0438zzxp82bj5fmvqnwlljkgrz9ab5qm5lgpwwgmg1cp78bp2l45"; }; diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 890e2996f5d2..3ebc0b36679c 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; - rev = "${version}"; + rev = version; sha256 = "10dcpmdsfq6r7hpvg413pqi1q3rjvgn7f87c17ghyz30x6rjhaic"; }; diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix index 5f6b3766012e..d84cda5b7501 100644 --- a/pkgs/development/libraries/cddlib/default.nix +++ b/pkgs/development/libraries/cddlib/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "cddlib"; repo = "cddlib"; - rev = "${version}"; + rev = version; sha256 = "1z03ljy3rrr0qq5gq54vynnif6fn0xhn05g90nnv0dpyc3ps8lzp"; }; buildInputs = [gmp]; diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix index 647c80bf8ac3..6f5314142427 100644 --- a/pkgs/development/libraries/curlcpp/default.nix +++ b/pkgs/development/libraries/curlcpp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "JosephP91"; repo = "curlcpp"; - rev = "${version}"; + rev = version; sha256 = "025qg5hym73xrvyhalv3jgbf9jqnnzkdjs3zwsgbpqx58zyd5bg5"; }; diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index 71229909431e..6aaefd8a2cc6 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # ping @timokau for more info src = fetchFromGitHub { owner = "JohnCremona"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "1910np1xzyjzszay24xn4b81qhpsvhp5aix9vdpknplni2mq8kwb"; }; diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index d45767058bb7..aa7b2ee9a059 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "anholt"; repo = "libepoxy"; - rev = "${version}"; + rev = version; sha256 = "03nrmf161xyj3q9zsigr5qj5vx5dsfxxyjva73cm1mgqqc5d60px"; }; diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index a2b048ebd19a..d46d997f6447 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "linbox-team"; - repo = "${pname}"; - rev = "${version}"; + repo = pname; + rev = version; sha256 = "1ynbjd72qrwp0b4kpn0p5d7gddpvj8dlb5fwdxajr5pvkvi3if74"; }; diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix index 5db1e0a47cfc..bea367b2554e 100644 --- a/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/pkgs/development/libraries/ffmpeg/3.4.nix @@ -5,7 +5,7 @@ }@args: callPackage ./generic.nix (args // rec { - version = "${branch}"; + version = branch; branch = "3.4.6"; sha256 = "1s20wzgxxrm56gckyb8cf1lh36hdnkdxvmmnnvdxvia4zb3grf1b"; darwinFrameworks = [ Cocoa CoreMedia ]; diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 8fd2ce704982..670f51000a6b 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -5,7 +5,7 @@ }@args: callPackage ./generic.nix (args // rec { - version = "${branch}"; + version = branch; branch = "4.2"; sha256 = "1f3glany3p2j832a9wia5vj8ds9xpm0xxlyia91y17hy85gxwsrh"; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 6ade5eb833a9..796861a30654 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "fmtlib"; repo = "fmt"; - rev = "${version}"; + rev = version; sha256 = "1hl9s69a5ql5nckc0ifh2fzlgsgv1wsn6yhqkpnrhasqkhj0hgv4"; }; diff --git a/pkgs/development/libraries/fplll/20160331.nix b/pkgs/development/libraries/fplll/20160331.nix index 1fd18254e10f..aabbfd14a78b 100644 --- a/pkgs/development/libraries/fplll/20160331.nix +++ b/pkgs/development/libraries/fplll/20160331.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { pname = "fplll"; version = "20160331"; src = fetchFromGitHub { - owner = "${pname}"; - repo = "${pname}"; + owner = pname; + repo = pname; rev = "11dea26c2f9396ffb7a7191aa371343f1f74c5c3"; sha256 = "1clxch9hbr30w6s84m2mprxv58adhg5qw6sa2p3jr1cy4r7r59ib"; }; diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index f06f7bf4a02f..a70e9934520a 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -5,9 +5,9 @@ stdenv.mkDerivation rec { pname = "fplll"; version = "5.2.1"; src = fetchFromGitHub { - owner = "${pname}"; - repo = "${pname}"; - rev = "${version}"; + owner = pname; + repo = pname; + rev = version; sha256 = "015qmrd7nfaysbv1hbwiprz9g6hnww1y1z1xw8f43ysb7k1b5nbg"; }; nativeBuildInputs = [autoconf automake libtool gettext autoreconfHook]; diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix index 86c5b7949a1b..affd57c06bc1 100644 --- a/pkgs/development/libraries/gio-sharp/default.nix +++ b/pkgs/development/libraries/gio-sharp/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "mono"; repo = "gio-sharp"; - rev = "${version}"; + rev = version; sha256 = "13pc529pjabj7lq23dbndc26ssmg5wkhc7lfvwapm87j711m0zig"; }; diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 4c1e538dcd66..6011dd03a46c 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "4.1.1"; src = fetchFromGitHub { owner = "linbox-team"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "11wz57q6ijsvfs5r82masxgr319as92syi78lnl9lgdblpc6xigk"; }; diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 2ee36d405b31..6532d6f81b54 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "glfw"; repo = "GLFW"; - rev = "${version}"; + rev = version; sha256 = "0gq6ad38b3azk0w2yy298yz2vmg2jmf9g0ydidqbmiswpk25ills"; }; diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix index 36d42644e0b5..fa762c3a02e8 100644 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ b/pkgs/development/libraries/gnome-sharp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mono"; repo = "gnome-sharp"; - rev = "${version}"; + rev = version; sha256 = "15jsm6n0sih0nf3w8vmvik97q7l3imz4vkdzmp9k7bssiz4glj1z"; }; diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix index 065dc2ac077e..2b83a8ef52e2 100644 --- a/pkgs/development/libraries/gtk-sharp-beans/default.nix +++ b/pkgs/development/libraries/gtk-sharp-beans/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "mono"; repo = "gtk-sharp-beans"; - rev = "${version}"; + rev = version; sha256 = "04sylwdllb6gazzs2m4jjfn14mil9l3cny2q0xf0zkhczzih6ah1"; }; diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index a3a8c7baa092..11b6df37fc0c 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "STEllAR-GROUP"; repo = "hpx"; - rev = "${version}"; + rev = version; sha256 = "0yzxb8520qh9rvzsa190yzx21jn3d8rl8ac5v01767ygd0413hfk"; }; diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 208f294aef7e..124c961b96ac 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -15,7 +15,7 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "${type}krb5-${version}"; majorVersion = "1.17"; - version = "${majorVersion}"; + version = majorVersion; src = fetchurl { url = "https://kerberos.org/dist/krb5/${majorVersion}/krb5-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 698182dbd4ed..f67b3cee607b 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "xiph"; repo = "libao"; - rev = "${version}"; + rev = version; sha256 = "0svgk4sc9kdhcsfyvbvgm5vpbg3sfr6z5rliflrw49v3x2i4vxq5"; }; diff --git a/pkgs/development/libraries/libaosd/default.nix b/pkgs/development/libraries/libaosd/default.nix index 5b9647d275cb..6cf395d7e74e 100644 --- a/pkgs/development/libraries/libaosd/default.nix +++ b/pkgs/development/libraries/libaosd/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "atheme-legacy"; repo = "libaosd"; - rev = "${version}"; + rev = version; sha256 = "1cn7k0n74p6jp25kxwcyblhmbdvgw3mikvj0m2jh4c6xccfrgb9a"; }; diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index cbedd97b2eec..6203b8c7b712 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "gphoto"; repo = "libgphoto2"; - rev = "${meta.tag}"; + rev = meta.tag; sha256 = "1sc2ycx11khf0qzp1cqxxx1qymv6bjfbkx3vvbwz6wnbyvsigxz2"; }; diff --git a/pkgs/development/libraries/libgroove/default.nix b/pkgs/development/libraries/libgroove/default.nix index fd34f28c1e81..511af0b613b8 100644 --- a/pkgs/development/libraries/libgroove/default.nix +++ b/pkgs/development/libraries/libgroove/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "andrewrk"; repo = "libgroove"; - rev = "${version}"; + rev = version; sha256 = "1la9d9kig50mc74bxvhx6hzqv0nrci9aqdm4k2j4q0s1nlfgxipd"; }; diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix index 67d525112ccb..1c5c39ac8989 100644 --- a/pkgs/development/libraries/liblangtag/default.nix +++ b/pkgs/development/libraries/liblangtag/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { src = fetchFromBitbucket { owner = "tagoh"; - repo = "${pname}"; - rev = "${version}"; + repo = pname; + rev = version; sha256 = "19dk2qsg7f3ig9xz8d73jvikmf5kvrwi008wrz2psxinbdml442g"; }; diff --git a/pkgs/development/libraries/liblaxjson/default.nix b/pkgs/development/libraries/liblaxjson/default.nix index dd999db27599..f185a44380ab 100644 --- a/pkgs/development/libraries/liblaxjson/default.nix +++ b/pkgs/development/libraries/liblaxjson/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "andrewrk"; repo = "liblaxjson"; - rev = "${version}"; + rev = version; sha256 = "01iqbpbhnqfifhv82m6hi8190w5sdim4qyrkss7z1zyv3gpchc5s"; }; diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index e1d0a51a6685..a9a17eca786a 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "rime"; repo = "librime"; - rev = "${version}"; + rev = version; sha256 = "0xskhdhk7dgpc71r39pfzxi5vrlzy90aqj1gzv8nnapq91p2awhv"; }; diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix index e7ec858cc7b3..62e5601b73c4 100644 --- a/pkgs/development/libraries/libsoundio/default.nix +++ b/pkgs/development/libraries/libsoundio/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "andrewrk"; repo = "libsoundio"; - rev = "${version}"; + rev = version; sha256 = "12l4rvaypv87vigdrmjz48d4d6sq4gfxf5asvnc4adyabxb73i4x"; }; diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 8635b8c412f3..70320ead5d11 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "linbox-team"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "10j6dspbsq7d2l4q3y0c1l1xwmaqqba2fxg59q5bhgk9h5d7q571"; }; diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/development/libraries/lmdbxx/default.nix index f4ecba7ad1e4..95d8f45eec46 100644 --- a/pkgs/development/libraries/lmdbxx/default.nix +++ b/pkgs/development/libraries/lmdbxx/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "drycpp"; repo = "lmdbxx"; - rev = "${version}"; + rev = version; sha256 = "1jmb9wg2iqag6ps3z71bh72ymbcjrb6clwlkgrqf1sy80qwvlsn6"; }; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 05494d1ad1a7..93e73a44bc9c 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "BelledonneCommunications"; - repo = "${baseName}"; - rev = "${version}"; + repo = baseName; + rev = version; sha256 = "02745bzl2r1jqvdqzyv94fjd4w92zr976la4c4nfvsy52waqah7j"; }; diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/development/libraries/msgpuck/default.nix index b200a12ef954..0ce4870272c3 100644 --- a/pkgs/development/libraries/msgpuck/default.nix +++ b/pkgs/development/libraries/msgpuck/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "rtsisyk"; repo = "msgpuck"; - rev = "${version}"; + rev = version; sha256 = "0cjq86kncn3lv65vig9cqkqqv2p296ymcjjbviw0j1s85cfflps0"; }; diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index 2e29ab395d6b..d813d6c519ca 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "ntop"; repo = "nDPI"; - rev = "${version}"; + rev = version; sha256 = "0lc4vga89pm954vf92g9fa6xwsjkb13jd6wrcc35zy5j04nf9rzf"; }; diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix index 4609fd1a3769..403b0326bb5a 100644 --- a/pkgs/development/libraries/notify-sharp/default.nix +++ b/pkgs/development/libraries/notify-sharp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "notify-sharp"; - rev = "${version}"; + rev = version; sha256 = "1vm7mnmxdwrgy4mr07lfva8sa6a32f2ah5x7w8yzcmahaks3sj5m"; }; diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix index 292b824709b2..25e7267b3c9f 100644 --- a/pkgs/development/libraries/openbsm/default.nix +++ b/pkgs/development/libraries/openbsm/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = "${lib.toUpper (builtins.replaceStrings ["." "-"] ["_" "_"] "${pname}-${version}")}"; + rev = lib.toUpper (builtins.replaceStrings ["." "-"] ["_" "_"] "${pname}-${version}"); sha256 = "0b98359hd8mm585sh145ss828pg2y8vgz38lqrb7nypapiyqdnd1"; }; diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 775695901425..6bf5ea6023e0 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; - rev = "${version}"; + rev = version; sha256 = "1mj3zsywxphh9wcazyqsldwwn14r77xv9cjsmc0nmcybsl2bwnpl"; }; diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index ea4ee44eb2df..f47b6ac8b21f 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -22,32 +22,32 @@ let # determine the version number, there might be different ones per architecture version = { - "x86_64-linux" = "19.3.0.0.0"; - "x86_64-darwin" = "18.1.0.0.0"; - }."${stdenv.hostPlatform.system}" or throwSystem; + x86_64-linux = "19.3.0.0.0"; + x86_64-darwin = "18.1.0.0.0"; + }.${stdenv.hostPlatform.system} or throwSystem; # hashes per component and architecture hashes = { - "x86_64-linux" = { - "basic" = "1yk4ng3a9ka1mzgfph9br6rwclagbgfvmg6kja11nl5dapxdzaxy"; - "sdk" = "115v1gqr0czy7dcf2idwxhc6ja5b0nind0mf1rn8iawgrw560l99"; - "sqlplus" = "0zj5h84ypv4n4678kfix6jih9yakb277l9hc0819iddc0a5slbi5"; - "odbc" = "1g1z6pdn76dp440fh49pm8ijfgjazx4cvxdi665fsr62h62xkvch"; + x86_64-linux = { + basic = "1yk4ng3a9ka1mzgfph9br6rwclagbgfvmg6kja11nl5dapxdzaxy"; + sdk = "115v1gqr0czy7dcf2idwxhc6ja5b0nind0mf1rn8iawgrw560l99"; + sqlplus = "0zj5h84ypv4n4678kfix6jih9yakb277l9hc0819iddc0a5slbi5"; + odbc = "1g1z6pdn76dp440fh49pm8ijfgjazx4cvxdi665fsr62h62xkvch"; }; - "x86_64-darwin" = { - "basic" = "fac3cdaaee7526f6c50ff167edb4ba7ab68efb763de24f65f63fb48cc1ba44c0"; - "sdk" = "98e6d797f1ce11e59b042b232f62380cec29ec7d5387b88a9e074b741c13e63a"; - "sqlplus" = "02e66dc52398fced75e7efcb6b4372afcf617f7d88344fb7f0f4bb2bed371f3b"; - "odbc" = "5d0cdd7f9dd2e27affbc9b36ef9fc48e329713ecd36905fdd089366e365ae8a2"; + x86_64-darwin = { + basic = "fac3cdaaee7526f6c50ff167edb4ba7ab68efb763de24f65f63fb48cc1ba44c0"; + sdk = "98e6d797f1ce11e59b042b232f62380cec29ec7d5387b88a9e074b741c13e63a"; + sqlplus = "02e66dc52398fced75e7efcb6b4372afcf617f7d88344fb7f0f4bb2bed371f3b"; + odbc = "5d0cdd7f9dd2e27affbc9b36ef9fc48e329713ecd36905fdd089366e365ae8a2"; }; - }."${stdenv.hostPlatform.system}" or throwSystem; + }.${stdenv.hostPlatform.system} or throwSystem; # rels per component and architecture, optional rels = { - "x86_64-darwin" = { - "sdk" = "2"; + x86_64-darwin = { + sdk = "2"; }; - }."${stdenv.hostPlatform.system}" or {}; + }.${stdenv.hostPlatform.system} or {}; # convert platform to oracle architecture names arch = { @@ -80,7 +80,7 @@ let # assemble srcs srcs = map (component: - (fetcher (srcFilename component arch version rels."${component}" or "") hashes."${component}" or "")) + (fetcher (srcFilename component arch version rels.${component} or "") hashes.${component} or "")) components; pname = "oracle-instantclient"; diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index e58e347c7f3e..58f355b27fe1 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "BelledonneCommunications"; - repo = "${baseName}"; - rev = "${version}"; + repo = baseName; + rev = version; sha256 = "12cwv593bsdnxs0zfcp07vwyk7ghlz2wv7vdbs1ksv293w3vj2rv"; }; diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index 2156c0e5350a..6d84e6091270 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "flavio"; repo = "qjson"; - rev = "${version}"; + rev = version; sha256 = "1f4wnxzx0qdmxzc7hqk28m0sva7z9p9xmxm6aifvjlp0ha6pmfxs"; }; diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index c428fbab588b..ef4e89aecb84 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { doCheck = false; - MKLROOT = optionalString mklSupport "${mkl}"; + MKLROOT = optionalString mklSupport mkl; enableParallelBuilding=true; buildFlags = [ "magma" "magma_sparse" ]; diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix index 4ee6f6cb9927..838fb1f3638f 100644 --- a/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # name of library file ("libzn_poly.so") libbasename = "libzn_poly"; - libext = "${stdenv.targetPlatform.extensions.sharedLibrary}"; + libext = stdenv.targetPlatform.extensions.sharedLibrary; makeFlags = [ "CC=cc" ]; diff --git a/pkgs/development/libraries/smarty3-i18n/default.nix b/pkgs/development/libraries/smarty3-i18n/default.nix index 14cefdea77b4..cd1584ac739b 100644 --- a/pkgs/development/libraries/smarty3-i18n/default.nix +++ b/pkgs/development/libraries/smarty3-i18n/default.nix @@ -5,7 +5,7 @@ src = fetchFromGitHub { owner = "kikimosha"; repo = "smarty3-i18n"; - rev = "${version}"; + rev = version; sha256 = "0rjxq4wka73ayna3hb5dxc5pgc8bw8p5fy507yc6cv2pl4h4nji2"; }; diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index 73cc88882d0f..80c3630af29e 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "google"; repo = "snappy"; - rev = "${version}"; + rev = version; sha256 = "1x7r8sjmdqlqjz0xfiwdyrqpgaj5yrvrgb28ivgpvnxgar5qv6m2"; }; diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 227d3c4c5476..5e0f37bbb526 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { if stdenv.hostPlatform.system == "x86_64-freebsd" then "bsd" else if stdenv.hostPlatform.system == "x686-freebsd" then "bsd" else throw "Don't know what arch to select for tachyon build"; - makeFlags = "${arch}"; + makeFlags = arch; patches = [ # Remove absolute paths in Make-config (and unset variables so they can be set in preBuild) ./no-absolute-paths.patch diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index a2cb103a1821..6dcfa3068c11 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -1,10 +1,13 @@ -{stdenv, fetchurl, zlib, cmake, fetchpatch}: +{ stdenv, fetchurl, cmake, fetchpatch +, zlib +}: stdenv.mkDerivation rec { - name = "taglib-1.11.1"; + pname = "taglib"; + version = "1.11.1"; src = fetchurl { - url = "http://taglib.org/releases/${name}.tar.gz"; + url = "http://taglib.org/releases/${pname}-${version}.tar.gz"; sha256 = "0ssjcdjv4qf9liph5ry1kngam1y7zp8fzr9xv4wzzrma22kabldn"; }; @@ -22,6 +25,13 @@ stdenv.mkDerivation rec { url = "https://github.com/taglib/taglib/commit/272648ccfcccae30e002ccf34a22e075dd477278.patch"; sha256 = "0p397qq4anvcm0p8xs68mxa8hg6dl07chg260lc6k2929m34xv72"; }) + + (fetchpatch { + # many consumers of taglib have started vendoring taglib due to this bug + name = "fix_ogg_corruption.patch"; + url = "https://github.com/taglib/taglib/commit/9336c82da3a04552168f208cd7a5fa4646701ea4.patch"; + sha256 = "01wlwk4gmfxdg5hjj9jmrain7kia89z0zsdaf5gn3nibmy5bq70r"; + }) ]; nativeBuildInputs = [ cmake ]; @@ -31,8 +41,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; meta = with stdenv.lib; { - homepage = http://taglib.org/; - repositories.git = git://github.com/taglib/taglib.git; + homepage = "http://taglib.org/"; + repositories.git = "git://github.com/taglib/taglib.git"; description = "A library for reading and editing audio file metadata."; longDescription = '' TagLib is a library for reading and editing the meta-data of several diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix index d62a8524644d..3d36245631be 100644 --- a/pkgs/development/libraries/v8/3.14.nix +++ b/pkgs/development/libraries/v8/3.14.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "v8"; repo = "v8"; - rev = "${version}"; + rev = version; inherit sha256; }; patchPhase = '' diff --git a/pkgs/development/libraries/xavs/default.nix b/pkgs/development/libraries/xavs/default.nix index d7ec3ae9c1e8..a5536f70a902 100644 --- a/pkgs/development/libraries/xavs/default.nix +++ b/pkgs/development/libraries/xavs/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchsvn { url = "https://svn.code.sf.net/p/xavs/code/trunk"; - rev = "${version}"; + rev = version; sha256 = "0drw16wm95dqszpl7j33y4gckz0w0107lnz6wkzb66f0dlbv48cf"; }; diff --git a/pkgs/development/misc/google-clasp/google-clasp.nix b/pkgs/development/misc/google-clasp/google-clasp.nix index c32132d7ac64..c2a2412d3d76 100644 --- a/pkgs/development/misc/google-clasp/google-clasp.nix +++ b/pkgs/development/misc/google-clasp/google-clasp.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}: let nodeEnv = import ../../node-packages/node-env.nix { diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index a74736620066..fb548bf3f9f2 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -78,13 +78,13 @@ rec { platform-tools = import ./platform-tools.nix { inherit deployAndroidPackage os autoPatchelfHook pkgs lib; - package = packages.platform-tools."${platformToolsVersion}"; + package = packages.platform-tools.${platformToolsVersion}; }; build-tools = map (version: import ./build-tools.nix { inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686 lib; - package = packages.build-tools."${version}"; + package = packages.build-tools.${version}; } ) buildToolsVersions; @@ -95,7 +95,7 @@ rec { emulator = import ./emulator.nix { inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686 lib; - package = packages.emulator."${emulatorVersion}"."${os}"; + package = packages.emulator.${emulatorVersion}.${os}; }; platforms = map (version: @@ -132,20 +132,20 @@ rec { lldb = map (version: import ./lldb.nix { inherit deployAndroidPackage os autoPatchelfHook pkgs lib; - package = packages.lldb."${version}"; + package = packages.lldb.${version}; } ) lldbVersions; cmake = map (version: import ./cmake.nix { inherit deployAndroidPackage os autoPatchelfHook pkgs lib; - package = packages.cmake."${version}"; + package = packages.cmake.${version}; } ) cmakeVersions; ndk-bundle = import ./ndk-bundle { inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs lib platform-tools; - package = packages.ndk-bundle."${ndkVersion}"; + package = packages.ndk-bundle.${ndkVersion}; }; google-apis = map (version: diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index ba498ce0953b..0ea74377a5fc 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -7,7 +7,7 @@ let packages = [ stdenv.cc.cc zlib glib xorg.libX11 libxkbcommon libXmu libXi libXext libGL ]; - libPath = "${stdenv.lib.makeLibraryPath packages}"; + libPath = stdenv.lib.makeLibraryPath packages; in stdenv.mkDerivation rec { pname = "genymotion"; diff --git a/pkgs/development/ocaml-modules/biniou/1.0.nix b/pkgs/development/ocaml-modules/biniou/1.0.nix index d2d3159cde14..2584c5ad8b3f 100644 --- a/pkgs/development/ocaml-modules/biniou/1.0.nix +++ b/pkgs/development/ocaml-modules/biniou/1.0.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; - homepage = "${webpage}"; + homepage = webpage; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index 214721fa0906..98fd7fc46cf6 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "c-cube"; repo = "ocaml-containers"; - rev = "${version}"; + rev = version; sha256 = "1wbarxphdrxvy7qsdp4p837h1zrv0z83pgs5lbz2h3kdnyvz2f1i"; }; diff --git a/pkgs/development/ocaml-modules/elina/default.nix b/pkgs/development/ocaml-modules/elina/default.nix index 44bfeb2d4740..b41743f542d8 100644 --- a/pkgs/development/ocaml-modules/elina/default.nix +++ b/pkgs/development/ocaml-modules/elina/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--use-apron" "--use-opam" - "--apron-prefix" "${apron}" + "--apron-prefix" apron ] ++ stdenv.lib.optional stdenv.isDarwin "--absolute-dylibs" ; diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix index 348f0cf2170b..626e6321acf8 100644 --- a/pkgs/development/ocaml-modules/gen/default.nix +++ b/pkgs/development/ocaml-modules/gen/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "c-cube"; repo = "gen"; - rev = "${version}"; + rev = version; sha256 = "14b8vg914nb0yp1hgxzm29bg692m0gqncjj43b599s98s1cwl92h"; }; diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix index 5fb9131ef095..d4c28be2f798 100644 --- a/pkgs/development/ocaml-modules/gg/default.nix +++ b/pkgs/development/ocaml-modules/gg/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { matrices, quaternions, axis aligned boxes, colors, color spaces, and raster data. ''; - homepage = "${webpage}"; + homepage = webpage; platforms = ocaml.meta.platforms or []; license = licenses.bsd3; maintainers = [ maintainers.jirkamarsik ]; diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix index b316540e3d05..4556fb1eb416 100644 --- a/pkgs/development/ocaml-modules/lacaml/default.nix +++ b/pkgs/development/ocaml-modules/lacaml/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mmottl"; repo = "lacaml"; - rev = "${version}"; + rev = version; sha256 = "1aflg07cc9ak9mg1cr0qr368c9s141glwlarl5nhalf6hhq7ibcb"; }; diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix index 22c4216a88ff..15d2bde0ec6f 100644 --- a/pkgs/development/ocaml-modules/logs/default.nix +++ b/pkgs/development/ocaml-modules/logs/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Logging infrastructure for OCaml"; - homepage = "${webpage}"; + homepage = webpage; inherit (ocaml.meta) platforms; maintainers = [ maintainers.sternenseemann ]; license = licenses.isc; diff --git a/pkgs/development/ocaml-modules/ocaml-result/default.nix b/pkgs/development/ocaml-modules/ocaml-result/default.nix index 362ad697934f..f6dee5ce3ce8 100644 --- a/pkgs/development/ocaml-modules/ocaml-result/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-result/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "janestreet"; repo = "result"; - rev = "${version}"; + rev = version; sha256 = "1jwzpcmxwgkfsbjz9zl59v12hf1vv4r9kiifancn9p8gm206g3g0"; }; diff --git a/pkgs/development/ocaml-modules/opam-file-format/default.nix b/pkgs/development/ocaml-modules/opam-file-format/default.nix index f61a690da190..4d308dc78b5f 100644 --- a/pkgs/development/ocaml-modules/opam-file-format/default.nix +++ b/pkgs/development/ocaml-modules/opam-file-format/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ocaml"; repo = "opam-file-format"; - rev = "${version}"; + rev = version; sha256 = "0fqb99asnair0043hhc8r158d6krv5nzvymd0xwycr5y72yrp0hv"; }; diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix index c78adce0ac15..8d5bf290c6e0 100644 --- a/pkgs/development/ocaml-modules/otfm/default.nix +++ b/pkgs/development/ocaml-modules/otfm/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { provides low-level access to font tables and functions to decode some of them. ''; - homepage = "${webpage}"; + homepage = webpage; platforms = ocaml.meta.platforms or []; license = licenses.bsd3; maintainers = [ maintainers.jirkamarsik ]; diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix index caa2d01a4418..ba192b3c24b2 100644 --- a/pkgs/development/ocaml-modules/otr/default.nix +++ b/pkgs/development/ocaml-modules/otr/default.nix @@ -9,7 +9,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "hannesm"; repo = "ocaml-otr"; - rev = "${version}"; + rev = version; sha256 = "0iz6p85a0jxng9aq9blqsky173zaqfr6wlc5j48ad55lgwzlbih5"; }; diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index a8fb4af2a6bb..60b730e06403 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -23,7 +23,7 @@ let param = { "4.08" = { version = "5.3+4.08.0"; sha256 = "0vdmhs3hpmh5iclx4lzgdpf362m4l35zprxs73r84z1yhr4jcr4m"; }; -}."${ocaml.meta.branch}"; +}.${ocaml.meta.branch}; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-ppx_tools-${param.version}"; diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix index 31408ebe6a4a..01bc71928469 100644 --- a/pkgs/development/ocaml-modules/sawja/default.nix +++ b/pkgs/development/ocaml-modules/sawja/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A library written in OCaml, relying on Javalib to provide a high level representation of Java bytecode programs"; - homepage = "${webpage}"; + homepage = webpage; license = licenses.gpl3Plus; maintainers = [ maintainers.vbgl ]; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index 2a29179f4cd4..b1a178128adb 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mirleft"; repo = "ocaml-tls"; - rev = "${version}"; + rev = version; sha256 = "02wv4lia583imn3sfci4nqv6ac5nzig5j3yfdnlqa0q8bp9rfc6g"; }; diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 17f66227e9c5..1bac71d301ff 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { - homepage = "${webpage}"; + homepage = webpage; description = "Thin bindings to the cross-platform SDL library"; license = licenses.bsd3; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix index 773bec612d6a..097676e8abba 100644 --- a/pkgs/development/ocaml-modules/uucd/default.nix +++ b/pkgs/development/ocaml-modules/uucd/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An OCaml module to decode the data of the Unicode character database from its XML representation"; - homepage = "${webpage}"; + homepage = webpage; platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.vbgl ]; license = licenses.bsd3; diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index b5074841eb1b..d657a6f02053 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An OCaml library providing efficient access to a selection of character properties of the Unicode character database"; - homepage = "${webpage}"; + homepage = webpage; platforms = ocaml.meta.platforms or []; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index 263094ca2eb0..c8eb8ea532c4 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An OCaml module for normalizing Unicode text"; - homepage = "${webpage}"; + homepage = webpage; platforms = ocaml.meta.platforms or []; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index 404a463fd034..8fb9d207576d 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An OCaml library for segmenting Unicode text"; - homepage = "${webpage}"; + homepage = webpage; platforms = ocaml.meta.platforms or []; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index b6b943b2a036..863a4cbb8409 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Non-blocking streaming Unicode codec for OCaml"; - homepage = "${webpage}"; + homepage = webpage; platforms = ocaml.meta.platforms or []; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index dec0af5a9c12..0a127e49fdc2 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { Renderers for PDF, SVG and the HTML canvas are distributed with the module. An API allows to implement new renderers. ''; - homepage = "${webpage}"; + homepage = webpage; inherit (ocaml.meta) platforms; license = licenses.isc; maintainers = [ maintainers.jirkamarsik ]; diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix index 4324b62f9c6e..bb05b89d7bef 100644 --- a/pkgs/development/ocaml-modules/xmlm/default.nix +++ b/pkgs/development/ocaml-modules/xmlm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An OCaml streaming codec to decode and encode the XML data format"; - homepage = "${webpage}"; + homepage = webpage; platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.vbgl ]; license = licenses.bsd3; diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix index 2f633eed7a35..5bccd0946c36 100644 --- a/pkgs/development/pharo/launcher/default.nix +++ b/pkgs/development/pharo/launcher/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { desktopItem = makeDesktopItem { name = "Pharo"; - exec = "${executable-name}"; + exec = executable-name; icon = "pharo"; comment = "Launcher for Pharo distributions"; desktopName = "Pharo"; diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index 1d61f1a6cc79..bda0e677f4a7 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pazz"; repo = "alot"; - rev = "${version}"; + rev = version; sha256 = "1isn0p0i2a7dlbrdk5ib01xa1wgi6bi9ka4xl4vj8iw1q4i5fqv9"; }; diff --git a/pkgs/development/python-modules/ansible-kernel/default.nix b/pkgs/development/python-modules/ansible-kernel/default.nix index 34e360d2c1a4..42438b31c210 100644 --- a/pkgs/development/python-modules/ansible-kernel/default.nix +++ b/pkgs/development/python-modules/ansible-kernel/default.nix @@ -16,7 +16,7 @@ let kernelSpecFile = writeText "kernel.json" (builtins.toJSON { - argv = [ "${python.interpreter}" "-m" "ansible_kernel" "-f" "{connection_file}" ]; + argv = [ python.interpreter "-m" "ansible_kernel" "-f" "{connection_file}" ]; codemirror_mode = "yaml"; display_name = "Ansible"; language = "ansible"; diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix index d14bf02cabf3..e0492a7d1c44 100644 --- a/pkgs/development/python-modules/bap/default.nix +++ b/pkgs/development/python-modules/bap/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap-python"; - rev = "${version}"; + rev = version; sha256 = "1ahkrmcn7qaivps1gar8wd9mq2qqyx6zzvznf5r9rr05h17x5lbp"; }; diff --git a/pkgs/development/python-modules/beaker/default.nix b/pkgs/development/python-modules/beaker/default.nix index 3b196810b005..09e0b8b3f3e5 100644 --- a/pkgs/development/python-modules/beaker/default.nix +++ b/pkgs/development/python-modules/beaker/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bbangert"; repo = "beaker"; - rev = "${version}"; + rev = version; sha256 = "0xrvg503xmi28w0hllr4s7fkap0p09fgw2wax3p1s2r6b3xjvbz7"; }; diff --git a/pkgs/development/python-modules/hocr-tools/default.nix b/pkgs/development/python-modules/hocr-tools/default.nix index d5492b3b6414..810d9ee6148e 100644 --- a/pkgs/development/python-modules/hocr-tools/default.nix +++ b/pkgs/development/python-modules/hocr-tools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tmbdev"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "14f9hkp7pr677085w8iidwd0la9cjzy3pyj3rdg9b03nz9pc0w6p"; }; diff --git a/pkgs/development/python-modules/locustio/default.nix b/pkgs/development/python-modules/locustio/default.nix index 18875f840644..2203fa4c6ad0 100644 --- a/pkgs/development/python-modules/locustio/default.nix +++ b/pkgs/development/python-modules/locustio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "locustio"; repo = "locust"; - rev = "${version}"; + rev = version; sha256 = "1645d63ig4ymw716b6h53bhmjqqc13p9r95k1xfx66ck6vdqnisd"; }; diff --git a/pkgs/development/python-modules/ludios_wpull/default.nix b/pkgs/development/python-modules/ludios_wpull/default.nix index 1c707b320310..f0b3aa60f179 100644 --- a/pkgs/development/python-modules/ludios_wpull/default.nix +++ b/pkgs/development/python-modules/ludios_wpull/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { disabled = !isPy3k; src = fetchFromGitHub { - rev = "${version}"; + rev = version; owner = "ludios"; repo = "wpull"; sha256 = "1j96avm0ynbazypzp766wh26n4qc73y7wgsiqfrdfl6x7rx20wgf"; diff --git a/pkgs/development/python-modules/magic/default.nix b/pkgs/development/python-modules/magic/default.nix index 3022eb52f502..ee2c38fed535 100644 --- a/pkgs/development/python-modules/magic/default.nix +++ b/pkgs/development/python-modules/magic/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage { - name = "${pkgs.file.name}"; + name = pkgs.file.name; src = pkgs.file.src; diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index ee5110995b01..d3a1cfe3907c 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -37,10 +37,10 @@ buildPythonPackage rec { # Variables used to configure the build process USE_NCCONFIG="0"; - HDF5_DIR="${hdf5}"; - NETCDF4_DIR="${netcdf}"; - CURL_DIR="${curl.dev}"; - JPEG_DIR="${libjpeg.dev}"; + HDF5_DIR=hdf5; + NETCDF4_DIR=netcdf; + CURL_DIR=curl.dev; + JPEG_DIR=libjpeg.dev; meta = with stdenv.lib; { description = "Interface to netCDF library (versions 3 and 4)"; diff --git a/pkgs/development/python-modules/nmigen/default.nix b/pkgs/development/python-modules/nmigen/default.nix index 7375eda43271..345ba982b0bc 100644 --- a/pkgs/development/python-modules/nmigen/default.nix +++ b/pkgs/development/python-modules/nmigen/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { postPatch = let tool = pkg: name: - if pkg == null then {} else { "${name}" = "${pkg}/bin/${name}"; }; + if pkg == null then {} else { ${name} = "${pkg}/bin/${name}"; }; # Only FOSS toolchain supported out of the box, sorry! toolchainOverrides = diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index c6e5c2c648ff..41064c6b36c7 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -16,12 +16,12 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.17.1"; + version = "1.17.2"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f11331530f0eff69a758d62c2461cd98cdc2eae0147279d8fc86e0464eb7e8ca"; + sha256 = "73615d3edc84dd7c4aeb212fa3748fb83217e00d201875a47327f55363cef2df"; }; nativeBuildInputs = [ gfortran pytest ]; diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix index 4c0086869f74..57023e786f05 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer_six/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pdfminer"; repo = "pdfminer.six"; - rev = "${version}"; + rev = version; sha256 = "1v8pcx43fgidv1g54s92k85anvcss08blkhm4yi1hn1ybl0mmw6c"; }; diff --git a/pkgs/development/python-modules/pybluez/default.nix b/pkgs/development/python-modules/pybluez/default.nix index 6ceca20fdd17..47c70758e4ca 100644 --- a/pkgs/development/python-modules/pybluez/default.nix +++ b/pkgs/development/python-modules/pybluez/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "karulis"; - repo = "${pname}"; + repo = pname; rev = "a0b226a61b166e170d48539778525b31e47a4731"; sha256 = "104dm5ngfhqisv1aszdlr3szcav2g3bhsgzmg4qfs09b3i5zj047"; }; diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index 72be3227e6cb..e8146a6fc7ff 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./tesseract-binary.patch; - drv = "${tesseract}"; + drv = tesseract; }) ]; diff --git a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix index a4e0cb809aec..8f24d1dc1f68 100644 --- a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix +++ b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "saltstack"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "0z9f25d2wpf3lnqzmmnrlvl5b1f7kqwjjf4nzs9x2bpf91s5zny1"; }; diff --git a/pkgs/development/python-modules/ruffus/default.nix b/pkgs/development/python-modules/ruffus/default.nix index 1b3b271fb61f..37222964b047 100644 --- a/pkgs/development/python-modules/ruffus/default.nix +++ b/pkgs/development/python-modules/ruffus/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cgat-developers"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "1gyabqafq4s2sy0prh3k1m8859shzjmfxr7fimx10liflvki96a9"; }; diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index 0a0a3d8a9b2f..9b2062dbf6c6 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { cd sources/shiboken2 ''; - CLANG_INSTALL_DIR = "${llvmPackages.libclang.out}"; + CLANG_INSTALL_DIR = llvmPackages.libclang.out; nativeBuildInputs = [ cmake ]; buildInputs = [ llvmPackages.libclang python qt5.qtbase qt5.qtxmlpatterns ]; diff --git a/pkgs/development/python-modules/sklearn-deap/default.nix b/pkgs/development/python-modules/sklearn-deap/default.nix index c54997a21fe8..47df62dd1c6a 100644 --- a/pkgs/development/python-modules/sklearn-deap/default.nix +++ b/pkgs/development/python-modules/sklearn-deap/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rsteca"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "1yqnmy8h08i2y6bb2s0a5nx9cwvyg45293whqh420c195gpzg1x3"; }; diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index 71163a2f11f6..6a16b38c6e15 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "slackapi"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "073fwf6fm2sqdp5ms3vm1v3ljh0pldi69k048404rp6iy3cfwkp0"; }; diff --git a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix index 96de95655e05..eefb53dd7a60 100644 --- a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = pkgs.fetchFromGitHub { repo = "sqlalchemy-imageattach"; owner = "dahlia"; - rev = "${version}"; + rev = version; sha256 = "0ba97pn5dh00qvxyjbr0mr3pilxqw5kb3a6jd4wwbsfcv6nngqig"; }; diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index f7e3906ee1fb..e46d02989531 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -51,7 +51,7 @@ in buildPythonPackage { format = "wheel"; src = let - pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) "${python.pythonVersion}"; + pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion; pyver = if stdenv.isDarwin then builtins.substring 0 1 pyVerNoDot else pyVerNoDot; platform = if stdenv.isDarwin then "mac" else "linux"; unit = if cudaSupport then "gpu" else "cpu"; diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix index dcb8eca187e8..725c73960f5d 100644 --- a/pkgs/development/python-modules/unicorn/default.nix +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; # needs python2 at build time - PYTHON="${buildPackages.python2.interpreter}"; + PYTHON=buildPackages.python2.interpreter; setupPyBuildFlags = [ "--plat-name" "linux" ]; diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix index 915194459b24..b69bb62a875a 100644 --- a/pkgs/development/python-modules/urwidtrees/default.nix +++ b/pkgs/development/python-modules/urwidtrees/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pazz"; repo = "urwidtrees"; - rev = "${version}"; + rev = version; sha256 = "1n1kpidvkdnsqyb82vlvk78gmly96kh8351lqxn2pzgwwns6fml2"; }; diff --git a/pkgs/development/python-modules/vultr/default.nix b/pkgs/development/python-modules/vultr/default.nix index e66e21f01a66..236e4121cf86 100644 --- a/pkgs/development/python-modules/vultr/default.nix +++ b/pkgs/development/python-modules/vultr/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "spry-group"; repo = "python-vultr"; - rev = "${version}"; + rev = version; sha256 = "1qjvvr2v9gfnwskdl0ayazpcmiyw9zlgnijnhgq9mcri5gq9jw5h"; }; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 995f13853a23..1616eacffc65 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -806,11 +806,11 @@ let RAppArmor = old.RAppArmor.overrideDerivation (attrs: { patches = [ ./patches/RAppArmor.patch ]; - LIBAPPARMOR_HOME = "${pkgs.libapparmor}"; + LIBAPPARMOR_HOME = pkgs.libapparmor; }); RMySQL = old.RMySQL.overrideDerivation (attrs: { - MYSQL_DIR="${pkgs.mysql.connector-c}"; + MYSQL_DIR=pkgs.mysql.connector-c; preConfigure = '' patchShebangs configure ''; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 68c2011205ae..4e910ae9a244 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -501,7 +501,7 @@ in sassc = attrs: { nativeBuildInputs = [ rake ]; dontBuild = false; - SASS_LIBSASS_PATH = "${libsass}"; + SASS_LIBSASS_PATH = libsass; postPatch = '' substituteInPlace lib/sassc/native.rb \ --replace 'gem_root = spec.gem_dir' 'gem_root = File.join(__dir__, "../../")' diff --git a/pkgs/development/ruby-modules/with-packages/test.nix b/pkgs/development/ruby-modules/with-packages/test.nix index 92ded1004e37..73f8f02b27b3 100644 --- a/pkgs/development/ruby-modules/with-packages/test.nix +++ b/pkgs/development/ruby-modules/with-packages/test.nix @@ -21,14 +21,14 @@ let lib.mapAttrs (name: gem: let test = - if builtins.isList gemTests."${name}" + if builtins.isList gemTests.${name} then pkgs.writeText "${name}.rb" '' puts "${name} GEM_HOME: #{ENV['GEM_HOME']}" - ${lib.concatStringsSep "\n" (map (n: "require '${n}'") gemTests."${name}")} + ${lib.concatStringsSep "\n" (map (n: "require '${n}'") gemTests.${name})} '' - else pkgs.writeText "${name}.rb" gemTests."${name}"; + else pkgs.writeText "${name}.rb" gemTests.${name}; - deps = ruby.withPackages (g: [ g."${name}" ]); + deps = ruby.withPackages (g: [ g.${name} ]); in stdenv.mkDerivation { name = "test-gem-${ruby.name}-${name}"; buildInputs = [ deps ]; diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index 7ff5633072e1..056bbd859164 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -7,7 +7,7 @@ let generic = { major, version, src }: nameMajor = "alloy${major}"; desktopItem = makeDesktopItem rec { - name = "${nameMajor}"; + name = nameMajor; exec = name; icon = name; desktopName = "Alloy ${major}"; diff --git a/pkgs/development/tools/build-managers/arpa2cm/default.nix b/pkgs/development/tools/build-managers/arpa2cm/default.nix index 16eb5e3ec748..ef3062c6ca50 100644 --- a/pkgs/development/tools/build-managers/arpa2cm/default.nix +++ b/pkgs/development/tools/build-managers/arpa2cm/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { sha256 = "093h7njj8d8iiwnw5byfxkkzlbny60fwv1w57j8f1lsd4yn6rih4"; rev = "version-${version}"; - repo = "${pname}"; + repo = pname; owner = "arpa2"; }; diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 86954ea9d7ec..670e2e1e3492 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -9,7 +9,7 @@ buildGoPackage rec { goPackagePath = "github.com/digitalocean/doctl"; excludedPackages = ''\(doctl-gen-doc\|install-doctl\|release-doctl\)''; - buildFlagsArray = let t = "${goPackagePath}"; in '' + buildFlagsArray = let t = goPackagePath; in '' -ldflags= -X ${t}.Major=${major} -X ${t}.Minor=${minor} diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix index d13c75be9b70..6bb8719d5d64 100644 --- a/pkgs/development/tools/git-quick-stats/default.nix +++ b/pkgs/development/tools/git-quick-stats/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; - rev = "${version}"; + rev = version; sha256 = "1px1sk7b6mjnbclsr1jn33m9k4wd8wqyw4d6w1rgj0ii29lhzmqi"; }; PREFIX = builtins.placeholder "out"; diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index 7341dfc90c43..74a88caeb7c0 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "martinpaljak"; repo = "GlobalPlatformPro"; - rev = "${version}"; + rev = version; sha256 = "1vws6cbgm3mrwc2xz9j1y262vw21x3hjc9m7rqc4hn3m7gjpwsvg"; }; diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix index 1c4dd00b95e0..1df94147ba4a 100644 --- a/pkgs/development/tools/goconvey/default.nix +++ b/pkgs/development/tools/goconvey/default.nix @@ -12,7 +12,7 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "smartystreets"; repo = "goconvey"; - rev = "${version}"; + rev = version; sha256 = "1ph18rkl3ns3fgin5i4j54w5a69grrmf3apcsmnpdn1wlrbs3dxh"; }; diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index cc2106cdc082..1b6b3aed4e88 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "securego"; repo = "gosec"; - rev = "${version}"; + rev = version; sha256 = "1420yl4cjp4v4xv0l0wbahgl6bjhz77lx5va9hqa6abddmqvx1hg"; }; diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix index cd0e125564f9..0fc8b85d8f42 100644 --- a/pkgs/development/tools/jid/default.nix +++ b/pkgs/development/tools/jid/default.nix @@ -9,7 +9,7 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "simeji"; repo = "jid"; - rev = "${version}"; + rev = version; sha256 = "0p4srp85ilcafrn9d36rzpzg5k5jd7is93p68hamgxqyiiw6a8fi"; }; diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix index 300c52961f3a..b12be2a9567f 100644 --- a/pkgs/development/tools/jmespath/default.nix +++ b/pkgs/development/tools/jmespath/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { pname = "jmespath"; version = "0.2.2"; - rev = "${version}"; + rev = version; goPackagePath = "github.com/jmespath/go-jmespath"; diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix index e9ba5a7ddd79..3ebdc881dcb3 100644 --- a/pkgs/development/tools/jp/default.nix +++ b/pkgs/development/tools/jp/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { pname = "jp"; version = "0.1.2"; - rev = "${version}"; + rev = version; goPackagePath = "github.com/jmespath/jp"; diff --git a/pkgs/development/tools/jsduck/default.nix b/pkgs/development/tools/jsduck/default.nix index 11a96bc22fe8..0b6098e5ee93 100644 --- a/pkgs/development/tools/jsduck/default.nix +++ b/pkgs/development/tools/jsduck/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = (import ./gemset.nix).jsduck.version; env = bundlerEnv { - name = "${pname}"; + name = pname; gemfile = ./Gemfile; lockfile = ./Gemfile.lock; gemset = ./gemset.nix; diff --git a/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kafkacat/default.nix index d1da88f60bd8..076cea38a9e5 100644 --- a/pkgs/development/tools/kafkacat/default.nix +++ b/pkgs/development/tools/kafkacat/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "edenhill"; repo = "kafkacat"; - rev = "${version}"; + rev = version; sha256 = "0zs2nmf3ghm9iar7phc0ncqsb9nhipav94v6qmpxkfwxd2ljkpds"; }; diff --git a/pkgs/development/tools/makerpm/default.nix b/pkgs/development/tools/makerpm/default.nix index 573e2aefb80d..24e5a6b6e191 100644 --- a/pkgs/development/tools/makerpm/default.nix +++ b/pkgs/development/tools/makerpm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ivan-tkatchev"; repo = "makerpm"; - rev = "${version}"; + rev = version; sha256 = "089dkbh5705ppyi920rd0ksjc0143xmvnhm8qrx93rsgwc1ggi1y"; }; diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix index f7da3521aa1e..9605a035be67 100644 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -18,12 +18,12 @@ let shas = if enableUnfree then { - "x86_64-linux" = "1xwklhqxk5rmdrgy2simwvijzq29kyq5w2w3hy53xh2i1zlnyvq3"; - "x86_64-darwin" = "1qpdn28mrpggd55khzqqld6r89l0hb870rigxcw2i8p2yx3jv106"; + x86_64-linux = "1xwklhqxk5rmdrgy2simwvijzq29kyq5w2w3hy53xh2i1zlnyvq3"; + x86_64-darwin = "1qpdn28mrpggd55khzqqld6r89l0hb870rigxcw2i8p2yx3jv106"; } else { - "x86_64-linux" = "1wpnwal2rq5v2bsp5qil9j6dplif7ql5394sy4ia5ghp2fzifxmf"; - "x86_64-darwin" = "12z8i0wbw10c097glbpdy350p0h3957433f51qfx2p0ghgkzkhzv"; + x86_64-linux = "1wpnwal2rq5v2bsp5qil9j6dplif7ql5394sy4ia5ghp2fzifxmf"; + x86_64-darwin = "12z8i0wbw10c097glbpdy350p0h3957433f51qfx2p0ghgkzkhzv"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index fb4dca8d5490..83651e6d17ee 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -18,12 +18,12 @@ let shas = if enableUnfree then { - "x86_64-linux" = "0sc5709k3z7lb8qcjpj49s6vfv69ds2wc8319ag9x776nyz1pqxi"; - "x86_64-darwin" = "0zh4q46vfdwaihs838ck8fap92i3b4x10wbpmx8mcwyfk5v0fkch"; + x86_64-linux = "0sc5709k3z7lb8qcjpj49s6vfv69ds2wc8319ag9x776nyz1pqxi"; + x86_64-darwin = "0zh4q46vfdwaihs838ck8fap92i3b4x10wbpmx8mcwyfk5v0fkch"; } else { - "x86_64-linux" = "1pq17fasryharvw4byybvmcf5172hcmy6cp0m8bxhkxagwilprba"; - "x86_64-darwin" = "11crpx2qs2nzkzv6fvs1gqn9v4zalxkzsc5br0fy1y02lzm26zbm"; + x86_64-linux = "1pq17fasryharvw4byybvmcf5172hcmy6cp0m8bxhkxagwilprba"; + x86_64-darwin = "11crpx2qs2nzkzv6fvs1gqn9v4zalxkzsc5br0fy1y02lzm26zbm"; }; in stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz"; - sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture"); + sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); }; patches = [ diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 98acccb252a3..1298346ef31c 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "lsof-org"; repo = "lsof"; - rev = "${version}"; + rev = version; sha256 = "1gd6r0nv8xz76pmvk52dgmfl0xjvkxl0s51b4jk4a0lphw3393yv"; }; diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix index 65a17fd1242e..44744413138f 100644 --- a/pkgs/development/tools/misc/trv/default.nix +++ b/pkgs/development/tools/misc/trv/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "afiniate"; repo = "trv"; - rev = "${version}"; + rev = version; sha256 = "0fv0zh76djqhkzfzwv6k60rnky50pw9gn01lwhijrggrcxrrphz1"; }; diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/tools/misc/xc3sprog/default.nix index caecad4b678a..68897105f5c7 100644 --- a/pkgs/development/tools/misc/xc3sprog/default.nix +++ b/pkgs/development/tools/misc/xc3sprog/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchsvn { url = "https://svn.code.sf.net/p/xc3sprog/code/trunk"; sha256 = "1rfhms3i7375kdlg0sdg5k52ix3xv5llj2dr30vamyg7pk74y8rx"; - rev = "${version}"; + rev = version; }; buildInputs = [ cmake libusb libftdi ]; diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index 7c7bf79acc7d..09de5b02737b 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = { description = "A stub code generator and COM binding for Objective Caml"; - homepage = "${webpage}"; + homepage = webpage; license = "LGPL"; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index 90d74414308e..bde5cce6048f 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation ({ longDescription = '' Cppo is an equivalent of the C preprocessor targeted at the OCaml language and its variants. ''; - homepage = "${webpage}"; + homepage = webpage; maintainers = [ maintainers.vbgl ]; license = licenses.bsd3; }; diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix index 182250f9a744..1ea1cd4ab380 100644 --- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { description = "Omake build system"; - homepage = "${webpage}"; + homepage = webpage; license = "GPL"; platforms = ocaml.meta.platforms or []; }; diff --git a/pkgs/development/tools/rucksack/default.nix b/pkgs/development/tools/rucksack/default.nix index 12b00ce93f38..85a4d0fa23dc 100644 --- a/pkgs/development/tools/rucksack/default.nix +++ b/pkgs/development/tools/rucksack/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "andrewrk"; repo = "rucksack"; - rev = "${version}"; + rev = version; sha256 = "0bcm20hqxqnq1j0zghb9i7z9frri6bbf7rmrv5g8dd626sq07vyv"; }; diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index 534c69200e02..49eea7213bd8 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -6,9 +6,9 @@ let version="1.0.0"; name="${baseName}-${version}"; owner = "laurentj"; - repo = "${baseName}"; + repo = baseName; sha256="1w4sfrv520isbs7r1rlzl5y3idrpad7znw9fc92yz40jlwz7sxs4"; - rev = "${version}"; + rev = version; }; buildInputs = [ unzip zip diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix index df6279b5a4ca..aab1c49a537b 100644 --- a/pkgs/development/tools/toluapp/default.nix +++ b/pkgs/development/tools/toluapp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "LuaDist"; repo = "toluapp"; - rev = "${version}"; + rev = version; sha256 = "0zd55bc8smmgk9j4cf0jpibb03lgsvl0knpwhplxbv93mcdnw7s0"; }; diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 03bbe0f52e5f..e5b23f14517d 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -55,7 +55,7 @@ in buildRubyGem rec { postInstall = let pathAdditions = lib.makeSearchPath "bin" - (map (x: "${lib.getBin x}") ([ + (map (x: lib.getBin x) ([ libarchive ] ++ lib.optionals withLibvirt [ libguestfs diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index 8f3bc5609052..f9a84937af30 100644 --- a/pkgs/development/tools/vcstool/default.nix +++ b/pkgs/development/tools/vcstool/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pyyaml ]; - makeWrapperArgs = ["--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ git bazaar subversion ]}"]; + makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ git bazaar subversion ])]; doCheck = false; # requires network diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix index 7cc8ce6fe134..23fd684b412b 100644 --- a/pkgs/development/tools/vultr/default.nix +++ b/pkgs/development/tools/vultr/default.nix @@ -8,7 +8,7 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "JamesClonk"; repo = "vultr"; - rev = "${version}"; + rev = version; sha256 = "1bx2x17aa6wfn4qy9lxk8sh7shs3x5ppz2z49s0xm8qq0rs1qi92"; }; diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix index 0b0cea703662..f7de15604fdc 100644 --- a/pkgs/games/90secondportraits/default.nix +++ b/pkgs/games/90secondportraits/default.nix @@ -11,8 +11,8 @@ let desktopItem = makeDesktopItem { name = "90secondportraits"; - exec = "${pname}"; - icon = "${icon}"; + exec = pname; + icon = icon; comment = "A silly speed painting game"; desktopName = "90 Second Portraits"; genericName = "90secondportraits"; diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix index 593622c3008b..7d83d3a7cdb7 100644 --- a/pkgs/games/assaultcube/default.nix +++ b/pkgs/games/assaultcube/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ file zlib ] ++ optionals client [ openal SDL SDL_image libogg libvorbis ]; targets = (optionalString server "server") + (optionalString client " client"); - makeFlags = [ "-C source/src" "CXX=c++" "${targets}" ]; + makeFlags = [ "-C source/src" "CXX=c++" targets ]; desktop = makeDesktopItem { name = "AssaultCube"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { genericName = "First-person shooter"; categories = "Application;Game;ActionGame;Shooter"; icon = "assaultcube.png"; - exec = "${pname}"; + exec = pname; }; gamedatadir = "/share/games/${pname}"; diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index 84a70c275a2f..b1d8a27b5a22 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (common // rec { name = "cataclysm-dda-${version}"; src = fetchFromCleverRaven { - rev = "${version}"; + rev = version; sha256 = "00zzhx1mh1qjq668cga5nbrxp2qk6b82j5ak65skhgnlr6ii4ysc"; }; diff --git a/pkgs/games/duckmarines/default.nix b/pkgs/games/duckmarines/default.nix index 6da1e8ffe4b5..7f73e047fd75 100644 --- a/pkgs/games/duckmarines/default.nix +++ b/pkgs/games/duckmarines/default.nix @@ -11,8 +11,8 @@ let desktopItem = makeDesktopItem { name = "duckmarines"; - exec = "${pname}"; - icon = "${icon}"; + exec = pname; + icon = icon; comment = "Duck-themed action puzzle video game"; desktopName = "Duck Marines"; genericName = "duckmarines"; diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix index 86a83d68f021..49339e5619db 100644 --- a/pkgs/games/eternity-engine/default.nix +++ b/pkgs/games/eternity-engine/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "team-eternity"; repo = "eternity"; - rev = "${version}"; + rev = version; sha256 = "00kpq4k23hjmzjaymw3sdda7mqk8fjq6dzf7fmdal9fm7lfmj41k"; }; diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index 19851341da0c..9266428b5e7b 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { desktopItem = makeDesktopItem { name = "flightgear"; exec = "fgfs"; - icon = "${iconsrc}"; + icon = iconsrc; comment = "FlightGear Flight Simulator"; desktopName = "FlightGear"; genericName = "Flight simulator"; diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index df613bb44470..14e0d881e095 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "MegaGlest"; repo = "megaglest-source"; - rev = "${version}"; + rev = version; fetchSubmodules = true; sha256 = "0fb58a706nic14ss89zrigphvdiwy5s9dwvhscvvgrfvjpahpcws"; }; diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix index c75fbbb1ca92..e8138f812322 100644 --- a/pkgs/games/mrrescue/default.nix +++ b/pkgs/games/mrrescue/default.nix @@ -11,8 +11,8 @@ let desktopItem = makeDesktopItem { name = "mrrescue"; - exec = "${pname}"; - icon = "${icon}"; + exec = pname; + icon = icon; comment = "Arcade-style fire fighting game"; desktopName = "Mr. Rescue"; genericName = "mrrescue"; diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix index 72d60eae7f66..72235d9131bc 100644 --- a/pkgs/games/nexuiz/default.nix +++ b/pkgs/games/nexuiz/default.nix @@ -11,7 +11,7 @@ let version = "2.5.2"; - version_short = stdenv.lib.replaceChars [ "." ] [ "" ] "${version}"; + version_short = stdenv.lib.replaceChars [ "." ] [ "" ] version; in stdenv.mkDerivation { pname = "nexuiz"; inherit version; diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix index 461d70085775..97fb3ebd19fa 100644 --- a/pkgs/games/orthorobot/default.nix +++ b/pkgs/games/orthorobot/default.nix @@ -11,8 +11,8 @@ let desktopItem = makeDesktopItem { name = "orthorobot"; - exec = "${pname}"; - icon = "${icon}"; + exec = pname; + icon = icon; comment = "Robot game"; desktopName = "Orthorobot"; genericName = "orthorobot"; diff --git a/pkgs/games/rimshot/default.nix b/pkgs/games/rimshot/default.nix index 2813bbf88692..c940c90b8841 100644 --- a/pkgs/games/rimshot/default.nix +++ b/pkgs/games/rimshot/default.nix @@ -11,8 +11,8 @@ let desktopItem = makeDesktopItem { name = "rimshot"; - exec = "${pname}"; - icon = "${icon}"; + exec = pname; + icon = icon; comment = "Create your own music"; desktopName = "Rimshot"; genericName = "rimshot"; diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix index eaf1b3dc4fda..77d1888b86e7 100644 --- a/pkgs/games/runelite/default.nix +++ b/pkgs/games/runelite/default.nix @@ -18,7 +18,7 @@ name = "RuneLite"; type = "Application"; exec = "runelite"; - icon = "${icon}"; + icon = icon; comment = "Open source Old School RuneScape client"; terminal = "false"; desktopName = "RuneLite"; diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix index aa96a5a8ae50..ed6ac781cae1 100644 --- a/pkgs/games/sienna/default.nix +++ b/pkgs/games/sienna/default.nix @@ -11,8 +11,8 @@ let desktopItem = makeDesktopItem { name = "sienna"; - exec = "${pname}"; - icon = "${icon}"; + exec = pname; + icon = icon; comment = "Fast-paced one button platformer"; desktopName = "Sienna"; genericName = "sienna"; diff --git a/pkgs/games/tdm/default.nix b/pkgs/games/tdm/default.nix index e18faf7c304e..136bac8800ed 100644 --- a/pkgs/games/tdm/default.nix +++ b/pkgs/games/tdm/default.nix @@ -10,7 +10,7 @@ let desktopName = pname; name = pname; exec = "@out@/bin/${pname}"; - icon = "${pname}"; + icon = pname; terminal = "False"; comment = "The Dark Mod - stealth FPS inspired by the Thief series"; type = "Application"; diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index ec529676463f..c04920d7aa2c 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -8,7 +8,7 @@ let desktopName = pname; name = pname; exec = "@out@/bin/${pname}"; - icon = "${pname}"; + icon = pname; terminal = "False"; comment = "An open-source, single-player, role-playing roguelike game set in the world of Eyal."; type = "Application"; diff --git a/pkgs/games/vapor/default.nix b/pkgs/games/vapor/default.nix index 7d965dee1c70..2e4fdf1af96c 100644 --- a/pkgs/games/vapor/default.nix +++ b/pkgs/games/vapor/default.nix @@ -12,8 +12,8 @@ let desktopItem = makeDesktopItem { name = "Vapor"; - exec = "${pname}"; - icon = "${icon}"; + exec = pname; + icon = icon; comment = "LÖVE Distribution Client"; desktopName = "Vapor"; genericName = "vapor"; diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/misc/brightnessctl/default.nix index 83bf552b8b78..d6e606324c4e 100644 --- a/pkgs/misc/brightnessctl/default.nix +++ b/pkgs/misc/brightnessctl/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Hummer12007"; repo = "brightnessctl"; - rev = "${version}"; + rev = version; sha256 = "1n1gb8ldgqv3vs565yhk1w4jfvrviczp94r8wqlkv5q6ab43c8w9"; }; diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/misc/emulators/ccemux/default.nix index 13cd21391f11..127770328707 100644 --- a/pkgs/misc/emulators/ccemux/default.nix +++ b/pkgs/misc/emulators/ccemux/default.nix @@ -25,7 +25,7 @@ let desktopItem = makeDesktopItem { name = "CCEmuX"; exec = "ccemux"; - icon = "${desktopIcon}"; + icon = desktopIcon; comment = "A modular ComputerCraft emulator"; desktopName = "CCEmuX"; genericName = "ComputerCraft Emulator"; diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index 6bef474d7ea4..4f02d0f147d4 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "rdanbrook"; repo = "nestopia"; - rev = "${version}"; + rev = version; sha256 = "0frr0gvjh5mxzdhj0ii3sh671slgnzlm8naqlc4h87rx4p4sz2y2"; }; diff --git a/pkgs/misc/lightspark/default.nix b/pkgs/misc/lightspark/default.nix index bb3ade6b616f..5e3f1bb79811 100644 --- a/pkgs/misc/lightspark/default.nix +++ b/pkgs/misc/lightspark/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "lightspark"; repo = "lightspark"; - rev = "${version}"; + rev = version; sha256 = "0chydd516wfi73n8dvivk6nwxb9kjimdfghyv9sffmqmza0mv13s"; }; diff --git a/pkgs/misc/sailsd/default.nix b/pkgs/misc/sailsd/default.nix index eefd83c72600..ea2435c50ae1 100644 --- a/pkgs/misc/sailsd/default.nix +++ b/pkgs/misc/sailsd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "sails-simulator"; repo = "sailsd"; - rev = "${version}"; + rev = version; sha256 = "147cr4aw1kw4gv3bhn0cska855kmyah8m70vdw1q2lwz56lbf4mb"; }; diff --git a/pkgs/misc/scream-receivers/default.nix b/pkgs/misc/scream-receivers/default.nix index aa88bd8a96c8..2ca00ccc9cea 100644 --- a/pkgs/misc/scream-receivers/default.nix +++ b/pkgs/misc/scream-receivers/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "duncanthrax"; repo = "scream"; - rev = "${version}"; + rev = version; sha256 = "1iqhs7m0fv3vfld7h288j5j0jc5xdihaghd0jd9qrk68mj2g6g9w"; }; diff --git a/pkgs/misc/themes/blackbird/default.nix b/pkgs/misc/themes/blackbird/default.nix index 3a0636a658af..7ffefb1d67f6 100644 --- a/pkgs/misc/themes/blackbird/default.nix +++ b/pkgs/misc/themes/blackbird/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2017-12-13"; src = fetchFromGitHub { - repo = "${pname}"; + repo = pname; owner = "shimmerproject"; rev = "a1c5674c0ec38b4cc8ba41d2c0e6187987ae7eb4"; sha256 = "0xskcw36ci2ykra5gir5pkrawh2qkcv18p4fp2kxivssbd20d4jw"; diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index c7b618323fc1..d1b1bc846ebd 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -253,7 +253,7 @@ let # TODO: proper quoting toNix = x: if (builtins.isString x) then "'${x}'" - else if builtins.isAttrs x && builtins ? out then toNix "${x}" # a derivation + else if builtins.isAttrs x && builtins ? out then toNix x # a derivation else if builtins.isAttrs x then "{${lib.concatStringsSep ", " (lib.mapAttrsToList (n: v: "${toNix n}: ${toNix v}") x)}}" else if builtins.isList x then "[${lib.concatMapStringsSep ", " toNix x}]" else throw "turning ${lib.generators.toPretty {} x} into a VimL thing not implemented yet"; diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index 054236398769..3a4c2ef7d9f7 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "bolt"; repo = "bolt"; - rev = "${version}"; + rev = version; sha256 = "1qamls0fll0qc27lqavf56hv1yj6v6n4ry90g7bcnwpvccmd82yd"; }; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 42230fe31ecd..7bffc54673bd 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -568,6 +568,7 @@ let }); misc = { + HID_BATTERY_STRENGTH = yes; MODULE_COMPRESS = yes; MODULE_COMPRESS_XZ = yes; KERNEL_XZ = yes; diff --git a/pkgs/os-specific/linux/klibc/shrunk.nix b/pkgs/os-specific/linux/klibc/shrunk.nix index f01f3b6a4ec3..b5b9783c6e7d 100644 --- a/pkgs/os-specific/linux/klibc/shrunk.nix +++ b/pkgs/os-specific/linux/klibc/shrunk.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { # name due to the sed hackery below. Once patchelf 0.4 is in the # tree, we can do this properly. #name = "${klibc.name}-shrunk"; - name = "${klibc.name}"; + name = klibc.name; buildCommand = '' mkdir -p $out/lib cp -prd ${klibc.out}/lib/klibc/bin $out/ diff --git a/pkgs/os-specific/linux/ofp/default.nix b/pkgs/os-specific/linux/ofp/default.nix index 70f46519375b..855754a6bc1b 100644 --- a/pkgs/os-specific/linux/ofp/default.nix +++ b/pkgs/os-specific/linux/ofp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "OpenFastPath"; repo = "ofp"; - rev = "${version}"; + rev = version; sha256 = "05902593fycgkwzk5g7wzgk0k40nrrgybplkdka3rqnlj6aydhqf"; }; diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix index 9b9e563f8035..c00bd67f95c2 100644 --- a/pkgs/os-specific/linux/pcm/default.nix +++ b/pkgs/os-specific/linux/pcm/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "opcm"; repo = "pcm"; - rev = "${version}"; + rev = version; sha256 = "15kh5ry2w1zj2mbg98hlayw8g53jy79q2ixj2wm48g8vagamv77z"; }; diff --git a/pkgs/os-specific/linux/pps-tools/default.nix b/pkgs/os-specific/linux/pps-tools/default.nix index e4f7d4b3616e..f50bfcec781c 100644 --- a/pkgs/os-specific/linux/pps-tools/default.nix +++ b/pkgs/os-specific/linux/pps-tools/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "redlab-i"; - repo = "${baseName}"; + repo = baseName; rev = "v${version}"; sha256 = "1yh9g0l59dkq4ci0wbb03qin3c3cizfngmn9jy1vwm5zm6axlxhf"; }; diff --git a/pkgs/os-specific/linux/service-wrapper/default.nix b/pkgs/os-specific/linux/service-wrapper/default.nix index f2ed3c4a7834..150262158da4 100644 --- a/pkgs/os-specific/linux/service-wrapper/default.nix +++ b/pkgs/os-specific/linux/service-wrapper/default.nix @@ -4,7 +4,7 @@ let name = "service-wrapper-${version}"; version = "19.04"; # Akin to Ubuntu Release in -runCommand "${name}" { +runCommand name { script = substituteAll { src = ./service-wrapper.sh; isExecutable = true; diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index ccc0df59d108..b4c5c0bac841 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "shadow-maint"; repo = "shadow"; - rev = "${version}"; + rev = version; sha256 = "1llcv77lvpc4h3rgww9ms736kbdisiylcr2z02863f41afxbwl82"; }; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 48f915214188..90b33e183cef 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -18,28 +18,19 @@ let pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { + version = "243"; pname = "systemd"; - # To whoever updates this to 239: check the todo on line 173. - version = "242"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! # Also fresh patches should be cherry-picked from that tree to our current one. src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "5fb35fbc783516e2014115c3488134a2afb8494c"; - sha256 = "0pyjvzzh8nnxv4z58n82lz1mjnzv44sylcjgkvw8sp35vx1ryxfh"; + rev = "7019836a26ebdc1ba20c03d06dbb3a613833bd0f"; + sha256 = "0ywaq5jfy177k4q5hwr43v66sz62l1bqhgyxs2vk9m1d5kvrjwk6"; }; - patches = [ - (fetchpatch { - name = "CVE-2019-15718.patch"; - url = https://github.com/systemd/systemd/pull/13457/commits/35e528018f315798d3bffcb592b32a0d8f5162bd.patch; - sha256 = "0m0ypnnllx4r6a2qy1586as15i2qrzxwi1sqdp14rzdwajz1rvnv"; - }) - ]; - outputs = [ "out" "lib" "man" "dev" ]; nativeBuildInputs = @@ -112,6 +103,13 @@ in stdenv.mkDerivation rec { "-Dsulogin-path=${utillinux}/bin/sulogin" "-Dmount-path=${utillinux}/bin/mount" "-Dumount-path=${utillinux}/bin/umount" + "-Dcreate-log-dirs=false" + # Upstream uses cgroupsv2 by default. To support docker and other + # container managers we still need v1. + "-Ddefault-hierarchy=hybrid" + # Upstream defaulted to disable manpages since they optimize for the much + # more frequent development builds + "-Dman=true" ]; preConfigure = '' @@ -233,6 +231,6 @@ in stdenv.mkDerivation rec { license = licenses.lgpl21Plus; platforms = platforms.linux; priority = 10; - maintainers = [ maintainers.eelco ]; + maintainers = with maintainers; [ eelco andir ]; }; } diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix index fc4b38724a7d..bb640e6fa5e1 100644 --- a/pkgs/os-specific/linux/tbs/default.nix +++ b/pkgs/os-specific/linux/tbs/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation { name = "tbs-2018.04.18-${kernel.version}"; srcs = [ media build ]; - sourceRoot = "${build.name}"; + sourceRoot = build.name; preConfigure = '' make dir DIR=../${media.name} diff --git a/pkgs/os-specific/linux/undervolt/default.nix b/pkgs/os-specific/linux/undervolt/default.nix index a97cca4dfa76..eb8f55ac6655 100644 --- a/pkgs/os-specific/linux/undervolt/default.nix +++ b/pkgs/os-specific/linux/undervolt/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "georgewhewell"; repo = "undervolt"; - rev = "${version}"; + rev = version; sha256 = "1d934lp8yczrfslmwff6fxzd4arja2vg00s5kwdr949bxpa6w59c"; }; diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index e1d02d2f9d74..2fbd0bbfb3da 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "coturn"; repo = "coturn"; - rev = "${version}"; + rev = version; sha256 = "12x604lgva1d3g4wvl3f66rdj6lkjk5cqr0l3xas33xgzgm13pwr"; }; diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 1dbf7eb2388b..8d015a92a8f1 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nginx"; repo = "unit"; - rev = "${version}"; + rev = version; sha256 = "00y7hc6bzn38f9mcqxnzddnwwsiba4ss9vwd9vgc95sj0yvv885a"; }; diff --git a/pkgs/servers/monitoring/facette/default.nix b/pkgs/servers/monitoring/facette/default.nix index e5f30f4e6146..5d6f0fc3bfe9 100644 --- a/pkgs/servers/monitoring/facette/default.nix +++ b/pkgs/servers/monitoring/facette/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "facette"; repo = "facette"; - rev = "${version}"; + rev = version; sha256 = "0p28s2vn18cqg8p7bzhb38wky0m98d5xv3wvf1nmg1kmwhwim6mi"; }; nativeBuildInputs = [ go pkgconfig nodejs nodePackages.npm pandoc ]; diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix index 888cef61fcb6..dfa13c805e59 100644 --- a/pkgs/servers/monitoring/plugins/esxi.nix +++ b/pkgs/servers/monitoring/plugins/esxi.nix @@ -2,7 +2,7 @@ let bName = "check_esxi_hardware"; - pName = stdenv.lib.replaceStrings [ "_" ] [ "-" ] "${bName}"; + pName = stdenv.lib.replaceStrings [ "_" ] [ "-" ] bName; in python2Packages.buildPythonApplication rec { name = "${pName}-${version}"; diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix index c47e627f8169..744e333594c8 100644 --- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix +++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix @@ -11,7 +11,7 @@ let generic = { pname, version, sha256, description, buildInputs, ... }: let - name' = "${stdenv.lib.replaceStrings [ "-" ] [ "_" ] "${pname}"}-${version}"; + name' = "${stdenv.lib.replaceStrings [ "-" ] [ "_" ] pname}-${version}"; in stdenv.mkDerivation { name = "${pname}-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index efe146c843fb..c101e55bc871 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -3,7 +3,7 @@ buildGoPackage rec { pname = "prom2json"; version = "0.1.0"; - rev = "${version}"; + rev = version; goPackagePath = "github.com/prometheus/prom2json"; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index dfe2bdb71b28..bf2a5935d1d2 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "influxdata"; repo = "telegraf"; - rev = "${version}"; + rev = version; sha256 = "0g27yczb49xf8nbhkzx7lv8378613afq9qx1gr5yhlpfrl4sgb69"; }; diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix index fafe8ad3046e..95f8ca4432b3 100644 --- a/pkgs/servers/monitoring/uchiwa/default.nix +++ b/pkgs/servers/monitoring/uchiwa/default.nix @@ -7,7 +7,7 @@ let src = fetchFromGitHub { inherit owner repo sha256; - rev = "${version}"; + rev = version; }; backend = buildGoPackage { diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 4ec00506b338..9bec174a58aa 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { [ "--with-static-modules=NONE" "--with-shared-modules=ALL" "--with-system-mitkrb5" - "--with-system-mitkdc" "${krb5Full}" + "--with-system-mitkdc" krb5Full "--enable-fhs" "--sysconfdir=/etc" "--localstatedir=/var" diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index 34494c76dedb..318919203699 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -17,12 +17,12 @@ let shas = if enableUnfree then { - "x86_64-linux" = "0x1ws6iqflvzphg2srvdrn4xrr5wd5fnykkc9h006mj9rb5lp1k9"; - "x86_64-darwin" = "0yjzgsbsgwa6gbp270fqfm1klm6f8n4s2xmay62gdgvnsj543cxz"; + x86_64-linux = "0x1ws6iqflvzphg2srvdrn4xrr5wd5fnykkc9h006mj9rb5lp1k9"; + x86_64-darwin = "0yjzgsbsgwa6gbp270fqfm1klm6f8n4s2xmay62gdgvnsj543cxz"; } else { - "x86_64-linux" = "1nl6yic1j422l2c7mf8wv0ylfx6marrwm7d181z9nzdswq509kpg"; - "x86_64-darwin" = "1sy4an9d1faifr3n2y45kalrd22yb68dnpjhi9h8q73c21gp8pzf"; + x86_64-linux = "1nl6yic1j422l2c7mf8wv0ylfx6marrwm7d181z9nzdswq509kpg"; + x86_64-darwin = "1sy4an9d1faifr3n2y45kalrd22yb68dnpjhi9h8q73c21gp8pzf"; }; in stdenv.mkDerivation (rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation (rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}-${plat}-${arch}.tar.gz"; - sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture"); + sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); }; patches = [ ./es-home-6.x.patch ]; diff --git a/pkgs/servers/sickbeard/sickrage.nix b/pkgs/servers/sickbeard/sickrage.nix index f4a37f85c6cb..cbde11e3dc0c 100644 --- a/pkgs/servers/sickbeard/sickrage.nix +++ b/pkgs/servers/sickbeard/sickrage.nix @@ -7,7 +7,7 @@ python2.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "SickRage"; repo = "SickRage"; - rev = "${version}"; + rev = version; sha256 = "0lzklpsxqrb73inbv8almnhbnb681pmi44gzc8i4sjwmdksiiif9"; }; diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix index 12a52c2641d5..f6f914b7cbd5 100644 --- a/pkgs/servers/sks/default.nix +++ b/pkgs/servers/sks/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromBitbucket { owner = "skskeyserver"; repo = "sks-keyserver"; - rev = "${version}"; + rev = version; sha256 = "00q5ma5rvl10rkc6cdw8d69bddgrmvy0ckqj3hbisy65l4idj2zm"; }; diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index 340ef36ac593..2fc67008b892 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { pname = "skydns"; version = "2.5.3a"; - rev = "${version}"; + rev = version; goPackagePath = "github.com/skynetservices/skydns"; diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix index cae300a53f40..82739d484f28 100644 --- a/pkgs/servers/web-apps/cryptpad/node-packages.nix +++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-6_x}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index f18a50fe7e92..cd5fac60abe4 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -137,7 +137,7 @@ in stdenv.mkDerivation { ruby ${./patch_plist.rb} \ ${stdenv.lib.escapeShellArg (builtins.toXML { XQUARTZ_DEFAULT_CLIENT = "${xterm}/bin/xterm"; - XQUARTZ_DEFAULT_SHELL = "${shell}"; + XQUARTZ_DEFAULT_SHELL = shell; XQUARTZ_DEFAULT_STARTX = "@STARTX@"; FONTCONFIG_FILE = "@FONTCONFIG_FILE@"; })} \ diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index b1e403e7de34..036c388fbda8 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "spwhitt"; repo = "nix-zsh-completions"; - rev = "${version}"; + rev = version; sha256 = "0fq1zlnsj1bb7byli7mwlz7nm2yszwmyx43ccczcv51mjjfivyp3"; }; diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix index 2ed4301e55ab..422294150e0f 100644 --- a/pkgs/shells/zsh/zsh-completions/default.nix +++ b/pkgs/shells/zsh/zsh-completions/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-completions"; - rev = "${version}"; + rev = version; sha256 = "1yf4rz99acdsiy0y1v3bm65xvs2m0sl92ysz0rnnrlbd5amn283l"; }; diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/tools/X11/ffcast/default.nix index d6c86d60bc1e..ff84dde6f99b 100644 --- a/pkgs/tools/X11/ffcast/default.nix +++ b/pkgs/tools/X11/ffcast/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "lolilolicon"; repo = "FFcast"; - rev = "${version}"; + rev = version; sha256 = "047y32bixhc8ksr98vwpgd0k1xxgsv2vs0n3kc2xdac4krc9454h"; }; diff --git a/pkgs/tools/X11/xbanish/default.nix b/pkgs/tools/X11/xbanish/default.nix index 8e838bfe9065..af522cca9e10 100644 --- a/pkgs/tools/X11/xbanish/default.nix +++ b/pkgs/tools/X11/xbanish/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "jcs"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "0vp8ja68hpmqkl61zyjar3czhmny1hbm74m8f393incfz1ymr3i8"; }; diff --git a/pkgs/tools/X11/xrectsel/default.nix b/pkgs/tools/X11/xrectsel/default.nix index b528078870a5..4712192eacff 100644 --- a/pkgs/tools/X11/xrectsel/default.nix +++ b/pkgs/tools/X11/xrectsel/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "lolilolicon"; repo = "xrectsel"; - rev = "${version}"; + rev = version; sha256 = "0prl4ky3xzch6xcb673mcixk998d40ngim5dqc5374b1ls2r6n7l"; }; diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix index d2b6a5dca9ff..6d590b8975b9 100644 --- a/pkgs/tools/admin/awslogs/default.nix +++ b/pkgs/tools/admin/awslogs/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "jorgebastida"; repo = "awslogs"; - rev = "${version}"; + rev = version; sha256 = "0vdpld7r7y78x1lcd5z3qsx047dwichxb8f3447yzl75fnsm75dc"; }; diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index 2a110c4cc83b..54bd9a1a08bb 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ib"; repo = "xarchiver"; - rev = "${version}"; + rev = version; sha256 = "1iklwgykgymrwcc5p1cdbh91v0ih1m58s3w9ndl5kyd44bwlb7px"; }; diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/tools/audio/glyr/default.nix index 665e2da3329c..2acca1510400 100644 --- a/pkgs/tools/audio/glyr/default.nix +++ b/pkgs/tools/audio/glyr/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "sahib"; repo = "glyr"; - rev = "${version}"; + rev = version; sha256 = "1miwbqzkhg0v3zysrwh60pj9sv6ci4lzq2vq2hhc6pc6hdyh8xyr"; }; diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix index e30b0af45a52..c8093f4453e9 100644 --- a/pkgs/tools/backup/grab-site/default.nix +++ b/pkgs/tools/backup/grab-site/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { name = "grab-site-${version}"; src = fetchFromGitHub { - rev = "${version}"; + rev = version; owner = "ArchiveTeam"; repo = "grab-site"; sha256 = "01n3mi9q593sd2bbmbbp5pn2c3pkwj7iqmy02zbh8ciqskraja4z"; diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 67016af8c0d3..7eee02e220af 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "cryfs"; repo = "cryfs"; - rev = "${version}"; + rev = version; sha256 = "04yqpad8x0hiiwpykcn3swi0py6sg9xid6g15ny2qs4j3llin5ry"; }; diff --git a/pkgs/tools/filesystems/simg2img/default.nix b/pkgs/tools/filesystems/simg2img/default.nix index 997aa321afa3..78f80ecfa87a 100644 --- a/pkgs/tools/filesystems/simg2img/default.nix +++ b/pkgs/tools/filesystems/simg2img/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "anestisb"; repo = "android-simg2img"; - rev = "${version}"; + rev = version; sha256 = "119gl9i61g2wr07hzv6mi1ihql6yd6pwq94ki2pgcpfbamv8f6si"; }; diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix index abe896801025..e828698b0e97 100644 --- a/pkgs/tools/filesystems/squashfuse/default.nix +++ b/pkgs/tools/filesystems/squashfuse/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "vasi"; - repo = "${pname}"; + repo = pname; rev = "540204955134eee44201d50132a5f66a246bcfaf"; sha256 = "062s77y32p80vc24a79z31g90b9wxzvws1xvicgx5fn1pd0xa0q6"; }; diff --git a/pkgs/tools/filesystems/udftools/default.nix b/pkgs/tools/filesystems/udftools/default.nix index 11ea490446d0..9efaf96182d7 100644 --- a/pkgs/tools/filesystems/udftools/default.nix +++ b/pkgs/tools/filesystems/udftools/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "pali"; repo = "udftools"; - rev = "${version}"; + rev = version; sha256 = "0mz04h3rki6ljwfs15z83gf4vv816w7xgz923waiqgmfj9xpvx87"; }; diff --git a/pkgs/tools/graphics/flam3/default.nix b/pkgs/tools/graphics/flam3/default.nix index e05f05a977bf..a6277f58cbdb 100644 --- a/pkgs/tools/graphics/flam3/default.nix +++ b/pkgs/tools/graphics/flam3/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { inherit rev; owner = "scottdraves"; - repo = "${pname}"; + repo = pname; sha256 = "18iyj16k0sn3fs52fj23lj31xi4avlddhbib6kk309576nlxp17w"; }; diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index 4c251f21c71f..7465ebb78836 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "bk138"; repo = "gromit-mpx"; - rev = "${version}"; + rev = version; sha256 = "1dkmp5rhzp56sz9cfxill2pkdz2anwb8kkxkypvk2xhqi64cvkrs"; }; diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix index 6ff0c7cd0d7d..ad86bdef80af 100644 --- a/pkgs/tools/misc/antimicro/default.nix +++ b/pkgs/tools/misc/antimicro/default.nix @@ -7,7 +7,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "AntiMicro"; repo = "antimicro"; - rev = "${version}"; + rev = version; sha256 = "1q40ayxwwyq85lc89cnj1cm2nar625h4vhh8dvmb2qcxczaggf4v"; }; diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index fd9bbda699f1..25765589beec 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -48,7 +48,7 @@ in src = fetchFromGitHub { owner = "phillipberndt"; repo = "autorandr"; - rev = "${version}"; + rev = version; sha256 = "1bp1cqkrpg77rjyh4lq1agc719fmxn92jkiicf6nbhfl8kf3l3vy"; }; diff --git a/pkgs/tools/misc/bcunit/default.nix b/pkgs/tools/misc/bcunit/default.nix index 1c681d4986d7..4a440e133feb 100644 --- a/pkgs/tools/misc/bcunit/default.nix +++ b/pkgs/tools/misc/bcunit/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { buildInputs = [cmake]; src = fetchFromGitHub { owner = "BelledonneCommunications"; - repo = "${baseName}"; - rev = "${version}"; + repo = baseName; + rev = version; sha256 = "063yl7kxkix76r49qrj0h1qpz2p538d1yw8aih0x4i47g35k00y7"; }; diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix index 930d4dfaabac..a5e4a42ef3cd 100644 --- a/pkgs/tools/misc/bonfire/default.nix +++ b/pkgs/tools/misc/bonfire/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { # https://github.com/blue-yonder/bonfire/pull/18 src = fetchFromGitHub { owner = "blue-yonder"; - repo = "${pname}"; + repo = pname; rev = "d0af9ca10394f366cfa3c60f0741f1f0918011c2"; sha256 = "193zcvzbhxwwkwbgmnlihhhazwkajycxf4r71jz1m12w301sjhq5"; }; diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index d12f9f6c1f49..699285f26647 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mrichar1"; repo = "clipster"; - rev = "${version}"; + rev = version; sha256 = "0582r8840dk4k4jj1zq6kmyh7z9drcng099bj7f4wvr468nb9z1p"; }; diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix index 193a631ccdc3..10406b8bf03b 100644 --- a/pkgs/tools/misc/diskscan/default.nix +++ b/pkgs/tools/misc/diskscan/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "baruch"; repo = "diskscan"; - rev = "${version}"; + rev = version; sha256 = "1s2df082yrnr3gqnapdsqz0yd0ld75bin37g0rms83ymzkh4ysgv"; }; diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix index 77ad7cd8ccd9..c5ea2cd46a16 100644 --- a/pkgs/tools/misc/duc/default.nix +++ b/pkgs/tools/misc/duc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "zevv"; repo = "duc"; - rev = "${version}"; + rev = version; sha256 = "1i7ry25xzy027g6ysv6qlf09ax04q4vy0kikl8h0aq5jbxsl9q52"; }; diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix index b651caf5a5e7..6c2cbd257442 100644 --- a/pkgs/tools/misc/fasd/default.nix +++ b/pkgs/tools/misc/fasd/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "clvv"; - repo = "${pname}"; + repo = pname; rev = "90b531a5daaa545c74c7d98974b54cbdb92659fc"; sha256 = "0i22qmhq3indpvwbxz7c472rdyp8grag55x7iyjz8gmyn8gxjc11"; }; diff --git a/pkgs/tools/misc/fltrdr/default.nix b/pkgs/tools/misc/fltrdr/default.nix index 692f7daa9cf6..8c2c5adfb5f4 100644 --- a/pkgs/tools/misc/fltrdr/default.nix +++ b/pkgs/tools/misc/fltrdr/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { repo = "fltrdr"; owner = "octobanana"; - rev = "${version}"; + rev = version; sha256 = "1vpci7vqzcpdd21zgigyz38k77r9fc81dmiwsvfr8w7gad5sg6sj"; }; diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/tools/misc/fsmon/default.nix index dde69778e5fe..c731094bdd6a 100644 --- a/pkgs/tools/misc/fsmon/default.nix +++ b/pkgs/tools/misc/fsmon/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nowsecure"; repo = "fsmon"; - rev = "${version}"; + rev = version; sha256 = "1b99cd5k2zh30sagp3f55jvj1r48scxibv7aqqc2sp82sci59npg"; }; diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index c19ed50ece2d..e10b42273be8 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "funtoo"; repo = "keychain"; - rev = "${version}"; + rev = version; sha256 = "1bkjlg0a2bbdjhwp37ci1rwikvrl4s3xlbf2jq2z4azc96dr83mj"; }; diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index ebf93f0684f0..db697bc9d511 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -3,7 +3,7 @@ rustPlatform.buildRustPackage rec { pname = "mcfly"; version = "v0.3.1"; - rev = "${version}"; + rev = version; src = fetchFromGitHub { inherit rev; diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index ca3016d11874..81d7591b7407 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "okbob"; repo = "pspg"; - rev = "${version}"; + rev = version; sha256 = "1lwzyimn28a7q8k2c8z7and4qhrdil0za8lixh96z6x4lcb0rz5q"; }; diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index 69bf9cafa536..d52910b5a848 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "algernon"; repo = "riemann-c-client"; - rev = "${name}"; + rev = name; sha256 = "01gzqxqm1xvki2vd78c7my2kgp4fyhkcf5j5fmy8z0l93lgj82rr"; }; diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index 748a4e0ce6a5..4ac9b32b3556 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "nvbn"; - repo = "${pname}"; + repo = pname; rev = version; sha256 = "1qhxwjjgrzpqrqjv7l2847ywpln76lyd6j8bl9gz2r6kl0fx2fqs"; }; diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index 1f5a6c4ea4c2..fd818ca6f9b0 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "andreafrancia"; repo = "trash-cli"; - rev = "${version}"; + rev = version; sha256 = "1bqazna223ibqjwbc1wfvfnspfyrvjy8347qlrgv4cpng72n7gfi"; }; diff --git a/pkgs/tools/misc/txtw/default.nix b/pkgs/tools/misc/txtw/default.nix index b642fb6ec5ce..ab8256842aed 100644 --- a/pkgs/tools/misc/txtw/default.nix +++ b/pkgs/tools/misc/txtw/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "baskerville"; repo = "txtw"; - rev = "${version}"; + rev = version; sha256 = "17yjdgdd080fsf5r1wzgk6vvzwsa15gcwc9z64v7x588jm1ryy3k"; }; diff --git a/pkgs/tools/misc/vimpager/build.nix b/pkgs/tools/misc/vimpager/build.nix index 19cc6cd2234f..69ec50bd5756 100644 --- a/pkgs/tools/misc/vimpager/build.nix +++ b/pkgs/tools/misc/vimpager/build.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { owner = "rkitover"; repo = "vimpager"; - rev = "${version}"; + rev = version; }; buildInputs = [ coreutils sharutils ]; # for uuencode diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/tools/misc/void/default.nix index eb14d89bfc92..ec19ae5bd18e 100644 --- a/pkgs/tools/misc/void/default.nix +++ b/pkgs/tools/misc/void/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "spacejam"; repo = "void"; - rev = "${version}"; + rev = version; sha256 = "08vazw4rszqscjz988k89z28skyj3grm81bm5iwknxxagmrb20fz"; }; diff --git a/pkgs/tools/misc/xv/default.nix b/pkgs/tools/misc/xv/default.nix index 90a9610a7ce9..8d8c2fa55b28 100644 --- a/pkgs/tools/misc/xv/default.nix +++ b/pkgs/tools/misc/xv/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "chrisvest"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "0x2yd21sr4wik3z22rknkx1fgb64j119ynjls919za8gd83zk81g"; }; diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index dec74c72fbe7..482a949482ff 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -8,7 +8,7 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "txthinking"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "04gx1p447wabw3d18s9sm8ynlvj2bp8ac9dsgs08kd1dyrsjlljk"; }; diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index 32fbed7eb9f7..a83274188c02 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -13,7 +13,7 @@ in buildGoPackage rec { src = fetchFromGitHub { inherit owner repo; - rev = "${version}"; + rev = version; sha256 = "1dwdiaf357l9c6b2cps5mdyfma3c1mp96zzxg1826fvz3x8ix68z"; }; diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix index 340bf4d863ca..280619a5eca6 100644 --- a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix @@ -8,7 +8,7 @@ buildGoPackage rec { src = fetchFromGitHub { inherit owner repo; - rev = "${version}"; + rev = version; sha256 = "0fc2flm0pa44mjxvn4fan0mkvg9yyg27w68xdgrnpdifj99kxxjf"; }; diff --git a/pkgs/tools/networking/gmrender-resurrect/default.nix b/pkgs/tools/networking/gmrender-resurrect/default.nix index 354288b3ce60..be1ca9f265d4 100644 --- a/pkgs/tools/networking/gmrender-resurrect/default.nix +++ b/pkgs/tools/networking/gmrender-resurrect/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "hzeller"; repo = "gmrender-resurrect"; - rev = "${version}"; + rev = version; sha256 = "1dmdhyz27bh74qmvncfd3kw7zqwnd05bhxcfjjav98z5qrxdygj4"; }; diff --git a/pkgs/tools/networking/httpstat/default.nix b/pkgs/tools/networking/httpstat/default.nix index 1649ebfb3cef..b3700fb93389 100644 --- a/pkgs/tools/networking/httpstat/default.nix +++ b/pkgs/tools/networking/httpstat/default.nix @@ -6,7 +6,7 @@ pythonPackages.buildPythonApplication rec { src = fetchFromGitHub { owner = "reorx"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "1vriibcsq4j1hvm5yigbbmmv21dc40y5c9gvd31dg9qkaz26hml6"; }; doCheck = false; # No tests diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index 5a6fb5e51042..a8154f26a713 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "megous"; repo = "megatools"; - rev = "${version}"; + rev = version; sha256 = "001hw8j36ld03wwaphq3xdaazf2dpl36h84k8xmk524x8vlia8lk"; }; diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix index 5dffdb4ca3fb..e4ab74f08e35 100644 --- a/pkgs/tools/networking/network-manager/l2tp/default.nix +++ b/pkgs/tools/networking/network-manager/l2tp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nm-l2tp"; repo = "network-manager-l2tp"; - rev = "${version}"; + rev = version; sha256 = "0cq07kvlm98s8a7l4a3zmqnif8x3307kv7n645zx3f1r7x72b8m4"; }; diff --git a/pkgs/tools/networking/ngrok-1/default.nix b/pkgs/tools/networking/ngrok-1/default.nix index 463227741fb3..19ae72aaac0d 100644 --- a/pkgs/tools/networking/ngrok-1/default.nix +++ b/pkgs/tools/networking/ngrok-1/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { pname = "ngrok"; version = "1.7.1"; - rev = "${version}"; + rev = version; goPackagePath = "ngrok"; diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix index c74ceb055cea..e5650d5427cb 100644 --- a/pkgs/tools/networking/ngrok-2/default.nix +++ b/pkgs/tools/networking/ngrok-2/default.nix @@ -17,7 +17,7 @@ let versions = builtins.fromJSON (builtins.readFile ./versions.json); in stdenv.mkDerivation { name = "ngrok-${version}"; - version = "${version}"; + version = version; # run ./update src = fetchurl { inherit sha256 url; }; diff --git a/pkgs/tools/networking/opensm/default.nix b/pkgs/tools/networking/opensm/default.nix index 592c24b81fd0..e0a0dcd56cbe 100644 --- a/pkgs/tools/networking/opensm/default.nix +++ b/pkgs/tools/networking/opensm/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "linux-rdma"; repo = "opensm"; - rev = "${version}"; + rev = version; sha256 = "1nb6zl93ffbgb8z8728j0dxrmvk3pm0i6a1sn7mpn8ki1vkf2y0j"; }; diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix index 854ad617cd26..7412bc568a28 100644 --- a/pkgs/tools/networking/persepolis/default.nix +++ b/pkgs/tools/networking/persepolis/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "persepolisdm"; repo = "persepolis"; - rev = "${version}"; + rev = version; sha256 = "0xngk8wgj5k27mh3bcrf2wwzqr8a3g0d4pc5i5vcavnnaj03j44m"; }; diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix index 84ecc44c1833..f3e6f2f156f6 100644 --- a/pkgs/tools/networking/tinyproxy/default.nix +++ b/pkgs/tools/networking/tinyproxy/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec{ src = fetchFromGitHub { sha256 = "0gzapnllzyc005l3rs6iarjk1p5fc8mf9ysbck1mbzbd8xg6w35s"; - rev = "${version}"; + rev = version; repo = "tinyproxy"; owner = "tinyproxy"; }; diff --git a/pkgs/tools/networking/wolfebin/default.nix b/pkgs/tools/networking/wolfebin/default.nix index 555c04a00899..7eded00db858 100644 --- a/pkgs/tools/networking/wolfebin/default.nix +++ b/pkgs/tools/networking/wolfebin/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "thejoshwolfe"; repo = "wolfebin"; - rev = "${version}"; + rev = version; sha256 = "16xj6zz30sn9q05p211bmmsl0i6fknfxf8dssn6knm6nkiym8088"; }; diff --git a/pkgs/tools/networking/yrd/default.nix b/pkgs/tools/networking/yrd/default.nix index e5d260ef7d42..a259d892cc15 100644 --- a/pkgs/tools/networking/yrd/default.nix +++ b/pkgs/tools/networking/yrd/default.nix @@ -10,7 +10,7 @@ in pythonPackages.buildPythonApplication { src = fetchFromGitHub { owner = "kpcyrd"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; inherit sha256; }; diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix index 7afd5e07717a..3acd207df95d 100644 --- a/pkgs/tools/networking/zap/default.nix +++ b/pkgs/tools/networking/zap/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "zaproxy"; repo = "zaproxy"; - rev ="${version}"; + rev =version; sha256 = "1bz4pgq66v6kxmgj99llacm1d85vj8z78jlgc2z9hv0ha5i57y32"; }; diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 2dcb03048577..0251e6acf81a 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "sunng87"; repo = "cargo-release"; - rev = "${version}"; + rev = version; sha256 = "14l5znr1nl69v2v3mdrlas85krq9jn280ssflmd0dz7i4fxiaflc"; }; diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix index 43e261b106bf..bffe04e78d96 100644 --- a/pkgs/tools/package-management/nix-review/default.nix +++ b/pkgs/tools/package-management/nix-review/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { }; makeWrapperArgs = [ - "--prefix" "PATH" ":" "${lib.makeBinPath [ nix git ]}" + "--prefix" "PATH" ":" (lib.makeBinPath [ nix git ]) ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/hash-slinger/default.nix b/pkgs/tools/security/hash-slinger/default.nix index 577fe02cb2ec..4fa0499f1dde 100644 --- a/pkgs/tools/security/hash-slinger/default.nix +++ b/pkgs/tools/security/hash-slinger/default.nix @@ -8,8 +8,8 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "letoams"; - repo = "${pname}"; - rev = "${version}"; + repo = pname; + rev = version; sha256 = "05wn744ydclpnpyah6yfjqlfjlasrrhzj48lqmm5a91nyps5yqyn"; }; diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index 923c96719fe3..bbed166d7598 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "CISOfy"; - repo = "${pname}"; - rev = "${version}"; + repo = pname; + rev = version; sha256 = "1lkkbvxm0rgrrlx0szaxmf8ghc3d26wal96sgqk84m37mvs1f7p0"; }; diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix index 94f0a3adfb82..f6f9e0df655a 100644 --- a/pkgs/tools/security/masscan/default.nix +++ b/pkgs/tools/security/masscan/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "robertdavidgraham"; repo = "masscan"; - rev = "${version}"; + rev = version; sha256 = "0q0c7bsf0pbl8napry1qyg0gl4pd8wn872h4mz9b56dx4rx90vqg"; }; diff --git a/pkgs/tools/security/munge/default.nix b/pkgs/tools/security/munge/default.nix index 2e83c691dc7f..2d758aa2aecd 100644 --- a/pkgs/tools/security/munge/default.nix +++ b/pkgs/tools/security/munge/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "dun"; repo = "munge"; - rev = "${name}"; + rev = name; sha256 = "1c4ff3d8ad3inbliszr4slym3b4cn19bn6mxm13mzy20jyi2rm70"; }; diff --git a/pkgs/tools/security/pass/extensions/genphrase.nix b/pkgs/tools/security/pass/extensions/genphrase.nix index c34fae083cdc..c031c59e3f63 100644 --- a/pkgs/tools/security/pass/extensions/genphrase.nix +++ b/pkgs/tools/security/pass/extensions/genphrase.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "congma"; repo = "pass-genphrase"; - rev = "${version}"; + rev = version; sha256 = "0vcg3b79n1r949qfn8ns85bq2mfsmbf4jw2dlzif8425n8ppfsgd"; }; diff --git a/pkgs/tools/security/shc/default.nix b/pkgs/tools/security/shc/default.nix index cd93c55001eb..18814eb7fa8f 100644 --- a/pkgs/tools/security/shc/default.nix +++ b/pkgs/tools/security/shc/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "shc"; version = "4.0.3"; - rev = "${version}"; + rev = version; src = fetchFromGitHub { inherit rev; diff --git a/pkgs/tools/system/clinfo/default.nix b/pkgs/tools/system/clinfo/default.nix index cc59aa5121c6..5653c70d4317 100644 --- a/pkgs/tools/system/clinfo/default.nix +++ b/pkgs/tools/system/clinfo/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Oblomov"; repo = "clinfo"; - rev = "${version}"; + rev = version; sha256 = "0y2q0lz5yzxy970b7w7340vp4fl25vndahsyvvrywcrn51ipgplx"; }; diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 4306f7e90935..18b452b3ca7f 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; - rev = "${version}"; + rev = version; sha256 = "1fvlrqx1wgl79a9j3xhhhdihj4lkpbrchfsc27il0p52fynn4dji"; }; diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index cfc0c8f87ad7..65c905f28c65 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -6,7 +6,7 @@ let numVersion = "02.18"; # :( in stdenv.mkDerivation rec { name = "lshw-${numVersion}b"; - version = "${numVersion}"; + version = numVersion; src = fetchurl { url = "https://ezix.org/software/files/lshw-B.${version}.tar.gz"; diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix index 6fe35f6dcf38..ad256e366566 100644 --- a/pkgs/tools/system/ps_mem/default.nix +++ b/pkgs/tools/system/ps_mem/default.nix @@ -8,7 +8,7 @@ in pythonPackages.buildPythonApplication { src = fetchFromGitHub { owner = "pixelb"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "0kcxlmfisbwf24p2k72njfyfp22fjr9p9zalg9b4w0yhnlzk24ph"; }; diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 85baa3d3f30c..b2b94e1d9d9e 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = https://chromium.googlesource.com/chromiumos/platform/vboot_reference; - rev = "${checkout}"; + rev = checkout; sha256 = "1zja4ma6flch08h5j2l1hqnxmw2xwylidnddxxd5y2x05dai9ddj"; }; diff --git a/pkgs/tools/text/invoice2data/default.nix b/pkgs/tools/text/invoice2data/default.nix index 646efbab5bf3..0e2e4cedfc22 100644 --- a/pkgs/tools/text/invoice2data/default.nix +++ b/pkgs/tools/text/invoice2data/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonPackage rec { sha256 = "1phz0a8jxg074k0im7shrrdfvdps7bn1fa4zwcf8q3sa2iig26l4"; }; - makeWrapperArgs = ["--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ imagemagick xpdf tesseract ]}" ]; + makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ imagemagick xpdf tesseract ]) ]; propagatedBuildInputs = with python3Packages; [ unidecode dateparser pyyaml pillow chardet pdfminer ]; diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index b37dbbf68366..2c28f9ea5a56 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ggreer"; repo = "the_silver_searcher"; - rev = "${version}"; + rev = version; sha256 = "0cyazh7a66pgcabijd27xnk1alhsccywivv6yihw378dqxb22i1p"; }; diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index c373f068961e..704ccede799b 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { desktopItem = makeDesktopItem { name = "basex"; exec = "basexgui %f"; - icon = "${./basex.svg}"; # icon copied from Ubuntu basex package + icon = ./basex.svg; # icon copied from Ubuntu basex package comment = "Visually query and analyse your XML data"; desktopName = "BaseX XML Database"; genericName = "XML database tool"; diff --git a/pkgs/tools/typesetting/sshlatex/default.nix b/pkgs/tools/typesetting/sshlatex/default.nix index e1bd3922ff3a..be218cda535a 100644 --- a/pkgs/tools/typesetting/sshlatex/default.nix +++ b/pkgs/tools/typesetting/sshlatex/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "iblech"; repo = "sshlatex"; - rev = "${version}"; + rev = version; sha256 = "0kaah8is74zba9373xccmsxmnnn6kh0isr4qpg21x3qhdzhlxl7q"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83ac7861d888..2021ec720a7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16624,7 +16624,7 @@ in # solve collision for nix-env before https://github.com/NixOS/nix/pull/815 dejavu_fontsEnv = buildEnv { - name = "${dejavu_fonts.name}"; + name = dejavu_fonts.name; paths = [ dejavu_fonts.out ]; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5dda58b8d64c..8b1e7943fb6e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -219,7 +219,7 @@ let }; buildInputs = [ ArchiveExtract ]; - TIDYP_DIR = "${pkgs.tidyp}"; + TIDYP_DIR = pkgs.tidyp; propagatedBuildInputs = [ FileShareDir ]; };