public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-11-19 20:08:15 +01:00
parent 45ed0b7018 93b430bc6b
commit ea7b8978ef
295 changed files with 2338 additions and 1119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/X11/ckbcomp/default.nix
View File

@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "ckbcomp";
version = "1.197";
version = "1.198";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "installer-team";
repo = "console-setup";
rev = version;
sha256 = "0m2q30f94vd1wb2zqpiyplpgfchjlm8j41xiyxcqdjzdgqbs7l27";
sha256 = "04ahnn8gi24x9kjz6q4nm6gswc4gcav87rvq9sajj4g2hkrxfn0c";
};
buildInputs = [ perl ];

10
pkgs/tools/X11/grobi/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildGoModule }:
{ stdenv, fetchFromGitHub, buildGoModule, fetchpatch }:
buildGoModule rec {
version = "0.6.0";
@@ -13,6 +13,14 @@ buildGoModule rec {
vendorSha256 = "1ibwx5rbxkygfx78j3g364dmbwwa5b34qmzq3sqcbrsnv8rzrwvj";
patches = [
# fix failing test on go 1.15
(fetchpatch {
url = "https://github.com/fd0/grobi/commit/176988ab087ff92d1408fbc454c77263457f3d7e.patch";
sha256 = "0j8y3gns4lm0qxqxzmdn2ll0kq34mmfhf83lvsq13iqhp5bx3y31";
})
];
meta = with stdenv.lib; {
homepage = "https://github.com/fd0/grobi";
description = "Automatically configure monitors/outputs for Xorg via RANDR";

6
pkgs/tools/admin/ssmsh/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ssmsh";
version = "1.4.3";
version = "1.4.4";
src = fetchFromGitHub {
owner = "bwhaley";
repo = pname;
rev = "v${version}";
sha256 = "0rvvawn4cavqhbrrp616mi5ipn4q6j22227h4rbjh0zxdlna23gm";
sha256 = "0mgx4q21f6rxih79l0hwgzwafxviz5a33dpvc5k0z172sfw0dmj1";
};
vendorSha256 = "127xni0i7w42075bspmm5r61j858i1p59jr2ib8f9r1pbizh63xw";
vendorSha256 = "147f02bl3sf073dy2ximbavdcbphdn7djgisla1cyyy4ng6dhf7f";
doCheck = true;

4
pkgs/tools/filesystems/cpcfs/default.nix
View File

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
pname = "cpcfs";
version = "0.85.4";
src = fetchFromGitHub {
owner = "derikz";
repo = "cpcfs";
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
description = "Manipulating CPC dsk images and files";
homepage = "https://github.com/derikz/cpcfs/" ;
license = licenses.bsd2;
maintainers = [ maintainers.genesis ];
maintainers = [ ];
platforms = platforms.linux;
};
}

2
pkgs/tools/filesystems/idsk/default.nix
View File

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
description = "Manipulating CPC dsk images and files";
homepage = "https://github.com/cpcsdk/idsk" ;
license = licenses.mit;
maintainers = [ maintainers.genesis ];
maintainers = [ ];
platforms = platforms.linux;
};
}

2
pkgs/tools/filesystems/romdirfs/default.nix
View File

@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/mlafeldt/romdirfs";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ genesis ];
maintainers = with maintainers; [ ];
};
}

16
pkgs/tools/filesystems/squashfuse/default.nix
View File

@@ -8,14 +8,6 @@ stdenv.mkDerivation rec {
pname = "squashfuse";
version = "0.1.103";
meta = {
description = "FUSE filesystem to mount squashfs archives";
homepage = "https://github.com/vasi/squashfuse";
maintainers = [ maintainers.genesis ];
platforms = platforms.linux;
license = "BSD-2-Clause";
};
# platforms.darwin should be supported : see PLATFORMS file in src.
# we could use a nix fuseProvider, and let the derivation choose the OS
# specific implementation.
@@ -29,4 +21,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook libtool pkgconfig ];
buildInputs = [ lz4 xz zlib lzo zstd fuse ];
meta = {
description = "FUSE filesystem to mount squashfs archives";
homepage = "https://github.com/vasi/squashfuse";
maintainers = [ ];
platforms = platforms.linux;
license = "BSD-2-Clause";
};
}

4
pkgs/tools/graphics/gmic/default.nix
View File

