diff --git a/pkgs/applications/audio/bchoppr/default.nix b/pkgs/applications/audio/bchoppr/default.nix index 7d4d53408d2..33827287712 100644 --- a/pkgs/applications/audio/bchoppr/default.nix +++ b/pkgs/applications/audio/bchoppr/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "sjaehn"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "1nd6byy75f0rbz9dm9drhxmpsfhxhg0y7q3v2m3098llynhy9k2j"; }; diff --git a/pkgs/applications/audio/bsequencer/default.nix b/pkgs/applications/audio/bsequencer/default.nix index 2c9217183e4..093e9450de8 100644 --- a/pkgs/applications/audio/bsequencer/default.nix +++ b/pkgs/applications/audio/bsequencer/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "sjaehn"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "0hagnn104ybzdp13r95idw20fhmzif8p3kmiypnr20m6c64rdd29"; }; diff --git a/pkgs/applications/audio/bslizr/default.nix b/pkgs/applications/audio/bslizr/default.nix index 5a2675187c0..e239a89b899 100644 --- a/pkgs/applications/audio/bslizr/default.nix +++ b/pkgs/applications/audio/bslizr/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "sjaehn"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "1f7xrljvsy7a1p8c7wln2zhwarl3ara7gbjxkpyh47wfdpigpdb0"; }; diff --git a/pkgs/applications/editors/marker/default.nix b/pkgs/applications/editors/marker/default.nix index 758cb0c30eb..19ffdbd2c2c 100644 --- a/pkgs/applications/editors/marker/default.nix +++ b/pkgs/applications/editors/marker/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "fabiocolacio"; repo = "Marker"; - rev = "${version}"; + rev = version; fetchSubmodules = true; sha256 = "1iy7izyprf050bix8am1krqivgyxnhx3jm775v8f80cgbqxy7m5r"; }; diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index e210d03406b..cf37512ad9f 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -74,7 +74,7 @@ in mkDerivation rec { src = fetchFromGitHub { owner = "drawpile"; repo = "drawpile"; - rev = "${version}"; + rev = version; sha256 = "sha256-AFFY+FcY9ExAur13OoWR9285RZtBe6jnRIrwi5raiCM="; }; diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index 9f157798a7d..911a30ccf61 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -8,7 +8,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; - rev = "${version}"; + rev = version; sha256 = "1vibk3wmn54qr2mwz537hrr959y0r1zabp0gsijhzj2mk68g9pnb"; }; diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix index 77eb32166fe..18dbcc9ce26 100644 --- a/pkgs/applications/misc/batsignal/default.nix +++ b/pkgs/applications/misc/batsignal/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; - rev = "${version}"; + rev = version; sha256 = "12hj0j18db34x0xzgj6xmhvxm966d05z0rl3d9rlrcd2q96lilwf"; }; diff --git a/pkgs/applications/misc/chewing-editor/default.nix b/pkgs/applications/misc/chewing-editor/default.nix index b70f9a2e7d8..3a89773b858 100644 --- a/pkgs/applications/misc/chewing-editor/default.nix +++ b/pkgs/applications/misc/chewing-editor/default.nix @@ -7,8 +7,8 @@ mkDerivation rec { src = fetchFromGitHub { owner = "chewing"; - repo = "${pname}"; - rev = "${version}"; + repo = pname; + rev = version; sha256 = "0kc2hjx1gplm3s3p1r5sn0cyxw3k1q4gyv08q9r6rs4sg7xh2w7w"; }; diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 41bfdb3fc5d..51e1b77096d 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "arsenetar"; repo = "dupeguru"; - rev = "${version}"; + rev = version; sha256 = "0ma4f1c6vmpz8gi4sdy43x1ik7wh42wayvk1iq520d3i714kfcpy"; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/effitask/default.nix b/pkgs/applications/misc/effitask/default.nix index 4f3255551c2..26008c133b8 100644 --- a/pkgs/applications/misc/effitask/default.nix +++ b/pkgs/applications/misc/effitask/default.nix @@ -13,8 +13,8 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "sanpii"; - repo = "${pname}"; - rev = "${version}"; + repo = pname; + rev = version; sha256 = "09bffxdp43s8b1rpmsgqr2kyz3i4jbd2yrwbxw21fj3sf3mwb9ig"; }; diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index 717d4a3aab3..337d68b4b20 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://codeberg.org/dnkl/fuzzel"; - rev = "${version}"; + rev = version; sha256 = "0c0p9spklzmy9f7abz3mvw0vp6zgnk3ns1i6ks95ljjb3kqy9vs2"; }; diff --git a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix index f9dbf14624f..10e6996873a 100644 --- a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix @@ -8,7 +8,7 @@ let src = fetchFromGitHub { owner = "pfn"; repo = "keepasshttp"; - #rev = "${version}"; + # rev = version; # for 1.8.4.2 the tag is at the wrong commit (they fixed stuff # afterwards and didn't move the tag), hence reference by commitid rev = "c2c4eb5388a02169400cba7a67be325caabdcc37"; diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index 26bc6cc0a0b..91f23f662af 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = "${version}"; + rev = version; sha256 = "0nh5jnf5yls2qv5hpfhm6i854zsknyh7d93c987a0cg14sg820fv"; }; diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index 83a7e9d6216..f92fe87b948 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; - rev = "${version}"; + rev = version; sha256 = "0k5z9dap6rawiafkg1x7zjx51ala7wra6j6lvc2nn0y8r79yp7a9"; }; diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix index 72dfe3ecc33..d26f8ed5dc6 100644 --- a/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/pkgs/applications/networking/cluster/kubeval/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "instrumenta"; repo = "kubeval"; - rev = "${version}"; + rev = version; sha256 = "05li0qv4q7fy2lr50r6c1r8dhx00jb1g01qmgc72a9zqp378yiq0"; }; diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index b1577a37844..c031615a90b 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -10,7 +10,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "QMatrixClient"; repo = "Quaternion"; - rev = "${version}"; + rev = version; sha256 = "0hqhg7l6wpkdbzrdjvrbqymmahziri07ba0hvbii7dd2p0h248fv"; }; diff --git a/pkgs/applications/networking/trebleshot/default.nix b/pkgs/applications/networking/trebleshot/default.nix index 56ebe1873ae..82f91ddef8b 100644 --- a/pkgs/applications/networking/trebleshot/default.nix +++ b/pkgs/applications/networking/trebleshot/default.nix @@ -10,7 +10,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "genonbeta"; repo = "TrebleShot-Desktop"; - rev = "${version}"; + rev = version; sha256 = "1k8wagw6arsi1lqkhn1nl6j11mb122vi1qs0q2np6nznwfy7pn1k"; }; diff --git a/pkgs/applications/science/electronics/flatcam/default.nix b/pkgs/applications/science/electronics/flatcam/default.nix index 360c6df7fe6..b8a80c5e9c1 100644 --- a/pkgs/applications/science/electronics/flatcam/default.nix +++ b/pkgs/applications/science/electronics/flatcam/default.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromBitbucket { owner = "jpcgt"; - repo = "${pname}"; + repo = pname; rev = "533afd6a1772857cb633c011b5e0a15b60b1e92e"; # 8.5 with Red Hat packaging. sha256 = "199kiiml18k34z1zhk2hbhibphmnv0kb11kxiajq52alps0mjb3m"; }; diff --git a/pkgs/applications/science/logic/potassco/clingcon.nix b/pkgs/applications/science/logic/potassco/clingcon.nix index 1203822d86e..b74583ca1a2 100644 --- a/pkgs/applications/science/logic/potassco/clingcon.nix +++ b/pkgs/applications/science/logic/potassco/clingcon.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "potassco"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; fetchSubmodules = true; sha256 = "1q7517h10jfvjdk2czq8d6y57r8kr1j1jj2k2ip2qxkpyfigk4rs"; diff --git a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix index 69b44625f95..eb44f6d412b 100644 --- a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix @@ -7,7 +7,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "c4urself"; - repo = "${pname}"; + repo = pname; rev = "refs/tags/v${version}"; sha256 = "10p7rg569rk3qvzs5kjj17894bqlsg3ihhbln6ciwwfhkfq1kpja"; }; @@ -16,12 +16,12 @@ buildPythonApplication rec { # X's in pytest are git tests which won't run in sandbox checkPhase = '' pytest tests/ -k 'not usage_string_fork' - ''; + ''; meta = with stdenv.lib; { description = "Version-bump your software with a single command"; longDescription = '' - A small command line tool to simplify releasing software by updating + A small command line tool to simplify releasing software by updating all version strings in your source code by the correct increment. ''; homepage = "https://github.com/c4urself/bump2version"; diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index fc2e660fa7a..30049e84587 100644 --- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; - rev = "${version}"; + rev = version; sha256 = "0diwndkckv6fga45j9zngizycn5m71r67cziv0zrx6c66ssbj49w"; }; diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix index a8dc4539a7d..d406ae50e1c 100644 --- a/pkgs/data/icons/zafiro-icons/default.nix +++ b/pkgs/data/icons/zafiro-icons/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "zayronxio"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "05h8qm9izjbp8pnl9jpbw3y9sddhp0zmg94fm1k4d4hhdqnakqhv"; }; diff --git a/pkgs/data/themes/orion/default.nix b/pkgs/data/themes/orion/default.nix index b44cc857c62..740b3488922 100644 --- a/pkgs/data/themes/orion/default.nix +++ b/pkgs/data/themes/orion/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchgit, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, gtk-engine-murrine }: -stdenv.mkDerivation { - name = "orion-1.5"; +stdenv.mkDerivation rec { + pname = "orion"; + version = "1.5"; - src = fetchgit { - url = "https://github.com/shimmerproject/Orion.git"; - rev = "refs/tags/v1.5"; + src = fetchFromGitHub { + owner = "shimmerproject"; + repo = "Orion"; + rev = "refs/tags/v${version}"; sha256 = "1116yawv3fspkiq1ykk2wj0gza3l04b5nhldy0bayzjaj0y6fd89"; }; diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix index 9ea68b02ea8..d58e608c957 100644 --- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { version = "3.22.11"; src = fetchFromGitLab { + domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - domain = "gitlab.gnome.org"; - rev = "${version}"; + rev = version; sha256 = "1asm0y6485xqsysdg586y3hzz8bhxqwnc82k6vhfnxpxz7l62qa1"; }; diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index a404d160695..e6765ec6899 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -7,7 +7,7 @@ let release_version = "11.0.0"; - version = "${release_version}"; # differentiating these (variables) is important for RCs + version = release_version; # differentiating these (variables) is important for RCs targetConfig = stdenv.targetPlatform.config; fetch = name: sha256: fetchurl { diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 9ad95645240..83b54e442aa 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "acl2-devel"; repo = "acl2-devel"; - rev = "${version}"; + rev = version; sha256 = "0c0wimaf16nrr3d6cxq6p7nr7rxffvpmn66hkpwc1m6zpcipf0y5"; }; diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix index 122831e80cc..61fd94c09bf 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/default.nix +++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix @@ -145,7 +145,7 @@ stdenv.mkDerivation { src = fetchgit { url = "https://github.com/anmonteiro/lumo.git"; - rev = "${version}"; + rev = version; sha256 = "12agi6bacqic2wq6q3l28283badzamspajmajzqm7fbdl2aq1a4p"; }; diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index b725c3e6e50..75a022de912 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "bytecodealliance"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "01k1fpk2qp4kv0xr4f0xmrjkr98j5ws48r1aks8l80mffs4ynqfr"; fetchSubmodules = true; diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index e1da5a44ff0..b3bf33f0e88 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "cminyard"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "07m8rbdk05biarc9xskwcx9lghj0dff1msxasfc6hi3jywc3xaih"; }; diff --git a/pkgs/development/libraries/libmkv/default.nix b/pkgs/development/libraries/libmkv/default.nix index 190c573577a..9a754eda592 100644 --- a/pkgs/development/libraries/libmkv/default.nix +++ b/pkgs/development/libraries/libmkv/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchgit, libtool, autoconf, automake }: +{ stdenv, fetchFromGitHub, libtool, autoconf, automake }: stdenv.mkDerivation rec { pname = "libmkv"; version = "0.6.5.1"; - src = fetchgit { - url = "https://github.com/saintdev/libmkv.git"; + src = fetchFromGitHub { + owner = "saintdev"; + repo = pname; rev = "refs/tags/${version}"; sha256 = "0pr9q7yprndl8d15ir7i7cznvmf1yqpvnsyivv763n6wryssq6dl"; }; diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index 952987447b2..12def747361 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "rhdunn"; repo = "pcaudiolib"; - rev = "${version}"; + rev = version; sha256 = "0c55hlqqh0m7bcb3nlgv1s4a22s5bgczr1cakjh3767rjb10khi0"; }; diff --git a/pkgs/development/libraries/wiiuse/default.nix b/pkgs/development/libraries/wiiuse/default.nix index 4dcc8a47105..738c6a43008 100644 --- a/pkgs/development/libraries/wiiuse/default.nix +++ b/pkgs/development/libraries/wiiuse/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "wiiuse"; repo = "wiiuse"; - rev = "${version}"; + rev = version; sha256 = "05gc3s0wxx7ga4g32yyibyxdh46rm9bbslblrc72ynrjxq98sg13"; }; diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 9d501f47c3b..3ad200cfc63 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -30,7 +30,7 @@ let src = fetchFromBitbucket { owner = "multicoreware"; repo = "x265_git"; - rev = "${version}"; + rev = version; sha256 = "1jzgv2hxhcwmsdf6sbgyzm88a46dp09ll1fqj92g9vckvh9a7dsn"; }; diff --git a/pkgs/development/ocaml-modules/dispatch/default.nix b/pkgs/development/ocaml-modules/dispatch/default.nix index 5de61169c36..03f2afbd314 100644 --- a/pkgs/development/ocaml-modules/dispatch/default.nix +++ b/pkgs/development/ocaml-modules/dispatch/default.nix @@ -7,7 +7,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "inhabitedtype"; repo = "ocaml-dispatch"; - rev = "${version}"; + rev = version; sha256 = "05kb9zcihk50r2haqz8vrlr7kmaka6vrs4j1z500lmnl877as6qr"; }; diff --git a/pkgs/development/ocaml-modules/lua-ml/default.nix b/pkgs/development/ocaml-modules/lua-ml/default.nix index 6e69bc1e5c5..38ccaea65eb 100644 --- a/pkgs/development/ocaml-modules/lua-ml/default.nix +++ b/pkgs/development/ocaml-modules/lua-ml/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "lindig"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "04lv98nxmzanvyn4c0k6k0ax29f5xfdl8qzpf5hwadslq213a044"; }; diff --git a/pkgs/development/ocaml-modules/webmachine/default.nix b/pkgs/development/ocaml-modules/webmachine/default.nix index afb26cfb354..14b1d2d2321 100644 --- a/pkgs/development/ocaml-modules/webmachine/default.nix +++ b/pkgs/development/ocaml-modules/webmachine/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "inhabitedtype"; repo = "ocaml-webmachine"; - rev = "${version}"; + rev = version; sha256 = "1zi1vsm589y2njwzsqkmdbxvs9s4xlgbd62xqw2scp60mccp09nk"; }; diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix index 993647c3f23..73c15850d33 100644 --- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix +++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jimfunk"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "1rrh38f3zl3jk5ijs6g75dxxvxygf4lczbgc7ahrgzf58g4a48lm"; }; diff --git a/pkgs/development/python-modules/hawkauthlib/default.nix b/pkgs/development/python-modules/hawkauthlib/default.nix index a819bca362d..1a8ddacdd69 100644 --- a/pkgs/development/python-modules/hawkauthlib/default.nix +++ b/pkgs/development/python-modules/hawkauthlib/default.nix @@ -1,6 +1,6 @@ { stdenv , buildPythonPackage -, fetchgit +, fetchFromGitHub , requests , webob }: @@ -9,8 +9,9 @@ buildPythonPackage rec { pname = "hawkauthlib"; version = "0.1.1"; - src = fetchgit { - url = "https://github.com/mozilla-services/hawkauthlib.git"; + src = fetchFromGitHub { + owner = "mozilla-services"; + repo = pname; rev = "refs/tags/v${version}"; sha256 = "0mr1mpx4j9q7sch9arwfvpysnpf2p7ijy7072wilxm8pnj0bwvsi"; }; diff --git a/pkgs/development/python-modules/ovito/default.nix b/pkgs/development/python-modules/ovito/default.nix index 24af3a51255..5e5847dce03 100644 --- a/pkgs/development/python-modules/ovito/default.nix +++ b/pkgs/development/python-modules/ovito/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "stuko"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "0rm1qxa0fanaaqg0idr6rf2s2xlbyn1dzjzwh3rddy9mgl60lj2h"; }; diff --git a/pkgs/development/python-modules/pa-ringbuffer/default.nix b/pkgs/development/python-modules/pa-ringbuffer/default.nix index fd05e7e8052..466d3937a1f 100644 --- a/pkgs/development/python-modules/pa-ringbuffer/default.nix +++ b/pkgs/development/python-modules/pa-ringbuffer/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "spatialaudio"; repo = "python-pa-ringbuffer"; - rev = "${version}"; + rev = version; sha256 = "0afpydy1l20hd1xncjppjhqa2c8dj5h9nlv4z8m55cs9hc9h1mxv"; }; diff --git a/pkgs/development/python-modules/pyfcm/default.nix b/pkgs/development/python-modules/pyfcm/default.nix index 22afc793cde..8fdb051a484 100644 --- a/pkgs/development/python-modules/pyfcm/default.nix +++ b/pkgs/development/python-modules/pyfcm/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "olucurious"; repo = "pyfcm"; - rev = "${version}"; + rev = version; sha256 = "0aj10yvjsc04j15zbn403i83j7ra5yg35pi3ywkyakk8n1s0s3qg"; }; diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index a787b869527..6f76ca9850f 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -1,14 +1,15 @@ { stdenv , buildPythonPackage -, fetchgit +, fetchFromGitHub }: buildPythonPackage rec { pname = "pykka"; version = "2.0.1"; - src = fetchgit { - url = "https://github.com/jodal/pykka.git"; + src = fetchFromGitHub { + owner = "jodal"; + repo = pname; rev = "refs/tags/v${version}"; sha256 = "011rvv3vzj9rpwaq6vfpz9hfwm6gx1jmad4iri6z12g8nnlpydhs"; }; diff --git a/pkgs/development/python-modules/pyramid_hawkauth/default.nix b/pkgs/development/python-modules/pyramid_hawkauth/default.nix index ff966d906c8..fc76d9af68d 100644 --- a/pkgs/development/python-modules/pyramid_hawkauth/default.nix +++ b/pkgs/development/python-modules/pyramid_hawkauth/default.nix @@ -1,6 +1,6 @@ { stdenv , buildPythonPackage -, fetchgit +, fetchFromGitHub , pyramid , hawkauthlib , tokenlib @@ -8,11 +8,12 @@ }: buildPythonPackage rec { - pname = "pyramidhawkauth"; + pname = "pyramid_hawkauth"; version = "0.1.0"; - src = fetchgit { - url = "https://github.com/mozilla-services/pyramid_hawkauth.git"; + src = fetchFromGitHub { + owner = "mozilla-services"; + repo = pname; rev = "refs/tags/v${version}"; sha256 = "038ign7qlavlmvrhb2y8bygbxvy4j7bx2k1zg0i3wblg2ja50w7h"; }; diff --git a/pkgs/development/python-modules/rtmixer/default.nix b/pkgs/development/python-modules/rtmixer/default.nix index e1115bd8180..1d9b8114df7 100644 --- a/pkgs/development/python-modules/rtmixer/default.nix +++ b/pkgs/development/python-modules/rtmixer/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "spatialaudio"; repo = "python-rtmixer"; - rev = "${version}"; + rev = version; sha256 = "1bvgzzxiypvvb3qacbcry6761x9sk3dnx7jga7pli63f69vakg4y"; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/sacremoses/default.nix b/pkgs/development/python-modules/sacremoses/default.nix index 3785ebcf86c..f5c0ee715c3 100644 --- a/pkgs/development/python-modules/sacremoses/default.nix +++ b/pkgs/development/python-modules/sacremoses/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alvations"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "1gzr56w8yx82mn08wax5m0xyg15ym4ri5l80gmagp8r53443j770"; }; diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix index 6916b704fcd..69f7a93f509 100644 --- a/pkgs/development/python-modules/signedjson/default.nix +++ b/pkgs/development/python-modules/signedjson/default.nix @@ -1,6 +1,6 @@ { stdenv , buildPythonPackage -, fetchgit +, fetchFromGitHub , canonicaljson , unpaddedbase64 , pynacl @@ -11,8 +11,9 @@ buildPythonPackage rec { pname = "signedjson"; version = "1.1.0"; - src = fetchgit { - url = "https://github.com/matrix-org/python-signedjson.git"; + src = fetchFromGitHub { + owner = "matrix-org"; + repo = "python-${pname}"; rev = "refs/tags/v${version}"; sha256 = "18s388hm3babnvakbbgfqk0jzq25nnznvhygywd3azp9b4yzmd5c"; }; diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 76367919059..a89c6fa307e 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -31,7 +31,7 @@ let src = fetchFromGitHub { owner = "tensorflow"; repo = "probability"; - rev = "${version}"; + rev = version; sha256 = "07cm8zba8n0ihzdm3k4a4rsg5v62xxsfvcw4h0niz91c0parqjqy"; }; diff --git a/pkgs/development/python-modules/tokenlib/default.nix b/pkgs/development/python-modules/tokenlib/default.nix index 0ffb5ce0cb7..7c8e99cc399 100644 --- a/pkgs/development/python-modules/tokenlib/default.nix +++ b/pkgs/development/python-modules/tokenlib/default.nix @@ -1,6 +1,6 @@ { stdenv , buildPythonPackage -, fetchgit +, fetchFromGitHub , requests , webob }: @@ -9,8 +9,9 @@ buildPythonPackage rec { pname = "tokenlib"; version = "0.3.1"; - src = fetchgit { - url = "https://github.com/mozilla-services/tokenlib.git"; + src = fetchFromGitHub { + owner = "mozilla-services"; + repo = pname; rev = "refs/tags/${version}"; sha256 = "0bq6dqyfwh29pg8ngmrm4mx4q27an9lsj0p9l79p9snn4g2rxzc8"; }; diff --git a/pkgs/development/python-modules/unpaddedbase64/default.nix b/pkgs/development/python-modules/unpaddedbase64/default.nix index bcb902e5bfd..386478cbb75 100644 --- a/pkgs/development/python-modules/unpaddedbase64/default.nix +++ b/pkgs/development/python-modules/unpaddedbase64/default.nix @@ -1,14 +1,15 @@ { stdenv , buildPythonPackage -, fetchgit +, fetchFromGitHub }: buildPythonPackage rec { pname = "unpaddedbase64"; version = "1.1.0"; - src = fetchgit { - url = "https://github.com/matrix-org/python-unpaddedbase64.git"; + src = fetchFromGitHub { + owner = "matrix-org"; + repo = "python-${pname}"; rev = "refs/tags/v${version}"; sha256 = "0if3fjfxga0bwdq47v77fs9hrcqpmwdxry2i2a7pdqsp95258nxd"; }; diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 099837fbafa..d2ad97141ca 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; - rev = "${version}"; + rev = version; sha256 = "0ga2zfq4365hxvr3wd3isc146ibivy3bfcy24rb6cq3av3b90a8k"; }; diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix index 55c077f932d..b0e5319df2d 100644 --- a/pkgs/development/tools/analysis/retdec/default.nix +++ b/pkgs/development/tools/analysis/retdec/default.nix @@ -135,8 +135,7 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "avast-tl"; - repo = "retdec"; - name = "retdec-${version}"; + repo = pname; rev = "refs/tags/v${version}"; sha256 = "0chky656lsddn20bnm3pmz6ix20y4a0y8swwr42hrhi01vkhmzrp"; }; diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix index 44411d0db72..600b2b0e56c 100644 --- a/pkgs/development/tools/eclipse-mat/default.nix +++ b/pkgs/development/tools/eclipse-mat/default.nix @@ -31,7 +31,7 @@ let in stdenv.mkDerivation rec { pname = "eclipse-mat"; - version = "${pVersion}"; + version = pVersion; src = fetchurl { url = "http://ftp.halifax.rwth-aachen.de/eclipse//mat/${baseVersion}/rcp/MemoryAnalyzer-${version}-linux.gtk.x86_64.zip"; diff --git a/pkgs/development/tools/misc/argbash/default.nix b/pkgs/development/tools/misc/argbash/default.nix index 0c0511ec792..3efff500943 100644 --- a/pkgs/development/tools/misc/argbash/default.nix +++ b/pkgs/development/tools/misc/argbash/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "matejak"; repo = "argbash"; - rev = "${version}"; + rev = version; sha256 = "1xdhpbnc0xjv6ydcm122hhdjcl77jhiqnccjfqjp3cd1lfmzvg8v"; }; diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix index 741854a507d..401bbdbee6e 100644 --- a/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; - rev = "${version}"; + rev = version; sha256 = "18gz94h2x1z6g6r7v9cdixkbcaigd7cl08af6smlkaa89j0aki32"; }; diff --git a/pkgs/development/tools/misc/fujprog/default.nix b/pkgs/development/tools/misc/fujprog/default.nix index e15e48b0f2a..e5cd2e0e2dd 100644 --- a/pkgs/development/tools/misc/fujprog/default.nix +++ b/pkgs/development/tools/misc/fujprog/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "kost"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "08kzkzd5a1wfd1aycywdynxh3qy6n7z9i8lihkahmb4xac3chmz5"; }; diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix index e6b86e4a85c..91653d3773e 100644 --- a/pkgs/development/tools/sourcetrail/default.nix +++ b/pkgs/development/tools/sourcetrail/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "CoatiSoftware"; repo = "Sourcetrail"; - rev = "${version}"; + rev = version; sha256 = "0jp9y86xzkcxikc1cn4f6gqgg6zdssck08677ldagw25p1zadvzw"; }; diff --git a/pkgs/development/tools/swiftformat/default.nix b/pkgs/development/tools/swiftformat/default.nix index c47955695f5..cb3ed5217f0 100644 --- a/pkgs/development/tools/swiftformat/default.nix +++ b/pkgs/development/tools/swiftformat/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nicklockwood"; repo = "SwiftFormat"; - rev = "${version}"; + rev = version; sha256 = "0zajvbaf3r02k53lv5zdxf13apc6chnjmj69zkyac48lpnpbcxq6"; }; diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix index 848bf2ab885..ac31de4e4c2 100644 --- a/pkgs/games/cockatrice/default.nix +++ b/pkgs/games/cockatrice/default.nix @@ -9,7 +9,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "Cockatrice"; repo = "Cockatrice"; - rev = "${version}"; + rev = version; sha256 = "1yaxm7q0ja3rgx197hh8ynjc6ncc4hm0qdn9v7f0l4fbv0bdpv34"; }; diff --git a/pkgs/games/eidolon/default.nix b/pkgs/games/eidolon/default.nix index e982c95c4d6..4ae64df4143 100644 --- a/pkgs/games/eidolon/default.nix +++ b/pkgs/games/eidolon/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchgit { url = "https://git.sr.ht/~nicohman/eidolon"; - rev = "${version}"; + rev = version; sha256 = "1yn3k569pxzw43mmsk97088xpkdc714rks3ncchbb6ccx25kgxrr"; }; cargoPatches = [ ./cargo-lock.patch ]; diff --git a/pkgs/games/mari0/default.nix b/pkgs/games/mari0/default.nix index b8c4ea281df..c3fb66208b8 100644 --- a/pkgs/games/mari0/default.nix +++ b/pkgs/games/mari0/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "Stabyourself"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "1zqaq4w599scsjvy1rsb21fd2r8j3srx9vym4ir9bh666dp36gxa"; }; diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index 14d51ee87bd..99599b92dfa 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -1,11 +1,12 @@ -{ stdenv, mkDerivation, fetchgit, qt5, box2d, which, cmake, gettext }: +{ stdenv, mkDerivation, fetchFromGitHub, qt5, box2d, which, cmake, gettext }: mkDerivation rec { pname = "tbe"; version = "0.9.3.1"; - src = fetchgit { - url = "https://github.com/kaa-ching/tbe"; + src = fetchFromGitHub { + owner = "kaa-ching"; + repo = pname; rev = "refs/tags/v${version}"; sha256 = "1ag2cp346f9bz9qy6za6q54id44d2ypvkyhvnjha14qzzapwaysj"; }; diff --git a/pkgs/games/wyvern/default.nix b/pkgs/games/wyvern/default.nix index 4723a6c52fa..dcf81bc0985 100644 --- a/pkgs/games/wyvern/default.nix +++ b/pkgs/games/wyvern/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { src = fetchgit { url = "https://git.sr.ht/~nicohman/wyvern"; - rev = "${version}"; + rev = version; sha256 = "1sl3yhash1527amc8rs4374fd7jbgnkyy7qpw94ms2gs80sdv3s5"; }; cargoPatches = [ ./cargo-lock.patch ]; diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix index 7e231c5edd3..60b0bfe1223 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/misc/emulators/mednaffe/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "AmatCoder"; repo = "mednaffe"; - rev = "${version}"; + rev = version; sha256 = "15qk3a3l1phr8bap2ayh3c0vyvw2jwhny1iz1ajq2adyjpm9fhr7"; }; diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix index d7c7e042981..c2527acc1cd 100644 --- a/pkgs/servers/monitoring/do-agent/default.nix +++ b/pkgs/servers/monitoring/do-agent/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "digitalocean"; repo = "do-agent"; - rev = "${version}"; + rev = version; sha256 = "16mmh1kz6zbncfisd9qnb3ssgpkcb4hb7700jlzbdjqxyjmy0qsf"; }; diff --git a/pkgs/servers/monitoring/prometheus/promscale.nix b/pkgs/servers/monitoring/prometheus/promscale.nix index 37e3ec0375c..25ad49e7c8a 100644 --- a/pkgs/servers/monitoring/prometheus/promscale.nix +++ b/pkgs/servers/monitoring/prometheus/promscale.nix @@ -10,7 +10,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "timescale"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "sha256:00mhkp3nf6h2zsvmmwyza1lahvmm05isfi7rqkx24c0dmkmif3x9"; }; diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix index ef592420b11..466f07052b8 100644 --- a/pkgs/servers/ser2net/default.nix +++ b/pkgs/servers/ser2net/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "cminyard"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "01w82nrgffsfz2c80p4cyppg3bz56d90jm6i6356j0nva3784haw"; }; diff --git a/pkgs/servers/web-apps/dokuwiki/default.nix b/pkgs/servers/web-apps/dokuwiki/default.nix index 8177e1d2226..2cb20e4932f 100644 --- a/pkgs/servers/web-apps/dokuwiki/default.nix +++ b/pkgs/servers/web-apps/dokuwiki/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "splitbrain"; - repo = "${pname}"; + repo = pname; rev = "release_stable_${version}"; sha256 = "09swcqyd06l3481k190gmlr3b33dlv1lw1kk9nyh5b4sa5p3k7kk"; }; diff --git a/pkgs/servers/web-apps/jirafeau/default.nix b/pkgs/servers/web-apps/jirafeau/default.nix index 1f3dd2e9012..33cde2c5922 100644 --- a/pkgs/servers/web-apps/jirafeau/default.nix +++ b/pkgs/servers/web-apps/jirafeau/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "mojo42"; repo = "Jirafeau"; - rev = "${version}"; + rev = version; sha256 = "09gq5zhynygpqj0skq7ifnn9yjjg7qnc6kjvaas7f53av2707z4c"; }; diff --git a/pkgs/servers/web-apps/rss-bridge/default.nix b/pkgs/servers/web-apps/rss-bridge/default.nix index 432f5956406..73c2fcce347 100644 --- a/pkgs/servers/web-apps/rss-bridge/default.nix +++ b/pkgs/servers/web-apps/rss-bridge/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "RSS-Bridge"; repo = "rss-bridge"; - rev = "${version}"; + rev = version; sha256 = "075k4bylx9308d083ry5a9q4629ccnrnndqqdqp1g42rzlqrw79q"; }; diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix index 7b30e5c5815..7bd0c3e6dcd 100644 --- a/pkgs/tools/X11/xwinmosaic/default.nix +++ b/pkgs/tools/X11/xwinmosaic/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchgit, gtk2, cmake, pkgconfig, libXdamage }: +{ stdenv, fetchFromGitHub, gtk2, cmake, pkgconfig, libXdamage }: stdenv.mkDerivation rec { version = "0.4.2"; pname = "xwinmosaic"; - src = fetchgit { - url = "https://github.com/soulthreads/xwinmosaic/"; - rev = "refs/tags/v0.4.2"; + src = fetchFromGitHub { + owner = "soulthreads"; + repo = pname; + rev = "refs/tags/v${version}"; sha256 = "16qhrpgn84fz0q3nfvaz5sisc82zk6y7c0sbvbr69zfx5fwbs1rr"; }; diff --git a/pkgs/tools/backup/stenc/default.nix b/pkgs/tools/backup/stenc/default.nix index 11859c4f8be..af5a33c2a6e 100644 --- a/pkgs/tools/backup/stenc/default.nix +++ b/pkgs/tools/backup/stenc/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "scsitape"; repo = "stenc"; - rev = "${version}"; + rev = version; sha256 = "1778m1zcyzyf42k5m496yqh0gv6kqhb0sq5983dhky1fccjl905k"; }; diff --git a/pkgs/tools/misc/ddate/default.nix b/pkgs/tools/misc/ddate/default.nix index 0987fb6d286..04a89ec3dd0 100644 --- a/pkgs/tools/misc/ddate/default.nix +++ b/pkgs/tools/misc/ddate/default.nix @@ -1,10 +1,13 @@ -{stdenv, fetchgit, cmake} : +{stdenv, fetchFromGitHub, cmake} : -stdenv.mkDerivation { - name = "ddate-0.2.2"; - src = fetchgit { - url = "https://github.com/bo0ts/ddate"; - rev = "refs/tags/v0.2.2"; +stdenv.mkDerivation rec { + pname = "ddate"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "bo0ts"; + repo = pname; + rev = "refs/tags/v${version}"; sha256 = "1qchxnxvghbma6gp1g78wnjxsri0b72ha9axyk31cplssl7yn73f"; }; @@ -14,7 +17,7 @@ stdenv.mkDerivation { homepage = "https://github.com/bo0ts/ddate"; description = "Discordian version of the date program"; license = stdenv.lib.licenses.publicDomain; - maintainers = with stdenv.lib.maintainers; [kovirobi]; + maintainers = with stdenv.lib.maintainers; [ kovirobi ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix index e59c2387a3c..a4091334330 100644 --- a/pkgs/tools/misc/eva/default.nix +++ b/pkgs/tools/misc/eva/default.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "NerdyPepper"; - repo = "${pname}"; + repo = pname; rev = "6ce0fc0212a34ffb647b24d9d903029ac4518165"; sha256 = "10242vnq2ph0g3p2hdacs4lmx3f474xm04nadplxbpv9xh4nbag3"; }; diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index d92f2346563..11cb0dcf554 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; - rev = "${version}"; + rev = version; sha256 = "sha256-xMz6e0OLeB3eltGrLV3Hew0lMjH5LSgqJ1l7JT2Ho/M="; }; diff --git a/pkgs/tools/misc/rpcsvc-proto/default.nix b/pkgs/tools/misc/rpcsvc-proto/default.nix index 12885172080..925dfde13a3 100644 --- a/pkgs/tools/misc/rpcsvc-proto/default.nix +++ b/pkgs/tools/misc/rpcsvc-proto/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "thkukuk"; - repo = "${pname}"; + repo = pname; rev = "v${version}"; sha256 = "006l1f824r9bcbwn1s1vbs33cdwhs66jn6v97yas597y884y40z9"; }; diff --git a/pkgs/tools/networking/goimapnotify/default.nix b/pkgs/tools/networking/goimapnotify/default.nix index fb64ff65cc1..4232a5a4fed 100644 --- a/pkgs/tools/networking/goimapnotify/default.nix +++ b/pkgs/tools/networking/goimapnotify/default.nix @@ -9,7 +9,7 @@ buildGoPackage rec { src = fetchFromGitLab { owner = "shackra"; repo = "goimapnotify"; - rev = "${version}"; + rev = version; sha256 = "1d42gd3m2rkvy985d181dbcm5i3f7xsg2z8z6s4bpvw24pfnzs42"; }; diff --git a/pkgs/tools/networking/network-manager/dmenu/default.nix b/pkgs/tools/networking/network-manager/dmenu/default.nix index 4b46d63ced5..e17d4ebc071 100644 --- a/pkgs/tools/networking/network-manager/dmenu/default.nix +++ b/pkgs/tools/networking/network-manager/dmenu/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "firecat53"; repo = "networkmanager-dmenu"; - rev = "${version}"; + rev = version; sha256 = "1liidqh8c33pxyb07qyj0jkd0fdak73g9r2iwiq62vfzrpik09k0"; }; diff --git a/pkgs/tools/networking/nfstrace/default.nix b/pkgs/tools/networking/nfstrace/default.nix index 2cb819caee9..6377f276af3 100644 --- a/pkgs/tools/networking/nfstrace/default.nix +++ b/pkgs/tools/networking/nfstrace/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "epam"; repo = "nfstrace"; - rev = "${version}"; + rev = version; sha256 = "1djsyn7i3xp969rnmsdaf5vwjiik9wylxxrc5nm7by00i76c1vsg"; }; diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix index c4d9aae267e..3f61fdd583e 100644 --- a/pkgs/tools/package-management/cargo-about/default.nix +++ b/pkgs/tools/package-management/cargo-about/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; - rev = "${version}"; + rev = version; sha256 = "00ing1v6vjqfvirp3mbayn8rwvxf72wnhz9249k2iifw8bl2r2hd"; }; diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix index 791dfe755ee..f9b996b2776 100644 --- a/pkgs/tools/package-management/gx/default.nix +++ b/pkgs/tools/package-management/gx/default.nix @@ -1,16 +1,16 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gx"; version = "0.14.1"; - rev = "refs/tags/v${version}"; goPackagePath = "github.com/whyrusleeping/gx"; - src = fetchgit { - inherit rev; - url = "https://github.com/whyrusleeping/gx"; + src = fetchFromGitHub { + owner = "whyrusleeping"; + repo = pname; + rev = "refs/tags/v${version}"; sha256 = "0pfx2p59xdbmqzfbgaf8xvlnzh8m05hkg596glq5kvl8ib65i4ha"; }; diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix index 652edf95e55..8579ef574d5 100644 --- a/pkgs/tools/package-management/gx/go/default.nix +++ b/pkgs/tools/package-management/gx/go/default.nix @@ -1,18 +1,18 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchgit +{ stdenv, buildGoPackage, fetchFromGitHub , gx }: buildGoPackage rec { pname = "gx-go"; version = "1.9.0"; - rev = "refs/tags/v${version}"; goPackagePath = "github.com/whyrusleeping/gx-go"; - src = fetchgit { - inherit rev; - url = "https://github.com/whyrusleeping/gx-go"; + src = fetchFromGitHub { + owner = "whyrusleeping"; + repo = pname; + rev = "refs/tags/v${version}"; sha256 = "0fdy4b3ymqw6hzvvjwq37mfrdmizc8lxm53axw93n3x6118na9jc"; }; diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix index e861d70f725..aff6bbd028a 100644 --- a/pkgs/tools/security/crackxls/default.nix +++ b/pkgs/tools/security/crackxls/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, pkgconfig, autoconf, automake, openssl, libgsf, gmp }: +{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, openssl, libgsf, gmp }: stdenv.mkDerivation rec { pname = "crackxls"; version = "0.4"; - src = fetchgit { - url = "https://github.com/GavinSmith0123/crackxls2003.git"; - rev = "refs/tags/v${version}"; + src = fetchFromGitHub { + owner = "GavinSmith0123"; + repo = "crackxls2003"; + rev = "v${version}"; sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz"; }; diff --git a/pkgs/tools/security/honggfuzz/default.nix b/pkgs/tools/security/honggfuzz/default.nix index 71146b15ea3..a46acef81d7 100644 --- a/pkgs/tools/security/honggfuzz/default.nix +++ b/pkgs/tools/security/honggfuzz/default.nix @@ -10,7 +10,7 @@ let src = fetchFromGitHub { owner = "google"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "0dcl5a5jykgfmnfj42vl7kah9k26wg38l2g6yfh5pssmlf0nax33"; }; diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index 9e778a636c1..e8c4b1f541b 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit version; - crateName = "${pname}"; + crateName = pname; sha256 = "0p37kwkp153mkns4bh7k7gnksk6c31214wlw3faf42daav32mmgw"; }; diff --git a/pkgs/tools/security/rustscan/default.nix b/pkgs/tools/security/rustscan/default.nix index 4d154bbc96f..f3656547951 100644 --- a/pkgs/tools/security/rustscan/default.nix +++ b/pkgs/tools/security/rustscan/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "RustScan"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "0dhy7b73ipsxsr7wlc3r5yy39i3cjrdszhsw9xwjj31692s3b605"; }; diff --git a/pkgs/tools/text/ledger2beancount/default.nix b/pkgs/tools/text/ledger2beancount/default.nix index 00cc996ed60..8a521b751d4 100644 --- a/pkgs/tools/text/ledger2beancount/default.nix +++ b/pkgs/tools/text/ledger2beancount/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "zacchiro"; repo = "ledger2beancount"; - rev = "${version}"; + rev = version; sha256 = "0w88jb1x0w02jwwf6ipx3cxr89kzffrrdqws3556zrvvs01bh84j"; };