Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-08-02 06:01:45 +00:00 committed by GitHub
commit 43a3dc4f0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
59 changed files with 193 additions and 128 deletions

View File

@ -574,7 +574,7 @@ let
inherit (phoronix-test-suite) pname version;
in
runCommand "${pname}-tests" { meta.timeout = 3; }
runCommand "${pname}-tests" { meta.timeout = 60; }
''
# automatic initial setup to prevent interactive questions
${phoronix-test-suite}/bin/phoronix-test-suite enterprise-setup >/dev/null

View File

@ -2,6 +2,7 @@
, qtbase, qtx11extras, qtsvg, makeWrapper
, vulkan-loader, libglvnd, xorg, python3, python3Packages
, bison, pcre, automake, autoconf, addOpenGLRunpath
, waylandSupport ? false, wayland
}:
let
custom_swig = fetchFromGitHub {
@ -11,22 +12,24 @@ let
sha256 = "15r2m5kcs0id64pa2fsw58qll3jyh71jzc04wy20pgsh2326zis6";
};
pythonPackages = python3Packages;
cmakeBool = b: if b then "ON" else "OFF";
in
mkDerivation rec {
version = "1.14";
version = "1.15";
pname = "renderdoc";
src = fetchFromGitHub {
owner = "baldurk";
repo = "renderdoc";
rev = "v${version}";
sha256 = "VO7pOLodXI0J7O4Y9b7YSl5BdtsIxmalFG5mqfuiJEw=";
sha256 = "HSWl3FC5YDIADO3h6oHxHdwsrFQKKj2zTtH2e3cc5iI=";
};
buildInputs = [
qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python3
]; # ++ (with pythonPackages; [pyside2 pyside2-tools shiboken2]);
] # ++ (with pythonPackages; [pyside2 pyside2-tools shiboken2])
# TODO: figure out how to make cmake recognise pyside2
++ (lib.optional waylandSupport wayland);
nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addOpenGLRunpath ];
@ -42,6 +45,7 @@ mkDerivation rec {
"-DBUILD_VERSION_DIST_VER=${version}"
"-DBUILD_VERSION_DIST_CONTACT=https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/graphics/renderdoc"
"-DBUILD_VERSION_STABLE=ON"
"-DENABLE_WAYLAND=${cmakeBool waylandSupport}"
];
# TODO: define these in the above array via placeholders, once those are widely supported