@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "gmic";
version = "2.9.2";
version = "2.9.3";
outputs = [ "out" "lib" "dev" "man" ];
src = fetchurl {
url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
sha256 = "14acph914a8lp6qqfmp319ggqjg3i3hmalmnpk3mp07m7vpv2p9q";
sha256 = "1pj3rwycwnspw2lm5j0w4647677y6s3446zsx9s6br9bc7v7w5s6";
};
nativeBuildInputs = [

7
pkgs/tools/misc/cpuminer-multi/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchgit, curl, jansson, autoconf, automake
{ stdenv, fetchFromGitHub, curl, jansson, autoconf, automake
, aesni ? stdenv.hostPlatform.aesSupport }:
let
@@ -8,9 +8,10 @@ in
stdenv.mkDerivation {
name = "cpuminer-multi-${date}-${stdenv.lib.strings.substring 0 7 rev}";
src = fetchgit {
src = fetchFromGitHub {
owner = "hyc";
repo = "cpuminer-multi";
inherit rev;
url = "https://github.com/wolf9466/cpuminer-multi.git";
sha256 = "11dg4rra4dgfb9x6q85irn0hrkx2lkwyrdpgdh10pag09s3vhy4v";
};

4
pkgs/tools/misc/direnv/default.nix
View File

@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "direnv";
version = "2.23.1";
version = "2.24.0";
vendorSha256 = null;
@@ -10,7 +10,7 @@ buildGoModule rec {
owner = "direnv";
repo = "direnv";
rev = "v${version}";
sha256 = "02b27imda9pg65z5xw2q398p2281d5d46vgs3i9mrwcfsbpl5s6d";
sha256 = "1hgivmz6f5knpchkyi3njj1h81hixm77ad5g2v0m9bid09b97nh8";
};
# we have no bash at the moment for windows

4
pkgs/tools/misc/fluent-bit/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fluent-bit";
version = "1.6.3";
version = "1.6.4";
src = fetchFromGitHub {
owner = "fluent";
repo = "fluent-bit";
rev = "v${version}";
sha256 = "0c8b5xg1shdncw24jsnzwk96ln4qmw1h2qlxv6467lf083kz0azw";
sha256 = "1hfkix5pjcrm68bm4k71dlkkdlnwffzlw4kxhiq9pmg09z8s6kq3";
};
nativeBuildInputs = [ cmake flex bison ];

14
pkgs/tools/misc/mons/default.nix
View File

@@ -2,21 +2,21 @@
stdenv.mkDerivation rec {
pname = "mons";
version = "20200107";
version = "20200320";
src = fetchFromGitHub {
owner = "Ventto";
repo = pname;
rev = "0c9e1a1dddff23a0525ed8e4ec9af8f9dd8cad4c";
sha256 = "02c41mw3g1mgl91hhpz1n45iaqk9s7mdk1ixm8yv6sv17hy8rr4w";
rev = "375bbba3aa700c8b3b33645a7fb70605c8b0ff0c";
sha256 = "19r5y721yrxhd9jp99s29jjvm0p87vl6xfjlcj38bljq903f21cl";
fetchSubmodules = true;
};
# PR: https://github.com/Ventto/mons/pull/36
preConfigure = ''sed -i 's/usr\///' Makefile'';
nativeBuildInputs = [ help2man ];
makeFlags = [ "DESTDIR=$(out)" ];
makeFlags = [
"DESTDIR=$(out)"
"PREFIX="
];
meta = with lib; {
description = "POSIX Shell script to quickly manage 2-monitors display";

2
pkgs/tools/misc/vector/default.nix
View File

@@ -8,6 +8,8 @@
then [ "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]
else [ "leveldb" "leveldb/leveldb-sys-2" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ])
++
(lib.optional stdenv.targetPlatform.isUnix "unix")
++
[ "sinks" "sources" "transforms" ])
, coreutils
, CoreServices

4
pkgs/tools/misc/youtube-dl/default.nix
View File

@@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2020.11.12";
version = "2020.11.19";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "0c98sjaj6mvxnjp0qnwqbr6fibgb4dlizad2xvkiswf4g4h0pc5f";
sha256 = "17my2k6ksj2gch2j85laa5y8c448j4n6zfg85ljfg3zxnag4vhgq";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];

4
pkgs/tools/networking/photon/default.nix
View File

@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
installPhase = ''
mkdir -p "$out"/{bin,share/photon}
cp -R photon.py core plugins $out/share/photon
makeWrapper ${python3Packages.python.interpreter} $out/bin/photon \
--set PYTHONPATH "$PYTHONPATH:$out/share/photon" \
--add-flags "-O $out/share/photon/photon.py"
@@ -29,6 +29,6 @@ python3Packages.buildPythonApplication rec {
description = "a lightning fast web crawler which extracts URLs, files, intel & endpoints from a target";
homepage = "https://github.com/s0md3v/Photon";
license = licenses.gpl3;
maintainers = with maintainers; [ genesis ];
maintainers = with maintainers; [ ];
};
}

4
pkgs/tools/package-management/nfpm/default.nix
View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "nfpm";
version = "1.10.0";
version = "1.10.1";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
sha256 = "1pgdajbphqfn430jwm052czz1d4ynl6n4z2wjzmblv7lwkbh9j3d";
sha256 = "1j9b6kkhlw2sx6qwnxkhsk7bj9vm2vr0z1hj1jf257fxw9m2q6mz";
};
vendorSha256 = "0x7r7qn4852q57fx5mcrw3aqdydmidk9g0hvj6apj81q77k5svqs";

4
pkgs/tools/security/pass/extensions/genphrase.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pass-genphrase";
version = "0.2";
version = "0.3";
src = fetchFromGitHub {
owner = "congma";
repo = "pass-genphrase";
rev = version;
sha256 = "1sdkmz5s6wdx4vdlgqf5kmyrm17zwzy3n52s13qpx32bnnajap1h";
sha256 = "01dff2jlp111y7vlmp1wbgijzphhlzc19m02fs8nzmn5vxyffanx";
};
dontBuild = true;

10
pkgs/tools/text/poedit/default.nix
View File

@@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "0pvd903j2x3h9wh38fhlcn23d0jkjlqnfbdpbvnbhy6al1ngx72w";
};
nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook
nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook
libxslt xmlto boost libtool pkgconfig ];
buildInputs = [ lucenepp nlohmann_json wxGTK30 icu pugixml gtk2 gtkspell2 hicolor-icon-theme ];
propagatedBuildInputs = [ gettext ];
preConfigure = "
patchShebangs bootstrap
./bootstrap
@@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
"--with-boost-libdir=${boost.out}/lib"
"CPPFLAGS=-I${nlohmann_json}/include/nlohmann/"
];
preFixup = ''
gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ gettext ]}")
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.poedit.net/";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ domenkozar genesis ];
maintainers = with maintainers; [ domenkozar ];
};
}

