cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-06-29 06:04:18 +00:00 committed by GitHub
commit de136681f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 179 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/audio/scream/default.nix
View file

@ -1,26 +1,29 @@
{ stdenv, lib, config, fetchFromGitHub, cmake, pkg-config
, alsaSupport ? stdenv.isLinux, alsa-lib
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio
, jackSupport ? false, libjack2
}:
stdenv.mkDerivation rec {
pname = "scream";
version = "3.6";
version = "3.7";
src = fetchFromGitHub {
owner = "duncanthrax";
repo = pname;
rev = version;
sha256 = "01k2zhfb781gfj3apmcjqbm5m05m6pvnh7fb5k81zwvqibai000v";
sha256 = "0d9abrw62cd08lcg4il415b7ap89iggbljvbl5jqv2y23il0pvyz";
};
buildInputs = lib.optional pulseSupport libpulseaudio
++ lib.optional jackSupport libjack2
++ lib.optional alsaSupport alsa-lib;
nativeBuildInputs = [ cmake pkg-config ];
cmakeFlags = [
"-DPULSEAUDIO_ENABLE=${if pulseSupport then "ON" else "OFF"}"
"-DALSA_ENABLE=${if alsaSupport then "ON" else "OFF"}"
"-DJACK_ENABLE=${if jackSupport then "ON" else "OFF"}"
];
cmakeDir = "../Receivers/unix";

41
pkgs/applications/backup/restique/default.nix Normal file
View file

@ -0,0 +1,41 @@
{ lib
, mkDerivation
, fetchFromGitea
, cmake
, libsecret
, qtkeychain
, restic
}:
mkDerivation rec {
pname = "restique";
version = "unstable-2021-05-03";
src = fetchFromGitea {
domain = "git.srcbox.net";
owner = "stefan";
repo = "restique";
rev = "f83ea63c2e2f2a41e845f54c7fe2c391a528a121";
sha256 = "0j1qihv7hd90xkfm4ksv74q6m7cq781fbdnc3l4spcd7h2p8lh0z";
};
nativeBuildInputs = [
cmake
];
buildInputs = [
libsecret
qtkeychain
];
qtWrapperArgs = [
"--prefix" "PATH" ":" (lib.makeBinPath [ restic ])
];
meta = with lib; {
description = "Restic GUI for Desktop/Laptop Backups";
homepage = "https://git.srcbox.net/stefan/restique";
license = with licenses; [ gpl3Plus cc-by-sa-40 cc0 ];
maintainers = with maintainers; [ dotlambda ];
};
}

4
pkgs/applications/graphics/avocode/default.nix
View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "avocode";
version = "4.14.3";
version = "4.15.0";
src = fetchurl {
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
sha256 = "sha256-6OEgSnW96jufc/Z+B17ghtAbj9SLulue26ffKREGzbY=";
sha256 = "sha256-Au1m7CfZkeOczcO/JvIzyVCp6Gn/nhSq0yJOdP8i+0w=";
};
libPath = lib.makeLibraryPath (with xorg; [

6
pkgs/applications/misc/hugo/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "hugo";
version = "0.84.1";
version = "0.84.2";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ULZa0tepq00v2VHDR3+aYYvRfbxYKcjcltRgRmbVmRA=";
sha256 = "sha256-NE4vXtczzcL5f0/aDYeGnleBwsDBTzojSaek/LzowFo=";
};
vendorSha256 = "sha256-jY/g92ON5OxjuZzPHJNduXYMgPU8/0ioAYvp4iqjGnU=";
vendorSha256 = "sha256-ImXTOtN6kQL7Q8IBlmK7+i47cWtyZT0xcnQdCw3NvWM=";
doCheck = false;

6
pkgs/applications/misc/openring/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "openring";
version = "unstable-2021-04-03";
version = "unstable-2021-06-28";
src = fetchFromSourcehut {
owner = "~sircmpwn";
repo = pname;
rev = "f13edb5dfd882ce608d61cf6b6740650ce9d84a3";
sha256 = "sha256-Z65V77JZ9jCzBg7T2+d5Agxxd+MV2R7nYcLedYP5eOE=";
rev = "e566294050776355ca0d3bfd7a1f6f70767cd08b";
sha256 = "sha256-h9Tout3KGiv6jbq9Ui3crb5NdTOHcn7BIy+aPoWG5sM=";
};
vendorSha256 = "sha256-BbBTmkGyLrIWphXC+dBaHaVzHuXRZ+4N/Jt2k3nF7Z4=";

4
pkgs/applications/networking/cluster/k9s/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k9s";
version = "0.24.10";
version = "0.24.11";
src = fetchFromGitHub {
owner = "derailed";
repo = "k9s";
rev = "v${version}";
sha256 = "sha256-ImWIR112q59hyKHXBmb9W6eVvu4xr+U4+uh2ZGcXv1g=";
sha256 = "sha256-UWY4r7pasFsmlRRKFANyxPIoNNuMPNg1gMXrAXEcqdw=";
};
buildFlagsArray = ''

4
pkgs/applications/networking/ids/snort/default.nix
View file

@ -3,13 +3,13 @@
}:
stdenv.mkDerivation rec {
version = "2.9.16.1";
version = "2.9.18";
pname = "snort";
src = fetchurl {
name = "${pname}-${version}.tar.gz";
url = "https://snort.org/downloads/archive/snort/${pname}-${version}.tar.gz";
sha256 = "13lzvjli6kbsnkd7lf0rm71l2mnz38pxk76ia9yrjb6clfhlbb73";
sha256 = "0xrc7crchflfrk4x5dq5zx22zkmgcrbkww5r1pvkc3cyyr18cc6h";
};
nativeBuildInputs = [ makeWrapper ];

21
pkgs/applications/networking/instant-messengers/teams/default.nix
View file

@ -13,6 +13,7 @@
, gawk
, xdg-utils
, systemd
, nodePackages
, enableRectOverlay ? false }:
stdenv.mkDerivation rec {
@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
sha256 = "1kx4j837fd344zy90nl0j3r8cdvihy6i6gf56wd5n56zngx1fhjv";
};
nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ];
nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook nodePackages.asar ];
unpackCmd = "dpkg -x $curSrc .";
@ -40,11 +41,27 @@ stdenv.mkDerivation rec {
];
preFixup = ''
gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin:${xdg-utils}/bin")
gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin")
gappsWrapperArgs+=(--add-flags --disable-namespace-sandbox)
gappsWrapperArgs+=(--add-flags --disable-setuid-sandbox)
'';
buildPhase = ''
runHook preBuild
asar extract share/teams/resources/app.asar "$TMP/work"
substituteInPlace $TMP/work/main.bundle.js \
--replace "/usr/share/pixmaps/" "$out/share/pixmaps" \
--replace "/usr/bin/xdg-mime" "${xdg-utils}/bin/xdg-mime" \
--replace "Exec=/usr/bin/" "Exec=" # Remove usage of absolute path in autostart.
asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" share/teams/resources/app.asar
runHook postBuild
'';
preferLocalBuild = true;
installPhase = ''
runHook preInstall

