Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
e090cb1f96
|
|
@ -35,6 +35,7 @@
|
|||
, libXrender
|
||||
, libXtst
|
||||
, makeWrapper
|
||||
, ncurses5
|
||||
, nspr
|
||||
, nss
|
||||
, pciutils
|
||||
|
|
@ -141,9 +142,18 @@ let
|
|||
]}" \
|
||||
--set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
|
||||
--set FONTCONFIG_FILE ${fontsConf}
|
||||
|
||||
# AS launches LLDBFrontend with a custom LD_LIBRARY_PATH
|
||||
wrapProgram $out/bin/lldb/bin/LLDBFrontend --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
|
||||
ncurses5
|
||||
zlib
|
||||
]}"
|
||||
'';
|
||||
};
|
||||
|
||||
# Causes the shebangs in interpreter scripts deployed to mobile devices to be patched, which Android does not understand
|
||||
dontPatchShebangs = true;
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = drvName;
|
||||
exec = pname;
|
||||
|
|
@ -161,7 +171,7 @@ let
|
|||
fhsEnv = buildFHSUserEnv {
|
||||
name = "${drvName}-fhs-env";
|
||||
multiPkgs = pkgs: [
|
||||
pkgs.ncurses5
|
||||
ncurses5
|
||||
|
||||
# Flutter can only search for certs Fedora-way.
|
||||
(runCommand "fedoracert" {}
|
||||
|
|
|
|||
|
|
@ -8,10 +8,12 @@ stdenv.mkDerivation rec {
|
|||
url = {
|
||||
"i686-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip";
|
||||
"x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";
|
||||
"aarch64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_arm_v${version}.zip";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
sha256 = {
|
||||
"i686-linux" = "teoxscan+EZ76Q0sfKT6nt1w/LSsmDoiN2oh+NGO/4A=";
|
||||
"x86_64-linux" = "nRK2GSwhQe5OgcAdR1fg0vUp3fzEkhwU/teIwsEEemw=";
|
||||
"aarch64-linux" = "0932bspm1likky1n0rg15d01gspkm1fns2ma82qyb91yr6d18ddk";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
stripRoot = false;
|
||||
} else fetchurl {
|
||||
|
|
@ -46,6 +48,6 @@ stdenv.mkDerivation rec {
|
|||
downloadPage = "https://app-updates.agilebits.com/product_history/CLI";
|
||||
maintainers = with maintainers; [ joelburget marsam ];
|
||||
license = licenses.unfree;
|
||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@
|
|||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "90.0.4408.0",
|
||||
"sha256": "0bg16nz65j13a8sdzrzkmbidlglh7bz7y8s4bi68il9ppbffw3k4",
|
||||
"sha256bin64": "0ad2xif8ng71ian07vb8h3jsd5wh95xndja43vwswc3072zk5h05",
|
||||
"version": "90.0.4412.3",
|
||||
"sha256": "1yjpfircdl38nrjh3an469g7q8178jyvawkfpnzc5aqsgkpkl442",
|
||||
"sha256bin64": "1asdjicb4l4l2ak3fkxcwdx1avpc1m8wvyhxmj1k3bqa4qmvz3hz",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-01-25",
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kube3d";
|
||||
version = "4.1.1";
|
||||
version = "4.2.0";
|
||||
|
||||
excludedPackages = "tools";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildGoModule rec {
|
|||
owner = "rancher";
|
||||
repo = "k3d";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZdPBlGlrgSJQlp6sWUeXm34+O30WtXHy5hvye40qew0=";
|
||||
sha256 = "sha256-R2RbQlceOD/uY3IdLLiM23gESh/oWnsiTWxHeH/Si18=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
{ callPackage
|
||||
, buildGoPackage
|
||||
, nvidia_x11
|
||||
, nvidiaGpuSupport
|
||||
}:
|
||||
|
||||
callPackage ./generic.nix {
|
||||
inherit buildGoPackage nvidia_x11 nvidiaGpuSupport;
|
||||
version = "0.11.8";
|
||||
sha256 = "1dhh07bifr02jh2lls8fv1d9ra67ymgh8qxqvpvm0cd0qdd469z1";
|
||||
}
|
||||
|
|
@ -6,6 +6,6 @@
|
|||
|
||||
callPackage ./generic.nix {
|
||||
inherit buildGoPackage nvidia_x11 nvidiaGpuSupport;
|
||||
version = "0.12.9";
|
||||
sha256 = "1a0ig6pb0z3qp7zk4jgz3h241bifmjlyqsfikyy3sxdnzj7yha27";
|
||||
version = "0.12.10";
|
||||
sha256 = "12hlzjkay7y1502nmfvq2qkhp9pq7vp4zxypawnh98qvxbzv149l";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,6 @@
|
|||
|
||||
callPackage ./generic.nix {
|
||||
inherit buildGoPackage nvidia_x11 nvidiaGpuSupport;
|
||||
version = "1.0.2";
|
||||
sha256 = "1l9j6k5dzh9ym9j75mam10vd9b5qh4xqfj6d63bjp7gkk4hd1jxx";
|
||||
version = "1.0.3";
|
||||
sha256 = "142rwpli8mbyg4vhhybnym34rk9w1ns4ddfhqjr1ygmxb1rlsngi";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "seaweedfs";
|
||||
version = "2.23";
|
||||
version = "2.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chrislusf";
|
||||
repo = "seaweedfs";
|
||||
rev = version;
|
||||
sha256 = "sha256-MMFVJoiVrA0zy4RM2nyhlu/JfnzIRpxrA3N1jm2R0jI=";
|
||||
sha256 = "sha256-nz45vCRhWhgVG2pMA6TZVUIS4d9qBWW7NtTHuEsn4pg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-UucbEBjIKRbZFd99BsnG6AAEIQ13+vzKe61k6ZPvE0A=";
|
||||
vendorSha256 = "sha256-v0wFlwODZt3LC+yTuNS1hAAkoedVPfTeEIvs6rUGUa4=";
|
||||
|
||||
subPackages = [ "weed" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ fetchurl, lib, stdenv, substituteAll
|
||||
, libtool, gettext, zlib, bzip2, flac, libvorbis
|
||||
, exiv2, libgsf, rpm, pkg-config, fetchpatch
|
||||
, exiv2, libgsf, rpm, pkg-config
|
||||
, gstreamerSupport ? true, gst_all_1 ? null
|
||||
# ^ Needed e.g. for proper id3 and FLAC support.
|
||||
# Set to `false` to decrease package closure size by about 87 MB (53%).
|
||||
|
|
@ -20,28 +20,15 @@ assert gtkSupport -> glib != null && gtk3 != null;
|
|||
assert videoSupport -> ffmpeg_3 != null && libmpeg2 != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libextractor-1.9";
|
||||
pname = "libextractor";
|
||||
version = "1.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libextractor/${name}.tar.gz";
|
||||
sha256 = "1zz2zvikvfibxnk1va3kgzs7djsmiqy7bmk8y01vbsf54ryjb3zh";
|
||||
url = "mirror://gnu/libextractor/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-FvYzq4dGo4VHxKHaP0WRGSsIJa2DxDNvBXW4WEPYvY8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-gcc8-build.patch
|
||||
# Fixes build with exiv2 0.27
|
||||
(fetchpatch {
|
||||
name = "libextractor-exiv2-0.27.patch";
|
||||
url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/libextractor-exiv2-0.27.patch?h=packages/libextractor&id=4dc53f7fc69210ae571285dface108ed65d8ee53";
|
||||
sha256 = "0w4gc1q1m1yxsd4hv105nblmif465nw3g5nxzldy0x2rl9mdncg6";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2019-15531.patch";
|
||||
url = "https://git.gnunet.org/libextractor.git/patch/?id=d2b032452241708bee68d02aa02092cfbfba951a";
|
||||
sha256 = "01xhcjbzv6p53wz7y2ii76kb8m9iwvnm4ip9w4a0bpgaxqz4b9fw";
|
||||
excludes = [ "ChangeLog" ];
|
||||
})
|
||||
] ++ lib.optionals gstreamerSupport [
|
||||
patches = lib.optionals gstreamerSupport [
|
||||
|
||||
# Libraries cannot be wrapped so we need to hardcode the plug-in paths.
|
||||
(substituteAll {
|
||||
|
|
@ -76,12 +63,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Checks need to be run after "make install", otherwise plug-ins are not in
|
||||
# the search path, etc.
|
||||
# FIXME: Tests currently fail and the test framework appears to be deeply
|
||||
# broken anyway.
|
||||
doCheck = false;
|
||||
#postInstall = "make check";
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = "make check";
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Simple library for keyword extraction";
|
||||
|
||||
longDescription =
|
||||
|
|
@ -105,9 +91,9 @@ stdenv.mkDerivation rec {
|
|||
additional MIME types are detected.
|
||||
'';
|
||||
|
||||
license = lib.licenses.gpl2Plus;
|
||||
license = licenses.gpl3Plus;
|
||||
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ maintainers.jorsn ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
diff --git a/src/plugins/ole2_extractor.c b/src/plugins/ole2_extractor.c
|
||||
index 072ffc5..a105840 100644
|
||||
--- a/src/plugins/ole2_extractor.c
|
||||
+++ b/src/plugins/ole2_extractor.c
|
||||
@@ -345,9 +345,8 @@ process_star_office (GsfInput *src,
|
||||
gsf_input_read (src, size, (unsigned char*) buf);
|
||||
if ( (buf[0] != 0x0F) ||
|
||||
(buf[1] != 0x0) ||
|
||||
- (0 != strncmp (&buf[2],
|
||||
- "SfxDocumentInfo",
|
||||
- strlen ("SfxDocumentInfo"))) ||
|
||||
+ (0 != strcmp (&buf[2],
|
||||
+ "SfxDocumentInfo")) ||
|
||||
(buf[0x11] != 0x0B) ||
|
||||
(buf[0x13] != 0x00) || /* pw protected! */
|
||||
(buf[0x12] != 0x00) )
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
buildGoModule rec {
|
||||
pname = "ytt";
|
||||
version = "0.30.0";
|
||||
version = "0.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "carvel-ytt";
|
||||
rev = "v${version}";
|
||||
sha256 = "0v9wp15aj4r7wif8i897zwj3c6bg41b95kk7vi3a3bzin814qn6l";
|
||||
sha256 = "sha256-GXnhI8nd4ciFd22989ypqGy5pozKJm+dzg8MaDDvuZg=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apt-cacher-ng";
|
||||
version = "3.5";
|
||||
version = "3.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz";
|
||||
sha256 = "0h76n02nnpg7ir9247qrxb8p4d4p282nh13zrv5bb9sfm12pril2";
|
||||
sha256 = "sha256-/4jA5acNpHpdQ9kb/1A9thtoUCqsYFxSCr4JLmFYdt4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake doxygen pkg-config ];
|
||||
|
|
|
|||
|
|
@ -11,15 +11,15 @@
|
|||
, zlib
|
||||
}: stdenv.mkDerivation rec {
|
||||
name = "roon-server";
|
||||
version = "100700710";
|
||||
version = "100800753";
|
||||
|
||||
# N.B. The URL is unstable. I've asked for them to provide a stable URL but
|
||||
# they have ignored me. If this package fails to build for you, you may need
|
||||
# to update the version and sha256.
|
||||
# c.f. https://community.roonlabs.com/t/latest-roon-server-is-not-available-for-download-on-nixos/118129
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20210202130624/https://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2";
|
||||
sha256 = "sha256-S1c3RvN/HE8zwpGZARYRy/Gu4OTG0CjWbxJhZ3cKoVE=";
|
||||
url = "https://web.archive.org/web/20210209195555/https://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2";
|
||||
sha256 = "sha256-uas1vqIDWlYr7jgsrlBeJSPjMxwzVnrkCD9jJljkFZs=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "stripe-cli";
|
||||
version = "1.5.8";
|
||||
version = "1.5.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stripe";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TE6+X2UEvHyUiPB61JA9JHCJTDOvHhyt5A44cgd2Meo=";
|
||||
sha256 = "sha256-fR4MFEytYZA4zt4WFGnEp9YDCtX6peQoI+NynqyReT8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-GQACtHTid1Aq5iSQqks10hmGS+VUlwNoM1LG+liynhU=";
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bacula";
|
||||
version = "11.0.0";
|
||||
version = "11.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz";
|
||||
sha256 = "JmBTwI/wUEytkhu0SYbTX6/dDQG6xvN2odEYTVpztok=";
|
||||
sha256 = "sha256-Lr2c24hZU8A/Cd8xGA7rfqga67ghz0XJ/cs/z/hSlPU=";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql sqlite zlib ncurses openssl readline ]
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "z-lua";
|
||||
version = "1.8.10";
|
||||
version = "1.8.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skywind3000";
|
||||
repo = "z.lua";
|
||||
rev = version;
|
||||
sha256 = "0q0qs07kmkpjv68j2bjgsrv6shl76mssnchfv82vjf8abkf8343b";
|
||||
sha256 = "sha256-k3Q4Fc2T7ElZb98+DVodC7zMHv5yfdwOIkSk0k04WCo=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -55,10 +55,10 @@ let inherit (lib) optionals; in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "connman";
|
||||
version = "1.38";
|
||||
version = "1.39";
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz";
|
||||
sha256 = "0awkqigvhwwxiapw0x6yd4whl465ka8a4al0v2pcqy9ggjlsqc6b";
|
||||
sha256 = "sha256-n2KnFpt0kcZwof8uM1sNlmMI+y9i4oXHgRBeuQ8YGvM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "1password";
|
||||
version = "0.9.11-3";
|
||||
version = "0.9.12-3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
|
||||
hash = "sha256-vkW0LphgJsIVsdI7CjA2hOvxnjO77GA5eEKElIR4PkU=";
|
||||
hash = "sha256-IK4BuZKM2U8vz7m8waJhoh3tQ539wGLcIDNiYGUou24=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -13,7 +13,9 @@ buildGoModule rec {
|
|||
|
||||
vendorSha256 = null;
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X pkg.Version=v${version}" ];
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.version=v${version}" ];
|
||||
|
||||
subPackages = [ "cmd/aws-iam-authenticator" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/kubernetes-sigs/aws-iam-authenticator";
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@ let
|
|||
++ recommendedDisplayInformationPrograms;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "inxi";
|
||||
version = "3.3.00-1";
|
||||
version = "3.3.01-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smxi";
|
||||
repo = "inxi";
|
||||
rev = version;
|
||||
sha256 = "sha256-P1AYo4Ao9lDxJXyZd64wBxNgQIvEcT00ThjtcB2v52I=";
|
||||
sha256 = "sha256-wY9wsxBByxqy9qk/7UoKiUSpFGS1rFpdyTs3ig6OJRs=";
|
||||
};
|
||||
|
||||
buildInputs = [ perl makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mark";
|
||||
version = "5.0";
|
||||
version = "5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovetskiy";
|
||||
repo = "mark";
|
||||
rev = version;
|
||||
sha256 = "sha256-PN7YSpTl7RoW5zgoYjXHDFB6sTroSA3TNpTCsOsdB34=";
|
||||
sha256 = "sha256-bjDQwtIsY+Dvv270DACvyU+MNPyI7EZcob6F/aebVac=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-1YQD+QwCOAPOsj946DNF92LYKfRgXZXcfhIADP8s2CY=";
|
||||
vendorSha256 = "sha256-l6zHsis2fais5HQJQdfsSC0sPdcF4BeWoUznpl3Fh1g=";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6511,16 +6511,13 @@ in
|
|||
|
||||
noip = callPackage ../tools/networking/noip { };
|
||||
|
||||
nomad = nomad_0_12;
|
||||
nomad = nomad_1_0;
|
||||
|
||||
# Nomad never updates major go versions within a release series and is unsupported
|
||||
# on Go versions that it did not ship with. Due to historic bugs when compiled
|
||||
# with different versions we pin Go for all versions.
|
||||
nomad_0_11 = callPackage ../applications/networking/cluster/nomad/0.11.nix {
|
||||
buildGoPackage = buildGo114Package;
|
||||
inherit (linuxPackages) nvidia_x11;
|
||||
nvidiaGpuSupport = config.cudaSupport or false;
|
||||
};
|
||||
# Upstream partially documents used Go versions here
|
||||
# https://github.com/hashicorp/nomad/blob/master/contributing/golang.md
|
||||
nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix {
|
||||
buildGoPackage = buildGo114Package;
|
||||
inherit (linuxPackages) nvidia_x11;
|
||||
|
|
|
|||
Loading…
Reference in a new issue