diff options
Diffstat (limited to 'pkgs/development')
33 files changed, 55 insertions, 49 deletions
diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index a404d16069573..e6765ec689902 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 9ad95645240ba..83b54e442aa33 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 122831e80cc07..61fd94c09bf4f 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 b725c3e6e5037..75a022de912fc 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 e1da5a44ff08e..b3bf33f0e881a 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 190c573577a52..9a754eda592fb 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 952987447b225..12def747361b5 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 4dcc8a47105e0..738c6a4300840 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 9d501f47c3b11..3ad200cfc6379 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 5de61169c3655..03f2afbd31415 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 6e69bc1e5c507..38ccaea65eba8 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 afb26cfb354b3..14b1d2d2321f1 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 993647c3f2328..73c15850d33c8 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 a819bca362dbe..1a8ddacdd6906 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 24af3a51255d6..5e5847dce0336 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 fd05e7e8052e5..466d3937a1fbd 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 22afc793cde9d..8fdb051a4846e 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 a787b86952753..6f76ca9850fee 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 ff966d906c885..fc76d9af68d9e 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 e1115bd818006..1d9b8114df7b3 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 3785ebcf86cfc..f5c0ee715c3a3 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 6916b704fcd48..69f7a93f509d6 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 763679190592c..a89c6fa307eaf 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 0ffb5ce0cb73e..7c8e99cc399a9 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 bcb902e5bfdb2..386478cbb752b 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 099837fbafa25..d2ad97141ca7f 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 55c077f932d92..b0e5319df2d6e 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 44411d0db72c0..600b2b0e56ce9 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 0c0511ec79227..3efff50094391 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 741854a507ddc..401bbdbee6ef9 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 e15e48b0f2a9d..e5cd2e0e2ddfb 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 e6b86e4a85c18..91653d3773e16 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 c47955695f5ce..cb3ed5217f08a 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"; }; |