diff --git a/pkgs/applications/audio/rofi-pulse-select/default.nix b/pkgs/applications/audio/rofi-pulse-select/default.nix index f4f70a9d1c33..0664a6c2c4d7 100644 --- a/pkgs/applications/audio/rofi-pulse-select/default.nix +++ b/pkgs/applications/audio/rofi-pulse-select/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "DamienCassou"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "1405v0bh2m8ip9c23l95i8iq2gfrpanc6f4dz17nysdcff2ay2p3"; }; diff --git a/pkgs/applications/blockchains/lndhub-go/default.nix b/pkgs/applications/blockchains/lndhub-go/default.nix index 4f292d44d6e1..08bfd05471d4 100644 --- a/pkgs/applications/blockchains/lndhub-go/default.nix +++ b/pkgs/applications/blockchains/lndhub-go/default.nix @@ -1,8 +1,6 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub -, fetchpatch }: buildGoModule rec { @@ -12,7 +10,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "getAlby"; repo = "lndhub.go"; - rev = "${version}"; + rev = version; sha256 = "sha256-m+Sc/rsYIbvd1oOqG4OT+wPtSxlgFq8m03n28eZIWJU="; }; diff --git a/pkgs/applications/misc/deadd-notification-center/default.nix b/pkgs/applications/misc/deadd-notification-center/default.nix index 8dd52e390dd3..39630f12c0f6 100644 --- a/pkgs/applications/misc/deadd-notification-center/default.nix +++ b/pkgs/applications/misc/deadd-notification-center/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, haskellPackages, fetchFromGitHub, lib, writeText }: +{ mkDerivation, haskellPackages, fetchFromGitHub, lib }: let # deadd-notification-center.service @@ -22,7 +22,7 @@ in mkDerivation rec { src = fetchFromGitHub { owner = "phuhl"; repo = "linux_notification_center"; - rev = "${version}"; + rev = version; hash = "sha256-ascg31HsHeXKhvMNntiRLuZ4+T2+fokfDhZ3c8N/Gzg="; }; diff --git a/pkgs/applications/misc/somebar/default.nix b/pkgs/applications/misc/somebar/default.nix index 9866ef6c6d80..6c595bc8dd66 100644 --- a/pkgs/applications/misc/somebar/default.nix +++ b/pkgs/applications/misc/somebar/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { src = fetchFromSourcehut { owner = "~raphi"; repo = "somebar"; - rev = "${version}"; + rev = version; sha256 = "sha256-PBxCy1dZrOL1nmhVDQozvF0XL79uKMhhERGNpPPzaRU="; }; diff --git a/pkgs/applications/networking/cluster/kubent/default.nix b/pkgs/applications/networking/cluster/kubent/default.nix index bba56a5b058a..e689af406ecf 100644 --- a/pkgs/applications/networking/cluster/kubent/default.nix +++ b/pkgs/applications/networking/cluster/kubent/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "doitintl"; repo = "kube-no-trouble"; - rev = "${version}"; + rev = version; sha256 = "sha256-QIvMhKAo30gInqJBpHvhcyjgVkdRqgBKwLQ80ng/75U="; }; diff --git a/pkgs/applications/networking/stc-cli/default.nix b/pkgs/applications/networking/stc-cli/default.nix index 85dadfee73a2..c2d799537174 100644 --- a/pkgs/applications/networking/stc-cli/default.nix +++ b/pkgs/applications/networking/stc-cli/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "tenox7"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "sha256-g1zn/CBpLv0oNhp32njeNhhli8aTCECgh92+zn5v+4U="; }; diff --git a/pkgs/applications/science/biology/angsd/default.nix b/pkgs/applications/science/biology/angsd/default.nix index 799ba87f073b..035cb2ca2b27 100644 --- a/pkgs/applications/science/biology/angsd/default.nix +++ b/pkgs/applications/science/biology/angsd/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "ANGSD"; repo = "angsd"; sha256 = "sha256-Ppxgy54pAnqJUzNX5c12NHjKTQyEEcPSpCEEVOyZ/LA="; - rev = "${version}"; + rev = version; }; buildInputs = [ htslib zlib bzip2 xz curl openssl ]; diff --git a/pkgs/applications/science/biology/muscle/default.nix b/pkgs/applications/science/biology/muscle/default.nix index 86219f35f95a..7696acefd7b2 100644 --- a/pkgs/applications/science/biology/muscle/default.nix +++ b/pkgs/applications/science/biology/muscle/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "rcedgar"; repo = pname; - rev = "${version}"; + rev = version; hash = "sha256-NpnJziZXga/T5OavUt3nQ5np8kJ9CFcSmwyg4m6IJsk="; }; diff --git a/pkgs/applications/science/logic/anders/default.nix b/pkgs/applications/science/logic/anders/default.nix index ccb81686cb32..eb2be71f1681 100644 --- a/pkgs/applications/science/logic/anders/default.nix +++ b/pkgs/applications/science/logic/anders/default.nix @@ -9,7 +9,7 @@ ocamlPackages.buildDunePackage rec { src = fetchFromGitHub { owner = "groupoid"; repo = "anders"; - rev = "${version}"; + rev = version; sha256 = "sha256-JUiZoo2rNLfgs94TlJqUNzul/7ODisCjSFAzhgSp1z4="; }; diff --git a/pkgs/applications/terminal-emulators/tym/default.nix b/pkgs/applications/terminal-emulators/tym/default.nix index 3dcf23170209..91a0b528c8db 100644 --- a/pkgs/applications/terminal-emulators/tym/default.nix +++ b/pkgs/applications/terminal-emulators/tym/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "endaaman"; repo = "${pname}"; - rev = "${version}"; + rev = version; sha256 = "sha256-5pXNOuMT2/G+m6XoTrwNTCGNfISLLy0wQpVPhQJzs4s="; }; diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix index a688e0476256..0878c2f1ed59 100644 --- a/pkgs/applications/video/glaxnimate/default.nix +++ b/pkgs/applications/video/glaxnimate/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "mattbas"; repo = "${pname}"; - rev = "${version}"; + rev = version; sha256 = "G4ykcOvXXnVIQZUYpRIrALtDSsGqxMvDtcmobjjtlKw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/applications/video/media-downloader/default.nix index af3ea0319f92..987defe419a5 100644 --- a/pkgs/applications/video/media-downloader/default.nix +++ b/pkgs/applications/video/media-downloader/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mhogomchungu"; repo = pname; - rev = "${version}"; + rev = version; hash = "sha256-B+KegiU3bXZXyXDQDBYipdd/+cXrPkFFH56DBojZQbg="; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix index b58d702b2dd6..523683e0c175 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "dimtpap"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "sha256-gcOH8gJuP03MxhJbgl941yTtm2XIHmqHWVwkRCVATkQ="; }; diff --git a/pkgs/data/icons/graphite-cursors/default.nix b/pkgs/data/icons/graphite-cursors/default.nix index 357ebcd9a6b3..b64e7567b25f 100644 --- a/pkgs/data/icons/graphite-cursors/default.nix +++ b/pkgs/data/icons/graphite-cursors/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "sha256-Kopl2NweYrq9rhw+0EUMhY/pfGo4g387927TZAhI5/A="; }; diff --git a/pkgs/development/embedded/arduino/arduinoOTA/default.nix b/pkgs/development/embedded/arduino/arduinoOTA/default.nix index 1026b855770f..92da1a77f18e 100644 --- a/pkgs/development/embedded/arduino/arduinoOTA/default.nix +++ b/pkgs/development/embedded/arduino/arduinoOTA/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "arduino"; repo = pname; - rev = "${version}"; + rev = version; hash = "sha256-HaNMkeV/PDEotYp8+rUKFaBxGbZO8qA99Yp2sa6glz8="; }; diff --git a/pkgs/development/embedded/nmrpflash/default.nix b/pkgs/development/embedded/nmrpflash/default.nix index bcfe308c2968..71bc39498720 100644 --- a/pkgs/development/embedded/nmrpflash/default.nix +++ b/pkgs/development/embedded/nmrpflash/default.nix @@ -1,11 +1,9 @@ { fetchFromGitHub -, gcc , lib , libnl , libpcap , pkg-config , stdenv -, writeShellScriptBin }: stdenv.mkDerivation rec { pname = "nmrpflash"; @@ -23,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ libnl libpcap ]; PREFIX = "${placeholder "out"}"; - STANDALONE_VERSION = "${version}"; + STANDALONE_VERSION = version; preInstall = '' mkdir -p $out/bin diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index 8cac5df55ea2..f5e7e2a638d2 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "google"; repo = "leveldb"; - rev = "${version}"; + rev = version; sha256 = "sha256-RL+dfSFZZzWvUobSqiPbuC4nDiGzjIIukbVJZRacHbI="; }; diff --git a/pkgs/development/libraries/libdecor/default.nix b/pkgs/development/libraries/libdecor/default.nix index c3641e843f57..fefaf98c40e9 100644 --- a/pkgs/development/libraries/libdecor/default.nix +++ b/pkgs/development/libraries/libdecor/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "libdecor"; repo = "libdecor"; - rev = "${version}"; + rev = version; hash = "sha256-8b6qCqOSDDbhYwAeAaUyI71tSopTkGtCJaxZaJw1vQQ="; }; diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 4be281284abf..1f9ffb373082 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "frankosterfeld"; repo = "qtkeychain"; - rev = "${version}"; + rev = version; sha256 = "sha256-LclYOuIYn+jYCvg69uHFlV3VcZ2KWdr8lFyCSBIB7Kw="; }; diff --git a/pkgs/development/libraries/ta-lib/default.nix b/pkgs/development/libraries/ta-lib/default.nix index b3900f645111..ea5ec66cf169 100644 --- a/pkgs/development/libraries/ta-lib/default.nix +++ b/pkgs/development/libraries/ta-lib/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "rafa-dot-el"; repo = "talib"; - rev = "${version}"; + rev = version; sha256 = "sha256-bIzN8f9ZiOLaVzGAXcZUHUh/v9z1U+zY+MnyjJr1lSw="; }; diff --git a/pkgs/development/lisp-modules-obsolete/lisp-packages.nix b/pkgs/development/lisp-modules-obsolete/lisp-packages.nix index 69a4596c22f6..6688ebcc527c 100644 --- a/pkgs/development/lisp-modules-obsolete/lisp-packages.nix +++ b/pkgs/development/lisp-modules-obsolete/lisp-packages.nix @@ -213,7 +213,7 @@ let lispPackages = rec { src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "nyxt"; - rev = "${version}"; + rev = version; sha256 = "12l7ir3q29v06jx0zng5cvlbmap7p709ka3ik6x29lw334qshm9b"; }; diff --git a/pkgs/development/ocaml-modules/fix/default.nix b/pkgs/development/ocaml-modules/fix/default.nix index 1fdf788c3636..c044a03a2574 100644 --- a/pkgs/development/ocaml-modules/fix/default.nix +++ b/pkgs/development/ocaml-modules/fix/default.nix @@ -8,7 +8,7 @@ buildDunePackage rec { domain = "gitlab.inria.fr"; owner = "fpottier"; repo = "fix"; - rev = "${version}"; + rev = version; sha256 = "sha256-suWkZDLnXEO/4QCGmNuyLFOV0LJsFOMD13gxOcgu6JQ="; }; diff --git a/pkgs/development/ocaml-modules/json-data-encoding/default.nix b/pkgs/development/ocaml-modules/json-data-encoding/default.nix index ef89f7a205b7..c517725c74e2 100644 --- a/pkgs/development/ocaml-modules/json-data-encoding/default.nix +++ b/pkgs/development/ocaml-modules/json-data-encoding/default.nix @@ -8,7 +8,7 @@ buildDunePackage rec { src = fetchFromGitLab { owner = "nomadic-labs"; repo = "json-data-encoding"; - rev = "${version}"; + rev = version; hash = "sha256-ticulOKiFNQIZNFOQE9UQOw/wqRfygQwLVIc4kkmwg4="; }; diff --git a/pkgs/development/ocaml-modules/lwt-exit/default.nix b/pkgs/development/ocaml-modules/lwt-exit/default.nix index a2a6f14524f9..1b82c30028e9 100644 --- a/pkgs/development/ocaml-modules/lwt-exit/default.nix +++ b/pkgs/development/ocaml-modules/lwt-exit/default.nix @@ -11,7 +11,7 @@ buildDunePackage rec { src = fetchFromGitLab { owner = "nomadic-labs"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "1k763bmj1asj9ijar39rh3h1d59rckmsf21h2y8966lgglsf42bd"; }; diff --git a/pkgs/development/ocaml-modules/odoc-parser/default.nix b/pkgs/development/ocaml-modules/odoc-parser/default.nix index 5224f241798f..b653b111698f 100644 --- a/pkgs/development/ocaml-modules/odoc-parser/default.nix +++ b/pkgs/development/ocaml-modules/odoc-parser/default.nix @@ -19,7 +19,6 @@ let param = { }; }."${version}"; in -let v = version; in buildDunePackage rec { pname = "odoc-parser"; inherit version; diff --git a/pkgs/development/python-modules/btsmarthub_devicelist/default.nix b/pkgs/development/python-modules/btsmarthub_devicelist/default.nix index 59fb071c744c..ea5e61f7a49d 100644 --- a/pkgs/development/python-modules/btsmarthub_devicelist/default.nix +++ b/pkgs/development/python-modules/btsmarthub_devicelist/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jxwolstenholme"; repo = "btsmarthub_devicelist"; - rev = "${version}"; + rev = version; hash = "sha256-7ncxCpY+A2SuSFa3k21QchrmFs1dPRUMb1r1z/laa6M="; }; diff --git a/pkgs/development/python-modules/flatbuffers/default.nix b/pkgs/development/python-modules/flatbuffers/default.nix index 3575f1c36137..f477a1446a6e 100644 --- a/pkgs/development/python-modules/flatbuffers/default.nix +++ b/pkgs/development/python-modules/flatbuffers/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { # flatbuffers needs VERSION environment variable for setting the correct # version, otherwise it uses the current date. - VERSION = "${version}"; + VERSION = version; pythonImportsCheck = [ "flatbuffers" ]; diff --git a/pkgs/development/python-modules/gatt/default.nix b/pkgs/development/python-modules/gatt/default.nix index 6242011b312f..472b3e592c3d 100644 --- a/pkgs/development/python-modules/gatt/default.nix +++ b/pkgs/development/python-modules/gatt/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "getsenic"; repo = "gatt-python"; - rev = "${version}"; + rev = version; hash = "sha256-GMLqQ9ojQ649hbbJB+KiQoOhiTWweOgv6zaCDzhIB5A="; }; diff --git a/pkgs/development/python-modules/pyasn/default.nix b/pkgs/development/python-modules/pyasn/default.nix index 0fe2d58f95c3..0fc2121f1430 100644 --- a/pkgs/development/python-modules/pyasn/default.nix +++ b/pkgs/development/python-modules/pyasn/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { datasrc = fetchFromGitHub { owner = "hadiasghari"; repo = "pyasn"; - rev = "${version}"; + rev = version; hash = "sha256-R7Vi1Mn44Mg3HQLDk9O43MkXXwbLRr/jjVKSHJvgYj0"; }; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 2171db6e9466..e700f630b665 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { hash = "sha256-qnYFAKLY+L6O/Y87J6lLKvOwqMLANzR9WV6vb/Cdinc="; }; - SETUPTOOLS_SCM_PRETEND_VERSION="${version}"; + SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ setuptoolsBuildHook diff --git a/pkgs/development/tools/rome/default.nix b/pkgs/development/tools/rome/default.nix index 6a6ade47ccac..5d5e82942e79 100644 --- a/pkgs/development/tools/rome/default.nix +++ b/pkgs/development/tools/rome/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { env = { RUSTFLAGS = "-C strip=symbols"; - ROME_VERSION = "${version}"; + ROME_VERSION = version; }; buildInputs = diff --git a/pkgs/development/tools/rust/cargo-deadlinks/default.nix b/pkgs/development/tools/rust/cargo-deadlinks/default.nix index 446f3cec37d9..21ac416882f9 100644 --- a/pkgs/development/tools/rust/cargo-deadlinks/default.nix +++ b/pkgs/development/tools/rust/cargo-deadlinks/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "deadlinks"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "0s5q9aghncsk9834azn5cgnn5ms3zzyjan2rq06kaqcgzhld4cjh"; }; diff --git a/pkgs/games/gotypist/default.nix b/pkgs/games/gotypist/default.nix index d7c9c33d7574..7840a56d361a 100644 --- a/pkgs/games/gotypist/default.nix +++ b/pkgs/games/gotypist/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "pb-"; repo = "gotypist"; - rev = "${version}"; + rev = version; sha256 = "0khl2f6bl121slw9mlf4qzsdarpk1v3vry11f3dvz7pb1q6zjj11"; }; diff --git a/pkgs/os-specific/linux/new-lg4ff/default.nix b/pkgs/os-specific/linux/new-lg4ff/default.nix index 26b0f67b6c43..a92ee9ae64b5 100644 --- a/pkgs/os-specific/linux/new-lg4ff/default.nix +++ b/pkgs/os-specific/linux/new-lg4ff/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "berarma"; repo = "new-lg4ff"; - rev = "${version}"; + rev = version; sha256 = "ZFwNdeJcSxzWtqjOF86SZpqhuz8jXZ2drvlQeIqsaNY="; }; diff --git a/pkgs/os-specific/linux/virtio_vmmci/default.nix b/pkgs/os-specific/linux/virtio_vmmci/default.nix index d18818a10de8..7c6d57273be9 100644 --- a/pkgs/os-specific/linux/virtio_vmmci/default.nix +++ b/pkgs/os-specific/linux/virtio_vmmci/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "voutilad"; repo = "virtio_vmmci"; - rev = "${version}"; + rev = version; hash = "sha256-ZHslYYZFjM3wp0W5J3/WwCtQ2wDzT1jNc26Z/giTC8g="; }; diff --git a/pkgs/os-specific/linux/vmm_clock/default.nix b/pkgs/os-specific/linux/vmm_clock/default.nix index 648a61b5e880..7ce99f40df1f 100644 --- a/pkgs/os-specific/linux/vmm_clock/default.nix +++ b/pkgs/os-specific/linux/vmm_clock/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "voutilad"; repo = "vmm_clock"; - rev = "${version}"; + rev = version; hash = "sha256-8z/N/dbkeFd40sH7jatNmSS62B88tC0jVgNljhxslOo="; }; diff --git a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix index 2abf5ace252a..ab092e6f02de 100644 --- a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix @@ -7,7 +7,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "czerwonk"; repo = "junos_exporter"; - rev = "${version}"; + rev = version; sha256 = "sha256-XYISwq6xcVKhXUK6j22pQ5eOfuKNH0uXOEK1MUzSq90="; }; diff --git a/pkgs/servers/osmocom/osmo-bsc/default.nix b/pkgs/servers/osmocom/osmo-bsc/default.nix index fd10dd5f20d1..f19261b0f855 100644 --- a/pkgs/servers/osmocom/osmo-bsc/default.nix +++ b/pkgs/servers/osmocom/osmo-bsc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-bsc"; - rev = "${version}"; + rev = version; hash = "sha256-oCHEWQjHG2JZdoisROukwRbpQq2cNAgC+1yOqsgx+As="; }; diff --git a/pkgs/servers/osmocom/osmo-bts/default.nix b/pkgs/servers/osmocom/osmo-bts/default.nix index c4a10f21abab..e4e731052420 100644 --- a/pkgs/servers/osmocom/osmo-bts/default.nix +++ b/pkgs/servers/osmocom/osmo-bts/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-bts"; - rev = "${version}"; + rev = version; hash = "sha256-RSWXWQn3DAPtThUbthyXrSFSQhHzKaH/m1f6/MCojzM="; }; diff --git a/pkgs/servers/osmocom/osmo-ggsn/default.nix b/pkgs/servers/osmocom/osmo-ggsn/default.nix index d65dad1dbb00..21f49e69f652 100644 --- a/pkgs/servers/osmocom/osmo-ggsn/default.nix +++ b/pkgs/servers/osmocom/osmo-ggsn/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-ggsn"; - rev = "${version}"; + rev = version; hash = "sha256-j7Szh6lDZY9ji9VAdE3D73R/WBPDo85nVB8hr4HzO7M="; }; diff --git a/pkgs/servers/osmocom/osmo-hlr/default.nix b/pkgs/servers/osmocom/osmo-hlr/default.nix index 8ecb1ad3780d..1a1ff1883908 100644 --- a/pkgs/servers/osmocom/osmo-hlr/default.nix +++ b/pkgs/servers/osmocom/osmo-hlr/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-hlr"; - rev = "${version}"; + rev = version; hash = "sha256-lFIYoDaJbVcC0A0TukRO9KDTVx31WqPPz/Z3wACJBp0="; }; diff --git a/pkgs/servers/osmocom/osmo-hnbgw/default.nix b/pkgs/servers/osmocom/osmo-hnbgw/default.nix index ecadc543c566..3214667da333 100644 --- a/pkgs/servers/osmocom/osmo-hnbgw/default.nix +++ b/pkgs/servers/osmocom/osmo-hnbgw/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-hnbgw"; - rev = "${version}"; + rev = version; hash = "sha256-OWCAiU4mK57e5gm6QOovwmoFAaCG1d8ZYpkP4isIqvI="; }; diff --git a/pkgs/servers/osmocom/osmo-hnodeb/default.nix b/pkgs/servers/osmocom/osmo-hnodeb/default.nix index cf5c715ccddf..20f925dc98ee 100644 --- a/pkgs/servers/osmocom/osmo-hnodeb/default.nix +++ b/pkgs/servers/osmocom/osmo-hnodeb/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-hnodeb"; - rev = "${version}"; + rev = version; hash = "sha256-Izivyw2HqRmrM68ehGqlIkJeuZ986d1WQ0yr6NWWTdA="; }; diff --git a/pkgs/servers/osmocom/osmo-iuh/default.nix b/pkgs/servers/osmocom/osmo-iuh/default.nix index 8f38383196e6..201a7ee9abf7 100644 --- a/pkgs/servers/osmocom/osmo-iuh/default.nix +++ b/pkgs/servers/osmocom/osmo-iuh/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-iuh"; - rev = "${version}"; + rev = version; hash = "sha256-AwLLfG+5JgvFSBddzyUQdPDFZOX1uQyDSyr4O/wTlgs="; }; diff --git a/pkgs/servers/osmocom/osmo-mgw/default.nix b/pkgs/servers/osmocom/osmo-mgw/default.nix index 68939011b98c..67b27f88c864 100644 --- a/pkgs/servers/osmocom/osmo-mgw/default.nix +++ b/pkgs/servers/osmocom/osmo-mgw/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-mgw"; - rev = "${version}"; + rev = version; hash = "sha256-l7JBAigcqQdb1IIz2iuetK8EKVkevtei7hB98g4a79Y="; }; diff --git a/pkgs/servers/osmocom/osmo-msc/default.nix b/pkgs/servers/osmocom/osmo-msc/default.nix index fdb6d35bcb79..ce5a5f3fdad9 100644 --- a/pkgs/servers/osmocom/osmo-msc/default.nix +++ b/pkgs/servers/osmocom/osmo-msc/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-msc"; - rev = "${version}"; + rev = version; hash = "sha256-CVyjSo+QFDLcow6XAcudhQ7LOnbCSHeYVTzTMh7KEwg="; }; diff --git a/pkgs/servers/osmocom/osmo-pcu/default.nix b/pkgs/servers/osmocom/osmo-pcu/default.nix index 99495d0dd1e8..d4c437b87895 100644 --- a/pkgs/servers/osmocom/osmo-pcu/default.nix +++ b/pkgs/servers/osmocom/osmo-pcu/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-pcu"; - rev = "${version}"; + rev = version; hash = "sha256-wZLTDvqVxP0FXV0VQH5KuigwbgzBipwL5JkTDp5Mzrc="; }; diff --git a/pkgs/servers/osmocom/osmo-sgsn/default.nix b/pkgs/servers/osmocom/osmo-sgsn/default.nix index 89afa75209b6..ca733f5ef640 100644 --- a/pkgs/servers/osmocom/osmo-sgsn/default.nix +++ b/pkgs/servers/osmocom/osmo-sgsn/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-sgsn"; - rev = "${version}"; + rev = version; hash = "sha256-tjExV8XigPEZ5gOCEoWfjhtGJVa5Ja3GHnpSovradak="; }; diff --git a/pkgs/servers/osmocom/osmo-sip-connector/default.nix b/pkgs/servers/osmocom/osmo-sip-connector/default.nix index 10546e95328d..78418529239a 100644 --- a/pkgs/servers/osmocom/osmo-sip-connector/default.nix +++ b/pkgs/servers/osmocom/osmo-sip-connector/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-sip-connector"; - rev = "${version}"; + rev = version; hash = "sha256-vsPtNeh6Yi5fQb+E90OF4/Hnjl9T5nMf9EMBhzpIA2I="; }; diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index 2dba16c182ab..f423ca9c52ed 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -1,7 +1,6 @@ { lib, beamPackages , fetchFromGitHub, fetchFromGitLab, fetchHex , file, cmake -, libxcrypt-legacy , nixosTests, writeText , ... }: @@ -20,7 +19,7 @@ beamPackages.mixRelease rec { mixNixDeps = import ./mix.nix { inherit beamPackages lib; - overrides = (final: prev: { + overrides = final: prev: { # mix2nix does not support git dependencies yet, # so we need to add them manually gettext = beamPackages.buildMix rec { @@ -136,7 +135,7 @@ beamPackages.mixRelease rec { src = fetchHex { pkg = "${name}"; - version = "${version}"; + inherit version; sha256 = "120znzz0yw1994nk6v28zql9plgapqpv51n9g6qm6md1f4x7gj0z"; }; @@ -160,7 +159,7 @@ beamPackages.mixRelease rec { cp ${cfgFile} config/config.exs ''; }; - }); + }; }; passthru = { diff --git a/pkgs/servers/polaris/default.nix b/pkgs/servers/polaris/default.nix index da53dc99252a..683d3c43faa5 100644 --- a/pkgs/servers/polaris/default.nix +++ b/pkgs/servers/polaris/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , rustPlatform , polaris-web @@ -12,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "agersant"; repo = "polaris"; - rev = "${version}"; + rev = version; sha256 = "sp1KDTzKvcGtuqL37fFnVgcnkIsmj5ZQji72BeyiFQE="; # The polaris version upstream in Cargo.lock is "0.0.0". diff --git a/pkgs/servers/polaris/web.nix b/pkgs/servers/polaris/web.nix index 08dc59e77a9d..a8fff551b332 100644 --- a/pkgs/servers/polaris/web.nix +++ b/pkgs/servers/polaris/web.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "agersant"; repo = "polaris-web"; - rev = "${version}"; + rev = version; sha256 = "2XqU4sExF7Or7RxpOK2XU9APtBujfPhM/VkOLKVDvF4="; }; diff --git a/pkgs/shells/fish/plugins/sponge.nix b/pkgs/shells/fish/plugins/sponge.nix index 2afc3ec61585..8528452e783b 100644 --- a/pkgs/shells/fish/plugins/sponge.nix +++ b/pkgs/shells/fish/plugins/sponge.nix @@ -7,7 +7,7 @@ buildFishPlugin rec { src = fetchFromGitHub { owner = "meaningful-ooo"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "sha256-MdcZUDRtNJdiyo2l9o5ma7nAX84xEJbGFhAVhK+Zm1w="; }; diff --git a/pkgs/tools/misc/gtkterm/default.nix b/pkgs/tools/misc/gtkterm/default.nix index a686e965785e..85636afb9d38 100644 --- a/pkgs/tools/misc/gtkterm/default.nix +++ b/pkgs/tools/misc/gtkterm/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Jeija"; repo = "gtkterm"; - rev = "${version}"; + rev = version; sha256 = "sha256-4Z+8fs4VEk2+Ci1X3oUuInylTdIbQ5AiPenFqnyNXvc="; }; diff --git a/pkgs/tools/misc/iam-policy-json-to-terraform/default.nix b/pkgs/tools/misc/iam-policy-json-to-terraform/default.nix index ed7b0ab43182..a015f3dabfac 100644 --- a/pkgs/tools/misc/iam-policy-json-to-terraform/default.nix +++ b/pkgs/tools/misc/iam-policy-json-to-terraform/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "flosell"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "sha256-ovmWZpeHt1L8zNzG7+2BohteSjpYADMivi+AP0Vm8/E="; }; diff --git a/pkgs/tools/networking/ifwifi/default.nix b/pkgs/tools/networking/ifwifi/default.nix index 92ebeb9f0a48..86891f459871 100644 --- a/pkgs/tools/networking/ifwifi/default.nix +++ b/pkgs/tools/networking/ifwifi/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "araujobsd"; repo = "ifwifi"; - rev = "${version}"; + rev = version; sha256 = "sha256-DPMCwyKqGJrav0wASBky9bS1bvJ3xaGsDzsk1bKaH1U="; }; diff --git a/pkgs/tools/networking/tuntox/default.nix b/pkgs/tools/networking/tuntox/default.nix index 6df9f724500d..64a13e99669a 100644 --- a/pkgs/tools/networking/tuntox/default.nix +++ b/pkgs/tools/networking/tuntox/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "gjedeer"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "sha256-c/0OxUH8iw8nRuVg4Fszf6Z/JiEV+m0B2ofzy81uFu8="; }; diff --git a/pkgs/tools/wayland/way-displays/default.nix b/pkgs/tools/wayland/way-displays/default.nix index d17cf825ea67..ea94ece408ce 100644 --- a/pkgs/tools/wayland/way-displays/default.nix +++ b/pkgs/tools/wayland/way-displays/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "alex-courtis"; repo = "way-displays"; - rev = "${version}"; + rev = version; sha256 = "sha256-rR181sxaddtn3yFtF1exSGPBU0Yp3VBRyucfuxyXI+Q="; };