diff options
author | Artturin <Artturin@artturin.com> | 2021-07-01 06:49:37 +0300 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2021-07-07 23:41:18 +0300 |
commit | 5ec78c03ce0edc82d33f6a4e4f6c243ce8d96cb1 (patch) | |
tree | 0a33f058294bcb557696cd4b592e8939f52a24f0 | |
parent | b749ff4f51211db2bd0d9931aedaf110467c1fbf (diff) |
change various expressions to use pname and version
-rw-r--r-- | pkgs/development/tools/literate-programming/funnelweb/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/tools/misc/editorconfig-core-c/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/tools/misc/rolespec/default.nix | 7 | ||||
-rw-r--r-- | pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/admin/sec/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/lnav/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/misc/yank/default.nix | 8 |
7 files changed, 20 insertions, 27 deletions
diff --git a/pkgs/development/tools/literate-programming/funnelweb/default.nix b/pkgs/development/tools/literate-programming/funnelweb/default.nix index 53b7f208e8124..56d53104a2061 100644 --- a/pkgs/development/tools/literate-programming/funnelweb/default.nix +++ b/pkgs/development/tools/literate-programming/funnelweb/default.nix @@ -1,8 +1,9 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { + pname = "funnelweb"; + version = "3.20"; - name = "funnelweb-${meta.version}"; src = fetchurl { url = "http://www.ross.net/funnelweb/download/funnelweb_v320/funnelweb_v320_source.tar.gz"; sha256 = "0zqhys0j9gabrd12mnk8ibblpc8dal4kbl8vnhxmdlplsdpwn4wg"; diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix index de5c1e070fdbb..f48ba999d868a 100644 --- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchgit, cmake, pcre, doxygen }: stdenv.mkDerivation rec { - name = "editorconfig-core-c-${meta.version}"; + pname = "editorconfig-core-c"; + version = "0.12.1"; src = fetchgit { url = "https://github.com/editorconfig/editorconfig-core-c.git"; - rev = "v${meta.version}"; + rev = "v${version}"; sha256 = "0awpb63ci85kal3pnlj2b54bay8igj1rbc13d8gqkvidlb51nnx4"; fetchSubmodules = true; - inherit name; }; buildInputs = [ pcre ]; @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/editorconfig/editorconfig-core-c"; license = with licenses; [ bsd2 bsd3 ]; - version = "0.12.1"; maintainers = with maintainers; [ dochang ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/misc/rolespec/default.nix b/pkgs/development/tools/misc/rolespec/default.nix index b26fbf75031d0..7b084fae891ee 100644 --- a/pkgs/development/tools/misc/rolespec/default.nix +++ b/pkgs/development/tools/misc/rolespec/default.nix @@ -1,15 +1,14 @@ { lib, stdenv, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { - - name = "rolespec-${meta.version}"; + pname = "rolespec"; + version = "20161104"; src = fetchFromGitHub { owner = "nickjj"; repo = "rolespec"; rev = "d9ee530cd709168882059776c482fc37f46cb743"; sha256 = "1jkidw6aqr0zfqwmcvlpi9qa140z2pxcfsd43xm5ikx6jcwjdrzl"; - inherit name; }; nativeBuildInputs = [ makeWrapper ]; @@ -41,9 +40,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/nickjj/rolespec"; license = licenses.gpl3; - version = "20161104"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; - } diff --git a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix index 6eebfe64d5a7a..d32968cc45c34 100644 --- a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix @@ -1,10 +1,11 @@ { coreutils, dpkg, fetchurl, gnugrep, gnused, makeWrapper, mfcl2700dnlpr, perl, lib, stdenv }: stdenv.mkDerivation rec { - name = "mfcl2700dncupswrapper-${meta.version}"; + pname = "mfcl2700dncupswrapper"; + version = "3.2.0-1"; src = fetchurl { - url = "https://download.brother.com/welcome/dlf102086/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf102086/mfcl2700dncupswrapper-${version}.i386.deb"; sha256 = "07w48mah0xbv4h8vsh1qd5cd4b463bx8y6gc5x9pfgsxsy6h6da1"; }; @@ -39,6 +40,5 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.tv ]; platforms = lib.platforms.linux; - version = "3.2.0-1"; }; } diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index fe3517c6196c7..0afac976d09e7 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -1,12 +1,13 @@ { fetchFromGitHub, perl, lib, stdenv }: stdenv.mkDerivation rec { - name = "sec-${meta.version}"; + pname = "sec"; + version = "2.8.3"; src = fetchFromGitHub { owner = "simple-evcorr"; repo = "sec"; - rev = meta.version; + rev = version; sha256 = "0ryic5ilj1i5l41440i0ss6j3yv796fz3gr0qij5pqyd1z21md83"; }; @@ -27,6 +28,5 @@ stdenv.mkDerivation rec { description = "Simple Event Correlator"; maintainers = [ lib.maintainers.tv ]; platforms = lib.platforms.all; - version = "2.8.3"; }; } diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index 4d9364ff23e4d..373687fafdf18 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -2,15 +2,14 @@ , readline, zlib, bzip2, autoconf, automake, curl }: stdenv.mkDerivation rec { - - name = "lnav-${meta.version}"; + pname = "lnav"; + version = "0.9.0"; src = fetchFromGitHub { owner = "tstack"; repo = "lnav"; - rev = "v${meta.version}"; + rev = "v${version}"; sha256 = "1frdrr3yjlk2fns3ny0qbr30rpswhwlvv3kyhdl3l6a0q5cqaqsg"; - inherit name; }; buildInputs = [ @@ -47,7 +46,6 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/tstack/lnav/releases"; license = licenses.bsd2; - version = "0.9.0"; maintainers = with maintainers; [ dochang ma27 ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix index 19a4ba986ff22..dbbe14cf38645 100644 --- a/pkgs/tools/misc/yank/default.nix +++ b/pkgs/tools/misc/yank/default.nix @@ -1,15 +1,14 @@ { lib, stdenv, fetchFromGitHub, xsel }: stdenv.mkDerivation rec { - - name = "yank-${meta.version}"; + pname = "yank"; + version = "1.2.0"; src = fetchFromGitHub { owner = "mptre"; repo = "yank"; - rev = "v${meta.version}"; + rev = "v${version}"; sha256 = "1izygx7f1z35li74i2cwca0p28c3v8fbr7w72dwpiqdaiwywa8xc"; - inherit name; }; installFlags = [ "PREFIX=$(out)" ]; @@ -27,7 +26,6 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/mptre/yank/releases"; license = licenses.mit; - version = "1.2.0"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; |