treewide: remove redundant quotes

2019-09-08 23:38:31 +00:00
parent 4b929acf67
commit 7b8fb5c06c
387 changed files with 487 additions and 487 deletions
--- 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";
  };

--- 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";
  };
--- 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";
  };

--- 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";
  };

--- 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";
  };

--- 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";
  };

--- 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";
--- 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";
  };

--- 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";
  };

--- 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";
  };
--- 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";
  };

--- 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";
  };

--- 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";
  };

--- 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";
  };

--- 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";
    };

--- 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";
  };

--- 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";
  };
--- 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";
  };

--- 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";
  };

--- 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";
  };

--- 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";
  };
--- 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";
  };

--- 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";
  };

--- 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";
  };

--- 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;
--- 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";
  };

--- 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";
  };

--- 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";
  };
--- 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";
  };

--- 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";
  };

--- 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
--- 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";
  };

--- 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";
  };

--- 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";
  };
--- 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";
  };

--- 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";
  };

--- 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";
  };

--- 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
--- 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";
  };

--- 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";
  };

--- 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";

--- 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; };
--- 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";
  };

--- 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";
  };

--- 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";
  };
--- 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";
  };

--- 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;
  };
--- 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";
  };

--- 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";
  };

--- 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; {
--- 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";
  };

--- 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";
  };

--- 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";
  };

--- 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";
  };

--- 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";
  };

--- 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;
--- 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";
    };

--- 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";
  };

--- 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";
--- 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";
  };
--- 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";
  };

--- 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 ];

--- 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";
  };

--- 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";
--- 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";
  };