diff options
author | Pavol Rusnak <pavol@rusnak.io> | 2020-11-01 23:39:49 +0100 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2020-11-01 23:02:24 -0800 |
commit | 2c931312ce6c7baf91ec98e164bef0241fc20aa6 (patch) | |
tree | 6bf1c7d460aab2085256fd415e3f24734516683d /pkgs/development/python-modules | |
parent | c6afa8820b528cec7e889e462cbcab84c0313b41 (diff) |
treewide: simplify rev/repo arguments in src
+ use fetchFromGithub where possible
Diffstat (limited to 'pkgs/development/python-modules')
13 files changed, 32 insertions, 26 deletions
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"; }; |