View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, glibcLocales, pandoc, python3 }:
{ lib, fetchFromGitHub, fetchpatch, glibcLocales, pandoc, python3 }:
let
pythonPackages = python3.pkgs;
@ -36,6 +36,13 @@ in pythonPackages.buildPythonApplication rec {
py.test -k 'not test_get_credentials_with_keyring' .
'';
patches = [
(fetchpatch {
url = "https://github.com/coursera-dl/coursera-dl/pull/789.patch";
sha256 = "sha256:07ca6zdyw3ypv7yzfv2kzmjvv86h0rwzllcg0zky27qppqz917bv";
})
];
meta = with lib; {
description = "CLI for downloading Coursera.org videos and naming them";
homepage = "https://github.com/coursera-dl/coursera-dl";

View File

@ -36,14 +36,14 @@ let
});
in stdenv.mkDerivation rec {
pname = "phoc";
version = "0.7.1";
version = "0.8.0";
src = fetchFromGitLab {
domain = "source.puri.sm";
owner = "Librem5";
repo = pname;
rev = "v${version}";
sha256 = "0n188xa2pwl4258naxhz45cvipcid8y1zvlbddll9xydrrh9bwqn";
sha256 = "sha256-QAnJlpFjWJvwxGyenmN4IaI9VFn2jwdXpa8VqAmH7Xw=";
};
nativeBuildInputs = [

View File

@ -5,6 +5,7 @@
obs-move-transition = callPackage ./obs-move-transition.nix {};
obs-multi-rtmp = libsForQt5.callPackage ./obs-multi-rtmp.nix {};
obs-ndi = libsForQt5.callPackage ./obs-ndi.nix {};
obs-websocket = libsForQt5.callPackage ./obs-websocket.nix {};
wlrobs = callPackage ./wlrobs.nix {};
looking-glass-obs = callPackage ./looking-glass-obs.nix {};
}

View File

@ -37,14 +37,14 @@ let
};
in stdenv.mkDerivation rec {
pname = "phosh";
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitLab {
domain = "source.puri.sm";
owner = "Librem5";
repo = pname;
rev = "v${version}";
sha256 = "1s0lgq04qz562iri535wpwvfkmmngdpclyl329cf7rc9ihy1kjvs";
sha256 = "048g5sp9jgfiwq6n8my4msm7wy3pdhbg0wxqxvps4m8qf8wa7ffq";
};
nativeBuildInputs = [

View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "metals";
version = "0.10.4";
version = "0.10.5";
deps = stdenv.mkDerivation {
name = "${pname}-deps-${version}";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "0pjgnm5argmc92872vblsz0pw2wniggvkw4w2346ps09ybdv9r3q";
outputHash = "0n0y522izqlyls3sn2x6mdjy0pmhrl1kr7z5fqac6wrpgcsczf01";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, libX11, libXext, libXi, libXmu, libXt, libXtst }:
stdenv.mkDerivation rec {
name = "imwheel-1.0.0pre12";
pname = "imwheel";
version = "1.0.0pre12";
src = fetchurl {
url = "mirror://sourceforge/imwheel/${name}.tar.gz";
url = "mirror://sourceforge/imwheel/imwheel-${version}.tar.gz";
sha256 = "2320ed019c95ca4d922968e1e1cbf0c075a914e865e3965d2bd694ca3d57cfe3";
};

View File

@ -3,7 +3,8 @@
let release = "20180821"; in
stdenv.mkDerivation {
name = "keynav-0.${release}.0";
pname = "keynav";
version = "0.${release}.0";
src = fetchFromGitHub {
owner = "jordansissel";

View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, xorg }:
stdenv.mkDerivation {
name = "x2vnc-1.7.2";
stdenv.mkDerivation rec {
pname = "x2vnc";
version = "1.7.2";
src = fetchurl {
url = "https://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz";
url = "https://fredrik.hubbe.net/x2vnc/x2vnc-${version}.tar.gz";
sha256 = "00bh9j3m6snyd2fgnzhj5vlkj9ibh69gfny9bfzlxbnivb06s1yw";
};

View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, imake, libX11, libXtst, libXext, gccmakedep }:
stdenv.mkDerivation {
name = "x2x-1.27";
stdenv.mkDerivation rec {
pname = "x2x";
version = "1.27";
src = fetchurl {
url = "https://github.com/downloads/dottedmag/x2x/x2x-1.27.tar.gz";
url = "https://github.com/downloads/dottedmag/x2x/x2x-${version}.tar.gz";
sha256 = "0dha0kn1lbc4as0wixsvk6bn4innv49z9a0sm5wlx4q1v0vzqzyj";
};

View File

@ -1,11 +1,12 @@
{ lib, stdenv, fetchurl, imake, gccmakedep
, libX11, libXaw, libXext, libXmu, libXpm, libXxf86vm }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "xbrightness";
version = "0.3-mika-akk";
name = "xbrightness-0.3-mika-akk";
src = fetchurl {
url = "https://shallowsky.com/software/xbrightness/xbrightness-0.3-mika-akk.tar.gz";
url = "https://shallowsky.com/software/xbrightness/xbrightness-${version}.tar.gz";
sha256 = "2564dbd393544657cdabe4cbf535d9cfb9abe8edddb1b8cdb1ed4d12f358626e";
};

View File

@ -1,12 +1,13 @@
{ lib, stdenv, fetchFromGitHub, libX11, libXxf86vm, libXext, libXrandr }:
stdenv.mkDerivation rec {
name = "xcalib-0.10";
pname = "xcalib";
version = "0.10";
src = fetchFromGitHub {
owner = "OpenICC";
repo = "xcalib";
rev = "f95abc1a551d7c695a8b142c4d9d5035368d482d";
rev = version;
sha256 = "05fzdjmhiafgi2jf0k41i3nm0837a78sb6yv59cwc23nla8g0bhr";
};

View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, libX11 }:
stdenv.mkDerivation rec {
name = "xchainkeys-0.11";
pname = "xchainkeys";
version = "0.11";
src = fetchurl {
url = "http://henning-bekel.de/download/xchainkeys/${name}.tar.gz";
url = "http://henning-bekel.de/download/xchainkeys/xchainkeys-${version}.tar.gz";
sha256 = "1rpqs7h5krral08vqxwb0imy33z17v5llvrg5hy8hkl2ap7ya0mn";
};

View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, libxslt, docbook_xsl, makeWrapper }:
stdenv.mkDerivation rec {
name = "xdg-user-dirs-0.17";
pname = "xdg-user-dirs";
version = "0.17";
src = fetchurl {
url = "https://user-dirs.freedesktop.org/releases/${name}.tar.gz";
url = "https://user-dirs.freedesktop.org/releases/xdg-user-dirs-${version}.tar.gz";
sha256 = "13216b8rfkzak5k6bvpx6jvqv3cnbgpijnjwj8a8d3kq4cl0a1ra";
};

View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, perl, libX11 }:
stdenv.mkDerivation rec {
name = "xkbset-0.5";
pname = "xkbset";
version = "0.5";
src = fetchurl {
url = "http://faculty.missouri.edu/~stephen/software/xkbset/${name}.tar.gz";
url = "http://faculty.missouri.edu/~stephen/software/xkbset/xkbset-${version}.tar.gz";
sha256 = "01c2579495b39e00d870f50225c441888dc88021e9ee3b693a842dd72554d172";
};

View File

@ -1,12 +1,13 @@
{ lib, stdenv, fetchFromGitLab, libX11, xorgproto }:
stdenv.mkDerivation {
name = "xmagnify-0.1.0";
stdenv.mkDerivation rec {
pname = "xmagnify";
version = "0.1.0";
src = fetchFromGitLab {
owner = "amiloradovsky";
repo = "magnify";
rev = "0.1.0"; # 56da280173e9d0bd7b3769e07ba485cb4db35869
rev = version;
sha256 = "1ngnp5f5zl3v35vhbdyjpymy6mwrs0476fm5nd7dzkba7n841jdh";
};

View File

@ -12,11 +12,11 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null;
stdenv.mkDerivation rec {
pname = "dialog";
version = "1.3-20210324";
version = "1.3-20210621";
src = fetchurl {
url = "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz";
hash = "sha256-AcLR4umvmwg+ogDKrQhP39pVF41bv05Cyf/0STUVFlM=";
hash = "sha256-w68izPzZuso4QGIQjdk1ToaZCSnuJwwjnu9pUYxdp8g=";
};
buildInputs = [
@ -30,7 +30,9 @@ stdenv.mkDerivation rec {
"--with-libtool-opts=${lib.optionalString enableShared "-shared"}"
];
installTargets = [ "install${lib.optionalString withLibrary "-full"}" ];
installTargets = [
"install${lib.optionalString withLibrary "-full"}"
];
meta = with lib; {
homepage = "https://invisible-island.net/dialog/dialog.html";

View File

@ -4,7 +4,7 @@ let
inherit (phoronix-test-suite) pname version;
in
runCommand "${pname}-tests" { meta.timeout = 3; }
runCommand "${pname}-tests" { meta.timeout = 60; }
''
# automatic initial setup to prevent interactive questions
${phoronix-test-suite}/bin/phoronix-test-suite enterprise-setup >/dev/null

View File

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite, bc, file }:
stdenv.mkDerivation rec {
version = "2.41";
version = "2.42";
pname = "profile-cleaner";
src = fetchFromGitHub {
owner = "graysky2";
repo = "profile-cleaner";
rev = "v${version}";
sha256 = "11sjf4j9dr6ih9jkg6vqq6gkfg6wly4182bi1008bsm1zdmm5iz7";
sha256 = "1d94lp91i4y896vyc7fc3ysha700cwzsdjmmmwlm6h2zp652c73y";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "ahcpd-0.53";
pname = "ahcpd";
version = "0.53";
src = fetchurl {
url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz";
url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/ahcpd-${version}.tar.gz";
sha256 = "0lhdmky3zdyk51hclv2lrhw3hzymbdc8bw2khs3rnaibgn0jwqm4";
};

View File

@ -3,10 +3,11 @@
, autoreconfHook, usbutils }:
stdenv.mkDerivation rec {
name = "aircrack-ng-1.6";
pname = "aircrack-ng";
version = "1.6";
src = fetchurl {
url = "https://download.aircrack-ng.org/${name}.tar.gz";
url = "https://download.aircrack-ng.org/aircrack-ng-${version}.tar.gz";
sha256 = "0ix2k64qg7x3w0bzdsbk1m50kcpq1ws59g3zkwiafvpwdr4gs2sg";
};

View File

@ -1,12 +1,13 @@
{ lib, stdenv, fetchzip, libnet }:
stdenv.mkDerivation rec {
name = "arpoison-0.7";
pname = "arpoison";
version = "0.7";
buildInputs = [ libnet ];
src = fetchzip {
url = "http://www.arpoison.net/${name}.tar.gz";
url = "http://www.arpoison.net/arpoison-${version}.tar.gz";
sha256 = "0krhszx3s0qwfg4rma5a51ak71nnd9xfs2ibggc3hwiz506s2x37";
};

View File

@ -3,10 +3,11 @@
# !!! Duplication: this package is almost exactly the same as `bsd-finger'.
stdenv.mkDerivation rec {
name = "bsd-finger-0.17";
pname = "bsd-finger";
version = "0.17";
src = fetchurl {
url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/${name}.tar.gz";
url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/bsd-finger-${version}.tar.gz";
sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244";
};

View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, fetchpatch, neon, pkg-config, readline, zlib}:
stdenv.mkDerivation rec {
name = "cadaver-0.23.3";
pname = "cadaver";
version = "0.23.3";
src = fetchurl {
url = "http://www.webdav.org/cadaver/${name}.tar.gz";
url = "http://www.webdav.org/cadaver/cadaver-${version}.tar.gz";
sha256 = "1jizq69ifrjbjvz5y79wh1ny94gsdby4gdxwjad4bfih6a5fck7x";
};

View File

@ -1,8 +1,8 @@
{ lib, stdenv, fetchgit, python3Packages, makeWrapper }:
stdenv.mkDerivation {
name = "carddav-0.1-2014-02-26";
pname = "carddav";
version = "0.1-2014-02-26";
src = fetchgit {
url = "git://github.com/ljanyst/carddav-util";

View File

@ -1,10 +1,11 @@
{lib, stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "cksfv-1.3.15";
pname = "cksfv";
version = "1.3.15";
src = fetchurl {
url = "http://zakalwe.fi/~shd/foss/cksfv/files/${name}.tar.bz2";
url = "http://zakalwe.fi/~shd/foss/cksfv/files/cksfv-${version}.tar.bz2";
sha256 = "0k06aq94cn5xp4knjw0p7gz06hzh622ql2xvnrlr3q8rcmdvwwx1";
};

View File

@ -1,7 +1,8 @@
{ buildGoPackage, lib, fetchFromGitHub }:
buildGoPackage rec {
name = "curl-unix-socket-2015-04-10";
pname = "curl-unix-socket";
version = "unstable-2015-04-10";
src = fetchFromGitHub {
owner = "Soulou";

View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, libpcap, perl }:
stdenv.mkDerivation {
name = "dhcpdump-1.8";
stdenv.mkDerivation rec {
pname = "dhcpdump";
version = "1.8";
src = fetchurl {
url = "http://archive.ubuntu.com/ubuntu/pool/universe/d/dhcpdump/dhcpdump_1.8.orig.tar.gz";
url = "http://archive.ubuntu.com/ubuntu/pool/universe/d/dhcpdump/dhcpdump_${version}.orig.tar.gz";
sha256 = "143iyzkqvhj4dscwqs75jvfr4wvzrs11ck3fqn5p7yv2h50vjpkd";
};

View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, libpcap, ncurses }:
stdenv.mkDerivation rec {
name = "dnstop-20140915";
pname = "dnstop";
version = "2014-09-15";
src = fetchurl {
url = "http://dns.measurement-factory.com/tools/dnstop/src/${name}.tar.gz";
url = "http://dns.measurement-factory.com/tools/dnstop/src/dnstop-${lib.replaceStrings ["-"] [""] version}.tar.gz";
sha256 = "0yn5s2825l826506gclbcfk3lzllx9brk9rzja6yj5jv0013vc5l";
};

View File

@ -4,10 +4,11 @@
}:
stdenv.mkDerivation rec {
name = "dropbear-2020.81";
pname = "dropbear";
version = "2020.81";
src = fetchurl {
url = "https://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2";
url = "https://matt.ucc.asn.au/dropbear/releases/dropbear-${version}.tar.bz2";
sha256 = "0fy5ma4cfc2pk25mcccc67b2mf1rnb2c06ilb7ddnxbpnc85s8s8";
};

View File

@ -20,7 +20,8 @@ let
in
stdenv.mkDerivation {
name = "email-git-2016-01-31";
pname = "email-git";
version = "unstable-2016-01-31";
src = eMailSrc;
buildInputs = [ openssl ];

View File

@ -1,10 +1,11 @@
{ buildGoPackage, lib, fetchurl }:
buildGoPackage rec {
name = "filegive-0.7.4";
pname = "filegive";
version = "0.7.4";
src = fetchurl {
url = "http://viric.name/soft/filegive/${name}.tar.gz";
url = "http://viric.name/soft/filegive/filegive-${version}.tar.gz";
sha256 = "1z3vyqfdp271qa5ah0i6jmn9gh3gb296wcm33sd2zfjqapyh12hy";
};

View File

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "flvstreamer-2.1c1";
pname = "flvstreamer";
version = "2.1c1";
src = fetchurl {
url = "mirror://savannah/flvstreamer/source/${name}.tar.gz";
url = "mirror://savannah/flvstreamer/source/flvstreamer-${version}.tar.gz";
sha256 = "e90e24e13a48c57b1be01e41c9a7ec41f59953cdb862b50cf3e667429394d1ee";
};

View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "fping-5.0";
pname = "fping";
version = "5.0";
src = fetchurl {
url = "https://www.fping.org/dist/${name}.tar.gz";
url = "https://www.fping.org/dist/fping-${version}.tar.gz";
sha256 = "1f2prmii4fyl44cfykp40hp4jjhicrhddh9v3dfs11j6nsww0f7d";
};

View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, gtk2, readline, ncurses, gettext, openssl, pkg-config }:
stdenv.mkDerivation {
name = "gftp-2.0.19";
stdenv.mkDerivation rec {
pname = "gftp";
version = "2.0.19";
src = fetchurl {
url = "https://www.gftp.org/gftp-2.0.19.tar.bz2";
url = "https://www.gftp.org/gftp-${version}.tar.bz2";
sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk";
};

View File

@ -1,12 +1,13 @@
{lib, stdenv, fetchurl, libdnet, pkg-config, libpcap}:
stdenv.mkDerivation {
name = "hyenae-0.36-1";
stdenv.mkDerivation rec {
pname = "hyenae";
version = "0.36-1";
enableParallelBuilding = true;
src = fetchurl {
url = "mirror://sourceforge/hyenae/0.36-1/hyenae-0.36-1.tar.gz";
url = "mirror://sourceforge/hyenae/${version}/hyenae-${version}.tar.gz";
sha256 = "1f3x4yn9a9p4f4wk4l8pv7hxfjc8q7cv20xzf7ky735sq1hj0xcg";
};

View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, ncurses, libpcap, automake, nixosTests }:
stdenv.mkDerivation {
name = "iftop-1.0pre4";
stdenv.mkDerivation rec {
pname = "iftop";
version = "1.0pre4";
src = fetchurl {
url = "http://ex-parrot.com/pdw/iftop/download/iftop-1.0pre4.tar.gz";
url = "http://ex-parrot.com/pdw/iftop/download/iftop-${version}.tar.gz";
sha256 = "15sgkdyijb7vbxpxjavh5qm5nvyii3fqcg9mzvw7fx8s6zmfwczp";
};

View File

@ -1,9 +1,11 @@
{lib, stdenv, fetchurl, openssl, ncurses}:
stdenv.mkDerivation {
name = "imapproxy-1.2.7";
stdenv.mkDerivation rec {
pname = "imapproxy";
version = "1.2.7";
src = fetchurl {
url = "mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-1.2.7.tar.bz2";
url = "mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-${version}.tar.bz2";
sha256 = "0j5fq755sxiz338ia93jrkiy64crv30g37pir5pxfys57q7d92nx";
};

View File

@ -1,9 +1,11 @@
{lib, stdenv, makeWrapper, fetchurl, perl, openssl, perlPackages }:
stdenv.mkDerivation rec {
name = "imapsync-1.727";
pname = "imapsync";
version = "1.727";
src = fetchurl {
url = "https://releases.pagure.org/imapsync/${name}.tgz";
url = "https://releases.pagure.org/imapsync/imapsync-${version}.tgz";
sha256 = "1axacjw2wyaphczfw3kfmi5cl83fyr8nb207nks40fxkbs8q5dlr";
};

View File

@ -1,10 +1,11 @@
{ fetchurl, fetchpatch, lib, stdenv, autoconf, libpcap, ncurses, pkg-config, glib }:
stdenv.mkDerivation {
name = "jnettop-0.13.0";
stdenv.mkDerivation rec {
pname = "jnettop";
version = "0.13.0";
src = fetchurl {
url = "http://jnettop.kubs.info/dist/jnettop-0.13.0.tar.gz";
url = "http://jnettop.kubs.info/dist/jnettop-${version}.tar.gz";
sha256 = "1855np7c4b0bqzhf1l1dyzxb90fpnvrirdisajhci5am6als31z9";
};

View File

@ -1,10 +1,11 @@
{lib, stdenv, lynx, fetchurl}:
stdenv.mkDerivation {
name = "jwhois-4.0";
stdenv.mkDerivation rec {
pname = "jwhois";
version = "4.0";
src = fetchurl {
url = "mirror://gnu/jwhois/jwhois-4.0.tar.gz";
url = "mirror://gnu/jwhois/jwhois-${version}.tar.gz";
sha256 = "0knn7iaj5v0n6jpmldyv2yk4bcy9dn3kywmv63bwc5drh9kvi6zs";
};

View File

@ -2,9 +2,11 @@
, nettools, lsof, procps }:
stdenv.mkDerivation rec {
name = "lsh-2.0.4";
pname = "lsh";
version = "2.0.4";
src = fetchurl {
url = "mirror://gnu/lsh/${name}.tar.gz";
url = "mirror://gnu/lsh/lsh-${version}.tar.gz";
sha256 = "614b9d63e13ad3e162c82b6405d1f67713fc622a8bc11337e72949d613713091";
};

View File

@ -1,10 +1,11 @@
{ fetchurl, lib, stdenv, pkg-config, pcre, perl }:
stdenv.mkDerivation {
name = "maildrop-2.6.0";
stdenv.mkDerivation rec {
pname = "maildrop";
version = "2.6.0";
src = fetchurl {
url = "mirror://sourceforge/courier/maildrop/2.6.0/maildrop-2.6.0.tar.bz2";
url = "mirror://sourceforge/courier/maildrop/${version}/maildrop-${version}.tar.bz2";
sha256 = "1a94p2b41iy334cwfwmzi19557dn5j61abh0cp2rfc9dkc8ibhdg";
};

View File

@ -7,12 +7,13 @@ let
scriptBinEnv = lib.makeBinPath [ which iproute2 iptables gnused coreutils gawk ];
in
stdenv.mkDerivation rec {
name = "miniupnpd-2.1.20190502";
pname = "miniupnpd";
version = "2.1.20190502";
src = fetchurl {
url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
url = "http://miniupnp.free.fr/files/download.php?file=miniupnpd-${version}.tar.gz";
sha256 = "1m8d0g9b0bjwsnqccw1yapp6n0jghmgzwixwjflwmvi2fi6hdp4b";
name = "${name}.tar.gz";
name = "miniupnpd-${version}.tar.gz";
};
buildInputs = [ iptables libuuid ];

View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "mpack-1.6";
pname = "mpack";
version = "1.6";
src = fetchurl {
url = "http://ftp.andrew.cmu.edu/pub/mpack/${name}.tar.gz";
url = "http://ftp.andrew.cmu.edu/pub/mpack/mpack-${version}.tar.gz";
sha256 = "0k590z96509k96zxmhv72gkwhrlf55jkmyqlzi72m61r7axhhh97";
};

View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, pkg-config, glib, which }:
stdenv.mkDerivation rec {
name = "nbd-3.21";
pname = "nbd";
version = "3.21";
src = fetchurl {
url = "mirror://sourceforge/nbd/${name}.tar.xz";
url = "mirror://sourceforge/nbd/nbd-${version}.tar.xz";
sha256 = "sha256-52iK852Rczu80tsIBixE/lA9AE5RUodAE5xEr/amvvk=";
};
@ -14,8 +15,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config which ];
postInstall = ''
mkdir -p "$out/share/doc/${name}"
cp README.md "$out/share/doc/${name}/"
mkdir -p "$out/share/doc/nbd-${version}"
cp README.md "$out/share/doc/nbd-${version}/"
'';
doCheck = true;

View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
name = "ndisc6-1.0.4";
pname = "ndisc6";
version = "1.0.4";
src = fetchurl {
url = "https://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2";
url = "https://www.remlab.net/files/ndisc6/archive/ndisc6-${version}.tar.bz2";
sha256 = "07swyar1hl83zxmd7fqwb2q0c0slvrswkcfp3nz5lknrk15dmcdb";
};

View File

@ -1,9 +1,11 @@
{ lib, stdenv, fetchurl, bison, lzo, db4 }:
stdenv.mkDerivation rec {
name = "netboot-0.10.2";
name = "netboot";
version = "0.10.2";
src = fetchurl {
url = "mirror://sourceforge/netboot/${name}.tar.gz";
url = "mirror://sourceforge/netboot/netboot-${version}.tar.gz";
sha256 = "09w09bvwgb0xzn8hjz5rhi3aibysdadbg693ahn8rylnqfq4hwg0";
};

View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation {
name = "netcat-gnu-0.7.1";
stdenv.mkDerivation rec {
pname = "netcat-gnu";
version = "0.7.1";
src = fetchurl {
url = "mirror://sourceforge/netcat/netcat-0.7.1.tar.bz2";
url = "mirror://sourceforge/netcat/netcat-${version}.tar.bz2";
sha256 = "1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm";
};

View File

@ -1,13 +1,14 @@
{lib, stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "netkit-tftp-0.17";
pname = "netkit-tftp";
version = "0.17";
src = fetchurl {
urls = [
"mirror://ubuntu/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz"
"ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${name}.tar.gz"
"https://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz"
"mirror://ubuntu/pool/universe/n/netkit-tftp/netkit-tftp_${version}.orig.tar.gz"
"ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-${version}.tar.gz"
"https://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_${version}.orig.tar.gz"
];
sha256 = "0kfibbjmy85r3k92cdchha78nzb6silkgn1zaq9g8qaf1l0w0hrs";
};

View File

@ -1,10 +1,11 @@
{ fetchurl, lib, stdenv, fetchpatch }:
stdenv.mkDerivation rec {
name = "nss-mdns-0.10";
pname = "nss-mdns";
version = "0.10";
src = fetchurl {
url = "http://0pointer.de/lennart/projects/nss-mdns/${name}.tar.gz";
url = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${version}.tar.gz";
sha256 = "0vgs6j0qsl0mwzh5a0m0bykr7x6bx79vnbyn0r3q289rghp3qs0y";
};

View File

@ -8,10 +8,11 @@ let
in
stdenv.mkDerivation rec {
name = "ntp-4.2.8p15";
pname = "ntp";
version = "4.2.8p15";
src = fetchurl {
url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz";
url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${lib.versions.majorMinor version}/ntp-${version}.tar.gz";
sha256 = "06cwhimm71safmwvp6nhxp6hvxsg62whnbgbgiflsqb8mgg40n7n";
};

View File

@ -2,7 +2,8 @@
, libavc1394, pkg-config, autoreconfHook }:
stdenv.mkDerivation {
name = "dvgrab-2016-05-16";
pname = "dvgrab";
version = "2016-05-16";
src = fetchFromGitHub {
# mirror of original project with some build fixes

View File

@ -8,10 +8,11 @@
# - libXxf86dga support? checking for XF86DGAQueryExtension in -lXxf86dga... no
stdenv.mkDerivation rec {
name = "mjpegtools-2.1.0";
pname = "mjpegtools";
version = "2.1.0";
src = fetchurl {
url = "mirror://sourceforge/mjpeg/${name}.tar.gz";
url = "mirror://sourceforge/mjpeg/mjpegtools-${version}.tar.gz";
sha256 = "01y4xpfdvd4zgv6fmcjny9mr1gbfd4y2i4adp657ydw6fqyi8kw6";
};

View File

@ -3,10 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "swfmill-0.3.3";
pname = "swfmill";
version = "0.3.3";
src = fetchurl {
url = "http://swfmill.org/releases/${name}.tar.gz";
url = "http://swfmill.org/releases/swfmill-${version}.tar.gz";
sha256 = "15mcpql448vvgsbxs7wd0vdk1ln6rdcpnif6i2zjm5l4xng55s7r";
};

View File

@ -3,7 +3,8 @@
}:
stdenv.mkDerivation {
name = "vncrec-0.2"; # version taken from Arch AUR
pname = "vncrec";
version = "0.2"; # version taken from Arch AUR
src = fetchurl {
url = "http://ronja.twibright.com/utils/vncrec-twibright.tgz";

View File

@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl, perl, curl }:
stdenv.mkDerivation {
name = "aws-2019.06.18";
pname = "aws";
version = "2019.06.18";
src = fetchurl {
url = "https://raw.github.com/timkay/aws/ac68eb5191c52f069b9aa0c9a99808f8a4430833/aws";

View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, unzip, makeWrapper, jre }:
stdenv.mkDerivation rec {
name = "ec2-api-tools-1.7.5.1";
pname = "ec2-api-tools";
version = "1.7.5.1";
src = fetchurl {
url = "http://tarballs.nixos.org/${name}.zip";
url = "http://tarballs.nixos.org/ec2-api-tools-${version}.zip";
sha256 = "0figmvcm82ghmpz3018ihysz8zpxpysgbpdx7rmciq9y80qbw6l5";
};