34
pkgs/tools/video/rav1e/default.nix
View File

@@ -1,18 +1,32 @@
{ rustPlatform, fetchFromGitHub, lib, nasm, cargo-c }:
{ stdenv, rustPlatform, fetchurl, fetchFromGitHub, lib, nasm, cargo-c }:
rustPlatform.buildRustPackage rec {
pname = "rav1e";
version = "0.3.4";
version = "0.4.0-alpha";
src = fetchFromGitHub {
owner = "xiph";
repo = "rav1e";
rev = "v${version}";
sha256 = "0zwjg0sv504i1ahzfy2jgng6qwmyvcrvdrp4n3s90r4kvwjkv8xs";
src = stdenv.mkDerivation rec {
name = "${pname}-${version}-source";
src = fetchFromGitHub {
owner = "xiph";
repo = "rav1e";
rev = "v${version}";
sha256 = "1fw1gxi8330kfhl9hfzpn0lcmyn5604lc74d6g6iadzz2hmv4mb9";
};
cargoLock = fetchurl {
url = "https://github.com/xiph/rav1e/releases/download/v0.4.0-alpha/Cargo.lock";
sha256 = "002s2wlzpifn5p2ahdrjdkjl48c1wr6fslg0if4gf9qpl8qj05fl";
};
installPhase = ''
mkdir -p $out
cp -r ./* $out/
cp ${cargoLock} $out/Cargo.lock
'';
};
cargoSha256 = "1mfzshcbxky27nskxhcyrj99wd3v5f597ymgv7nb67lzp5lsyb24";
cargoSha256 = "1i5ldqb77rrhfxxf9krp7f6yj3h6rsqak6hf23fd2znhgmi7psb1";
nativeBuildInputs = [ nasm cargo-c ];
postBuild = ''
@@ -31,7 +45,7 @@ rustPlatform.buildRustPackage rec {
libaom (the reference encoder) is too slow.
Features: https://github.com/xiph/rav1e#features
'';
inherit (src.meta) homepage;
homepage = "https://github.com/xiph/rav1e";
changelog = "https://github.com/xiph/rav1e/releases/tag/v${version}";
license = licenses.bsd2;
maintainers = [ maintainers.primeos ];