Merge branch 'staging-next' into staging

This commit is contained in:
Weijia Wang 2024-05-03 19:03:51 +02:00
commit b4617eb071
71 changed files with 2400 additions and 1598 deletions

View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "opustags";
version = "1.9.0";
version = "1.10.0";
src = fetchFromGitHub {
owner = "fmang";
repo = "opustags";
rev = version;
sha256 = "sha256-cRDyE6/nv8g0OWxZ/AqfwVrk3cSIycvbjvQm9CyQK7g=";
sha256 = "sha256-2t6fhA1s1sKpHTmaMtK+DZ8xLpS6ntq33b4ycuMc8x8=";
};

View File

@ -13,6 +13,7 @@
, miniupnpc
, zeromq
, zlib
, db48
, sqlite
, qrencode
, qtbase ? null
@ -51,6 +52,8 @@ stdenv.mkDerivation rec {
buildInputs = [ boost libevent miniupnpc zeromq zlib ]
++ lib.optionals withWallet [ sqlite ]
# building with db48 (for legacy descriptor wallet support) is broken on Darwin
++ lib.optionals (withWallet && !stdenv.isDarwin) [ db48 ]
++ lib.optionals withGui [ qrencode qtbase qttools ];
postInstall = ''

View File

@ -16,7 +16,7 @@
}:
let
rev = "977d344e2e930f3680990014f84ca94877d6eebf";
rev = "75b1431c1e0f6c221dbfdb0ecd0f62f183b02254";
python = python3.withPackages (ps: with ps; [
epc
orjson
@ -28,13 +28,13 @@ let
in
melpaBuild {
pname = "lsp-bridge";
version = "20240424.1125";
version = "20240502.2306";
src = fetchFromGitHub {
owner = "manateelazycat";
repo = "lsp-bridge";
inherit rev;
hash = "sha256-moG0BaHHN3ySON4aMza43Ub4GKuGV9mGSzC48xoiPl8=";
hash = "sha256-8MqGwHVBE+87IQfsUA6b3ffrVWjypiH3shwELBCUBDQ=";
};
commit = rev;

View File

@ -30,21 +30,21 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "14m9w7wkg1704apd4d46yi6zwdlbrx2rp3fry9ffk2nn6kkahwk2";
x86_64-darwin = "1cp74wdkva1zib04wxjby0h8r1c56g893kq5ksdj38404i2c5hdk";
aarch64-linux = "00yrdmi4c5m8r11gm7vw18qb5ddcwwg5mdk8s9ykzhmxhdrkcarm";
aarch64-darwin = "1jjhw60jcvj5brayarg8k6avxwaa00mwdn4lrkcdzbzzh1q4knvv";
armv7l-linux = "1jddc3fsv65mp95ybpprx8sz3mpnp6j2ghp4nflky8iawmzz183v";
x86_64-linux = "0hy1ppv7wzyy581k3skmckaas0lwkx5l6w4hk1ml5f2cpkkxhq5w";
x86_64-darwin = "1mybfp2hg93wp3iwgwgkh84gcaj1vgs3gkmgb5yp38jhwxj5wrhk";
aarch64-linux = "16d0qqm7fm1bm58n7n2cscs619mbxr0bbglgz3prr2cmr7bwmx87";
aarch64-darwin = "1pp668rf5a06rdb8fd06ajrzxp02z7v6lmr3y77i5n2hs5xnpm0b";
armv7l-linux = "1cqhlm64gw08rn45ryizx1vypyybsrm9v8piapym5clwswbaxqs5";
}.${system} or throwSystem;
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.88.1";
version = "1.89.0";
pname = "vscode" + lib.optionalString isInsiders "-insiders";
# This is used for VS Code - Remote SSH test
rev = "e170252f762678dec6ca2cc69aba1570769a5d39";
rev = "b58957e67ee1e712cebf466b995adf4c5307b2bd";
executableName = "code" + lib.optionalString isInsiders "-insiders";
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@ -68,7 +68,7 @@ in
src = fetchurl {
name = "vscode-server-${rev}.tar.gz";
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
sha256 = "100nhm231gzav24lz84vxwxnqkn777kfn0fkkjmdcd30kc7g7ig9";
sha256 = "17563d413czlqpy3921gq5ja7mi3lgb8yjgvsqfn3fkaj70gr1hq";
};
};

View File

@ -46,13 +46,13 @@ let
in stdenv.mkDerivation rec {
pname = "cemu";
version = "2.0-79";
version = "2.0-80";
src = fetchFromGitHub {
owner = "cemu-project";
repo = "Cemu";
rev = "v${version}";
hash = "sha256-vSZLiRzOOJJMgycjI5xpgJcUAj5WCz241mAABgNuECw=";
hash = "sha256-uNGRiotitt+fWpJFCno04XiCSD1p38QEqw042Bq/IGc=";
};
patches = [

View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "cotp";
version = "1.5.0";
version = "1.6.0";
src = fetchFromGitHub {
owner = "replydev";
repo = "cotp";
rev = "v${version}";
hash = "sha256-Zs/RUpyu8GG4koprC+8aSzpPUSLc19p/XinY5fR5Z4A=";
hash = "sha256-X3o3KgTHnhekdiSFdrCwLOrd0HKvCd8Z5jR2WpY1D6Q=";
};
cargoHash = "sha256-jYKu1sAzPUfv8gQj3V4zxarRj3XUhyD/5n1WqMuLF/g=";
cargoHash = "sha256-zaVNfgWXqHQaogGTaR1eE5u3gYU9SQ0nk0VO7NL5mvg=";
buildInputs = lib.optionals stdenv.isLinux [ libxcb ]
++ lib.optionals stdenv.isDarwin [ AppKit ];

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "hcl2json";
version = "0.6.2";
version = "0.6.3";
src = fetchFromGitHub {
owner = "tmccombs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lnmWIyS1byXvShR1/ej8PAuo+WJBEBykQwJ79439Fus=";
sha256 = "sha256-RBzx6TxkR6GwMGHIpkJeswZ3zV4hRf38rTGUO6u2OI4=";
};
vendorHash = "sha256-HbdectUQgyQZ9qcfBarwRTF3VjzSqaM2vhVekThv2+k=";
vendorHash = "sha256-G/2bSFCXbph0bVjmWmcFgv4i/pCOQHhYxsVRVkpHPo4=";
subPackages = [ "." ];

View File

@ -1,4 +1,4 @@
{ lib, stdenv, patchelf, makeWrapper
{ lib, stdenv, patchelf, makeWrapper, fetchurl
# Linked dynamic libraries.
, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, nss, nspr
@ -28,15 +28,9 @@
## Gentoo
, bzip2, libcap
# Which distribution channel to use.
, channel ? "stable"
# Necessary for USB audio devices.
, pulseSupport ? true, libpulseaudio
# Only needed for getting information about upstream binaries
, chromium
, gsettings-desktop-schemas
, gnome
@ -52,8 +46,6 @@ let
withCustomModes = true;
};
version = chromium.upstream-info.version;
deps = [
glib fontconfig freetype pango cairo libX11 libXi atk nss nspr
libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb
@ -70,18 +62,14 @@ let
++ lib.optional libvaSupport libva
++ [ gtk3 gtk4 ];
suffix = lib.optionalString (channel != "stable") "-${channel}";
in stdenv.mkDerivation (finalAttrs: {
pname = "google-chrome";
version = "124.0.6367.118";
crashpadHandlerBinary = if lib.versionAtLeast version "94"
then "chrome_crashpad_handler"
else "crashpad_handler";
in stdenv.mkDerivation {
inherit version;
name = "google-chrome${suffix}-${version}";
src = chromium.chromeSrc;
src = fetchurl {
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-H3bv6WiVBl4j38ROZ80+SD9UO9ok+xxcKFxDd9yjWNY=";
};
nativeBuildInputs = [ patchelf makeWrapper ];
buildInputs = [
@ -103,11 +91,8 @@ in stdenv.mkDerivation {
installPhase = ''
runHook preInstall
case ${channel} in
beta) appname=chrome-beta dist=beta ;;
dev) appname=chrome-unstable dist=unstable ;;
*) appname=chrome dist=stable ;;
esac
appname=chrome
dist=stable
exe=$out/bin/google-chrome-$dist
@ -149,7 +134,7 @@ in stdenv.mkDerivation {
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
--add-flags ${lib.escapeShellArg commandLineArgs}
for elf in $out/share/google/$appname/{chrome,chrome-sandbox,${crashpadHandlerBinary}}; do
for elf in $out/share/google/$appname/{chrome,chrome-sandbox,chrome_crashpad_handler}; do
patchelf --set-rpath $rpath $elf
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf
done
@ -162,13 +147,8 @@ in stdenv.mkDerivation {
homepage = "https://www.google.com/chrome/browser/";
license = licenses.unfree;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ primeos ];
# Note from primeos: By updating Chromium I also update Google Chrome and
# will try to merge PRs and respond to issues but I'm not actually using
# Google Chrome.
maintainers = with maintainers; [ jnsgruk ];
platforms = [ "x86_64-linux" ];
mainProgram =
if (channel == "dev") then "google-chrome-unstable"
else "google-chrome-${channel}";
mainProgram = "google-chrome-stable";
};
}
})

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "atmos";
version = "1.70.0";
version = "1.71.0";
src = fetchFromGitHub {
owner = "cloudposse";
repo = pname;
rev = "v${version}";
sha256 = "sha256-NmgInrjCcMoSjSCotGU38URP7FNMaFs3N2g49Y/fXSw=";
sha256 = "sha256-RnBMVVbZQrJ85uPVLniNjpcledYnOyu5zxIYsvV63qk=";
};
vendorHash = "sha256-dJJPq2HcGZ+MqtJ848gsrvzD1rMVrwJQKwq+UpZsFB0=";
vendorHash = "sha256-dcQWD6UrsSPJZzasovBSXUKaXvL9mZF6cLp458Ia8O4=";
ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ];

View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "kubeone";
version = "1.7.3";
version = "1.7.4";
src = fetchFromGitHub {
owner = "kubermatic";
repo = "kubeone";
rev = "v${version}";
hash = "sha256-m2RxSKXiKmx1p5g+C8I/l+OtV7wy2KtrFRIK+h9L5lo=";
hash = "sha256-GK5SEQjQb553MypcRpTfmewVhucP1fRldpXhfLERkMo=";
};
vendorHash = "sha256-vUy60CBrdhB9OFMZ4+q05WtrtN4/5ssozYGBV7r4BsM=";
vendorHash = "sha256-pt3EWohdXOBgE3SfEEODUi1uX/X+jJ2JrBbLFIXDbwY=";
ldflags = [
"-s"

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubeshark";
version = "52.2.39";
version = "52.3.0";
src = fetchFromGitHub {
owner = "kubeshark";
repo = "kubeshark";
rev = "v${version}";
hash = "sha256-ji/WOCqZOIaUc+mS2zaMNjWxSgv68DGjtWxgtJCH2C4=";
hash = "sha256-7tTXhILWnYRFyKBw1Im9Q9/oqlKJAP478qiBEoTUGMc=";
};
vendorHash = "sha256-SmvO9DYOXxnmN2dmHPPOguVwEbWSH/xNLBB+idpzopo=";

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "yor";
version = "0.1.192";
version = "0.1.193";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-J3hygbjpJ+etYcOHRKkuPPF2oquLWgWnps8chcU3uUU=";
hash = "sha256-6IdCnuW49DVeOJKBD6AYxr2kbv7CmpFReja3PweDSmU=";
};
vendorHash = "sha256-uT/jGD4hDVes4h+mlSIT2p+C9TjxnUWsmKv9haPjjLc=";

View File

@ -69,14 +69,12 @@ let
then ./linux.nix
else ./darwin.nix;
openasar = callPackage ./openasar.nix { };
packages = (
builtins.mapAttrs
(_: value:
callPackage package (value
// {
inherit src version openasar branch;
inherit src version branch;
meta = meta // { mainProgram = value.binaryName; };
}))
{

View File

@ -11,16 +11,16 @@
buildGoModule rec {
pname = "trayscale";
version = "0.11.2";
version = "0.12.0";
src = fetchFromGitHub {
owner = "DeedleFake";
repo = "trayscale";
rev = "v${version}";
hash = "sha256-Og/ilxWNB5TNqnViZ5TeE0P+RxG1JOP2q9jo91SBNZQ=";
hash = "sha256-GAK95XlRVGpoVcEmeFO3SddHpdn0qO7qs2IOj7qzRXQ=";
};
vendorHash = "sha256-eIakjEYfVp2wfXu0oqBmd5hJZTp0xgYKNNbtpRBnT2w=";
vendorHash = "sha256-Iedd8WsJPAVQexRqDSLAmv7MAWc4IFQXHk6XpnStMps=";
subPackages = [ "cmd/trayscale" ];

View File

@ -14,8 +14,6 @@ appimageTools.wrapType2 rec {
extraInstallCommands =
let appimageContents = appimageTools.extract { inherit pname version src; };
in ''
mv $out/bin/${pname}-${version} $out/bin/${pname}
install -Dm 444 ${appimageContents}/clockify.desktop -t $out/share/applications
install -Dm 444 ${appimageContents}/clockify.png -t $out/share/pixmaps

View File

@ -190,6 +190,8 @@ python.pkgs.buildPythonApplication rec {
installPhase = let
pythonPath = python.pkgs.makePythonPath propagatedBuildInputs;
in ''
runHook preInstall
mkdir -p $out/lib/paperless-ngx
cp -r {src,static,LICENSE,gunicorn.conf.py} $out/lib/paperless-ngx
ln -s ${frontend}/lib/paperless-ui/frontend $out/lib/paperless-ngx/static/
@ -200,6 +202,8 @@ python.pkgs.buildPythonApplication rec {
makeWrapper ${python.pkgs.celery}/bin/celery $out/bin/celery \
--prefix PYTHONPATH : "${pythonPath}:$out/lib/paperless-ngx/src" \
--prefix PATH : "${path}"
runHook postInstall
'';
postFixup = ''

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "eprover";
version = "3.0.03";
version = "3.1";
src = fetchurl {
url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz";
hash = "sha256-cS5zUe2N9Kd9uzbNpeBtvLbgUN0c3N3tGcYczK3KsdQ=";
hash = "sha256-+E2z7JAkiNXhZrWRXFbhI5f9NmB0Q4eixab4GlAFqYY=";
};
buildInputs = [ which ];

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng
{ lib, stdenv, fetchurl, fetchpatch, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng
, libtiff, ncurses, pango, pcre2, perl, readline, tcl, texlive, texliveSmall, tk, xz, zlib
, less, texinfo, graphviz, icu, pkg-config, bison, imake, which, jdk, blas, lapack
, curl, Cocoa, Foundation, libobjc, libcxx, tzdata
@ -37,6 +37,12 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
./no-usr-local-search-paths.patch
(fetchpatch {
# https://hiddenlayer.com/research/r-bitrary-code-execution/
name = "CVE-2024-27322.patch";
url = "https://github.com/r-devel/r-svn/commit/f7c46500f455eb4edfc3656c3fa20af61b16abb7.patch";
hash = "sha256-CH2mMmie9E96JeGSC7UGm7/roUNhK5xv6HO53N2ixEI=";
})
];
# Test of the examples for package 'tcltk' fails in Darwin sandbox. See:

View File

@ -1,38 +0,0 @@
From bc359e8f51a17ba759121339e87e90eed16e98fe Mon Sep 17 00:00:00 2001
From: Yaya <mak@nyantec.com>
Date: Tue, 20 Jun 2023 10:01:23 +0000
Subject: [PATCH] Disable inmemory storage driver test
---
.../storage/driver/inmemory/driver_test.go | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 registry/storage/driver/inmemory/driver_test.go
diff --git a/registry/storage/driver/inmemory/driver_test.go b/registry/storage/driver/inmemory/driver_test.go
deleted file mode 100644
index dbc1916f..00000000
--- a/registry/storage/driver/inmemory/driver_test.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package inmemory
-
-import (
- "testing"
-
- storagedriver "github.com/docker/distribution/registry/storage/driver"
- "github.com/docker/distribution/registry/storage/driver/testsuites"
- "gopkg.in/check.v1"
-)
-
-// Hook up gocheck into the "go test" runner.
-func Test(t *testing.T) { check.TestingT(t) }
-
-func init() {
- inmemoryDriverConstructor := func() (storagedriver.StorageDriver, error) {
- return New(), nil
- }
- testsuites.RegisterSuite(inmemoryDriverConstructor, testsuites.NeverSkip)
-}
--
2.40.1

View File

@ -15,11 +15,10 @@ buildGoModule rec {
vendorHash = "sha256-KZWdM8Q8ipsgm7OoLyOuHo+4Vg2Nve+yZtTSUDgjOW4=";
patches = [
./Disable-inmemory-storage-driver-test.patch
];
postPatch = ''
# Disable flaky inmemory storage driver test
rm registry/storage/driver/inmemory/driver_test.go
substituteInPlace health/checks/checks_test.go \
--replace \
'func TestHTTPChecker(t *testing.T) {' \

View File

@ -118,11 +118,11 @@ in stdenv.mkDerivation {
# we don't take any chances and only apply it if people actually want to use KVM support.
++ optional enableKvm (fetchpatch
(let
patchVersion = "20240325";
patchVersion = "20240502";
in {
name = "virtualbox-${version}-kvm-dev-${patchVersion}.patch";
url = "https://github.com/cyberus-technology/virtualbox-kvm/releases/download/dev-${patchVersion}/kvm-backend-${version}-dev-${patchVersion}.patch";
hash = "sha256-D1ua8X5Iyw/I89PtskiGdnGr4NhdFtI93ThltiOcu8w=";
hash = "sha256-KokIrrAoJutHzPg6e5YAJgDGs+nQoVjapmyn9kG5tV0=";
}))
++ [
./qt-dependency-paths.patch

View File

@ -163,8 +163,10 @@ let
inherit (go) GOOS GOARCH;
GOFLAGS = GOFLAGS
++ lib.optional (!proxyVendor) "-mod=vendor"
++ lib.optional (!allowGoReference) "-trimpath";
++ lib.warnIf (lib.any (lib.hasPrefix "-mod=") GOFLAGS) "use `proxyVendor` to control Go module/vendor behavior instead of setting `-mod=` in GOFLAGS"
(lib.optional (!proxyVendor) "-mod=vendor")
++ lib.warnIf (builtins.elem "-trimpath" GOFLAGS) "`-trimpath` is added by default to GOFLAGS by buildGoModule when allowGoReference isn't set to true"
(lib.optional (!allowGoReference) "-trimpath");
inherit CGO_ENABLED enableParallelBuilding GO111MODULE GOTOOLCHAIN;
# If not set to an explicit value, set the buildid empty for reproducibility.
@ -196,7 +198,12 @@ let
runHook postConfigure
'');
buildPhase = args.buildPhase or (''
buildPhase = args.buildPhase or (
lib.warnIf (buildFlags != "" || buildFlagsArray != "")
"`buildFlags`/`buildFlagsArray` are deprecated and will be removed in the 24.11 release. Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`"
lib.warnIf (builtins.elem "-buildid=" ldflags)
"`-buildid=` is set by default as ldflag by buildGoModule"
''
runHook preBuild
exclude='\(/_\|examples\|Godeps\|testdata'
@ -313,9 +320,4 @@ let
} // meta;
});
in
lib.warnIf (buildFlags != "" || buildFlagsArray != "")
"`buildFlags`/`buildFlagsArray` are deprecated and will be removed in the 24.11 release. Use the `ldflags` and/or `tags` attributes instead"
lib.warnIf (builtins.elem "-buildid=" ldflags) "`-buildid=` is set by default as ldflag by buildGoModule"
lib.warnIf (builtins.elem "-trimpath" GOFLAGS) "`-trimpath` is added by default to GOFLAGS by buildGoModule when allowGoReference isn't set to true"
lib.warnIf (lib.any (lib.hasPrefix "-mod=") GOFLAGS) "use `proxyVendor` to control Go module/vendor behavior instead of setting `-mod=` in GOFLAGS"
package
package

View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "ast-grep";
version = "0.21.1";
version = "0.21.3";
src = fetchFromGitHub {
owner = "ast-grep";
repo = "ast-grep";
rev = version;
hash = "sha256-hR6DPkApHDlg91O040s+3FL2mEM3FH61pnyCBwwE6tw=";
hash = "sha256-vI40H+hLR1OR1Nark9NL4YWbx/ZElYTk651+COJQF9o=";
};
cargoHash = "sha256-Iqq7F8PCrNhFGvrfbYQn3mdOwiokCmTKCaXjOHvD8V0=";
cargoHash = "sha256-bjBi8gcTT0tjnq+WSET3ywAvugJCdRXWYL8G6rJcxe4=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -8,13 +8,13 @@
}:
stdenvNoCC.mkDerivation rec {
pname = "cosmic-icons";
version = "unstable-2024-02-22";
version = "0-unstable-2024-05-02";
src = fetchFromGitHub {
owner = "pop-os";
repo = pname;
rev = "ee87327736728a9fb5a70c8688e9000f72829343";
sha256 = "sha256-W4t5uTkiOVGGHZEqD5tGbEPhHbNZp5qnYYHDG8N70vQ=";
rev = "f48101c38db7e725d31591ec49896a2f525886e2";
sha256 = "sha256-M9n09uEM4ee8FZYTsaAu+8E0YRxQAGBvylKDHv1dp5M=";
};
nativeBuildInputs = [ just ];

View File

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "dep-scan";
version = "5.3.3";
version = "5.3.4";
pyproject = true;
src = fetchFromGitHub {
owner = "owasp-dep-scan";
repo = "dep-scan";
rev = "refs/tags/v${version}";
hash = "sha256-ehQsRTMoHr6LDXCka3/4YcyEKLN7DQW4mUp4nyid/aE=";
hash = "sha256-5iMhl3Wcxwgq4Wr0TUcAuRnb2+y8DHBugnnkpcZfSAM=";
};
postPatch = ''

View File

@ -10,11 +10,11 @@
}:
stdenv.mkDerivation rec {
pname = "guile-goblins";
version = "0.12.0";
version = "0.13.0";
src = fetchurl {
url = "https://spritely.institute/files/releases/guile-goblins/guile-goblins-${version}.tar.gz";
hash = "sha256-P5WKKv5i5Lrs4en+IWL40AkYAD+bgTyFdsQqE4FxPfA=";
hash = "sha256-efmyOtPAz1ZPdMCuVaGALR6e0lg7gcjt81BUMBVUKug=";
};
strictDeps = true;

View File

@ -2,16 +2,16 @@
buildNpmPackage rec {
pname = "inshellisense";
version = "0.0.1-rc.14";
version = "0.0.1-rc.15";
src = fetchFromGitHub {
owner = "microsoft";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-ZsEAE9EDJLREpKjHLbvqAUNM/y9eCH44g3D8NHYHiT4=";
hash = "sha256-/6pU8ubasONPMe1qnE+Db0nzdHRQTo9fhMr7Xxjgsos=";
};
npmDepsHash = "sha256-p0/GnAdWNM/wjB/w+rXbOrh3Hr/smIW0IVQga7uCKYY=";
npmDepsHash = "sha256-rOyvFA5X3o1TCgY54XxNSg0+QotA8IUauLngTtJuRj4=";
# Needed for dependency `@homebridge/node-pty-prebuilt-multiarch`
# On Darwin systems the build fails with,

View File

@ -0,0 +1,58 @@
{ lib
, fetchurl
, makeWrapper
, nextflow
, nf-test
, openjdk11
, stdenv
, testers
}:
stdenv.mkDerivation rec {
pname = "nf-test";
version = "0.8.4";
src = fetchurl {
url = "https://github.com/askimed/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
hash = "sha256-gCO75uNUKU+6UUST9CP4DnWGnl2vflH0y4CId/3IQ4E=";
};
sourceRoot = ".";
buildInputs = [
makeWrapper
];
nativeBuildInputs = [
nextflow
];
installPhase = ''
runHook preInstall
mkdir -p $out/share/nf-test
install -Dm644 nf-test.jar $out/share/nf-test
mkdir -p $out/bin
makeWrapper ${openjdk11}/bin/java $out/bin/nf-test \
--add-flags "-jar $out/share/nf-test/nf-test.jar" \
--prefix PATH : ${lib.makeBinPath nativeBuildInputs} \
runHook postInstall
'';
passthru.tests.version = testers.testVersion {
package = nf-test;
command = "nf-test version";
};
meta = with lib; {
description = "Simple test framework for Nextflow pipelines";
homepage = "https://www.nf-test.com/";
changelog = "https://github.com/askimed/nf-test/releases";
license = licenses.mit;
maintainers = with maintainers; [ rollf ];
mainProgram = "nf-test";
platforms = platforms.unix;
};
}

View File

@ -10,7 +10,7 @@
, nix-output-monitor
}:
let
version = "3.5.13";
version = "3.5.14";
runtimeDeps = [ nvd nix-output-monitor ];
in
rustPlatform.buildRustPackage {
@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
owner = "viperML";
repo = "nh";
rev = "refs/tags/v${version}";
hash = "sha256-lTy5gmB3dJZJKag2uuuxXvZCAt/RhLnI0jbIicBJfCo=";
hash = "sha256-4vXLHDj6TnEXjJIzEcToHQ+6Rp4EnMpOFHQ3Ypymh0s=";
};
strictDeps = true;
@ -47,7 +47,7 @@ rustPlatform.buildRustPackage {
--prefix PATH : ${lib.makeBinPath runtimeDeps}
'';
cargoHash = "sha256-X8+GmPFxvgeNxMuOacoCUCgdZ/+N4mwQFMUtvO1E998=";
cargoHash = "sha256-A2AFlm6Qs7IuR6LedapWx4RL0Ae5E7eSBJSMXjrONHE=";
passthru.updateScript = nix-update-script { };

View File

@ -1,14 +1,23 @@
{ lib, stdenv, fetchFromGitHub, nodejs, bash, asar, unzip }:
{
lib,
stdenv,
fetchFromGitHub,
unstableGitUpdater,
nodejs,
bash,
asar,
unzip,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "openasar";
version = "unstable-2023-10-24";
version = "0-unstable-2024-01-13";
src = fetchFromGitHub {
owner = "GooseMod";
repo = "OpenAsar";
rev = "eee9bab822e3dbd97a735d0050ddd41ba27917f2";
hash = "sha256-SSWQSqGgTZjowgrzF6qHZDTw/Y9xFHNTZvetxqZubYI=";
rev = "4f264d860a5a6a32e1862ce26178b9cf6402335d";
hash = "sha256-NPUUDqntsMxnT/RN5M9DtLDwJXDyjOED4GlXa1oU8l8=";
};
postPatch = ''
@ -23,7 +32,7 @@ stdenv.mkDerivation rec {
runHook preBuild
bash scripts/injectPolyfills.sh
substituteInPlace src/index.js --replace 'nightly' '${version}'
substituteInPlace src/index.js --replace 'nightly' '${finalAttrs.version}'
${nodejs}/bin/node scripts/strip.js
${asar}/bin/asar pack src app.asar
@ -40,11 +49,19 @@ stdenv.mkDerivation rec {
doCheck = false;
passthru.updateScript = unstableGitUpdater {
# Only has a "nightly" tag (untaged version 0.2 is latest) see https://github.com/GooseMod/OpenAsar/commit/8f79dcef9b1f7732421235a392f06e5bd7382659
hardcodeZeroVersion = true;
};
meta = with lib; {
description = "Open-source alternative of Discord desktop's \"app.asar\".";
homepage = "https://openasar.dev";
license = licenses.mit;
maintainers = with maintainers; [ ];
license = licenses.agpl3Only;
maintainers = with maintainers; [
Scrumplex
jopejoe1
];
platforms = nodejs.meta.platforms;
};
}
})

View File

@ -12,13 +12,13 @@
buildDotnetModule rec {
pname = "pupdate";
version = "3.10.1";
version = "3.10.2";
src = fetchFromGitHub {
owner = "mattpannella";
repo = "${pname}";
rev = "${version}";
hash = "sha256-xr5XD0V3kt4fDm8GNotGuttAeWwwlAr2iFA/RezvC4w=";
hash = "sha256-XPPbxlmwuM9q1NkeI8MX6w+ZbC272o2BPopQgkqU4Ek=";
};
buildInputs = [

View File

@ -10,11 +10,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "stats";
version = "2.10.10";
version = "2.10.11";
src = fetchurl {
url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg";
hash = "sha256-CdTY5Qv/xF9ItNgHQFqec5nKObnImx/+MuFShTfdrAo=";
hash = "sha256-vF32tDuSAZJrZ21iKtM+/2qk9WWoyMddrtg5wK2+IaI=";
};
sourceRoot = ".";

View File

@ -27,13 +27,13 @@ lib.checkListOfEnum "${pname}: grub screens" [ "1080p" "2k" "4k" ] grubScreens
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "2023-12-31";
version = "2024-04-28";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
hash = "sha256-tAby1nLRBdkVQy448BXloBw8oeYqN2aFEs0jahNI3jg=";
hash = "sha256-7P8dTPk0LwXU3e44TeechCNsxtzw+w01B56IWtCUcCI=";
};
nativeBuildInputs = [

View File

@ -29,7 +29,7 @@ compcert = mkCoqDerivation {
releaseRev = v: "v${v}";
defaultVersion = with lib.versions; lib.switch coq.version [
{ case = range "8.14" "8.19"; out = "3.13.1"; }
{ case = range "8.14" "8.19"; out = "3.14"; }
{ case = isEq "8.13" ; out = "3.10"; }
{ case = isEq "8.12" ; out = "3.9"; }
{ case = range "8.8" "8.11"; out = "3.8"; }
@ -43,6 +43,7 @@ compcert = mkCoqDerivation {
"3.12".sha256 = "sha256-hXkQ8UnAx3k50OJGBmSm4hgrnRFCosu4+PEMrcKfmV0=";
"3.13".sha256 = "sha256-ZedxgEPr1ZgKIcyhQ6zD1l2xr6RDNNUYq/4ZyR6ojM4=";
"3.13.1".sha256 = "sha256-ldXbuzVB0Z+UVTd5S4yGSg6oRYiKbXLMmUZcQsJLcns=";
"3.14".sha256 = "sha256-QXJMpp/BaPiK5okHeo2rcmXENToXKjB51UqljMHTDgw=";
};
strictDeps = true;

View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "guile-git";
version = "0.6.0";
version = "0.7.0";
src = fetchFromGitLab {
owner = "guile-git";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+GVGM9XOy8+nFChyJazRWsNBjS+HYUBnbUErCVkxZyg=";
sha256 = "sha256-7xKs5Biq9HHOJbNILLU1oX8oPuEbti0uLMiobKz//bU=";
};
strictDeps = true;

View File

@ -12,6 +12,7 @@
, MediaToolbox
, OpenGL
, Security
, SystemConfiguration
, VideoToolbox
, ipu6ep-camera-hal
, ipu6epmtl-camera-hal
@ -32,7 +33,7 @@
gst-plugins-viperfx = callPackage ./viperfx { };
gst-plugins-rs = callPackage ./rs { inherit Security; };
gst-plugins-rs = callPackage ./rs { inherit Security SystemConfiguration; };
gst-rtsp-server = callPackage ./rtsp-server { };

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchFromGitHub
, fetchpatch
, rustPlatform
, meson
@ -23,6 +24,7 @@
, openssl
, pango
, Security
, SystemConfiguration
, gst-plugins-good
, nix-update-script
# specifies a limited subset of plugins to build (the default `null` means all plugins supported on the stdenv platform)
@ -60,8 +62,8 @@ let
raptorq = [ ];
reqwest = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
rtp = [ ];
webrtc = [ gst-plugins-bad openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
webrtchttp = [ gst-plugins-bad openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
webrtc = [ gst-plugins-bad openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
webrtchttp = [ gst-plugins-bad openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
# text
textahead = [ ];
@ -79,7 +81,19 @@ let
# video
cdg = [ ];
closedcaption = [ pango ];
dav1d = [ dav1d ];
dav1d = [
# Only dav1d < 1.3 is supported for now.
# https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1393
(dav1d.overrideAttrs rec {
version = "1.2.1";
src = fetchFromGitHub {
owner = "videolan";
repo = "dav1d";
rev = version;
hash = "sha256-RrEim3HXXjx2RUU7K3wPH3QbhNTRN9ZX/oAcyE9aV8I=";
};
})
];
ffv1 = [ ];
gif = [ ];
gtk4 = [ gtk4 ];
@ -126,9 +140,9 @@ in
assert lib.assertMsg (invalidPlugins == [])
"Invalid gst-plugins-rs plugin${lib.optionalString (lib.length invalidPlugins > 1) "s"}: ${lib.concatStringsSep ", " invalidPlugins}";
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "gst-plugins-rs";
version = "0.11.0+fixup";
version = "0.12.4";
outputs = [ "out" "dev" ];
@ -136,8 +150,8 @@ stdenv.mkDerivation rec {
domain = "gitlab.freedesktop.org";
owner = "gstreamer";
repo = "gst-plugins-rs";
rev = version;
hash = "sha256-nvDvcY/WyVhcxitcoqgEUT8A1synZqxG2e51ct7Fgss=";
rev = finalAttrs.version;
hash = "sha256-Qnp+e1Vww2kWjDG0x2tcigwDdG67I4xnm8+QrBI+o08=";
# TODO: temporary workaround for case-insensitivity problems with color-name crate - https://github.com/annymosse/color-name/pull/2
postFetch = ''
sedSearch="$(cat <<\EOF | sed -ze 's/\n/\\n/g'
@ -162,12 +176,12 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"cairo-rs-0.18.1" = "sha256-k+YIAZXxejbxPQqbUU91qbx2AR98gTrseknLHtNZDEE=";
"cairo-rs-0.19.3" = "sha256-TjVXdnlYEfPLbUx1pC84rCC2MlNecECMK2Yo9XKwz9M=";
"color-name-1.1.0" = "sha256-RfMStbe2wX5qjPARHIFHlSDKjzx8DwJ+RjzyltM5K7A=";
"ffv1-0.0.0" = "sha256-af2VD00tMf/hkfvrtGrHTjVJqbl+VVpLaR0Ry+2niJE=";
"flavors-0.2.0" = "sha256-zBa0X75lXnASDBam9Kk6w7K7xuH9fP6rmjWZBUB5hxk=";
"gdk4-0.7.1" = "sha256-UMGmZivVdvmKRAjIGlj6pjDxwfNJyz8/6C0eYH1OOw4=";
"gstreamer-0.21.0" = "sha256-2uilK8wYG8e59fdL3q+kmixc1zw+EBwqvGs/EgfCGhk=";
"gdk4-0.8.1" = "sha256-VPmegFZ/bC8x1vkl3YU208jQ8FCEKLwe6ZDatz4mIvM=";
"gstreamer-0.22.4" = "sha256-r5+wOEhTVztDMEu6t47yJ9HIlbXyjdvswUND4l7kPl8=";
};
};
@ -202,36 +216,26 @@ stdenv.mkDerivation rec {
map (plugin: lib.mesonEnable plugin true) selectedPlugins
) ++ [
(lib.mesonOption "sodium-source" "system")
(lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck)
(lib.mesonEnable "doc" enableDocumentation)
];
# turn off all auto plugins since we use a list of plugins we generate
mesonAutoFeatures = "disabled";
doCheck = true;
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
# csound lib dir must be manually specified for it to build
# webrtc and webrtchttp plugins are the only that need gstreamer-webrtc (from gst-plugins-bad, a heavy set)
preConfigure = ''
export CARGO_BUILD_JOBS=$NIX_BUILD_CORES
patchShebangs dependencies.py
'' + lib.optionalString (lib.elem "csound" selectedPlugins) ''
export CSOUND_LIB_DIR=${lib.getLib csound}/lib
'' + lib.optionalString (lib.mutuallyExclusive [ "webrtc" "webrtchttp" ] selectedPlugins) ''
sed -i "/\['gstreamer-webrtc-1\.0', 'gst-plugins-bad', 'gstwebrtc_dep', 'gstwebrtc'\]/d" meson.build
'' + lib.optionalString (!gst-plugins-base.glEnabled) ''
sed -i "/\['gstreamer-gl-1\.0', 'gst-plugins-base', 'gst_gl_dep', 'gstgl'\]/d" meson.build
'';
# run tests ourselves to avoid meson timing out by default
checkPhase = ''
runHook preCheck
meson test --no-rebuild --verbose --timeout-multiplier 12
runHook postCheck
'';
# give meson longer before timing out for tests
mesonCheckFlags = [ "--verbose" "--timeout-multiplier" "12" ];
doInstallCheck = (lib.elem "webp" selectedPlugins) && !stdenv.hostPlatform.isStatic &&
stdenv.hostPlatform.isElf;
@ -243,6 +247,7 @@ stdenv.mkDerivation rec {
passthru.updateScript = nix-update-script {
# use numbered releases rather than gstreamer-* releases
# this matches upstream's recommendation: https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/470#note_2202772
extraArgs = [ "--version-regex" "([0-9.]+)" ];
};
@ -254,4 +259,4 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
maintainers = with maintainers; [ lilyinstarlight ];
};
}
})

View File

@ -12,29 +12,29 @@
buildPythonPackage rec {
pname = "dataclasses-json";
version = "0.6.4";
format = "pyproject";
version = "0.6.5";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "lidatong";
repo = pname;
repo = "dataclasses-json";
rev = "refs/tags/v${version}";
hash = "sha256-izNDvljUWw60joi5WfCfoqL5SDM8Jz5Pz+lI/RP35n8=";
hash = "sha256-YkGxUQgnUB7WfpsZz74b3j/TIqJi2ihsk9Ib05S7uPM=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'version = "0.0.0"' 'version = "${version}"'
--replace-fail 'version = "0.0.0"' 'version = "${version}"'
'';
nativeBuildInputs = [
build-system = [
poetry-core
poetry-dynamic-versioning
];
propagatedBuildInputs = [
dependencies = [
typing-inspect
marshmallow-enum
];

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "django-model-utils";
version = "4.5.0";
version = "4.5.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "jazzband";
repo = "django-model-utils";
rev = "refs/tags/${version}";
hash = "sha256-ZEnDk4kCXyhLvq3CZTK/zP3IK6BsNRqbkfqKAuU6Mfk=";
hash = "sha256-GaBTCrEwEkJyVeY5YVptPioYcmivyQtBKjs+TgC9IqA=";
};
build-system = [

View File

@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "fastai";
version = "2.7.14";
version = "2.7.15";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-QiVyYojI/xs7wYl3umhky0j+xzptNS7Fv+fLMRy/4jc=";
hash = "sha256-8swg/RjN9exzjMVtKdVN51iH1IrRX501z1DDjTqFaSM=";
};
propagatedBuildInputs = [

View File

@ -1,23 +1,24 @@
{ lib
, buildPythonPackage
, cryptography
, cython
, fetchPypi
, pythonOlder
, setuptools
, wheel
{
lib,
buildPythonPackage,
cryptography,
cython,
fetchPypi,
pythonOlder,
setuptools,
wheel,
}:
buildPythonPackage rec {
pname = "oracledb";
version = "2.1.2";
version = "2.2.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-MFS8wpXXN4g0unpazrhlmF6VSRX5sHqEPqhMOCTGoLI=";
hash = "sha256-9Sx984sTJDtc5YNFe4B0ijRoK5u4Nw2iSXhotxl2eYs=";
};
build-system = [
@ -26,22 +27,21 @@ buildPythonPackage rec {
wheel
];
dependencies = [
cryptography
];
dependencies = [ cryptography ];
# Checks need an Oracle database
doCheck = false;
pythonImportsCheck = [
"oracledb"
];
pythonImportsCheck = [ "oracledb" ];
meta = with lib; {
description = "Python driver for Oracle Database";
homepage = "https://oracle.github.io/python-oracledb";
changelog = "https://github.com/oracle/python-oracledb/blob/v${version}/doc/src/release_notes.rst";
license = with licenses; [ asl20 /* and or */ upl ];
license = with licenses; [
asl20 # and or
upl
];
maintainers = with maintainers; [ harvidsen ];
};
}

View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "publicsuffixlist";
version = "0.10.0.20240420";
version = "0.10.0.20240502";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-s8xPkes/xFlejqfOlMZOPLmNK92e2TLK18UZmv3/a6I=";
hash = "sha256-Hy0DmawyjUXn35tTV39Mpp+Xe16hDTbkyQoBdKS/d0o=";
};
build-system = [ setuptools ];

View File

@ -62,7 +62,7 @@ buildPythonPackage rec {
elif name == 'freetype':
path = '${freetype}/lib/libfreetype${ext}'
elif name[0:2] == 'av' or name[0:2] == 'sw':
path = '${ffmpeg-full}/lib/lib' + name + '${ext}'
path = '${lib.getLib ffmpeg-full}/lib/lib' + name + '${ext}'
elif name == 'openal':
path = '${openal}/lib/libopenal${ext}'
elif name == 'pulse':

View File

@ -39,12 +39,6 @@ buildPythonPackage rec {
# R_LIBS_SITE is used by the nix r package to point to the installed R libraries.
# This patch sets R_LIBS_SITE when rpy2 is imported.
./rpy2-3.x-r-libs-site.patch
# https://github.com/rpy2/rpy2/pull/1094
(fetchpatch {
url = "https://github.com/rpy2/rpy2/commit/026d069a008163a62d12567bcb938410d0f9bf7a.diff";
hash = "sha256-x778upSY3zab5EiRyOcsbDpPj7vN/7XzefEs+wvkNg0=";
})
];
postPatch = ''

View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "sdkmanager";
version = "0.6.6";
version = "0.6.7";
format = "setuptools";
disabled = pythonOlder "3.5";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fdroid";
repo = pname;
rev = version;
hash = "sha256-Vuht2gH9ivNG7PgG+XKtkdKoszkkoI91reQKg6D50xs=";
hash = "sha256-8Iq3sVp9/dZi4zNZIgNm38ntoA2koS/Ism+pIVATr4Q=";
};
propagatedBuildInputs = [

View File

@ -2,7 +2,7 @@
, bazel_5
, fetchFromGitHub
, git
, go
, go_1_21
, python3
, lib, stdenv
}:
@ -29,16 +29,16 @@ let
in
buildBazelPackage rec {
pname = "bazel-watcher";
version = "0.24.0";
version = "0.25.2";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = "bazel-watcher";
rev = "v${version}";
hash = "sha256-ebNHAYKyE3226KiCc2/VSz1OSITuPwuYlAIS3JrWzj0=";
hash = "sha256-lreGKA0DZiOd1bJq8NNQ+80cyDwiughoXCkKu1RaZmc=";
};
nativeBuildInputs = [ go git python3 ];
nativeBuildInputs = [ go_1_21 git python3 ];
removeRulesCC = false;
bazel = bazel_5;

View File

@ -1,4 +1,10 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
{ lib
, stdenv
, buildGoModule
, fetchFromGitHub
, installShellFiles
, fetchpatch
}:
buildGoModule rec {
pname = "bob";
@ -11,9 +17,18 @@ buildGoModule rec {
hash = "sha256-zmWfOLBb+GWw9v6LdCC7/WaP1Wz7UipPwqkmI1+rG8Q=";
};
patches = [
# Fix vulnerable dependencies
# Backport of https://github.com/benchkram/bob/pull/387
(fetchpatch {
url = "https://github.com/benchkram/bob/commit/5020e6fafbfbcb1b3add5d936886423ce882793d.patch";
hash = "sha256-if1ZErI0Un7d26eOkYSkEa87+VTRcEtF6JbsJYOHpHE=";
})
];
ldflags = [ "-s" "-w" "-X main.Version=${version}" ];
vendorHash = "sha256-S1XUgjdSVTWXehOLCxXcvj0SH12cxqvYadVlCw/saF4=";
vendorHash = "sha256-u0nFaTQWU9O7A/RAhGaLcBka+YNGjSlpycDF8TLQALw=";
excludedPackages = [ "example/server-db" "test/e2e" "tui-example" ];

View File

@ -14,7 +14,10 @@ buildGoModule rec {
vendorHash = "sha256-vTYB3ka34VooN2Wh/Rcj+2S1qAsA2a/VtXlILn1W7oU=";
patches = [ ./disable_httptest.patch ];
postPatch = ''
# disable httptest
rm server/handler/handler_test.go
'';
ldflags = [ "-s" "-w" ];

View File

@ -1,58 +0,0 @@
diff --git a/server/handler/handler_test.go b/server/handler/handler_test.go
deleted file mode 100644
index 6521633..0000000
--- a/server/handler/handler_test.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package handler
-
-import (
- "net/http"
- "net/http/httptest"
- "testing"
- "time"
-
- "codeberg.org/codeberg/pages/server/cache"
- "codeberg.org/codeberg/pages/server/gitea"
- "github.com/rs/zerolog/log"
-)
-
-func TestHandlerPerformance(t *testing.T) {
- giteaClient, _ := gitea.NewClient("https://codeberg.org", "", cache.NewKeyValueCache(), false, false)
- testHandler := Handler(
- "codeberg.page", "raw.codeberg.org",
- giteaClient,
- "https://docs.codeberg.org/pages/raw-content/",
- []string{"/.well-known/acme-challenge/"},
- []string{"raw.codeberg.org", "fonts.codeberg.org", "design.codeberg.org"},
- []string{"pages"},
- cache.NewKeyValueCache(),
- cache.NewKeyValueCache(),
- cache.NewKeyValueCache(),
- )
-
- testCase := func(uri string, status int) {
- t.Run(uri, func(t *testing.T) {
- req := httptest.NewRequest("GET", uri, http.NoBody)
- w := httptest.NewRecorder()
-
- log.Printf("Start: %v\n", time.Now())
- start := time.Now()
- testHandler(w, req)
- end := time.Now()
- log.Printf("Done: %v\n", time.Now())
-
- resp := w.Result()
-
- if resp.StatusCode != status {
- t.Errorf("request failed with status code %d", resp.StatusCode)
- } else {
- t.Logf("request took %d milliseconds", end.Sub(start).Milliseconds())
- }
- })
- }
-
- testCase("https://mondstern.codeberg.page/", 404) // TODO: expect 200
- testCase("https://codeberg.page/", 404) // TODO: expect 200
- testCase("https://example.momar.xyz/", 424)
-}

View File

@ -1,16 +1,16 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "protolint";
version = "0.49.6";
version = "0.49.7";
src = fetchFromGitHub {
owner = "yoheimuta";
repo = pname;
rev = "v${version}";
hash = "sha256-wGAHc0I2ewXJeHPH2qO6V3ScixUAMIX5U7zCBi4fqew=";
hash = "sha256-XXF37r9p6cAU7q3bOzkwPpy2kKXKhp944d22jtJox7k=";
};
vendorHash = "sha256-0+GaTE/qKfPfZpkzUBglIXQoZD6fYkX6Z3QabkZ+IcE=";
vendorHash = "sha256-JmS80vAFP9tIyGjvASAEEY+0tk3SpNqXdZajvi9mH5E=";
# Something about the way we run tests causes issues. It doesn't happen
# when using "go test" directly:

View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-binstall";
version = "1.6.4";
version = "1.6.5";
src = fetchFromGitHub {
owner = "cargo-bins";
repo = "cargo-binstall";
rev = "v${version}";
hash = "sha256-xG2eLKqGv+wqpSGBUMoYGSQ22lrMHDpQzrSyxyHMHoc=";
hash = "sha256-DD9tecF6oZOg501DUMm5KEPC2BOxMa78YGIXLvhsRys=";
};
cargoHash = "sha256-xNTSvJZWX19kmaFoLLHNKIrcsTFYWwN+7Ubym0hCwTA=";
cargoHash = "sha256-veVE4THR58DAOo0CqMCnN3EqCOEge8K0PvLM0KgHDnI=";
nativeBuildInputs = [
pkg-config

View File

@ -8,9 +8,9 @@
, stdenv
, curl
, Security
, version ? "0.2.91"
, hash ? "sha256-f/RK6s12ItqKJWJlA2WtOXtwX4Y0qa8bq/JHlLTAS3c="
, cargoHash ? "sha256-3vxVI0BhNz/9m59b+P2YEIrwGwlp7K3pyPKt4VqQuHE="
, version ? "0.2.92"
, hash ? "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0="
, cargoHash ? "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0="
}:
rustPlatform.buildRustPackage rec {

View File

@ -1,26 +1,27 @@
{ stdenv, lib, fetchurl, zip, unzip
, jdk, python2
, jdk, python3
, confFile ? ""
, extraLibraryPaths ? []
, extraJars ? []
, testers
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "apache-storm";
version = "2.4.0";
name = "${pname}-${version}";
version = "2.6.2";
name = "${finalAttrs.pname}-${finalAttrs.version}";
src = fetchurl {
url = "mirror://apache/storm/${name}/${name}.tar.gz";
sha256 = "sha256-VFNcaISPBRMGR5l/P6/pGnK7lHClDW2AmXJ00gzxwMY=";
url = "mirror://apache/storm/${finalAttrs.name}/${finalAttrs.name}.tar.gz";
hash = "sha256-ZAwsVKWTzc/++UQTNnOHdK5hiDDT5j6453DCLWi+7TA=";
};
nativeBuildInputs = [ zip unzip ];
installPhase = ''
mkdir -p $out/share/${name}
mkdir -p $out/share/${finalAttrs.name}
mv public $out/docs
mv examples $out/share/${name}/.
mv examples $out/share/${finalAttrs.name}/.
mv external extlib* lib $out/.
mv conf bin $out/.
@ -28,23 +29,23 @@ stdenv.mkDerivation rec {
'';
fixupPhase = ''
patchShebangs $out
# Fix python reference
sed -i \
-e '19iPYTHON=${python2}/bin/python' \
-e 's|#!/usr/bin/.*python|#!${python2}/bin/python|' \
-e '19iPYTHON=${python3}/bin/python' \
-e 's|#!/usr/bin/.*python|#!${python3}/bin/python|' \
$out/bin/storm
sed -i \
-e 's|#!/usr/bin/.*python|#!${python2}/bin/python|' \
-e 's|#!/usr/bin/.*python|#!${python3}/bin/python|' \
-e "s|STORM_CONF_DIR = .*|STORM_CONF_DIR = os.getenv('STORM_CONF_DIR','$out/conf')|" \
-e 's|STORM_LOG4J2_CONF_DIR =.*|STORM_LOG4J2_CONF_DIR = os.path.join(STORM_CONF_DIR, "log4j2")|' \
$out/bin/storm.py
# Default jdk location
sed -i -e 's|#.*export JAVA_HOME=.*|export JAVA_HOME="${jdk.home}"|' \
sed -i -e 's|export JAVA_HOME=.*|export JAVA_HOME="${jdk.home}"|' \
$out/conf/storm-env.sh
ls -lh $out/lib
unzip $out/lib/storm-client-${version}.jar defaults.yaml;
zip -d $out/lib/storm-client-${version}.jar defaults.yaml;
unzip $out/lib/storm-client-${finalAttrs.version}.jar defaults.yaml;
zip -d $out/lib/storm-client-${finalAttrs.version}.jar defaults.yaml;
sed -i \
-e 's|java.library.path: .*|java.library.path: "${lib.concatStringsSep ":" extraLibraryPaths}"|' \
-e 's|storm.log4j2.conf.dir: .*|storm.log4j2.conf.dir: "conf/log4j2"|' \
@ -59,6 +60,11 @@ stdenv.mkDerivation rec {
dontStrip = true;
passthru.tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "storm version";
};
meta = with lib; {
homepage = "https://storm.apache.org/";
description = "Distributed realtime computation system";
@ -67,4 +73,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ edwtjo vizanto ];
platforms = with platforms; unix;
};
}
})

View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "mtail";
version = "3.0.0";
version = "3.0.1";
src = fetchFromGitHub {
owner = "google";
repo = "mtail";
rev = "v${version}";
hash = "sha256-1AUV3NyALJbR2CPpDJaK+Cq/w87jGFtp/iUkBFqanSE=";
hash = "sha256-HXnudY9GUCjFL4JvdNYGZ1fPeaPZjt63jrZfUfOWjEc=";
};
vendorHash = "sha256-XKELlrsyumv3EbNdepLRgX7kPWxzo2ZdKrOwiM0myf8=";

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "aerospike-server";
version = "7.0.0.7";
version = "7.0.0.8";
src = fetchFromGitHub {
owner = "aerospike";
repo = "aerospike-server";
rev = version;
hash = "sha256-WAdN0Kk55Y3rhth1tiAZb9xIb0tF3YVfP+BXGRRY3lI=";
hash = "sha256-Tqg4SYMLw4K3nIlL4h0lvXdQMnG6tAOHNuqzgswl0uk=";
fetchSubmodules = true;
};

View File

@ -6,12 +6,13 @@
buildGoModule rec {
pname = "roadrunner";
version = "2024.1.0";
version = "2024.1.1";
src = fetchFromGitHub {
repo = "roadrunner";
owner = "roadrunner-server";
rev = "v${version}";
hash = "sha256-K5ZN5HHz2PEBOQ5ke7FUCjMihORfxxjLUtBJgd/1jAA=";
rev = "refs/tags/v${version}";
hash = "sha256-uSc4dVDw4aXuo0mKPhsXLYfifpu4c+L7AQXaDgTkvTc=";
};
nativeBuildInputs = [
@ -22,8 +23,8 @@ buildGoModule rec {
# https://github.com/roadrunner-server/roadrunner/blob/fe572d0eceae8fd05225fbd99ba50a9eb10c4393/.github/workflows/release.yml#L89
ldflags = [
"-s"
"-X github.com/roadrunner-server/roadrunner/v2023/internal/meta.version=${version}"
"-X github.com/roadrunner-server/roadrunner/v2023/internal/meta.buildTime=1970-01-01T00:00:00Z"
"-X=github.com/roadrunner-server/roadrunner/v2023/internal/meta.version=${version}"
"-X=github.com/roadrunner-server/roadrunner/v2023/internal/meta.buildTime=1970-01-01T00:00:00Z"
];
postInstall = ''
@ -44,7 +45,7 @@ buildGoModule rec {
--replace "127.0.0.1:0" "127.0.0.1:55554"
'';
vendorHash = "sha256-fAFErw5+oR4MEme5v3iMyLqwwsR4O6OxeVcVDVlKpdI=";
vendorHash = "sha256-8cNUCTwrhkgHu+XyneYLdPqsITnTCxQ6KGFoPrz7PwI=";
meta = {
changelog = "https://github.com/roadrunner-server/roadrunner/blob/v${version}/CHANGELOG.md";

View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "kics";
version = "2.0.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "Checkmarx";
repo = "kics";
rev = "v${version}";
hash = "sha256-OdX3ipfPj+rope5oT5ND9MEaefW36X6XDV5F7PaQOuw=";
hash = "sha256-4WYrKWkcf7AJjogWQcNsIZiCfxf4CmhLW/GJFUWfQzw=";
};
vendorHash = "sha256-vYAMzXBQIt8F9DTGLkWNXx6e08MPo12W2ogiTZ8gcjw=";
vendorHash = "sha256-N3MJhuzMJW40aMrAyuBsNciwZaNq0K4IUd+0re17AOI=";
subPackages = [ "cmd/console" ];

View File

@ -222,6 +222,9 @@ pythonPackages.buildPythonApplication rec {
pythonPackages.selenium
];
# sandboxing issues on aarch64-darwin, see https://github.com/NixOS/nixpkgs/issues/198495
doCheck = postgresql.doCheck;
checkPhase = ''
runHook preCheck

View File

@ -3,6 +3,7 @@
, fetchFromGitHub
, fetchpatch
, pkg-config
, autoreconfHook
, ffmpeg
, poco
, ocl-icd
@ -24,12 +25,14 @@ stdenv.mkDerivation rec {
(fetchpatch {
name = "build-with-cxx17.patch";
url = "https://github.com/MCJack123/sanjuuni/commit/f2164bc18935bcf63ee5b0a82087bc91f7fd258d.patch";
hash = "sha256-ZmP+AmUV7fcIFqSA6e56Nt6u03leE9PX36g2z0nLswo=";
hash = "sha256-MjDeAiB3WkemCRYzgOHzHlbPUoI4DHEYe28xIIC+c7I=";
excludes = [ "configure" ]; # conflicts with release tarball; we manually regenerate this
})
];
nativeBuildInputs = [
pkg-config
autoreconfHook
];
buildInputs = [

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "phrase-cli";
version = "2.25.0";
version = "2.27.0";
src = fetchFromGitHub {
owner = "phrase";
repo = "phrase-cli";
rev = version;
sha256 = "sha256-JVelz5I6HWgoqqkfNzb0DlAA4DsydBzdcxEIdKs24i4=";
sha256 = "sha256-PStbkJbSGCN92eAk4TZaIzbkG1C25PKI6R6LJgaQuxQ=";
};
vendorHash = "sha256-8lqiseOJ8eDvY4J/MimKVvh5euHfOgQLjhKf7sPS6AE=";
vendorHash = "sha256-5EgttRimT+TTL9QhT36AO9rx2DdZBmnQrllBfRpdhg0=";
ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bgpq4";
version = "1.12";
version = "1.13";
src = fetchFromGitHub {
owner = "bgp";
repo = pname;
rev = version;
sha256 = "sha256-Irv91M5g21id0QfsnpDA7n5IhP8Qe9QHMh/KizD74qw=";
sha256 = "sha256-Kw1Y9g2ItclDYYoZC2FTdBTec7zoM/N3Vk4zM8EVBR0=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dnsproxy";
version = "0.71.0";
version = "0.71.1";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = "dnsproxy";
rev = "v${version}";
hash = "sha256-2Qn5lYam4bMA7JS/rovHTUGXovCUOhikpv8pcWzyO24=";
hash = "sha256-g+QjGU+9//Ms7s61IzkxLTffmu1XIhzUX841e86JqE4=";
};
vendorHash = "sha256-8t1/XIjDXRHumHkRNxQBeexL2qN94AHModk8ioLpMNY=";

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "aws-iam-authenticator";
version = "0.6.19";
version = "0.6.20";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-wgMMa1PFKNArI4pk7gA2o8HHgF84Q+rga4j+UC1/Js8=";
hash = "sha256-72l+EgqWy8+7wdTKwXnebZ+wm5VCgYODw4D6lkL4NBA=";
};
vendorHash = "sha256-wJqtIuLiidO3XFkvhSXRZcFR/31rR4U9BXjFilsr5a0=";
vendorHash = "sha256-7FYR8c1Q9SS3prt8yrTzbOqgqG1tGuvzjH42MkY0tAo=";
ldflags = let PKG = "sigs.k8s.io/aws-iam-authenticator"; in [
"-s"

View File

@ -10,17 +10,17 @@
buildGoModule rec {
pname = "kubescape";
version = "3.0.8";
version = "3.0.9";
src = fetchFromGitHub {
owner = "kubescape";
repo = "kubescape";
rev = "refs/tags/v${version}";
hash = "sha256-ZGDE9go8BmaXE1YFT/z5Nob90MhsKZ6oKrodDMu2npY=";
hash = "sha256-pAe289XwKq/PO39/Wt60uipt4Z0ZD5f73pDaOTXXwi0=";
fetchSubmodules = true;
};
vendorHash = "sha256-qFJVoWzU9rqpYbb8gzdK33rq///zizxVkWhsNV8OXOM=";
vendorHash = "sha256-UWmsS79N8ooFr4qpKqOVC14cgf5ckAQwzROHGl1smD8=";
subPackages = [
"."
@ -49,7 +49,6 @@ buildGoModule rec {
rm core/cautils/getter/downloadreleasedpolicy_test.go
rm core/core/initutils_test.go
rm core/core/list_test.go
rm core/pkg/resourcehandler/remotegitutils_test.go
# Remove tests that use networking
substituteInPlace core/pkg/resourcehandler/repositoryscanner_test.go \

View File

@ -1,27 +1,27 @@
{ lib
, fetchFromGitHub
, gitMinimal
, python3
{
lib,
fetchFromGitHub,
gitMinimal,
python3,
}:
python3.pkgs.buildPythonApplication rec {
pname = "quark-engine";
version = "24.4.1";
version = "24.5.1";
pyproject = true;
src = fetchFromGitHub {
owner = pname;
repo = pname;
owner = "quark-engine";
repo = "quark-engine";
rev = "refs/tags/v${version}";
sha256 = "sha256-cWO/avMz9nT9yo10b1ugC0C8NsEp2jAlcR0/+86gFKc=";
hash = "sha256-W1UeTiyyYZzxu3XQ/6VkTvEyqPWl1Du6QutuoPhaSfs=";
};
nativeBuildInputs = with python3.pkgs; [
setuptools
pythonRelaxDepsHook
];
build-system = with python3.pkgs; [ setuptools ];
propagatedBuildInputs = with python3.pkgs; [
nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ];
dependencies = with python3.pkgs; [
androguard
click
colorama
@ -37,16 +37,12 @@ python3.pkgs.buildPythonApplication rec {
tqdm
];
pythonRelaxDeps = [
"r2pipe"
];
pythonRelaxDeps = [ "r2pipe" ];
# Project has no tests
doCheck = false;
pythonImportsCheck = [
"quark"
];
pythonImportsCheck = [ "quark" ];
meta = with lib; {
description = "Android malware (analysis and scoring) system";

View File

@ -4,21 +4,13 @@
stdenv.mkDerivation rec {
pname = "tpm2-tools";
version = "5.6";
version = "5.7";
src = fetchurl {
url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-Usi8uq3KCCq/5et+5JZ9LWMthLFndnXy8HG20uwizsM=";
sha256 = "sha256-OBDTa1B5JW9PL3zlUuIiE9Q7EDHBMVON+KLbw8VwmDo=";
};
patches = [
# https://github.com/tpm2-software/tpm2-tools/pull/3271
(fetchpatch {
url = "https://github.com/tpm2-software/tpm2-tools/commit/b98be08f6f88b0cca9e0667760c4e1e5eb417fbd.patch";
sha256 = "sha256-2sEam9i4gwscJhLwraX2EAjVM8Dh1vmNnG3zYsOF0fc=";
})
];
nativeBuildInputs = [ pandoc pkg-config makeWrapper ];
buildInputs = [
curl openssl tpm2-tss libuuid

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "vals";
version = "0.37.0";
version = "0.37.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "helmfile";
repo = pname;
sha256 = "sha256-R/nTlB8VM41Yah+3sH/J3Y3m9KUFsIZQNQ9kFddo+Mo=";
sha256 = "sha256-POFxoGUbcasEvFdovZ1RER+yxLzg9owyKjWcr1zI+nc=";
};
vendorHash = "sha256-VKJIbsVIIEEGqo+LXfYzhIJLtcj0jbbq/UXVpykgcz8=";
vendorHash = "sha256-Yzab4Y6ETOZM5zL/5fQSzqNFi51YOgDjsL53efW1vvk=";
ldflags = [
"-s"

View File

@ -48,12 +48,12 @@ in
google = buildStyle rec {
name = "Google";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "errata-ai";
repo = "Google";
rev = "v${version}";
hash = "sha256-TQS/hgS6tEWPSuZpEbX65MdYSE/+HJVcnzIuQbhIG2M=";
hash = "sha256-jSmfUgzlIbDVh2zLtnTNpM/z6dHMp358F9adLZ5+qcw=";
};
meta = {
description = "A Vale-compatible implementation of the Google Developer Documentation Style Guide";
@ -80,12 +80,12 @@ in
microsoft = buildStyle rec {
name = "Microsoft";
version = "0.14.0";
version = "0.14.1";
src = fetchFromGitHub {
owner = "errata-ai";
repo = "Microsoft";
rev = "v${version}";
hash = "sha256-22rGNLZOsWYQ+H3CcM2b1zOXV3kNPcgYqDpaCg1iv9o=";
hash = "sha256-4j05bIGAVEy6untUqtrUxdLKlhyOcJsbcsow8OxRp1A=";
};
meta = {
description = "A Vale-compatible implementation of the Microsoft Writing Style Guide";

View File

@ -21244,7 +21244,7 @@ with pkgs;
gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer {
callPackage = newScope (gst_all_1 // { libav = pkgs.ffmpeg-headless; });
inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL Security VideoToolbox;
inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL Security SystemConfiguration VideoToolbox;
});
gusb = callPackage ../development/libraries/gusb { };

View File

@ -136,7 +136,7 @@ let
(lib.versionAtLeast self.coq.version "8.14") {
compcert = self.compcert.override {
version = with lib.versions; lib.switch self.coq.version [
{ case = range "8.15" "8.17"; out = "3.13.1"; }
{ case = range "8.15" "8.19"; out = "3.13.1"; }
{ case = isEq "8.14"; out = "3.11"; }
] null;
};