swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-10-01 09:30:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #128843 from Artturin/change-various-to-use-pname

Browse source
This commit is contained in:
Sandro 2021-07-07 23:43:22 +02:00 committed by GitHub
parent 8c8db7e737 d8a87e89e7
commit b3a0ea7453
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 37 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/applications/version-management/mercurial/4.9.nix
View file

@ -1,21 +1,19 @@
{ lib, stdenv, fetchurl, python2Packages, makeWrapper
, guiSupport ? false, tk ? null
, ApplicationServices
, mercurialSrc ? fetchurl rec {
meta.name = "mercurial-${meta.version}";
meta.version = "4.9.1";
url = "https://mercurial-scm.org/release/${meta.name}.tar.gz";
sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v";
}
}:
let
inherit (python2Packages) docutils hg-git dulwich python;
in python2Packages.buildPythonApplication {
in python2Packages.buildPythonApplication rec {
pname = "mercurial";
version = "4.9.1";
inherit (mercurialSrc.meta) name version;
src = mercurialSrc;
src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v";
};
format = "other";
@ -59,7 +57,6 @@ in python2Packages.buildPythonApplication {
'';
meta = {
inherit (mercurialSrc.meta) version;
description = "A fast, lightweight SCM system for very large distributed projects";
homepage = "https://www.mercurial-scm.org";
downloadPage = "https://www.mercurial-scm.org/release/";
@ -69,4 +66,3 @@ in python2Packages.buildPythonApplication {
platforms = lib.platforms.unix;
};
}

22
pkgs/applications/version-management/tortoisehg/default.nix
View file

@ -1,20 +1,18 @@
{ lib, fetchurl, python3Packages
, mercurial, qt5
}:
let
tortoisehgSrc = fetchurl rec {
meta.name = "tortoisehg-${meta.version}";
meta.version = "5.8";
url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${meta.version}.tar.gz";
sha256 = "154q7kyrdk045wx7rsblzx41k3wbvp2f40kzkxmiiaa5n35srsm3";
};
# Extension point for when thg's mercurial is lagging behind mainline.
tortoiseMercurial = mercurial;
python3Packages.buildPythonApplication rec {
pname = "tortoisehg";
version = "5.8";
in python3Packages.buildPythonApplication {
inherit (tortoisehgSrc.meta) name version;
src = tortoisehgSrc;
src = fetchurl {
url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz";
sha256 = "154q7kyrdk045wx7rsblzx41k3wbvp2f40kzkxmiiaa5n35srsm3";
};
# Extension point for when thg's mercurial is lagging behind mainline.
tortoiseMercurial = mercurial;
propagatedBuildInputs = with python3Packages; [
tortoiseMercurial qscintilla-qt5 iniparse

5
pkgs/development/tools/literate-programming/funnelweb/default.nix
View file

@ -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";

7
pkgs/development/tools/misc/editorconfig-core-c/default.nix
View file

@ -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;
};

7
pkgs/development/tools/misc/rolespec/default.nix
View file

@ -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;
};
}

6
pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix
View file

@ -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";
};
}

6
pkgs/tools/admin/sec/default.nix
View file

@ -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";
};
}

8
pkgs/tools/misc/lnav/default.nix
View file

@ -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;
};

8
pkgs/tools/misc/yank/default.nix
View file

@ -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;
};