38
pkgs/development/libraries/mimalloc/default.nix
View file

@ -7,42 +7,35 @@ let
in
stdenv.mkDerivation rec {
pname = "mimalloc";
version = "2.0.0";
version = "2.0.2";
src = fetchFromGitHub {
owner = "microsoft";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BMDCreY41CxJaPo9BdSRZlqh/YjtPC9aI/Zxt501e+0=";
sha256 = "sha256-n4FGld3bq6ZOSLTzXcVlucCGbQ5/eSFbijU0dfBD/T0=";
};
nativeBuildInputs = [ cmake ninja ];
cmakeFlags = lib.optional secureBuild [ "-DMI_SECURE=ON" ];
cmakeFlags = [ "-DMI_INSTALL_TOPLEVEL=ON" ] ++ lib.optional secureBuild [ "-DMI_SECURE=ON" ];
postInstall = let
rel = lib.versions.majorMinor version;
suffix = if stdenv.isLinux then "${soext}.${rel}" else ".${rel}${soext}";
in ''
# first, install headers, that's easy
mkdir -p $dev
mv $out/lib/*/include $dev/include
# first, move headers and cmake files, that's easy
mkdir -p $dev/lib
mv $out/include $dev/include
mv $out/cmake $dev/lib/
# move .a and .o files into place
find $out/lib
mv $out/lib/mimalloc-${rel}/libmimalloc*.a $out/lib/libmimalloc.a
mv $out/lib/mimalloc-${rel}/mimalloc*.o $out/lib/mimalloc.o
'' + (if secureBuild then ''
mv $out/lib/mimalloc-${rel}/libmimalloc-secure${soext}.${rel} $out/lib/libmimalloc-secure${soext}.${rel}
ln -sfv $out/lib/libmimalloc-secure${soext}.${rel} $out/lib/libmimalloc-secure${soext}
ln -sfv $out/lib/libmimalloc-secure${soext}.${rel} $out/lib/libmimalloc${soext}
'' else ''
mv $out/lib/mimalloc-${rel}/libmimalloc${soext}.${rel} $out/lib/libmimalloc${soext}.${rel}
ln -sfv $out/lib/libmimalloc${soext}.${rel} $out/lib/libmimalloc${soext}
'') + ''
# remote duplicate dir. FIXME: try to fix the .cmake file distribution
# so we can re-use it for dependencies...
rm -rf $out/lib/mimalloc-${rel}
'';
'' + (lib.optionalString secureBuild ''
# pretend we're normal mimalloc
ln -sfv $out/lib/libmimalloc-secure${suffix} $out/lib/libmimalloc${suffix}
ln -sfv $out/lib/libmimalloc-secure${suffix} $out/lib/libmimalloc${soext}
ln -sfv $out/lib/libmimalloc-secure.a $out/lib/libmimalloc.a
ln -sfv $out/lib/mimalloc-secure.o $out/lib/mimalloc.o
'');
outputs = [ "out" "dev" ];
@ -52,6 +45,5 @@ stdenv.mkDerivation rec {
license = licenses.bsd2;
platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice ];
badPlatforms = platforms.darwin;
};
}

4
pkgs/development/tools/esbuild/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "esbuild";
version = "0.12.9";
version = "0.12.11";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
sha256 = "sha256-MqwgdhgWIfYE0wO7fWQuC72tEwCVgL7qUbJlJ3APf4E=";
sha256 = "sha256-fn1PQZxZbizer226c9bI1kQ7/p8Z5PbdPiYv2ekll7U=";
};
vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";

4
pkgs/games/cbonsai/default.nix
View file

@ -1,14 +1,14 @@
{ stdenv, lib, fetchFromGitLab, ncurses, pkg-config, nix-update-script }:
stdenv.mkDerivation rec {
version = "1.2.0";
version = "1.2.1";
pname = "cbonsai";
src = fetchFromGitLab {
owner = "jallbrit";
repo = pname;
rev = "v${version}";
sha256 = "sha256-j3RNCUxNyphZy5c7ZcKwyVbcYt7l6wiB+r7P3sWPFwA=";
sha256 = "sha256-kofJqMoBsvHrV3XfIQbSYO7OWpN7UgvrSs3WX3IVAJs=";
};
nativeBuildInputs = [ pkg-config ];

16
pkgs/games/gemrb/default.nix
View file

@ -20,6 +20,10 @@ let
backend =
if (stdenv.isx86_32 || stdenv.isx86_64) then "OpenGL" else "GLES";
withVLC = stdenv.isDarwin;
inherit (lib) optional optionalString;
in
stdenv.mkDerivation rec {
pname = "gemrb";
@ -39,19 +43,23 @@ stdenv.mkDerivation rec {
libGL
libiconv
libpng
libvlc
libvorbis
openal
python2
zlib
];
]
++ optional withVLC libvlc;
nativeBuildInputs = [ cmake ];
LIBVLC_INCLUDE_PATH = "${lib.getDev libvlc}/include";
LIBVLC_LIBRARY_PATH = "${lib.getLib libvlc}/lib";
# libvlc isn't being detected properly as of 0.9.0, so set it
LIBVLC_INCLUDE_PATH = optionalString withVLC "${lib.getDev libvlc}/include";
LIBVLC_LIBRARY_PATH = optionalString withVLC "${lib.getLib libvlc}/lib";
cmakeFlags = [
"-DDATA_DIR=${placeholder "out"}/share/gemrb"
"-DEXAMPLE_CONF_DIR=${placeholder "out"}/share/doc/gemrb/examples"
"-DSYSCONF_DIR=/etc"
# use the Mesa drivers for video on ARM (harmless on x86)
"-DDISABLE_VIDEOCORE=ON"
"-DLAYOUT=opt"

4
pkgs/games/katago/default.nix
View file

@ -33,14 +33,14 @@ let
in env.mkDerivation rec {
pname = "katago";
version = "1.8.2";
version = "1.9.0";
githash = "b846bddd88fbc5353e4a93fa514f6cbf45358362";
src = fetchFromGitHub {
owner = "lightvector";
repo = "katago";
rev = "v${version}";
sha256 = "sha256-kL+y2rsEiC5GGDlWrbzxlJvLxHDCuvVT6CDOlUtXpDk=";
sha256 = "sha256-6J1UY05NweXLw8D4kOXG3KkCxJRsrQ9NBYWu2Xzu9JI=";
};
fakegit = writeShellScriptBin "git" "echo ${githash}";

26
pkgs/misc/emulators/gxemul/0001-fix-attributes.patch Normal file
View file

@ -0,0 +1,26 @@
diff -Naur gxemul-0.7.0-old/src/include/thirdparty/pcireg.h gxemul-0.7.0/src/include/thirdparty/pcireg.h
--- gxemul-0.7.0-old/src/include/thirdparty/pcireg.h 2021-04-22 15:04:14.000000000 -0300
+++ gxemul-0.7.0-new/src/include/thirdparty/pcireg.h 2021-06-28 18:41:13.063065322 -0300
@@ -12,9 +12,6 @@
#undef __noreturn__
#endif
-#define __attribute__(x) /* */
-#define __noreturn__ /* */
-
/*
* Copyright (c) 1995, 1996, 1999, 2000
* Christopher G. Demetriou. All rights reserved.
diff -Naur gxemul-0.7.0-old/src/include/thirdparty/sgi_arcbios.h gxemul-0.7.0/src/include/thirdparty/sgi_arcbios.h
--- gxemul-0.7.0-old/src/include/thirdparty/sgi_arcbios.h 2021-04-22 15:04:14.000000000 -0300
+++ gxemul-0.7.0-new/src/include/thirdparty/sgi_arcbios.h 2021-06-28 18:41:33.549981505 -0300
@@ -14,9 +14,6 @@
#undef __noreturn__
#endif
-#define __attribute__(x) /* */
-#define __noreturn__ /* */
-
/* $NetBSD: arcbios.h,v 1.3 2001/12/06 14:59:02 rafal Exp $ */
/*-

42
pkgs/misc/emulators/gxemul/default.nix
View file

@ -1,21 +1,31 @@
{ lib, stdenv, fetchurl }:
{ lib
, stdenv
, fetchurl
, libX11
}:
stdenv.mkDerivation rec {
pname = "gxemul";
version = "0.6.2";
version = "0.7.0";
src = fetchurl {
url = "http://gavare.se/gxemul/src/gxemul-${version}.tar.gz";
sha256 = "0iqmazfn7ss5n27m1a9n9nps3vzhag1phzb7qw0wgczycmwsq0x7";
url = "http://gavare.se/gxemul/src/${pname}-${version}.tar.gz";
sha256 = "sha256-ecRDfG+MqQT0bTOsNgYqZf3PSpKiSEeOQIqxEpXPjoM=";
};
configurePhase = "./configure";
buildInputs = [
libX11
];
installPhase = ''
mkdir -p {$out/bin,$out/share/${pname}-${version}}
cp -r {doc,demos} $out/share/${pname}-${version}
cp gxemul $out/bin
cp -r ./man $out
patches = [
# Fix compilation; remove when next release arrives
./0001-fix-attributes.patch
];
dontAddPrefix = true;
preConfigure = ''
export PREFIX=${placeholder "out"}
'';
meta = with lib; {
@ -24,12 +34,14 @@ stdenv.mkDerivation rec {
longDescription = ''
GXemul is a framework for full-system computer architecture
emulation. Several real machines have been implemented within the
framework, consisting of processors (ARM, MIPS, Motorola 88K,
PowerPC, and SuperH) and surrounding hardware components such as
framebuffers, interrupt controllers, busses, disk controllers,
and serial controllers. The emulation is working well enough to
allow several unmodified "guest" operating systems to run.
framework, consisting of processors (ARM, MIPS, Motorola 88K, PowerPC, and
SuperH) and surrounding hardware components such as framebuffers,
interrupt controllers, busses, disk controllers, and serial
controllers. The emulation is working well enough to allow several
unmodified "guest" operating systems to run.
'';
license = licenses.bsd3;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
};
}

6
pkgs/servers/imgproxy/default.nix
View file

@ -3,16 +3,16 @@
buildGoModule rec {
pname = "imgproxy";
version = "2.16.4";
version = "2.16.5";
src = fetchFromGitHub {
owner = pname;
repo = pname;
sha256 = "sha256-25oOGkTc19PHlU0Va7IPKrvGK9pDrGqKZa6qNFMVphQ=";
sha256 = "sha256-CLmnc33mVvm7CR0Qv4zsLiQ/jyRIkr1N53mMfD3flNM=";
rev = "v${version}";
};
vendorSha256 = "sha256-y8cXe4+jTLnM7K+na2VHGXkPgZjFYdgtDd14D8KiCas=";
vendorSha256 = "sha256-aV+A2duS13Zi9IPa7bd/tBe5NzmUhKYsXzvluuIFc+I=";
doCheck = false;

4
pkgs/tools/bluetooth/blueberry/default.nix
View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "blueberry";
version = "1.4.3";
version = "1.4.4";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-UkF50AIFKkvjUHJiemR0Hj5ECZeHQU6beIw2TGrOlbk=";
sha256 = "sha256-dz0uGesyuQVXI7aEONCeOsa2vVw5yuStSFPnrqv2VcM=";
};
nativeBuildInputs = [

38
pkgs/tools/typesetting/tex/texlive/default.nix
View file

@ -160,35 +160,12 @@ let
"https://texlive.info/tlnet-archive/${snapshot.year}/${snapshot.month}/${snapshot.day}/tlnet/archive"
];
src = fetchurl { inherit urls sha512; };
passthru = {
inherit pname tlType version;
} // lib.optionalAttrs (sha512 != "") { inherit src; };
unpackCmd = file: ''
tar -xf ${file} \
'--strip-components=${toString stripPrefix}' \
-C "$out" --anchored --exclude=tlpkg --keep-old-files
'' + postUnpack;
in if sha512 == "" then
# hash stripped from pkgs.nix to save space -> fetch&unpack in a single step
# currently unused as we prefer to keep the sha512 hashes for reproducibility
fetchurl {
inherit urls;
sha1 = if fixedHash == null then throw "TeX Live package ${tlName} is missing hash!"
else fixedHash;
name = tlName;
recursiveHash = true;
downloadToTemp = true;
postFetch = ''mkdir "$out";'' + unpackCmd "$downloadedFile";
# TODO: perhaps override preferHashedMirrors and allowSubstitutes
}
// passthru
else runCommand "texlive-${tlName}"
in runCommand "texlive-${tlName}"
( {
inherit passthru;
src = fetchurl { inherit urls sha512; };
inherit stripPrefix;
# metadata for texlive.combine
passthru = { inherit pname tlType version; };
} // lib.optionalAttrs (fixedHash != null) {
outputHash = fixedHash;
outputHashAlgo = "sha1";
@ -197,7 +174,10 @@ let
)
( ''
mkdir "$out"
'' + unpackCmd "'${src}'"
tar -xf "$src" \
--strip-components="$stripPrefix" \
-C "$out" --anchored --exclude=tlpkg --keep-old-files
'' + postUnpack
);
# combine a set of TL packages into a single TL meta-package

2
pkgs/top-level/all-packages.nix
View file

@ -26584,6 +26584,8 @@ in
remotebox = callPackage ../applications/virtualization/remotebox { };
restique = libsForQt5.callPackage ../applications/backup/restique { };
retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { };
rgp = libsForQt5.callPackage ../development/tools/rgp { };