change various expressions to use pname and version

This commit is contained in:
Artturin 2021-07-01 06:49:37 +03:00
parent b749ff4f51
commit 5ec78c03ce
7 changed files with 20 additions and 27 deletions

View file

@ -1,8 +1,9 @@
{lib, stdenv, fetchurl}: { lib, stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "funnelweb";
version = "3.20";
name = "funnelweb-${meta.version}";
src = fetchurl { src = fetchurl {
url = "http://www.ross.net/funnelweb/download/funnelweb_v320/funnelweb_v320_source.tar.gz"; url = "http://www.ross.net/funnelweb/download/funnelweb_v320/funnelweb_v320_source.tar.gz";
sha256 = "0zqhys0j9gabrd12mnk8ibblpc8dal4kbl8vnhxmdlplsdpwn4wg"; sha256 = "0zqhys0j9gabrd12mnk8ibblpc8dal4kbl8vnhxmdlplsdpwn4wg";

View file

@ -1,14 +1,14 @@
{ lib, stdenv, fetchgit, cmake, pcre, doxygen }: { lib, stdenv, fetchgit, cmake, pcre, doxygen }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "editorconfig-core-c-${meta.version}"; pname = "editorconfig-core-c";
version = "0.12.1";
src = fetchgit { src = fetchgit {
url = "https://github.com/editorconfig/editorconfig-core-c.git"; url = "https://github.com/editorconfig/editorconfig-core-c.git";
rev = "v${meta.version}"; rev = "v${version}";
sha256 = "0awpb63ci85kal3pnlj2b54bay8igj1rbc13d8gqkvidlb51nnx4"; sha256 = "0awpb63ci85kal3pnlj2b54bay8igj1rbc13d8gqkvidlb51nnx4";
fetchSubmodules = true; fetchSubmodules = true;
inherit name;
}; };
buildInputs = [ pcre ]; buildInputs = [ pcre ];
@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
''; '';
downloadPage = "https://github.com/editorconfig/editorconfig-core-c"; downloadPage = "https://github.com/editorconfig/editorconfig-core-c";
license = with licenses; [ bsd2 bsd3 ]; license = with licenses; [ bsd2 bsd3 ];
version = "0.12.1";
maintainers = with maintainers; [ dochang ]; maintainers = with maintainers; [ dochang ];
platforms = platforms.unix; platforms = platforms.unix;
}; };

View file

@ -1,15 +1,14 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper }: { lib, stdenv, fetchFromGitHub, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rolespec";
name = "rolespec-${meta.version}"; version = "20161104";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nickjj"; owner = "nickjj";
repo = "rolespec"; repo = "rolespec";
rev = "d9ee530cd709168882059776c482fc37f46cb743"; rev = "d9ee530cd709168882059776c482fc37f46cb743";
sha256 = "1jkidw6aqr0zfqwmcvlpi9qa140z2pxcfsd43xm5ikx6jcwjdrzl"; sha256 = "1jkidw6aqr0zfqwmcvlpi9qa140z2pxcfsd43xm5ikx6jcwjdrzl";
inherit name;
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
@ -41,9 +40,7 @@ stdenv.mkDerivation rec {
''; '';
downloadPage = "https://github.com/nickjj/rolespec"; downloadPage = "https://github.com/nickjj/rolespec";
license = licenses.gpl3; license = licenses.gpl3;
version = "20161104";
maintainers = [ maintainers.dochang ]; maintainers = [ maintainers.dochang ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -1,10 +1,11 @@
{ coreutils, dpkg, fetchurl, gnugrep, gnused, makeWrapper, mfcl2700dnlpr, perl, lib, stdenv }: { coreutils, dpkg, fetchurl, gnugrep, gnused, makeWrapper, mfcl2700dnlpr, perl, lib, stdenv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mfcl2700dncupswrapper-${meta.version}"; pname = "mfcl2700dncupswrapper";
version = "3.2.0-1";
src = fetchurl { 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"; sha256 = "07w48mah0xbv4h8vsh1qd5cd4b463bx8y6gc5x9pfgsxsy6h6da1";
}; };
@ -39,6 +40,5 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.tv ]; maintainers = [ lib.maintainers.tv ];
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
version = "3.2.0-1";
}; };
} }

View file

@ -1,12 +1,13 @@
{ fetchFromGitHub, perl, lib, stdenv }: { fetchFromGitHub, perl, lib, stdenv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sec-${meta.version}"; pname = "sec";
version = "2.8.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "simple-evcorr"; owner = "simple-evcorr";
repo = "sec"; repo = "sec";
rev = meta.version; rev = version;
sha256 = "0ryic5ilj1i5l41440i0ss6j3yv796fz3gr0qij5pqyd1z21md83"; sha256 = "0ryic5ilj1i5l41440i0ss6j3yv796fz3gr0qij5pqyd1z21md83";
}; };
@ -27,6 +28,5 @@ stdenv.mkDerivation rec {
description = "Simple Event Correlator"; description = "Simple Event Correlator";
maintainers = [ lib.maintainers.tv ]; maintainers = [ lib.maintainers.tv ];
platforms = lib.platforms.all; platforms = lib.platforms.all;
version = "2.8.3";
}; };
} }

View file

@ -2,15 +2,14 @@
, readline, zlib, bzip2, autoconf, automake, curl }: , readline, zlib, bzip2, autoconf, automake, curl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lnav";
name = "lnav-${meta.version}"; version = "0.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tstack"; owner = "tstack";
repo = "lnav"; repo = "lnav";
rev = "v${meta.version}"; rev = "v${version}";
sha256 = "1frdrr3yjlk2fns3ny0qbr30rpswhwlvv3kyhdl3l6a0q5cqaqsg"; sha256 = "1frdrr3yjlk2fns3ny0qbr30rpswhwlvv3kyhdl3l6a0q5cqaqsg";
inherit name;
}; };
buildInputs = [ buildInputs = [
@ -47,7 +46,6 @@ stdenv.mkDerivation rec {
''; '';
downloadPage = "https://github.com/tstack/lnav/releases"; downloadPage = "https://github.com/tstack/lnav/releases";
license = licenses.bsd2; license = licenses.bsd2;
version = "0.9.0";
maintainers = with maintainers; [ dochang ma27 ]; maintainers = with maintainers; [ dochang ma27 ];
platforms = platforms.unix; platforms = platforms.unix;
}; };

View file

@ -1,15 +1,14 @@
{ lib, stdenv, fetchFromGitHub, xsel }: { lib, stdenv, fetchFromGitHub, xsel }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "yank";
name = "yank-${meta.version}"; version = "1.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mptre"; owner = "mptre";
repo = "yank"; repo = "yank";
rev = "v${meta.version}"; rev = "v${version}";
sha256 = "1izygx7f1z35li74i2cwca0p28c3v8fbr7w72dwpiqdaiwywa8xc"; sha256 = "1izygx7f1z35li74i2cwca0p28c3v8fbr7w72dwpiqdaiwywa8xc";
inherit name;
}; };
installFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ];
@ -27,7 +26,6 @@ stdenv.mkDerivation rec {
''; '';
downloadPage = "https://github.com/mptre/yank/releases"; downloadPage = "https://github.com/mptre/yank/releases";
license = licenses.mit; license = licenses.mit;
version = "1.2.0";
maintainers = [ maintainers.dochang ]; maintainers = [ maintainers.dochang ];
platforms = platforms.unix; platforms = platforms.unix;
}; };