diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-03-23 18:01:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-23 18:01:20 +0000 |
| commit | 307b7194146f7aba544847f8a44abb164244bf1c (patch) | |
| tree | 228165661e61d6ddd1cc861fda5d4a4269e8ae34 | |
| parent | d6eaead385f7a770832eba6fbe242d3b97b058b4 (diff) | |
| parent | 4a3d90135ba8d31ef4d5a19de23f7e74b9914d08 (diff) | |
| download | nixpkgs-307b7194146f7aba544847f8a44abb164244bf1c.tar nixpkgs-307b7194146f7aba544847f8a44abb164244bf1c.tar.gz nixpkgs-307b7194146f7aba544847f8a44abb164244bf1c.tar.bz2 nixpkgs-307b7194146f7aba544847f8a44abb164244bf1c.tar.lz nixpkgs-307b7194146f7aba544847f8a44abb164244bf1c.tar.xz nixpkgs-307b7194146f7aba544847f8a44abb164244bf1c.tar.zst nixpkgs-307b7194146f7aba544847f8a44abb164244bf1c.zip | |
Merge master into staging-next
107 files changed, 849 insertions, 249 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index f142045710b..43b86d54b5f 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -234,6 +234,8 @@ In addition to numerous new and upgraded packages, this release has the followin The `{aclUse,superUser,disableActions}` attributes have been renamed, `pluginsConfig` now also accepts an attribute set of booleans, passing plain PHP is deprecated. Same applies to `acl` which now also accepts structured settings. +- The `zsh` package changes the way to set environment variables on NixOS systems where `programs.zsh.enable` equals `false`. It now sources `/etc/set-environment` when reading the system-level `zshenv` file. Before, it sourced `/etc/profile` when reading the system-level `zprofile` file. + - The `wordpress` service now takes configuration via the `services.wordpress.sites.<name>.settings` attribute set, `extraConfig` is still available to append additional text to `wp-config.php`. - To reduce closure size in `nixos/modules/profiles/minimal.nix` profile disabled installation documentations and manuals. Also disabled `logrotate` and `udisks2` services. diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index c6c8753d532..a21450708fe 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -24,7 +24,7 @@ in rec { } '' name=${shellEscape name} - mkdir -p "$out/$(dirname "$name")" + mkdir -p "$out/$(dirname -- "$name")" echo -n "$text" > "$out/$name" '' else diff --git a/nixos/modules/services/databases/dgraph.nix b/nixos/modules/services/databases/dgraph.nix index 887164fa5b9..7f005a9971a 100644 --- a/nixos/modules/services/databases/dgraph.nix +++ b/nixos/modules/services/databases/dgraph.nix @@ -12,7 +12,7 @@ let '' mkdir -p $out/bin makeWrapper ${cfg.package}/bin/dgraph $out/bin/dgraph \ - --set PATH '${lib.makeBinPath [ pkgs.nodejs ]}:$PATH' \ + --prefix PATH : "${lib.makeBinPath [ pkgs.nodejs ]}" \ ''; securityOptions = { NoNewPrivileges = true; diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 014c5b16097..e019e431a18 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -365,6 +365,8 @@ in ]; services.gitea.settings = { + "cron.update_checker".ENABLED = lib.mkDefault false; + database = mkMerge [ { DB_TYPE = cfg.database.type; diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 905dd5bef1f..064c86a9a7e 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -184,8 +184,8 @@ let brotli_types ${lib.concatStringsSep " " compressMimeTypes}; ''} - # https://docs.nginx.com/nginx/admin-guide/web-server/compression/ ${optionalString cfg.recommendedGzipSettings '' + # https://docs.nginx.com/nginx/admin-guide/web-server/compression/ gzip on; gzip_static on; gzip_vary on; @@ -195,6 +195,14 @@ let gzip_types ${lib.concatStringsSep " " compressMimeTypes}; ''} + ${optionalString cfg.recommendedZstdSettings '' + zstd on; + zstd_comp_level 9; + zstd_min_length 256; + zstd_static on; + zstd_types ${lib.concatStringsSep " " compressMimeTypes}; + ''} + ${optionalString cfg.recommendedProxySettings '' proxy_redirect off; proxy_connect_timeout ${cfg.proxyTimeout}; @@ -490,6 +498,16 @@ in ''; }; + recommendedZstdSettings = mkOption { + default = false; + type = types.bool; + description = lib.mdDoc '' + Enable recommended zstd settings. Learn more about compression in Zstd format [here](https://github.com/tokers/zstd-nginx-module). + + This adds `pkgs.nginxModules.zstd` to `services.nginx.additionalModules`. + ''; + }; + proxyTimeout = mkOption { type = types.str; default = "60s"; @@ -1015,7 +1033,8 @@ in groups = config.users.groups; }) dependentCertNames; - services.nginx.additionalModules = optional cfg.recommendedBrotliSettings pkgs.nginxModules.brotli; + services.nginx.additionalModules = optional cfg.recommendedBrotliSettings pkgs.nginxModules.brotli + ++ lib.optional cfg.recommendedZstdSettings pkgs.nginxModules.zstd; systemd.services.nginx = { description = "Nginx Web Server"; diff --git a/pkgs/applications/blockchains/sparrow/default.nix b/pkgs/applications/blockchains/sparrow/default.nix index 85d5abdd178..d7f1963a3c8 100644 --- a/pkgs/applications/blockchains/sparrow/default.nix +++ b/pkgs/applications/blockchains/sparrow/default.nix @@ -20,11 +20,11 @@ let pname = "sparrow"; - version = "1.7.1"; + version = "1.7.3"; src = fetchurl { url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz"; - sha256 = "0q31b4ncvbhr9gb47wplphg43pwlg5vpd1b12qiidqlrkgm2vjy8"; + sha256 = "sha256-/tKct73v0zWAjY4kTllnb/+SB/8ENgVl8Yh/LErKTxY="; }; launcher = writeScript "sparrow" '' @@ -156,24 +156,6 @@ let ln -s ${hwi}/bin/hwi $out/modules/com.sparrowwallet.sparrow/native/linux/x64/hwi ''; }; - - # To use the udev rules for connected hardware wallets, - # add "pkgs.sparrow" to "services.udev.packages" and add user accounts to the user group "plugdev". - udev-rules = stdenv.mkDerivation { - name = "sparrow-udev"; - - src = let version = "2.0.2"; in - fetchurl { - url = "https://github.com/bitcoin-core/HWI/releases/download/${version}/hwi-${version}.tar.gz"; - sha256 = "sha256-di1fRsMbwpHcBFNTCVivfxpwhUoUKLA3YTnJxKq/jHM="; - }; - - installPhase = '' - mkdir -p $out/etc/udev/rules.d - cp -a hwilib/udev/* $out/etc/udev/rules.d - rm $out/etc/udev/rules.d/README.md - ''; - }; in stdenv.mkDerivation rec { inherit pname version src; @@ -186,8 +168,9 @@ stdenv.mkDerivation rec { icon = pname; desktopName = "Sparrow Bitcoin Wallet"; genericName = "Bitcoin Wallet"; - categories = [ "Finance" ]; + categories = [ "Finance" "Network" ]; mimeTypes = [ "application/psbt" "application/bitcoin-transaction" "x-scheme-handler/bitcoin" "x-scheme-handler/auth47" "x-scheme-handler/lightning" ]; + startupWMClass = "Sparrow"; }) ]; @@ -217,8 +200,8 @@ stdenv.mkDerivation rec { mkdir -p $out/share/icons ln -s ${sparrow-icons}/hicolor $out/share/icons - mkdir -p $out/etc/udev - ln -s ${udev-rules}/etc/udev/rules.d $out/etc/udev/rules.d + mkdir -p $out/etc/udev/rules.d + cp ${hwi}/lib/python*/site-packages/hwilib/udev/*.rules $out/etc/udev/rules.d runHook postInstall ''; diff --git a/pkgs/applications/blockchains/sparrow/fhsenv.nix b/pkgs/applications/blockchains/sparrow/fhsenv.nix new file mode 100644 index 00000000000..a82b975227c --- /dev/null +++ b/pkgs/applications/blockchains/sparrow/fhsenv.nix @@ -0,0 +1,30 @@ +{ lib +, buildFHSUserEnv +, sparrow-unwrapped +}: + +buildFHSUserEnv { + name = "sparrow"; + + runScript = "${sparrow-unwrapped}/bin/sparrow"; + + targetPkgs = pkgs: with pkgs; [ + sparrow-unwrapped + pcsclite + ]; + + multiPkgs = pkgs: with pkgs; [ + pcsclite + ]; + + extraInstallCommands = '' + mkdir -p $out/share + ln -s ${sparrow-unwrapped}/share/applications $out/share + ln -s ${sparrow-unwrapped}/share/icons $out/share + + mkdir -p $out/etc/udev + ln -s ${sparrow-unwrapped}/etc/udev/rules.d $out/etc/udev/rules.d + ''; + + meta = sparrow-unwrapped.meta; +} diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index d7909c64a20..da5bda5569f 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -22,11 +22,6 @@ buildDotnetModule rec { sha256 = "sha256-SRWqe8KTjFdgVW7/EYRVUONtDWwxpcZ1GXWFPjKZzpI="; }; - patches = [ - # otherwise installPhase fails with NETSDK1129 - ./fix-framework.diff - ]; - dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; dotnet-sdk = dotnetCorePackages.sdk_7_0; @@ -38,6 +33,9 @@ buildDotnetModule rec { "-p:PublishSingleFile=true" "-p:PublishTrimmed=true" ]; + dotnetInstallFlags = [ + "--framework=net7.0" + ]; selfContainedBuild = true; runtimeDeps = [ libkrb5 zlib openssl ]; @@ -58,9 +56,11 @@ buildDotnetModule rec { postInstall = '' buildPlugin() { + echo "Publishing plugin $1" dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \ --output $out/lib/${pname}/plugins/$1 --configuration Release \ - -p:TargetLatestRuntimePatch=false -p:UseAppHost=false --no-restore + -p:TargetLatestRuntimePatch=false -p:UseAppHost=false --no-restore \ + --framework=net7.0 } buildPlugin ArchiSteamFarm.OfficialPlugins.ItemsMatcher diff --git a/pkgs/applications/misc/ArchiSteamFarm/fix-framework.diff b/pkgs/applications/misc/ArchiSteamFarm/fix-framework.diff deleted file mode 100644 index 6c525e735b0..00000000000 --- a/pkgs/applications/misc/ArchiSteamFarm/fix-framework.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/Directory.Build.props b/Directory.Build.props -index 89137fba..bce300a4 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -29,16 +29,16 @@ - <RepositoryUrl>$(PackageProjectUrl).git</RepositoryUrl> - <RollForward>LatestMajor</RollForward> - <RuntimeIdentifiers>linux-arm;linux-arm64;linux-x64;osx-arm64;osx-x64;win-arm64;win-x64</RuntimeIdentifiers> -- <TargetFrameworks>net7.0</TargetFrameworks> -+ <TargetFramework>net7.0</TargetFramework> - <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch> - </PropertyGroup> - - <PropertyGroup Condition="'$(OS)' == 'Windows_NT' OR '$(ASFNetFramework)' != ''"> -- <TargetFrameworks>$(TargetFrameworks);net481</TargetFrameworks> -+ <TargetFramework>$(TargetFramework);net481</TargetFramework> - </PropertyGroup> - - <PropertyGroup Condition="'$(ASFNetStandard)' != ''"> -- <TargetFrameworks>$(TargetFrameworks);netstandard2.1</TargetFrameworks> -+ <TargetFramework>$(TargetFramework);netstandard2.1</TargetFramework> - </PropertyGroup> - - <ItemGroup Condition="'$(TargetFramework)' == 'net481' OR '$(TargetFramework)' == 'netstandard2.1'"> diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 415e395ea70..3cf79268f70 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "glooctl"; - version = "1.13.10"; + version = "1.13.11"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-PsdaGVBEslcBMNCj1NQozwbrRx1Nx7Z5+jtZLCrJwDU="; + hash = "sha256-K3tk55YPgBSF0YrxSw8zypnzgwEiyEPAAbiGyuKId9o="; }; subPackages = [ "projects/gloo/cli/cmd" ]; - vendorHash = "sha256-sQv6g0Xgs+6jgxacWJwE3dK3GimfiPHly0Z0rvdKNE4="; + vendorHash = "sha256-BRF4kc2Yers3jV2YqG7koycFK34i8NqTcuyt1oGXzsU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/freefilesync/default.nix b/pkgs/applications/networking/freefilesync/default.nix index b7e7ab29865..4d1310335ec 100644 --- a/pkgs/applications/networking/freefilesync/default.nix +++ b/pkgs/applications/networking/freefilesync/default.nix @@ -10,6 +10,7 @@ , openssl , wxGTK32 , gitUpdater +, wrapGAppsHook }: gcc12Stdenv.mkDerivation rec { @@ -45,6 +46,7 @@ gcc12Stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + wrapGAppsHook pkg-config ]; diff --git a/pkgs/applications/version-management/git-open/default.nix b/pkgs/applications/version-management/git-open/default.nix index 2c57ca1f840..42e23dcd32e 100644 --- a/pkgs/applications/version-management/git-open/default.nix +++ b/pkgs/applications/version-management/git-open/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-open"; - version = "2.1.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "paulirish"; repo = "git-open"; rev = "v${version}"; - sha256 = "11n46bngvca5wbdbfcxzjhjbfdbad7sgf7h9gf956cb1q8swsdm0"; + sha256 = "sha256-Bag2rI2uR7ilkg2ozjR8tPXqKz5XjiY7WAUJKTVTXd8="; }; nativeBuildInputs = [ installShellFiles makeWrapper pandoc ]; @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp git-open $out/bin + mv git-open $out/bin installManPage git-open.1 wrapProgram $out/bin/git-open \ - --prefix PATH : "${lib.makeBinPath [ git gnugrep ]}" \ + --prefix PATH : "${lib.makeBinPath [ gnugrep ]}" \ --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" ''; @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { description = "Open the GitHub page or website for a repository in your browser"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ jlesquembre SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 861d4877e42..2de8989830c 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1IJboAy0GYgkysY84+wHHOulA/aiux7pgCtxfr0CFV8="; + sha256 = "sha256-eAniM4o7TshGhO5jGrCZz+Rs5n5Q24tvIWMWebKAWAs="; }; - cargoHash = "sha256-kAou5pPOwbOZ9n8+fQJ4+Hh9x7wrY898R5XTuUEvF2o="; + cargoHash = "sha256-0Y4hHuWB7NY7rRJImNIrxlEffrT9055ThQGqJlMeDMM="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/development/libraries/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch b/pkgs/development/libraries/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch new file mode 100644 index 00000000000..3ee3198cb22 --- /dev/null +++ b/pkgs/development/libraries/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch @@ -0,0 +1,201 @@ +From 1cf6b108882669f1b20c18fb5f2d6dff0fc83296 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar <jtojnar@gmail.com> +Date: Sat, 24 Dec 2022 15:31:51 +0100 +Subject: [PATCH 1/4] libbacktrace: avoid libtool wrapping tests +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When `--enable-shared` is used, libtool will produce shell scripts +instead of programs, preventing separate debug info from being generated: + + objcopy --only-keep-debug btest btest_gnudebuglink.debug + objcopy: btest: file format not recognized + make[2]: *** [Makefile:2615: btest_gnudebuglink] Error 1 + +Let’s make it properly set rpath with `-no-install` flag, +so that wrappers are not needed, as mentioned on +https://autotools.info/libtool/wrappers.html +--- + Makefile.am | 28 +++++++++++++++++++++++----- + 1 file changed, 23 insertions(+), 5 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index c53cbae..6eab991 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -107,6 +107,8 @@ check_DATA = + # Flags to use when compiling test programs. + libbacktrace_TEST_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) -g + ++libbacktrace_TEST_LDFLAGS = -no-install ++ + if USE_DSYMUTIL + + %.dSYM: % +@@ -171,48 +173,56 @@ xcoff_%.c: xcoff.c + + test_elf_32_SOURCES = test_format.c testlib.c + test_elf_32_CFLAGS = $(libbacktrace_TEST_CFLAGS) ++test_elf_32_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) + test_elf_32_LDADD = libbacktrace_noformat.la elf_32.lo + + BUILDTESTS += test_elf_32 + + test_elf_64_SOURCES = test_format.c testlib.c + test_elf_64_CFLAGS = $(libbacktrace_TEST_CFLAGS) ++test_elf_64_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) + test_elf_64_LDADD = libbacktrace_noformat.la elf_64.lo + + BUILDTESTS += test_elf_64 + + test_macho_SOURCES = test_format.c testlib.c + test_macho_CFLAGS = $(libbacktrace_TEST_CFLAGS) ++test_macho_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) + test_macho_LDADD = libbacktrace_noformat.la macho.lo + + BUILDTESTS += test_macho + + test_xcoff_32_SOURCES = test_format.c testlib.c + test_xcoff_32_CFLAGS = $(libbacktrace_TEST_CFLAGS) ++test_xcoff_32_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) + test_xcoff_32_LDADD = libbacktrace_noformat.la xcoff_32.lo + + BUILDTESTS += test_xcoff_32 + + test_xcoff_64_SOURCES = test_format.c testlib.c + test_xcoff_64_CFLAGS = $(libbacktrace_TEST_CFLAGS) ++test_xcoff_64_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) + test_xcoff_64_LDADD = libbacktrace_noformat.la xcoff_64.lo + + BUILDTESTS += test_xcoff_64 + + test_pecoff_SOURCES = test_format.c testlib.c + test_pecoff_CFLAGS = $(libbacktrace_TEST_CFLAGS) ++test_pecoff_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) + test_pecoff_LDADD = libbacktrace_noformat.la pecoff.lo + + BUILDTESTS += test_pecoff + + test_unknown_SOURCES = test_format.c testlib.c + test_unknown_CFLAGS = $(libbacktrace_TEST_CFLAGS) ++test_unknown_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) + test_unknown_LDADD = libbacktrace_noformat.la unknown.lo + + BUILDTESTS += test_unknown + + unittest_SOURCES = unittest.c testlib.c + unittest_CFLAGS = $(libbacktrace_TEST_CFLAGS) ++unittest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) + unittest_LDADD = libbacktrace.la + + BUILDTESTS += unittest +@@ -253,7 +263,7 @@ if HAVE_OBJCOPY_DEBUGLINK + + b2test_SOURCES = $(btest_SOURCES) + b2test_CFLAGS = $(libbacktrace_TEST_CFLAGS) +-b2test_LDFLAGS = -Wl,--build-id ++b2test_LDFLAGS = -Wl,--build-id $(libbacktrace_TEST_LDFLAGS) + b2test_LDADD = libbacktrace_elf_for_test.la + + check_PROGRAMS += b2test +@@ -263,7 +273,7 @@ if HAVE_DWZ + + b3test_SOURCES = $(btest_SOURCES) + b3test_CFLAGS = $(libbacktrace_TEST_CFLAGS) +-b3test_LDFLAGS = -Wl,--build-id ++b3test_LDFLAGS = -Wl,--build-id $(libbacktrace_TEST_LDFLAGS) + b3test_LDADD = libbacktrace_elf_for_test.la + + check_PROGRAMS += b3test +@@ -276,6 +286,7 @@ endif HAVE_ELF + + btest_SOURCES = btest.c testlib.c + btest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -O ++btest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) + btest_LDADD = libbacktrace.la + + BUILDTESTS += btest +@@ -330,6 +341,7 @@ endif HAVE_DWZ + + stest_SOURCES = stest.c + stest_CFLAGS = $(libbacktrace_TEST_CFLAGS) ++stest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) + stest_LDADD = libbacktrace.la + + BUILDTESTS += stest +@@ -352,6 +364,7 @@ if HAVE_ELF + + ztest_SOURCES = ztest.c testlib.c + ztest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -DSRCDIR=\"$(srcdir)\" ++ztest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) + ztest_LDADD = libbacktrace.la + ztest_alloc_LDADD = libbacktrace_alloc.la + +@@ -371,6 +384,7 @@ BUILDTESTS += ztest_alloc + + zstdtest_SOURCES = zstdtest.c testlib.c + zstdtest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -DSRCDIR=\"$(srcdir)\" ++zstdtest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) + zstdtest_LDADD = libbacktrace.la + zstdtest_alloc_LDADD = libbacktrace_alloc.la + +@@ -392,6 +406,7 @@ endif HAVE_ELF + + edtest_SOURCES = edtest.c edtest2_build.c testlib.c + edtest_CFLAGS = $(libbacktrace_TEST_CFLAGS) ++edtest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) + edtest_LDADD = libbacktrace.la + + BUILDTESTS += edtest +@@ -422,6 +437,7 @@ BUILDTESTS += ttest + + ttest_SOURCES = ttest.c testlib.c + ttest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -pthread ++ttest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) + ttest_LDADD = libbacktrace.la + + if USE_DSYMUTIL +@@ -460,12 +476,12 @@ if HAVE_COMPRESSED_DEBUG + + ctestg_SOURCES = btest.c testlib.c + ctestg_CFLAGS = $(libbacktrace_TEST_CFLAGS) +-ctestg_LDFLAGS = -Wl,--compress-debug-sections=zlib-gnu ++ctestg_LDFLAGS = -Wl,--compress-debug-sections=zlib-gnu $(libbacktrace_TEST_LDFLAGS) + ctestg_LDADD = libbacktrace.la + + ctesta_SOURCES = btest.c testlib.c + ctesta_CFLAGS = $(libbacktrace_TEST_CFLAGS) +-ctesta_LDFLAGS = -Wl,--compress-debug-sections=zlib-gabi ++ctesta_LDFLAGS = -Wl,--compress-debug-sections=zlib-gabi $(libbacktrace_TEST_LDFLAGS) + ctesta_LDADD = libbacktrace.la + + BUILDTESTS += ctestg ctesta +@@ -474,7 +490,7 @@ if HAVE_COMPRESSED_DEBUG_ZSTD + + ctestzstd_SOURCES = btest.c testlib.c + ctestzstd_CFLAGS = $(libbacktrace_TEST_CFLAGS) +-ctestzstd_LDFLAGS = -Wl,--compress-debug-sections=zstd ++ctestzstd_LDFLAGS = -Wl,--compress-debug-sections=zstd $(libbacktrace_TEST_LDFLAGS) + ctestzstd_LDADD = libbacktrace.la + + BUILDTESTS += ctestzstd +@@ -521,6 +537,7 @@ endif + + mtest_SOURCES = mtest.c testlib.c + mtest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -O ++mtest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) + mtest_LDADD = libbacktrace.la + + BUILDTESTS += mtest +@@ -553,6 +570,7 @@ if HAVE_ELF + + xztest_SOURCES = xztest.c testlib.c + xztest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -DSRCDIR=\"$(srcdir)\" ++xztest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) + xztest_LDADD = libbacktrace.la + + xztest_alloc_SOURCES = $(xztest_SOURCES) +-- +2.38.1 + diff --git a/pkgs/development/libraries/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch b/pkgs/development/libraries/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch new file mode 100644 index 00000000000..37da7ef4d96 --- /dev/null +++ b/pkgs/development/libraries/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch @@ -0,0 +1,108 @@ +From f409ee343fe6cdc059bb411746f27a515aec66a8 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar <jtojnar@gmail.com> +Date: Sat, 24 Dec 2022 16:46:18 +0100 +Subject: [PATCH 2/4] libbacktrace: Allow configuring debug dir +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On platforms that do not use FHS like NixOS or GNU Guix, +the build-id directories are not under `/usr/lib/debug`. + +Let’s add `--with-separate-debug-dir` configure flag so that +the path can be changed. The same flag is supported by gdb: + +https://github.com/bminor/binutils-gdb/blob/095f84c7e3cf85cd68c657c46b80be078f336bc9/gdb/configure.ac#L113-L115 +--- + Makefile.am | 11 ++++++----- + configure.ac | 8 ++++++++ + elf.c | 4 ++-- + 3 files changed, 16 insertions(+), 7 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 6eab991..da443c1 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -33,7 +33,8 @@ ACLOCAL_AMFLAGS = -I config + + AM_CPPFLAGS = + +-AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG) ++AM_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) $(PIC_FLAG) \ ++ -DSYSTEM_DEBUG_DIR=\"$(SEPARATE_DEBUG_DIR)\" + + include_HEADERS = backtrace.h backtrace-supported.h + +@@ -134,7 +135,7 @@ libbacktrace_noformat_la_DEPENDENCIES = $(libbacktrace_noformat_la_LIBADD) + if HAVE_ELF + if HAVE_OBJCOPY_DEBUGLINK + +-TEST_BUILD_ID_DIR=$(abs_builddir)/usr/lib/debug/.build-id/ ++TEST_DEBUG_DIR=$(abs_builddir)/usr/lib/debug + + check_LTLIBRARIES += libbacktrace_elf_for_test.la + +@@ -143,8 +144,8 @@ libbacktrace_elf_for_test_la_LIBADD = $(BACKTRACE_FILE) elf_for_test.lo \ + $(VIEW_FILE) $(ALLOC_FILE) + + elf_for_test.c: elf.c +- SEARCH='^#define SYSTEM_BUILD_ID_DIR.*$$'; \ +- REPLACE="#define SYSTEM_BUILD_ID_DIR \"$(TEST_BUILD_ID_DIR)\""; \ ++ SEARCH='^#define BUILD_ID_DIR.*$$'; \ ++ REPLACE='\0\n#undef SYSTEM_DEBUG_DIR\n#define SYSTEM_DEBUG_DIR "$(TEST_DEBUG_DIR)"'; \ + $(SED) "s%$$SEARCH%$$REPLACE%" \ + $< \ + > $@.tmp +@@ -468,7 +469,7 @@ endif HAVE_OBJCOPY_DEBUGLINK + + %_buildid: % + ./install-debuginfo-for-buildid.sh \ +- "$(TEST_BUILD_ID_DIR)" \ ++ "$(TEST_DEBUG_DIR)/.build-id" \ + $< + $(OBJCOPY) --strip-debug $< $@ + +diff --git a/configure.ac b/configure.ac +index 7f122cb..bb590ab 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -67,6 +67,14 @@ AM_MAINTAINER_MODE + AC_ARG_WITH(target-subdir, + [ --with-target-subdir=SUBDIR Configuring in a subdirectory for target]) + ++AC_ARG_WITH(separate-debug-dir, ++[ --with-separate-debug-dir=DEBUGDIR Look for global separate debug info in this path @<:@LIBDIR/debug@:>@], ++[separate_debug_dir=$withval], ++[separate_debug_dir=$libdir/debug]) ++ ++SEPARATE_DEBUG_DIR=$separate_debug_dir ++AC_SUBST(SEPARATE_DEBUG_DIR) ++ + # We must force CC to /not/ be precious variables; otherwise + # the wrong, non-multilib-adjusted value will be used in multilibs. + # As a side effect, we have to subst CFLAGS ourselves. +diff --git a/elf.c b/elf.c +index e82ecc5..8b1189c 100644 +--- a/elf.c ++++ b/elf.c +@@ -856,7 +856,7 @@ elf_readlink (struct backtrace_state *state, const char *filename, + } + } + +-#define SYSTEM_BUILD_ID_DIR "/usr/lib/debug/.build-id/" ++#define BUILD_ID_DIR "/.build-id/" + + /* Open a separate debug info file, using the build ID to find it. + Returns an open file descriptor, or -1. +@@ -870,7 +870,7 @@ elf_open_debugfile_by_buildid (struct backtrace_state *state, + backtrace_error_callback error_callback, + void *data) + { +- const char * const prefix = SYSTEM_BUILD_ID_DIR; ++ const char * const prefix = SYSTEM_DEBUG_DIR BUILD_ID_DIR; + const size_t prefix_len = strlen (prefix); + const char * const suffix = ".debug"; + const size_t suffix_len = strlen (suffix); +-- +2.38.1 + diff --git a/pkgs/development/libraries/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch b/pkgs/development/libraries/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch new file mode 100644 index 00000000000..f223217a831 --- /dev/null +++ b/pkgs/development/libraries/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch @@ -0,0 +1,101 @@ +From de122af5382d8017cae63bdee946206c6c6c23ab Mon Sep 17 00:00:00 2001 +From: Jan Tojnar <jtojnar@gmail.com> +Date: Sat, 24 Dec 2022 20:19:27 +0100 +Subject: [PATCH 3/4] libbacktrace: Support multiple build id directories +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +gdb supports multiple debug directories separated by colons: +https://github.com/bminor/binutils-gdb/blob/fcbfb25dcca625a7f999ec51d48b6fc3a32123c3/gdb/build-id.c#L136-L142 + +This is useful for example when using dwarffs in addition +to debug data installed using distribution’s package manager. +--- + elf.c | 57 ++++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 36 insertions(+), 21 deletions(-) + +diff --git a/elf.c b/elf.c +index 8b1189c..65c647a 100644 +--- a/elf.c ++++ b/elf.c +@@ -865,12 +865,12 @@ elf_readlink (struct backtrace_state *state, const char *filename, + when the build ID is known is in /usr/lib/debug/.build-id. */ + + static int +-elf_open_debugfile_by_buildid (struct backtrace_state *state, ++elf_open_debugfile_by_buildid (const char * const prefix, ++ struct backtrace_state *state, + const char *buildid_data, size_t buildid_size, + backtrace_error_callback error_callback, + void *data) + { +- const char * const prefix = SYSTEM_DEBUG_DIR BUILD_ID_DIR; + const size_t prefix_len = strlen (prefix); + const char * const suffix = ".debug"; + const size_t suffix_len = strlen (suffix); +@@ -6936,27 +6936,42 @@ elf_add (struct backtrace_state *state, const char *filename, int descriptor, + if (buildid_data != NULL) + { + int d; ++ char debug_directories[strlen(SYSTEM_DEBUG_DIR) + 1]; ++ char *debug_dir; + +- d = elf_open_debugfile_by_buildid (state, buildid_data, buildid_size, +- error_callback, data); +- if (d >= 0) +- { +- int ret; ++ strcpy(debug_directories, SYSTEM_DEBUG_DIR); + +- elf_release_view (state, &buildid_view, error_callback, data); +- if (debuglink_view_valid) +- elf_release_view (state, &debuglink_view, error_callback, data); +- if (debugaltlink_view_valid) +- elf_release_view (state, &debugaltlink_view, error_callback, data); +- ret = elf_add (state, "", d, NULL, 0, base_address, error_callback, +- data, fileline_fn, found_sym, found_dwarf, NULL, 0, +- 1, NULL, 0); +- if (ret < 0) +- backtrace_close (d, error_callback, data); +- else if (descriptor >= 0) +- backtrace_close (descriptor, error_callback, data); +- return ret; +- } ++ debug_dir = strtok (debug_directories, ":"); ++ while (debug_dir != NULL) ++ { ++ char prefix[strlen(debug_dir) + strlen(BUILD_ID_DIR) + 1]; ++ strcpy(prefix, debug_dir); ++ strcat(prefix, BUILD_ID_DIR); ++ ++ d = elf_open_debugfile_by_buildid (prefix, state, buildid_data, buildid_size, ++ error_callback, data); ++ ++ if (d >= 0) ++ { ++ int ret; ++ ++ elf_release_view (state, &buildid_view, error_callback, data); ++ if (debuglink_view_valid) ++ elf_release_view (state, &debuglink_view, error_callback, data); ++ if (debugaltlink_view_valid) ++ elf_release_view (state, &debugaltlink_view, error_callback, data); ++ ret = elf_add (state, "", d, NULL, 0, base_address, error_callback, ++ data, fileline_fn, found_sym, found_dwarf, NULL, 0, ++ 1, NULL, 0); ++ if (ret < 0) ++ backtrace_close (d, error_callback, data); ++ else if (descriptor >= 0) ++ backtrace_close (descriptor, error_callback, data); ++ return ret; ++ } ++ ++ debug_dir = strtok (NULL, ":"); ++ } + } + + if (buildid_view_valid) +-- +2.38.1 + diff --git a/pkgs/development/libraries/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch b/pkgs/development/libraries/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch new file mode 100644 index 00000000000..9abbbedb9ea --- /dev/null +++ b/pkgs/development/libraries/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch @@ -0,0 +1,42 @@ +From a3b7510e4c9e7201a4301f2a45d8569b06354607 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar <jtojnar@gmail.com> +Date: Sat, 24 Dec 2022 20:30:22 +0100 +Subject: [PATCH 4/4] libbacktrace: Support NIX_DEBUG_INFO_DIRS environment + variable +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Let’s make debug data lookup work on NixOS just like in gdb. +--- + elf.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/elf.c b/elf.c +index 65c647a..5c8abc0 100644 +--- a/elf.c ++++ b/elf.c +@@ -6935,11 +6935,18 @@ elf_add (struct backtrace_state *state, const char *filename, int descriptor, + + if (buildid_data != NULL) + { ++ const char *debug_directories_immutable; ++ const char *nix_debug = getenv ("NIX_DEBUG_INFO_DIRS"); ++ if (nix_debug != NULL) ++ debug_directories_immutable = nix_debug; ++ else ++ debug_directories_immutable = SYSTEM_DEBUG_DIR; ++ + int d; +- char debug_directories[strlen(SYSTEM_DEBUG_DIR) + 1]; ++ char debug_directories[strlen(debug_directories_immutable) + 1]; + char *debug_dir; + +- strcpy(debug_directories, SYSTEM_DEBUG_DIR); ++ strcpy(debug_directories, debug_directories_immutable); + + debug_dir = strtok (debug_directories, ":"); + while (debug_dir != NULL) +-- +2.38.1 + diff --git a/pkgs/development/libraries/libbacktrace/default.nix b/pkgs/development/libraries/libbacktrace/default.nix index 549ed0c29e8..bc998563a73 100644 --- a/pkgs/development/libraries/libbacktrace/default.nix +++ b/pkgs/development/libraries/libbacktrace/default.nix @@ -1,22 +1,52 @@ -{ lib, stdenv, callPackage, fetchFromGitHub +{ stdenv +, lib +, fetchFromGitHub , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !stdenv.hostPlatform.isStatic +, unstableGitUpdater +, autoreconfHook }: -let - yesno = b: if b then "yes" else "no"; -in stdenv.mkDerivation rec { + +stdenv.mkDerivation { pname = "libbacktrace"; - version = "2020-05-13"; + version = "unstable-2022-12-16"; + src = fetchFromGitHub { owner = "ianlancetaylor"; - repo = pname; - rev = "9b7f216e867916594d81e8b6118f092ac3fcf704"; - sha256 = "0qr624v954gnfkmpdlfk66sxz3acyfmv805rybsaggw5gz5sd1nh"; + repo = "libbacktrace"; + rev = "da7eff2f37e38136c5a0c8922957b9dfab5483ef"; + sha256 = "ADp8n1kUf8OysFY/Jv1ytxKjqgz1Nu2VRcFGlt1k/HM="; }; + + patches = [ + # Fix tests with shared library. + # https://github.com/ianlancetaylor/libbacktrace/pull/99 + ./0001-libbacktrace-avoid-libtool-wrapping-tests.patch + + # Support multiple debug dirs. + # https://github.com/ianlancetaylor/libbacktrace/pull/100 + ./0002-libbacktrace-Allow-configuring-debug-dir.patch + ./0003-libbacktrace-Support-multiple-build-id-directories.patch + + # Support NIX_DEBUG_INFO_DIRS environment variable. + ./0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch + ]; + + nativeBuildInputs = [ + autoreconfHook + ]; + configureFlags = [ - "--enable-static=${yesno enableStatic}" - "--enable-shared=${yesno enableShared}" + (lib.enableFeature enableStatic "static") + (lib.enableFeature enableShared "shared") ]; + + doCheck = stdenv.isLinux; + + passthru = { + updateScript = unstableGitUpdater { }; + }; + meta = with lib; { description = "A C library that may be linked into a C/C++ program to produce symbolic backtraces"; homepage = "https://github.com/ianlancetaylor/libbacktrace"; diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 96f53a33b1e..3c4d317d526 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -61,26 +61,21 @@ let platformStr = "linuxarm64"; projectArch = "arm64"; }; - "i686-linux" = { - platformStr = "linux32"; - projectArch = "x86"; - }; "x86_64-linux" = { platformStr = "linux64"; projectArch = "x86_64"; }; }; - platforms."aarch64-linux".sha256 = "0gmnmr0zn2ffn7xbhmfh6rhmwmxy5zzlj0s3lyp99knjn47lg2fg"; - platforms."i686-linux".sha256 = "1lp2z9db89qk2wh900c2dzlhflwmcbmp4m7xnlj04pq4q2kgfm9p"; - platforms."x86_64-linux".sha256 = "1ljrp0iky7rrj04sbqicrg1jr938xnid6jlirbf7gwlmzliz3wfs"; + platforms."aarch64-linux".sha256 = "1aacq9baw0hxf3h354fmws4v6008d3axxmri23vlvhzg7hza05n1"; + platforms."x86_64-linux".sha256 = "17wpmvrbkdhnsk63f36yk6kq0mqhx63ih0mbhf8hl0qj6yndabgc"; platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "100.0.24"; - gitRevision = "0783cf8"; - chromiumVersion = "100.0.4896.127"; + version = "110.0.27"; + gitRevision = "1296c82"; + chromiumVersion = "110.0.5481.100"; src = fetchurl { url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; diff --git a/pkgs/development/libraries/libcef/update.sh b/pkgs/development/libraries/libcef/update.sh index 545f7c70205..d11fd7193d6 100755 --- a/pkgs/development/libraries/libcef/update.sh +++ b/pkgs/development/libraries/libcef/update.sh @@ -12,7 +12,6 @@ GIT_REVISION=$(echo ${VERSION_JSON} | jq -r '.cef_version' | cut -d'+' -f2 | cut CHROMIUM_VERSION=$(echo ${VERSION_JSON} | jq -r '.chromium_version') SHA256_LINUX64=$(nix-prefetch-url --quiet https://cef-builds.spotifycdn.com/cef_binary_${CEF_VERSION}+g${GIT_REVISION}+chromium-${CHROMIUM_VERSION}_linux64_minimal.tar.bz2) -SHA256_LINUX32=$(nix-prefetch-url --quiet https://cef-builds.spotifycdn.com/cef_binary_${CEF_VERSION}+g${GIT_REVISION}+chromium-${CHROMIUM_VERSION}_linux32_minimal.tar.bz2) SHA256_LINUXARM64=$(nix-prefetch-url --quiet https://cef-builds.spotifycdn.com/cef_binary_${CEF_VERSION}+g${GIT_REVISION}+chromium-${CHROMIUM_VERSION}_linuxarm64_minimal.tar.bz2) setKV () { @@ -23,5 +22,4 @@ setKV version ${CEF_VERSION} setKV gitRevision ${GIT_REVISION} setKV chromiumVersion ${CHROMIUM_VERSION} setKV 'platforms."aarch64-linux".sha256' ${SHA256_LINUXARM64} -setKV 'platforms."i686-linux".sha256' ${SHA256_LINUX32} setKV 'platforms."x86_64-linux".sha256' ${SHA256_LINUX64} diff --git a/pkgs/development/libraries/libsegfault/default.nix b/pkgs/development/libraries/libsegfault/default.nix new file mode 100644 index 00000000000..e3a27c21284 --- /dev/null +++ b/pkgs/development/libraries/libsegfault/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, lib +, fetchFromGitHub +, meson +, ninja +, boost +, libbacktrace +, unstableGitUpdater +}: + +stdenv.mkDerivation rec { + pname = "libsegfault"; + version = "unstable-2022-11-13"; + + src = fetchFromGitHub { + owner = "jonathanpoelen"; + repo = "libsegfault"; + rev = "8bca5964613695bf829c96f7a3a14dbd8304fe1f"; + sha256 = "vKtY6ZEkyK2K+BzJCSo30f9MpERpPlUnarFIlvJ1Giw="; + }; + + nativeBuildInputs = [ + meson + ninja + ]; + + buildInputs = [ + boost + libbacktrace + ]; + + passthru = { + updateScript = unstableGitUpdater { }; + }; + + meta = with lib; { + description = "Implementation of libSegFault.so with Boost.stracktrace"; + homepage = "https://github.com/jonathanpoelen/libsegfault"; + license = licenses.asl20; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/ocaml-modules/bls12-381-signature/default.nix b/pkgs/development/ocaml-modules/bls12-381-signature/default.nix index db0a383f925..e7ca964750e 100644 --- a/pkgs/development/ocaml-modules/bls12-381-signature/default.nix +++ b/pkgs/development/ocaml-modules/bls12-381-signature/default.nix @@ -16,6 +16,8 @@ buildDunePackage rec { sha256 = "sha256-KaUpAT+BWxmUP5obi4loR9vVUeQmz3p3zG3CBolUuL4="; }; + duneVersion = "3"; + minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ bls12-381 ]; diff --git a/pkgs/development/ocaml-modules/bls12-381/default.nix b/pkgs/development/ocaml-modules/bls12-381/default.nix index 6c1ff541c5f..8330ce3e2bc 100644 --- a/pkgs/development/ocaml-modules/bls12-381/default.nix +++ b/pkgs/development/ocaml-modules/bls12-381/default.nix @@ -14,6 +14,7 @@ buildDunePackage rec { }; minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ ff-sig diff --git a/pkgs/development/ocaml-modules/bls12-381/gen.nix b/pkgs/development/ocaml-modules/bls12-381/gen.nix index 7949fe20438..2eaf616a77b 100644 --- a/pkgs/development/ocaml-modules/bls12-381/gen.nix +++ b/pkgs/development/ocaml-modules/bls12-381/gen.nix @@ -11,7 +11,7 @@ buildDunePackage rec { sha256 = "qocIfQdv9rniOUykRulu2zWsqkzT0OrsGczgVKALRuk="; }; - useDune2 = true; + duneVersion = "3"; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/bls12-381/legacy.nix b/pkgs/development/ocaml-modules/bls12-381/legacy.nix index c72157c677e..596001da06a 100644 --- a/pkgs/development/ocaml-modules/bls12-381/legacy.nix +++ b/pkgs/development/ocaml-modules/bls12-381/legacy.nix @@ -13,7 +13,9 @@ buildDunePackage rec { pname = "bls12-381-legacy"; - inherit (bls12-381-gen) version src useDune2 doCheck; + inherit (bls12-381-gen) version src doCheck; + + duneVersion = "3"; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/hex/default.nix b/pkgs/development/ocaml-modules/hex/default.nix index 4a6123ebd3a..42c1b5d5c13 100644 --- a/pkgs/development/ocaml-modules/hex/default.nix +++ b/pkgs/development/ocaml-modules/hex/default.nix @@ -1,19 +1,18 @@ -{ lib, fetchurl, buildDunePackage, bigarray-compat, cstruct }: +{ lib, fetchurl, buildDunePackage, cstruct }: buildDunePackage rec { pname = "hex"; - version = "1.4.0"; + version = "1.5.0"; - useDune2 = true; - - minimumOCamlVersion = "4.02"; + duneVersion = "3"; + minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/hex-v${version}.tbz"; - sha256 = "07b9y0lmnflsslkrm6xilkj40n8sf2hjqkyqghnk7sw5l0plkqsp"; + url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/hex-${version}.tbz"; + hash = "sha256-LmfuyhsDBJMHowgxtc1pS8stPn8qa0+1l/vbZHNRtNw="; }; - propagatedBuildInputs = [ bigarray-compat cstruct ]; + propagatedBuildInputs = [ cstruct ]; doCheck = true; meta = { diff --git a/pkgs/development/ocaml-modules/ipaddr/cstruct.nix b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix index c2621584f34..07abfc96734 100644 --- a/pkgs/development/ocaml-modules/ipaddr/cstruct.nix +++ b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix @@ -7,6 +7,8 @@ buildDunePackage rec { inherit (ipaddr) version src; + duneVersion = "3"; + propagatedBuildInputs = [ ipaddr cstruct ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix index c4eefb637fb..6e1170375dc 100644 --- a/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -1,6 +1,6 @@ { lib, buildDunePackage , macaddr, domain-name, stdlib-shims -, ounit, ppx_sexp_conv +, ounit2, ppx_sexp_conv }: buildDunePackage rec { @@ -8,9 +8,12 @@ buildDunePackage rec { inherit (macaddr) version src; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; + propagatedBuildInputs = [ macaddr domain-name stdlib-shims ]; - checkInputs = [ ppx_sexp_conv ounit ]; + checkInputs = [ ppx_sexp_conv ounit2 ]; doCheck = true; meta = macaddr.meta // { diff --git a/pkgs/development/ocaml-modules/ipaddr/sexp.nix b/pkgs/development/ocaml-modules/ipaddr/sexp.nix index 373b5a87e49..a74236c5aa0 100644 --- a/pkgs/development/ocaml-modules/ipaddr/sexp.nix +++ b/pkgs/development/ocaml-modules/ipaddr/sexp.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage -, ipaddr, ipaddr-cstruct, ounit, ppx_sexp_conv +, ipaddr, ipaddr-cstruct, ounit2, ppx_sexp_conv }: buildDunePackage rec { @@ -7,9 +7,11 @@ buildDunePackage rec { inherit (ipaddr) version src; + duneVersion = "3"; + propagatedBuildInputs = [ ipaddr ]; - checkInputs = [ ipaddr-cstruct ounit ppx_sexp_conv ]; + checkInputs = [ ipaddr-cstruct ounit2 ppx_sexp_conv ]; doCheck = true; meta = ipaddr.meta // { diff --git a/pkgs/development/ocaml-modules/macaddr/cstruct.nix b/pkgs/development/ocaml-modules/macaddr/cstruct.nix index db543c0574e..863491e0b7f 100644 --- a/pkgs/development/ocaml-modules/macaddr/cstruct.nix +++ b/pkgs/development/ocaml-modules/macaddr/cstruct.nix @@ -7,6 +7,8 @@ buildDunePackage { inherit (macaddr) version src; + duneVersion = "3"; + propagatedBuildInputs = [ macaddr cstruct ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix index 7eb74ff064d..ab2126843a2 100644 --- a/pkgs/development/ocaml-modules/macaddr/default.nix +++ b/pkgs/development/ocaml-modules/macaddr/default.nix @@ -1,19 +1,20 @@ { lib, fetchurl, buildDunePackage -, ppx_sexp_conv, ounit +, ppx_sexp_conv, ounit2 }: buildDunePackage rec { pname = "macaddr"; - version = "5.3.0"; + version = "5.4.0"; minimalOCamlVersion = "4.04"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-${version}.tbz"; - sha256 = "0mdp38mkvk2f5h2q7nb9fc70a8hyssblnl7kam0d8r5lckgrx5rn"; + hash = "sha256-WmYpG/cQtF9+lVDs1WIievUZ1f7+iZ2hufsdD1HHNeo="; }; - checkInputs = [ ppx_sexp_conv ounit ]; + checkInputs = [ ppx_sexp_conv ounit2 ]; doCheck = true; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/macaddr/sexp.nix b/pkgs/development/ocaml-modules/macaddr/sexp.nix index 1f03c1326a5..5d096dfecec 100644 --- a/pkgs/development/ocaml-modules/macaddr/sexp.nix +++ b/pkgs/development/ocaml-modules/macaddr/sexp.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage -, macaddr, ppx_sexp_conv, macaddr-cstruct, ounit +, macaddr, ppx_sexp_conv, macaddr-cstruct, ounit2 }: buildDunePackage { @@ -7,9 +7,11 @@ buildDunePackage { inherit (macaddr) version src; + duneVersion = "3"; + propagatedBuildInputs = [ ppx_sexp_conv ]; - checkInputs = [ macaddr-cstruct ounit ]; + checkInputs = [ macaddr-cstruct ounit2 ]; doCheck = true; meta = macaddr.meta // { diff --git a/pkgs/development/ocaml-modules/mirage-logs/default.nix b/pkgs/development/ocaml-modules/mirage-logs/default.nix index 7aabd51b819..e54a8bc1b3e 100644 --- a/pkgs/development/ocaml-modules/mirage-logs/default.nix +++ b/pkgs/development/ocaml-modules/mirage-logs/default.nix @@ -1,20 +1,20 @@ { lib, fetchurl, buildDunePackage -, logs, lwt, mirage-clock, mirage-profile, ptime -, alcotest, stdlib-shims +, logs, lwt, mirage-clock, ptime +, alcotest }: buildDunePackage rec { pname = "mirage-logs"; - version = "1.2.0"; + version = "1.3.0"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/mirage-logs/releases/download/v${version}/mirage-logs-v${version}.tbz"; - sha256 = "0h0amzjxy067jljscib7fvw5q8k0adqa8m86affha9hq5jsh07a1"; + url = "https://github.com/mirage/mirage-logs/releases/download/v${version}/mirage-logs-${version}.tbz"; + hash = "sha256-c1YQIutqp58TRz+a9Vd/69FCv0jnGRvFnei9BtSbOxA="; }; - propagatedBuildInputs = [ logs lwt mirage-clock mirage-profile ptime stdlib-shims ]; + propagatedBuildInputs = [ logs lwt mirage-clock ptime ]; doCheck = true; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/mirage-net/default.nix b/pkgs/development/ocaml-modules/mirage-net/default.nix index bc7ae7d96b3..bf4992df76f 100644 --- a/pkgs/development/ocaml-modules/mirage-net/default.nix +++ b/pkgs/development/ocaml-modules/mirage-net/default.nix @@ -6,11 +6,11 @@ buildDunePackage rec { pname = "mirage-net"; version = "4.0.0"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/mirage-net/releases/download/v${version}/mirage-net-v${version}.tbz"; - sha256 = "sha256-Zo7/0Ye4GgqzJFCHDBXbuJ/5ETl/8ziolRgH4lDhlM4="; + hash = "sha256-Zo7/0Ye4GgqzJFCHDBXbuJ/5ETl/8ziolRgH4lDhlM4="; }; propagatedBuildInputs = [ cstruct fmt lwt macaddr mirage-device ]; diff --git a/pkgs/development/ocaml-modules/mirage-profile/default.nix b/pkgs/development/ocaml-modules/mirage-profile/default.nix index ef856e02127..2aba97944e1 100644 --- a/pkgs/development/ocaml-modules/mirage-profile/default.nix +++ b/pkgs/development/ocaml-modules/mirage-profile/default.nix @@ -7,7 +7,7 @@ buildDunePackage rec { pname = "mirage-profile"; version = "0.9.1"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/mirage-profile/releases/download/v${version}/mirage-profile-v${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/mirage/runtime.nix b/pkgs/development/ocaml-modules/mirage/runtime.nix index 8182b7b5ef5..0b7d929f5a8 100644 --- a/pkgs/development/ocaml-modules/mirage/runtime.nix +++ b/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -8,6 +8,7 @@ buildDunePackage rec { inherit (functoria-runtime) src version; minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs lwt ]; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix index 0b4974f910c..17dee792007 100644 --- a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix +++ b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix @@ -2,19 +2,20 @@ , buildDunePackage , fetchurl , ppx_cstruct -, mirage-profile , cstruct +, lwt , ounit -, stdlib-shims }: buildDunePackage rec { pname = "shared-memory-ring"; version = "3.1.1"; + duneVersion = "3"; + src = fetchurl { url = "https://github.com/mirage/shared-memory-ring/releases/download/v${version}/shared-memory-ring-${version}.tbz"; - sha256 = "sha256-KW8grij/OAnFkdUdRRZF21X39DvqayzkTWeRKwF8uoU="; + hash = "sha256-KW8grij/OAnFkdUdRRZF21X39DvqayzkTWeRKwF8uoU="; }; buildInputs = [ @@ -22,13 +23,12 @@ buildDunePackage rec { ]; propagatedBuildInputs = [ - mirage-profile cstruct - stdlib-shims ]; doCheck = true; checkInputs = [ + lwt ounit ]; diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix b/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix index e3ae1ef2e3d..dc34be8ed74 100644 --- a/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix +++ b/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix @@ -14,6 +14,8 @@ buildDunePackage { inherit (shared-memory-ring) version src; + duneVersion = "3"; + buildInputs = [ ppx_cstruct ]; diff --git a/pkgs/development/ocaml-modules/tuntap/default.nix b/pkgs/development/ocaml-modules/tuntap/default.nix index 2bbf89c6127..e5db86d7fee 100644 --- a/pkgs/development/ocaml-modules/tuntap/default.nix +++ b/pkgs/development/ocaml-modules/tuntap/default.nix @@ -6,9 +6,9 @@ buildDunePackage rec { pname = "tuntap"; version = "2.0.0"; - useDune2 = true; + duneVersion = "3"; - minimumOCamlVersion = "4.04.2"; + minimalOCamlVersion = "4.04.2"; src = fetchurl { url = "https://github.com/mirage/ocaml-tuntap/releases/download/v${version}/tuntap-v${version}.tbz"; diff --git a/pkgs/development/python-modules/aiocontextvars/default.nix b/pkgs/development/python-modules/aiocontextvars/default.nix index 09eb8b0dbcf..9684dc406ad 100644 --- a/pkgs/development/python-modules/aiocontextvars/default.nix +++ b/pkgs/development/python-modules/aiocontextvars/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytest-runner , pytestCheckHook , pytest-asyncio , isPy27 @@ -20,9 +19,10 @@ buildPythonPackage rec { sha256 = "0a2gmrm9csiknc8n3si67sgzffkydplh9d7ga1k87ygk2aj22mmk"; }; - buildInputs = [ - pytest-runner - ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'," "" + ''; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/banal/default.nix b/pkgs/development/python-modules/banal/default.nix index 793de7d3a76..066fba0b5c9 100644 --- a/pkgs/development/python-modules/banal/default.nix +++ b/pkgs/development/python-modules/banal/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "Commons of banal micro-functions for Python"; homepage = "https://github.com/pudo/banal"; license = licenses.mit; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/blosc2/default.nix b/pkgs/development/python-modules/blosc2/default.nix index 027dd0ca8e1..87f23b04dcf 100644 --- a/pkgs/development/python-modules/blosc2/default.nix +++ b/pkgs/development/python-modules/blosc2/default.nix @@ -35,6 +35,11 @@ buildPythonPackage rec { hash = "sha256-nbPMLkTye0/Q05ubE35LssN677sUIQErPTxjAtSuGgI="; }; + postPatch = '' + substituteInPlace requirements-runtime.txt \ + --replace "pytest" "" + ''; + nativeBuildInputs = [ cmake cython diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix index 22416afa6eb..fdd2e1f894c 100644 --- a/pkgs/development/python-modules/clevercsv/default.nix +++ b/pkgs/development/python-modules/clevercsv/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "clevercsv"; - version = "0.7.5"; + version = "0.7.6"; format = "setuptools"; src = fetchFromGitHub { owner = "alan-turing-institute"; repo = "CleverCSV"; rev = "refs/tags/v${version}"; - hash = "sha256-zpnUw0ThYbbYS7CYgsi0ZL1qxbY4B1cy2NhrUU9uzig="; + hash = "sha256-mdsznhxTykEGZAFvTRZTCM11fR4tkwfpa95k7udE33c="; }; propagatedBuildInputs = [ @@ -64,7 +64,7 @@ buildPythonPackage rec { with CSV files. ''; homepage = "https://github.com/alan-turing-institute/CleverCSV"; - changelog = "https://github.com/alan-turing-institute/CleverCSV/blob/master/CHANGELOG.md"; + changelog = "https://github.com/alan-turing-institute/CleverCSV/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index acc8093b74f..b5400b185f3 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -84,6 +84,6 @@ buildPythonPackage rec { description = "A set of common utilities, originally split from ScanCode"; homepage = "https://github.com/nexB/commoncode"; license = licenses.asl20; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/cxxfilt/default.nix b/pkgs/development/python-modules/cxxfilt/default.nix index 117b1214576..8b9c8f979c2 100644 --- a/pkgs/development/python-modules/cxxfilt/default.nix +++ b/pkgs/development/python-modules/cxxfilt/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Demangling C++ symbols in Python / interface to abi::__cxa_demangle "; homepage = "https://github.com/afq984/python-cxxfilt"; license = licenses.bsd2; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/debian-inspector/default.nix b/pkgs/development/python-modules/debian-inspector/default.nix index 7568f9af912..cc6a4fffc42 100644 --- a/pkgs/development/python-modules/debian-inspector/default.nix +++ b/pkgs/development/python-modules/debian-inspector/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Utilities to parse Debian package, copyright and control files"; homepage = "https://github.com/nexB/debian-inspector"; license = with licenses; [ asl20 bsd3 mit ]; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/etcd/default.nix b/pkgs/development/python-modules/etcd/default.nix index b98e9a63dd4..d4931696916 100644 --- a/pkgs/development/python-modules/etcd/default.nix +++ b/pkgs/development/python-modules/etcd/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-h+jYIRSNdrGkW3tBV1ifIDEXU46EQGyeJoz/Mxym4pI="; }; - patchPhase = '' + postPatch = '' sed -i -e '13,14d;37d' setup.py ''; @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "A Python etcd client that just works"; homepage = "https://github.com/dsoprea/PythonEtcdClient"; license = licenses.gpl2; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix index bcb47a4fac7..31dd7cac40f 100644 --- a/pkgs/development/python-modules/etils/default.nix +++ b/pkgs/development/python-modules/etils/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "etils"; - version = "1.0.0"; + version = "1.1.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-0QmC93AkIr6oY11ShLi+1in1GRn8EirB4eSr9F7I94U="; + hash = "sha256-eipJUHeaKB70x+WVriFZkLFcHYxviwonhQCSr1rSxkE="; }; nativeBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { passthru.optional-dependencies = rec { array-types = enp; + eapp = [ absl-py /* FIXME package simple-parsing */ ] ++ epy; ecolab = [ jupyter numpy mediapy ] ++ enp ++ epy; edc = epy; enp = [ numpy ] ++ epy; @@ -53,8 +54,8 @@ buildPythonPackage rec { etree = array-types ++ epy ++ enp ++ etqdm; etree-dm = [ dm-tree ] ++ etree; etree-jax = [ jax ] ++ etree; - etree-tf = [ tensorflow etree ] ++ etree; - all = array-types ++ ecolab ++ edc ++ enp ++ epath ++ epy ++ etqdm + etree-tf = [ tensorflow ] ++ etree; + all = array-types ++ eapp ++ ecolab ++ edc ++ enp ++ epath ++ epy ++ etqdm ++ etree ++ etree-dm ++ etree-jax ++ etree-tf; }; @@ -73,14 +74,13 @@ buildPythonPackage rec { ++ passthru.optional-dependencies.all; disabledTests = [ - "test_repr" # known to fail on Python 3.10, see https://github.com/google/etils/issues/143 "test_public_access" # requires network access - "test_resource_path" # known to fail on Python 3.10, see https://github.com/google/etils/issues/143 ]; doCheck = false; # error: infinite recursion encountered meta = with lib; { + changelog = "https://github.com/google/etils/blob/v${version}/CHANGELOG.md"; description = "Collection of eclectic utils for python"; homepage = "https://github.com/google/etils"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/extractcode/7z.nix b/pkgs/development/python-modules/extractcode/7z.nix index 6e2db205e3e..895253d5a45 100644 --- a/pkgs/development/python-modules/extractcode/7z.nix +++ b/pkgs/development/python-modules/extractcode/7z.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { description = "A ScanCode Toolkit plugin to provide pre-built binary libraries and utilities and their locations"; homepage = "https://github.com/nexB/scancode-plugins/tree/main/builtins/extractcode_7z-linux"; license = with licenses; [ asl20 lgpl21 ]; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/extractcode/default.nix b/pkgs/development/python-modules/extractcode/default.nix index 7b42f579ba2..9f45b7178ee 100644 --- a/pkgs/development/python-modules/extractcode/default.nix +++ b/pkgs/development/python-modules/extractcode/default.nix @@ -77,6 +77,6 @@ buildPythonPackage rec { homepage = "https://github.com/nexB/extractcode"; changelog = "https://github.com/nexB/extractcode/releases/tag/v${version}"; license = licenses.asl20; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/extractcode/libarchive.nix b/pkgs/development/python-modules/extractcode/libarchive.nix index efb314fa4c5..f1dd6f12959 100644 --- a/pkgs/development/python-modules/extractcode/libarchive.nix +++ b/pkgs/development/python-modules/extractcode/libarchive.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { description = "A ScanCode Toolkit plugin to provide pre-built binary libraries and utilities and their locations"; homepage = "https://github.com/nexB/scancode-plugins/tree/main/builtins/extractcode_libarchive-linux"; license = with licenses; [ asl20 bsd2 ]; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/fingerprints/default.nix b/pkgs/development/python-modules/fingerprints/default.nix index 30437950b46..05affeb93cb 100644 --- a/pkgs/development/python-modules/fingerprints/default.nix +++ b/pkgs/development/python-modules/fingerprints/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "A library to generate entity fingerprints"; homepage = "https://github.com/alephdata/fingerprints"; license = licenses.mit; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/gemfileparser/default.nix b/pkgs/development/python-modules/gemfileparser/default.nix index b9bcacf02a4..a87073e82a9 100644 --- a/pkgs/development/python-modules/gemfileparser/default.nix +++ b/pkgs/development/python-modules/gemfileparser/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "A library to parse Ruby Gemfile, .gemspec and Cocoapod .podspec file using Python"; homepage = "https://github.com/gemfileparser/gemfileparser"; license = with licenses; [ gpl3Plus /* or */ mit ]; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/intbitset/default.nix b/pkgs/development/python-modules/intbitset/default.nix index aa2fc70eb0d..620ead1afe2 100644 --- a/pkgs/development/python-modules/intbitset/default.nix +++ b/pkgs/development/python-modules/intbitset/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://github.com/inveniosoftware/intbitset"; changelog = "https://github.com/inveniosoftware-contrib/intbitset/blob/v${version}/CHANGELOG.rst"; license = licenses.lgpl3Plus; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/kaitaistruct/default.nix b/pkgs/development/python-modules/kaitaistruct/default.nix index f5285193048..c6f8ebf7eaf 100644 --- a/pkgs/development/python-modules/kaitaistruct/default.nix +++ b/pkgs/development/python-modules/kaitaistruct/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Kaitai Struct: runtime library for Python"; homepage = "https://github.com/kaitai-io/kaitai_struct_python_runtime"; license = licenses.mit; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/liblzfse/default.nix b/pkgs/development/python-modules/liblzfse/default.nix index 90533cc3020..687d1df765b 100644 --- a/pkgs/development/python-modules/liblzfse/default.nix +++ b/pkgs/development/python-modules/liblzfse/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Python bindings for LZFSE"; homepage = "https://github.com/ydkhatri/pyliblzfse"; license = licenses.mit; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/multimethod/default.nix b/pkgs/development/python-modules/multimethod/default.nix index 90e596a5116..cc0ec79acdf 100644 --- a/pkgs/development/python-modules/multimethod/default.nix +++ b/pkgs/development/python-modules/multimethod/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://coady.github.io/multimethod/"; changelog = "https://github.com/coady/multimethod/tree/v${version}#changes"; license = licenses.asl20; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/normality/default.nix b/pkgs/development/python-modules/normality/default.nix index 208898731b7..5770b61718a 100644 --- a/pkgs/development/python-modules/normality/default.nix +++ b/pkgs/development/python-modules/normality/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Micro-library to normalize text strings"; homepage = "https://github.com/pudo/normality"; license = licenses.mit; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index cd1aad3d6a3..92d906407ce 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "14.0.3"; + version = "14.0.4"; disabled = pythonOlder "3.8"; @@ -45,7 +45,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-LAYy1UpGHd3kTH1TIrp9gfrFwXzsXcME6AISf07rUYA="; + hash = "sha256-SLWpMkXq5DlmVgDfRAHtYfEUAVpVKgtnJKO2ffyH5cU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/plugincode/default.nix b/pkgs/development/python-modules/plugincode/default.nix index 831109f8e48..9153c64e719 100644 --- a/pkgs/development/python-modules/plugincode/default.nix +++ b/pkgs/development/python-modules/plugincode/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { description = "Library that provides plugin functionality for ScanCode toolkit"; homepage = "https://github.com/nexB/plugincode"; license = licenses.asl20; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/plugnplay/default.nix b/pkgs/development/python-modules/plugnplay/default.nix index 259fe96028a..a0eda76e4dd 100644 --- a/pkgs/development/python-modules/plugnplay/default.nix +++ b/pkgs/development/python-modules/plugnplay/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "A Generic plug-in system for python applications"; homepage = "https://github.com/daltonmatos/plugnplay"; license = licenses.gpl2Only; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyimpfuzzy/default.nix b/pkgs/development/python-modules/pyimpfuzzy/default.nix index 43e1a1a2b82..18ebf3231e3 100644 --- a/pkgs/development/python-modules/pyimpfuzzy/default.nix +++ b/pkgs/development/python-modules/pyimpfuzzy/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "A Python module which calculates and compares the impfuzzy (import fuzzy hashing)"; homepage = "https://github.com/JPCERTCC/impfuzzy"; license = licenses.gpl2Only; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pymaven-patch/default.nix b/pkgs/development/python-modules/pymaven-patch/default.nix index f74c959cfd7..602399b2d02 100644 --- a/pkgs/development/python-modules/pymaven-patch/default.nix +++ b/pkgs/development/python-modules/pymaven-patch/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Python access to maven"; homepage = "https://github.com/nexB/pymaven"; license = licenses.asl20; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-registry/default.nix b/pkgs/development/python-modules/python-registry/default.nix index 324afa93579..ef5ba5b438b 100644 --- a/pkgs/development/python-modules/python-registry/default.nix +++ b/pkgs/development/python-modules/python-registry/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Pure Python parser for Windows Registry hives"; homepage = "https://github.com/williballenthin/python-registry"; license = licenses.asl20; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/qiling/default.nix b/pkgs/development/python-modules/qiling/default.nix index 0b008f86f88..c9854e34527 100644 --- a/pkgs/development/python-modules/qiling/default.nix +++ b/pkgs/development/python-modules/qiling/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { homepage = "https://qiling.io/"; changelog = "https://github.com/qilingframework/qiling/releases/tag/${version}"; license = licenses.gpl2Only; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/requirements-parser/default.nix b/pkgs/development/python-modules/requirements-parser/default.nix index af6592cadae..11fe8edf6a1 100644 --- a/pkgs/development/python-modules/requirements-parser/default.nix +++ b/pkgs/development/python-modules/requirements-parser/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "Pip requirements file parser"; homepage = "https://github.com/davidfischer/requirements-parser"; license = licenses.bsd2; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/rpmfile/default.nix b/pkgs/development/python-modules/rpmfile/default.nix index e5d656795c2..7da1f609b74 100644 --- a/pkgs/development/python-modules/rpmfile/default.nix +++ b/pkgs/development/python-modules/rpmfile/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Read rpm archive files"; homepage = "https://github.com/srossross/rpmfile"; license = licenses.mit; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/saneyaml/default.nix b/pkgs/development/python-modules/saneyaml/default.nix index 9dd89af51fd..acbaca9ff01 100644 --- a/pkgs/development/python-modules/saneyaml/default.nix +++ b/pkgs/development/python-modules/saneyaml/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "A PyYaml wrapper with sane behaviour to read and write readable YAML safely"; homepage = "https://github.com/nexB/saneyaml"; license = licenses.asl20; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index fb2194e963c..9d50a87e3c4 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -159,6 +159,6 @@ buildPythonPackage rec { description = "Tool to scan code for license, copyright, package and their documented dependencies and other interesting facts"; homepage = "https://github.com/nexB/scancode-toolkit"; license = with licenses; [ asl20 cc-by-40 ]; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/scooby/default.nix b/pkgs/development/python-modules/scooby/default.nix index 0bd037a74fc..ba9049e3ac7 100644 --- a/pkgs/development/python-modules/scooby/default.nix +++ b/pkgs/development/python-modules/scooby/default.nix @@ -25,6 +25,11 @@ buildPythonPackage rec { hash = "sha256-wKbCIA6Xp+VYhcQ5ZpHo5usB+ksnMAJyv5naBvl4Cxo="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "python_requires='>=3.7.*'" "python_requires='>=3.7'" + ''; + SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/spdx-tools/default.nix b/pkgs/development/python-modules/spdx-tools/default.nix index d1e66d67646..08897adcc1d 100644 --- a/pkgs/development/python-modules/spdx-tools/default.nix +++ b/pkgs/development/python-modules/spdx-tools/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/spdx/tools-python"; changelog = "https://github.com/spdx/tools-python/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index c2a2cd5e11a..cb6670c785d 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -55,6 +55,7 @@ buildPythonPackage rec { --replace "return 0" "assert result.wasSuccessful(); return 0" \ --replace "return 1" "assert result.wasSuccessful(); return 1" substituteInPlace requirements.txt \ + --replace "cython>=0.29.21" "" \ --replace "blosc2~=2.0.0" "blosc2" ''; diff --git a/pkgs/development/python-modules/telfhash/default.nix b/pkgs/development/python-modules/telfhash/default.nix index b2cb3c3ac95..40198cddb68 100644 --- a/pkgs/development/python-modules/telfhash/default.nix +++ b/pkgs/development/python-modules/telfhash/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Symbol hash for ELF files"; homepage = "https://github.com/trendmicro/telfhash"; license = licenses.asl20; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/tern/default.nix b/pkgs/development/python-modules/tern/default.nix index 2e95c6acc2f..3b2701960f8 100644 --- a/pkgs/development/python-modules/tern/default.nix +++ b/pkgs/development/python-modules/tern/default.nix @@ -64,6 +64,6 @@ buildPythonPackage rec { homepage = "https://github.com/tern-tools/tern"; changelog = "https://github.com/tern-tools/tern/releases/tag/v${version}"; license = licenses.bsd2; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix index 4a3c4100985..4da0d770231 100644 --- a/pkgs/development/python-modules/testcontainers/default.nix +++ b/pkgs/development/python-modules/testcontainers/default.nix @@ -9,6 +9,8 @@ buildPythonPackage rec { pname = "testcontainers"; version = "3.7.1"; + format = "setuptools"; + src = fetchFromGitHub { owner = "testcontainers"; repo = "testcontainers-python"; @@ -16,6 +18,10 @@ buildPythonPackage rec { hash = "sha256-OHuvUi5oa0fVcfo0FW9XwaUp52MEH4NTM6GqK4ic0oM="; }; + postPatch = '' + echo "${version}" > VERSION + ''; + buildInputs = [ deprecation docker diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix index 3c5ccce3a71..c9f9ba7220a 100644 --- a/pkgs/development/python-modules/typecode/default.nix +++ b/pkgs/development/python-modules/typecode/default.nix @@ -67,6 +67,6 @@ buildPythonPackage rec { homepage = "https://github.com/nexB/typecode"; changelog = "https://github.com/nexB/typecode/releases/tag/v${version}"; license = licenses.asl20; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/typecode/libmagic.nix b/pkgs/development/python-modules/typecode/libmagic.nix index 5668b62e200..5110e5e2a5c 100644 --- a/pkgs/development/python-modules/typecode/libmagic.nix +++ b/pkgs/development/python-modules/typecode/libmagic.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { description = "A ScanCode Toolkit plugin to provide pre-built binary libraries and utilities and their locations"; homepage = "https://github.com/nexB/scancode-plugins/tree/main/builtins/typecode_libmagic-linux"; license = licenses.asl20; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/urlpy/default.nix b/pkgs/development/python-modules/urlpy/default.nix index cd03957e00e..f03b8b56450 100644 --- a/pkgs/development/python-modules/urlpy/default.nix +++ b/pkgs/development/python-modules/urlpy/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Simple URL parsing, canonicalization and equivalence"; homepage = "https://github.com/nexB/urlpy"; license = licenses.mit; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/viv-utils/default.nix b/pkgs/development/python-modules/viv-utils/default.nix index f80d32e9637..8829279a185 100644 --- a/pkgs/development/python-modules/viv-utils/default.nix +++ b/pkgs/development/python-modules/viv-utils/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { homepage = "https://github.com/williballenthin/viv-utils"; changelog = "https://github.com/williballenthin/viv-utils/releases/tag/v${version}"; license = licenses.asl20; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix index 931a052d24f..6a844ebc0ab 100644 --- a/pkgs/development/python-modules/vivisect/default.nix +++ b/pkgs/development/python-modules/vivisect/default.nix @@ -69,6 +69,6 @@ buildPythonPackage rec { homepage = "https://github.com/vivisect/vivisect"; changelog = "https://github.com/vivisect/vivisect/blob/v${version}/CHANGELOG.rst"; license = licenses.asl20; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/woodblock/default.nix b/pkgs/development/python-modules/woodblock/default.nix index 7497ad15489..c74a6ba7882 100644 --- a/pkgs/development/python-modules/woodblock/default.nix +++ b/pkgs/development/python-modules/woodblock/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "A framework to generate file carving test data"; homepage = "https://github.com/fkie-cad/woodblock"; license = licenses.mit; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/build-managers/corrosion/default.nix b/pkgs/development/tools/build-managers/corrosion/default.nix index 1f8e04c0808..0907923e6fc 100644 --- a/pkgs/development/tools/build-managers/corrosion/default.nix +++ b/pkgs/development/tools/build-managers/corrosion/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "corrosion"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "corrosion-rs"; repo = "corrosion"; rev = "v${version}"; - hash = "sha256-g2kA1FYt6OWb0zb3pSQ46dJMsSZpT6kLYkpIIN3XZbI="; + hash = "sha256-r/jrck4RiQynH1+Hx4GyIHpw/Kkr8dHe1+vTHg+fdRs="; }; cargoRoot = "generator"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { inherit src; sourceRoot = "${src.name}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-088qK9meyqV93ezLlBIjdp1l/n+pv+9afaJGYlXEFQc="; + hash = "sha256-d4ep2v1aMQJUiMwwM0QWZo8LQosJoSeVIEx7JXkXHt8="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 6dad681809d..f4c651a8e85 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "15.9.1"; + version = "15.10.0"; in buildGoModule rec { inherit version; @@ -17,13 +17,13 @@ buildGoModule rec { # For patchShebangs buildInputs = [ bash ]; - vendorHash = "sha256-3PtbUVIRCyBBqbfbntOUHBd9p+DWMQt4w+C8enqNiAA="; + vendorHash = "sha256-ASmhcaywnVb62lPZk1+0hHme7IgXylnk8DryhCjQ6dc="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-J8wcTU2bilhEKwOAVgaJk743b66TLndYOxc1k+S/cBg="; + sha256 = "sha256-HwG23eqTPQFvziRKhbMdl5O4OlrC9lgha92J2hzRRS8="; }; patches = [ diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index cb9a6906507..5a2c7dae9b3 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "14.14.1"; + version = "14.14.3"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-EdW9LnSYSa8ulXKSJz3LBktVlDev7CLVOZL9qAytjcQ="; + hash = "sha256-Rxsc77M30aDuDgOtXWF2sQkzv2Xv4sxZ5JlkaqO/AbI="; }; - vendorHash = "sha256-JZ5UiL2vGsXy/xmz+NcAKYDmp5hq7bx54/OdUyQHUp0="; + vendorHash = "sha256-eMmp67B2udc8mhpVq2nHX+v1l1h3dXvjVXenZqCA6m4="; sourceRoot = "source/src"; diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix index 7cac6d50d66..0dc9249d558 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/development/tools/railway/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.0.12"; + version = "3.0.13"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-2RdB/X62/9HKKax+Y+RYPrLEHsWwzOwzJ1Go930bYN0="; + hash = "sha256-ZLzIbA/eIu8cP9F6xSl8exFXDuyw7cYLAy0Zg+dJEzw="; }; - cargoHash = "sha256-Aozg/Pyo7JlTEXul3MEfGLwbRo/qjogWeAUHzK8xssc="; + cargoHash = "sha256-1CqGs1pT/QaA+fFfuhP/O74wpFeVCHFsubIIo+UVLf8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix index cf0a5a99a69..c3b4fbf82eb 100644 --- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix +++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, kernel, linuxHeaders }: +{ lib, stdenv, fetchFromGitHub, kernel, linuxHeaders, pahole }: stdenv.mkDerivation rec { pname = "tuxedo-keyboard-${kernel.version}"; @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "h6+br+JPEItym83MaVt+xo6o/zMtTv8+wsBoTeYa2AM="; }; - buildInputs = [ linuxHeaders ]; + buildInputs = [ + pahole + linuxHeaders + ]; makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index d09c98ef2a2..0bbc654309a 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -29,6 +29,7 @@ , which , yajl , zlib +, zstd }: let @@ -666,6 +667,19 @@ let self = { sha256 = "sha256-x4ry5ljPeJQY+7Mp04/xYIGf22d6Nee7CSqHezdK4gQ="; }; }; + + zstd = { + name = "zstd"; + src = fetchFromGitHub { + name = "zstd"; + owner = "tokers"; + repo = "zstd-nginx-module"; + rev = "25d88c262be47462cf90015ee7ebf6317b6848f9"; + sha256 = "sha256-YRluKekhx1tb6e5IL1FPK05jPtzfQPaHI47cdada928="; + }; + + inputs = [ zstd ]; + }; }; in self // lib.optionalAttrs config.allowAliases { # deprecated or renamed packages modsecurity-nginx = self.modsecurity; diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index fcff16672f3..971865331a1 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -11,13 +11,13 @@ assert withHyperscan -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "rspamd"; - version = "3.4"; + version = "3.5"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - sha256 = "sha256-KEIOyURdioyqD33K3rRTiysGO/zSEm6k29zqjzmK9Uk="; + hash = "sha256-3+ve5cPt4As6Hfvxw77waJgl2Imi9LpredFkYzTchbQ="; }; hardeningEnable = [ "pie" ]; diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/servers/monitoring/mimir/default.nix index 9858cdd818e..f151d31d595 100644 --- a/pkgs/servers/monitoring/mimir/default.nix +++ b/pkgs/servers/monitoring/mimir/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }: buildGoModule rec { pname = "mimir"; - version = "2.6.0"; + version = "2.7.1"; src = fetchFromGitHub { rev = "${pname}-${version}"; owner = "grafana"; repo = pname; - sha256 = "sha256-MOuLXtjmk9wjQMF2ez3NQ7YTKJtX/RItKbgfaANXzhU="; + sha256 = "sha256-5rj7qTomHiplCMcAsKCquH5Z94Syk43Ggoq+Mo1heQA="; }; vendorSha256 = null; diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 5a003b889a0..3a5a83ad1f8 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { "--enable-multibyte" "--with-tcsetpgrp" "--enable-pcre" - "--enable-zprofile=${placeholder "out"}/etc/zprofile" + "--enable-zshenv=${placeholder "out"}/etc/zshenv" "--disable-site-fndir" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform && !stdenv.hostPlatform.isStatic) [ # Also see: https://github.com/buildroot/buildroot/commit/2f32e668aa880c2d4a2cce6c789b7ca7ed6221ba @@ -64,34 +64,36 @@ stdenv.mkDerivation { postInstall = '' make install.info install.html mkdir -p $out/etc/ - cat > $out/etc/zprofile <<EOF + cat > $out/etc/zshenv <<EOF if test -e /etc/NIXOS; then - if test -r /etc/zprofile; then - . /etc/zprofile + if test -r /etc/zshenv; then + . /etc/zshenv else emulate bash alias shopt=false - . /etc/profile + if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then + . /etc/set-environment + fi unalias shopt emulate zsh fi - if test -r /etc/zprofile.local; then - . /etc/zprofile.local + if test -r /etc/zshenv.local; then + . /etc/zshenv.local fi else - # on non-nixos we just source the global /etc/zprofile as if we did + # on non-nixos we just source the global /etc/zshenv as if we did # not use the configure flag - if test -r /etc/zprofile; then - . /etc/zprofile + if test -r /etc/zshenv; then + . /etc/zshenv fi fi EOF ${if stdenv.hostPlatform == stdenv.buildPlatform then '' - $out/bin/zsh -c "zcompile $out/etc/zprofile" + $out/bin/zsh -c "zcompile $out/etc/zshenv" '' else '' - ${lib.getBin buildPackages.zsh}/bin/zsh -c "zcompile $out/etc/zprofile" + ${lib.getBin buildPackages.zsh}/bin/zsh -c "zcompile $out/etc/zshenv" ''} - mv $out/etc/zprofile $out/etc/zprofile_zwc_is_used + mv $out/etc/zshenv $out/etc/zshenv_zwc_is_used rm $out/bin/zsh-${version} mkdir -p $out/share/doc/ diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 4b0ca649ee9..4c218b24d11 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -113,6 +113,7 @@ let showLicenseOrSourceType = value: toString (map (v: v.shortName or "unknown") (lib.lists.toList value)); showLicense = showLicenseOrSourceType; + showPlatforms = value: lib.optionalString (builtins.isList value && builtins.all builtins.isString value) (toString value); showSourceType = showLicenseOrSourceType; pos_str = meta: meta.position or "«unknown-file»"; @@ -368,7 +369,7 @@ let else if !allowBroken && attrs.meta.broken or false then { valid = "no"; reason = "broken"; errormsg = "is marked as broken"; } else if !allowUnsupportedSystem && hasUnsupportedPlatform attrs then - { valid = "no"; reason = "unsupported"; errormsg = "is not supported on ‘${hostPlatform.system}’"; } + { valid = "no"; reason = "unsupported"; errormsg = "is only supported on `${showPlatforms attrs.meta.platforms}` but not on requested ‘${hostPlatform.system}’"; } else if !(hasAllowedInsecure attrs) then { valid = "no"; reason = "insecure"; errormsg = "is marked as insecure"; } diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index a83c1c81c41..fd153b8f768 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2023.02.08"; + version = "2023.03.15"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-cJrRt+if3Ymn/nMCGsw2iObkRQF3hDxaUT9OEYp6j/g="; + hash = "sha256-hLKaPfMZ5nmKRREvto2qd07mj88wEWADfFHNC+FZjIE="; }; meta = with lib; { diff --git a/pkgs/tools/misc/cyclonedx-python/default.nix b/pkgs/tools/misc/cyclonedx-python/default.nix index 97dfd8310da..03b5ba03111 100644 --- a/pkgs/tools/misc/cyclonedx-python/default.nix +++ b/pkgs/tools/misc/cyclonedx-python/default.nix @@ -42,6 +42,6 @@ python3.pkgs.buildPythonApplication rec { description = "Creates CycloneDX Software Bill of Materials (SBOM) from Python projects"; homepage = "https://github.com/CycloneDX/cyclonedx-python"; license = licenses.asl20; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 2f430dea25c..471bd9d62e6 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "2.0.9"; + version = "2.0.10"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "sha256-jHbxROO21cgbhEiWv9wQJyHWGGK14nGQuk9Fc9ufHqg="; + sha256 = "sha256-6bmtSsNjSy7+Q2MWJdrP+zaXKwV4CEiBjhdZju+RBLI="; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/pkgs/tools/misc/xmlbeans/default.nix b/pkgs/tools/misc/xmlbeans/default.nix index ce174b19541..f3702d0302c 100644 --- a/pkgs/tools/misc/xmlbeans/default.nix +++ b/pkgs/tools/misc/xmlbeans/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { pname = "xmlbeans"; - version = "5.0.2-20211014"; + version = "5.1.1-20220819"; src = fetchzip { - url = "https://dlcdn.apache.org/poi/xmlbeans/release/bin/xmlbeans-bin-${version}.zip"; - sha256 = "sha256-1o0kfBMhka/Midtg+GzpVDDygixL6mrfxtY5WrjLN+0="; + # old releases are deleted from the cdn + url = "https://web.archive.org/web/20230313151507/https://dlcdn.apache.org/poi/xmlbeans/release/bin/xmlbeans-bin-${version}.zip"; + sha256 = "sha256-TDnWo1uJWL6k6Z8/uaF2LBNzRVQMHYopYze/2Fb/0aI="; }; postPatch = '' @@ -34,6 +35,6 @@ stdenv.mkDerivation rec { homepage = "https://xmlbeans.apache.org/"; downloadPage = "https://dlcdn.apache.org/poi/xmlbeans/release/bin/"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index b21969f7cab..bdfe03b9408 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -53,6 +53,13 @@ let sha256 = "sha256-tI5nKU7SZgsJrxiskJ5nHZyfrWf5aZyKYExM0792N80="; }; + patch-non-existing-output = fetchpatch { + # https://github.com/NixOS/nix/pull/7283 + name = "fix-requires-non-existing-output.patch"; + url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch"; + sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0="; + }; + in lib.makeExtensible (self: { nix_2_3 = (common rec { version = "2.3.16"; @@ -82,12 +89,7 @@ in lib.makeExtensible (self: { sha256 = "sha256-B9EyDUz/9tlcWwf24lwxCFmkxuPTVW7HFYvp0C4xGbc="; patches = [ ./patches/flaky-tests.patch - (fetchpatch { - # https://github.com/NixOS/nix/pull/7283 - name = "fix-requires-non-existing-output.patch"; - url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch"; - sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0="; - }) + patch-non-existing-output patch-monitorfdhup patch-sqlite-exception ]; @@ -98,12 +100,7 @@ in lib.makeExtensible (self: { sha256 = "sha256-qCV65kw09AG+EkdchDPq7RoeBznX0Q6Qa4yzPqobdOk="; patches = [ ./patches/flaky-tests.patch - (fetchpatch { - # https://github.com/NixOS/nix/pull/7283 - name = "fix-requires-non-existing-output.patch"; - url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch"; - sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0="; - }) + patch-non-existing-output patch-monitorfdhup patch-sqlite-exception ]; diff --git a/pkgs/tools/security/cve-bin-tool/default.nix b/pkgs/tools/security/cve-bin-tool/default.nix index c8a72a88429..94a7ce22409 100644 --- a/pkgs/tools/security/cve-bin-tool/default.nix +++ b/pkgs/tools/security/cve-bin-tool/default.nix @@ -82,6 +82,6 @@ buildPythonApplication rec { description = "CVE Binary Checker Tool"; homepage = "https://github.com/intel/cve-bin-tool"; license = licenses.gpl3Plus; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/tools/security/earlybird/default.nix b/pkgs/tools/security/earlybird/default.nix index 30916acda72..eb13b38c158 100644 --- a/pkgs/tools/security/earlybird/default.nix +++ b/pkgs/tools/security/earlybird/default.nix @@ -21,6 +21,6 @@ buildGoModule { description = "A sensitive data detection tool capable of scanning source code repositories for passwords, key files, and more"; homepage = "https://github.com/americanexpress/earlybird"; license = licenses.asl20; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/tools/security/flare-floss/default.nix b/pkgs/tools/security/flare-floss/default.nix index 84185851787..e8fc5aeff24 100644 --- a/pkgs/tools/security/flare-floss/default.nix +++ b/pkgs/tools/security/flare-floss/default.nix @@ -70,6 +70,6 @@ py.pkgs.buildPythonPackage rec { description = "Automatically extract obfuscated strings from malware"; homepage = "https://github.com/mandiant/flare-floss"; license = licenses.asl20; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/tools/security/honeytrap/default.nix b/pkgs/tools/security/honeytrap/default.nix index 735d5d69bd8..91d1c367182 100644 --- a/pkgs/tools/security/honeytrap/default.nix +++ b/pkgs/tools/security/honeytrap/default.nix @@ -23,6 +23,6 @@ buildGoModule { description = "Advanced Honeypot framework"; homepage = "https://github.com/honeytrap/honeytrap"; license = licenses.asl20; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/tools/security/xorex/default.nix b/pkgs/tools/security/xorex/default.nix index 84919f54826..a1a6e655996 100644 --- a/pkgs/tools/security/xorex/default.nix +++ b/pkgs/tools/security/xorex/default.nix @@ -33,6 +33,6 @@ python3.pkgs.buildPythonApplication rec { description = "XOR Key Extractor"; homepage = "https://github.com/Neo23x0/xorex"; license = licenses.asl20; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/tools/security/yarGen/default.nix b/pkgs/tools/security/yarGen/default.nix index 8a2d51b8e19..4003c7e996e 100644 --- a/pkgs/tools/security/yarGen/default.nix +++ b/pkgs/tools/security/yarGen/default.nix @@ -53,6 +53,6 @@ python3.pkgs.buildPythonApplication rec { description = "A generator for YARA rules"; homepage = "https://github.com/Neo23x0/yarGen"; license = licenses.bsd3; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/tools/text/dcs/default.nix b/pkgs/tools/text/dcs/default.nix index e33c1b44cdf..5edc7896afa 100644 --- a/pkgs/tools/text/dcs/default.nix +++ b/pkgs/tools/text/dcs/default.nix @@ -40,7 +40,7 @@ buildGoModule { description = "Debian Code Search"; homepage = "https://github.com/Debian/dcs"; license = licenses.bsd3; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; broken = stdenv.isAarch64 || stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dcs.x86_64-darwin }; diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index f6adca208fc..ae250f2efee 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, perl -, enableGhostscript ? false, ghostscript # for postscript and html output +, enableGhostscript ? false +, ghostscript, gawk, libX11, libXaw, libXt, libXmu # for postscript and html output , enableHtml ? false, psutils, netpbm # for html output , enableIconv ? false, iconv , enableLibuchardet ? false, libuchardet # for detecting input file encoding in preconv(1) @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { # Parallel build is failing for missing depends. Known upstream as: # https://savannah.gnu.org/bugs/?62084 + # fixed, planned release: 1.23.0 enableParallelBuilding = false; patches = [ @@ -47,10 +49,15 @@ stdenv.mkDerivation rec { --replace "pnmcut" "${lib.getBin netpbm}/bin/pnmcut" \ --replace "pnmcrop" "${lib.getBin netpbm}/bin/pnmcrop" \ --replace "pnmtopng" "${lib.getBin netpbm}/bin/pnmtopng" - substituteInPlace tmac/www.tmac \ + substituteInPlace tmac/www.tmac.in \ --replace "pnmcrop" "${lib.getBin netpbm}/bin/pnmcrop" \ --replace "pngtopnm" "${lib.getBin netpbm}/bin/pngtopnm" \ --replace "@PNMTOPS_NOSETPAGE@" "${lib.getBin netpbm}/bin/pnmtops -nosetpage" + substituteInPlace contrib/groffer/roff2.pl \ + --replace "'gs'" "'${lib.getBin ghostscript}/bin/gs'" + substituteInPlace contrib/pdfmark/pdfroff.sh \ + --replace '$GROFF_GHOSTSCRIPT_INTERPRETER' "${lib.getBin ghostscript}/bin/gs" \ + --replace '$GROFF_AWK_INTERPRETER' "${lib.getBin gawk}/bin/gawk" ''; strictDeps = true; @@ -58,7 +65,7 @@ stdenv.mkDerivation rec { # Required due to the patch that changes .ypp files. ++ lib.optional (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "9") bison; buildInputs = [ perl bash ] - ++ lib.optionals enableGhostscript [ ghostscript ] + ++ lib.optionals enableGhostscript [ ghostscript gawk libX11 libXaw libXt libXmu ] ++ lib.optionals enableHtml [ psutils netpbm ] ++ lib.optionals enableIconv [ iconv ] ++ lib.optionals enableLibuchardet [ libuchardet ]; @@ -66,13 +73,14 @@ stdenv.mkDerivation rec { # Builds running without a chroot environment may detect the presence # of /usr/X11 in the host system, leading to an impure build of the # package. To avoid this issue, X11 support is explicitly disabled. - # Note: If we ever want to *enable* X11 support, then we'll probably - # have to pass "--with-appresdir", too. - configureFlags = [ + configureFlags = lib.optionals (!enableGhostscript) [ "--without-x" + ] ++ [ "ac_cv_path_PERL=${buildPackages.perl}/bin/perl" ] ++ lib.optionals enableGhostscript [ - "--with-gs=${ghostscript}/bin/gs" + "--with-gs=${lib.getBin ghostscript}/bin/gs" + "--with-awk=${lib.getBin gawk}/bin/gawk" + "--with-appresdir=${placeholder "out"}/lib/X11/app-defaults" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "gl_cv_func_signbit=yes" ]; diff --git a/pkgs/tools/text/zoekt/default.nix b/pkgs/tools/text/zoekt/default.nix index 9710932cde6..22059ebbf23 100644 --- a/pkgs/tools/text/zoekt/default.nix +++ b/pkgs/tools/text/zoekt/default.nix @@ -29,6 +29,6 @@ buildGoModule { description = "Fast trigram based code search"; homepage = "https://github.com/google/zoekt"; license = licenses.asl20; - maintainers = teams.determinatesystems.members; + maintainers = [ ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f938271f05..07bcd303c82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12314,8 +12314,13 @@ with pkgs; sozu = callPackage ../servers/sozu { }; - sparrow = callPackage ../applications/blockchains/sparrow { - openimajgrabber = callPackage ../applications/blockchains/sparrow/openimajgrabber.nix { }; + sparrow-unwrapped = callPackage ../applications/blockchains/sparrow { + openimajgrabber = callPackage ../applications/blockchains/sparrow/openimajgrabber.nix {}; + openjdk = openjdk.override { enableJavaFX = true; }; + }; + + sparrow = callPackage ../applications/blockchains/sparrow/fhsenv.nix { + buildFHSUserEnv = buildFHSUserEnvBubblewrap; }; sparsehash = callPackage ../development/libraries/sparsehash { }; @@ -21388,6 +21393,8 @@ with pkgs; libsecret = callPackage ../development/libraries/libsecret { }; + libsegfault = callPackage ../development/libraries/libsegfault { }; + libserdes = callPackage ../development/libraries/libserdes { }; libserialport = callPackage ../development/libraries/libserialport { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c8a19041c06..59b488bc018 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5347,7 +5347,6 @@ let meta = { description = "Perl extension for minifying CSS"; license = with lib.licenses; [ artistic1 ]; - maintainers = teams.determinatesystems.members; }; }; |