diff options
author | Ryan Mulligan <ryan@ryantm.com> | 2018-05-28 05:59:57 -0700 |
---|---|---|
committer | Ryan Mulligan <ryan@ryantm.com> | 2018-05-28 05:59:57 -0700 |
commit | af9d10a91b5ef0518ee12b220470735076974210 (patch) | |
tree | ef7ede43a31b0b5998799f33dc8f0e8fdf254db3 /pkgs/development | |
parent | f0d6411c22d91723fef3f935adf35c7884a4dc76 (diff) |
treewide: fix derivation names
Diffstat (limited to 'pkgs/development')
20 files changed, 46 insertions, 40 deletions
diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/development/compilers/eli/default.nix index 93e53aa30d13f..4635c6d0a4e83 100644 --- a/pkgs/development/compilers/eli/default.nix +++ b/pkgs/development/compilers/eli/default.nix @@ -28,11 +28,11 @@ let }; in stdenv.mkDerivation rec { - name = "eli"; + name = "eli-${version}"; version = "4.8.1"; src = fetchurl { - url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/eli-${version}.tar.bz2"; + url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/${name}.tar.bz2"; sha256="1vran8583hbwrr5dciji4zkhz3f88w4mn8n9sdpr6zw0plpf1whj"; }; diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/development/interpreters/red/default.nix index 01b95adf92f41..36047759baae3 100644 --- a/pkgs/development/interpreters/red/default.nix +++ b/pkgs/development/interpreters/red/default.nix @@ -1,7 +1,7 @@ { stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }: stdenv.mkDerivation rec { - name = "red-v${version}"; + name = "red-${version}"; version = "0.6.3"; src = fetchFromGitHub { rev = "6a43c767fa2e85d668b83f749158a18e62c30f70"; diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix index fcd37239e9119..6dc496d0e5aaf 100644 --- a/pkgs/development/libraries/cppcms/default.nix +++ b/pkgs/development/libraries/cppcms/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pcre, zlib, python, openssl }: stdenv.mkDerivation rec { - name = "cppcms"; + name = "cppcms-${version}"; version = "1.0.5"; src = fetchurl { - url = "mirror://sourceforge/cppcms/${name}-${version}.tar.bz2"; + url = "mirror://sourceforge/cppcms/${name}.tar.bz2"; sha256 = "0r8qyp102sq4lw8xhrjhan0dnslhsmxj4zs9jzlw75yagfbqbdl4"; }; diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix index 07c6e1490e7e2..3423b29d76c8e 100644 --- a/pkgs/development/libraries/cppdb/default.nix +++ b/pkgs/development/libraries/cppdb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, sqlite, mysql, postgresql, unixODBC }: stdenv.mkDerivation rec { - name = "cppdb"; + name = "cppdb-${version}"; version = "0.3.1"; src = fetchurl { - url = "mirror://sourceforge/cppcms/${name}-${version}.tar.bz2"; + url = "mirror://sourceforge/cppcms/${name}.tar.bz2"; sha256 = "0blr1casmxickic84dxzfmn3lm7wrsl4aa2abvpq93rdfddfy3nn"; }; diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix index bf57bab2f2222..55835cdb63dbc 100644 --- a/pkgs/development/libraries/ctpp2/default.nix +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "ctpp2"; + name = "ctpp2-${version}"; version = "2.8.3"; src = fetchurl { - url = "http://ctpp.havoc.ru/download/ctpp2-${version}.tar.gz"; + url = "http://ctpp.havoc.ru/download/${name}.tar.gz"; sha256 = "1z22zfw9lb86z4hcan9hlvji49c9b7vznh7gjm95gnvsh43zsgx8"; }; diff --git a/pkgs/development/libraries/cxxtools/default.nix b/pkgs/development/libraries/cxxtools/default.nix index 5dd48794f5e28..77b27640fd77c 100644 --- a/pkgs/development/libraries/cxxtools/default.nix +++ b/pkgs/development/libraries/cxxtools/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.2.1"; - name = "cxxtools"; + name = "cxxtools-${version}"; src = fetchurl { - url = "http://www.tntnet.org/download/${name}-${version}.tar.gz"; + url = "http://www.tntnet.org/download/${name}.tar.gz"; sha256 = "0hp3qkyhidxkdf8qgkwrnqq5bpahink55mf0yz23rjd7rpbbdswc"; }; diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/development/libraries/dleyna-connector-dbus/default.nix index 94efa8e31d3af..e3815165f6e3f 100644 --- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix +++ b/pkgs/development/libraries/dleyna-connector-dbus/default.nix @@ -1,13 +1,14 @@ { stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dbus, dleyna-core, glib }: stdenv.mkDerivation rec { - name = "dleyna-connector-dbus"; + pname = "dleyna-connector-dbus"; + name = "${pname}-${version}"; version = "0.3.0"; src = fetchFromGitHub { owner = "01org"; - repo = name; - rev = "${version}"; + repo = pname; + rev = version; sha256 = "0vziq5gwjm79yl2swch2mz6ias20nvfddf5cqgk9zbg25cb9m117"; }; diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/pkgs/development/libraries/dleyna-core/default.nix index 1fc65b9ac7f0b..11cfa31c04b6f 100644 --- a/pkgs/development/libraries/dleyna-core/default.nix +++ b/pkgs/development/libraries/dleyna-core/default.nix @@ -1,12 +1,13 @@ { stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, gupnp }: stdenv.mkDerivation rec { - name = "dleyna-core"; + pname = "dleyna-core"; + name = "${pname}-${version}"; version = "0.6.0"; src = fetchFromGitHub { owner = "01org"; - repo = name; + repo = pname; rev = "v${version}"; sha256 = "1x5vj5zfk95avyg6g3nf6gar250cfrgla2ixj2ifn8pcick2d9vq"; }; diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/development/libraries/dleyna-renderer/default.nix index 176b05126b2be..a8ea7e8bd6277 100644 --- a/pkgs/development/libraries/dleyna-renderer/default.nix +++ b/pkgs/development/libraries/dleyna-renderer/default.nix @@ -1,13 +1,14 @@ { stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dleyna-connector-dbus, dleyna-core, gssdp, gupnp, gupnp-av, gupnp-dlna, libsoup, makeWrapper }: stdenv.mkDerivation rec { - name = "dleyna-renderer"; + pname = "dleyna-renderer"; + name = "${pname}-${version}"; version = "0.6.0"; src = fetchFromGitHub { owner = "01org"; - repo = name; - rev = "${version}"; + repo = pname; + rev = version; sha256 = "0jy54aq8hgrvzchrvfzqaj4pcn0cfhafl9bv8a9p6j82yjk4pvpp"; }; diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/development/libraries/dleyna-server/default.nix index d36e665bd85db..b4885145f6e42 100644 --- a/pkgs/development/libraries/dleyna-server/default.nix +++ b/pkgs/development/libraries/dleyna-server/default.nix @@ -1,13 +1,14 @@ { stdenv, autoreconfHook, makeWrapper, pkgconfig, fetchFromGitHub, dleyna-core, dleyna-connector-dbus, gssdp, gupnp, gupnp-av, gupnp-dlna, libsoup }: stdenv.mkDerivation rec { - name = "dleyna-server"; + pname = "dleyna-server"; + name = "${pname}-${version}"; version = "0.6.0"; src = fetchFromGitHub { owner = "01org"; - repo = name; - rev = "${version}"; + repo = pname; + rev = version; sha256 = "13a2i6ms27s46yxdvlh2zm7pim7jmr5cylnygzbliz53g3gxxl3j"; }; diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix index 6cedb4d555a56..05088df52105b 100644 --- a/pkgs/development/libraries/fastjson/default.nix +++ b/pkgs/development/libraries/fastjson/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libtool, autoconf, automake }: stdenv.mkDerivation rec { - version = "v0.99.4"; + version = "0.99.4"; name = "fastjson-${version}"; src = fetchFromGitHub { repo = "libfastjson"; diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 3f4f48775c1b7..5ccfb0d1b26f1 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "1.9.0"; - name = "libbladeRF-v${version}"; + name = "libbladeRF-${version}"; src = fetchFromGitHub { owner = "Nuand"; diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix index 75a494cfbdede..9edfcc88f1640 100644 --- a/pkgs/development/libraries/tntdb/default.nix +++ b/pkgs/development/libraries/tntdb/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, cxxtools, postgresql, mysql, sqlite, zlib, openssl }: stdenv.mkDerivation rec { + name = "tntdb-${version}"; version = "1.3"; - name = "tntdb"; + src = fetchurl { - url = "http://www.tntnet.org/download/tntdb-${version}.tar.gz"; + url = "http://www.tntnet.org/download/${name}.tar.gz"; sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9"; }; diff --git a/pkgs/development/libraries/tntnet/default.nix b/pkgs/development/libraries/tntnet/default.nix index cd4ba34b33c64..aaff759525b64 100644 --- a/pkgs/development/libraries/tntnet/default.nix +++ b/pkgs/development/libraries/tntnet/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, cxxtools, zlib, openssl, zip }: stdenv.mkDerivation rec { + name = "tntnet-${version}"; version = "2.2.1"; - name = "tntnet"; + src = fetchurl { - url = "http://www.tntnet.org/download/tntnet-${version}.tar.gz"; + url = "http://www.tntnet.org/download/${name}.tar.gz"; sha256 = "08bmak9mpbamwwl3h9p8x5qzwqlm9g3jh70y0ml5hk7hiv870cf8"; }; diff --git a/pkgs/development/python-modules/htmltreediff/default.nix b/pkgs/development/python-modules/htmltreediff/default.nix index 5e839e4ada9b4..c2c7f4e12f42a 100644 --- a/pkgs/development/python-modules/htmltreediff/default.nix +++ b/pkgs/development/python-modules/htmltreediff/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage, fetchFromGitHub, isPy3k, lxml, html5lib, nose, stdenv }: buildPythonPackage rec { - version = "v0.1.2"; + version = "0.1.2"; pname = "htmltreediff"; disabled = isPy3k; @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "christian-oudard"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "16mqp2jyznrw1mgd3qzybq28h2k5wz7vmmz1m6xpgscazyjhvvd1"; }; diff --git a/pkgs/development/python-modules/moinmoin/default.nix b/pkgs/development/python-modules/moinmoin/default.nix index 2097470d4e474..db0a5bcca2b32 100644 --- a/pkgs/development/python-modules/moinmoin/default.nix +++ b/pkgs/development/python-modules/moinmoin/default.nix @@ -3,7 +3,7 @@ }: buildPythonPackage rec { - name = "moinmoin"; + pname = "moinmoin"; version = "1.9.9"; # SyntaxError in setup.py diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index 5e2ad1d5aa2a9..bab7cc052b9dd 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -3,13 +3,13 @@ }: buildPythonPackage rec { - version = "v4.10.0"; + version = "4.10.0"; pname = "mt940"; src = fetchFromGitHub { owner = "WoLpH"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "1dsf2di8rr0iw2vaz6dppalby3y7i8x2bl0qjqvaiqacjxxvwj65"; }; diff --git a/pkgs/development/python-modules/podcats/default.nix b/pkgs/development/python-modules/podcats/default.nix index a1b8312b134f6..8af9e759c953b 100644 --- a/pkgs/development/python-modules/podcats/default.nix +++ b/pkgs/development/python-modules/podcats/default.nix @@ -2,13 +2,12 @@ buildPythonPackage rec { pname = "podcats"; - version = "v0.5.0"; - name = "${pname}-${version}"; + version = "0.5.0"; src = fetchFromGitHub { owner = "jakubroztocil"; repo = "podcats"; - rev = version; + rev = "v${version}"; sha256 = "0zjdgry5n209rv19kj9yaxy7c7zq5gxr488izrgs4sc75vdzz8xc"; }; diff --git a/pkgs/development/python-modules/pyxml/default.nix b/pkgs/development/python-modules/pyxml/default.nix index 0ef91fda9e353..646308feece4a 100644 --- a/pkgs/development/python-modules/pyxml/default.nix +++ b/pkgs/development/python-modules/pyxml/default.nix @@ -3,10 +3,10 @@ buildPythonPackage rec { pname = "PyXML"; version = "0.8.4"; - name = "${pname}-${pname}"; + format = "other"; src = fetchurl { - url = "mirror://sourceforge/pyxml/${name}.tar.gz"; + url = "mirror://sourceforge/pyxml/${pname}-${pname}.tar.gz"; sha256 = "04wc8i7cdkibhrldy6j65qp5l75zjxf5lx6qxdxfdf2gb3wndawz"; }; diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index 37807b245ff27..75e898fdb3fd7 100644 --- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -2,7 +2,8 @@ stdenv.mkDerivation rec { - name = "ocsigen-i18n"; + pname = "ocsigen-i18n"; + name = "${pname}-${version}"; version = "3.1.0"; buildInputs = with ocamlPackages; [ ocaml findlib ]; @@ -16,7 +17,7 @@ stdenv.mkDerivation rec ''; src = fetchurl { - url = "https://github.com/besport/${name}/archive/${version}.tar.gz"; + url = "https://github.com/besport/${pname}/archive/${version}.tar.gz"; sha256 = "0cw0mmr67wx03j4279z7ldxwb01smkqz9rbklx5lafrj5sf99178"; }; |