diff --git a/ci/OWNERS b/ci/OWNERS index f94fdbc77eaf..2c9d3c0fa690 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -149,8 +149,8 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza # Python-related code and docs /doc/languages-frameworks/python.section.md @mweinelt @natsukium -/maintainers/scripts/update-python-libraries @natsukium -/pkgs/development/interpreters/python @natsukium +/maintainers/scripts/update-python-libraries @mweinelt @natsukium +/pkgs/development/interpreters/python @mweinelt @natsukium /pkgs/top-level/python-packages.nix @natsukium /pkgs/top-level/release-python.nix @natsukium diff --git a/doc/hooks/meson.section.md b/doc/hooks/meson.section.md index 3a7fb5032082..c3cd89b12e89 100644 --- a/doc/hooks/meson.section.md +++ b/doc/hooks/meson.section.md @@ -18,6 +18,16 @@ setup hook registering ninja-based build and install phases. Controls the flags passed to `meson setup` during configure phase. +#### `mesonBuildDir` {#meson-build-dir} + +Directory where Meson will put intermediate files. + +Setting this can be useful for debugging multiple Meson builds while in the same source directory, for example, when building for different platforms. +Different values for each build will prevent build artefacts from interefering with each other. +This setting has no tangible effect when running the build in a sandboxed derivation. + +The default value is `build`. + #### `mesonWrapMode` {#meson-wrap-mode} Which value is passed as diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index feeb6f38673d..d01991784977 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -57,8 +57,8 @@ Available compilers are collected under `haskell.compiler`. Each of those compiler versions has a corresponding attribute set `packages` built with it. However, the non-standard package sets are not tested regularly and, as a result, contain fewer working packages. The corresponding package set for GHC -9.4.5 is `haskell.packages.ghc945`. In fact `haskellPackages` is just an alias -for `haskell.packages.ghc964`: +9.4.5 is `haskell.packages.ghc945`. In fact `haskellPackages` (at the time of writing) is just an alias +for `haskell.packages.ghc966`: Every package set also re-exposes the GHC used to build its packages as `haskell.packages.*.ghc`. diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 3d9736da7fa0..31f7f40346b3 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -55,6 +55,7 @@ sets are * `pkgs.python311Packages` * `pkgs.python312Packages` * `pkgs.python313Packages` +* `pkgs.python314Packages` * `pkgs.pypy27Packages` * `pkgs.pypy39Packages` * `pkgs.pypy310Packages` diff --git a/doc/languages-frameworks/qt.section.md b/doc/languages-frameworks/qt.section.md index dcec4b6fff42..9b3d1e054a62 100644 --- a/doc/languages-frameworks/qt.section.md +++ b/doc/languages-frameworks/qt.section.md @@ -25,12 +25,14 @@ stdenv.mkDerivation { The same goes for Qt 5 where libraries and tools are under `libsForQt5`. -Any Qt package should include `wrapQtAppsHook` in `nativeBuildInputs`, or explicitly set `dontWrapQtApps` to bypass generating the wrappers. +Any Qt package should include `wrapQtAppsHook` or `wrapQtAppsNoGuiHook` in `nativeBuildInputs`, or explicitly set `dontWrapQtApps` to bypass generating the wrappers. ::: {.note} -Qt 6 graphical applications should also include `qtwayland` in `buildInputs` on Linux (but not on platforms e.g. Darwin, where `qtwayland` is not available), to ensure the Wayland platform plugin is available. -This may become default in the future, see [NixOS/nixpkgs#269674](https://github.com/NixOS/nixpkgs/pull/269674). +`wrapQtAppsHook` propagates plugins and QML components from `qtwayland` on platforms that support it, to allow applications to act as native Wayland clients. It should be used for all graphical applications. + +`wrapQtAppsNoGuiHook` does not propagate `qtwayland` to reduce closure size for purely command-line applications. + ::: ## Packages supporting multiple Qt versions {#qt-versions} diff --git a/lib/licenses.nix b/lib/licenses.nix index eb0de0509ac3..3955498b5dce 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -895,6 +895,11 @@ lib.mapAttrs mkLicense ({ fullName = "MIT License"; }; + mit-cmu = { + spdxId = "MIT-CMU"; + fullName = "CMU License"; + }; + mit-feh = { spdxId = "MIT-feh"; fullName = "feh License"; diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index bdeb8eec896d..3f15f90f5b78 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch , updateAutotoolsGnuConfigScriptsHook, autoreconfHook -, IOKit, Carbon }: stdenv.mkDerivation rec { @@ -14,8 +13,8 @@ stdenv.mkDerivation rec { patches = lib.optionals stdenv.hostPlatform.isDarwin [ (fetchpatch { - url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/osx_interface.patch"; - sha256 = "0hq3lvfr0h1m3p0r33jij0s1aspiqlpy533rwv19zrfllb39qvr8"; + url = "https://github.com/macports/macports-ports/raw/c8e15973bc3c1e1ab371bc0ee2de14209e639f17/audio/cdparanoia/files/osx_interface.patch"; + hash = "sha256-9p4+9dRvqLHkpR0RWLQcNL1m7fb7L6r+c9Q2tt4jh0U="; # Our configure patch will subsume it, but we want our configure # patch to be used on all platforms so we cannot just start where # this leaves off. @@ -23,13 +22,38 @@ stdenv.mkDerivation rec { }) (fetchurl { url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/patch-paranoia_paranoia.c.10.4.diff"; - sha256 = "17l2qhn8sh4jy6ryy5si6ll6dndcm0r537rlmk4a6a8vkn852vad"; + hash = "sha256-TW1RkJ0bKaPIrDSfUTKorNlmKDVRF++z8ZJAjSzEgp4="; + }) + # add missing include files needed for function prototypes + (fetchpatch { + url = "https://github.com/macports/macports-ports/raw/f210a6061bc53c746730a37922399c6de6d69cb7/audio/cdparanoia/files/fixing-include.patch"; + hash = "sha256-6a/u4b8/H/4XjyFup23xySgyAI9SMVMom4PLvH8KzhE="; }) ] ++ [ # Has to come after darwin patches ./fix_private_keyword.patch # Order does not matter ./configure.patch + # labs for long + (fetchpatch { + url = "https://github.com/macports/macports-ports/raw/f210a6061bc53c746730a37922399c6de6d69cb7/audio/cdparanoia/files/fixing-labs.patch"; + hash = "sha256-BMMQ5bbPP3eevuwWUVjQCtRBiWbkAHD+O0C0fp+BPaw="; + }) + # use "%s" for passing a buffer to fprintf + (fetchpatch { + url = "https://github.com/macports/macports-ports/raw/f210a6061bc53c746730a37922399c6de6d69cb7/audio/cdparanoia/files/fixing-fprintf.patch"; + hash = "sha256-2dJl16p+f5l3wxVOJhsuLiQ9a4prq7jsRZP8/ygEae4="; + }) + # add support for IDE4-9 + (fetchpatch { + url = "https://salsa.debian.org/optical-media-team/cdparanoia/-/raw/bbf353721834b3784ccc0fd54a36a6b25181f5a4/debian/patches/02-ide-devices.patch"; + hash = "sha256-S6OzftUIPPq9JHsoAE2K51ltsI1WkVaQrpgCjgm5AG4="; + }) + # check buffer is non-null before dereferencing + (fetchpatch { + url = "https://salsa.debian.org/optical-media-team/cdparanoia/-/raw/f7bab3024c5576da1fdb7497abbd6abc8959a98c/debian/patches/04-endian.patch"; + hash = "sha256-krfprwls0L3hsNfoj2j69J5k1RTKEQtzE0fLYG9EJKo="; + }) ] ++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch; nativeBuildInputs = [ @@ -37,13 +61,6 @@ stdenv.mkDerivation rec { autoreconfHook ]; - propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - IOKit - ]; - - hardeningDisable = [ "format" ]; - # Build system reuses the same object file names for shared and static # library. Occasionally fails in the middle: # gcc -O2 -fsigned-char -g -O2 -c scan_devices.c diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 9fe4e925c13a..f18469f56588 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -22,11 +22,11 @@ assert withConplay -> !libOnly; stdenv.mkDerivation rec { pname = "${lib.optionalString libOnly "lib"}mpg123"; - version = "1.32.7"; + version = "1.32.8"; src = fetchurl { url = "mirror://sourceforge/mpg123/mpg123-${version}.tar.bz2"; - hash = "sha256-PIkZJDcHlRysDjw5u/KGU7yv/EPJj/FoAaJzUNuPDyE="; + hash = "sha256-/u4TdMeVQODkBd8LxF/eIK1nARQlw2GidZ4hRolKJ6c="; }; outputs = [ "out" "dev" "man" ] ++ lib.optional withConplay "conplay"; diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index bd6513e4e4f7..8ce689018e25 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -31,24 +31,10 @@ , qtnetworkauth , qttools , nixosTests -, darwin +, apple-sdk_11 }: -let - stdenv' = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; - # portaudio propagates Darwin frameworks. Rebuild it using the 11.0 stdenv - # from Qt and the 11.0 SDK frameworks. - portaudio' = if stdenv.hostPlatform.isDarwin then portaudio.override { - stdenv = stdenv'; - inherit (darwin.apple_sdk_11_0.frameworks) - AudioUnit - AudioToolbox - CoreAudio - CoreServices - Carbon - ; - } else portaudio; -in stdenv'.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "musescore"; version = "4.4.3"; @@ -116,7 +102,7 @@ in stdenv'.mkDerivation (finalAttrs: { libpulseaudio libsndfile libvorbis - portaudio' + portaudio portmidi flac libopusenc @@ -132,7 +118,7 @@ in stdenv'.mkDerivation (finalAttrs: { alsa-lib qtwayland ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Cocoa + apple-sdk_11 ]; postInstall = '' diff --git a/pkgs/applications/editors/emacs/build-support/elpa2nix.el b/pkgs/applications/editors/emacs/build-support/elpa2nix.el index b0b4ecedc360..97cf2fd58a06 100644 --- a/pkgs/applications/editors/emacs/build-support/elpa2nix.el +++ b/pkgs/applications/editors/emacs/build-support/elpa2nix.el @@ -34,9 +34,10 @@ The file can either be a tar file or an Emacs Lisp file." (let ((flag (getenv "turnCompilationWarningToError"))) (when (and flag - (not (string-empty-p flag))) + ;; we do not use `string-empty-p' because it requires subr-x in Emacs <= 26 + (not (string= flag ""))) (setq byte-compile-error-on-warn t))) (let ((flag (getenv "ignoreCompilationError"))) - (when (string-empty-p flag) + (when (string= flag "") (setq byte-compile-debug t))) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 67cf247fe72a..afe60212baf7 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: rec { - version = "9.1.0765"; + version = "9.1.0787"; outputs = [ "out" "xxd" ]; @@ -8,7 +8,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-LtEEMpdWXA6qyjAIjgsZoc4hNXXG2ZXxCsbWKC5aEPI="; + hash = "sha256-kV2SaIOUv+ZcDsqBibZZ38gCevVLhejcYtY0TCQVtig="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 2005eef7b6fe..23aa24ff9b6d 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -139,7 +139,6 @@ stdenv.mkDerivation (finalAttrs: { # Xcode project or pass it as a flag to xcodebuild as well. postConfigure = '' substituteInPlace src/auto/config.mk \ - --replace "PERL_CFLAGS${"\t"}=" "PERL_CFLAGS${"\t"}= -I${darwin.libutil}/include" \ --replace " -L${stdenv.cc.libc}/lib" "" \ --replace " -L${darwin.libobjc}/lib" "" \ --replace " -L${darwin.libunwind}/lib" "" \ diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix new file mode 100644 index 000000000000..98b1697e9e70 --- /dev/null +++ b/pkgs/applications/editors/yi/wrapper.nix @@ -0,0 +1,28 @@ +# To use this for hacking of your Yi config file, drop into a shell +# with env attribute. +{ + lib, + stdenv, + makeWrapper, + haskellPackages, + extraPackages ? (s: [ ]), +}: +let + yiEnv = haskellPackages.ghcWithPackages (self: [ self.yi ] ++ extraPackages self); +in +stdenv.mkDerivation { + pname = "yi-custom"; + dontUnpack = true; + nativeBuildInputs = [ makeWrapper ]; + + buildCommand = '' + mkdir -p $out/bin + makeWrapper ${haskellPackages.yi}/bin/yi $out/bin/yi \ + --set NIX_GHC ${yiEnv}/bin/ghc + ''; + + # For hacking purposes + passthru.env = yiEnv; + + inherit (haskellPackages.yi) meta version; +} diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix index 423ceaadc087..cb03e41704c5 100644 --- a/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , qtsvg -, qtwayland , qttools , exiv2 , wrapQtAppsHook @@ -28,7 +27,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ qtsvg - qtwayland exiv2 ]; diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index 293fb563af60..71682501b28f 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, stdenv, zlib, ncurses, libiconv, darwin }: +{ lib, fetchurl, stdenv, zlib, ncurses, libiconv, apple-sdk_11, darwinMinVersionHook }: stdenv.mkDerivation (finalAttrs: { pname = "fnc"; @@ -9,18 +9,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-npS+sOxF0S/9TuFjtEFlev0HpIOsaP6zmcfopPNUehk="; }; - buildInputs = [ libiconv ncurses zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libutil - ]; + buildInputs = [ libiconv ncurses zlib apple-sdk_11 (darwinMinVersionHook "11.0") ]; makeFlags = [ "PREFIX=$(out)" ]; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ # Needed with GCC 12 "-Wno-error=maybe-uninitialized" - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # error: 'strtonum' is only available on macOS 11.0 or newer - "-Wno-error=unguarded-availability-new" ]); preInstall = '' diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 1b4f736ed63f..57779cb487d0 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -245,10 +245,11 @@ stdenv.mkDerivation (finalAttrs: { + (if svnSupport then '' # wrap git-svn - wrapProgram $out/libexec/git-core/git-svn \ - --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath (perlLibs ++ [svn.out])}" \ - --prefix PATH : "${svn.out}/bin" '' - else '' # replace git-svn by notification script + wrapProgram $out/libexec/git-core/git-svn \ + --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath (perlLibs ++ [svn.out])}" \ + --prefix PATH : "${svn.out}/bin" + '' else '' + # replace git-svn by notification script notSupported $out/libexec/git-core/git-svn '') @@ -261,9 +262,11 @@ stdenv.mkDerivation (finalAttrs: { notSupported $out/libexec/git-core/git-send-email '') - + lib.optionalString withManual ''# Install man pages + + lib.optionalString withManual '' + # Install man pages make -j $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \ - -C Documentation '' + -C Documentation + '' + (if guiSupport then '' # Wrap Tcl/Tk programs diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 5a790ff3f4d3..fd41363e1650 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -21,11 +21,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - hash = "sha256-Aw6Kem1ZDk6utAPuJWdWFc2A0jbzq4oLVtzIQYEViwU="; + hash = "sha256-qsYYEGdorR7ZdsP+fIZZ/smebwtTN+pupVT66EkMT04="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - hash = "sha256-i5AVyi9m7qLLubhV8fBhhZ6/RYOjMdwmv9Bek9pT/xo="; + hash = "sha256-/HjgGtjKfLLufEqyT7xHYIlC5xnVunYoA+H1xLS1bVw="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; diff --git a/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh b/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh index 0a2961bbe46e..75d9484846a8 100644 --- a/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh +++ b/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh @@ -79,19 +79,3 @@ if [ ! "$havePlatformVersionFlag" ]; then extraBefore+=(-@darwinPlatform@_version_min "${@darwinMinVersionVariable@_@suffixSalt@:-@darwinMinVersion@}") fi fi - -mangleVarSingle DEVELOPER_DIR ${role_suffixes[@]+"${role_suffixes[@]}"} - -# Allow wrapped bintools to do something useful when no `DEVELOPER_DIR` is set, which can happen when -# the compiler is run outside of a stdenv or intentionally in an environment with no environment variables set. -DEVELOPER_DIR=${DEVELOPER_DIR_@suffixSalt@:-@fallback_sdk@} - -# Darwin looks for frameworks in the SDK located at `DEVELOPER_DIR`. -extraBefore+=("-F$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks") -extraBefore+=("-L$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib") - -# While the Swift wrapper should take care of this, anything that needs to link Swift auto-linked frameworks -# also needs these paths. Note: Test and conditionally add it because the path may not exist in older SDKs. -if [ -d "$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/swift" ]; then - extraBefore+=("-L$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/swift") -fi diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index a2a0736c2221..736494b5ee55 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -372,24 +372,15 @@ stdenvNoCC.mkDerivation { substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash + substituteAll ${../wrapper-common/darwin-sdk-setup.bash} $out/nix-support/darwin-sdk-setup.bash '' ### ### Ensure consistent LC_VERSION_MIN_MACOSX ### - + optionalString targetPlatform.isDarwin ( - let - inherit (targetPlatform) - darwinPlatform darwinSdkVersion - darwinMinVersion darwinMinVersionVariable; - in '' - export darwinPlatform=${darwinPlatform} - export darwinMinVersion=${darwinMinVersion} - export darwinSdkVersion=${darwinSdkVersion} - export darwinMinVersionVariable=${darwinMinVersionVariable} - substituteAll ${./add-darwin-ldflags-before.sh} $out/nix-support/add-local-ldflags-before.sh - '' - ) + + optionalString targetPlatform.isDarwin '' + substituteAll ${./add-darwin-ldflags-before.sh} $out/nix-support/add-local-ldflags-before.sh + '' ## ## Extra custom steps @@ -403,10 +394,17 @@ stdenvNoCC.mkDerivation { # TODO(@sternenseemann): rename env var via stdenv rebuild shell = (getBin runtimeShell + runtimeShell.shellPath or ""); gnugrep_bin = optionalString (!nativeTools) gnugrep; + rm = if nativeTools then "rm" else lib.getExe' coreutils "rm"; + mktemp = if nativeTools then "mktemp" else lib.getExe' coreutils "mktemp"; wrapperName = "BINTOOLS_WRAPPER"; inherit dynamicLinker targetPrefix suffixSalt coreutils_bin; inherit bintools_bin libc_bin libc_dev libc_lib; default_hardening_flags_str = builtins.toString defaultHardeningFlags; + } // lib.mapAttrs (_: lib.optionalString targetPlatform.isDarwin) { + # These will become empty strings when not targeting Darwin. + inherit (targetPlatform) + darwinPlatform darwinSdkVersion + darwinMinVersion darwinMinVersionVariable; } // lib.optionalAttrs (apple-sdk != null && stdenvNoCC.targetPlatform.isDarwin) { # Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`. fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk; diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index 7e00d02b0374..a3a3eddc52bc 100644 --- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -16,6 +16,8 @@ fi source @out@/nix-support/utils.bash +source @out@/nix-support/darwin-sdk-setup.bash + if [ -z "${NIX_BINTOOLS_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then source @out@/nix-support/add-flags.sh fi @@ -42,9 +44,9 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}" while (( "$n" < "$nParams" )); do p=${params[n]} p2=${params[n+1]:-} # handle `p` being last one - if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then + if [ "${p:0:3}" = -L/ ] && badPathWithDarwinSdk "${p:2}"; then skip "${p:2}" - elif [ "$p" = -L ] && badPath "$p2"; then + elif [ "$p" = -L ] && badPathWithDarwinSdk "$p2"; then n+=1; skip "$p2" elif [ "$p" = -rpath ] && badPath "$p2"; then n+=1; skip "$p2" @@ -251,8 +253,8 @@ PATH="$path_backup" # Old bash workaround, see above. if (( "${NIX_LD_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then - responseFile=$(mktemp "${TMPDIR:-/tmp}/ld-params.XXXXXX") - trap 'rm -f -- "$responseFile"' EXIT + responseFile=$(@mktemp@ "${TMPDIR:-/tmp}/ld-params.XXXXXX") + trap '@rm@ -f -- "$responseFile"' EXIT printf "%q\n" \ ${extraBefore+"${extraBefore[@]}"} \ ${params+"${params[@]}"} \ diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index cd5396f45f8b..2c3dc8884023 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -78,28 +78,12 @@ if [ -e @out@/nix-support/cc-cflags-before ]; then NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@="$(< @out@/nix-support/cc-cflags-before) $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@" fi -# Only add darwin min version flag and set up `DEVELOPER_DIR` if a default darwin min version is set, +# Only add darwin min version flag if a default darwin min version is set, # which is a signal that we're targetting darwin. if [ "@darwinMinVersion@" ]; then mangleVarSingle @darwinMinVersionVariable@ ${role_suffixes[@]+"${role_suffixes[@]}"} NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@="-m@darwinPlatformForCC@-version-min=${@darwinMinVersionVariable@_@suffixSalt@:-@darwinMinVersion@} $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@" - - # `DEVELOPER_DIR` is used to dynamically locate libSystem (and the SDK frameworks) based on the SDK at that path. - mangleVarSingle DEVELOPER_DIR ${role_suffixes[@]+"${role_suffixes[@]}"} - - # Allow wrapped compilers to do something useful when no `DEVELOPER_DIR` is set, which can happen when - # the compiler is run outside of a stdenv or intentionally in an environment with no environment variables set. - DEVELOPER_DIR=${DEVELOPER_DIR_@suffixSalt@:-@fallback_sdk@} - - # xcbuild needs `SDKROOT` to be the name of the SDK, which it sets in its own wrapper, - # but compilers expect it to point to the absolute path. - SDKROOT="$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" - - # Set up various library paths since compilers may not support (or may have disabled) finding them in the sysroot. - NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@+=" -isysroot $SDKROOT" - NIX_CFLAGS_COMPILE_@suffixSalt@+=" -idirafter $SDKROOT/usr/include" - NIX_CFLAGS_COMPILE_@suffixSalt@+=" -iframework $SDKROOT/System/Library/Frameworks" fi # That way forked processes will not extend these environment variables again. diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 4cc661721f44..da1a709684da 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -17,6 +17,8 @@ fi source @out@/nix-support/utils.bash +source @out@/nix-support/darwin-sdk-setup.bash + # Parse command line options and set several variables. # For instance, figure out if linker flags should be passed. @@ -101,7 +103,7 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "$NIX_STORE" ]]; then -[IL] | -isystem) path=$p2 skipNext=true ;; esac - if [[ -n $path ]] && badPath "$path"; then + if [[ -n $path ]] && badPathWithDarwinSdk "$path"; then skip "$path" $skipNext && n+=1 continue @@ -251,8 +253,8 @@ if [[ -e @out@/nix-support/cc-wrapper-hook ]]; then fi if (( "${NIX_CC_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then - responseFile=$(mktemp "${TMPDIR:-/tmp}/cc-params.XXXXXX") - trap 'rm -f -- "$responseFile"' EXIT + responseFile=$(@mktemp@ "${TMPDIR:-/tmp}/cc-params.XXXXXX") + trap '@rm@ -f -- "$responseFile"' EXIT printf "%q\n" \ ${extraBefore+"${extraBefore[@]}"} \ ${params+"${params[@]}"} \ diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 085f64d37dd4..001123fe3d85 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -284,13 +284,6 @@ let if (targetPlatform.darwinPlatform == "macos" && isGNU) then "macosx" else targetPlatform.darwinPlatform ); - - darwinMinVersion = optionalString targetPlatform.isDarwin ( - targetPlatform.darwinMinVersion - ); - - darwinMinVersionVariable = optionalString targetPlatform.isDarwin - targetPlatform.darwinMinVersionVariable; in assert includeFortifyHeaders' -> fortify-headers != null; @@ -707,6 +700,7 @@ stdenvNoCC.mkDerivation { substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash + substituteAll ${../wrapper-common/darwin-sdk-setup.bash} $out/nix-support/darwin-sdk-setup.bash '' + optionalString cc.langAda or false '' @@ -743,14 +737,19 @@ stdenvNoCC.mkDerivation { # TODO(@sternenseemann): rename env var via stdenv rebuild shell = getBin runtimeShell + runtimeShell.shellPath or ""; gnugrep_bin = optionalString (!nativeTools) gnugrep; + rm = if nativeTools then "rm" else lib.getExe' coreutils "rm"; + mktemp = if nativeTools then "mktemp" else lib.getExe' coreutils "mktemp"; # stdenv.cc.cc should not be null and we have nothing better for now. # if the native impure bootstrap is gotten rid of this can become `inherit cc;` again. cc = optionalString (!nativeTools) cc; wrapperName = "CC_WRAPPER"; inherit suffixSalt coreutils_bin bintools; inherit libc_bin libc_dev libc_lib; - inherit darwinPlatformForCC darwinMinVersion darwinMinVersionVariable; + inherit darwinPlatformForCC; default_hardening_flags_str = builtins.toString defaultHardeningFlags; + } // lib.mapAttrs (_: lib.optionalString targetPlatform.isDarwin) { + # These will become empty strings when not targeting Darwin. + inherit (targetPlatform) darwinMinVersion darwinMinVersionVariable; } // lib.optionalAttrs (apple-sdk != null && stdenvNoCC.targetPlatform.isDarwin) { # Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`. fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk; diff --git a/pkgs/build-support/wrapper-common/darwin-sdk-setup.bash b/pkgs/build-support/wrapper-common/darwin-sdk-setup.bash new file mode 100644 index 000000000000..3b31a4aa6981 --- /dev/null +++ b/pkgs/build-support/wrapper-common/darwin-sdk-setup.bash @@ -0,0 +1,16 @@ +accumulateRoles + +# Only set up `DEVELOPER_DIR` if a default darwin min version is set, +# which is a signal that we're targetting darwin. +if [[ "@darwinMinVersion@" ]]; then + # `DEVELOPER_DIR` is used to dynamically locate libSystem (and the SDK frameworks) based on the SDK at that path. + mangleVarSingle DEVELOPER_DIR ${role_suffixes[@]+"${role_suffixes[@]}"} + + # Allow wrapped compilers to do something useful when no `DEVELOPER_DIR` is set, which can happen when + # the compiler is run outside of a stdenv or intentionally in an environment with no environment variables set. + export DEVELOPER_DIR=${DEVELOPER_DIR_@suffixSalt@:-@fallback_sdk@} + + # xcbuild needs `SDKROOT` to be the name of the SDK, which it sets in its own wrapper, + # but compilers expect it to point to the absolute path. + export SDKROOT="$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" +fi diff --git a/pkgs/build-support/wrapper-common/utils.bash b/pkgs/build-support/wrapper-common/utils.bash index 2faf96df15b4..c9870d1b4d41 100644 --- a/pkgs/build-support/wrapper-common/utils.bash +++ b/pkgs/build-support/wrapper-common/utils.bash @@ -118,6 +118,21 @@ badPath() { "${p#"${TEMPDIR:-/tmp}"}" = "$p" } +# Like `badPath`, but handles paths that may be interpreted relative to +# `$SDKROOT` on Darwin. For example, `-L/usr/lib/swift` is interpreted +# as `-L$SDKROOT/usr/lib/swift` when `$SDKROOT` is set and +# `$SDKROOT/usr/lib/swift` exists. +badPathWithDarwinSdk() { + path=$1 + if [[ "@darwinMinVersion@" ]]; then + sdkPath=$SDKROOT/$path + if [[ -e $sdkPath ]]; then + path=$sdkPath + fi + fi + badPath "$path" +} + expandResponseParams() { declare -ga params=("$@") local arg diff --git a/pkgs/by-name/ab/abduco/package.nix b/pkgs/by-name/ab/abduco/package.nix index 1f454d40bc85..eef5fe0df344 100644 --- a/pkgs/by-name/ab/abduco/package.nix +++ b/pkgs/by-name/ab/abduco/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchzip, writeText, darwin, conf ? null }: +{ lib, stdenv, fetchpatch, fetchzip, writeText, conf ? null }: let rev = "8c32909a159aaa9484c82b71f05b7a73321eb491"; @@ -21,10 +21,6 @@ stdenv.mkDerivation { installFlags = [ "install-completion" ]; CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE"; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libutil - ]; - patches = [ # https://github.com/martanne/abduco/pull/22 (fetchpatch { diff --git a/pkgs/by-name/ap/apbs/package.nix b/pkgs/by-name/ap/apbs/package.nix index 87cd5fed1373..bb8ba7afeff3 100644 --- a/pkgs/by-name/ap/apbs/package.nix +++ b/pkgs/by-name/ap/apbs/package.nix @@ -7,8 +7,6 @@ , suitesparse , python3 , libintl -, libiconv -, darwin }: let # this is a fork version of fetk (http://www.fetk.org/) @@ -87,8 +85,6 @@ stdenv.mkDerivation (finalAttrs: { python3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libintl - libiconv - darwin.libutil ]; cmakeFlags = [ diff --git a/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix b/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix index f4d80eed0b49..668ac586cb01 100644 --- a/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix +++ b/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix @@ -54,6 +54,8 @@ self: super: { libiconv darwin.libresolv darwin.libsbuf + # Shipped with the SDK only as a library with no headers + (lib.getLib darwin.libutil) # Required by some SDK headers cupsHeaders ] diff --git a/pkgs/by-name/ap/apple-sdk/package.nix b/pkgs/by-name/ap/apple-sdk/package.nix index 2fb57182001c..31017a6a9ae5 100644 --- a/pkgs/by-name/ap/apple-sdk/package.nix +++ b/pkgs/by-name/ap/apple-sdk/package.nix @@ -48,9 +48,13 @@ let (callPackage ./common/propagate-inputs.nix { }) (callPackage ./common/propagate-xcrun.nix { }) ] - ++ [ - # These have to happen last. + # Older SDKs do not include the libraries re-exported from umbrella frameworks in the umbrellas’ stubs, which causes + # link failures for those libraries unless their paths have been rewritten to point to the store. + ++ lib.optionals (lib.versionOlder sdkVersion "11.0") [ (callPackage ./common/rewrite-sdk-paths.nix { inherit sdkVersion; }) + ] + # This has to happen last. + ++ [ (callPackage ./common/run-build-phase-hooks.nix { }) ] ); diff --git a/pkgs/by-name/au/auto-patchelf/package.nix b/pkgs/by-name/au/auto-patchelf/package.nix index 5096c4fcf56a..adff3a5e40c0 100644 --- a/pkgs/by-name/au/auto-patchelf/package.nix +++ b/pkgs/by-name/au/auto-patchelf/package.nix @@ -1,18 +1,29 @@ { + stdenv, + python3, lib, - python3Packages, }: -python3Packages.buildPythonApplication { +let + pythonEnv = python3.withPackages (ps: [ ps.pyelftools ]); + +in +# Note: Not using python3Packages.buildPythonApplication because of dependency propagation. +stdenv.mkDerivation { pname = "auto-patchelf"; version = "0-unstable-2024-08-14"; - pyproject = false; + + buildInputs = [ pythonEnv ]; src = ./source; - dependencies = with python3Packages; [ - pyelftools - ]; + buildPhase = '' + runHook preBuild + + substituteInPlace auto-patchelf.py --replace-fail "@defaultBintools@" "$NIX_BINTOOLS" + + runHook postBuild + ''; installPhase = '' runHook preInstall @@ -22,10 +33,6 @@ python3Packages.buildPythonApplication { runHook postInstall ''; - makeWrapperArgs = [ - "--set DEFAULT_BINTOOLS $NIX_BINTOOLS" - ]; - meta = { description = "Automatically patch ELF binaries using patchelf"; mainProgram = "auto-patchelf"; diff --git a/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py b/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py index 938ea6310118..2a1090302ee9 100644 --- a/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py +++ b/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py @@ -21,6 +21,9 @@ from elftools.elf.elffile import ELFFile # type: ignore from elftools.elf.enums import ENUM_E_TYPE, ENUM_EI_OSABI # type: ignore +DEFAULT_BINTOOLS = "@defaultBintools@" + + @contextmanager def open_elf(path: Path) -> Iterator[ELFFile]: with path.open('rb') as stream: @@ -425,7 +428,7 @@ interpreter_arch: str = None # type: ignore libc_lib: Path = None # type: ignore if __name__ == "__main__": - nix_support = Path(os.environ.get('NIX_BINTOOLS', os.environ['DEFAULT_BINTOOLS'])) / 'nix-support' + nix_support = Path(os.environ.get('NIX_BINTOOLS', DEFAULT_BINTOOLS)) / 'nix-support' interpreter_path = Path((nix_support / 'dynamic-linker').read_text().strip()) libc_lib = Path((nix_support / 'orig-libc').read_text().strip()) / 'lib' diff --git a/pkgs/by-name/au/autoconf-archive/package.nix b/pkgs/by-name/au/autoconf-archive/package.nix index 3fbfabcee265..a507fd8094ef 100644 --- a/pkgs/by-name/au/autoconf-archive/package.nix +++ b/pkgs/by-name/au/autoconf-archive/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "autoconf-archive"; - version = "2023.02.20"; + version = "2024.10.16"; src = fetchurl { url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz"; - hash = "sha256-cdQEhHmuKPH1eUYZw9ct+cAd9JscYo74X943WW3DGjM="; + hash = "sha256-e81dABkW86UO10NvT3AOPSsbrePtgDIZxZLWJQKlc2M="; }; strictDeps = true; diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index f18b65c62552..05729f8aa848 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20240808"; + version = "20240921"; src = fetchurl { url = "https://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-tZGJJRtIPezUSS8fdDh7KlhMA9WqRjfNSLOOxiucCEg="; + hash = "sha256-s0ZXnoLSltGk2ineqFlOPuWWEwsgeG3sDziZo+ESdcI="; }; patches = [ diff --git a/pkgs/by-name/bo/boehmgc/package.nix b/pkgs/by-name/bo/boehmgc/package.nix index 1c46aea7f9ca..df5e9f854e90 100644 --- a/pkgs/by-name/bo/boehmgc/package.nix +++ b/pkgs/by-name/bo/boehmgc/package.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , autoreconfHook -# doc: https://github.com/ivmai/bdwgc/blob/v8.2.6/doc/README.macros (LARGE_CONFIG) +# doc: https://github.com/ivmai/bdwgc/blob/v8.2.8/doc/README.macros (LARGE_CONFIG) , enableLargeConfig ? false , enableMmap ? true , enableStatic ? false @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "boehm-gc"; - version = "8.2.6"; + version = "8.2.8"; src = fetchFromGitHub { owner = "ivmai"; repo = "bdwgc"; rev = "v${finalAttrs.version}"; - hash = "sha256-y6hU5qU4qO9VvQvKNH9dvReCrf3+Ih2HHbF6IS1V3WQ="; + hash = "sha256-UQSLK/05uPal6/m+HMz0QwXVII1leonlmtSZsXjJ+/c="; }; outputs = [ "out" "dev" "doc" ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { # not fix the problem the test failure will be a reminder to # extend the set of versions requiring the workaround). makeFlags = lib.optionals (stdenv.hostPlatform.isPower64 && - finalAttrs.version == "8.2.6") + finalAttrs.version == "8.2.8") [ # do not use /proc primitives to track dirty bits; see: # https://github.com/ivmai/bdwgc/issues/479#issuecomment-1279687537 diff --git a/pkgs/by-name/br/brotli/package.nix b/pkgs/by-name/br/brotli/package.nix index 94ed992812e5..0a7bbfe1746c 100644 --- a/pkgs/by-name/br/brotli/package.nix +++ b/pkgs/by-name/br/brotli/package.nix @@ -54,18 +54,18 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/google/brotli"; description = "Generic-purpose lossless compression algorithm and tool"; - longDescription = - '' Brotli is a generic-purpose lossless compression algorithm that - compresses data using a combination of a modern variant of the LZ77 - algorithm, Huffman coding and 2nd order context modeling, with a - compression ratio comparable to the best currently available - general-purpose compression methods. It is similar in speed with - deflate but offers more dense compression. + longDescription = '' + Brotli is a generic-purpose lossless compression algorithm that + compresses data using a combination of a modern variant of the LZ77 + algorithm, Huffman coding and 2nd order context modeling, with a + compression ratio comparable to the best currently available + general-purpose compression methods. It is similar in speed with + deflate but offers more dense compression. - The specification of the Brotli Compressed Data Format is defined - in the following internet draft: - http://www.ietf.org/id/draft-alakuijala-brotli - ''; + The specification of the Brotli Compressed Data Format is defined + in the following internet draft: + http://www.ietf.org/id/draft-alakuijala-brotli + ''; license = licenses.mit; maintainers = with maintainers; [ freezeboy ]; pkgConfigModules = [ diff --git a/pkgs/by-name/bu/bubblewrap/package.nix b/pkgs/by-name/bu/bubblewrap/package.nix index d45e0043e21f..e4a028cb5900 100644 --- a/pkgs/by-name/bu/bubblewrap/package.nix +++ b/pkgs/by-name/bu/bubblewrap/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "bubblewrap"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "containers"; repo = "bubblewrap"; rev = "v${version}"; - hash = "sha256-HYJoX7DnAwHCgxCzTYGJlc4RodbVP6hutK065AmGSl0="; + hash = "sha256-8IDMLQPeO576N1lizVudXUmTV6hNOiowjzRpEWBsZ+U="; }; postPatch = '' diff --git a/pkgs/by-name/bu/bundler/package.nix b/pkgs/by-name/bu/bundler/package.nix index c144149da290..ac81e5b797bf 100644 --- a/pkgs/by-name/bu/bundler/package.nix +++ b/pkgs/by-name/bu/bundler/package.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.5.16"; - source.sha256 = "sha256-h7oDOPQNWSinmxqwZ4Z6Ns3lgTXQi2MmfvY5eVuVmDo="; + version = "2.5.22"; + source.sha256 = "sha256-dj8w1ZjuWHQu6ikoWHVDXqciIY1N8UneNbzjfALOlo4="; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/by-name/ch/chibi/package.nix b/pkgs/by-name/ch/chibi/package.nix index 09ffa3ca2128..9cdd21a6b955 100644 --- a/pkgs/by-name/ch/chibi/package.nix +++ b/pkgs/by-name/ch/chibi/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, darwin }: +{ lib, stdenv, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { version = "0.11"; @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.libutil; - installPhase = '' make install PREFIX="$out" ''; diff --git a/pkgs/by-name/cl/clutter/package.nix b/pkgs/by-name/cl/clutter/package.nix index bb7ddf08957f..3831e3105208 100644 --- a/pkgs/by-name/cl/clutter/package.nix +++ b/pkgs/by-name/cl/clutter/package.nix @@ -84,20 +84,20 @@ stdenv.mkDerivation rec { meta = { description = "Library for creating fast, dynamic graphical user interfaces"; - longDescription = - '' Clutter is free software library for creating fast, compelling, - portable, and dynamic graphical user interfaces. It is a core part - of MeeGo, and is supported by the open source community. Its - development is sponsored by Intel. + longDescription = '' + Clutter is free software library for creating fast, compelling, + portable, and dynamic graphical user interfaces. It is a core part + of MeeGo, and is supported by the open source community. Its + development is sponsored by Intel. - Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use - on mobile and embedded platforms), but wraps an easy to use, - efficient, flexible API around GL's complexity. + Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use + on mobile and embedded platforms), but wraps an easy to use, + efficient, flexible API around GL's complexity. - Clutter enforces no particular user interface style, but provides a - rich, generic foundation for higher-level toolkits tailored to - specific needs. - ''; + Clutter enforces no particular user interface style, but provides a + rich, generic foundation for higher-level toolkits tailored to + specific needs. + ''; license = lib.licenses.lgpl2Plus; homepage = "http://www.clutter-project.org/"; diff --git a/pkgs/by-name/cm/cmake/008-FindCURL-Add-more-target-properties-from-pkg-config.diff b/pkgs/by-name/cm/cmake/008-FindCURL-Add-more-target-properties-from-pkg-config.diff new file mode 100644 index 000000000000..8dfc354a9c20 --- /dev/null +++ b/pkgs/by-name/cm/cmake/008-FindCURL-Add-more-target-properties-from-pkg-config.diff @@ -0,0 +1,32 @@ +diff --git a/Modules/FindCURL.cmake b/Modules/FindCURL.cmake +index 5ce8a9046b..f7361308b7 100644 +--- a/Modules/FindCURL.cmake ++++ b/Modules/FindCURL.cmake +@@ -239,9 +239,24 @@ if(CURL_FOUND) + IMPORTED_LOCATION_DEBUG "${CURL_LIBRARY_DEBUG}") + endif() + +- if(CURL_USE_STATIC_LIBS AND MSVC) +- set_target_properties(CURL::libcurl PROPERTIES +- INTERFACE_LINK_LIBRARIES "normaliz.lib;ws2_32.lib;wldap32.lib") ++ if(PC_CURL_FOUND) ++ if(PC_CURL_LINK_LIBRARIES) ++ set_property(TARGET CURL::libcurl PROPERTY ++ INTERFACE_LINK_LIBRARIES "${PC_CURL_LINK_LIBRARIES}") ++ endif() ++ if(PC_CURL_LDFLAGS_OTHER) ++ set_property(TARGET CURL::libcurl PROPERTY ++ INTERFACE_LINK_OPTIONS "${PC_CURL_LDFLAGS_OTHER}") ++ endif() ++ if(PC_CURL_CFLAGS_OTHER) ++ set_property(TARGET CURL::libcurl PROPERTY ++ INTERFACE_COMPILE_OPTIONS "${PC_CURL_CFLAGS_OTHER}") ++ endif() ++ else() ++ if(CURL_USE_STATIC_LIBS AND MSVC) ++ set_target_properties(CURL::libcurl PROPERTIES ++ INTERFACE_LINK_LIBRARIES "normaliz.lib;ws2_32.lib;wldap32.lib") ++ endif() + endif() + + endif() diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index 4ccac7799541..3b5caabec709 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString isMinimalBuild "-minimal" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.30.4"; + version = "3.30.5"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-x1nJcnTx56qq/LHw0mH53pvzpdbst+LfYWMkpG/nBLI="; + hash = "sha256-n1XhpAUI8vKbfgZfoIwp+CxAL6BALag5//5koldVqG0="; }; patches = [ @@ -76,7 +76,12 @@ stdenv.mkDerivation (finalAttrs: { substituteAll { src = ./007-darwin-bsd-ps-abspath.diff; ps = lib.getExe ps; - }); + }) + ++ [ + # Backport of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9900 + # Needed to corretly link curl in pkgsStatic. + ./008-FindCURL-Add-more-target-properties-from-pkg-config.diff + ]; outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" "info" ]; separateDebugInfo = true; diff --git a/pkgs/by-name/cu/cue/validator.nix b/pkgs/by-name/cu/cue/validator.nix index cddc3fe342b7..09e852347341 100644 --- a/pkgs/by-name/cu/cue/validator.nix +++ b/pkgs/by-name/cu/cue/validator.nix @@ -5,8 +5,8 @@ # against the fragment described by `document` or the whole definition. # The script will be strict and enforce concrete values, i.e. partial documents are not supported. cueSchemaFile: { document ? null }: - writeShellScript "validate-using-cue" - ''${cue}/bin/cue \ + writeShellScript "validate-using-cue" '' + ${cue}/bin/cue \ --all-errors \ --strict \ vet \ diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index e64f0007c1cb..399101a21435 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -49,14 +49,14 @@ assert !((lib.count (x: x) [ gnutlsSupport opensslSupport wolfsslSupport rustlsS stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "8.10.1"; + version = "8.11.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.xz" "https://github.com/curl/curl/releases/download/curl-${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}/curl-${finalAttrs.version}.tar.xz" ]; - hash = "sha256-c6Sw6ZWWoJ+lkkpPt+S5lahf2g0YosAquc8TS+vOBO4="; + hash = "sha256-21nPDWccpuf1wsXsF3CEozp54EyX5xzxg6XN6iNQVOs="; }; # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion diff --git a/pkgs/by-name/da/dav1d/package.nix b/pkgs/by-name/da/dav1d/package.nix index d0b77e2477c9..dc7efc22e852 100644 --- a/pkgs/by-name/da/dav1d/package.nix +++ b/pkgs/by-name/da/dav1d/package.nix @@ -26,13 +26,13 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "videolan"; repo = pname; rev = version; - hash = "sha256-uudtA9ZpGIpw1yfCzbywFyH7EWYHuXfE6pBb2eksx1g="; + hash = "sha256-eOMQj88vlgoxguV+eK4iWXFjUPiXwqRTJlhehev+yGY="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/by-name/dc/dconf/package.nix b/pkgs/by-name/dc/dconf/package.nix index 1aad769c6db2..6d56ba075f49 100644 --- a/pkgs/by-name/dc/dconf/package.nix +++ b/pkgs/by-name/dc/dconf/package.nix @@ -15,7 +15,10 @@ , docbook-xsl-nons , docbook_xml_dtd_42 , nixosTests -, withDocs ? true +, buildPackages +, gobject-introspection +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages +, withDocs ? withIntrospection }: stdenv.mkDerivation rec { @@ -49,12 +52,14 @@ stdenv.mkDerivation rec { glib bash-completion dbus + ] ++ lib.optionals withIntrospection [ vala ]; mesonFlags = [ "--sysconfdir=/etc" - "-Dgtk_doc=${lib.boolToString withDocs}" + (lib.mesonBool "gtk_doc" withDocs) + (lib.mesonBool "vapi" withIntrospection) ]; nativeCheckInputs = [ diff --git a/pkgs/by-name/dh/dhcpcd/package.nix b/pkgs/by-name/dh/dhcpcd/package.nix index 5d5e4a0b32e2..2e0dbb90d63f 100644 --- a/pkgs/by-name/dh/dhcpcd/package.nix +++ b/pkgs/by-name/dh/dhcpcd/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "dhcpcd"; - version = "10.0.6"; + version = "10.1.0"; src = fetchFromGitHub { owner = "NetworkConfiguration"; repo = "dhcpcd"; rev = "v${version}"; - sha256 = "sha256-tNC5XCA8dShaTIff15mQz8v+YK9sZkRNLCX5qnlpxx4="; + sha256 = "sha256-Qtg9jOFMR/9oWJDmoNNcEAMxG6G1F187HF4MMBJIoTw="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/di/directx-headers/package.nix b/pkgs/by-name/di/directx-headers/package.nix index 061d18d15016..f1830f54035e 100644 --- a/pkgs/by-name/di/directx-headers/package.nix +++ b/pkgs/by-name/di/directx-headers/package.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, meson, ninja }: stdenv.mkDerivation rec { pname = "directx-headers"; - version = "1.614.0"; + version = "1.614.1"; src = fetchFromGitHub { owner = "microsoft"; repo = "DirectX-Headers"; rev = "v${version}"; - hash = "sha256-0LaN9D3cKVacMJhZCe9oxDPHpd1jdCAV0ImG2rSgnxc="; + hash = "sha256-CDmzKdV40EExLpOHPAUnytqG9x1+IGW4AZldfYs5YJk="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/by-name/dt/dtc/package.nix b/pkgs/by-name/dt/dtc/package.nix index 5a8bd2a85086..f407fba956a1 100644 --- a/pkgs/by-name/dt/dtc/package.nix +++ b/pkgs/by-name/dt/dtc/package.nix @@ -1,5 +1,6 @@ { stdenv , lib +, fetchpatch2 , fetchzip , meson , ninja @@ -22,6 +23,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-KZCzrvdWd6zfQHppjyp4XzqNCfH2UnuRneu+BNIRVAY="; }; + patches = [ + (fetchpatch2 { + # https://github.com/dgibson/dtc/pull/141 + url = "https://github.com/dgibson/dtc/commit/56a7d0cb3be5f2f7604bc42299e24d13a39c72d8.patch"; + hash = "sha256-GmAyk/K2OolH/Z8SsgwCcq3/GOlFuSpnVPr7jsy8Cs0="; + }) + ]; + env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; nativeBuildInputs = [ diff --git a/pkgs/by-name/et/eternal-terminal/package.nix b/pkgs/by-name/et/eternal-terminal/package.nix index c580d02a794f..3096ea67840f 100644 --- a/pkgs/by-name/et/eternal-terminal/package.nix +++ b/pkgs/by-name/et/eternal-terminal/package.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { openssl protobuf zlib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libutil ]; preBuild = '' diff --git a/pkgs/by-name/et/ethtool/package.nix b/pkgs/by-name/et/ethtool/package.nix index ff7fe2603271..ebd26985f7f4 100644 --- a/pkgs/by-name/et/ethtool/package.nix +++ b/pkgs/by-name/et/ethtool/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "ethtool"; - version = "6.9"; + version = "6.11"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/ethtool-${version}.tar.xz"; - sha256 = "sha256-pxsDVAEGYcXPF4vGBu1Q/LkYBc8Yl60OsoGDh6X9DNk="; + sha256 = "sha256-jZH1xyrj8lt+iNR4EnncsyD3HjAFiRQ3CxxXTJazEgI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ex/expat/package.nix b/pkgs/by-name/ex/expat/package.nix index 83284ff64fc5..7d49962cbdb7 100644 --- a/pkgs/by-name/ex/expat/package.nix +++ b/pkgs/by-name/ex/expat/package.nix @@ -17,7 +17,7 @@ # files. let - version = "2.6.3"; + version = "2.6.4"; tag = "R_${lib.replaceStrings ["."] ["_"] version}"; in stdenv.mkDerivation (finalAttrs: { @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = with finalAttrs; "https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz"; - hash = "sha256-J02yVKaXm95arUBHY6cElWlA5GWEPyqb2e168i4sDvw="; + hash = "sha256-ppVina4EcFWzfVCg/0d20dRdCkyELPTM7hWEQfVf9+4="; }; strictDeps = true; diff --git a/pkgs/by-name/ff/ffmpeg-livepeer/package.nix b/pkgs/by-name/ff/ffmpeg-livepeer/package.nix new file mode 100644 index 000000000000..9cbd88f92ae4 --- /dev/null +++ b/pkgs/by-name/ff/ffmpeg-livepeer/package.nix @@ -0,0 +1,29 @@ +{ + ffmpeg_7-headless, + lib, + fetchFromGitHub, +}: + +(ffmpeg_7-headless.override { + version = "7.0.1-unstable-2024-07-10"; + withCudaLLVM = true; + source = fetchFromGitHub { + owner = "livepeer"; + repo = "FFmpeg"; + rev = "d9751c73e714b01b363483db358b1ea8022c9bea"; # From branch n*-livepeer + hash = "sha256-IJVpb/k+obGFD9uOoIVHCd2ZiGL3CA4CV3D+Q9vMbQM="; + }; +}).overrideAttrs + (old: { + pname = "ffmpeg-livepeer"; + + meta = { + inherit (old.meta) + license + mainProgram + pkgConfigModules + platforms + ; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + }; + }) diff --git a/pkgs/by-name/ge/gengetopt/package.nix b/pkgs/by-name/ge/gengetopt/package.nix index 9ef5ec24d545..b0492665de1b 100644 --- a/pkgs/by-name/ge/gengetopt/package.nix +++ b/pkgs/by-name/ge/gengetopt/package.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { description = "Command-line option parser generator"; mainProgram = "gengetopt"; - longDescription = - '' GNU Gengetopt program generates a C function that uses getopt_long - function to parse the command line options, to validate them and - fills a struct - ''; + longDescription = '' + GNU Gengetopt program generates a C function that uses getopt_long + function to parse the command line options, to validate them and + fills a struct + ''; homepage = "https://www.gnu.org/software/gengetopt/"; diff --git a/pkgs/by-name/gj/gjs/package.nix b/pkgs/by-name/gj/gjs/package.nix index b3a9f606d17f..fee889cbd537 100644 --- a/pkgs/by-name/gj/gjs/package.nix +++ b/pkgs/by-name/gj/gjs/package.nix @@ -32,13 +32,13 @@ let ]; in stdenv.mkDerivation (finalAttrs: { pname = "gjs"; - version = "1.82.0"; + version = "1.82.1"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor finalAttrs.version}/gjs-${finalAttrs.version}.tar.xz"; - hash = "sha256-FEkCNoaNC/gi96p884/NMz52IHYP3PUOkyQjYR9iZiM="; + hash = "sha256-+zmqVjZXbeDloRcfVqGlgl4r0aaZcvsSC6eL0Qm1aTw="; }; patches = [ diff --git a/pkgs/by-name/im/imath/package.nix b/pkgs/by-name/im/imath/package.nix index ae7bbe2fba3f..a8e1ed336bcd 100644 --- a/pkgs/by-name/im/imath/package.nix +++ b/pkgs/by-name/im/imath/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "imath"; - version = "3.1.11"; + version = "3.1.12"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "imath"; rev = "v${version}"; - sha256 = "sha256-Cnl0BTXUzkDvgLSNXJbh5ATczBdbxiwbS4J9L6N8sKI="; + sha256 = "sha256-r4FNyNsWdmpZrHOpSvaSUWRYhAU+qnW4lE5uYPKn7Mw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/im/immich-machine-learning/package.nix b/pkgs/by-name/im/immich-machine-learning/package.nix index 6d46e20d575e..31149ea2c7cf 100644 --- a/pkgs/by-name/im/immich-machine-learning/package.nix +++ b/pkgs/by-name/im/immich-machine-learning/package.nix @@ -22,6 +22,7 @@ python.pkgs.buildPythonApplication rec { ''; pythonRelaxDeps = [ + "pillow" "pydantic-settings" ]; diff --git a/pkgs/by-name/iw/iwd/package.nix b/pkgs/by-name/iw/iwd/package.nix index fdd289722155..cdab250abd96 100644 --- a/pkgs/by-name/iw/iwd/package.nix +++ b/pkgs/by-name/iw/iwd/package.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "2.22"; + version = "3.0"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - hash = "sha256-t2mfBRP/PRlcfeezu3B7myCKXVv9SHeW8HlGK1cO3/I="; + hash = "sha256-pkren8mF0xg5yrkaIrMJ5auq+7w8VAldbgVflE2BmlM="; }; outputs = [ "out" "man" "doc" ] diff --git a/pkgs/by-name/kv/kvazaar/package.nix b/pkgs/by-name/kv/kvazaar/package.nix new file mode 100644 index 000000000000..9fe102f82d5c --- /dev/null +++ b/pkgs/by-name/kv/kvazaar/package.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + fetchFromGitHub, + gitUpdater, + testers, + cmake, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "kvazaar"; + version = "2.3.1"; + + src = fetchFromGitHub { + owner = "ultravideo"; + repo = "kvazaar"; + rev = "v${finalAttrs.version}"; + hash = "sha256-d/OkX18nyHSQXJgNhBtiCLb/Fe8Y/MpddXxLpNMZiXI="; + }; + + nativeBuildInputs = [ cmake ]; + + outputs = [ + "out" + "lib" + "dev" + "man" + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "Open-source HEVC encoder"; + homepage = "https://github.com/ultravideo/kvazaar"; + changelog = "https://github.com/ultravideo/kvazaar/releases/tag/v${finalAttrs.version}"; + pkgConfigModules = [ "kvazaar" ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +}) diff --git a/pkgs/by-name/lc/lcevcdec/package.nix b/pkgs/by-name/lc/lcevcdec/package.nix new file mode 100644 index 000000000000..20526efebc91 --- /dev/null +++ b/pkgs/by-name/lc/lcevcdec/package.nix @@ -0,0 +1,104 @@ +{ + cmake, + copyPkgconfigItems, + fetchFromGitHub, + fmt, + git, + gitUpdater, + gtest, + lib, + makePkgconfigItem, + pkg-config, + python3, + range-v3, + rapidjson, + stdenv, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lcevcdec"; + version = "3.2.1"; + + outputs = [ + "out" + "lib" + "dev" + ]; + + src = fetchFromGitHub { + owner = "v-novaltd"; + repo = "LCEVCdec"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-Nf0YntB1A3AH0MTXlfUHhxYbzZqeB0EH9Fe9Xrqdsts="; + }; + + postPatch = '' + substituteInPlace cmake/tools/version_files.py \ + --replace-fail "args.git_version" '"${finalAttrs.version}"' \ + --replace-fail "args.git_hash" '"${finalAttrs.src.rev}"' \ + --replace-fail "args.git_date" '"1970-01-01"' + ''; + + env = { + includedir = "${placeholder "dev"}/include"; + libdir = "${placeholder "out"}/lib"; + }; + + pkgconfigItems = [ + (makePkgconfigItem rec { + name = "lcevc_dec"; + inherit (finalAttrs) version; + libs = [ + "-L${variables.libdir}" + "-llcevc_dec_api" + ]; + libsPrivate = [ + "-lpthread" + "-llcevc_dec_core" + ]; + cflags = [ + "-I${variables.includedir}" + ]; + variables = { + prefix = "@dev@"; + includedir = "@includedir@"; + libdir = "@libdir@"; + }; + }) + ]; + + nativeBuildInputs = [ + cmake + python3 + git + pkg-config + copyPkgconfigItems + ]; + + buildInputs = [ + rapidjson + fmt + range-v3 + ]; + + cmakeFlags = [ + (lib.cmakeFeature "VN_SDK_FFMPEG_LIBS_PACKAGE" "") + (lib.cmakeBool "VN_SDK_UNIT_TESTS" false) + (lib.cmakeBool "VN_SDK_SAMPLE_SOURCE" false) + ]; + + passthru = { + updateScript = gitUpdater { }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + homepage = "https://github.com/v-novaltd/LCEVCdec"; + description = "MPEG-5 LCEVC Decoder"; + license = lib.licenses.bsd3Clear; + pkgConfigModules = [ "lcevc_dec" ]; + maintainers = with lib.maintainers; [ jopejoe1 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ld/ld64/0008-Disable-searching-in-standard-library-locations.patch b/pkgs/by-name/ld/ld64/0008-Disable-searching-in-standard-library-locations.patch deleted file mode 100644 index ddda588c6aaf..000000000000 --- a/pkgs/by-name/ld/ld64/0008-Disable-searching-in-standard-library-locations.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3e80d438e2a3ec50d666f2b6e32007c275d4a08a Mon Sep 17 00:00:00 2001 -From: Randy Eckenrode -Date: Thu, 11 Apr 2024 23:13:29 -0400 -Subject: [PATCH 8/8] Disable searching in standard library locations - ---- - src/ld/Options.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ld/Options.cpp b/src/ld/Options.cpp -index 67a9f53..611b583 100644 ---- a/src/ld/Options.cpp -+++ b/src/ld/Options.cpp -@@ -4320,7 +4320,7 @@ bool Options::shouldUseBuildVersion(ld::Platform plat, uint32_t minOSvers) const - - void Options::buildSearchPaths(int argc, const char* argv[]) - { -- bool addStandardLibraryDirectories = true; -+ bool addStandardLibraryDirectories = false; - ld::Platform platform = ld::Platform::unknown; - std::vector libraryPaths; - std::vector frameworkPaths; --- -2.45.1 - diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix index e921b0ec20a8..ce63bfad5e0d 100644 --- a/pkgs/by-name/ld/ld64/package.nix +++ b/pkgs/by-name/ld/ld64/package.nix @@ -128,8 +128,7 @@ stdenv.mkDerivation (finalAttrs: { ./0006-Add-libcd_is_blob_a_linker_signature-implementation.patch # Add OpenSSL implementation of CoreCrypto digest functions. Avoids use of private and non-free APIs. ./0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch - # ld64 will search `/usr/lib`, `/Library/Frameworks`, etc by default. Disable that. - ./0008-Disable-searching-in-standard-library-locations.patch + ./remove-unused-and-incomplete-blob-clone.diff ]; postPatch = '' diff --git a/pkgs/by-name/ld/ld64/remove-unused-and-incomplete-blob-clone.diff b/pkgs/by-name/ld/ld64/remove-unused-and-incomplete-blob-clone.diff new file mode 100644 index 000000000000..88dd4304f6f7 --- /dev/null +++ b/pkgs/by-name/ld/ld64/remove-unused-and-incomplete-blob-clone.diff @@ -0,0 +1,14 @@ +diff --git a/src/ld/code-sign-blobs/blob.h b/src/ld/code-sign-blobs/blob.h +index 19c63a9..1dfb380 100644 +--- a/src/ld/code-sign-blobs/blob.h ++++ b/src/ld/code-sign-blobs/blob.h +@@ -180,9 +180,6 @@ public: + return NULL; + } + +- BlobType *clone() const +- { assert(validateBlob()); return specific(this->BlobCore::clone()); } +- + static BlobType *readBlob(int fd) + { return specific(BlobCore::readBlob(fd, _magic, sizeof(BlobType), 0), true); } + diff --git a/pkgs/by-name/le/less/package.nix b/pkgs/by-name/le/less/package.nix index ba57f5460ccd..452944aa9a75 100644 --- a/pkgs/by-name/le/less/package.nix +++ b/pkgs/by-name/le/less/package.nix @@ -1,6 +1,8 @@ { lib, fetchurl, + fetchpatch, + autoreconfHook, ncurses, pcre2, stdenv, @@ -22,6 +24,23 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-KBn1VWTYbVQqu+yv2C/2HoGaPuyWf6o2zT5o8VlqRLg="; }; + patches = [ + (fetchpatch { + # Fix configure parameters --with-secure=no and --without-secure. + url = "https://github.com/gwsw/less/commit/8fff6c56bfc833528b31ebdaee871f65fbe342b1.patch"; + hash = "sha256-XV5XufivNWWLGeIpaP04YQPWcxIUKYYEINdT+eEx+WA="; + includes = [ + "configure.ac" + ]; + }) + ]; + + # Need `autoreconfHook` since we patch `configure.ac`. + # TODO: Remove the `configure.ac` patch and `autoreconfHook` next release + nativeBuildInputs = [ + autoreconfHook + ]; + buildInputs = [ ncurses pcre2 diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix index d8b11d227180..8703c1a4faba 100644 --- a/pkgs/by-name/li/libarchive/package.nix +++ b/pkgs/by-name/li/libarchive/package.nix @@ -31,13 +31,13 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation (finalAttrs: { pname = "libarchive"; - version = "3.7.6"; + version = "3.7.7"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${finalAttrs.version}"; - hash = "sha256-smj8JV5irW/StUx/Zp62w5cnlKbF6GRIOSh8i4ocJ8s="; + hash = "sha256-maV2+Whi4aDG1VLAYpOTxluO9I0zNiZ8fA3w7epGlDg="; }; outputs = [ "out" "lib" "dev" ]; diff --git a/pkgs/by-name/li/libimobiledevice-glue/package.nix b/pkgs/by-name/li/libimobiledevice-glue/package.nix index 13a2e83d0473..99eb6c3cede0 100644 --- a/pkgs/by-name/li/libimobiledevice-glue/package.nix +++ b/pkgs/by-name/li/libimobiledevice-glue/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libimobiledevice-glue"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; rev = version; - hash = "sha256-+poCrn2YHeH8RQCfWDdnlmJB4Nf+unWUVwn7YwILHIs="; + hash = "sha256-Fu0zQIryESRaTGzDlAaewX9Yo2nPEeUxmcb3yPJLuSI="; }; preAutoreconf = '' diff --git a/pkgs/by-name/li/libjpeg_turbo/package.nix b/pkgs/by-name/li/libjpeg_turbo/package.nix index 9055e75de47f..eb638d8c6e74 100644 --- a/pkgs/by-name/li/libjpeg_turbo/package.nix +++ b/pkgs/by-name/li/libjpeg_turbo/package.nix @@ -32,13 +32,13 @@ assert !(enableJpeg7 && enableJpeg8); # pick only one or none, not both stdenv.mkDerivation (finalAttrs: { pname = "libjpeg-turbo"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "libjpeg-turbo"; repo = "libjpeg-turbo"; rev = finalAttrs.version; - hash = "sha256-w2wJaVf4sjJ9pPPqc9R4TE6Q6Yl0U6+fI5KLpQKwEXI="; + hash = "sha256-ZNqhOfZtWcMv10VWIUxn7MSy4KhW/jBrgC1tUFKczqs="; }; patches = [ @@ -85,7 +85,6 @@ stdenv.mkDerivation (finalAttrs: { inherit dvgrab epeg - freeimage gd graphicsmagick imagemagick diff --git a/pkgs/by-name/li/libmpc/package.nix b/pkgs/by-name/li/libmpc/package.nix index fe11b59f4523..053f0113b444 100644 --- a/pkgs/by-name/li/libmpc/package.nix +++ b/pkgs/by-name/li/libmpc/package.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { meta = { description = "Library for multiprecision complex arithmetic with exact rounding"; - longDescription = - '' GNU MPC is a C library for the arithmetic of complex numbers with - arbitrarily high precision and correct rounding of the result. It is - built upon and follows the same principles as GNU MPFR. - ''; + longDescription = '' + GNU MPC is a C library for the arithmetic of complex numbers with + arbitrarily high precision and correct rounding of the result. It is + built upon and follows the same principles as GNU MPFR. + ''; homepage = "https://www.multiprecision.org/mpc/"; license = lib.licenses.lgpl2Plus; diff --git a/pkgs/by-name/li/libogg/package.nix b/pkgs/by-name/li/libogg/package.nix index ae104d5f8df3..14ad2231d3bf 100644 --- a/pkgs/by-name/li/libogg/package.nix +++ b/pkgs/by-name/li/libogg/package.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + ]; + meta = { description = "Media container library to manipulate Ogg files"; longDescription = '' diff --git a/pkgs/by-name/li/libssh2/CVE-2023-48795.patch b/pkgs/by-name/li/libssh2/CVE-2023-48795.patch deleted file mode 100644 index c89e4a137b72..000000000000 --- a/pkgs/by-name/li/libssh2/CVE-2023-48795.patch +++ /dev/null @@ -1,459 +0,0 @@ -From d34d9258b8420b19ec3f97b4cc5bf7aa7d98e35a Mon Sep 17 00:00:00 2001 -From: Michael Buckley -Date: Thu, 30 Nov 2023 15:08:02 -0800 -Subject: [PATCH] src: add 'strict KEX' to fix CVE-2023-48795 "Terrapin Attack" - -Refs: -https://terrapin-attack.com/ -https://seclists.org/oss-sec/2023/q4/292 -https://osv.dev/list?ecosystem=&q=CVE-2023-48795 -https://github.com/advisories/GHSA-45x7-px36-x8w8 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-48795 - -Fixes #1290 -Closes #1291 ---- - src/kex.c | 63 +++++++++++++++++++++++------------ - src/libssh2_priv.h | 18 +++++++--- - src/packet.c | 83 +++++++++++++++++++++++++++++++++++++++++++--- - src/packet.h | 2 +- - src/session.c | 3 ++ - src/transport.c | 12 ++++++- - 6 files changed, 149 insertions(+), 32 deletions(-) - -diff --git a/src/kex.c b/src/kex.c -index 8e7b7f0af3..a7b301e157 100644 ---- a/src/kex.c -+++ b/src/kex.c -@@ -3032,6 +3032,13 @@ kex_method_extension_negotiation = { - 0, - }; - -+static const LIBSSH2_KEX_METHOD -+kex_method_strict_client_extension = { -+ "kex-strict-c-v00@openssh.com", -+ NULL, -+ 0, -+}; -+ - static const LIBSSH2_KEX_METHOD *libssh2_kex_methods[] = { - #if LIBSSH2_ED25519 - &kex_method_ssh_curve25519_sha256, -@@ -3050,6 +3057,7 @@ static const LIBSSH2_KEX_METHOD *libssh2_kex_methods[] = { - &kex_method_diffie_helman_group1_sha1, - &kex_method_diffie_helman_group_exchange_sha1, - &kex_method_extension_negotiation, -+ &kex_method_strict_client_extension, - NULL - }; - -@@ -3302,13 +3310,13 @@ static int kexinit(LIBSSH2_SESSION * session) - return 0; - } - --/* kex_agree_instr -+/* _libssh2_kex_agree_instr - * Kex specific variant of strstr() - * Needle must be preceded by BOL or ',', and followed by ',' or EOL - */ --static unsigned char * --kex_agree_instr(unsigned char *haystack, size_t haystack_len, -- const unsigned char *needle, size_t needle_len) -+unsigned char * -+_libssh2_kex_agree_instr(unsigned char *haystack, size_t haystack_len, -+ const unsigned char *needle, size_t needle_len) - { - unsigned char *s; - unsigned char *end_haystack; -@@ -3393,7 +3401,7 @@ static int kex_agree_hostkey(LIBSSH2_SESSION * session, - while(s && *s) { - unsigned char *p = (unsigned char *) strchr((char *) s, ','); - size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); -- if(kex_agree_instr(hostkey, hostkey_len, s, method_len)) { -+ if(_libssh2_kex_agree_instr(hostkey, hostkey_len, s, method_len)) { - const LIBSSH2_HOSTKEY_METHOD *method = - (const LIBSSH2_HOSTKEY_METHOD *) - kex_get_method_by_name((char *) s, method_len, -@@ -3427,9 +3435,9 @@ static int kex_agree_hostkey(LIBSSH2_SESSION * session, - } - - while(hostkeyp && (*hostkeyp) && (*hostkeyp)->name) { -- s = kex_agree_instr(hostkey, hostkey_len, -- (unsigned char *) (*hostkeyp)->name, -- strlen((*hostkeyp)->name)); -+ s = _libssh2_kex_agree_instr(hostkey, hostkey_len, -+ (unsigned char *) (*hostkeyp)->name, -+ strlen((*hostkeyp)->name)); - if(s) { - /* So far so good, but does it suit our purposes? (Encrypting vs - Signing) */ -@@ -3463,6 +3471,12 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, - { - const LIBSSH2_KEX_METHOD **kexp = libssh2_kex_methods; - unsigned char *s; -+ const unsigned char *strict = -+ (unsigned char *)"kex-strict-s-v00@openssh.com"; -+ -+ if(_libssh2_kex_agree_instr(kex, kex_len, strict, 28)) { -+ session->kex_strict = 1; -+ } - - if(session->kex_prefs) { - s = (unsigned char *) session->kex_prefs; -@@ -3470,7 +3484,7 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, - while(s && *s) { - unsigned char *q, *p = (unsigned char *) strchr((char *) s, ','); - size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); -- q = kex_agree_instr(kex, kex_len, s, method_len); -+ q = _libssh2_kex_agree_instr(kex, kex_len, s, method_len); - if(q) { - const LIBSSH2_KEX_METHOD *method = (const LIBSSH2_KEX_METHOD *) - kex_get_method_by_name((char *) s, method_len, -@@ -3504,9 +3518,9 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, - } - - while(*kexp && (*kexp)->name) { -- s = kex_agree_instr(kex, kex_len, -- (unsigned char *) (*kexp)->name, -- strlen((*kexp)->name)); -+ s = _libssh2_kex_agree_instr(kex, kex_len, -+ (unsigned char *) (*kexp)->name, -+ strlen((*kexp)->name)); - if(s) { - /* We've agreed on a key exchange method, - * Can we agree on a hostkey that works with this kex? -@@ -3550,7 +3564,7 @@ static int kex_agree_crypt(LIBSSH2_SESSION * session, - unsigned char *p = (unsigned char *) strchr((char *) s, ','); - size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); - -- if(kex_agree_instr(crypt, crypt_len, s, method_len)) { -+ if(_libssh2_kex_agree_instr(crypt, crypt_len, s, method_len)) { - const LIBSSH2_CRYPT_METHOD *method = - (const LIBSSH2_CRYPT_METHOD *) - kex_get_method_by_name((char *) s, method_len, -@@ -3572,9 +3586,9 @@ static int kex_agree_crypt(LIBSSH2_SESSION * session, - } - - while(*cryptp && (*cryptp)->name) { -- s = kex_agree_instr(crypt, crypt_len, -- (unsigned char *) (*cryptp)->name, -- strlen((*cryptp)->name)); -+ s = _libssh2_kex_agree_instr(crypt, crypt_len, -+ (unsigned char *) (*cryptp)->name, -+ strlen((*cryptp)->name)); - if(s) { - endpoint->crypt = *cryptp; - return 0; -@@ -3614,7 +3628,7 @@ static int kex_agree_mac(LIBSSH2_SESSION * session, - unsigned char *p = (unsigned char *) strchr((char *) s, ','); - size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); - -- if(kex_agree_instr(mac, mac_len, s, method_len)) { -+ if(_libssh2_kex_agree_instr(mac, mac_len, s, method_len)) { - const LIBSSH2_MAC_METHOD *method = (const LIBSSH2_MAC_METHOD *) - kex_get_method_by_name((char *) s, method_len, - (const LIBSSH2_COMMON_METHOD **) -@@ -3635,8 +3649,9 @@ static int kex_agree_mac(LIBSSH2_SESSION * session, - } - - while(*macp && (*macp)->name) { -- s = kex_agree_instr(mac, mac_len, (unsigned char *) (*macp)->name, -- strlen((*macp)->name)); -+ s = _libssh2_kex_agree_instr(mac, mac_len, -+ (unsigned char *) (*macp)->name, -+ strlen((*macp)->name)); - if(s) { - endpoint->mac = *macp; - return 0; -@@ -3667,7 +3682,7 @@ static int kex_agree_comp(LIBSSH2_SESSION *session, - unsigned char *p = (unsigned char *) strchr((char *) s, ','); - size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); - -- if(kex_agree_instr(comp, comp_len, s, method_len)) { -+ if(_libssh2_kex_agree_instr(comp, comp_len, s, method_len)) { - const LIBSSH2_COMP_METHOD *method = - (const LIBSSH2_COMP_METHOD *) - kex_get_method_by_name((char *) s, method_len, -@@ -3689,8 +3704,9 @@ static int kex_agree_comp(LIBSSH2_SESSION *session, - } - - while(*compp && (*compp)->name) { -- s = kex_agree_instr(comp, comp_len, (unsigned char *) (*compp)->name, -- strlen((*compp)->name)); -+ s = _libssh2_kex_agree_instr(comp, comp_len, -+ (unsigned char *) (*compp)->name, -+ strlen((*compp)->name)); - if(s) { - endpoint->comp = *compp; - return 0; -@@ -3871,6 +3887,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, - session->local.kexinit = key_state->oldlocal; - session->local.kexinit_len = key_state->oldlocal_len; - key_state->state = libssh2_NB_state_idle; -+ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; - session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; - session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; - return -1; -@@ -3896,6 +3913,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, - session->local.kexinit = key_state->oldlocal; - session->local.kexinit_len = key_state->oldlocal_len; - key_state->state = libssh2_NB_state_idle; -+ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; - session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; - session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; - return -1; -@@ -3944,6 +3962,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, - session->remote.kexinit = NULL; - } - -+ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; - session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; - session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; - -diff --git a/src/libssh2_priv.h b/src/libssh2_priv.h -index 7660366954..18d9ab2130 100644 ---- a/src/libssh2_priv.h -+++ b/src/libssh2_priv.h -@@ -736,6 +736,9 @@ struct _LIBSSH2_SESSION - /* key signing algorithm preferences -- NULL yields server order */ - char *sign_algo_prefs; - -+ /* Whether to use the OpenSSH Strict KEX extension */ -+ int kex_strict; -+ - /* (remote as source of data -- packet_read ) */ - libssh2_endpoint_data remote; - -@@ -908,6 +911,7 @@ struct _LIBSSH2_SESSION - int fullpacket_macstate; - size_t fullpacket_payload_len; - int fullpacket_packet_type; -+ uint32_t fullpacket_required_type; - - /* State variables used in libssh2_sftp_init() */ - libssh2_nonblocking_states sftpInit_state; -@@ -948,10 +952,11 @@ struct _LIBSSH2_SESSION - }; - - /* session.state bits */ --#define LIBSSH2_STATE_EXCHANGING_KEYS 0x00000001 --#define LIBSSH2_STATE_NEWKEYS 0x00000002 --#define LIBSSH2_STATE_AUTHENTICATED 0x00000004 --#define LIBSSH2_STATE_KEX_ACTIVE 0x00000008 -+#define LIBSSH2_STATE_INITIAL_KEX 0x00000001 -+#define LIBSSH2_STATE_EXCHANGING_KEYS 0x00000002 -+#define LIBSSH2_STATE_NEWKEYS 0x00000004 -+#define LIBSSH2_STATE_AUTHENTICATED 0x00000008 -+#define LIBSSH2_STATE_KEX_ACTIVE 0x00000010 - - /* session.flag helpers */ - #ifdef MSG_NOSIGNAL -@@ -1182,6 +1187,11 @@ ssize_t _libssh2_send(libssh2_socket_t socket, const void *buffer, - int _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, - key_exchange_state_t * state); - -+unsigned char *_libssh2_kex_agree_instr(unsigned char *haystack, -+ size_t haystack_len, -+ const unsigned char *needle, -+ size_t needle_len); -+ - /* Let crypt.c/hostkey.c expose their method structs */ - const LIBSSH2_CRYPT_METHOD **libssh2_crypt_methods(void); - const LIBSSH2_HOSTKEY_METHOD **libssh2_hostkey_methods(void); -diff --git a/src/packet.c b/src/packet.c -index eccb8c56a8..6da14e9fa1 100644 ---- a/src/packet.c -+++ b/src/packet.c -@@ -624,14 +624,13 @@ packet_authagent_open(LIBSSH2_SESSION * session, - * layer when it has received a packet. - * - * The input pointer 'data' is pointing to allocated data that this function -- * is asked to deal with so on failure OR success, it must be freed fine. -- * The only exception is when the return code is LIBSSH2_ERROR_EAGAIN. -+ * will be freed unless return the code is LIBSSH2_ERROR_EAGAIN. - * - * This function will always be called with 'datalen' greater than zero. - */ - int - _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, -- size_t datalen, int macstate) -+ size_t datalen, int macstate, uint32_t seq) - { - int rc = 0; - unsigned char *message = NULL; -@@ -676,6 +675,70 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - break; - } - -+ if(session->state & LIBSSH2_STATE_INITIAL_KEX) { -+ if(msg == SSH_MSG_KEXINIT) { -+ if(!session->kex_strict) { -+ if(datalen < 17) { -+ LIBSSH2_FREE(session, data); -+ session->packAdd_state = libssh2_NB_state_idle; -+ return _libssh2_error(session, -+ LIBSSH2_ERROR_BUFFER_TOO_SMALL, -+ "Data too short extracting kex"); -+ } -+ else { -+ const unsigned char *strict = -+ (unsigned char *)"kex-strict-s-v00@openssh.com"; -+ struct string_buf buf; -+ unsigned char *algs = NULL; -+ size_t algs_len = 0; -+ -+ buf.data = (unsigned char *)data; -+ buf.dataptr = buf.data; -+ buf.len = datalen; -+ buf.dataptr += 17; /* advance past type and cookie */ -+ -+ if(_libssh2_get_string(&buf, &algs, &algs_len)) { -+ LIBSSH2_FREE(session, data); -+ session->packAdd_state = libssh2_NB_state_idle; -+ return _libssh2_error(session, -+ LIBSSH2_ERROR_BUFFER_TOO_SMALL, -+ "Algs too short"); -+ } -+ -+ if(algs_len == 0 || -+ _libssh2_kex_agree_instr(algs, algs_len, strict, 28)) { -+ session->kex_strict = 1; -+ } -+ } -+ } -+ -+ if(session->kex_strict && seq) { -+ LIBSSH2_FREE(session, data); -+ session->socket_state = LIBSSH2_SOCKET_DISCONNECTED; -+ session->packAdd_state = libssh2_NB_state_idle; -+ libssh2_session_disconnect(session, "strict KEX violation: " -+ "KEXINIT was not the first packet"); -+ -+ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, -+ "strict KEX violation: " -+ "KEXINIT was not the first packet"); -+ } -+ } -+ -+ if(session->kex_strict && session->fullpacket_required_type && -+ session->fullpacket_required_type != msg) { -+ LIBSSH2_FREE(session, data); -+ session->socket_state = LIBSSH2_SOCKET_DISCONNECTED; -+ session->packAdd_state = libssh2_NB_state_idle; -+ libssh2_session_disconnect(session, "strict KEX violation: " -+ "unexpected packet type"); -+ -+ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, -+ "strict KEX violation: " -+ "unexpected packet type"); -+ } -+ } -+ - if(session->packAdd_state == libssh2_NB_state_allocated) { - /* A couple exceptions to the packet adding rule: */ - switch(msg) { -@@ -1364,6 +1427,15 @@ _libssh2_packet_ask(LIBSSH2_SESSION * session, unsigned char packet_type, - - return 0; - } -+ else if(session->kex_strict && -+ (session->state & LIBSSH2_STATE_INITIAL_KEX)) { -+ libssh2_session_disconnect(session, "strict KEX violation: " -+ "unexpected packet type"); -+ -+ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, -+ "strict KEX violation: " -+ "unexpected packet type"); -+ } - packet = _libssh2_list_next(&packet->node); - } - return -1; -@@ -1425,7 +1497,10 @@ _libssh2_packet_require(LIBSSH2_SESSION * session, unsigned char packet_type, - } - - while(session->socket_state == LIBSSH2_SOCKET_CONNECTED) { -- int ret = _libssh2_transport_read(session); -+ int ret; -+ session->fullpacket_required_type = packet_type; -+ ret = _libssh2_transport_read(session); -+ session->fullpacket_required_type = 0; - if(ret == LIBSSH2_ERROR_EAGAIN) - return ret; - else if(ret < 0) { -diff --git a/src/packet.h b/src/packet.h -index 1d90b8af12..955351e5f6 100644 ---- a/src/packet.h -+++ b/src/packet.h -@@ -72,6 +72,6 @@ int _libssh2_packet_burn(LIBSSH2_SESSION * session, - int _libssh2_packet_write(LIBSSH2_SESSION * session, unsigned char *data, - unsigned long data_len); - int _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, -- size_t datalen, int macstate); -+ size_t datalen, int macstate, uint32_t seq); - - #endif /* LIBSSH2_PACKET_H */ -diff --git a/src/session.c b/src/session.c -index 35e7929fe7..9d89ade8ec 100644 ---- a/src/session.c -+++ b/src/session.c -@@ -469,6 +469,8 @@ libssh2_session_init_ex(LIBSSH2_ALLOC_FUNC((*my_alloc)), - session->abstract = abstract; - session->api_timeout = 0; /* timeout-free API by default */ - session->api_block_mode = 1; /* blocking API by default */ -+ session->state = LIBSSH2_STATE_INITIAL_KEX; -+ session->fullpacket_required_type = 0; - session->packet_read_timeout = LIBSSH2_DEFAULT_READ_TIMEOUT; - session->flag.quote_paths = 1; /* default behavior is to quote paths - for the scp subsystem */ -@@ -1223,6 +1225,7 @@ libssh2_session_disconnect_ex(LIBSSH2_SESSION *session, int reason, - const char *desc, const char *lang) - { - int rc; -+ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; - session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; - BLOCK_ADJUST(rc, session, - session_disconnect(session, reason, desc, lang)); -diff --git a/src/transport.c b/src/transport.c -index 21be9d2b80..a8bb588a4b 100644 ---- a/src/transport.c -+++ b/src/transport.c -@@ -186,6 +186,7 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) - struct transportpacket *p = &session->packet; - int rc; - int compressed; -+ uint32_t seq = session->remote.seqno; - - if(session->fullpacket_state == libssh2_NB_state_idle) { - session->fullpacket_macstate = LIBSSH2_MAC_CONFIRMED; -@@ -317,7 +318,7 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) - if(session->fullpacket_state == libssh2_NB_state_created) { - rc = _libssh2_packet_add(session, p->payload, - session->fullpacket_payload_len, -- session->fullpacket_macstate); -+ session->fullpacket_macstate, seq); - if(rc == LIBSSH2_ERROR_EAGAIN) - return rc; - if(rc) { -@@ -328,6 +329,11 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) - - session->fullpacket_state = libssh2_NB_state_idle; - -+ if(session->kex_strict && -+ session->fullpacket_packet_type == SSH_MSG_NEWKEYS) { -+ session->remote.seqno = 0; -+ } -+ - return session->fullpacket_packet_type; - } - -@@ -1093,6 +1099,10 @@ int _libssh2_transport_send(LIBSSH2_SESSION *session, - - session->local.seqno++; - -+ if(session->kex_strict && data[0] == SSH_MSG_NEWKEYS) { -+ session->local.seqno = 0; -+ } -+ - ret = LIBSSH2_SEND(session, p->outbuf, total_length, - LIBSSH2_SOCKET_SEND_FLAGS(session)); - if(ret < 0) diff --git a/pkgs/by-name/li/libssh2/package.nix b/pkgs/by-name/li/libssh2/package.nix index e548b011f66d..42f8acbc8f3f 100644 --- a/pkgs/by-name/li/libssh2/package.nix +++ b/pkgs/by-name/li/libssh2/package.nix @@ -15,19 +15,13 @@ stdenv.mkDerivation rec { pname = "libssh2"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { url = "https://www.libssh2.org/download/libssh2-${version}.tar.gz"; - sha256 = "sha256-NzYWHkHiaTMk3rOMJs/cPv5iCdY0ukJY2xzs/2pa1GE="; + hash = "sha256-2ex2y+NNuY7sNTn+LImdJrDIN8s+tGalaw8QnKv2WPc="; }; - patches = [ - # fetchpatch cannot be used due to infinite recursion - # https://github.com/libssh2/libssh2/commit/d34d9258b8420b19ec3f97b4cc5bf7aa7d98e35a - ./CVE-2023-48795.patch - ]; - # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion # necessary for FreeBSD code path in configure postPatch = '' diff --git a/pkgs/by-name/li/liburing/package.nix b/pkgs/by-name/li/liburing/package.nix index c35df57b6052..931cbd77b041 100644 --- a/pkgs/by-name/li/liburing/package.nix +++ b/pkgs/by-name/li/liburing/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "liburing"; - version = "2.7"; + version = "2.8"; src = fetchFromGitHub { owner = "axboe"; repo = "liburing"; rev = "refs/tags/liburing-${version}"; - hash = "sha256-WhNlO2opPM7v4LOLWpmzPv31++zmn5Hmb6Su9IQBDH8="; + hash = "sha256-10zmoMDzO41oNRVXE/6FzDGPVRVJTJTARVUmc1b7f+o="; }; separateDebugInfo = true; diff --git a/pkgs/by-name/li/libvpx/package.nix b/pkgs/by-name/li/libvpx/package.nix index 4f6c91d65c71..4e6e6316d9ad 100644 --- a/pkgs/by-name/li/libvpx/package.nix +++ b/pkgs/by-name/li/libvpx/package.nix @@ -94,13 +94,13 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; stdenv.mkDerivation rec { pname = "libvpx"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "webmproject"; repo = pname; rev = "v${version}"; - hash = "sha256-Pfg7g4y/dqn2VKDQU1LnTJQSj1Tont9/8Je6ShDb2GQ="; + hash = "sha256-ewkx1okhpa05jn4DyN8pkl6UJoz4Ymw4jRe6GN1lWuA="; }; postPatch = '' diff --git a/pkgs/by-name/li/libxmlb/package.nix b/pkgs/by-name/li/libxmlb/package.nix index a90ae30fec1e..49c67f74d30e 100644 --- a/pkgs/by-name/li/libxmlb/package.nix +++ b/pkgs/by-name/li/libxmlb/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.3.19"; + version = "0.3.20"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - hash = "sha256-gXLWHkT+h/wvmmi7PyIx16gbeYznVOT7CwuBgF3bjOY="; + hash = "sha256-X1sOUaqafppEjlcq2jYFo+BXxNX1d+vLizSQM+x/pvg="; }; patches = [ diff --git a/pkgs/by-name/li/lilv/package.nix b/pkgs/by-name/li/lilv/package.nix index fdd50d8af937..f0c2aa304546 100644 --- a/pkgs/by-name/li/lilv/package.nix +++ b/pkgs/by-name/li/lilv/package.nix @@ -32,10 +32,19 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ lv2 ]; mesonFlags = [ - "-Ddocs=disabled" + (lib.mesonOption "docs" "disabled") # Tests require building a shared library. (lib.mesonEnable "tests" (!stdenv.hostPlatform.isStatic)) - ]; + ] # Add nix and NixOS specific lv2 paths + # The default values are from: https://github.com/lv2/lilv/blob/master/src/lilv_config.h + ++ lib.optional stdenv.isDarwin (lib.mesonOption "default_lv2_path" + "~/.lv2:~/Library/Audio/Plug-Ins/LV2:" + + "/usr/local/lib/lv2:/usr/lib/lv2:" + + "/Library/Audio/Plug-Ins/LV2:" + + "~/.nix-profile/lib/lv2") + ++ lib.optional stdenv.isLinux (lib.mesonOption "default_lv2_path" + "~/.lv2:/usr/local/lib/lv2:/usr/lib/lv2:" + + "~/.nix-profile/lib/lv2:/run/current-system/sw/lib/lv2"); passthru = { tests = { diff --git a/pkgs/by-name/li/livepeer/package.nix b/pkgs/by-name/li/livepeer/package.nix index 695ceeb2b9a0..fa304d95bbfb 100644 --- a/pkgs/by-name/li/livepeer/package.nix +++ b/pkgs/by-name/li/livepeer/package.nix @@ -1,33 +1,52 @@ -{ lib, fetchFromGitHub, buildGoModule -, pkg-config, ffmpeg, gnutls +{ + lib, + fetchFromGitHub, + buildGoModule, + pkg-config, + ffmpeg-livepeer, + gnutls, + nix-update-script, }: buildGoModule rec { pname = "livepeer"; - version = "0.5.20"; + version = "0.8.0"; proxyVendor = true; - vendorHash = "sha256-aRZoAEnRai8i5H08ReW8lEFlbmarYxU0lBRhR/Llw+M="; + vendorHash = "sha256-FCTdPVa10/DUYYuZDLtZsrCXCRoDRfuvnkzhmHJNvrk="; src = fetchFromGitHub { owner = "livepeer"; repo = "go-livepeer"; - rev = "v${version}"; - sha256 = "sha256-cOxIL093Mi+g9Al/SQJ6vdaeBAXUN6ZGsSaVvEIiJpU="; + rev = "refs/tags/v${version}"; + hash = "sha256-UVL5y8z62pHi0mLueIp+iBxtzGf57LpGh+Czwg2pV0Q="; }; - # livepeer_cli has a vendoring problem - subPackages = [ "cmd/livepeer" ]; + nativeBuildInputs = [ + pkg-config + ]; - nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + ffmpeg-livepeer + gnutls + ]; - buildInputs = [ ffmpeg gnutls ]; + __darwinAllowLocalNetworking = true; - meta = with lib; { + postPatch = '' + rm -rf test/e2e # Require docker + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { description = "Official Go implementation of the Livepeer protocol"; homepage = "https://livepeer.org"; - license = licenses.mit; - maintainers = with maintainers; [ elitak ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + elitak + bot-wxt1221 + ]; mainProgram = "livepeer"; }; } diff --git a/pkgs/by-name/me/memcached/package.nix b/pkgs/by-name/me/memcached/package.nix index f1e2c027db6a..52dee4aa95dd 100644 --- a/pkgs/by-name/me/memcached/package.nix +++ b/pkgs/by-name/me/memcached/package.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.29"; + version = "1.6.31"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-JpZD1Ri3uiAzx6H2b9/FYNcnJaKCIZTZDII1QIxEOkk="; + sha256 = "sha256-INjTObj7H2x5zuIFWdxv+13+6E255Yn06yFPbSyHPvU="; }; configureFlags = [ diff --git a/pkgs/by-name/me/meson/007-case-sensitive-fs.patch b/pkgs/by-name/me/meson/007-case-sensitive-fs.patch deleted file mode 100644 index 54d07d85585c..000000000000 --- a/pkgs/by-name/me/meson/007-case-sensitive-fs.patch +++ /dev/null @@ -1,87 +0,0 @@ -From a6fb2c165cda4bbf315424c96165ec9cc7052363 Mon Sep 17 00:00:00 2001 -From: Randy Eckenrode -Date: Wed, 3 Apr 2024 17:35:56 -0400 -Subject: [PATCH] dependencies: find extraframeworks on case-sensitive - filesystems - -Fixes a test failure on case-sensitive filesystems when a CMake -dependency is turned into an Apple framework. ---- - mesonbuild/dependencies/framework.py | 9 +++++++-- - test cases/osx/11 case sensitive apfs/meson.build | 5 +++++ - test cases/osx/11 case sensitive apfs/prog.c | 3 +++ - test cases/osx/11 case sensitive apfs/test.json | 5 +++++ - 4 files changed, 20 insertions(+), 2 deletions(-) - create mode 100644 test cases/osx/11 case sensitive apfs/meson.build - create mode 100644 test cases/osx/11 case sensitive apfs/prog.c - create mode 100644 test cases/osx/11 case sensitive apfs/test.json - -diff --git a/mesonbuild/dependencies/framework.py b/mesonbuild/dependencies/framework.py -index 3c880c7430af..1fbd628235ba 100644 ---- a/mesonbuild/dependencies/framework.py -+++ b/mesonbuild/dependencies/framework.py -@@ -47,6 +47,7 @@ def detect(self, name: str, paths: T.List[str]) -> None: - framework_path = self._get_framework_path(p, name) - if framework_path is None: - continue -+ framework_name = framework_path.stem - # We want to prefer the specified paths (in order) over the system - # paths since these are "extra" frameworks. - # For example, Python2's framework is in /System/Library/Frameworks and -@@ -54,11 +55,15 @@ def detect(self, name: str, paths: T.List[str]) -> None: - # Python.framework. We need to know for sure that the framework was - # found in the path we expect. - allow_system = p in self.system_framework_paths -- args = self.clib_compiler.find_framework(name, self.env, [p], allow_system) -+ args = self.clib_compiler.find_framework(framework_name, self.env, [p], allow_system) - if args is None: - continue - self.link_args = args - self.framework_path = framework_path.as_posix() -+ # The search is done case-insensitively, so the found name may differ -+ # from the one that was requested. Setting the name ensures the correct -+ # one is used when linking on case-sensitive filesystems. -+ self.name = framework_name - self.compile_args = ['-F' + self.framework_path] - # We need to also add -I includes to the framework because all - # cross-platform projects such as OpenGL, Python, Qt, GStreamer, -@@ -74,7 +79,7 @@ def _get_framework_path(self, path: str, name: str) -> T.Optional[Path]: - p = Path(path) - lname = name.lower() - for d in p.glob('*.framework/'): -- if lname == d.name.rsplit('.', 1)[0].lower(): -+ if lname == d.stem.lower(): - return d - return None - -diff --git a/test cases/osx/11 case sensitive apfs/meson.build b/test cases/osx/11 case sensitive apfs/meson.build -new file mode 100644 -index 000000000000..dd566b185f28 ---- /dev/null -+++ b/test cases/osx/11 case sensitive apfs/meson.build -@@ -0,0 +1,5 @@ -+project('case-sensitive APFS with extra frameworks test', 'c') -+ -+dep = dependency('FoUnDaTiOn') -+ -+exe = executable('prog', 'prog.c', install : true, dependencies: dep) -diff --git a/test cases/osx/11 case sensitive apfs/prog.c b/test cases/osx/11 case sensitive apfs/prog.c -new file mode 100644 -index 000000000000..9b6bdc2ec2f0 ---- /dev/null -+++ b/test cases/osx/11 case sensitive apfs/prog.c -@@ -0,0 +1,3 @@ -+int main(void) { -+ return 0; -+} -diff --git a/test cases/osx/11 case sensitive apfs/test.json b/test cases/osx/11 case sensitive apfs/test.json -new file mode 100644 -index 000000000000..a883714eaa27 ---- /dev/null -+++ b/test cases/osx/11 case sensitive apfs/test.json -@@ -0,0 +1,5 @@ -+{ -+ "installed": [ -+ {"type": "file", "file": "usr/bin/prog"} -+ ] -+} diff --git a/pkgs/by-name/me/meson/007-freebsd-pkgconfig-path.patch b/pkgs/by-name/me/meson/007-freebsd-pkgconfig-path.patch index 3a9ba6f092dd..8eb172bb1256 100644 --- a/pkgs/by-name/me/meson/007-freebsd-pkgconfig-path.patch +++ b/pkgs/by-name/me/meson/007-freebsd-pkgconfig-path.patch @@ -1,15 +1,16 @@ -diff -ur a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py ---- a/mesonbuild/modules/pkgconfig.py 2024-05-17 17:52:30.880877000 -0700 -+++ b/mesonbuild/modules/pkgconfig.py 2024-05-17 17:53:10.901068000 -0700 -@@ -693,10 +693,7 @@ +diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py +index 1bdf82931..db165ea12 100644 +--- a/mesonbuild/modules/pkgconfig.py ++++ b/mesonbuild/modules/pkgconfig.py +@@ -701,10 +701,7 @@ class PkgConfigModule(NewExtensionModule): pcfile = filebase + '.pc' pkgroot = pkgroot_name = kwargs['install_dir'] or default_install_dir if pkgroot is None: - if mesonlib.is_freebsd(): -- pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(mesonlib.OptionKey('prefix'))), 'libdata', 'pkgconfig') +- pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(OptionKey('prefix'))), 'libdata', 'pkgconfig') - pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig') - elif mesonlib.is_haiku(): + if mesonlib.is_haiku(): - pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(mesonlib.OptionKey('prefix'))), 'develop', 'lib', 'pkgconfig') + pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(OptionKey('prefix'))), 'develop', 'lib', 'pkgconfig') pkgroot_name = os.path.join('{prefix}', 'develop', 'lib', 'pkgconfig') else: diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index d463190fec08..419e489e2b2e 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -13,7 +13,6 @@ , python3 , substituteAll , zlib -, fetchpatch }: let @@ -21,13 +20,13 @@ let in python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "mesonbuild"; repo = "meson"; rev = "refs/tags/${version}"; - hash = "sha256-cesMepnD3fHX2CwnSQ3c5TE9kPSa0FkCVVVZDgXwo8M="; + hash = "sha256-st0dbb+GfF0KEyF+Qn/PIE2462ZrrXy8YcnrulHTI8M="; }; patches = [ @@ -74,24 +73,6 @@ python3.pkgs.buildPythonApplication rec { # This edge case is explicitly part of meson but is wrong for nix ./007-freebsd-pkgconfig-path.patch - - (fetchpatch { - name = "tests-skip-framework-recasting-if-CMake-unavailable.patch"; - url = "https://github.com/mesonbuild/meson/commit/8a8a3a0578fd8d5a8720a7a706f6f3b99e857f9c.patch"; - hash = "sha256-XkwNQ5eg/fVekhsFg/V2/S2LbIVGz3H0wsSFlUT3ZZE="; - }) - - # Fix extraframework lookup on case-sensitive APFS. - # https://github.com/mesonbuild/meson/pull/13038 - ./007-case-sensitive-fs.patch - - # Fix meson's detection for zig's linker - # https://github.com/mesonbuild/meson/pull/12293 - (fetchpatch { - name = "linker-support-zig-cc.patch"; - url = "https://github.com/mesonbuild/meson/pull/12293/commits/2baae244c995794d9addfe6ed924dfa72f01be82.patch"; - hash = "sha256-dDOmSRBKl/gs7I3kmLXIyQk3zsOdlaYov72pPSel4+I="; - }) ]; buildInputs = lib.optionals (python3.pythonOlder "3.9") [ @@ -129,7 +110,7 @@ python3.pkgs.buildPythonApplication rec { patchShebangs 'test cases' substituteInPlace \ 'test cases/native/8 external program shebang parsing/script.int.in' \ - 'test cases/common/273 customtarget exe for test/generate.py' \ + 'test cases/common/274 customtarget exe for test/generate.py' \ --replace /usr/bin/env ${coreutils}/bin/env '' ] diff --git a/pkgs/by-name/me/meson/setup-hook.sh b/pkgs/by-name/me/meson/setup-hook.sh index 55ea8b5c1d97..a88a276f09a8 100644 --- a/pkgs/by-name/me/meson/setup-hook.sh +++ b/pkgs/by-name/me/meson/setup-hook.sh @@ -3,6 +3,8 @@ mesonConfigurePhase() { runHook preConfigure + : ${mesonBuildDir:=build} + local flagsArray=() if [ -z "${dontAddPrefix-}" ]; then @@ -28,8 +30,8 @@ mesonConfigurePhase() { echoCmd 'mesonConfigurePhase flags' "${flagsArray[@]}" - meson setup build "${flagsArray[@]}" - cd build || { echoCmd 'mesonConfigurePhase' "could not cd to build"; exit 1; } + meson setup "$mesonBuildDir" "${flagsArray[@]}" + cd "$mesonBuildDir" || { echoCmd 'mesonConfigurePhase' "could not cd to $mesonBuildDir"; exit 1; } if ! [[ -v enableParallelBuilding ]]; then enableParallelBuilding=1 diff --git a/pkgs/by-name/mg/mg/package.nix b/pkgs/by-name/mg/mg/package.nix index 70f5dd604296..2b69571a9109 100644 --- a/pkgs/by-name/mg/mg/package.nix +++ b/pkgs/by-name/mg/mg/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, buildPackages, darwin }: +{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, buildPackages }: stdenv.mkDerivation { pname = "mg"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin [ darwin.libutil ]; + buildInputs = [ ncurses ]; meta = with lib; { description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team"; diff --git a/pkgs/by-name/mp/mpdecimal/package.nix b/pkgs/by-name/mp/mpdecimal/package.nix index 1041100f9f8e..82643b197109 100644 --- a/pkgs/by-name/mp/mpdecimal/package.nix +++ b/pkgs/by-name/mp/mpdecimal/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "mpdecimal"; @@ -10,10 +10,16 @@ stdenv.mkDerivation rec { hash = "sha256-lCRFwyRbInMP1Bpnp8XCMdEcsbmTa5wPdjNPt9C0Row="; }; - nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ]; + postPatch = '' + # Use absolute library install names on Darwin. + substituteInPlace configure.ac \ + --replace-fail '-install_name @rpath/' "-install_name $out/lib/" + ''; + postInstall = '' mkdir -p $cxx/lib mv $out/lib/*c++* $cxx/lib diff --git a/pkgs/by-name/mt/mtm/package.nix b/pkgs/by-name/mt/mtm/package.nix index 97d2c72d52be..8ecbc087894b 100644 --- a/pkgs/by-name/mt/mtm/package.nix +++ b/pkgs/by-name/mt/mtm/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, darwin }: +{ lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { pname = "mtm"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0gibrvah059z37jvn1qs4b6kvd4ivk2mfihmcpgx1vz6yg70zghv"; }; - buildInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ darwin.libutil ]; + buildInputs = [ ncurses ]; makeFlags = [ "DESTDIR=${placeholder "out"}" "MANDIR=${placeholder "out"}/share/man/man1" ]; diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix index dc49789cf5df..d23f77669caa 100644 --- a/pkgs/by-name/ne/neovide/package.nix +++ b/pkgs/by-name/ne/neovide/package.nix @@ -12,12 +12,12 @@ , pkg-config , python3 , removeReferencesTo -, xcbuild +, apple-sdk_11 +, cctools , SDL2 , fontconfig , xorg , stdenv -, darwin , libglvnd , libxkbcommon , enableWayland ? stdenv.hostPlatform.isLinux @@ -62,11 +62,12 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { SKIA_NINJA_COMMAND = "${ninja}/bin/ninja"; nativeBuildInputs = [ + cctools.libtool makeWrapper pkg-config python3 # skia removeReferencesTo - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; + ]; nativeCheckInputs = [ neovim ]; @@ -74,9 +75,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { SDL2 fontconfig rustPlatform.bindgenHook - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; postFixup = let libPath = lib.makeLibraryPath ([ @@ -118,6 +117,6 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { changelog = "https://github.com/neovide/neovide/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ck3d ]; - platforms = platforms.linux ++ [ "aarch64-darwin" ]; + platforms = platforms.unix; }; } diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index bc61215ad4e9..fb185d85f646 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -6,7 +6,6 @@ cmake, gettext, msgpack-c, - darwin, libuv, lua, pkg-config, @@ -145,7 +144,6 @@ stdenv.mkDerivation ( tree-sitter unibilium ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ] ++ lib.optionals finalAttrs.finalPackage.doCheck [ glibcLocales procps @@ -185,16 +183,12 @@ stdenv.mkDerivation ( ]; # nvim --version output retains compilation flags and references to build tools - postPatch = - '' - substituteInPlace src/nvim/version.c --replace NVIM_VERSION_CFLAGS ""; - '' - + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - sed -i runtime/CMakeLists.txt \ - -e "s|\".*/bin/nvim|\${stdenv.hostPlatform.emulator buildPackages} &|g" - sed -i src/nvim/po/CMakeLists.txt \ - -e "s|\$ enableApp; stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.63.0"; + version = "1.64.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-YHsXRVTSKoKLxTLR1zT+D3KbXV7SB/LxLpamLoPynFU="; + sha256 = "sha256-OmcN83joUrhaIpXyXk9RzCj1bg/MSWQIuMN2QpBTevU="; }; outputs = [ "out" "dev" "lib" "doc" "man" ]; diff --git a/pkgs/by-name/ni/nixpkgs-openjdk-updater/package.nix b/pkgs/by-name/ni/nixpkgs-openjdk-updater/package.nix index 124a1fced4c6..e23d573d9641 100644 --- a/pkgs/by-name/ni/nixpkgs-openjdk-updater/package.nix +++ b/pkgs/by-name/ni/nixpkgs-openjdk-updater/package.nix @@ -43,11 +43,17 @@ python3Packages.buildPythonApplication { featureVersionPrefix, }: let - # TODO: Tighten up after update scripts are run. - src = fetchFromGitHub (lib.importJSON sourceFile); + sourceInfo = lib.importJSON sourceFile; in { - inherit src; + src = fetchFromGitHub { + inherit (sourceInfo) + owner + repo + rev + hash + ; + }; updateScript = { command = [ @@ -57,10 +63,10 @@ python3Packages.buildPythonApplication { sourceFile "--owner" - src.owner + sourceInfo.owner "--repo" - src.repo + sourceInfo.repo "--feature-version-prefix" featureVersionPrefix diff --git a/pkgs/by-name/nu/numactl/package.nix b/pkgs/by-name/nu/numactl/package.nix index 142dd064e0f9..4eceef0b2bf1 100644 --- a/pkgs/by-name/nu/numactl/package.nix +++ b/pkgs/by-name/nu/numactl/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "numactl"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { hash = "sha256-ry29RUNa0Hv5gIhy2RTVT94mHhgfdIwb5aqjBycxxj0="; }; + patches = [ + # Fix for memory corruption in set_nodemask_size + (fetchpatch { + url = "https://github.com/numactl/numactl/commit/f9deba0c8404529772468d6dd01389f7dbfa5ba9.patch"; + hash = "sha256-TmWfD99YaSIHA5PSsWHE91GSsdsVgVU+qIow7LOwOGw="; + }) + ]; + outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/oa/oama/package.nix b/pkgs/by-name/oa/oama/package.nix index e938805bac86..1f87b3bffe43 100644 --- a/pkgs/by-name/oa/oama/package.nix +++ b/pkgs/by-name/oa/oama/package.nix @@ -15,14 +15,7 @@ let passthru.updateScript = ./update.sh; }; - raw-pkg = (haskellPackages.callPackage ./generated-package.nix { }).overrideScope ( - final: prev: { - # Dependency twain requires an older version of http2, and we cannot mix - # versions of transitive dependencies. - http2 = final.http2_3_0_3; - warp = final.warp_3_3_30; - } - ); + raw-pkg = haskellPackages.callPackage ./generated-package.nix { }; in lib.pipe raw-pkg [ (overrideCabal overrides) diff --git a/pkgs/by-name/op/openjfx/17/deps.json b/pkgs/by-name/op/openjfx/17/deps.json index a9fa40a91be1..ec1816339f40 100644 --- a/pkgs/by-name/op/openjfx/17/deps.json +++ b/pkgs/by-name/op/openjfx/17/deps.json @@ -7,8 +7,8 @@ } }, "https://github.com": { - "unicode-org/icu/releases/download/release-71-1/icu4c-71_1-data-bin-l": { - "zip": "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM=" + "unicode-org/icu/releases/download/release-73-1/icu4c-73_1-data-bin-l": { + "zip": "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA=" } }, "https://repo.maven.apache.org/maven2": { diff --git a/pkgs/by-name/op/openjfx/17/source.json b/pkgs/by-name/op/openjfx/17/source.json index 932875548f4b..df4010708c42 100644 --- a/pkgs/by-name/op/openjfx/17/source.json +++ b/pkgs/by-name/op/openjfx/17/source.json @@ -1,6 +1,6 @@ { + "hash": "sha256-WV8NHlYlt7buGbirLSorLnS2TnyBD17zUquFfwSL3xE=", "owner": "openjdk", "repo": "jfx17u", - "rev": "17.0.11-ga", - "sha256": "sha256-9VfXk2EfMebMyVKPohPRP2QXRFf8XemUtfY0JtBCHyw=" + "rev": "refs/tags/17.0.11+3" } diff --git a/pkgs/by-name/op/openjfx/21/source.json b/pkgs/by-name/op/openjfx/21/source.json index adecaa605bcc..73d3a6adbb5c 100644 --- a/pkgs/by-name/op/openjfx/21/source.json +++ b/pkgs/by-name/op/openjfx/21/source.json @@ -2,5 +2,5 @@ "hash": "sha256-7z0GIbkQwG9mXY9dssaicqaKpMo3FkNEpyAvkswoQQ4=", "owner": "openjdk", "repo": "jfx21u", - "rev": "21.0.3-ga" + "rev": "refs/tags/21.0.3+2" } diff --git a/pkgs/by-name/op/openjfx/23/source.json b/pkgs/by-name/op/openjfx/23/source.json index a67cd0f370f1..19ca02f90b00 100644 --- a/pkgs/by-name/op/openjfx/23/source.json +++ b/pkgs/by-name/op/openjfx/23/source.json @@ -1,6 +1,6 @@ { - "hash": "sha256-a/ev91Rq7D3z9O56ZZQCgvvbfj5GBt5Lonow2NH3s/E=", + "hash": "sha256-H3BPLo7yKWBiiI8sd3wkLJDN9h6jbWj5119cs2YHLwU=", "owner": "openjdk", "repo": "jfx23u", - "rev": "23-ga" + "rev": "refs/tags/23.0.1+4" } diff --git a/pkgs/by-name/op/openjfx/package.nix b/pkgs/by-name/op/openjfx/package.nix index 96269280f7b6..b64ce6d32e15 100644 --- a/pkgs/by-name/op/openjfx/package.nix +++ b/pkgs/by-name/op/openjfx/package.nix @@ -69,17 +69,8 @@ stdenv.mkDerivation { inherit (source) src; - patches = - if featureVersion == "23" then - [ - # 8338701: Provide media support for libavcodec version 61 - # - (fetchpatch2 { - url = "https://github.com/openjdk/jfx23u/commit/aba60fda1c82f00e8e685107592305c403a31287.patch?full_index=1"; - hash = "sha256-+aRhTwi4VQthAq1SH1jxPl0mTosNMKoTY52jm+jiKso="; - }) - ] - else if atLeast21 then + patches = lib.optionals (!atLeast23) ( + if atLeast21 then [ ./21/patches/backport-ffmpeg-7-support-jfx21.patch ] @@ -87,7 +78,8 @@ stdenv.mkDerivation { [ ./17/patches/backport-ffmpeg-6-support-jfx11.patch ./17/patches/backport-ffmpeg-7-support-jfx11.patch - ]; + ] + ); nativeBuildInputs = [ gradle_openjfx @@ -139,11 +131,6 @@ stdenv.mkDerivation { -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h - '' - + lib.optionalString (!atLeast21) '' - substituteInPlace modules/javafx.web/src/main/native/Source/JavaScriptCore/offlineasm/parser.rb \ - --replace-fail "File.exists?" "File.exist?" - '' + '' ln -s $config gradle.properties diff --git a/pkgs/by-name/p1/p11-kit/package.nix b/pkgs/by-name/p1/p11-kit/package.nix index b520c7087ba7..316265e07bef 100644 --- a/pkgs/by-name/p1/p11-kit/package.nix +++ b/pkgs/by-name/p1/p11-kit/package.nix @@ -60,6 +60,11 @@ stdenv.mkDerivation rec { ])) ]; + ${if stdenv.buildPlatform.isDarwin && stdenv.buildPlatform.isx86_64 then "mesonCheckFlags" else null} = [ + # Tests regularly exceed the default timeout on `x86_64-darwin`. + "--timeout-multiplier=0" + ]; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; postPatch = '' diff --git a/pkgs/by-name/pu/publicsuffix-list/package.nix b/pkgs/by-name/pu/publicsuffix-list/package.nix index d12c615487ad..ef24d5765133 100644 --- a/pkgs/by-name/pu/publicsuffix-list/package.nix +++ b/pkgs/by-name/pu/publicsuffix-list/package.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation { pname = "publicsuffix-list"; - version = "0-unstable-2024-09-10"; + version = "0-unstable-2024-10-25"; src = fetchFromGitHub { owner = "publicsuffix"; repo = "list"; - rev = "fbcc4c495e8aed1fe0e90156e6b3796556eb6978"; - hash = "sha256-L6TepLI91IWImX453GO8VNSSle75f0H1IZbFr2qepDA="; + rev = "435e07efb28973ea116592dc2291b1f8c27080aa"; + hash = "sha256-nLuZVgPHNnxOT3GcGz6TEbHkiNgVU5f2uWcgCfr7tZ8="; }; dontBuild = true; diff --git a/pkgs/by-name/se/serd/package.nix b/pkgs/by-name/se/serd/package.nix index 51e1f0264805..750591e0f2e2 100644 --- a/pkgs/by-name/se/serd/package.nix +++ b/pkgs/by-name/se/serd/package.nix @@ -1,25 +1,32 @@ -{ lib -, stdenv -, fetchurl -, doxygen -, mandoc -, meson -, ninja -, pkg-config -, python3 -, sphinx -, writeScript +{ + lib, + stdenv, + fetchurl, + doxygen, + mandoc, + meson, + ninja, + pkg-config, + python3, + sphinx, + sphinxygen, + writeScript, }: stdenv.mkDerivation rec { pname = "serd"; - version = "0.30.16"; + version = "0.32.2"; - outputs = [ "out" "dev" "doc" "man" ]; + outputs = [ + "out" + "dev" + "doc" + "man" + ]; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; - hash = "sha256-9Q9IbaUZzdjQOyDJ5CQU5FkTP1okRBHY5jyu+NmskUY="; + hash = "sha256-333CyW8rod7P11bkWOBh3tfYFY0lVVTnaTSDrAljxWs="; }; nativeBuildInputs = [ @@ -30,6 +37,7 @@ stdenv.mkDerivation rec { pkg-config python3 sphinx + sphinxygen ]; postPatch = '' @@ -51,12 +59,12 @@ stdenv.mkDerivation rec { ''; }; - meta = with lib; { + meta = { description = "Lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples"; homepage = "https://drobilla.net/software/serd"; - license = licenses.mit; - maintainers = [ ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ samueltardieu ]; mainProgram = "serdi"; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/sh/sharutils/package.nix b/pkgs/by-name/sh/sharutils/package.nix index 557fdae4d22b..6a30ae1ff946 100644 --- a/pkgs/by-name/sh/sharutils/package.nix +++ b/pkgs/by-name/sh/sharutils/package.nix @@ -66,8 +66,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools for remote synchronization and `shell archives'"; - longDescription = - '' GNU shar makes so-called shell archives out of many files, preparing + longDescription = '' + GNU shar makes so-called shell archives out of many files, preparing them for transmission by electronic mail services. A shell archive is a collection of files that can be unpacked by /bin/sh. A wide range of features provide extensive flexibility in manufacturing diff --git a/pkgs/by-name/su/surelog/package.nix b/pkgs/by-name/su/surelog/package.nix index 595a3e168040..0d795611b95a 100644 --- a/pkgs/by-name/su/surelog/package.nix +++ b/pkgs/by-name/su/surelog/package.nix @@ -12,7 +12,6 @@ , antlr4 , capnproto , nlohmann_json -, darwin }: stdenv.mkDerivation (finalAttrs: { @@ -46,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { capnproto antlr4.runtime.cpp nlohmann_json - ] ++ lib.optional stdenv.isDarwin [ darwin.libutil ]; + ]; cmakeFlags = [ "-DSURELOG_USE_HOST_CAPNP=On" diff --git a/pkgs/by-name/sw/swtpm/package.nix b/pkgs/by-name/sw/swtpm/package.nix index 6b1bdb4c03ab..0332de516e8d 100644 --- a/pkgs/by-name/sw/swtpm/package.nix +++ b/pkgs/by-name/sw/swtpm/package.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , pkg-config , libtasn1, openssl, fuse, glib, libseccomp, json-glib @@ -25,6 +26,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-48/BOzGPoKr/BGEXFo3FXWr6ZoPB+ixZIvv78g6L294="; }; + patches = [ + # Enable 64-bit file API on 32-bit systems: + # https://github.com/stefanberger/swtpm/pull/941 + (fetchpatch { + name = "64-bit-file-api.patch"; + url = "https://github.com/stefanberger/swtpm/commit/599e2436d4f603ef7c83fad11d76b5546efabefc.patch"; + hash = "sha256-cS/BByOJeNNevQ1B3Ij1kykJwixVwGoikowx7j9gRmA="; + }) + ]; + nativeBuildInputs = [ pkg-config unixtools.netstat expect socat perl # for pod2man diff --git a/pkgs/by-name/td/tdb/package.nix b/pkgs/by-name/td/tdb/package.nix index c84ded6267e1..a42bb92cda13 100644 --- a/pkgs/by-name/td/tdb/package.nix +++ b/pkgs/by-name/td/tdb/package.nix @@ -7,17 +7,18 @@ , readline , libxslt , libxcrypt +, apple-sdk_11 , docbook-xsl-nons , docbook_xml_dtd_45 }: stdenv.mkDerivation rec { pname = "tdb"; - version = "1.4.10"; + version = "1.4.11"; src = fetchurl { url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; - hash = "sha256-AjOOM8FsIcnilXHO9SPnaytwhjYlT28wxs8ZXUjGLa8="; + hash = "sha256-Toum2T84NWW70GG+Te7hUxgjLRu8ynIS8Y4X9Wu5dag="; }; nativeBuildInputs = [ @@ -33,6 +34,8 @@ stdenv.mkDerivation rec { python3 readline # required to build python libxcrypt + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_11 ]; # otherwise the configure script fails with diff --git a/pkgs/by-name/ti/tinysparql/package.nix b/pkgs/by-name/ti/tinysparql/package.nix index f4d5283c91d4..240dbf789f57 100644 --- a/pkgs/by-name/ti/tinysparql/package.nix +++ b/pkgs/by-name/ti/tinysparql/package.nix @@ -1,5 +1,6 @@ { stdenv , lib +, fetchpatch2 , fetchurl , gettext , meson @@ -106,13 +107,15 @@ stdenv.mkDerivation (finalAttrs: { "-Dsystemd_user_services=false" ]; - doCheck = - # https://gitlab.gnome.org/GNOME/tinysparql/-/issues/402 - !stdenv.hostPlatform.isDarwin - # https://gitlab.gnome.org/GNOME/tinysparql/-/issues/398 - && !stdenv.hostPlatform.is32bit - # https://gitlab.gnome.org/GNOME/tinysparql/-/issues/474 - && !stdenv.hostPlatform.isMusl; + patches = [ + # https://gitlab.gnome.org/GNOME/tinysparql/-/merge_requests/730 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/tinysparql/commit/12ed969913cb579f638fa0aa0853aeb6c6c6f536.patch"; + hash = "sha256-jyx9hdWUUxfCSTGn7lZL4RUiQAF4pkf4gfCP8g9Ep3U="; + }) + ]; + + doCheck = true; postPatch = '' chmod +x \ diff --git a/pkgs/by-name/ti/tinyxxd/package.nix b/pkgs/by-name/ti/tinyxxd/package.nix index a19f9d7ef3f3..ed491ca42b61 100644 --- a/pkgs/by-name/ti/tinyxxd/package.nix +++ b/pkgs/by-name/ti/tinyxxd/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tinyxxd"; - version = "1.3.5"; + version = "1.3.7"; src = fetchFromGitHub { repo = "tinyxxd"; owner = "xyproto"; rev = "v${finalAttrs.version}"; - hash = "sha256-W7BrQga98ACrhTHF3UlGQMRmcdJaxgorDP6FpD5mr2A="; + hash = "sha256-Yj9n/reWAjKY1spXiW/fjPGTgj1Yc18FzFln6f5LK9c="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/uh/uhdm/package.nix b/pkgs/by-name/uh/uhdm/package.nix index eb078d482732..72b55ffbcd7a 100644 --- a/pkgs/by-name/uh/uhdm/package.nix +++ b/pkgs/by-name/uh/uhdm/package.nix @@ -5,7 +5,6 @@ , python3 , capnproto , gtest -, darwin }: stdenv.mkDerivation (finalAttrs: { @@ -29,8 +28,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ capnproto - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libutil ]; cmakeFlags = [ diff --git a/pkgs/by-name/up/upower/package.nix b/pkgs/by-name/up/upower/package.nix index 5b4e4ede7b56..5f2321bb407f 100644 --- a/pkgs/by-name/up/upower/package.nix +++ b/pkgs/by-name/up/upower/package.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , makeWrapper , pkg-config , libxslt @@ -53,6 +54,13 @@ stdenv.mkDerivation (finalAttrs: { ./i686-test-remove-battery-check.patch ] ++ [ ./installed-tests-path.patch + + # Fix a race condition in test_sibling_priority_no_overwrite + # Remove when updating to > 1.90.6 + (fetchpatch { + url = "https://gitlab.freedesktop.org/upower/upower/-/commit/9ee76826bd41a5d3a377dfd6f5835f42ec50be9a.patch"; + hash = "sha256-E56iz/iHn+VM7Opo0a13A5nhnB9nf6C7Y1kyWzk4ZnU="; + }) ]; strictDeps = true; diff --git a/pkgs/by-name/vv/vvenc/package.nix b/pkgs/by-name/vv/vvenc/package.nix new file mode 100644 index 000000000000..774645e29ff9 --- /dev/null +++ b/pkgs/by-name/vv/vvenc/package.nix @@ -0,0 +1,48 @@ +{ + lib, + fetchFromGitHub, + stdenv, + gitUpdater, + testers, + cmake, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "vvenc"; + version = "1.12.0"; + + outputs = [ + "out" + "lib" + "dev" + ]; + + src = fetchFromGitHub { + owner = "fraunhoferhhi"; + repo = "vvenc"; + rev = "v${finalAttrs.version}"; + hash = "sha256-C7ApayhubunkXBqJ/EqntaFPn6zk8rZ9fUqg7kbhvAk="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + (lib.cmakeBool "VVENC_INSTALL_FULLFEATURE_APP" true) + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + homepage = "https://github.com/fraunhoferhhi/vvenc"; + description = "Fraunhofer Versatile Video Encoder"; + license = lib.licenses.bsd3Clear; + mainProgram = "vvencapp"; + pkgConfigModules = [ "libvvenc" ]; + maintainers = with lib.maintainers; [ jopejoe1 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/wa/waf/package.nix b/pkgs/by-name/wa/waf/package.nix index 45ab6f7622db..75fb3d74c2a7 100644 --- a/pkgs/by-name/wa/waf/package.nix +++ b/pkgs/by-name/wa/waf/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "waf"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; rev = "waf-${finalAttrs.version}"; - hash = "sha256-/7V+GA3YBhdaJkDlZ1k4IUYkgh0yuTG09G+frnnMoIw="; + hash = "sha256-7ujlE0brLFmET7tAy0/RTdDORUyr6keZ3OjvxBOC/BI="; }; nativeBuildInputs = [ @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://waf.io"; description = "Meta build system"; - changelog = "https://gitlab.com/ita1024/waf/blob/${finalAttrs.version}/ChangeLog"; + changelog = "https://gitlab.com/ita1024/waf/blob/waf-${finalAttrs.version}/ChangeLog"; license = lib.licenses.bsd3; mainProgram = "waf"; maintainers = with lib.maintainers; [ AndersonTorres ]; diff --git a/pkgs/by-name/xc/xcbuild/package.nix b/pkgs/by-name/xc/xcbuild/package.nix index 7b574aa91994..fc5e79830664 100644 --- a/pkgs/by-name/xc/xcbuild/package.nix +++ b/pkgs/by-name/xc/xcbuild/package.nix @@ -80,8 +80,10 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Add missing header for `abort` ./patches/includes.patch - # Prevent xcrun from recursively invoking itself - ./patches/Avoid-fork-bomb-when-searching-system-paths.patch + # Prevent xcrun from recursively invoking itself but still find native toolchain binaries + ./patches/Use-system-toolchain-for-usr-bin.patch + # Suppress warnings due to newer SDKs with unknown keys + ./patches/Suppress-unknown-key-warnings.patch ]; prePatch = '' diff --git a/pkgs/by-name/xc/xcbuild/patches/Avoid-fork-bomb-when-searching-system-paths.patch b/pkgs/by-name/xc/xcbuild/patches/Avoid-fork-bomb-when-searching-system-paths.patch deleted file mode 100644 index bad8621e4b8c..000000000000 --- a/pkgs/by-name/xc/xcbuild/patches/Avoid-fork-bomb-when-searching-system-paths.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/Libraries/xcsdk/Tools/xcrun.cpp b/Libraries/xcsdk/Tools/xcrun.cpp -index 9d6d4576d7..7400267c2b 100644 ---- a/Libraries/xcsdk/Tools/xcrun.cpp -+++ b/Libraries/xcsdk/Tools/xcrun.cpp -@@ -23,6 +23,8 @@ - #include - #include - -+#include -+ - using libutil::DefaultFilesystem; - using libutil::Filesystem; - using libutil::FSUtil; -@@ -398,6 +400,8 @@ - fprintf(stderr, "\n"); - } - -+ std::unordered_map environment = processContext->environmentVariables(); -+ - /* - * Collect search paths for the tool. - * Can be in toolchains, target (if one is provided), developer root, -@@ -408,6 +412,15 @@ - executablePaths.insert(executablePaths.end(), defaultExecutablePaths.begin(), defaultExecutablePaths.end()); - - /* -+ * Don’t look for tools in `/usr/bin` because it can cause an infinite recursion when `xcrun` finds a shim -+ * that tries to invoke `xcrun` to run the tool. -+ */ -+ executablePaths.erase( -+ std::remove(executablePaths.begin(), executablePaths.end(), "/usr/bin"), -+ executablePaths.end() -+ ); -+ -+ /* - * Find the tool to execute. - */ - ext::optional executable = filesystem->findExecutable(*options.tool(), executablePaths); -@@ -428,8 +441,6 @@ - } else { - /* Run is the default. */ - -- std::unordered_map environment = processContext->environmentVariables(); -- - if (target != nullptr) { - /* - * Update effective environment to include the target path. diff --git a/pkgs/by-name/xc/xcbuild/patches/Suppress-unknown-key-warnings.patch b/pkgs/by-name/xc/xcbuild/patches/Suppress-unknown-key-warnings.patch new file mode 100644 index 000000000000..c101e9ca722e --- /dev/null +++ b/pkgs/by-name/xc/xcbuild/patches/Suppress-unknown-key-warnings.patch @@ -0,0 +1,26 @@ +diff --git a/Libraries/xcsdk/Sources/SDK/Product.cpp b/Libraries/xcsdk/Sources/SDK/Product.cpp +index f291d475c7..bc339f567c 100644 +--- a/Libraries/xcsdk/Sources/SDK/Product.cpp ++++ b/Libraries/xcsdk/Sources/SDK/Product.cpp +@@ -33,7 +33,7 @@ + auto PBV = unpack.cast ("ProductBuildVersion"); + auto PC = unpack.cast ("ProductCopyright"); + +- if (!unpack.complete(true)) { ++ if (!unpack.complete(false)) { + fprintf(stderr, "%s", unpack.errorText().c_str()); + } + +diff --git a/Libraries/xcsdk/Sources/SDK/Target.cpp b/Libraries/xcsdk/Sources/SDK/Target.cpp +index 523c1e4cbd..2197b1d6d1 100644 +--- a/Libraries/xcsdk/Sources/SDK/Target.cpp ++++ b/Libraries/xcsdk/Sources/SDK/Target.cpp +@@ -86,7 +86,7 @@ + /* Ignored: seems to be a typo. */ + (void)unpack.cast ("isBaseSDK"); + +- if (!unpack.complete(true)) { ++ if (!unpack.complete(false)) { + fprintf(stderr, "%s", unpack.errorText().c_str()); + } + diff --git a/pkgs/by-name/xc/xcbuild/patches/Use-system-toolchain-for-usr-bin.patch b/pkgs/by-name/xc/xcbuild/patches/Use-system-toolchain-for-usr-bin.patch new file mode 100644 index 000000000000..9e8314235709 --- /dev/null +++ b/pkgs/by-name/xc/xcbuild/patches/Use-system-toolchain-for-usr-bin.patch @@ -0,0 +1,80 @@ +diff --git a/Libraries/xcsdk/Tools/xcrun.cpp b/Libraries/xcsdk/Tools/xcrun.cpp +index 9d6d4576d7..73aabc3d42 100644 +--- a/Libraries/xcsdk/Tools/xcrun.cpp ++++ b/Libraries/xcsdk/Tools/xcrun.cpp +@@ -23,10 +23,14 @@ + #include + #include + ++#include ++ + using libutil::DefaultFilesystem; + using libutil::Filesystem; + using libutil::FSUtil; + ++#define SYSTEM_DEVELOPER_DIR "/private/var/select/developer_dir" ++ + class Options { + private: + ext::optional _help; +@@ -398,6 +402,8 @@ + fprintf(stderr, "\n"); + } + ++ std::unordered_map environment = processContext->environmentVariables(); ++ + /* + * Collect search paths for the tool. + * Can be in toolchains, target (if one is provided), developer root, +@@ -408,10 +414,42 @@ + executablePaths.insert(executablePaths.end(), defaultExecutablePaths.begin(), defaultExecutablePaths.end()); + + /* ++ * Remove `/usr/bin` from the search paths to avoid infinite recursions from stubs that try to invoke `xcrun`. ++ */ ++ const auto originalSize = executablePaths.size(); ++ auto result = executablePaths.erase( ++ std::remove(executablePaths.begin(), executablePaths.end(), "/usr/bin"), ++ executablePaths.end() ++ ); ++ ++ /* + * Find the tool to execute. + */ + ext::optional executable = filesystem->findExecutable(*options.tool(), executablePaths); + if (!executable) { ++ /* ++ * However, check for the system developer dir and look there if the binaries can’t be found in the store. ++ * This is done only if a binary is not found in the store to ensure those always take priority. ++ * Fixes https://github.com/NixOS/nixpkgs/issues/353875. ++ */ ++ std::vector toolchainPaths = { }; ++ if (executablePaths.size() < originalSize && filesystem->exists(SYSTEM_DEVELOPER_DIR)) { ++ auto linkTarget = filesystem->readSymbolicLinkCanonical(SYSTEM_DEVELOPER_DIR); ++ if (linkTarget) { ++ auto usrBinPath = FSUtil::NormalizePath(*linkTarget + "/usr/bin"); ++ if (filesystem->exists(usrBinPath)) { ++ toolchainPaths.push_back(usrBinPath); ++ } ++ auto toolchainUsrBinPath = FSUtil::NormalizePath(*linkTarget + "/Toolchains/XcodeDefault.xctoolchain/usr/bin"); ++ if (filesystem->exists(toolchainUsrBinPath)) { ++ toolchainPaths.push_back(toolchainUsrBinPath); ++ } ++ } ++ } ++ executable = filesystem->findExecutable(*options.tool(), toolchainPaths); ++ } ++ ++ if (!executable) { + fprintf(stderr, "error: tool '%s' not found\n", options.tool()->c_str()); + return 1; + } +@@ -428,8 +466,6 @@ + } else { + /* Run is the default. */ + +- std::unordered_map environment = processContext->environmentVariables(); +- + if (target != nullptr) { + /* + * Update effective environment to include the target path. diff --git a/pkgs/by-name/xt/xterm/package.nix b/pkgs/by-name/xt/xterm/package.nix index 41f3b5bd8b3f..f9a2e0151f6a 100644 --- a/pkgs/by-name/xt/xterm/package.nix +++ b/pkgs/by-name/xt/xterm/package.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "394"; + version = "395"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-oqDLIG6wQj3tw0eU9cLTjIM5DS3REGtmq6CWDDqXbHo="; + hash = "sha256-KG48qlk46uOOICgnYhVnYp3+quaJ6AcLQTyhE5gJPcg="; }; patches = [ ./sixel-256.support.patch ]; diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index e0c1383b6a64..72cffa55962e 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -205,9 +205,6 @@ rustPlatform.buildRustPackage rec { ZED_UPDATE_EXPLANATION = "Zed has been installed using Nix. Auto-updates have thus been disabled."; # Used by `zed --version` RELEASE_VERSION = version; - # Required until `-isysroot` can be used with libclang in nixpkgs on darwin, otherwise - # rust bindgen will not work as expected - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-F${apple-sdk_15.sdkroot}/System/Library/Frameworks"; }; RUSTFLAGS = if withGLES then "--cfg gles" else ""; diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 557a787a0965..dcff9e8cb404 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "750067bc36e810a96c066c8800438e0ce9ced327", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/750067bc36e810a96c066c8800438e0ce9ced327.tar.gz", - "sha256": "1bfr8r14rkisjp1f3iln12h4f5n66k8wkk09jvk7adal4grlpjny", - "msg": "Update from Hackage at 2024-10-05T14:46:54Z" + "commit": "0b0765b206e909965c9a65d28e87ebc9aae4d8af", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0b0765b206e909965c9a65d28e87ebc9aae4d8af.tar.gz", + "sha256": "1rh4jmbj2v4n1lf8cv8qkj5rx10gjib2cmfsdxaf2d3n0c4cr4bn", + "msg": "Update from Hackage at 2024-10-25T11:10:52Z" } diff --git a/pkgs/desktops/deepin/core/dde-application-manager/default.nix b/pkgs/desktops/deepin/core/dde-application-manager/default.nix index 73b412d7e6da..d265cfdc6c06 100644 --- a/pkgs/desktops/deepin/core/dde-application-manager/default.nix +++ b/pkgs/desktops/deepin/core/dde-application-manager/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - qt6Packages.wrapQtAppsHook + qt6Packages.wrapQtAppsNoGuiHook ]; buildInputs = [ diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index 2c1b1ea125c8..9b4123b0e7d9 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -146,7 +146,8 @@ in '' + lib.optionalString (flutter ? engine && flutter.engine.meta.available) '' --set-default FLUTTER_ENGINE "${flutter.engine}" \ --add-flags "--local-engine-host ${flutter.engine.outName}" \ - '' + '' --suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \ + '' + '' + --suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \ --suffix PKG_CONFIG_PATH : "$FLUTTER_PKG_CONFIG_PATH" \ --suffix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \ --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCxxFlags)}' \ diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index d5d59adabb74..40a0484d5c50 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -226,7 +226,8 @@ pipe ((callFile ./common/builder.nix {}) ({ libc = if libcCross != null then libcCross else stdenv.cc.libc; in ( - '' echo "fixing the {GLIBC,UCLIBC,MUSL}_DYNAMIC_LINKER macros..." + '' + echo "fixing the {GLIBC,UCLIBC,MUSL}_DYNAMIC_LINKER macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h do grep -q _DYNAMIC_LINKER "$header" || continue diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 8830b8d179b2..10554c4cb48a 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,5 +1,5 @@ import ./common-hadrian.nix { - version = "9.11.20240423"; - rev = "dddc9dff0547733a10e7f505612ab9df3a7c21b6"; - sha256 = "0993sdmzzyymllck8mcpa1zgrjqjfxcvk1ykvfc18bvbs4145cm9"; + version = "9.13.20241031"; + rev = "0b11cdc022ce33d089db95b2b2e7c1f4bb326d37"; + sha256 = "0kqnpcgv49ricbr950lffs8gx7jrcg6anzc0qvwy5pb518w0d37i"; } diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index 229d19ff06e7..14a80eae8046 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.23.2"; + version = "1.23.3"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-NpMBYqk99BfZC9IsbhTa/0cFuqwrAkGO3aZxzfqc0H8="; + hash = "sha256-jWp3MySHVXxq+iQhExtQ+D20rjxXnDvHLmcO4faWhZk="; }; strictDeps = true; diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix index 45b8090d8214..88f5dfd84d6a 100644 --- a/pkgs/development/compilers/llvm/common/clang/default.nix +++ b/pkgs/development/compilers/llvm/common/clang/default.nix @@ -79,13 +79,17 @@ let # Make sure clang passes the correct location of libLTO to ld64 substituteInPlace lib/Driver/ToolChains/Darwin.cpp \ --replace-fail 'StringRef P = llvm::sys::path::parent_path(D.Dir);' 'StringRef P = "${lib.getLib libllvm}";' - '' + (if lib.versionOlder release_version "13" then '' - sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ - -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ - lib/Driver/ToolChains/*.cpp - '' else '' - (cd tools && ln -s ../../clang-tools-extra extra) - '') + lib.optionalString stdenv.hostPlatform.isMusl '' + '' + ( + # See the comment on the `add-nostdlibinc-flag.patch` patch in + # `../default.nix` for why we skip Darwin here. + if lib.versionOlder release_version "13" && (!stdenv.hostPlatform.isDarwin || !stdenv.targetPlatform.isDarwin) then '' + sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ + -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ + lib/Driver/ToolChains/*.cpp + '' else '' + (cd tools && ln -s ../../clang-tools-extra extra) + '' + ) + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp ''; diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index 241fad158c3c..21f5cfef393f 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -188,6 +188,13 @@ stdenv.mkDerivation ({ substituteInPlace ../libcxx/utils/merge_archives.py \ --replace-fail "import distutils.spawn" "from shutil import which as find_executable" \ --replace-fail "distutils.spawn." "" + '' + lib.optionalString (lib.versionAtLeast release_version "19") + # codesign in sigtool doesn't support the various options used by the build + # and is present in the bootstrap-tools. Removing find_program prevents the + # build from trying to use it and failing. + '' + substituteInPlace cmake/Modules/AddCompilerRT.cmake \ + --replace-fail 'find_program(CODESIGN codesign)' "" ''; # Hack around weird upsream RPATH bug diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 1826215ba3ef..707bb91b875d 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -529,8 +529,24 @@ let # mis-compilation in firefox. # See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454 (metadata.getVersionFile "clang/revert-malloc-alignment-assumption.patch") + # This patch prevents global system header directories from + # leaking through on non‐NixOS Linux. However, on macOS, the + # SDK path is used as the sysroot, and forcing `-nostdlibinc` + # breaks `-isysroot` with an unwrapped compiler. As macOS has + # no `/usr/include`, there’s essentially no risk to skipping + # the patch there. It’s possible that Homebrew headers in + # `/usr/local/include` might leak through to unwrapped + # compilers being used without an SDK set or something, but + # it hopefully shouldn’t matter. + # + # TODO: Figure out a better solution to this whole problem so + # that we won’t have to choose between breaking unwrapped + # compilers breaking libclang when we can do Linux‐to‐Darwin + # cross‐compilation again. + ++ lib.optional ( + !args.stdenv.hostPlatform.isDarwin || !args.stdenv.targetPlatform.isDarwin + ) ./clang/add-nostdlibinc-flag.patch ++ [ - ./clang/add-nostdlibinc-flag.patch (substituteAll { src = if (lib.versionOlder metadata.release_version "16") then @@ -947,6 +963,10 @@ let url = "https://github.com/llvm/llvm-project/commit/abc2eae68290c453e1899a94eccc4ed5ea3b69c1.patch"; hash = "sha256-oxCxOjhi5BhNBEraWalEwa1rS3Mx9CuQgRVZ2hrbd7M="; }) + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5909979869edca359bcbca74042c2939d900680e.patch"; + hash = "sha256-l4rQHYbblEADBXaZIdqTG0sZzH4fEQvYiqhLYNZDMa8="; + }) ]; }; } diff --git a/pkgs/development/compilers/llvm/common/libclc.nix b/pkgs/development/compilers/llvm/common/libclc.nix index c24fc6e3b4c0..d20e6877019b 100644 --- a/pkgs/development/compilers/llvm/common/libclc.nix +++ b/pkgs/development/compilers/llvm/common/libclc.nix @@ -17,6 +17,14 @@ let spirv-llvm-translator = buildPackages.spirv-llvm-translator.override { inherit (buildLlvmTools) llvm; }; + + # The build requires an unwrapped clang but wrapped clang++ thus we need to + # split the unwrapped clang out to prevent the build from finding the + # unwrapped clang++ + clang-only = runCommand "clang-only" { } '' + mkdir -p "$out"/bin + ln -s "${lib.getExe' buildLlvmTools.clang.cc "clang"}" "$out"/bin + ''; in stdenv.mkDerivation rec { pname = "libclc"; @@ -78,7 +86,7 @@ stdenv.mkDerivation rec { python3 ] ++ lib.optional (lib.versionAtLeast release_version "19") [ - buildLlvmTools.clang.cc + clang-only buildLlvmTools.llvm spirv-llvm-translator ]; diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 4d52e48d8775..24a028e77974 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -28,7 +28,7 @@ let "16.0.6".officialRelease.sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs="; "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; - "19.1.1".officialRelease.sha256 = "sha256-xTo44+vH1Bz49fEl4bIpU3eIgQtFuBTGbgU7mzeY33s="; + "19.1.3".officialRelease.sha256 = "sha256-NUx01eJNsYMlk+8mtlf10isIqhK8zBmqaOTjuFqMNRQ="; "20.0.0-git".gitRelease = { rev = "0e8555d4dbfdfeddc01dc2ecf9a9b6e804f7b645"; rev-version = "20.0.0-unstable-2024-10-07"; diff --git a/pkgs/development/compilers/openjdk/11/source.json b/pkgs/development/compilers/openjdk/11/source.json index 8683cdecba3d..68080694d667 100644 --- a/pkgs/development/compilers/openjdk/11/source.json +++ b/pkgs/development/compilers/openjdk/11/source.json @@ -1,6 +1,6 @@ { - "hash": "sha256-H/VmT6NYbbZBba7Js8xk+epVZ2kLfvlwTNgg5SQ4ljA=", + "hash": "sha256-HqFm4qESB5T4Y1FLgfHZxURi7l7NkLzx2w8GzmB1jSY=", "owner": "openjdk", "repo": "jdk11u", - "rev": "jdk-11.0.24+8" + "rev": "refs/tags/jdk-11.0.25+9" } diff --git a/pkgs/development/compilers/openjdk/17/patches/fix-library-path-jdk17.patch b/pkgs/development/compilers/openjdk/17/patches/fix-library-path-jdk17.patch index 4c38aca2b48a..71d96631ef89 100644 --- a/pkgs/development/compilers/openjdk/17/patches/fix-library-path-jdk17.patch +++ b/pkgs/development/compilers/openjdk/17/patches/fix-library-path-jdk17.patch @@ -1,6 +1,8 @@ +diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp +index 7c951cee51..bcc61ff43d 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -412,18 +412,8 @@ void os::init_system_properties_values() { +@@ -416,18 +416,8 @@ // 1: ... // ... // 7: The default directories, normally /lib and /usr/lib. @@ -18,8 +20,8 @@ -#define SYS_EXT_DIR "/usr/java/packages" #define EXTENSIONS_DIR "/lib/ext" - // Buffer that fits several sprintfs. -@@ -431,7 +421,7 @@ void os::init_system_properties_values() { + // Buffer that fits several snprintfs. +@@ -435,7 +425,7 @@ // by the nulls included by the sizeof operator. const size_t bufsize = MAX2((size_t)MAXPATHLEN, // For dll_dir & friends. @@ -28,28 +30,26 @@ char *buf = NEW_C_HEAP_ARRAY(char, bufsize, mtInternal); // sysclasspath, java_home, dll_dir -@@ -478,26 +468,22 @@ void os::init_system_properties_values() { +@@ -482,24 +472,20 @@ // should always exist (until the legacy problem cited above is // addressed). const char *v = ::getenv("LD_LIBRARY_PATH"); - const char *v_colon = ":"; - if (v == NULL) { v = ""; v_colon = ""; } +- // That's +1 for the colon and +1 for the trailing '\0'. +- size_t pathsize = strlen(v) + 1 + sizeof(SYS_EXT_DIR) + sizeof("/lib/") + sizeof(DEFAULT_LIBPATH) + 1; + if (v == NULL) { v = ""; } - // That's +1 for the colon and +1 for the trailing '\0'. - char *ld_library_path = NEW_C_HEAP_ARRAY(char, -- strlen(v) + 1 + -- sizeof(SYS_EXT_DIR) + sizeof("/lib/") + sizeof(DEFAULT_LIBPATH) + 1, -+ strlen(v) + 1, - mtInternal); -- sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib:" DEFAULT_LIBPATH, v, v_colon); -+ sprintf(ld_library_path, "%s", v); ++ size_t pathsize = strlen(v) + 1; + char *ld_library_path = NEW_C_HEAP_ARRAY(char, pathsize, mtInternal); +- os::snprintf_checked(ld_library_path, pathsize, "%s%s" SYS_EXT_DIR "/lib:" DEFAULT_LIBPATH, v, v_colon); ++ os::snprintf_checked(ld_library_path, pathsize, "%s", v); Arguments::set_library_path(ld_library_path); FREE_C_HEAP_ARRAY(char, ld_library_path); } // Extensions directories. -- sprintf(buf, "%s" EXTENSIONS_DIR ":" SYS_EXT_DIR EXTENSIONS_DIR, Arguments::get_java_home()); -+ sprintf(buf, "%s" EXTENSIONS_DIR, Arguments::get_java_home()); +- os::snprintf_checked(buf, bufsize, "%s" EXTENSIONS_DIR ":" SYS_EXT_DIR EXTENSIONS_DIR, Arguments::get_java_home()); ++ os::snprintf_checked(buf, bufsize, "%s" EXTENSIONS_DIR, Arguments::get_java_home()); Arguments::set_ext_dirs(buf); FREE_C_HEAP_ARRAY(char, buf); @@ -57,4 +57,5 @@ -#undef DEFAULT_LIBPATH -#undef SYS_EXT_DIR #undef EXTENSIONS_DIR - } \ No newline at end of file + } + diff --git a/pkgs/development/compilers/openjdk/17/source.json b/pkgs/development/compilers/openjdk/17/source.json index 546e2fff8a19..c372853e70e0 100644 --- a/pkgs/development/compilers/openjdk/17/source.json +++ b/pkgs/development/compilers/openjdk/17/source.json @@ -1,6 +1,6 @@ { - "hash": "sha256-9UB1H3gd+b4wWxOMgsdDPgX/IGWNORKk1gMsSjYoZMw=", + "hash": "sha256-wHJlCmaE8titkfcWb2WboqemekPBn3JWc4bGyWskmoY=", "owner": "openjdk", "repo": "jdk17u", - "rev": "jdk-17.0.12+7" + "rev": "refs/tags/jdk-17.0.13+11" } diff --git a/pkgs/development/compilers/openjdk/21/source.json b/pkgs/development/compilers/openjdk/21/source.json index d0db28246a84..9808423ccff1 100644 --- a/pkgs/development/compilers/openjdk/21/source.json +++ b/pkgs/development/compilers/openjdk/21/source.json @@ -1,6 +1,6 @@ { - "hash": "sha256-+xpQtQ1IQ7btVWnENT9XS5A/2VP101/+XR3BMo8BqYI=", + "hash": "sha256-H28Hp1SzANkrgnC6xdkiSEcRK6bm8BcT/lbJDEUvRYY=", "owner": "openjdk", "repo": "jdk21u", - "rev": "jdk-21.0.4+7" + "rev": "refs/tags/jdk-21.0.5+11" } diff --git a/pkgs/development/compilers/openjdk/23/source.json b/pkgs/development/compilers/openjdk/23/source.json index b47426326ecd..d56aeb591498 100644 --- a/pkgs/development/compilers/openjdk/23/source.json +++ b/pkgs/development/compilers/openjdk/23/source.json @@ -1,6 +1,6 @@ { - "hash": "sha256-lcLnWAiskWindOqWmOWiIHiYKXGSJZK4d20k19QZfrE=", + "hash": "sha256-Sl0aEtndzlyuwMtcjOeDe2CVls89ONzicP5IXhAU2FA=", "owner": "openjdk", "repo": "jdk23u", - "rev": "jdk-23-ga" + "rev": "refs/tags/jdk-23.0.1+11" } diff --git a/pkgs/development/compilers/openjdk/8/source.json b/pkgs/development/compilers/openjdk/8/source.json index 47ad1dc0596a..6cedef5ccb7b 100644 --- a/pkgs/development/compilers/openjdk/8/source.json +++ b/pkgs/development/compilers/openjdk/8/source.json @@ -1,6 +1,6 @@ { - "hash": "sha256-uMo1DIkji+FPTbFRwURXybkLE5xv+teSClWP9RfAvfo=", + "hash": "sha256-48DyJXD7D28LFa+4ONeMgSddqrCLn6FLwEGWGeP4upM=", "owner": "openjdk", "repo": "jdk8u", - "rev": "jdk8u422-ga" + "rev": "refs/tags/jdk8u432-b06" } diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix index 0d03be2a95cf..ee3b6b5991a1 100644 --- a/pkgs/development/compilers/openjdk/generic.nix +++ b/pkgs/development/compilers/openjdk/generic.nix @@ -99,12 +99,8 @@ let atLeast23 = lib.versionAtLeast featureVersion "23"; tagPrefix = if atLeast11 then "jdk-" else "jdk"; - # TODO: Merge these `lib.removePrefix` calls once update scripts have - # been run. - version = lib.removePrefix tagPrefix (lib.removePrefix "refs/tags/" source.src.rev); - versionSplit = - # TODO: Remove `-ga` logic once update scripts have been run. - builtins.match (if atLeast11 then "(.+)[-+](.+)" else "(.+)-b?(.+)") version; + version = lib.removePrefix "refs/tags/${tagPrefix}" source.src.rev; + versionSplit = builtins.match (if atLeast11 then "(.+)+(.+)" else "(.+)-b(.+)") version; versionBuild = lib.elemAt versionSplit 1; # The JRE 8 libraries are in directories that depend on the CPU. @@ -221,15 +217,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; }) ] - ++ lib.optionals (featureVersion == "17") [ - # Backport fixes for musl 1.2.4 which are already applied in jdk21+ - # Fetching patch from chimera because they already went through the effort of rebasing it onto jdk17 - (fetchurl { - name = "lfs64.patch"; - url = "https://raw.githubusercontent.com/chimera-linux/cports/4614075d19e9c9636f3f7e476687247f63330a35/contrib/openjdk17/patches/lfs64.patch"; - hash = "sha256-t2mRbdEiumBAbIAC0zsJNwCn59WYWHsnRtuOSL6bWB4="; - }) - ] ++ lib.optionals (!headless && enableGtk) [ ( if atLeast17 then diff --git a/pkgs/development/compilers/rust/1_82.nix b/pkgs/development/compilers/rust/1_82.nix index 8e74e8c3a3e6..9d1281352ee1 100644 --- a/pkgs/development/compilers/rust/1_82.nix +++ b/pkgs/development/compilers/rust/1_82.nix @@ -104,25 +104,26 @@ import ./default.nix else llvmPackages_18; - # Note: the version MUST be one version prior to the version we're - # building - bootstrapVersion = "1.81.0"; + # Note: the version MUST be the same version that we are building. Upstream + # ensures that each released compiler can compile itself: + # https://github.com/NixOS/nixpkgs/pull/351028#issuecomment-2438244363 + bootstrapVersion = "1.82.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "0ab6ff2da7218220a2fb6e9538f5582c5d27448e91ff6ea2e296b2aee2b5e2d9"; - x86_64-unknown-linux-gnu = "4ca7c24e573dae2f382d8d266babfddc307155e1a0a4025f3bc11db58a6cab3e"; - x86_64-unknown-linux-musl = "2a0829c842425ab316a63adb0d604421be1c4df332388ac26d63aef47e857c12"; - arm-unknown-linux-gnueabihf = "0da7b4a3b760fa514ba5e1a731fd212f1d082468f118f19e852136a30d2c0253"; - armv7-unknown-linux-gnueabihf = "5a8d799a09cc605ea3a88dc43bd348bd6335847a0b71ba8e73b40968a0a7bf6f"; - aarch64-unknown-linux-gnu = "ef4da9c1ecd56bbbb36f42793524cce3062e6a823ae22cb679a945c075c7755b"; - aarch64-unknown-linux-musl = "fab9a1a69e61326399becab2571381b079ee42f2b648d862b0c3df05004dc864"; - x86_64-apple-darwin = "f74d8ad24cc3cbfb825da98a08d98319565e4d18ec2c3e9503bf0a33c81ba767"; - aarch64-apple-darwin = "60a41dea4ae0f4006325745a6400e6fdc3e08ad3f924fac06f04c238cf23f4ec"; - powerpc64le-unknown-linux-gnu = "bf98b27de08a2fd5a2202a2b621b02bfde2a6fde397df2a735d018aeffcdc5e2"; - riscv64gc-unknown-linux-gnu = "664e7a50c03848afc86d579a9cbf82cd0b2291a97776f7f81cee9bbf9fc1f648"; - s390x-unknown-linux-gnu = "e0450ff125cadd3813c7888f5ca42f78e68df13c212b12d5eac3325062632723"; - x86_64-unknown-freebsd = "b96ebbc043058eedebccd20f1d01e64f2241107665fe2336e6927966d8b9d8d3"; + i686-unknown-linux-gnu = "77b261fb3d9efa7fe39e87c024987495e03b647b6cb23a66b8e69aeb12a8be61"; + x86_64-unknown-linux-gnu = "0265c08ae997c4de965048a244605fb1f24a600bbe35047b811c638b8fcf676b"; + x86_64-unknown-linux-musl = "9dd781c64f71c1d3f854b0937eb751f19e8ebac1110e68e08b94223ad9b022ba"; + arm-unknown-linux-gnueabihf = "d6a2857d0ab8880c3bc691607b10b68fb2750eae35144e035a9a5eeef820b740"; + armv7-unknown-linux-gnueabihf = "eff9939c4b98c6ad91a759fa1a2ebdd81b4d05e47ac523218bf9d7093226589b"; + aarch64-unknown-linux-gnu = "d7db04fce65b5f73282941f3f1df5893be9810af17eb7c65b2e614461fe31a48"; + aarch64-unknown-linux-musl = "f061eabf0324805637c1e89e7d936365f705be1359699efbda59b637dbe9715f"; + x86_64-apple-darwin = "b1a289cabc523f259f65116a41374ac159d72fbbf6c373bd5e545c8e835ceb6a"; + aarch64-apple-darwin = "49b6d36b308addcfd21ae56c94957688338ba7b8985bff57fc626c8e1b32f62c"; + powerpc64le-unknown-linux-gnu = "44f3a1e70be33f91927ae8d89a11843a79b8b6124d62a9ddd9030a5275ebc923"; + riscv64gc-unknown-linux-gnu = "a72e8aa3fff374061ff90ada317a8d170c2a15eb079ddc828c97189179d3eebd"; + s390x-unknown-linux-gnu = "63760886a9b2de6cb38f75a236db358939d904e205e1e2bc9d96cec69e00ae83"; + x86_64-unknown-freebsd = "f7b51943dbed0af3387e3269c1767fee916fb22b8e7897b3594bf5e422403137"; }; selectRustPackage = pkgs: pkgs.rust_1_82; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 030b8a4d4379..bd174babd549 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -22,20 +22,16 @@ self: super: { # enable list-transformer, jailbreaking is necessary until next release >0.13.0: https://github.com/ivanperez-keera/dunai/issues/427 dunai = doJailbreak (addBuildDepend self.list-transformer (enableCabalFlag "list-transformer" super.dunai)); - # Make sure that Cabal 3.10.* can be built as-is - Cabal_3_10_3_0 = doDistribute (super.Cabal_3_10_3_0.override ({ + # Make sure that Cabal_* can be built as-is + Cabal_3_10_3_0 = doDistribute (super.Cabal_3_10_3_0.override { Cabal-syntax = self.Cabal-syntax_3_10_3_0; - } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { - # Use process core package when possible - process = self.process_1_6_24_0; - })); - - Cabal_3_12_1_0 = doDistribute (super.Cabal_3_12_1_0.override ({ + }); + Cabal_3_12_1_0 = doDistribute (super.Cabal_3_12_1_0.override { Cabal-syntax = self.Cabal-syntax_3_12_1_0; - } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { - # Use process core package when possible - process = self.process_1_6_24_0; - })); + }); + Cabal_3_14_0_0 = doDistribute (super.Cabal_3_14_0_0.override { + Cabal-syntax = self.Cabal-syntax_3_14_0_0; + }); # hackage-security == 0.6.2.6 has a wider support range in theory, but it only # makes sense to use the non Stackage version if we want to use Cabal* >= 3.12 @@ -366,15 +362,6 @@ self: super: { ] super.threadscope); - # http2 also overridden in all-packages.nix for mailctl. - # twain is currently only used by mailctl, so the .overrideScope shouldn't - # negatively affect any other packages, at least currently... - # https://github.com/alexmingoia/twain/issues/5 - twain = super.twain.overrideScope (self: _: { - http2 = self.http2_3_0_3; - warp = self.warp_3_3_30; - }); - # The latest release on hackage has an upper bound on containers which # breaks the build, though it works with the version of containers present # and the upper bound doesn't exist in code anymore: @@ -1270,6 +1257,7 @@ self: super: { stack = super.stack.overrideScope (lself: lsuper: { # stack-3.1.1 requires the latest versions of these libraries pantry = lself.pantry_0_10_0; + static-bytes = lself.static-bytes_0_1_1; # for pantry_0_10_0 tar = lself.tar_0_6_3_0; # Upstream stack-3.1.1 is compiled with hpack-0.37.0, and we make sure to @@ -2002,14 +1990,6 @@ self: super: { # Test suite fails, upstream not reachable for simple fix (not responsive on github) vivid-osc = dontCheck super.vivid-osc; vivid-supercollider = dontCheck super.vivid-supercollider; - vivid = overrideCabal (drv: assert drv.version == "0.5.2.0"; { - # 2024-10-18: Some library dependency must have stopped - # re-exporting 'void', so now it needs an extra import line. - # Fixed in 0.5.2.1. - postPatch = '' - sed -i '/) where/a import Control.Monad (void)' Vivid/GlobalState.hs - ''; - }) super.vivid; # Test suite does not compile. feed = dontCheck super.feed; @@ -2276,44 +2256,6 @@ self: super: { # Too strict bound on hspec (<2.11) utf8-light = doJailbreak super.utf8-light; - large-hashable = lib.pipe (super.large-hashable.override { - # https://github.com/factisresearch/large-hashable/commit/5ec9d2c7233fc4445303564047c992b693e1155c - utf8-light = null; - }) [ - # 2022-03-21: use version from git which supports GHC 9.{0,2} and aeson 2.0 - (assert super.large-hashable.version == "0.1.0.4"; overrideSrc { - version = "unstable-2022-06-10"; - src = pkgs.fetchFromGitHub { - owner = "factisresearch"; - repo = "large-hashable"; - rev = "4d149c828c185bcf05556d1660f79ff1aec7eaa1"; - sha256 = "141349qcw3m93jw95jcha9rsg2y8sn5ca5j59cv8xmci38k2nam0"; - }; - }) - # Provide newly added dependencies - (overrideCabal (drv: { - libraryHaskellDepends = drv.libraryHaskellDepends or [] ++ [ - self.cryptonite - self.memory - ]; - testHaskellDepends = drv.testHaskellDepends or [] ++ [ - self.inspection-testing - ]; - })) - # https://github.com/factisresearch/large-hashable/issues/24 - (overrideCabal (drv: { - testFlags = drv.testFlags or [] ++ [ - "-n" "^Data.LargeHashable.Tests.Inspection:genericSumGetsOptimized$" - ]; - })) - # https://github.com/factisresearch/large-hashable/issues/25 - # Currently broken with text >= 2.0 - (overrideCabal (lib.optionalAttrs (lib.versionAtLeast self.ghc.version "9.4") { - broken = true; - hydraPlatforms = []; - })) - ]; - # BSON defaults to requiring network instead of network-bsd which is # required nowadays: https://github.com/mongodb-haskell/bson/issues/26 bson = appendConfigureFlag "-f-_old_network" (super.bson.override { diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index e931a60ada41..844e38f9e4fa 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -94,6 +94,12 @@ self: super: ({ ''; }) super.git-annex; + # on*Finish tests rely on a threadDelay timing differential of 0.1s. + # You'd think that's plenty of time even though immediate rescheduling + # after threadDelay is not guaranteed. However, it appears that these + # tests are quite flaky on Darwin. + immortal = dontCheck super.immortal; + # Prevents needing to add `security_tool` as a run-time dependency for # everything using x509-system to give access to the `security` executable. # @@ -331,6 +337,10 @@ self: super: ({ # Tests fail on macOS https://github.com/mrkkrp/zip/issues/112 zip = dontCheck super.zip; + snap = super.snap.overrideAttrs (drv: { + __darwinAllowLocalNetworking = true; + }); + warp = super.warp.overrideAttrs (drv: { __darwinAllowLocalNetworking = true; }); diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix index dcb91d08add0..6d0cd255ef9c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -69,7 +69,7 @@ self: super: { integer-conversion = doDistribute self.integer-conversion_0_1_1; ghc-lib-parser = doDistribute self.ghc-lib-parser_9_10_1_20240511; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_10_0_0; - http2 = super.http2_5_3_4; + http2 = self.http2_5_3_4; lens = doDistribute self.lens_5_3_2; lukko = doDistribute self.lukko_0_1_2; network-control = super.network-control_0_1_3; @@ -84,6 +84,7 @@ self: super: { time-manager = super.time-manager_0_1_0; th-abstraction = doDistribute self.th-abstraction_0_7_0_0; uuid-types = doDistribute self.uuid-types_1_0_6; + warp = pkgs.haskell.lib.dontCheck super.warp_3_4_3; # test suite assumes it can freely call curl # A given major version of ghc-exactprint only supports one version of GHC. ghc-exactprint = doDistribute self.ghc-exactprint_1_9_0_0; @@ -126,7 +127,6 @@ self: super: { primitive-unlifted = dontCheck super.primitive-unlifted; # doesn't compile with primitive ==0.9.* bsb-http-chunked = pkgs.haskell.lib.dontCheck super.bsb-http-chunked; # https://github.com/sjakobi/bsb-http-chunked/issues/45 hinotify = pkgs.haskell.lib.dontCheck super.hinotify; # https://github.com/kolmodin/hinotify/issues/38 - warp = pkgs.haskell.lib.dontCheck super.warp_3_4_2; # test suite assumes it can freely call curl haskell-language-server = disableCabalFlag "retrie" (disableCabalFlag "hlint" (disableCabalFlag "stylishhaskel" (super.haskell-language-server.override {stylish-haskell = null;retrie = null;apply-refact=null;hlint = null;}))); diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index fb7115d6bbd2..91b24ebf9429 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -4,7 +4,7 @@ with haskellLib; let inherit (pkgs.stdenv.hostPlatform) isDarwin; - + inherit (pkgs) lib; in self: super: { @@ -54,9 +54,9 @@ self: super: { # Version upgrades # th-abstraction = doDistribute self.th-abstraction_0_7_0_0; - ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_2_20240223; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_3_20241022; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2; - ghc-lib = doDistribute self.ghc-lib_9_8_2_20240223; + ghc-lib = doDistribute self.ghc-lib_9_8_3_20241022; megaparsec = doDistribute self.megaparsec_9_6_1; # aeson 2.2.3.0 seemingly unnecessesarily bumped the lower bound on hashable # https://github.com/haskell/aeson/commit/1a666febd0775d8e88d315ece1b97cd20602fb5f @@ -147,3 +147,8 @@ self: super: { }) super.reflex; } +// lib.optionalAttrs (lib.versionAtLeast super.ghc.version "9.8.3") { + # Breakage related to GHC 9.8.3 / deepseq 1.5.1.0 + # https://github.com/typeable/generic-arbitrary/issues/18 + generic-arbitrary = dontCheck super.generic-arbitrary; +} diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 6d8bc6ad3b76..a34c5110db85 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -84,6 +84,7 @@ broken-packages: - aeson-flat # failure in job https://hydra.nixos.org/build/233220787 at 2023-09-02 - aeson-flatten # failure in job https://hydra.nixos.org/build/233242954 at 2023-09-02 - aeson-flowtyped # failure in job https://hydra.nixos.org/build/233245878 at 2023-09-02 + - aeson-generic-default # failure in job https://hydra.nixos.org/build/276370826 at 2024-11-06 - aeson-generics-typescript # failure in job https://hydra.nixos.org/build/245703304 at 2024-01-07 - aeson-injector # failure in job https://hydra.nixos.org/build/233200351 at 2023-09-02 - aeson-json-ast # failure in job https://hydra.nixos.org/build/233249406 at 2023-09-02 @@ -2159,6 +2160,7 @@ broken-packages: - graph-matchings # failure in job https://hydra.nixos.org/build/233245821 at 2023-09-02 - graphmod-plugin # failure in job https://hydra.nixos.org/build/233192543 at 2023-09-02 - graphql-api # failure in job https://hydra.nixos.org/build/233254333 at 2023-09-02 + - graphql-spice # failure in job https://hydra.nixos.org/build/276376899 at 2024-11-06 - graphql-utils # failure in job https://hydra.nixos.org/build/233221340 at 2023-09-02 - graphql-w-persistent # failure in job https://hydra.nixos.org/build/233228956 at 2023-09-02 - graph-rewriting # failure in job https://hydra.nixos.org/build/233191278 at 2023-09-02 @@ -2909,6 +2911,7 @@ broken-packages: - hssqlppp # failure in job https://hydra.nixos.org/build/233216888 at 2023-09-02 - HsSVN # failure in job https://hydra.nixos.org/build/233213151 at 2023-09-02 - hs-tags # failure in job https://hydra.nixos.org/build/233258358 at 2023-09-02 + - hs-tango # failure in job https://hydra.nixos.org/build/276377558 at 2024-11-06 - hstatsd # failure in job https://hydra.nixos.org/build/233232363 at 2023-09-02 - hstats # failure in job https://hydra.nixos.org/build/233239963 at 2023-09-02 - hs-term-emulator # failure in job https://hydra.nixos.org/build/233252262 at 2023-09-02 @@ -3068,6 +3071,7 @@ broken-packages: - ieee-utils # failure in job https://hydra.nixos.org/build/233224430 at 2023-09-02 - iexcloud # failure in job https://hydra.nixos.org/build/233224874 at 2023-09-02 - ifcxt # failure in job https://hydra.nixos.org/build/233196911 at 2023-09-02 + - if-instance # failure in job https://hydra.nixos.org/build/276378643 at 2024-11-06 - IFS # failure in job https://hydra.nixos.org/build/233246865 at 2023-09-02 - ige # failure in job https://hydra.nixos.org/build/233224389 at 2023-09-02 - ig # failure in job https://hydra.nixos.org/build/233203872 at 2023-09-02 @@ -3807,6 +3811,7 @@ broken-packages: - microbase # failure in job https://hydra.nixos.org/build/233204368 at 2023-09-02 - microformats2-parser # failure in job https://hydra.nixos.org/build/233238485 at 2023-09-02 - microgroove # failure in job https://hydra.nixos.org/build/233196933 at 2023-09-02 + - MicroHs # failure in job https://hydra.nixos.org/build/276379260 at 2024-11-06 - microlens-each # failure in job https://hydra.nixos.org/build/233253621 at 2023-09-02 - microlens-process # failure in job https://hydra.nixos.org/build/233190805 at 2023-09-02 - microlens-pro # failure in job https://hydra.nixos.org/build/252733422 at 2024-03-16 @@ -4227,6 +4232,7 @@ broken-packages: - oi # failure in job https://hydra.nixos.org/build/233190838 at 2023-09-02 - okapi # failure in job https://hydra.nixos.org/build/233193822 at 2023-09-02 - old-version # failure in job https://hydra.nixos.org/build/233198538 at 2023-09-02 + - ollama-haskell # failure in job https://hydra.nixos.org/build/276371507 at 2024-11-06 - om-actor # failure in job https://hydra.nixos.org/build/233231027 at 2023-09-02 - omaketex # failure in job https://hydra.nixos.org/build/233202599 at 2023-09-02 - ombra # failure in job https://hydra.nixos.org/build/233192387 at 2023-09-02 @@ -4731,6 +4737,8 @@ broken-packages: - powermate # failure in job https://hydra.nixos.org/build/233224977 at 2023-09-02 - powerpc # failure in job https://hydra.nixos.org/build/233217983 at 2023-09-02 - powerqueue-levelmem # failure in job https://hydra.nixos.org/build/233232882 at 2023-09-02 + - ppad-sha256 # failure in job https://hydra.nixos.org/build/276377736 at 2024-11-06 + - ppad-sha512 # failure in job https://hydra.nixos.org/build/276375868 at 2024-11-06 - pprecord # failure in job https://hydra.nixos.org/build/233198838 at 2023-09-02 - PPrinter # failure in job https://hydra.nixos.org/build/233253160 at 2023-09-02 - pqc # failure in job https://hydra.nixos.org/build/233217425 at 2023-09-02 @@ -6287,6 +6295,7 @@ broken-packages: - type-indexed-queues # failure in job https://hydra.nixos.org/build/233197833 at 2023-09-02 - type-interpreter # failure in job https://hydra.nixos.org/build/233192182 at 2023-09-02 - type-int # failure in job https://hydra.nixos.org/build/233245978 at 2023-09-02 + - typelet # failure in job https://hydra.nixos.org/build/276367145 at 2024-11-06 - type-level-bst # failure in job https://hydra.nixos.org/build/233202030 at 2023-09-02 - type-level-natural-number-induction # failure in job https://hydra.nixos.org/build/233259499 at 2023-09-02 - type-level-natural-number-operations # failure in job https://hydra.nixos.org/build/233198314 at 2023-09-02 @@ -6839,7 +6848,10 @@ broken-packages: - yhccore # failure in job https://hydra.nixos.org/build/233199669 at 2023-09-02 - yhseq # failure in job https://hydra.nixos.org/build/233191724 at 2023-09-02 - yices # failure in job https://hydra.nixos.org/build/233242137 at 2023-09-02 - - yi-language # failure in job https://hydra.nixos.org/build/233217570 at 2023-09-02 + - yi-contrib # failure in job https://hydra.nixos.org/build/276370855 at 2024-11-06 + - yi-monokai # failure in job https://hydra.nixos.org/build/276375617 at 2024-11-06 + - yi-solarized # failure in job https://hydra.nixos.org/build/276380211 at 2024-11-06 + - yi-spolsky # failure in job https://hydra.nixos.org/build/276371008 at 2024-11-06 - yoctoparsec # failure in job https://hydra.nixos.org/build/233192019 at 2023-09-02 - yoda # failure in job https://hydra.nixos.org/build/233200530 at 2023-09-02 - Yogurt # failure in job https://hydra.nixos.org/build/233212103 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 667a79adb859..b1dc2492f8b9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -36,7 +36,8 @@ default-package-overrides: - hnix-store-remote < 0.7 # 2024-09-12: match xmonad 0.17.* from Stackage LTS - xmonad-contrib < 0.18.1 - + # 2024-11-01: no release version of http2/3 supports http-semantics >= 0.3.0 at the moment + - http-semantics < 0.3.0 extra-packages: - Cabal == 3.2.* # Used for packages needing newer Cabal on ghc 8.6 and 8.8 @@ -72,7 +73,6 @@ extra-packages: - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-megaparsec == 2.2.0 # 2023-11-18: Latest version compatible with ghc 9.0, needed for HLS - hspec-meta < 2.8 # 2022-12-07: Needed for elmPackages.elm / hspec-discover - - http2 < 3.3 # 2023-08-24: Needed for twain - immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20 - language-docker == 11.0.0 # required by hadolint 2.12.0, 2022-11-16 - language-javascript == 0.7.0.0 # required by purescript @@ -89,7 +89,6 @@ extra-packages: - primitive-unlifted == 0.1.3.1 # 2024-03-16: Needed for hls on ghc 9.2 - stylish-haskell == 0.14.4.0 # 2022-09-19: needed for hls on ghc 9.2 - text == 2.0.2 # 2023-09-14: Needed for elm (which is currently on ghc-8.10) - - warp < 3.3.31 # 2024-03-20: for twain, which requires http2 3.0.3 - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 - weeder == 2.4.* # 2023-02-02: preserve for GHC 9.2.* @@ -821,8 +820,6 @@ supported-platforms: midi-alsa: [ platforms.linux ] # alsa-core only supported on linux midisurface: [ platforms.linux ] # alsa-core only supported on linux OrderedBits: [ platforms.x86 ] # lacks implementations for non-x86: https://github.com/choener/OrderedBits/blob/401cbbe933b1635aa33e8e9b29a4a570b0a8f044/lib/Data/Bits/Ordered.hs#L316 - password: [ platforms.x86 ] # uses scrypt, which requries x86 - password-instances: [ platforms.x86 ] # uses scrypt, which requries x86 reactivity: [ platforms.windows ] reflex-libtelnet: [ platforms.linux ] # pkgs.libtelnet only supports linux scat: [ platforms.x86 ] # uses scrypt, which requries x86 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 235261802442..5bde9a49a237 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 22.36 +# Stackage LTS 22.39 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -397,7 +397,7 @@ default-package-overrides: - atom-conduit ==0.9.0.1 - atomic-counter ==0.1.2.1 - atomic-primops ==0.8.8 - - atomic-write ==0.2.0.7 + - atomic-write ==0.2.1.0 - attoparsec ==0.14.4 - attoparsec-aeson ==2.1.0.0 - attoparsec-base64 ==0.0.0 @@ -454,7 +454,7 @@ default-package-overrides: - bcp47 ==0.2.0.6 - bcp47-orphans ==0.1.0.6 - bcrypt ==0.0.11 - - beam-core ==0.10.1.0 + - beam-core ==0.10.3.0 - bech32 ==1.1.7 - bech32-th ==1.1.7 - benchpress ==0.2.2.23 @@ -508,6 +508,8 @@ default-package-overrides: - blaze-textual ==0.2.3.1 - bloodhound ==0.21.0.0 - bloomfilter ==2.0.1.2 + - bluefin ==0.0.9.0 + - bluefin-internal ==0.0.9.0 - bm ==0.2.0.0 - bmp ==1.2.6.4 - bnb-staking-csvs ==0.2.2.0 @@ -527,7 +529,7 @@ default-package-overrides: - bounded-qsem ==0.1.0.2 - bounded-queue ==1.0.0 - boundingboxes ==0.2.3 - - box ==0.9.3.1 + - box ==0.9.3.2 - boxes ==0.1.5 - breakpoint ==0.1.4.0 - brick ==2.1.1 @@ -552,7 +554,7 @@ default-package-overrides: - bv-sized ==1.0.5 - byteable ==0.1.1 - bytebuild ==0.3.16.2 - - byte-count-reader ==0.10.1.11 + - byte-count-reader ==0.10.1.12 - bytedump ==1.0 - bytehash ==0.1.1.0 - byte-order ==0.1.3.1 @@ -577,7 +579,7 @@ default-package-overrides: - cabal2spec ==2.7.1 - cabal-appimage ==0.4.0.5 - cabal-clean ==0.2.20230609 - - cabal-debian ==5.2.3 + - cabal-debian ==5.2.4 - cabal-doctest ==1.0.10 - cabal-file ==0.1.1 - cabal-plan ==0.7.3.0 @@ -683,9 +685,9 @@ default-package-overrides: - comfort-fftw ==0.0.0.1 - comfort-glpk ==0.1 - comfort-graph ==0.0.4 - - commonmark ==0.2.6 + - commonmark ==0.2.6.1 - commonmark-extensions ==0.2.5.5 - - commonmark-pandoc ==0.2.2.1 + - commonmark-pandoc ==0.2.2.2 - commutative ==0.0.2 - commutative-semigroups ==0.1.1.0 - comonad ==5.0.8 @@ -824,14 +826,14 @@ default-package-overrides: - data-bword ==0.1.0.2 - data-checked ==0.3 - data-clist ==0.2 - - data-default ==0.7.1.1 - - data-default-class ==0.1.2.0 - - data-default-instances-base ==0.1.0.1 + - data-default ==0.7.1.2 + - data-default-class ==0.1.2.2 + - data-default-instances-base ==0.1.0.3 - data-default-instances-bytestring ==0.0.1 - data-default-instances-case-insensitive ==0.0.1 - data-default-instances-containers ==0.0.1 - - data-default-instances-dlist ==0.0.1 - - data-default-instances-old-locale ==0.0.1 + - data-default-instances-dlist ==0.0.1.2 + - data-default-instances-old-locale ==0.0.1.2 - data-default-instances-unordered-containers ==0.0.1 - data-default-instances-vector ==0.0.1 - data-diverse ==4.7.1.0 @@ -1057,7 +1059,7 @@ default-package-overrides: - extrapolate ==0.4.6 - fail ==4.9.0.0 - FailT ==0.1.2.0 - - fakedata ==1.0.3 + - fakedata ==1.0.5 - fakedata-parser ==0.1.0.0 - fakedata-quickcheck ==0.2.0 - fakefs ==0.3.0.2 @@ -1066,7 +1068,7 @@ default-package-overrides: - falsify ==0.2.0 - fasta ==0.10.4.2 - fast-digits ==0.3.2.0 - - fast-logger ==3.2.3 + - fast-logger ==3.2.4 - fast-math ==1.0.2 - fast-myers-diff ==0.0.1 - fb ==2.1.1.1 @@ -1074,12 +1076,11 @@ default-package-overrides: - fclabels ==2.0.5.1 - fdo-notify ==0.3.1 - feature-flags ==0.1.0.1 - - fedora-dists ==2.1.1 - - fedora-haskell-tools ==1.1 + - fedora-releases ==0.1.0 - FenwickTree ==0.1.2.1 - fft ==0.1.8.7 - fftw-ffi ==0.1 - - fgl ==5.8.2.0 + - fgl ==5.8.3.0 - fgl-arbitrary ==0.2.0.6 - fields-json ==0.4.0.0 - file-embed ==0.0.16.0 @@ -1132,7 +1133,7 @@ default-package-overrides: - ForestStructures ==0.0.1.1 - forkable-monad ==0.2.0.3 - forma ==1.2.0 - - formatn ==0.3.0.1 + - formatn ==0.3.1.0 - format-numbers ==0.1.0.1 - formatting ==7.2.0 - foundation ==0.0.30 @@ -1170,7 +1171,7 @@ default-package-overrides: - generically ==0.1.1 - generic-arbitrary ==1.0.1 - generic-constraints ==1.1.1.1 - - generic-data ==1.1.0.0 + - generic-data ==1.1.0.1 - generic-data-surgery ==0.3.0.0 - generic-deriving ==1.14.5 - generic-functor ==1.1.0.0 @@ -1296,7 +1297,7 @@ default-package-overrides: - GLUT ==2.7.0.16 - gmail-simple ==0.1.0.6 - gnuplot ==0.5.7 - - goldplate ==0.2.1.1 + - goldplate ==0.2.2.1 - google-isbn ==1.0.3 - gopher-proxy ==0.1.1.3 - gpolyline ==0.1.0.1 @@ -1343,7 +1344,7 @@ default-package-overrides: - hashing ==0.1.1.0 - hashmap ==1.3.3 - hashtables ==1.3.1 - - haskell-gi ==0.26.11 + - haskell-gi ==0.26.12 - haskell-gi-base ==0.26.8 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.1.1 @@ -1476,7 +1477,7 @@ default-package-overrides: - hslua-classes ==2.3.1 - hslua-cli ==1.4.3 - hslua-core ==2.3.2 - - hslua-list ==1.1.3 + - hslua-list ==1.1.4 - hslua-marshalling ==2.3.1 - hslua-module-doclayout ==1.1.1.2 - hslua-module-path ==1.1.1 @@ -1731,7 +1732,7 @@ default-package-overrides: - LambdaHack ==0.11.0.1 - lame ==0.2.2 - language-avro ==0.1.4.0 - - language-c ==0.9.3 + - language-c ==0.9.4 - language-c99 ==0.2.0 - language-c99-simple ==0.3.0 - language-c99-util ==0.2.0 @@ -1781,7 +1782,7 @@ default-package-overrides: - liboath-hs ==0.0.1.2 - libyaml ==0.1.4 - libyaml-clib ==0.2.5 - - lifted-async ==0.10.2.5 + - lifted-async ==0.10.2.6 - lifted-base ==0.2.3.12 - lift-generics ==0.2.1 - lift-type ==0.1.2.0 @@ -1853,7 +1854,7 @@ default-package-overrides: - markdown-unlit ==0.6.0 - markov-chain ==0.0.3.4 - markov-chain-usage-model ==0.0.0 - - markup-parse ==0.1.1 + - markup-parse ==0.1.1.1 - mason ==0.2.6 - massiv ==1.0.4.0 - massiv-io ==1.0.0.1 @@ -1872,7 +1873,7 @@ default-package-overrides: - matrix-static ==0.3 - maximal-cliques ==0.1.1 - mbox-utility ==0.0.3.1 - - mcmc ==0.8.2.0 + - mcmc ==0.8.3.1 - mcmc-types ==1.0.3 - median-stream ==0.7.0.0 - med-module ==0.1.3 @@ -2153,7 +2154,7 @@ default-package-overrides: - pandoc-cli ==3.1.11.1 - pandoc-dhall-decoder ==0.1.0.1 - pandoc-lua-engine ==0.2.1.2 - - pandoc-lua-marshal ==0.2.8 + - pandoc-lua-marshal ==0.2.9 - pandoc-plot ==1.8.0 - pandoc-server ==0.1.0.5 - pandoc-throw ==0.1.0.0 @@ -2317,7 +2318,7 @@ default-package-overrides: - primes ==0.2.1.0 - primitive ==0.8.0.0 - primitive-addr ==0.1.0.3 - - primitive-extras ==0.10.2 + - primitive-extras ==0.10.2.1 - primitive-offset ==0.2.0.1 - primitive-serial ==0.1 - primitive-unaligned ==0.1.1.2 @@ -2362,8 +2363,8 @@ default-package-overrides: - PyF ==0.11.3.0 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.1.0 - - qrcode-core ==0.9.9 - - qrcode-juicypixels ==0.8.5 + - qrcode-core ==0.9.10 + - qrcode-juicypixels ==0.8.6 - quaalude ==0.0.0.1 - quadratic-irrational ==0.1.1 - QuasiText ==0.1.2.6 @@ -2464,7 +2465,7 @@ default-package-overrides: - relational-record ==0.2.2.0 - relational-schemas ==0.1.8.1 - reliable-io ==0.0.2 - - relude ==1.2.1.0 + - relude ==1.2.2.0 - renderable ==0.2.0.1 - replace-attoparsec ==1.5.0.0 - replace-megaparsec ==1.5.0.1 @@ -2606,7 +2607,7 @@ default-package-overrides: - servant-rate-limit ==0.2.0.0 - servant-rawm ==1.0.0.0 - servant-server ==0.20.2 - - servant-static-th ==1.0.0.0 + - servant-static-th ==1.0.0.1 - servant-subscriber ==0.7.0.0 - servant-swagger ==1.2.1 - servant-swagger-ui ==0.3.5.5.0.0 @@ -2635,8 +2636,8 @@ default-package-overrides: - shared-memory ==0.2.0.1 - shell-conduit ==5.0.0 - shell-escape ==0.2.0 - - shellify ==0.11.0.1 - - shellmet ==0.0.4.1 + - shellify ==0.11.0.3 + - shellmet ==0.0.5.0 - shelltestrunner ==1.10 - shell-utility ==0.1 - shellwords ==0.1.3.1 @@ -2762,7 +2763,7 @@ default-package-overrides: - Stream ==0.4.7.2 - streaming ==0.2.4.0 - streaming-attoparsec ==1.0.0.1 - - streaming-bytestring ==0.3.2 + - streaming-bytestring ==0.3.3 - streaming-commons ==0.2.2.6 - streaming-wai ==0.1.1 - streamly ==0.10.1 @@ -3094,9 +3095,9 @@ default-package-overrides: - universe-instances-extended ==1.1.3 - universe-reverse-instances ==1.1.1 - universe-some ==1.2.1 - - universum ==1.8.2.1 + - universum ==1.8.2.2 - unix-bytestring ==0.4.0.2 - - unix-compat ==0.7.2 + - unix-compat ==0.7.3 - unix-time ==0.4.15 - unjson ==0.15.4 - unliftio ==0.2.25.0 @@ -3282,7 +3283,7 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.11.2 - yaml-unscrambler ==0.1.0.19 - - Yampa ==0.14.10 + - Yampa ==0.14.11 - yarn-lock ==0.6.5 - yeshql-core ==4.2.0.0 - yesod ==1.6.2.1 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 9fef480d2c11..7d3699af9eb5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -802,7 +802,7 @@ dont-distribute-packages: - chart-cli - chart-svg - chart-svg-various - - chart-svg_0_6_1_0 + - chart-svg_0_7_0_0 - chart-unit - chassis - chatty @@ -1866,6 +1866,7 @@ dont-distribute-packages: - hark - harmony - haroonga-httpd + - harpie-numhask - has-th - hasbolt - hascat @@ -2013,7 +2014,6 @@ dont-distribute-packages: - hedgehog-gen-json - hedis-pile - heftia - - heftia-effects - heist-aeson - helic - helics @@ -2498,6 +2498,7 @@ dont-distribute-packages: - language-python-colour - language-qux - language-spelling + - large-anon - lat - latex-formulae-hakyll - latex-formulae-pandoc @@ -3028,6 +3029,7 @@ dont-distribute-packages: - perdure - perf - perf-analysis + - perf_0_13_0_0 - perfecthash - periodic-client - periodic-client-exe @@ -3162,6 +3164,8 @@ dont-distribute-packages: - potoki-hasql - potoki-zlib - powerqueue-sqs + - ppad-hmac-drbg + - ppad-secp256k1 - pqueue-mtl - practice-room - pred-set @@ -3290,6 +3294,7 @@ dont-distribute-packages: - rasa-ext-vim - rascal - raw-feldspar + - rawlock - rawr - razom-text-util - rbr @@ -3379,6 +3384,7 @@ dont-distribute-packages: - reserve - resin - resource-pool-catchio + - resource-registry - resource-simple - respond - rest-client @@ -4289,25 +4295,6 @@ dont-distribute-packages: - yesod-routes-typescript - yesod-session-redis - yesod-worker - - yi - - yi-contrib - - yi-core - - yi-dynamic-configuration - - yi-emacs-colours - - yi-frontend-pango - - yi-frontend-vty - - yi-fuzzy-open - - yi-ireader - - yi-keymap-cua - - yi-keymap-emacs - - yi-keymap-vim - - yi-misc-modes - - yi-mode-haskell - - yi-mode-javascript - - yi-monokai - - yi-snippet - - yi-solarized - - yi-spolsky - yjftp - yjftp-libs - yoko diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 28fd6880eb6c..7a85abfba34e 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -113,6 +113,35 @@ self: super: builtins.intersectAttrs super { '' + drv.preCheck or ""; }) super.agda2lagda; + # - Disable scrypt support since the library used only works on x86 due to SSE2: + # https://github.com/informatikr/scrypt/issues/8 + # - Use crypton as the encryption backend. That override becomes obsolete with + # 3.1.* since cabal2nix picks crypton by default then. + password = + let + scryptSupported = pkgs.stdenv.hostPlatform.isx86; + in + + lib.pipe + (super.password.override ({ + cryptonite = self.crypton; + } // lib.optionalAttrs (!scryptSupported) { + scrypt = null; + })) + ([ + (enableCabalFlag "crypton") + (disableCabalFlag "cryptonite") + # https://github.com/cdepillabout/password/pull/84 + (appendPatch ./patches/password-3.0.4.0-scrypt-conditional.patch) + (overrideCabal (drv: { + # patch doesn't apply otherwise because of revisions + prePatch = drv.prePatch or "" + '' + ${pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal + ''; + })) + ] ++ lib.optionals (!scryptSupported) [ + (disableCabalFlag "scrypt") + ]); audacity = enableCabalFlag "buildExamples" (overrideCabal (drv: { executableHaskellDepends = [self.optparse-applicative self.soxlib]; @@ -156,6 +185,11 @@ self: super: builtins.intersectAttrs super { ''; }) super.nvvm; + # Doesn't declare LLVM dependency, needs llvm-config + llvm-codegen = addBuildTools [ + pkgs.llvmPackages_17.llvm.dev # for native llvm-config + ] super.llvm-codegen; + # hledger* overrides inherit ( let @@ -381,7 +415,6 @@ self: super: builtins.intersectAttrs super { # The curl executable is required for withApplication tests. warp = addTestToolDepend pkgs.curl super.warp; - warp_3_3_30 = addTestToolDepend pkgs.curl super.warp_3_3_30; safe-exceptions = overrideCabal (drv: { # Fix strictDeps build error "could not execute: hspec-discover" @@ -523,7 +556,7 @@ self: super: builtins.intersectAttrs super { "--extra-include-dirs=${pkgs.cwiid}/include" "--extra-include-dirs=${pkgs.bluez.dev}/include" ]; - prePatch = '' sed -i -e "/Extra-Lib-Dirs/d" -e "/Include-Dirs/d" "hcwiid.cabal" ''; + prePatch = ''sed -i -e "/Extra-Lib-Dirs/d" -e "/Include-Dirs/d" "hcwiid.cabal"''; }) super.hcwiid; # cabal2nix doesn't pick up some of the dependencies. @@ -1414,7 +1447,7 @@ self: super: builtins.intersectAttrs super { mpiImpl = pkgs.mpi.pname; disableUnused = with builtins; map disableCabalFlag (filter (n: n != mpiImpl) validMpi); in lib.pipe - (super.mpi-hs_0_7_3_0.override { ompi = pkgs.mpi; }) + (super.mpi-hs_0_7_3_1.override { ompi = pkgs.mpi; }) ( [ (addTestToolDepends [ pkgs.openssh pkgs.mpiCheckPhaseHook ]) ] ++ disableUnused ++ lib.optional (builtins.elem mpiImpl validMpi) (enableCabalFlag mpiImpl) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6e73461e51e5..d51851b2c471 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3379,6 +3379,8 @@ self: { pname = "ChasingBottoms"; version = "1.3.1.15"; sha256 = "0if8h6xq10y1xa90cwmx2jkxjn9628rzs8y6fsjmpjdcvcyr5wnj"; + revision = "1"; + editedCabalFile = "1h3c5dhaqkpmc7cvivigadfkjkjjriahzcpdw8qg62fl44gbkmh2"; libraryHaskellDepends = [ base containers mtl QuickCheck random syb ]; @@ -5885,8 +5887,8 @@ self: { pname = "Euterpea"; version = "2.0.7"; sha256 = "0kxdilxzg0dgz1684csbyfv4cifh9d92ac6pwp6dnrcwwpwskiw8"; - revision = "1"; - editedCabalFile = "1fdkjivbrp9q5vwiprjhpnpl9bir1qdiybc2hm52i016x3rx51d8"; + revision = "2"; + editedCabalFile = "05z8vn26yr8hl2dh23g80fpxj8s90hdaajjfnpblrkzhczz7317s"; libraryHaskellDepends = [ array arrows base bytestring containers deepseq ghc-prim HCodecs heap PortMidi random stm @@ -10783,8 +10785,8 @@ self: { ({ mkDerivation, array, base, containers, random }: mkDerivation { pname = "HaskellForMaths"; - version = "0.4.9"; - sha256 = "1jgim9g0jbv6k31aalq0yps843jmfx74k53lnd1p79kgad7670rz"; + version = "0.4.10"; + sha256 = "0ydaw5xwck2l9xzlqrdf3qv7p5s6dqd131q3mx6g0wpqpkjjic4q"; libraryHaskellDepends = [ array base containers random ]; description = "Combinatorics, group theory, commutative algebra, non-commutative algebra"; license = lib.licenses.bsd3; @@ -11801,8 +11803,8 @@ self: { }: mkDerivation { pname = "I1M"; - version = "0.1.0"; - sha256 = "0a5bh9hlsn6hmdqinc47hxlav1isv9jh2i4x3zfyfp4y4xrp2h93"; + version = "0.2.2"; + sha256 = "1p8rv0rhjyjjic03zzjp7qw1j3p5nz4if5ib9w1l0frlrybqb1s8"; libraryHaskellDepends = [ array base QuickCheck ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Code for the Haskell course taught at the University of Seville"; @@ -11933,8 +11935,8 @@ self: { }: mkDerivation { pname = "IPv6DB"; - version = "0.3.3.3"; - sha256 = "1f376a5zc0q20s2jp4z00hxj9h0ngp7k2bgx53g328hf3qyq676z"; + version = "0.3.3.4"; + sha256 = "1mkf2fqlg2n9q3l3p8rxdcmb7k281lz37x6hiry1wvxbn92d4pja"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14365,8 +14367,8 @@ self: { }: mkDerivation { pname = "MicroHs"; - version = "0.9.18.0"; - sha256 = "1w1aazbsl80xk6kxmkcii6y33i42hw64bhjwcn62grh5xb220hag"; + version = "0.10.3.0"; + sha256 = "11zhgmkzkxxjhnf0jnzk50hsm60zxil5mqa6m1yq6wmg2h1g0vkf"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -14375,7 +14377,9 @@ self: { ]; description = "A small compiler for Haskell"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; mainProgram = "mhs"; + broken = true; }) {}; "MicrosoftTranslator" = callPackage @@ -14674,6 +14678,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "MonadRandom_0_6_1" = callPackage + ({ mkDerivation, base, mtl, primitive, random, transformers + , transformers-compat + }: + mkDerivation { + pname = "MonadRandom"; + version = "0.6.1"; + sha256 = "09v56xbp4l0qpv8l18289p4xmjjh56q07crj9h5801fiji8zz4w8"; + libraryHaskellDepends = [ + base mtl primitive random transformers transformers-compat + ]; + description = "Random-number generation monad"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "MonadRandomLazy" = callPackage ({ mkDerivation, base, MonadRandom, mtl, random }: mkDerivation { @@ -15258,6 +15278,8 @@ self: { pname = "NanoID"; version = "3.4.0.2"; sha256 = "1dddc7aakhrj65kdspj8ashfdfl894ybqf7iwy94l344ikldfkaj"; + revision = "1"; + editedCabalFile = "0kdr24dw1z1vj0a63bqsdz55ps4lksf4c5fw7l19bn51f71lpqrf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -18070,14 +18092,24 @@ self: { }) {}; "RandomDotOrg" = callPackage - ({ mkDerivation, base, HTTP-Simple, network }: + ({ mkDerivation, aeson, base, binary, bytestring, http-client + , http-client-tls, http-media, servant, servant-client + , servant-client-core, servant-jsonrpc, servant-jsonrpc-client + , text, time, unordered-containers, uuid-types + }: mkDerivation { pname = "RandomDotOrg"; - version = "0.2.1"; - sha256 = "0rfarn424wsvvwvi7b1qzvzc63dxfqmlyrfd0hdcvmgkq5h2iy4c"; - libraryHaskellDepends = [ base HTTP-Simple network ]; - description = "Interface to random.org"; - license = lib.licenses.publicDomain; + version = "1.0"; + sha256 = "10a4vh3n308i628v58s6wb5yn3vhpb4d989bmd4vvyv39xv92sj6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring http-client http-client-tls http-media + servant servant-client servant-client-core servant-jsonrpc + servant-jsonrpc-client text time unordered-containers uuid-types + ]; + description = "Haskell bindings to the RANDOM.ORG Core API"; + license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20330,6 +20362,8 @@ self: { pname = "Spintax"; version = "0.3.6.1"; sha256 = "066pks24c4501i86hgll3bygqkgyag7n2src19k0x9gc05p130wr"; + revision = "1"; + editedCabalFile = "1946q9361nzsp4aa6jxv36g96nhgb7isv3wpcrnvvk4r2w0jvlmp"; libraryHaskellDepends = [ attoparsec base extra mtl mwc-random text ]; @@ -20916,6 +20950,29 @@ self: { broken = true; }) {}; + "THSH" = callPackage + ({ mkDerivation, base, extra, filepath, ghc, parsec, process, PyF + , split, template-haskell, temporary, text, transformers + }: + mkDerivation { + pname = "THSH"; + version = "0.0.0.5"; + sha256 = "0hfc3f68w5n55k5gnlf6ip76j3b7yvirb81k373w8vq4rgqf447s"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath ghc parsec process PyF template-haskell temporary + text transformers + ]; + executableHaskellDepends = [ + base extra filepath ghc process PyF split template-haskell + ]; + testHaskellDepends = [ base ghc PyF template-haskell ]; + description = "A \"noDSL\" approach to mixing shell scripting with Haskell programs using Template Haskell"; + license = lib.licenses.mit; + mainProgram = "thsh"; + }) {}; + "TLT" = callPackage ({ mkDerivation, ansi-terminal, base, free, mtl, resourcet , STMonadTrans, transformers @@ -23358,8 +23415,8 @@ self: { }: mkDerivation { pname = "Yampa"; - version = "0.14.10"; - sha256 = "1la2v70pzjmvw4j0v5sacb6vxclby86jx68jq6czzxyrl8ydijzc"; + version = "0.14.11"; + sha256 = "1pz1s0vb2h62zggbj6y6c3qhx7008758zq9gds347qv1hwg82jn9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -26011,15 +26068,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "aern2-mp_0_2_16_0" = callPackage + "aern2-mp_0_2_16_1" = callPackage ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec , integer-logarithms, mixed-types-num, QuickCheck, reflection , regex-tdfa, template-haskell }: mkDerivation { pname = "aern2-mp"; - version = "0.2.16.0"; - sha256 = "1q9rc53zj49yfn5ap8khx8gvgphw7dr86agi77xaj1d0d97x35pi"; + version = "0.2.16.1"; + sha256 = "0y0043ckrg1cx1kpf18jk9nmav2h3bp1w4ywwnbwq2abqf3kmd1p"; libraryHaskellDepends = [ base cdar-mBound collect-errors deepseq hspec integer-logarithms mixed-types-num QuickCheck reflection regex-tdfa template-haskell @@ -26053,14 +26110,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "aern2-real_0_2_16_0" = callPackage + "aern2-real_0_2_16_1" = callPackage ({ mkDerivation, aern2-mp, base, collect-errors, hspec , integer-logarithms, mixed-types-num, QuickCheck }: mkDerivation { pname = "aern2-real"; - version = "0.2.16.0"; - sha256 = "14rdjkqpmk4f7135ssn03b7bqbakixx0hrrx742dc379pjq57k7d"; + version = "0.2.16.1"; + sha256 = "00g504rqvr3z5a8asnhr6c9xrhd6wjqzcscgik1qj2wvxfls32f6"; libraryHaskellDepends = [ aern2-mp base collect-errors hspec integer-logarithms mixed-types-num QuickCheck @@ -26618,6 +26675,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "aeson-generic-default" = callPackage + ({ mkDerivation, aeson, base, data-default, tasty, tasty-hunit + , text + }: + mkDerivation { + pname = "aeson-generic-default"; + version = "0.1.1.0"; + sha256 = "0al9xd9mdxffvpx0mb3rll68gmizwknh3g6ixfnvxx62anb47w2p"; + libraryHaskellDepends = [ aeson base data-default text ]; + testHaskellDepends = [ + aeson base data-default tasty tasty-hunit text + ]; + description = "Type-level default fields for aeson Generic FromJSON parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "aeson-generics-typescript" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, hspec, process, QuickCheck, random, split @@ -27386,8 +27461,8 @@ self: { }: mkDerivation { pname = "aftovolio"; - version = "0.2.1.0"; - sha256 = "18z69rzzzfkf4mivjzz9g5h4l1c7lc8s1dnsa6d1xwafhbc2mp2h"; + version = "0.4.0.0"; + sha256 = "0gf86va0x7ni169w4swcr1m5qf115i925pckbw342m7md3k8a6rv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36368,7 +36443,7 @@ self: { mainProgram = "amqp-builder"; }) {}; - "amqp_0_23_0" = callPackage + "amqp_0_24_0" = callPackage ({ mkDerivation, base, binary, bytestring, clock, containers , crypton-connection, data-binary-ieee754, data-default-class , hspec, hspec-expectations, monad-control, network, network-uri @@ -36376,8 +36451,8 @@ self: { }: mkDerivation { pname = "amqp"; - version = "0.23.0"; - sha256 = "0cp0hg4fmqxhzah67hgbwrrm2m7pn64y88chqk5vjhfa19km2np8"; + version = "0.24.0"; + sha256 = "0swrh5dh9hwp8m15x4hiplm89ls19bpmir44wnffzgz7v8rxh1mx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37037,14 +37112,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "annotated-exception_0_3_0_1" = callPackage + "annotated-exception_0_3_0_2" = callPackage ({ mkDerivation, base, containers, hspec, hspec-discover , safe-exceptions, text, unliftio-core }: mkDerivation { pname = "annotated-exception"; - version = "0.3.0.1"; - sha256 = "09lgqzx5g7wnfpj9a8zn10s8v919psxrzzg50vllryaqxxkfmj4a"; + version = "0.3.0.2"; + sha256 = "1xsyq28hkf7ngkq9v5ga958d2fqbmshc9gl8lzms6vknr64gaqr7"; libraryHaskellDepends = [ base containers safe-exceptions text unliftio-core ]; @@ -37259,8 +37334,8 @@ self: { pname = "ansigraph"; version = "0.3.0.5"; sha256 = "03ks75ik0jyfz55iz3gcccxgg73v1dw2nn0myl40c2rc31mwz39f"; - revision = "1"; - editedCabalFile = "047pnpd9sviia1wxx9czidz2in6jq7jgbln7l6dy2j157vyqi93k"; + revision = "2"; + editedCabalFile = "0kq3dijahr4yxp13v3v5d5v0v3zswkxh8idx5hyv0yp9d1czqars"; libraryHaskellDepends = [ ansi-terminal base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Terminal-based graphing via ANSI and Unicode"; @@ -39619,10 +39694,8 @@ self: { }: mkDerivation { pname = "arch-web"; - version = "0.2"; - sha256 = "0axyb62pjgh1l60qx6z8mppiq5gam3g6c9wfbrww8wl7f2kamwrp"; - revision = "1"; - editedCabalFile = "1msmx8w3m2aypigramyiwqz77vzx8r6ssyp0p35ndb03mzmrry3p"; + version = "0.3.1"; + sha256 = "1z8zfl0dskp7i0h5kgrw1nh94sxrmmfdpaykdjqiingn9dqnsmqm"; libraryHaskellDepends = [ aeson base deriving-aeson exceptions http-client http-client-tls http-types lens mtl servant servant-client servant-client-core text @@ -42273,24 +42346,6 @@ self: { }) {}; "atomic-write" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, hspec - , temporary, text, unix-compat - }: - mkDerivation { - pname = "atomic-write"; - version = "0.2.0.7"; - sha256 = "03cn3ii74h0w3g4h78xsx9v2sn58r3qsr2dbdwq340xwhiwcgxdm"; - libraryHaskellDepends = [ - base bytestring directory filepath temporary text unix-compat - ]; - testHaskellDepends = [ - base bytestring filepath hspec temporary text unix-compat - ]; - description = "Atomically write to a file"; - license = lib.licenses.mit; - }) {}; - - "atomic-write_0_2_1_0" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hspec , hspec-discover, temporary, text, unix-compat }: @@ -42307,7 +42362,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Atomically write to a file"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "atomo" = callPackage @@ -46416,8 +46470,8 @@ self: { pname = "base16"; version = "1.0"; sha256 = "1plwc4yrkvd5j6y09fjvyzhr05mzhzwz6z41fyb60y0bj5j66dl6"; - revision = "1"; - editedCabalFile = "00r0j3l3af912b33mlsr5a48rr0l31gh34cmj8jf247c4a332rlk"; + revision = "2"; + editedCabalFile = "1dcb8m73xj2dfb8xbz731l91nm2jz532v971rsfm0kkid5ap9bvl"; libraryHaskellDepends = [ base bytestring deepseq primitive text text-short ]; @@ -47716,10 +47770,8 @@ self: { }: mkDerivation { pname = "beam-core"; - version = "0.10.1.0"; - sha256 = "0h1kr653wd00m5pypj4ia8d1ni6m2qrzqqqh19hnd8wz1n0pfd1h"; - revision = "1"; - editedCabalFile = "0sjc2zyy9f5r3qg4yxl1dq0c4ybvqvgh64vy078507sl8jxxl7v7"; + version = "0.10.3.0"; + sha256 = "1q3f95xjyinr6g9yxq1w32agp9n6q152b6mfpmabpv0l74c9mmhm"; libraryHaskellDepends = [ aeson base bytestring containers dlist free ghc-prim hashable microlens mtl network-uri scientific tagged text time vector @@ -47740,10 +47792,8 @@ self: { }: mkDerivation { pname = "beam-migrate"; - version = "0.5.2.1"; - sha256 = "16gl39cpj7gvb82i41h18606n6k40hi8lfyyw1x0dq73xs2ldfyc"; - revision = "2"; - editedCabalFile = "0788nzixn3fnm57vw5s69rwc3qmw0rr1d46lqwzxdsxqzcywq644"; + version = "0.5.3.1"; + sha256 = "0qx1nh5vvncgr4ixnraaahwp879v8wgn2lhixgzndk6zrs3y4a21"; libraryHaskellDepends = [ aeson base beam-core bytestring containers deepseq dependent-map dependent-sum free ghc-prim hashable haskell-src-exts microlens mtl @@ -47795,15 +47845,13 @@ self: { , bytestring, case-insensitive, conduit, free, hashable , haskell-src-exts, hedgehog, lifted-base, monad-control, mtl , network-uri, postgresql-libpq, postgresql-simple, scientific - , tagged, tasty, tasty-hunit, text, time, tmp-postgres + , tagged, tasty, tasty-hunit, testcontainers, text, time , transformers-base, unordered-containers, uuid, uuid-types, vector }: mkDerivation { pname = "beam-postgres"; - version = "0.5.3.1"; - sha256 = "19gagw9r2wfy398calkcnilsgl89sjpy8vj9bdswg390mw15m41n"; - revision = "2"; - editedCabalFile = "11f3jxljrfa4rva21r561w7vxafv63wmmsa9cq8bydcp3gzlgr4p"; + version = "0.5.4.1"; + sha256 = "0rxf275y89xh8if2w2my75fgy34vzc85lv4viyirgd0y26n9d0kc"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring case-insensitive conduit free hashable haskell-src-exts lifted-base @@ -47813,7 +47861,7 @@ self: { ]; testHaskellDepends = [ aeson base beam-core beam-migrate bytestring hedgehog - postgresql-simple tasty tasty-hunit text tmp-postgres uuid vector + postgresql-simple tasty tasty-hunit testcontainers text uuid vector ]; description = "Connection layer between beam and postgres"; license = lib.licenses.mit; @@ -47900,8 +47948,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.14.10"; - sha256 = "0fyjrwb3f7sqs1bbiga98h6bylgvmqfpqg59p07lhv4hrrgmx8ff"; + version = "0.14.11"; + sha256 = "13f9x9kavnkbg29mrp2zddvx5vqdyp6ias5a822hmlzqfzp5c1hy"; libraryHaskellDepends = [ base deepseq dunai mtl random simple-affine-space transformers ]; @@ -53290,8 +53338,10 @@ self: { ({ mkDerivation, bluefin-internal }: mkDerivation { pname = "bluefin"; - version = "0.0.8.0"; - sha256 = "16gzb82lrxhw4s1b1gmq03k094lfpczsls8csv02l77bkipjmfh8"; + version = "0.0.9.0"; + sha256 = "11balgaw73fi3bqnajhs570nfy5lcjzhxdkms2jbxsd80l6n1zx1"; + revision = "1"; + editedCabalFile = "0xll6fdlhr9h9kswn6kdbdk3wbd1z87wsrgr4g3bqsj29bdjqvb7"; libraryHaskellDepends = [ bluefin-internal ]; description = "The Bluefin effect system"; license = lib.licenses.mit; @@ -53322,10 +53372,8 @@ self: { }: mkDerivation { pname = "bluefin-internal"; - version = "0.0.8.0"; - sha256 = "1knhqll525qn74zbyqxn6k8d1zbb974h1qh92qpc7r3bqp5v576p"; - revision = "1"; - editedCabalFile = "1j27hka5sm5vld2mgvw238c4bg6ys7mzfjskdmdvbxs5yn6ywqpr"; + version = "0.0.9.0"; + sha256 = "06y5vq24jrm5l3lf2sq43qnc0i8zazrf9g28spmgzjlsqcv84g4d"; libraryHaskellDepends = [ async base monad-control transformers transformers-base unliftio-core @@ -54678,18 +54726,19 @@ self: { "box" = callPackage ({ mkDerivation, async, base, bytestring, containers, contravariant - , dlist, exceptions, kan-extensions, mtl, profunctors - , semigroupoids, stm, text, time + , dlist, doctest-parallel, exceptions, kan-extensions, mtl + , profunctors, semigroupoids, stm, text, time }: mkDerivation { pname = "box"; - version = "0.9.3.1"; - sha256 = "09mqz1ifq9sbq2h5wqy0lfvlc3v9m2nsw2f7gdss93qx8bz5cxmy"; + version = "0.9.3.2"; + sha256 = "0x2h5d6jgmv4nwsl955xb89q0f1fclsg5hjn7fyyja3z8w9qnf39"; libraryHaskellDepends = [ async base bytestring containers contravariant dlist exceptions kan-extensions mtl profunctors semigroupoids stm text time ]; - description = "A profunctor effect system"; + testHaskellDepends = [ base doctest-parallel ]; + description = "A profunctor effect system?"; license = lib.licenses.bsd3; }) {}; @@ -54707,13 +54756,14 @@ self: { }) {}; "box-socket" = callPackage - ({ mkDerivation, async, base, box, bytestring, network-simple - , optparse-applicative, profunctors, text, websockets + ({ mkDerivation, async, base, box, bytestring, doctest-parallel + , network-simple, optparse-applicative, profunctors, text + , websockets }: mkDerivation { pname = "box-socket"; - version = "0.5.1.0"; - sha256 = "0bm3csgz72fv41pilbwn0f2dx9gplin7qxi5i8mrwflaix156sy5"; + version = "0.5.2.0"; + sha256 = "13a8dclvf7m5j0a9gvmla8pr78qqrqnbqz8nc8js2yzp215p5qip"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54721,6 +54771,7 @@ self: { websockets ]; executableHaskellDepends = [ base optparse-applicative ]; + testHaskellDepends = [ base doctest-parallel ]; description = "Box websockets"; license = lib.licenses.bsd3; mainProgram = "box-socket"; @@ -54886,14 +54937,16 @@ self: { "brassica" = callPackage ({ mkDerivation, aeson, attoparsec-aeson, base, bytestring, conduit , conduit-extra, containers, criterion, deepseq, fast-myers-diff - , file-embed, megaparsec, mtl, optparse-applicative, parallel - , parser-combinators, split, tasty, tasty-golden, text - , transformers, utf8-string, vector + , file-embed, megaparsec, mtl, optparse-applicative, pandoc + , pandoc-types, parallel, parser-combinators, split, tasty + , tasty-golden, text, transformers, utf8-string, vector }: mkDerivation { pname = "brassica"; - version = "0.3.0"; - sha256 = "10ydb5w79y1jqa34mzrdl7s8ns29w1vxplv55ik51mkayclfgx3n"; + version = "1.0.0"; + sha256 = "04nrfc448m0kz73rwnvb6c0h9mhh55vjxxls6ddyq80avypsgb57"; + revision = "1"; + editedCabalFile = "1vqakf9jh6hrbicbrpwsv3fjqwi0mngnvrwg58xaaqhb4h18kzj4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54905,8 +54958,8 @@ self: { deepseq optparse-applicative parallel text ]; testHaskellDepends = [ - base bytestring conduit tasty tasty-golden text transformers - utf8-string + base bytestring conduit pandoc pandoc-types tasty tasty-golden text + transformers utf8-string ]; benchmarkHaskellDepends = [ base criterion file-embed parallel text @@ -55119,8 +55172,8 @@ self: { ({ mkDerivation, base, brick, containers, microlens, vector }: mkDerivation { pname = "brick-list-skip"; - version = "0.1.1.13"; - sha256 = "1n5mp9ikqmlckqywbvb1ry24j927qim3bw8bkw84w72yhlrxsmfc"; + version = "0.1.1.14"; + sha256 = "1gyc59y2ch2w5chiyx1d1s6rd71cvgvccmdfkbyzvcm8sywaqnnr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers microlens vector ]; @@ -55174,8 +55227,8 @@ self: { }: mkDerivation { pname = "brick-tabular-list"; - version = "2.2.0.11"; - sha256 = "0vikqrrhb94m6xg0k67j626gahx4iiwwywimlsqh96lvs5l07y9l"; + version = "2.2.0.12"; + sha256 = "0ss1rakdpv82pbyf9cnfd3sysap2ggjc7cpz4vh46w55ivy3ba3n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56945,8 +56998,8 @@ self: { }: mkDerivation { pname = "byte-count-reader"; - version = "0.10.1.11"; - sha256 = "1mi0560rcajp9q83y6vsw7ld1n429jdsmswassnyhh1z4hs6ihv7"; + version = "0.10.1.12"; + sha256 = "0bzks15c2s2xiv95v7fyzsndyiinp9ar8ajcalxs68zpwmbpzk3h"; libraryHaskellDepends = [ base extra parsec parsec-numbers text ]; testHaskellDepends = [ base extra hspec parsec parsec-numbers text @@ -58553,8 +58606,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "5.2.3"; - sha256 = "0gj6w5r07bmij41flx7rw4ad0qjl2fmbxp9jrdkl8k33b045lfc7"; + version = "5.2.4"; + sha256 = "02pwpdzq8lk9yk6d4zpw62v1yd3ccn3r88gz3l0z51mk17ifym44"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58724,14 +58777,15 @@ self: { "cabal-fix" = callPackage ({ mkDerivation, algebraic-graphs, base, bytestring, Cabal-syntax - , containers, directory, dotparse, filepath, flatparse - , optics-extra, optparse-applicative, pretty, pretty-simple - , string-interpolate, tar, text, these, tree-diff, vector + , containers, directory, doctest-parallel, dotparse, filepath + , flatparse, optics-extra, optparse-applicative, pretty + , pretty-simple, string-interpolate, tar, text, these, tree-diff + , vector }: mkDerivation { pname = "cabal-fix"; - version = "0.0.0.2"; - sha256 = "050003nvqc0x44jik7x5gsljqsrandpsl77xkqbhrh3xglw8cydb"; + version = "0.1.0.0"; + sha256 = "09q9nzxybkrqg96ys45jpq37ar5dgdvxc3yacfngk3kzxcw3ykms"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58743,6 +58797,7 @@ self: { base bytestring directory filepath optparse-applicative pretty-simple text tree-diff ]; + testHaskellDepends = [ base doctest-parallel ]; description = "Fix for cabal files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -60126,21 +60181,22 @@ self: { , conduit-concurrent-map, conduit-extra, conduit-zstd, containers , crypton, deepseq, dhall, directory, ed25519, either, exceptions , extra, filepath, fsnotify, generic-lens, hercules-ci-cnix-store - , here, hnix-store-core, hspec, hspec-discover, http-client - , http-client-tls, http-conduit, http-types, immortal, inline-c-cpp - , katip, lukko, lzma-conduit, megaparsec, memory, microlens, netrc - , network, nix, nix-narinfo, optparse-applicative, pretty-terminal - , prettyprinter, process, protolude, resourcet, retry - , safe-exceptions, servant, servant-auth, servant-auth-client - , servant-client, servant-client-core, servant-conduit, stm - , stm-chans, stm-conduit, systemd, temporary, text, time - , transformers, unix, unliftio, unliftio-core, unordered-containers - , uri-bytestring, uuid, vector, versions, websockets, wuss + , here, hnix-store-core, hnix-store-nar, hspec, hspec-discover + , http-client, http-client-tls, http-conduit, http-types, immortal + , inline-c-cpp, katip, lukko, lzma-conduit, megaparsec, memory + , microlens, netrc, network, nix, nix-narinfo, optparse-applicative + , pretty-terminal, prettyprinter, process, protolude, resourcet + , retry, safe-exceptions, servant, servant-auth + , servant-auth-client, servant-client, servant-client-core + , servant-conduit, stm, stm-chans, stm-conduit, systemd, temporary + , text, time, transformers, unix, unliftio, unliftio-core + , unordered-containers, uri-bytestring, uuid, vector, versions + , websockets, wuss }: mkDerivation { pname = "cachix"; - version = "1.7.4"; - sha256 = "1bz80b9cfhib2j0bkxsxwvp8zzf1bfvzpwin1fb8lfw9nm9mz915"; + version = "1.7.5"; + sha256 = "0f9lp7drhiadn8blcf1m4hxmv3zj1ah9n0w6s9v5ad1zp1lgcd0y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60149,15 +60205,15 @@ self: { concurrent-extra conduit conduit-concurrent-map conduit-extra conduit-zstd containers crypton deepseq dhall directory ed25519 either exceptions extra filepath fsnotify generic-lens - hercules-ci-cnix-store here hnix-store-core http-client - http-client-tls http-conduit http-types immortal inline-c-cpp katip - lukko lzma-conduit megaparsec memory microlens netrc network - nix-narinfo optparse-applicative pretty-terminal prettyprinter - process protolude resourcet retry safe-exceptions servant - servant-auth servant-auth-client servant-client servant-conduit stm - stm-chans stm-conduit systemd temporary text time transformers unix - unliftio unliftio-core unordered-containers uri-bytestring uuid - vector versions websockets wuss + hercules-ci-cnix-store here hnix-store-core hnix-store-nar + http-client http-client-tls http-conduit http-types immortal + inline-c-cpp katip lukko lzma-conduit megaparsec memory microlens + netrc network nix-narinfo optparse-applicative pretty-terminal + prettyprinter process protolude resourcet retry safe-exceptions + servant servant-auth servant-auth-client servant-client + servant-conduit stm stm-chans stm-conduit systemd temporary text + time transformers unix unliftio unliftio-core unordered-containers + uri-bytestring uuid vector versions websockets wuss ]; libraryPkgconfigDepends = [ nix ]; executableHaskellDepends = [ @@ -60166,8 +60222,8 @@ self: { ]; testHaskellDepends = [ aeson async base bytestring cachix-api containers dhall directory - extra here hspec protolude retry servant-auth-client - servant-client-core stm temporary time versions + extra hercules-ci-cnix-store here hspec protolude retry + servant-auth-client servant-client-core stm temporary time versions ]; testToolDepends = [ hspec-discover ]; description = "Command-line client for Nix binary cache hosting https://cachix.org"; @@ -60176,18 +60232,18 @@ self: { }) {inherit (pkgs) nix;}; "cachix-api" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, conduit - , cryptonite, deriving-aeson, exceptions, hspec, hspec-discover - , http-media, jose, memory, nix-narinfo, protolude, resourcet - , safe-exceptions, servant, servant-auth, stm-chans, swagger2, text - , time, unordered-containers, uuid, websockets + ({ mkDerivation, aeson, async, base, bytestring, conduit, crypton + , deriving-aeson, exceptions, hspec, hspec-discover, http-media + , jose, memory, nix-narinfo, protolude, resourcet, safe-exceptions + , servant, servant-auth, stm-chans, swagger2, text, time + , unordered-containers, uuid, websockets }: mkDerivation { pname = "cachix-api"; - version = "1.7.4"; - sha256 = "0f19mxmas71mwj487jizwfmlfpp5c5jwhjk5j8w4kz3xc434irqy"; + version = "1.7.5"; + sha256 = "03iq1kwy2jnbpf2c2v0hs9s44sd2w92srrrcb61jm00ws7qnh5sw"; libraryHaskellDepends = [ - aeson async base bytestring conduit cryptonite deriving-aeson + aeson async base bytestring conduit crypton deriving-aeson exceptions http-media jose memory nix-narinfo protolude resourcet safe-exceptions servant servant-auth stm-chans swagger2 text time unordered-containers uuid websockets @@ -60521,8 +60577,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.12.0.0"; - sha256 = "00vdj70n5s05xx7yq4d28nbp9vncrdc4a9k3502xslkh6kj7zva2"; + version = "0.12.1.0"; + sha256 = "0ccwrnymkd96ca85n097iw9x5pnirc3ccmalyl1w507c56ph3jb4"; libraryHaskellDepends = [ aeson aeson-optics async base bytestring calamity-commands colour concurrent-extra containers crypton-connection crypton-x509-system @@ -64244,20 +64300,20 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "chart-svg_0_6_1_0" = callPackage - ({ mkDerivation, adjunctions, attoparsec, base, bytestring, Color - , containers, cubicbezier, doctest-parallel, flatparse, foldl - , formatn, markup-parse, mtl, numhask, numhask-array, numhask-space - , optics-core, random, string-interpolate, text, time + "chart-svg_0_7_0_0" = callPackage + ({ mkDerivation, base, bytestring, Color, containers, cubicbezier + , doctest-parallel, flatparse, formatn, harpie, markup-parse, mtl + , numhask, numhask-space, optics-core, random, string-interpolate + , text, time }: mkDerivation { pname = "chart-svg"; - version = "0.6.1.0"; - sha256 = "05z9raqqjnq0wvlknkl2z2g20hxal6nnz7g8p0fqplggv52f53vd"; + version = "0.7.0.0"; + sha256 = "1v1dhvn4rgv191byvr5dvaxifd48hskpqvv3kzpsq40ii7hqyj4m"; libraryHaskellDepends = [ - adjunctions attoparsec base bytestring Color containers cubicbezier - flatparse foldl formatn markup-parse mtl numhask numhask-array - numhask-space optics-core random string-interpolate text time + base bytestring Color containers cubicbezier flatparse formatn + harpie markup-parse mtl numhask numhask-space optics-core random + string-interpolate text time ]; testHaskellDepends = [ base doctest-parallel ]; description = "Charting library targetting SVGs"; @@ -64781,8 +64837,8 @@ self: { }: mkDerivation { pname = "chessIO"; - version = "0.9.3.1"; - sha256 = "1jq8x1mjjy89mfdrksdaiyqyhn7wvxnl3is36kacyck58l0sc738"; + version = "0.9.4.0"; + sha256 = "1dbbhpvpnrlx3a4a66q0732fdvb132xax0p5fh41xfhjfxxspzf2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66109,6 +66165,8 @@ self: { pname = "citeproc"; version = "0.8.1.1"; sha256 = "0hgkxgd1wmyrryv2ahavia6r5z9331i9557mnblq922lkdi0bs2g"; + revision = "1"; + editedCabalFile = "091gm0cbjsqvad3fhd2fx4bgsylv3gfakq3fhki3z40aywri8992"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70847,6 +70905,21 @@ self: { license = "unknown"; }) {}; + "comma-and" = callPackage + ({ mkDerivation, base, data-default-class, hspec, hspec-discover + , QuickCheck + }: + mkDerivation { + pname = "comma-and"; + version = "0.1.0.0"; + sha256 = "13z5z7c2xgljxk9lr786wbmayyqng3pp16pkhv6ch9p0a0adwwkc"; + libraryHaskellDepends = [ base data-default-class ]; + testHaskellDepends = [ base data-default-class hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Join text together with commas, and \"and\""; + license = lib.licenses.bsd3; + }) {}; + "command" = callPackage ({ mkDerivation, base, deepseq, process }: mkDerivation { @@ -70952,28 +71025,6 @@ self: { }) {}; "commonmark" = callPackage - ({ mkDerivation, base, bytestring, containers, parsec, tasty - , tasty-bench, tasty-hunit, tasty-quickcheck, text, transformers - , unicode-data, unicode-transforms - }: - mkDerivation { - pname = "commonmark"; - version = "0.2.6"; - sha256 = "0k0wkvlqbcv7iml9pa56pic4z417qydck22r4kbw51zixkj6rrp7"; - libraryHaskellDepends = [ - base bytestring containers parsec text transformers unicode-data - unicode-transforms - ]; - testHaskellDepends = [ - base parsec tasty tasty-hunit tasty-quickcheck text - unicode-transforms - ]; - benchmarkHaskellDepends = [ base tasty-bench text ]; - description = "Pure Haskell commonmark parser"; - license = lib.licenses.bsd3; - }) {}; - - "commonmark_0_2_6_1" = callPackage ({ mkDerivation, base, bytestring, containers, parsec, tasty , tasty-bench, tasty-hunit, tasty-quickcheck, text, transformers , unicode-data, unicode-transforms @@ -70993,7 +71044,6 @@ self: { benchmarkHaskellDepends = [ base tasty-bench text ]; description = "Pure Haskell commonmark parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "commonmark-cli" = callPackage @@ -71039,21 +71089,6 @@ self: { }) {}; "commonmark-pandoc" = callPackage - ({ mkDerivation, base, commonmark, commonmark-extensions - , pandoc-types, text - }: - mkDerivation { - pname = "commonmark-pandoc"; - version = "0.2.2.1"; - sha256 = "1kbs165li9fcizzivlb9ajsh9livc7vq8s903g5n829fpwayp431"; - libraryHaskellDepends = [ - base commonmark commonmark-extensions pandoc-types text - ]; - description = "Bridge between commonmark and pandoc AST"; - license = lib.licenses.bsd3; - }) {}; - - "commonmark-pandoc_0_2_2_2" = callPackage ({ mkDerivation, base, commonmark, commonmark-extensions , pandoc-types, text }: @@ -71066,7 +71101,6 @@ self: { ]; description = "Bridge between commonmark and pandoc AST"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "commonmark-simple" = callPackage @@ -74172,8 +74206,8 @@ self: { pname = "config-value"; version = "0.8.3"; sha256 = "0pkcwxg91wali7986k03d7q940hb078hlsxfknqhkp2spr3d1f3w"; - revision = "7"; - editedCabalFile = "0bzrsy2qlz6ylml38q905rcw2lg0khz6iqr67hhcihbgwgazrrsj"; + revision = "8"; + editedCabalFile = "1sfj9c77y7j5y5l7vsix4v94hmi5lajm1v5lgvwvcl7y063h0p2r"; libraryHaskellDepends = [ array base containers pretty text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base text ]; @@ -75830,6 +75864,20 @@ self: { license = lib.licenses.publicDomain; }) {}; + "control-monad-omega_0_3_3" = callPackage + ({ mkDerivation, base, tasty, tasty-bench, tasty-quickcheck }: + mkDerivation { + pname = "control-monad-omega"; + version = "0.3.3"; + sha256 = "0f90q6mxxb8szqvw93pypbbf4nicj1w5n9sqs4434b6cp55665z6"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base tasty-bench ]; + description = "A breadth-first list monad"; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + }) {}; + "control-monad-queue" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -79744,15 +79792,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "crypton_1_0_0" = callPackage + "crypton_1_0_1" = callPackage ({ mkDerivation, base, basement, bytestring, deepseq, gauge , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit , tasty-kat, tasty-quickcheck }: mkDerivation { pname = "crypton"; - version = "1.0.0"; - sha256 = "1q1kv37hv8cl6hykvssbd4hsd0zj8a562q42jr2gwk59lnwklhcx"; + version = "1.0.1"; + sha256 = "19674xqf6zp17g4qwlz1m3dzdsl05s1frb2drxb77iccfhabnhli"; libraryHaskellDepends = [ base basement bytestring deepseq ghc-prim integer-gmp memory ]; @@ -80402,8 +80450,8 @@ self: { }: mkDerivation { pname = "csv-conduit"; - version = "1.0.0.1"; - sha256 = "16falqdvm94dr4fjb9dndax1vj50amf1ns95x0hribww0vp85w8c"; + version = "1.0.1.0"; + sha256 = "0qlw5hhsrfpw972ryp3mr895q77d6p1g2q1z7jl7hf1xz7ba0c1r"; libraryHaskellDepends = [ array attoparsec base blaze-builder bytestring conduit conduit-extra containers data-default exceptions ordered-containers @@ -81406,7 +81454,7 @@ self: { hydraPlatforms = lib.platforms.none; mainProgram = "cut-the-crap"; broken = true; - }) {pocketsphinx = null; sphinxbase = null;}; + }) {inherit (pkgs) pocketsphinx; sphinxbase = null;}; "cutter" = callPackage ({ mkDerivation, base, bytestring, explicit-exception, spreadsheet @@ -82760,28 +82808,42 @@ self: { }) {}; "data-default" = callPackage - ({ mkDerivation, base, data-default-class + ({ mkDerivation, base, containers, data-default-class , data-default-instances-containers, data-default-instances-dlist - , data-default-instances-old-locale + , data-default-instances-old-locale, mtl, old-locale }: mkDerivation { pname = "data-default"; - version = "0.7.1.1"; - sha256 = "04d5n8ybmcxba9qb6h389w9zfq1lvj81b82jh6maqp6pkhkmvydh"; + version = "0.7.1.2"; + sha256 = "0kzq84bflmfhzc7650wykjamwq8zsxm9q2c1s7nfbgig5xyizkjc"; libraryHaskellDepends = [ base data-default-class data-default-instances-containers data-default-instances-dlist data-default-instances-old-locale ]; + testHaskellDepends = [ base containers mtl old-locale ]; description = "A class for types with a default value"; license = lib.licenses.bsd3; }) {}; + "data-default_0_8_0_0" = callPackage + ({ mkDerivation, base, containers, mtl }: + mkDerivation { + pname = "data-default"; + version = "0.8.0.0"; + sha256 = "0cfxfbgsxxla1hr59rnm1cljb6i18rbp8yq7f0bfwvwpi4q0xwi3"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers mtl ]; + description = "A class for types with a default value"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "data-default-class" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "data-default-class"; - version = "0.1.2.0"; - sha256 = "0miyjz8d4jyvqf2vp60lyfbnflx6cj2k8apmm9ly1hq0y0iv80ag"; + version = "0.1.2.2"; + sha256 = "1qxfyxdddl0rzigp81p36i1dgddw2yhqskyz8ngkcy6zbq0w407l"; libraryHaskellDepends = [ base ]; description = "A class for types with a default value"; license = lib.licenses.bsd3; @@ -82839,8 +82901,8 @@ self: { ({ mkDerivation, base, data-default-class }: mkDerivation { pname = "data-default-instances-base"; - version = "0.1.0.1"; - sha256 = "0ym1sw3ssdzzifxxhh76qlv8kkmb2iclc158incv1dklyr9y8kw4"; + version = "0.1.0.3"; + sha256 = "1cslj2bywl4w58f6wr4knk7zj6v8v7rykjxq9ddy8vzbydns1bn8"; libraryHaskellDepends = [ base data-default-class ]; description = "Default instances for types in base"; license = lib.licenses.bsd3; @@ -82883,12 +82945,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "data-default-instances-containers_0_1_0_3" = callPackage + ({ mkDerivation, base, containers, data-default-class }: + mkDerivation { + pname = "data-default-instances-containers"; + version = "0.1.0.3"; + sha256 = "0awk655khqc1cqfc2kcxkcxqpa90l882cz89f2gip6v31vyzmpdr"; + libraryHaskellDepends = [ base containers data-default-class ]; + description = "Default instances for types in containers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "data-default-instances-dlist" = callPackage ({ mkDerivation, base, data-default-class, dlist }: mkDerivation { pname = "data-default-instances-dlist"; - version = "0.0.1"; - sha256 = "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x"; + version = "0.0.1.2"; + sha256 = "02wy7rq6d5z2hpxdw6vwnb1bri5bz9yrw5hnc1i7l0x5q68g3gg0"; libraryHaskellDepends = [ base data-default-class dlist ]; description = "Default instances for types in dlist"; license = lib.licenses.bsd3; @@ -82911,8 +82985,8 @@ self: { ({ mkDerivation, base, data-default-class, old-locale }: mkDerivation { pname = "data-default-instances-old-locale"; - version = "0.0.1"; - sha256 = "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0"; + version = "0.0.1.2"; + sha256 = "0vxqr7hmp1vxjv08lmrf15x4p6s7l44qz1c834a8dds807zri03h"; libraryHaskellDepends = [ base data-default-class old-locale ]; description = "Default instances for types in old-locale"; license = lib.licenses.bsd3; @@ -83062,8 +83136,10 @@ self: { }: mkDerivation { pname = "data-effects"; - version = "0.1.2.0"; - sha256 = "1gx04k8rsk2qcq74ya44w0249vfb8n3qqwc3bj95askm4nr7nfl6"; + version = "0.2.0.0"; + sha256 = "1fmag3frj414q3anp8711l53diy603rz6sh6pl3p9bliwk8npwfs"; + revision = "1"; + editedCabalFile = "13j27hw73a8kzjf6hvz8pyj8xfv6j9bzp8y2ahd8w6ycv7kdcl10"; libraryHaskellDepends = [ base data-default data-effects-core data-effects-th lens text these time @@ -83081,8 +83157,8 @@ self: { }: mkDerivation { pname = "data-effects-core"; - version = "0.1.0.0"; - sha256 = "1sz3wnna9h6211lc9pbvgf6wjr6csqzpl2q2jz8z3s4hky0m32jg"; + version = "0.2.0.0"; + sha256 = "1cxagw2h0987k3s1h3wbhqsydjk0yvz4nda5d6yvz2w3jlm1fnqg"; libraryHaskellDepends = [ base compdata mtl ]; testHaskellDepends = [ base tasty tasty-hunit ]; testToolDepends = [ tasty-discover ]; @@ -83100,8 +83176,10 @@ self: { }: mkDerivation { pname = "data-effects-th"; - version = "0.1.2.0"; - sha256 = "05jzplb3vxxhy8ham7v8w3n943fng3fk8v1pa09vbv68k3r1p14w"; + version = "0.2.0.0"; + sha256 = "0b6hwhh7hc7b81xsm1khrjda737gjwg0q48c8v9ai48q5nsnb646"; + revision = "1"; + editedCabalFile = "1bi4rhb6wl5n5myp1jc5rv3s483jspqfa53dkv7xsq6chvfqhf7h"; libraryHaskellDepends = [ base containers data-default data-effects-core either extra formatting infinite-list lens mtl template-haskell text @@ -83112,7 +83190,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Template Haskell utilities for the data-effects library"; - license = lib.licenses.mpl20; + license = "MPL-2.0 AND BSD-3-Clause"; hydraPlatforms = lib.platforms.none; }) {}; @@ -85149,17 +85227,17 @@ self: { license = lib.licenses.asl20; }) {}; - "dbus_1_3_7" = callPackage + "dbus_1_3_8" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, containers - , criterion, deepseq, directory, exceptions, extra, filepath, lens - , network, parsec, process, QuickCheck, random, resourcet, split - , tasty, tasty-hunit, tasty-quickcheck, template-haskell, temporary - , text, th-lift, transformers, unix, vector, xml-conduit, xml-types + , deepseq, directory, exceptions, extra, filepath, lens, network + , parsec, process, QuickCheck, random, resourcet, split, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text + , th-lift, transformers, unix, vector, xml-conduit, xml-types }: mkDerivation { pname = "dbus"; - version = "1.3.7"; - sha256 = "0yjsgabcihy8gzzckh5ipy5bwspw3pg3ghj3in6mzlkyqj1hx964"; + version = "1.3.8"; + sha256 = "1vw6268w3gs7lzi3p0g1vhi930cwwb2l38w6mnv1yzsm26v6np4s"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -85170,7 +85248,6 @@ self: { parsec process QuickCheck random resourcet tasty tasty-hunit tasty-quickcheck temporary text transformers unix vector ]; - benchmarkHaskellDepends = [ base criterion ]; doCheck = false; description = "A client library for the D-Bus IPC system"; license = lib.licenses.asl20; @@ -87178,6 +87255,8 @@ self: { pname = "dependent-monoidal-map"; version = "0.1.1.4"; sha256 = "1cgk0dlag557krddaivbqkc3qp4crsspa53wkqx5mpgv6jaiq7dg"; + revision = "1"; + editedCabalFile = "0qm6b15ljxdpnyihz6ip932spbgz0kgkgqpif961599l35l1ajg9"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum dependent-sum-aeson-orphans @@ -87221,8 +87300,8 @@ self: { pname = "dependent-sum-aeson-orphans"; version = "0.3.1.1"; sha256 = "0d2255gxsamp19hl23m076ds2j08ny95swrk9r3njjfjrwkd4zbq"; - revision = "1"; - editedCabalFile = "023f0h3pifgjrv8qr7cka86iykpzw1c4vcx1kjsi8m9brl78hh1h"; + revision = "2"; + editedCabalFile = "1w50zxcngacgaq534dza7p1h37nkshmh9nhcaxlwkia2mr26fiv5"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum some @@ -87506,8 +87585,8 @@ self: { ({ mkDerivation, base, hspec, template-haskell, th-abstraction }: mkDerivation { pname = "derive-has-field"; - version = "0.0.1.2"; - sha256 = "03w0qvs7adgwc676gk0q36bm9s7f7b709siy4dh0y27qblcjb6a4"; + version = "0.0.1.4"; + sha256 = "19mbgv53sc4j200affnsig9g9qz9cn7xp7v3qc1l4cc93pgyf3m9"; libraryHaskellDepends = [ base template-haskell th-abstraction ]; testHaskellDepends = [ base hspec template-haskell th-abstraction @@ -87925,8 +88004,8 @@ self: { }: mkDerivation { pname = "desktop-portal"; - version = "0.6.0.0"; - sha256 = "18cgwz8cgsj1vjhk4rgv4lakqbnrrb5pspkpg5lnkc9kq7953d1g"; + version = "0.6.0.2"; + sha256 = "04z1d3gqcd0qvrvfhiv51sdhra5m39dq5jvp8hsrw2k32mkdixn9"; libraryHaskellDepends = [ base binary bytestring containers data-default-class dbus directory filepath modern-uri network random text unix @@ -89177,8 +89256,8 @@ self: { pname = "diagrams-builder"; version = "0.8.0.6"; sha256 = "17yi5dmcxx4sgk3wha386zbv9h69pwq72j8i21vmfh35brxhs9f4"; - revision = "1"; - editedCabalFile = "1w9bjc6zizp779rk4frfmffzlv4vq4sljdcvql9ma5qy679phiyr"; + revision = "2"; + editedCabalFile = "1mkxn0r6wmxyvdhwly1a6j0z4j234mfv7aimirwl7jmcv55lwbs4"; configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; isLibrary = true; isExecutable = true; @@ -90504,6 +90583,8 @@ self: { pname = "dimensional"; version = "1.5"; sha256 = "16d50vlln11hq894y8qxrg4cricz1459dg14z0wc1fzfiydxb6ns"; + revision = "1"; + editedCabalFile = "1149vwz3ywi2kkblsl8ayhca4ibwn76zdc5g6l18j8b03hvf3yzg"; libraryHaskellDepends = [ base deepseq exact-pi ieee754 numtype-dk vector ]; @@ -90524,6 +90605,8 @@ self: { pname = "dimensional"; version = "1.6"; sha256 = "05ikvdpl9j94alyf3r9fwfwn354z4gifbhp1fasspmd9s0bhi7wl"; + revision = "1"; + editedCabalFile = "0g51fw0k86jr0nlvriiprw5zpjqkifxc16s18h1h240y2v0cbgq0"; libraryHaskellDepends = [ base deepseq exact-pi ieee754 numtype-dk vector ]; @@ -90899,13 +90982,13 @@ self: { broken = true; }) {}; - "directory_1_3_8_5" = callPackage - ({ mkDerivation, base, filepath, time, unix }: + "directory_1_3_9_0" = callPackage + ({ mkDerivation, base, file-io, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.8.5"; - sha256 = "0s57dq5l02b9z3h17slw3yg73mzdx15pzj02xg91avpwvmafsr78"; - libraryHaskellDepends = [ base filepath time unix ]; + version = "1.3.9.0"; + sha256 = "1k34iqdkh9d5vjd7wihhjjc6388hfbh7sjwp3msziibz2534i8i0"; + libraryHaskellDepends = [ base file-io filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; license = lib.licenses.bsd3; @@ -91471,8 +91554,8 @@ self: { pname = "discrimination"; version = "0.5"; sha256 = "1qq7fs1dsfqgf4969gksqcp3swcx0wbzdh66a89fv78k6y94g0pc"; - revision = "3"; - editedCabalFile = "1i3mkza18y2dxj03zn9419rh7jgpkg1kq97blhjrcw5174p9p3c6"; + revision = "4"; + editedCabalFile = "1m4sv7mdqdm5xx5khbyq0il3dn5isg575vgn1akb283l2jkz4v1g"; libraryHaskellDepends = [ array base containers contravariant deepseq ghc-bignum ghc-prim hashable primitive promises transformers @@ -93495,7 +93578,7 @@ self: { mainProgram = "doctest"; }) {}; - "doctest_0_22_10" = callPackage + "doctest_0_23_0" = callPackage ({ mkDerivation, base, code-page, containers, deepseq, directory , exceptions, filepath, ghc, ghc-paths, hspec, hspec-core , hspec-discover, HUnit, mockery, process, QuickCheck, silently @@ -93503,8 +93586,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.22.10"; - sha256 = "0ylckg8mzfkv25a3yymfv8yal05ypr1qrx99qv4xakzpn8149m46"; + version = "0.23.0"; + sha256 = "1jh38pj6rbsli4ba6jvnrg9dm2di18i7g9706nnfm0xc9ckhfs90"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94411,18 +94494,20 @@ self: { "dotparse" = callPackage ({ mkDerivation, algebraic-graphs, base, bytestring, chart-svg - , containers, flatparse, numhask-space, optics-core, process-extras - , string-interpolate, template-haskell, text, these + , containers, doctest-parallel, flatparse, numhask-space + , optics-core, process-extras, string-interpolate, template-haskell + , text, these }: mkDerivation { pname = "dotparse"; - version = "0.1.0.0"; - sha256 = "06knlrrb2ma57d5rnv2xdqp7avdbcbnd5m6pk45953lmhz217ls6"; + version = "0.1.1.0"; + sha256 = "14829jdzb3vc3485y7hbri77giv2sbg8x4cyrc0pwk5cj8xb0yzf"; libraryHaskellDepends = [ algebraic-graphs base bytestring chart-svg containers flatparse numhask-space optics-core process-extras string-interpolate template-haskell text these ]; + testHaskellDepends = [ base doctest-parallel ]; description = "dot language parsing and printing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -95426,6 +95511,8 @@ self: { pname = "dsp"; version = "0.2.5.2"; sha256 = "0inar9c0n4x0li9c7krr17qv7zc49162wchhyn6ix7adni8j92z0"; + revision = "1"; + editedCabalFile = "06lrjxcsyviifpw398za544r5wqfjlx3h206g1lmjmcqj0ph1n5q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers random ]; @@ -95597,8 +95684,8 @@ self: { pname = "dual-game"; version = "0.1.0.1"; sha256 = "1w69d7d2xbpi82n41gq08qdmldh834ka7qwvy159vsac556wwcfg"; - revision = "8"; - editedCabalFile = "1c4m2nwmnrjs8rinfa9p9vynmdr56i5ggydgnjs3d8szpbbbbrml"; + revision = "9"; + editedCabalFile = "140svi4r35rji7br3bcrcb7rgwkbzvrsc2nx1xml17sf8d3clj4r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -95815,8 +95902,8 @@ self: { }: mkDerivation { pname = "dunai"; - version = "0.13.1"; - sha256 = "1hamj3yv6v0rdr06889iidhzpz6jbskq3bc5gbf45gzvq7bvcds7"; + version = "0.13.2"; + sha256 = "0x12hx51p5vfgscys40p8a9nnfj8d5rf5ynp436jzry6pzi0i6ab"; libraryHaskellDepends = [ base MonadRandom simple-affine-space transformers transformers-base ]; @@ -95847,8 +95934,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.13.1"; - sha256 = "0hm5c9n890cxnw0pp62vqlw7yqmrzy2xb0inhbzcjm49i5gacfdq"; + version = "0.13.2"; + sha256 = "0z9rgirz7las2qrvagiiihgz03ds7dgbbmwk32mkz4paz339lkbg"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -97788,6 +97875,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful_2_5_0_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , effectful-core, exceptions, lifted-base, primitive, process + , safe-exceptions, stm, strict-mutable-base, tasty, tasty-bench + , tasty-hunit, text, time, unix, unliftio + }: + mkDerivation { + pname = "effectful"; + version = "2.5.0.0"; + sha256 = "1fv228n3cvbqhbvdrnix2wqr96zzvgav1dp5rkynpm12jjwknqkp"; + libraryHaskellDepends = [ + async base bytestring directory effectful-core process stm + strict-mutable-base time unliftio + ]; + testHaskellDepends = [ + base containers effectful-core exceptions lifted-base primitive + safe-exceptions strict-mutable-base tasty tasty-hunit unliftio + ]; + benchmarkHaskellDepends = [ + async base tasty-bench text unix unliftio + ]; + description = "An easy to use, performant extensible effects library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-core" = callPackage ({ mkDerivation, base, containers, exceptions, monad-control , primitive, transformers-base, unliftio-core @@ -97804,6 +97917,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful-core_2_5_0_0" = callPackage + ({ mkDerivation, base, containers, deepseq, exceptions + , monad-control, primitive, strict-mutable-base, transformers-base + , unliftio-core + }: + mkDerivation { + pname = "effectful-core"; + version = "2.5.0.0"; + sha256 = "1fjk92pwpxapjkq8zzv36j071nq1g9lys78jwg8f4q68g3f7rlzr"; + libraryHaskellDepends = [ + base containers deepseq exceptions monad-control primitive + strict-mutable-base transformers-base unliftio-core + ]; + description = "An easy to use, performant extensible effects library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-plugin" = callPackage ({ mkDerivation, base, containers, effectful-core, ghc }: mkDerivation { @@ -97816,6 +97947,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful-plugin_1_1_0_4" = callPackage + ({ mkDerivation, base, containers, effectful-core, ghc }: + mkDerivation { + pname = "effectful-plugin"; + version = "1.1.0.4"; + sha256 = "0c401ni8ajig5da4dgkk2xbajbkzghrjll8ccfh7pbbiknf7si7j"; + libraryHaskellDepends = [ base containers effectful-core ghc ]; + testHaskellDepends = [ base effectful-core ]; + description = "A GHC plugin for improving disambiguation of effects"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-st" = callPackage ({ mkDerivation, base, effectful-core, primitive }: mkDerivation { @@ -97848,14 +97992,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "effectful-th_1_0_0_2" = callPackage + "effectful-th_1_0_0_3" = callPackage ({ mkDerivation, base, containers, effectful-core, exceptions , template-haskell, th-abstraction }: mkDerivation { pname = "effectful-th"; - version = "1.0.0.2"; - sha256 = "14zj43wc3lz7aac0qcyzkxw2fbpgvp8b7wgk035ipcj7cfl25bhk"; + version = "1.0.0.3"; + sha256 = "0dzjy054n4zcrnnnj50yxxqicv50mfmzhgcqzhz4n6ap8v88ykiv"; libraryHaskellDepends = [ base containers effectful-core exceptions template-haskell th-abstraction @@ -98831,6 +98975,8 @@ self: { pname = "eliminators"; version = "0.9.5"; sha256 = "17pl2mg9bpagzkw50mydls883bj4mm7glmgnm59r57prky9h55gs"; + revision = "1"; + editedCabalFile = "0dzyskd0av2rdq9bk0y0d2605a65p9xailbbchvmaqjvqf4cqvpm"; libraryHaskellDepends = [ base extra singleton-nats singletons-base template-haskell text th-abstraction th-desugar @@ -102035,6 +102181,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "esqueleto_3_5_13_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring + , conduit, containers, exceptions, hspec, hspec-core, monad-logger + , mtl, mysql, mysql-simple, persistent, persistent-mysql + , persistent-postgresql, persistent-sqlite, postgresql-simple + , QuickCheck, resourcet, tagged, template-haskell, text, time + , transformers, unliftio, unordered-containers + }: + mkDerivation { + pname = "esqueleto"; + version = "3.5.13.0"; + sha256 = "01sp5g61kk6k3fzzdb9sx4sf8iqhncv5sg3hiw8hjp7xv6wc7341"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + monad-logger persistent resourcet tagged template-haskell text time + transformers unliftio unordered-containers + ]; + testHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + exceptions hspec hspec-core monad-logger mtl mysql mysql-simple + persistent persistent-mysql persistent-postgresql persistent-sqlite + postgresql-simple QuickCheck resourcet tagged template-haskell text + time transformers unliftio unordered-containers + ]; + description = "Type-safe EDSL for SQL queries on persistent backends"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "esqueleto-compat" = callPackage ({ mkDerivation, base, conduit, esqueleto, hspec, persistent , resourcet, transformers @@ -104573,8 +104748,8 @@ self: { pname = "expiring-cache-map"; version = "0.0.6.1"; sha256 = "1fb47hsn06ybn2yzw7r6pjkmvvfpbdx7wjhbpxcywilbjyac4fqf"; - revision = "1"; - editedCabalFile = "1k5wqilafxp3ksqb7qy90cwipk0db568f15amn3mnf9krc1qjabg"; + revision = "2"; + editedCabalFile = "1lg38r5i6wdi39561g6kpdcdkhr34idkvh8n128gc7dz2a9irycl"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -105320,8 +105495,8 @@ self: { }: mkDerivation { pname = "extism-pdk"; - version = "1.1.0.0"; - sha256 = "0bnhi02f3m9shsn1x2vn7rpjaii72sb6lrsw9njzk743ap23d1kr"; + version = "1.2.0.0"; + sha256 = "1ph4c2l22mhdn8053shsh2spq5wdgvi7zw279ay9ffhhwkyan654"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105343,6 +105518,8 @@ self: { pname = "extra"; version = "1.7.16"; sha256 = "0w3wwwnf96ax70lrb0fkfich7b23kvk112j9rzr72b0bqd1ns315"; + revision = "1"; + editedCabalFile = "0xb2xd6qw664rz0d1pa7g4cd58ixqfhpxh7q6gz9lhc10afqw62g"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; @@ -105353,6 +105530,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "extra_1_8" = callPackage + ({ mkDerivation, base, clock, directory, filepath, process + , QuickCheck, quickcheck-instances, time, unix + }: + mkDerivation { + pname = "extra"; + version = "1.8"; + sha256 = "18c9ad7wjf6q4yp0sagxhwyjpm9frw9kk27ih2x0nmjhmrgcx91g"; + libraryHaskellDepends = [ + base clock directory filepath process time unix + ]; + testHaskellDepends = [ + base directory filepath QuickCheck quickcheck-instances unix + ]; + description = "Extra functions I use"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "extra-data-yj" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -105732,6 +105928,8 @@ self: { pname = "failure"; version = "0.2.0.3"; sha256 = "0jimc2x46zq7wnmzfbnqi67jl8yhbvr0fa65ljlc9p3fns9mca3p"; + revision = "1"; + editedCabalFile = "0lnvh6slp057kl0sjn14iab8y3cpic60lhbmn9502zryp7by23ky"; libraryHaskellDepends = [ base transformers ]; description = "A simple type class for success/failure computations. (deprecated)"; license = lib.licenses.bsd3; @@ -105828,8 +106026,8 @@ self: { }: mkDerivation { pname = "fakedata"; - version = "1.0.3"; - sha256 = "12sldxpn14zx5zwblw28k593rdqz50d246rz8j3zj41ljmnbwj4i"; + version = "1.0.5"; + sha256 = "179j2r6ws6ngmwsswkmpas4ij5jywlvhk0rhbk8rn3vxc3yj7gnr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson attoparsec base bytestring containers directory exceptions @@ -106191,8 +106389,8 @@ self: { }: mkDerivation { pname = "fast-logger"; - version = "3.2.3"; - sha256 = "0af4228rnv2g3fgw00vx85fh0ngi092bx54awx1cd1jjkmpdyn73"; + version = "3.2.4"; + sha256 = "1fxh94qk24c7mki0049zc0h5g0cyn78fp54bgxczqcba6lqknx9r"; libraryHaskellDepends = [ array auto-update base bytestring directory easy-file filepath stm text unix-compat unix-time @@ -108150,23 +108348,6 @@ self: { }) {}; "fgl" = callPackage - ({ mkDerivation, array, base, containers, deepseq, hspec - , microbench, QuickCheck, transformers - }: - mkDerivation { - pname = "fgl"; - version = "5.8.2.0"; - sha256 = "1dn3x3rmdlglg1kbvx7vndkm66lvvyd23awwd0qzplzi43vhrks4"; - libraryHaskellDepends = [ - array base containers deepseq transformers - ]; - testHaskellDepends = [ base containers hspec QuickCheck ]; - benchmarkHaskellDepends = [ base deepseq microbench ]; - description = "Martin Erwig's Functional Graph Library"; - license = lib.licenses.bsd3; - }) {}; - - "fgl_5_8_3_0" = callPackage ({ mkDerivation, array, base, containers, deepseq, hspec , microbench, QuickCheck, transformers }: @@ -108181,7 +108362,6 @@ self: { benchmarkHaskellDepends = [ base deepseq microbench ]; description = "Martin Erwig's Functional Graph Library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fgl-arbitrary" = callPackage @@ -112391,12 +112571,15 @@ self: { }) {}; "formatn" = callPackage - ({ mkDerivation, base, containers, QuickCheck, text }: + ({ mkDerivation, base, containers, doctest-parallel, QuickCheck + , text + }: mkDerivation { pname = "formatn"; - version = "0.3.0.1"; - sha256 = "1w1isqk9mxrzl0sfj10kqfr2z8wkxvx5dmacig4k415cbaf4dqs3"; - libraryHaskellDepends = [ base containers QuickCheck text ]; + version = "0.3.1.0"; + sha256 = "0xh78ckdsih2p984qr170f6l4yfz5fnq7xni6gjzapcilfxzvky9"; + libraryHaskellDepends = [ base containers text ]; + testHaskellDepends = [ base doctest-parallel QuickCheck ]; description = "Formatting of doubles"; license = lib.licenses.bsd3; }) {}; @@ -113325,14 +113508,15 @@ self: { , monad-validate, MonadRandom, mtl, nonempty-containers, openapi3 , path-pieces, persistent, persistent-postgresql, postgresql-simple , primitive, QuickCheck, resource-pool, resourcet, scientist - , semigroupoids, template-haskell, text, time, transformers - , transformers-base, typed-process, unliftio, unordered-containers - , vector, wai, wai-extra, yaml, yesod-core, yesod-test + , semigroupoids, servant-server, template-haskell, text, time + , transformers, transformers-base, typed-process, unliftio + , unordered-containers, vector, wai, wai-extra, yaml, yesod-core + , yesod-test }: mkDerivation { pname = "freckle-app"; - version = "1.20.2.1"; - sha256 = "09j74p9mxhxz689c9i46474d23hp5p1xmfz2l4pbfh8wfg91bb5a"; + version = "1.20.3.0"; + sha256 = "0if5ijphbin6ff0krfhy7bpjambw4zf8ccg459caiff3qc97rlcy"; libraryHaskellDepends = [ aeson annotated-exception autodocodec autodocodec-openapi3 base bcp47 Blammo Blammo-wai bugsnag bytestring case-insensitive cassava @@ -113346,15 +113530,16 @@ self: { monad-validate MonadRandom mtl nonempty-containers openapi3 path-pieces persistent persistent-postgresql postgresql-simple primitive QuickCheck resource-pool resourcet scientist - semigroupoids template-haskell text time transformers - transformers-base typed-process unliftio unordered-containers - vector wai wai-extra yaml yesod-core yesod-test + semigroupoids servant-server template-haskell text time + transformers transformers-base typed-process unliftio + unordered-containers vector wai wai-extra yaml yesod-core + yesod-test ]; testHaskellDepends = [ aeson annotated-exception async base Blammo bugsnag bytestring cassava conduit hs-opentelemetry-api hspec http-types HUnit - monad-validate nonempty-containers postgresql-simple QuickCheck - vector wai wai-extra + monad-validate nonempty-containers path-pieces persistent + postgresql-simple QuickCheck servant-server vector wai wai-extra ]; description = "Haskell application toolkit used at Freckle"; license = lib.licenses.mit; @@ -113563,8 +113748,8 @@ self: { }: mkDerivation { pname = "free-alacarte"; - version = "1.0.0.7"; - sha256 = "033h3ghq7ibq74har4mv4njpwl6c6gndibq1qhlgx3x82ymxkgpk"; + version = "1.0.0.8"; + sha256 = "1il7ihn81g2341bx07pjjmjzyrxl3n9n70bg6qdxdgjs0w9b6b78"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers hspec QuickCheck relude tasty tasty-hspec text time @@ -116051,8 +116236,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.25.22"; - sha256 = "12x8n953l5j3msh95vbf94yh5yfw9x80grms2r59i3k6vg32bx01"; + version = "0.25.23"; + sha256 = "1yd1j5qv4rfijjxv48m0qq7y9r0qn31zliafgbmqs2i9ik5gg6sz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116124,8 +116309,8 @@ self: { }: mkDerivation { pname = "futhark-server"; - version = "1.2.2.1"; - sha256 = "0g8n1gkl4y2a65z1idx58b1ls2g4jf0pwjhnc3w5wffq9mpwliaq"; + version = "1.2.3.0"; + sha256 = "12gih73pvy54k4fs7s690b40cfhrvgzahhw3n571pi73ia86mljb"; libraryHaskellDepends = [ base binary bytestring directory futhark-data mtl process temporary text @@ -118035,19 +118220,16 @@ self: { }) {}; "generic-data" = callPackage - ({ mkDerivation, ap-normalize, base, base-orphans, contravariant - , deepseq, generic-lens, ghc-boot-th, one-liner, show-combinators - , tasty, tasty-bench, tasty-hunit + ({ mkDerivation, ap-normalize, base, base-orphans, deepseq + , generic-lens, ghc-boot-th, one-liner, show-combinators, tasty + , tasty-bench, tasty-hunit }: mkDerivation { pname = "generic-data"; - version = "1.1.0.0"; - sha256 = "1jxwkc475v0h1i5g5zyjq0x66fqvixdc99a7m8w3cpxkk56vqb5i"; - revision = "2"; - editedCabalFile = "187qabhjmymg18i7424s90f7nwx17hlpcr5i53ximwyd9z6i9ify"; + version = "1.1.0.1"; + sha256 = "0cbng88jsx5f34jrhj2c83jg9r0d7q4xj6vb2as97mgrdmy054nk"; libraryHaskellDepends = [ - ap-normalize base base-orphans contravariant ghc-boot-th - show-combinators + ap-normalize base base-orphans ghc-boot-th show-combinators ]; testHaskellDepends = [ base generic-lens one-liner show-combinators tasty tasty-hunit @@ -121089,7 +121271,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib_9_8_2_20240223" = callPackage + "ghc-lib_9_8_3_20241022" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts @@ -121097,8 +121279,10 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.8.2.20240223"; - sha256 = "12lmk3ipd1pyiwzmnb0zgbw86yy7mhsy530dnackwidg3ww07nia"; + version = "9.8.3.20241022"; + sha256 = "0irdlkkb139spmggjam2n4ydcwkb1r8vsv29g5w9rxqd5rd66w1b"; + revision = "1"; + editedCabalFile = "0r1a022nf2kk9vk5ca7crx74fzi0vcd8r5c5ldarcvqjfhgayfvi"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -121121,6 +121305,8 @@ self: { pname = "ghc-lib"; version = "9.10.1.20240511"; sha256 = "1z8xpzkwp2abb8azhjsnmq0cyyvvc3xqm5dgs7vmrfj3yq72j6ys"; + revision = "1"; + editedCabalFile = "0zzp85lr6lps0w1ld535sc73nz4dmrk48rwvngzdwzb460lnqsiv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -121174,15 +121360,17 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser_9_8_2_20240223" = callPackage + "ghc-lib-parser_9_8_3_20241022" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.8.2.20240223"; - sha256 = "05k5grbh3s0ywm8y6cp9hqfj4bbq0nh1bx1ysgfv88df5hgg47r9"; + version = "9.8.3.20241022"; + sha256 = "0gnd9dvjbis9vdgjk671x9ys6b0af7399mim8gpi6dpa1nczgc7b"; + revision = "2"; + editedCabalFile = "0qbqx6qg8hab2il9idmxjfwhk7s86ffp24836irc85aazmpvzsxv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -121204,6 +121392,8 @@ self: { pname = "ghc-lib-parser"; version = "9.10.1.20240511"; sha256 = "0fgissqfbgx5ra6gvfywxn76q16v5i97riaxqs1l9pa3zrfdzl9p"; + revision = "1"; + editedCabalFile = "0lsjzmdyqbganrq492vwwkx5j05p34vwn4bjkrd5zjww17fazfcj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -121998,8 +122188,8 @@ self: { ({ mkDerivation, base, containers, ghc, transformers }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.11.0.0"; - sha256 = "0k0hr9l3w3xf60var20by5xp0wqfcwv8x4lfcag94f9bn60cnvra"; + version = "0.12.0.0"; + sha256 = "0gl5zhfvvkqa36ccl5hxjrw6pgpl1giwa1ysq4kbw41df8cwcxxl"; libraryHaskellDepends = [ base containers ghc transformers ]; description = "An API for type-checker plugins"; license = lib.licenses.bsd3; @@ -125411,8 +125601,8 @@ self: { pname = "github"; version = "0.29"; sha256 = "1hki9lvf5vcq980ky98vwc7rh86rgf3z8pvqfgpb6jinc7jylcpx"; - revision = "5"; - editedCabalFile = "094n02zbpvy3fpc1rss88ja7gq40ds8dp990bwsw73wrpgip67zg"; + revision = "6"; + editedCabalFile = "0ylwq4jzsng513pi98b3hxnn9lbjvjv5sgq1r7kfbd8nxgdcrbmw"; libraryHaskellDepends = [ aeson base base-compat base16-bytestring binary binary-instances bytestring containers cryptohash-sha1 deepseq deepseq-generics @@ -129995,30 +130185,6 @@ self: { }) {}; "goldplate" = callPackage - ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring, Diff - , directory, filepath, Glob, optparse-applicative, process - , regex-pcre-builtin, text, unordered-containers - }: - mkDerivation { - pname = "goldplate"; - version = "0.2.1.1"; - sha256 = "1cisak5ng6v0iq24djyg4jp87diay02m0k2saac49saxmk29jsr6"; - revision = "6"; - editedCabalFile = "1572x5xh8qja14qfv4whlj7zl7gwp5cyhmzdnbi44fnv4hr27l9d"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson aeson-pretty async base bytestring Diff directory filepath - Glob optparse-applicative process regex-pcre-builtin text - unordered-containers - ]; - testHaskellDepends = [ base process ]; - description = "A lightweight golden test runner"; - license = lib.licenses.asl20; - mainProgram = "goldplate"; - }) {}; - - "goldplate_0_2_2_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring, Diff , directory, filepath, Glob, optparse-applicative, process , regex-pcre-builtin, text, unordered-containers @@ -130038,7 +130204,6 @@ self: { testHaskellDepends = [ aeson base bytestring process ]; description = "A lightweight golden test runner"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; mainProgram = "goldplate"; }) {}; @@ -131802,8 +131967,8 @@ self: { }: mkDerivation { pname = "graphql-spice"; - version = "1.0.3.0"; - sha256 = "1jzrhbpxswi4znalwswjh43pwcysw7nzj6d1xa446xc3w8azs3ic"; + version = "1.0.4.0"; + sha256 = "182kjz5zky5z1wdg92823hhyprc13yfai0jlg6lx1cih83rwz3h5"; libraryHaskellDepends = [ aeson base conduit containers exceptions graphql hspec-expectations megaparsec scientific template-haskell text time transformers @@ -131815,6 +131980,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "GraphQL with batteries"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "graphql-utils" = callPackage @@ -134088,8 +134255,10 @@ self: { }: mkDerivation { pname = "h-raylib"; - version = "5.5.0.0"; - sha256 = "063sjmk48nrp27qajipcc2br0nfxa6206gybdpxngbs66vz4kgc1"; + version = "5.5.2.0"; + sha256 = "19y2vgy0s4mw47ip3jb78n2gjab2qyp6vyn5fra293srsp25qn5j"; + revision = "4"; + editedCabalFile = "17jcpz9vywj1kjg5llxb2qn0zx3cny4mh8xr478bd6l2m93ywm3b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -136486,8 +136655,8 @@ self: { pname = "hakyll"; version = "4.16.2.2"; sha256 = "0hnqf4xxgf1qgk262qvq0b0mx51jfv67y2kn6ca8jsp43dxy9941"; - revision = "2"; - editedCabalFile = "15457i7cjr2khv3ipis013cm11hinxr5r0s32bgmmbbdqi1g1y2s"; + revision = "3"; + editedCabalFile = "15q1wkjisjgvjn3mq6bj1rfrdsa50r0c37c4g75g905g7zrbmk51"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -136513,6 +136682,47 @@ self: { maintainers = [ lib.maintainers.erictapen ]; }) {inherit (pkgs) util-linux;}; + "hakyll_4_16_3_0" = callPackage + ({ mkDerivation, aeson, base, binary, blaze-html, blaze-markup + , bytestring, containers, data-default, deepseq, directory + , file-embed, filepath, fsnotify, hashable, http-conduit + , http-types, lrucache, mtl, network-uri, optparse-applicative + , pandoc, parsec, process, QuickCheck, random, regex-tdfa + , resourcet, scientific, tagsoup, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, text, time + , time-locale-compat, unordered-containers, util-linux, vector, wai + , wai-app-static, warp, yaml + }: + mkDerivation { + pname = "hakyll"; + version = "4.16.3.0"; + sha256 = "1m6kr9ph3ja3y2b6j1i2rk349v8ikqwjjj1z0my6p5ld77abz8qk"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base binary blaze-html blaze-markup bytestring containers + data-default deepseq directory file-embed filepath fsnotify + hashable http-conduit http-types lrucache mtl network-uri + optparse-applicative pandoc parsec process random regex-tdfa + resourcet scientific tagsoup template-haskell text time + time-locale-compat unordered-containers vector wai wai-app-static + warp yaml + ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + aeson base bytestring containers filepath pandoc QuickCheck tagsoup + tasty tasty-golden tasty-hunit tasty-quickcheck text + unordered-containers yaml + ]; + testToolDepends = [ util-linux ]; + description = "A static website compiler library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hakyll-init"; + maintainers = [ lib.maintainers.erictapen ]; + }) {inherit (pkgs) util-linux;}; + "hakyll-R" = callPackage ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process }: @@ -138666,13 +138876,13 @@ self: { mainProgram = "happy"; }) {}; - "happy_2_0_2" = callPackage + "happy_2_1_1" = callPackage ({ mkDerivation, array, base, containers, happy-lib, mtl, process }: mkDerivation { pname = "happy"; - version = "2.0.2"; - sha256 = "0gp8fwn0k4vdz4g3s00jrh0n4g1arvpp6ps4f5xljqd1x1sjxxgp"; + version = "2.1.1"; + sha256 = "05vnv5dila8scra69vqn7gpxwn667nhsv9jx79pnx30444d8p8px"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers happy-lib mtl ]; @@ -138740,8 +138950,8 @@ self: { ({ mkDerivation, array, base, containers, mtl, transformers }: mkDerivation { pname = "happy-lib"; - version = "2.0.2"; - sha256 = "0ki1yn2m7fadsj1vjfskc2py7s6sgkhhzbs4l3ykbmgxkskvza29"; + version = "2.1.1"; + sha256 = "04sq8kzcgp6iv117s8z0469lg5g0qhc1s3grszksv781w71ljpp7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers mtl transformers ]; doHaddock = false; @@ -139079,8 +139289,8 @@ self: { }: mkDerivation { pname = "harpie"; - version = "0.1.0.0"; - sha256 = "11jdq7d1zx17qa2i1nvg6iysm56plikwk5bkq32xjbjq28yb0jhs"; + version = "0.1.1.0"; + sha256 = "18f49jjkf3zf20bmd9rfan768wlkaggikr1r6px354mfkfs8nb36"; libraryHaskellDepends = [ adjunctions base distributive first-class-families prettyprinter QuickCheck quickcheck-instances random vector vector-algorithms @@ -139092,6 +139302,23 @@ self: { broken = true; }) {}; + "harpie-numhask" = callPackage + ({ mkDerivation, adjunctions, base, doctest-parallel + , first-class-families, harpie, numhask, prettyprinter + }: + mkDerivation { + pname = "harpie-numhask"; + version = "0.1.0.1"; + sha256 = "1688gkwabg3ijnqq65j3nwrwdx2r6qb38dpchkm6wckycpy7i8f2"; + libraryHaskellDepends = [ + adjunctions base first-class-families harpie numhask + ]; + testHaskellDepends = [ base doctest-parallel prettyprinter ]; + description = "numhask shim for harpie"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "harpy" = callPackage ({ mkDerivation, array, base, containers, disassembler, mtl, parsec , pretty, template-haskell @@ -139498,8 +139725,8 @@ self: { }: mkDerivation { pname = "hash-cons"; - version = "0.1.0.0"; - sha256 = "04rdgc8lyf2byvjx5p3g06vcwjc6g0bh9qgk08c304p4q6rrijv4"; + version = "0.2.0.0"; + sha256 = "0dyg0xx8bxmh97p58bd8znlxjbld54af7q6blrsmaqqfvv4amxhn"; libraryHaskellDepends = [ base hashable ]; testHaskellDepends = [ async base hashable tasty tasty-hunit tasty-quickcheck @@ -140927,28 +141154,6 @@ self: { }) {}; "haskell-gi" = callPackage - ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal - , cabal-doctest, containers, directory, doctest, filepath, glib - , gobject-introspection, haskell-gi-base, mtl, pretty-show, process - , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit - }: - mkDerivation { - pname = "haskell-gi"; - version = "0.26.11"; - sha256 = "0raf97k9w0794i1viv0xqcpwp6ahpqdja11a4d5qk80r811rc5iw"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - ansi-terminal attoparsec base bytestring Cabal containers directory - filepath haskell-gi-base mtl pretty-show process regex-tdfa safe - text transformers xdg-basedir xml-conduit - ]; - libraryPkgconfigDepends = [ glib gobject-introspection ]; - testHaskellDepends = [ base doctest process ]; - description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; - - "haskell-gi_0_26_12" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal , cabal-doctest, containers, directory, doctest, filepath, glib , gobject-introspection, haskell-gi-base, mtl, pretty-show, process @@ -140968,7 +141173,6 @@ self: { testHaskellDepends = [ base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; "haskell-gi-base" = callPackage @@ -143512,8 +143716,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "1.5.12"; - sha256 = "19v7bwy3c3xwvsgxnch8p68fw67h0yy89sppjwhbndk2f5avshgq"; + version = "1.5.13"; + sha256 = "1bkwv3f494kqz9a7mmry831mfp3dkhz1zv209lgnl5k8kgf6a22z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144443,8 +144647,8 @@ self: { }: mkDerivation { pname = "haspara"; - version = "0.0.0.8"; - sha256 = "1yvzzkv0hbki5a5rp6md2kllrslafb26lkz4i9hfydllxqgrm0is"; + version = "0.0.0.10"; + sha256 = "0b80519m7g2iww89wj1vs6hz9sfkv8iv904si9wl83f0adh7r99w"; libraryHaskellDepends = [ aeson base containers data-default exceptions hashable megaparsec mtl refined safe-decimal scientific template-haskell text time @@ -145301,8 +145505,8 @@ self: { }: mkDerivation { pname = "hasqlator-mysql"; - version = "0.2.0"; - sha256 = "1dl72axgr6jaz9m243krys9x2svsrc7rnanc4pfvjx9w5648j3mq"; + version = "0.2.1"; + sha256 = "02hkkv2f0zck15dfmdrfr6vw9ma4xifv4jmz5crkyvmr68jw6n4d"; libraryHaskellDepends = [ aeson base binary bytestring containers dlist io-streams megaparsec mtl mysql-haskell optics-core pretty-simple prettyprinter @@ -148143,19 +148347,15 @@ self: { }) {}; "heftia" = callPackage - ({ mkDerivation, base, constraints, data-effects, extensible, free - , kan-extensions, membership, mtl, singletons-base, singletons-th - , tasty, tasty-discover, tasty-hunit, transformers - , transformers-base, unliftio + ({ mkDerivation, base, data-effects, freer-simple, mtl, tasty + , tasty-discover, tasty-hunit, unliftio }: mkDerivation { pname = "heftia"; - version = "0.3.1.0"; - sha256 = "09kvmpfkb88mgh3vvx78dn719ipifknav2b602l65ah7bwwn962n"; + version = "0.4.0.0"; + sha256 = "19p1l14cg6iqf5bk7pvllpd8z4qhzbpfvfzkvr3rgl7zsz7f28ih"; libraryHaskellDepends = [ - base constraints data-effects extensible free kan-extensions - membership mtl singletons-base singletons-th transformers - transformers-base unliftio + base data-effects freer-simple mtl unliftio ]; testHaskellDepends = [ base tasty tasty-hunit ]; testToolDepends = [ tasty-discover ]; @@ -148165,34 +148365,41 @@ self: { }) {}; "heftia-effects" = callPackage - ({ mkDerivation, base, containers, data-effects, extensible, extra - , free, ghc-typelits-knownnat, heftia, hspec, mtl, tasty - , tasty-discover, tasty-hspec, text, time, transformers - , unbounded-delays, unliftio + ({ mkDerivation, base, containers, data-effects, eff, effectful + , eveff, extra, freer-simple, fused-effects, ghc-typelits-knownnat + , heftia, hspec, logict, mpeff, mtl, polysemy, tasty, tasty-bench + , tasty-discover, tasty-hspec, text, time, unbounded-delays + , unliftio }: mkDerivation { pname = "heftia-effects"; - version = "0.3.1.0"; - sha256 = "1kdhhzw3kcpkjl5f4li6w3kygppj57bpscgdcxygy34cflgy4pdc"; + version = "0.4.0.1"; + sha256 = "05zsgfx2kmhgga4zczz2d9k45f1dkk12qvx5cwf2cx9kx44zi0ba"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers data-effects extensible extra free - ghc-typelits-knownnat heftia mtl time transformers unbounded-delays - unliftio + base containers data-effects ghc-typelits-knownnat heftia time + unbounded-delays unliftio ]; executableHaskellDepends = [ - base data-effects extra ghc-typelits-knownnat heftia text time + base containers data-effects extra ghc-typelits-knownnat heftia + text time unbounded-delays unliftio ]; testHaskellDepends = [ - base data-effects ghc-typelits-knownnat heftia hspec tasty - tasty-hspec unliftio + base containers data-effects ghc-typelits-knownnat heftia hspec + tasty tasty-hspec time unbounded-delays unliftio ]; testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base containers data-effects eff effectful eveff freer-simple + fused-effects ghc-typelits-knownnat heftia logict mpeff mtl + polysemy tasty-bench time unbounded-delays unliftio + ]; description = "higher-order effects done right"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; - }) {}; + broken = true; + }) {eff = null;}; "hegg" = callPackage ({ mkDerivation, base, containers, deepseq, tasty, tasty-bench @@ -148404,6 +148611,8 @@ self: { pname = "helf"; version = "1.0.20240318"; sha256 = "0rmjfbai6k6kzynzm5skz4ska0awb012m4ykqhh47sd28vs9spk1"; + revision = "1"; + editedCabalFile = "151jk61357vydckahj0rhphph0yn8qm243p3rzvqi27w65969lyy"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -150972,6 +151181,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "hi-file-parser_0_1_7_0" = callPackage + ({ mkDerivation, base, binary, bytestring, hspec, mtl, rio, text + , vector + }: + mkDerivation { + pname = "hi-file-parser"; + version = "0.1.7.0"; + sha256 = "1rss6j85kj33jfp14qlafqlcbld6ibhhki2rjkdsz8ilchq32hqq"; + libraryHaskellDepends = [ + base binary bytestring mtl rio text vector + ]; + testHaskellDepends = [ + base binary bytestring hspec mtl rio text vector + ]; + description = "Parser for GHC's hi files"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hi3status" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, dbus, dyre , network, prefix-units, process, regex-pcre-builtin, text, time @@ -151126,8 +151354,8 @@ self: { pname = "hie-bios"; version = "0.14.0"; sha256 = "1caszgj3x3l13q6w26snx49yqyzjfgiik4403gl3mfalkrgbvk2g"; - revision = "1"; - editedCabalFile = "1g9gagj12jpazrq9zwq8vwv5saf23gqjgcvzcg81q7s4bn115l72"; + revision = "2"; + editedCabalFile = "0an5jy6hqa7v7r4s2lgzcb5sl7jlx5slncf73s4vyplx7qskjcah"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155572,8 +155800,8 @@ self: { }: mkDerivation { pname = "hmp3-ng"; - version = "2.14.3"; - sha256 = "02bcxzpmjm6kqcvx7036055chbyfyhi6pl4xrrxwwmkp85fh0apb"; + version = "2.15.0"; + sha256 = "12h06yzp3jiswfy95bryppc352wfkn666c17bd4g00v7k3qnda6p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -155923,8 +156151,8 @@ self: { }: mkDerivation { pname = "hnix-store-nar"; - version = "0.1.0.0"; - sha256 = "1kr8hmycb29sv646a3f3lpl0zzng9dg3nix7n0yfrfapycqd04cg"; + version = "0.1.1.0"; + sha256 = "16g03bvgdmpmzvq1acsayfq4b9xh7cgf41xn9bqjl0w72var67qp"; libraryHaskellDepends = [ algebraic-graphs base bytestring case-insensitive cereal containers directory filepath lifted-base monad-control mtl text unix @@ -158192,6 +158420,26 @@ self: { mainProgram = "hp2pretty"; }) {}; + "hp2pretty_0_10_1" = callPackage + ({ mkDerivation, array, attoparsec, base, containers, filepath + , floatshow, mtl, optparse-applicative, semigroups, text + }: + mkDerivation { + pname = "hp2pretty"; + version = "0.10.1"; + sha256 = "1wx3vxrx8qp85wfhpvv5vjxd45hmgy8m807m62b32ydxpw8mm89k"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array attoparsec base containers filepath floatshow mtl + optparse-applicative semigroups text + ]; + description = "generate pretty graphs from heap profiles"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hp2pretty"; + }) {}; + "hpack" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, crypton, deepseq, directory, filepath, Glob, hspec @@ -160556,8 +160804,8 @@ self: { pname = "hs-php-session"; version = "0.0.9.3"; sha256 = "1xwdikiqy2dxyzr6wx51wy51vifsvshblx7kkhfqd7izjf87ww8f"; - revision = "1"; - editedCabalFile = "1dj1r73v31bd2091pqvrg7vdc3lgjh373ynxn49dlhqmyw45kiw8"; + revision = "2"; + editedCabalFile = "00c8grlybwb22r5rqw82lmplgr3njkpij8ns1rx0caz2g6xr91xb"; libraryHaskellDepends = [ base bytestring ]; description = "PHP session and values serialization"; license = lib.licenses.bsd3; @@ -160837,6 +161085,21 @@ self: { broken = true; }) {}; + "hs-tango" = callPackage + ({ mkDerivation, base, derive-storable, tango, text, unliftio }: + mkDerivation { + pname = "hs-tango"; + version = "1.0.0"; + sha256 = "0ah4xp3vrarq8kpvgwk78hck8bj9w0fk3d6m5vi28cy8dq62qb5c"; + libraryHaskellDepends = [ base derive-storable text unliftio ]; + libraryPkgconfigDepends = [ tango ]; + benchmarkHaskellDepends = [ base text ]; + description = "Bindings to the Tango Controls system"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {inherit (pkgs) tango;}; + "hs-term-emulator" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring , containers, criterion, hspec, hspec-discover, lens, text, vector @@ -161395,8 +161658,8 @@ self: { pname = "hsc2hs"; version = "0.68.10"; sha256 = "0xpgbi6pssnizazz54583c50cz4axq3h78g03q4sfb7yi3bk8kkg"; - revision = "2"; - editedCabalFile = "099303623kck9pv6x0q2dzvwb3w39v5dazn3wryafcnwc1n8prv0"; + revision = "3"; + editedCabalFile = "0ndpgzmq2h2kv7xr9iaf957jnnykbjpd6vlii0n2rkahfckjaqr7"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -163051,18 +163314,6 @@ self: { }) {}; "hslua-list" = callPackage - ({ mkDerivation, base, bytestring, hslua-core, tasty, tasty-lua }: - mkDerivation { - pname = "hslua-list"; - version = "1.1.3"; - sha256 = "1ipmf3rpc3ndc23zjmyjmy9lx0q53pm6bjwsgidbqxi4rxsbddqw"; - libraryHaskellDepends = [ base bytestring hslua-core ]; - testHaskellDepends = [ base hslua-core tasty tasty-lua ]; - description = "Opinionated, but extensible Lua list type"; - license = lib.licenses.mit; - }) {}; - - "hslua-list_1_1_4" = callPackage ({ mkDerivation, base, bytestring, hslua-core, tasty, tasty-lua }: mkDerivation { pname = "hslua-list"; @@ -163072,7 +163323,6 @@ self: { testHaskellDepends = [ base hslua-core tasty tasty-lua ]; description = "Opinionated, but extensible Lua list type"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hslua-marshalling" = callPackage @@ -165208,10 +165458,8 @@ self: { }: mkDerivation { pname = "hstar"; - version = "0.1.0.6"; - sha256 = "0fcb37yi81059r2nqmq1809q5mdx8q2fyvs7b9fsj3j2fqmgnai6"; - revision = "2"; - editedCabalFile = "0ncj58a8rkwkwlcv50q5i6c9szss0kp0gbx8z38ycx1fhniig5qv"; + version = "0.1.0.7"; + sha256 = "00y5napbsbxdi3yjl9sj23zncqmxhnvdjppc2pwzj53xynpa4x94"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -167554,6 +167802,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "http-semantics_0_3_0" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive + , http-types, network, network-byte-order, time-manager + , utf8-string + }: + mkDerivation { + pname = "http-semantics"; + version = "0.3.0"; + sha256 = "0kviffsmvggzpbwxnqxshjq3w3yz5v367l5fywq9zcmzrc5ykklw"; + libraryHaskellDepends = [ + array base bytestring case-insensitive http-types network + network-byte-order time-manager utf8-string + ]; + description = "HTTP senmatics libarry"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "http-server" = callPackage ({ mkDerivation, base, HTTP, mime, network, network-uri, text, unix , url, utf8-string @@ -167707,41 +167973,6 @@ self: { broken = true; }) {}; - "http2_3_0_3" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, async, base - , base16-bytestring, bytestring, case-insensitive, containers - , cryptonite, directory, filepath, gauge, Glob, heaps, hspec - , hspec-discover, http-types, mwc-random, network - , network-byte-order, network-run, psqueues, stm, text - , time-manager, typed-process, unix-time, unordered-containers - , vector - }: - mkDerivation { - pname = "http2"; - version = "3.0.3"; - sha256 = "1kv99i3pnnx31xndlkaczrpd2j5mvzbqlfz1kaw6cwlwkdnl5bhv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array async base bytestring case-insensitive containers http-types - network network-byte-order psqueues stm time-manager unix-time - ]; - testHaskellDepends = [ - aeson aeson-pretty async base base16-bytestring bytestring - cryptonite directory filepath Glob hspec http-types network - network-byte-order network-run text typed-process - unordered-containers vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - array base bytestring case-insensitive containers gauge heaps - mwc-random network-byte-order psqueues stm - ]; - description = "HTTP/2 library"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "http2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, bytestring, case-insensitive, containers @@ -167927,19 +168158,19 @@ self: { "http2-tls" = callPackage ({ mkDerivation, base, bytestring, crypton-x509-store , crypton-x509-validation, data-default-class, http2, network - , network-control, network-run, recv, time-manager, tls, unliftio + , network-control, network-run, recv, time-manager, tls , utf8-string }: mkDerivation { pname = "http2-tls"; - version = "0.4.2"; - sha256 = "0fqdad7lrw7m942xl3k0yipm2qr48j3qd14a9a6m87dv2rypsqg4"; + version = "0.4.3"; + sha256 = "0pfjybiqiqafpbm9cr8dx4b2914l0n62xd36aw5jm8d9x8xsqdzy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring crypton-x509-store crypton-x509-validation data-default-class http2 network network-control network-run recv - time-manager tls unliftio utf8-string + time-manager tls utf8-string ]; description = "Library for HTTP/2 over TLS"; license = lib.licenses.bsd3; @@ -169603,8 +169834,8 @@ self: { }: mkDerivation { pname = "hw-kafka-avro"; - version = "6.0.1"; - sha256 = "1910yzn569x9iicd8c8ykkq3p5vz3py6d4j0pvwqy1h07xp528sk"; + version = "6.0.2"; + sha256 = "13lrmpglh31srd74a1ch68g723x08wns9sapmlckm1bzs6jj7s06"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169794,27 +170025,27 @@ self: { "hw-polysemy" = callPackage ({ mkDerivation, aeson, aeson-pretty, amazonka-s3, async, base , binary, bytestring, contravariant, Diff, directory, exceptions - , filepath, generic-lens, ghc-prim, http-conduit, lens, mtl - , network, polysemy, polysemy-log, polysemy-plugin, polysemy-time - , prettyprinter, process, resourcet, stm, tasty, tasty-discover - , tasty-hedgehog, temporary, testcontainers, text, time - , transformers, ulid, unliftio, yaml + , filepath, generic-lens, ghc-prim, http-conduit, hw-prelude, lens + , mtl, network, polysemy, polysemy-log, polysemy-plugin + , polysemy-time, prettyprinter, process, resourcet, stm, tasty + , tasty-discover, tasty-hedgehog, temporary, testcontainers, text + , time, transformers, ulid, unliftio, yaml }: mkDerivation { pname = "hw-polysemy"; - version = "0.2.14.11"; - sha256 = "1a71d98arml7qbq1374b4shkxv366f5w0agg4k6c89605h2zmfwl"; + version = "0.3.0.0"; + sha256 = "16cgg0z13f46hqp0abbv70pk6mw1lhckf2kf0hz994mjbprxrp2a"; libraryHaskellDepends = [ aeson aeson-pretty async base binary bytestring contravariant Diff directory exceptions filepath generic-lens ghc-prim http-conduit - lens mtl network polysemy polysemy-log polysemy-plugin + hw-prelude lens mtl network polysemy polysemy-log polysemy-plugin polysemy-time prettyprinter process resourcet stm temporary testcontainers text time transformers ulid unliftio yaml ]; testHaskellDepends = [ - amazonka-s3 base filepath generic-lens lens polysemy polysemy-log - polysemy-plugin tasty tasty-discover tasty-hedgehog testcontainers - text + amazonka-s3 base filepath generic-lens hw-prelude lens polysemy + polysemy-log polysemy-plugin tasty tasty-discover tasty-hedgehog + testcontainers text ]; testToolDepends = [ tasty-discover ]; doHaddock = false; @@ -169823,6 +170054,22 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "hw-prelude" = callPackage + ({ mkDerivation, async, base, bytestring, contravariant, directory + , filepath, network, process, resourcet, text, unliftio + }: + mkDerivation { + pname = "hw-prelude"; + version = "0.0.0.1"; + sha256 = "13zi55k9by4ysf0r48a7bhh6sb5qri39rqv5c33d4a9aw4jp5jyj"; + libraryHaskellDepends = [ + async base bytestring contravariant directory filepath network + process resourcet text unliftio + ]; + description = "Opinionated prelude library"; + license = lib.licenses.asl20; + }) {}; + "hw-prim" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, directory , doctest, doctest-discover, exceptions, ghc-prim, hedgehog, hspec @@ -171746,6 +171993,8 @@ self: { pname = "iCalendar"; version = "0.4.1.0"; sha256 = "1nh2gdmm1kd8dlflxwzdqg9xdylqblb7xhnhpl143j1wfcnd1cn4"; + revision = "1"; + editedCabalFile = "037il8bdhxbbpq5p7lpvjyvlrnx24km9lib9kz6q70p8m8mi43xn"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive containers data-default mime mtl network-uri old-locale parsec text time @@ -172468,6 +172717,8 @@ self: { doHaddock = false; description = "Branch on whether a constraint is satisfied"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ifcxt" = callPackage @@ -173987,14 +174238,16 @@ self: { license = "BSD-2-Clause-Patent"; }) {}; - "incipit-base_0_6_0_0" = callPackage + "incipit-base_0_6_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, data-default, stm , text }: mkDerivation { pname = "incipit-base"; - version = "0.6.0.0"; - sha256 = "15mmnixl4ny32h5aflqcq8kv37zhddhqwixa53mkz6ksrrdkpsxc"; + version = "0.6.1.0"; + sha256 = "1vlvwhgn4wfb6gaw1rld1qa1b54dvsymri0mf9x737faah0arhpy"; + revision = "1"; + editedCabalFile = "0gg499hfbi7fs7pffh00md4wdz2bcpm3wg2cqrb3kyr16y6nri1j"; libraryHaskellDepends = [ base bytestring containers data-default stm text ]; @@ -174016,12 +174269,12 @@ self: { license = "BSD-2-Clause-Patent"; }) {}; - "incipit-core_0_6_0_0" = callPackage + "incipit-core_0_6_1_0" = callPackage ({ mkDerivation, base, incipit-base, polysemy }: mkDerivation { pname = "incipit-core"; - version = "0.6.0.0"; - sha256 = "103fxzx6riyx5scfw340gj5dldxia7zw1i0xk5bkfbn1p5fw3sf4"; + version = "0.6.1.0"; + sha256 = "19m4pvrv6fyxj7ilns3ipfjhibmhgcrjz376djadbqb8fzxba2xb"; libraryHaskellDepends = [ base incipit-base polysemy ]; description = "A Prelude for Polysemy"; license = "BSD-2-Clause-Patent"; @@ -175423,8 +175676,8 @@ self: { pname = "inspection-testing"; version = "0.5.0.3"; sha256 = "1kh6lrcdyfnj0c8fqrllb21hfmnlsrllw6jkkg4hya0f9lqf4mgi"; - revision = "2"; - editedCabalFile = "01qs82sldkjvyjkdf2r96g4n480d2dwrncrlzl6k49b4py9hfdll"; + revision = "3"; + editedCabalFile = "1b66i5h8vbj3d3dn99wy6sffppfz8iywpwwdivxnxvn645crywa8"; libraryHaskellDepends = [ base containers ghc mtl template-haskell transformers ]; @@ -177032,6 +177285,18 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "io-embed" = callPackage + ({ mkDerivation, base, bytestring, hspec, template-haskell }: + mkDerivation { + pname = "io-embed"; + version = "0.1.0.1"; + sha256 = "0k50rkvak2647w43k083ib1yr845hmlh9wppgjg0fdyvqzxk45vb"; + libraryHaskellDepends = [ base bytestring hspec template-haskell ]; + testHaskellDepends = [ base bytestring hspec template-haskell ]; + description = "Use Template Haskell to embed the result of an IO computation"; + license = lib.licenses.bsd3; + }) {}; + "io-machine" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -177617,6 +177882,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "iproute_1_7_15" = callPackage + ({ mkDerivation, appar, base, byteorder, bytestring, containers + , hspec, hspec-discover, network, QuickCheck, safe + }: + mkDerivation { + pname = "iproute"; + version = "1.7.15"; + sha256 = "19abgdk9pk6n8qmvfcpqp282dgbn1mxmg5fsla4xryg6w2kk38qq"; + libraryHaskellDepends = [ + appar base byteorder bytestring containers network + ]; + testHaskellDepends = [ + appar base byteorder bytestring containers hspec network QuickCheck + safe + ]; + testToolDepends = [ hspec-discover ]; + description = "IP Routing Table"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "iptables-helpers" = callPackage ({ mkDerivation, base, containers, mtl, parsec, QuickCheck, safe , syb, utf8-string @@ -179291,8 +179577,10 @@ self: { }: mkDerivation { pname = "jacinda"; - version = "3.1.1.1"; - sha256 = "0jbssi0xq7y153avnd7c9qwnlnaiqdn7kznipi9c03rhax3yxdl1"; + version = "3.2.0.0"; + sha256 = "0vm55xalnlj7kkpc0n2hdzs5i5rizbig4bi2r77h1b5d9yz0iwjw"; + revision = "2"; + editedCabalFile = "0qf5zi8k7vlkli1d51mhhc9lbh39xd4gvrhcpar792npdi8jwx1c"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -180982,6 +181270,17 @@ self: { ]; }) {}; + "jsaddle-wasm" = callPackage + ({ mkDerivation, base, jsaddle }: + mkDerivation { + pname = "jsaddle-wasm"; + version = "0.0.0.0"; + sha256 = "03n1541sajbms1pkad6jajxfddx6xm5py4b7j1v77kafxi61dlxw"; + libraryHaskellDepends = [ base jsaddle ]; + description = "Run JSaddle @JSM@ with the GHC WASM backend"; + license = lib.licenses.cc0; + }) {}; + "jsaddle-webkit2gtk" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, gi-gio , gi-glib, gi-gtk, gi-javascriptcore, gi-webkit2, haskell-gi-base @@ -182426,8 +182725,8 @@ self: { }: mkDerivation { pname = "jsonrpc-tinyclient"; - version = "1.0.0.0"; - sha256 = "02xhijk3rk4c9yqh1ghs8gvi1r7fwbxba0h21nb23545wflg0bz9"; + version = "1.0.1.0"; + sha256 = "1rhfhyjzfazwvzw7xf3f5xccnd7p4wx9n9avbbrjwj2bzvlfn9b8"; libraryHaskellDepends = [ aeson base bytestring exceptions http-client http-client-tls mtl random text websockets @@ -184972,6 +185271,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "keycode_0_2_3" = callPackage + ({ mkDerivation, base, containers, ghc-prim, template-haskell }: + mkDerivation { + pname = "keycode"; + version = "0.2.3"; + sha256 = "1zq02yd7ldbyk7zpgq9bj37y52ckzyyrad2yi48amh7dzym1sbj2"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + description = "Maps web browser keycodes to their corresponding keyboard keys"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "keyed" = callPackage ({ mkDerivation, base, containers, vector }: mkDerivation { @@ -187854,8 +188167,8 @@ self: { }: mkDerivation { pname = "language-c"; - version = "0.9.3"; - sha256 = "0lz2djw7zs8wnp23amqqxdyin3jgbjfh2dr2sr1v0kqpqav3yw81"; + version = "0.9.4"; + sha256 = "0cv2hqg4miajspwndn15s37nkra27bffqm4vv2gkk79nr86k9v31"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath mtl pretty process @@ -189318,6 +189631,7 @@ self: { ]; description = "Scalable anonymous records"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "large-anon-testsuite-fourmolu-preprocessor"; }) {}; @@ -189344,30 +189658,32 @@ self: { "large-hashable" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, byteable, bytes - , bytestring, cereal, containers, cryptohash, deepseq, hashable - , HTF, QuickCheck, safecopy, scientific, strict, template-haskell - , text, time, transformers, unordered-containers, utf8-light - , vector, void + , bytestring, cereal, containers, cpphs, criterion, cryptohash + , cryptonite, deepseq, hashable, HTF, inspection-testing, memory + , QuickCheck, safecopy, scientific, strict, template-haskell, text + , time, transformers, unordered-containers, vector, void }: mkDerivation { pname = "large-hashable"; - version = "0.1.0.4"; - sha256 = "13k2k8rqbk40whzn4hpa92ypws2c1gh5fb4zh0diy5m0kxfk9hz9"; - revision = "1"; - editedCabalFile = "1xfl265ryvrjra2nsjvlcmwgilbnxhp8pwxy54wi1ada645nwgbr"; + version = "0.1.1.0"; + sha256 = "0i7xk128c1hp1bw50n4wpbdyd6paqbl6vmnknyymkaaga07g5ba0"; libraryHaskellDepends = [ - aeson base base16-bytestring bytes bytestring containers scientific - strict template-haskell text time transformers unordered-containers - utf8-light vector void + aeson base base16-bytestring bytes bytestring containers cryptonite + memory scientific strict template-haskell text time transformers + unordered-containers vector void ]; + libraryToolDepends = [ cpphs ]; testHaskellDepends = [ - aeson base bytes bytestring containers hashable HTF QuickCheck - scientific strict text time unordered-containers vector + aeson base bytes bytestring containers hashable HTF + inspection-testing QuickCheck scientific strict text time + unordered-containers vector ]; + testToolDepends = [ cpphs ]; benchmarkHaskellDepends = [ - base base16-bytestring byteable bytes bytestring cereal cryptohash - deepseq safecopy text transformers + base base16-bytestring byteable bytes bytestring cereal criterion + cryptohash deepseq safecopy text transformers ]; + benchmarkToolDepends = [ cpphs ]; description = "Efficiently hash (large) Haskell values"; license = lib.licenses.bsd3; badPlatforms = [ "aarch64-linux" ]; @@ -189375,22 +189691,22 @@ self: { }) {}; "large-records" = callPackage - ({ mkDerivation, base, containers, generic-deriving, ghc + ({ mkDerivation, base, containers, generic-deriving, ghc, ghc-prim , large-generics, mtl, newtype, primitive, record-dot-preprocessor , record-hasfield, syb, tasty, tasty-hunit, template-haskell , transformers }: mkDerivation { pname = "large-records"; - version = "0.4.1"; - sha256 = "0z0k8r4im1rzykwgk8wgyy8zv1wcb06fmikgir09bxhymg0fzpw8"; + version = "0.4.2"; + sha256 = "1z61v8vi3ax2pjw0d4k3vznbiziwflgraralrkxv12s3s3kq0pm5"; libraryHaskellDepends = [ base containers ghc large-generics mtl primitive record-dot-preprocessor record-hasfield syb template-haskell transformers ]; testHaskellDepends = [ - base generic-deriving large-generics mtl newtype + base generic-deriving ghc-prim large-generics mtl newtype record-dot-preprocessor record-hasfield tasty tasty-hunit template-haskell transformers ]; @@ -189697,8 +190013,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "4.2.0"; - sha256 = "1ip40njah6i25v7wzkd5vpw9gs43dinb1x8ri8mhdn430h30mr05"; + version = "4.3.0"; + sha256 = "0prsix4w6x3413pix2971nlwd1pnz6s8w91wq12wcbvyv6lvlb03"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers cryptohash exceptions extra generic-lens hashtables http-client @@ -193029,8 +193345,8 @@ self: { ({ mkDerivation, base, libsodium }: mkDerivation { pname = "libsodium-bindings"; - version = "0.0.1.1"; - sha256 = "0gfksw47rl13a3mhyzawhxrcp9ia6g85m5v59pp85jci0bgs7bda"; + version = "0.0.2.0"; + sha256 = "12zg8ckvv8qhdmw6pdwfyif23y6iw5hgwcyhb4hlhfk8q7qv2av3"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ libsodium ]; description = "FFI bindings to libsodium"; @@ -193494,6 +193810,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "lift-generics_0_3" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover + , mtl, template-haskell, th-compat, th-lift-instances + }: + mkDerivation { + pname = "lift-generics"; + version = "0.3"; + sha256 = "1walsrpschxg2bqw925z6cr24cznrcq04bb37azvwdcfrbl19r7a"; + libraryHaskellDepends = [ + base ghc-prim template-haskell th-compat + ]; + testHaskellDepends = [ + base containers hspec mtl template-haskell th-compat + th-lift-instances + ]; + testToolDepends = [ hspec-discover ]; + description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lift-read-show" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -193518,29 +193855,6 @@ self: { }) {}; "lifted-async" = callPackage - ({ mkDerivation, async, base, constraints, deepseq, HUnit - , lifted-base, monad-control, mtl, tasty, tasty-bench - , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base - }: - mkDerivation { - pname = "lifted-async"; - version = "0.10.2.5"; - sha256 = "1lhyjv32plqs0r2gi7ca8b527z5qas7xgjkh680lqwi0l81xd80n"; - revision = "1"; - editedCabalFile = "18z12n6v3n810qp7hxanixwhznphpw69jz9ahwxfknww51dj2jx0"; - libraryHaskellDepends = [ - async base constraints lifted-base monad-control transformers-base - ]; - testHaskellDepends = [ - async base HUnit lifted-base monad-control mtl tasty - tasty-expected-failure tasty-hunit tasty-th - ]; - benchmarkHaskellDepends = [ async base deepseq tasty-bench ]; - description = "Run lifted IO operations asynchronously and wait for their results"; - license = lib.licenses.bsd3; - }) {}; - - "lifted-async_0_10_2_6" = callPackage ({ mkDerivation, async, base, constraints, deepseq, HUnit , lifted-base, monad-control, mtl, tasty, tasty-bench , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base @@ -193559,7 +193873,6 @@ self: { benchmarkHaskellDepends = [ async base deepseq tasty-bench ]; description = "Run lifted IO operations asynchronously and wait for their results"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "lifted-base" = callPackage @@ -196287,6 +196600,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "llvm-codegen" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, dlist + , ghc-prim, hspec, hspec-hedgehog, mmorph, mtl, neat-interpolation + , text, text-builder-linear + }: + mkDerivation { + pname = "llvm-codegen"; + version = "0.1.0.0"; + sha256 = "1iqrfkyhqdw7mvpl86jrccl6iqmdp64mmzmhlc4bp59cbxifb0zz"; + setupHaskellDepends = [ base Cabal containers ]; + libraryHaskellDepends = [ + base bytestring containers dlist ghc-prim mmorph mtl text + text-builder-linear + ]; + testHaskellDepends = [ + base bytestring containers dlist ghc-prim hspec hspec-hedgehog + mmorph mtl neat-interpolation text text-builder-linear + ]; + description = "A DSL for LLVM IR code generation based on llvm-hs"; + license = lib.licenses.bsd3; + }) {}; + "llvm-data-interop" = callPackage ({ mkDerivation, array, base, bytestring, c2hs, containers , data-default, deepseq, dwarf, hashable, hashtables @@ -198707,6 +199042,8 @@ self: { pname = "lrucache"; version = "1.2.0.1"; sha256 = "11avhnjnb89rvn2s41jhh5r40zgp7r6kb5c0hcfiibpabqvv46pw"; + revision = "1"; + editedCabalFile = "0v2wc5k2knvv5knbarzspmbzf657r52jyjm9kf6r4ylsmi9cbq0k"; libraryHaskellDepends = [ base containers contravariant ]; description = "a simple, pure LRU cache"; license = lib.licenses.bsd3; @@ -202320,25 +202657,21 @@ self: { }) {}; "markup-parse" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, flatparse - , html-parse, optparse-applicative, perf, string-interpolate, tasty - , tasty-golden, text, these, tree-diff + ({ mkDerivation, base, bytestring, containers, deepseq + , doctest-parallel, flatparse, string-interpolate, tasty + , tasty-golden, these, tree-diff }: mkDerivation { pname = "markup-parse"; - version = "0.1.1"; - sha256 = "1ybmppxd4hpqjr2lnb1x9jk96fkd8snq6l2p0fzpr7q6bq09wx0a"; - revision = "1"; - editedCabalFile = "1p9hba5fcfbv9qm4aqg9hn5bamw6slyr1sxz5pzg3hnj1c8npzl6"; + version = "0.1.1.1"; + sha256 = "0k9ga485l7nvhny0kqjb6s4q407a1mnfpcsy90892qgj42dkkdb4"; libraryHaskellDepends = [ base bytestring containers deepseq flatparse string-interpolate tasty tasty-golden these tree-diff ]; testHaskellDepends = [ - base bytestring string-interpolate tasty tasty-golden tree-diff - ]; - benchmarkHaskellDepends = [ - base bytestring flatparse html-parse optparse-applicative perf text + base bytestring doctest-parallel string-interpolate tasty + tasty-golden tree-diff ]; description = "A markup parser"; license = lib.licenses.bsd3; @@ -203827,8 +204160,8 @@ self: { }: mkDerivation { pname = "mcmc"; - version = "0.8.2.0"; - sha256 = "0ms2v86wam1gl5ibhs8pl8rqxxbp2zlr3pv7vfbbp6vgjw2i4x7h"; + version = "0.8.3.1"; + sha256 = "1x0r4ph3vc5aamd1pbpbx39l8cih0nmm7pl3ywkl8hmbgzmmkami"; libraryHaskellDepends = [ ad aeson async base bytestring circular containers covariance directory dirichlet hmatrix log-domain math-functions microlens @@ -203844,33 +204177,6 @@ self: { maintainers = [ lib.maintainers.dschrempf ]; }) {}; - "mcmc_0_8_3_0" = callPackage - ({ mkDerivation, ad, aeson, async, base, bytestring, circular - , containers, covariance, criterion, directory, dirichlet - , fixed-vector, hmatrix, hspec, log-domain, math-functions - , microlens, mwc-random, parallel, primitive, random, splitmix - , statistics, time, transformers, vector, zlib - }: - mkDerivation { - pname = "mcmc"; - version = "0.8.3.0"; - sha256 = "1p4j59wzzbrn5xy64pcg42g2qicski3j16prpm082sags0pv3i7r"; - libraryHaskellDepends = [ - ad aeson async base bytestring circular containers covariance - directory dirichlet hmatrix log-domain math-functions microlens - mwc-random parallel primitive random splitmix statistics time - transformers vector zlib - ]; - testHaskellDepends = [ base hspec random statistics ]; - benchmarkHaskellDepends = [ - aeson base criterion fixed-vector math-functions random vector - ]; - description = "Sample from a posterior using Markov chain Monte Carlo"; - license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.dschrempf ]; - }) {}; - "mcmc-samplers" = callPackage ({ mkDerivation, base, containers, hakaru, hmatrix, mwc-random , primitive, statistics @@ -204045,16 +204351,16 @@ self: { "mealy" = callPackage ({ mkDerivation, adjunctions, base, containers, doctest-parallel - , mwc-probability, numhask, numhask-array, primitive, profunctors - , tdigest, text, vector, vector-algorithms + , harpie, harpie-numhask, mwc-probability, numhask, primitive + , profunctors, tdigest, text, vector, vector-algorithms }: mkDerivation { pname = "mealy"; - version = "0.4.5.0"; - sha256 = "1lyqskr9pddhdm0i8ncykz9gvbjxhfac3y49cvm6vziy3wmxd6ji"; + version = "0.5.0.0"; + sha256 = "0cijjmi3wqi7z3vbhm0ya8va9397rlkr3wkri6kf94qqr1vimgxy"; libraryHaskellDepends = [ - adjunctions base containers mwc-probability numhask numhask-array - primitive profunctors tdigest text vector vector-algorithms + adjunctions base containers harpie harpie-numhask mwc-probability + numhask primitive profunctors tdigest text vector vector-algorithms ]; testHaskellDepends = [ base doctest-parallel ]; description = "Mealy machines for processing time-series and ordered data"; @@ -207445,17 +207751,17 @@ self: { ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , case-insensitive, directory, file-embed-lzma, filepath , http-api-data, http-types, insert-ordered-containers, lens - , minion, minion-wai-extra, openapi3, template-haskell, text + , minion, openapi3, template-haskell, text }: mkDerivation { pname = "minion-openapi3"; - version = "0.1.0.0"; - sha256 = "03rqqx8dy6sk8ryp2a0ykw67rxj531sw12vzpnz8f17vw90x5npp"; + version = "0.1.0.1"; + sha256 = "1vc1cmmf1sspdfcbxk1d1807rggiridyhvvsh27j0z34n3p9whih"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring case-insensitive directory file-embed-lzma filepath http-api-data http-types - insert-ordered-containers lens minion minion-wai-extra openapi3 - template-haskell text + insert-ordered-containers lens minion openapi3 template-haskell + text ]; description = "Minion openapi3 support"; license = lib.licenses.mit; @@ -208045,17 +208351,19 @@ self: { "mit-3qvpPyAi6mH" = callPackage ({ mkDerivation, base, base64, containers, directory, ki - , optparse-applicative, parsec, process, stm, text, text-ansi, unix + , optparse-applicative, parsec, process, stm, text, text-ansi + , text-builder-linear, unconditional-jump, unix }: mkDerivation { pname = "mit-3qvpPyAi6mH"; - version = "11"; - sha256 = "0p5v2spwd8rz5h5zclbr7wq5m4qvsihvp91p52d2vd3jdd6xaszx"; + version = "12"; + sha256 = "0lvn4fal9my2gngcic6kx5xq3sdsl63xm9b6bnsy23ww10zkxdp3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base64 containers directory ki optparse-applicative parsec - process stm text text-ansi unix + process stm text text-ansi text-builder-linear unconditional-jump + unix ]; executableHaskellDepends = [ base ]; description = "A git wrapper with a streamlined UX"; @@ -208692,18 +209000,19 @@ self: { "mmzk-typeid" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring, containers - , entropy, hashable, hspec, random, text, time, uuid, uuid-types + , entropy, hashable, hint, hspec, random, text, time, uuid + , uuid-types }: mkDerivation { pname = "mmzk-typeid"; - version = "0.7.0.0"; - sha256 = "139wn08imnasz40v8hlcjm4fmkxwq9lr0xbcl1kqnxqph8yfmmwa"; + version = "0.7.0.1"; + sha256 = "1c2mybdgnn9nzvk2php5i3xid3cm1ws7zrcsg4ngy2a60057pwbz"; libraryHaskellDepends = [ aeson array base binary bytestring entropy hashable random text time uuid uuid-types ]; testHaskellDepends = [ - aeson array base binary bytestring containers entropy hashable + aeson array base binary bytestring containers entropy hashable hint hspec random text time uuid uuid-types ]; description = "A TypeID and UUIDv7 implementation for Haskell"; @@ -213229,12 +213538,12 @@ self: { maintainers = [ lib.maintainers.sheepforce ]; }) {inherit (pkgs) mpich;}; - "mpi-hs_0_7_3_0" = callPackage + "mpi-hs_0_7_3_1" = callPackage ({ mkDerivation, base, bytestring, c2hs, monad-loops, ompi }: mkDerivation { pname = "mpi-hs"; - version = "0.7.3.0"; - sha256 = "1q6jb3sm8jspw9zas5iggvzr6w0zmcbr2qqw4q4j96hrfpjgj798"; + version = "0.7.3.1"; + sha256 = "1f4jdk5wysi54skz2jpzh83v5xi4gqa0q3r89l1adlz4m5i90l70"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring monad-loops ]; @@ -221453,6 +221762,8 @@ self: { pname = "nix-derivation"; version = "1.1.3"; sha256 = "11drhg3zjhwbvdw25k0icvbkcpqilx0m9qw60k7snfaz1iadfkdb"; + revision = "1"; + editedCabalFile = "1w84h665dls927g1zwzyfp91jyk97dy0ccii8m07y1prp007ccxa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221708,8 +222019,8 @@ self: { }: mkDerivation { pname = "nix-tree"; - version = "0.4.1"; - sha256 = "1w8fg872fw40r346vkkqffahplmyly792ygcbqq0czapwhl0wbvv"; + version = "0.5.0"; + sha256 = "0gjmmnkizqb5pzzr13a1bzs0smch353nvhwplcp04kwcdgm22axd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -223311,23 +223622,27 @@ self: { }) {}; "nri-redis" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, conduit, hedis - , nri-env-parser, nri-observability, nri-prelude, resourcet - , safe-exceptions, text, unordered-containers, uuid + ({ mkDerivation, aeson, async, base, bytestring, conduit + , containers, cryptohash-sha1, haskell-src-meta, hedis, megaparsec + , modern-uri, nri-env-parser, nri-observability, nri-prelude + , pcre-light, resourcet, safe-exceptions, template-haskell, text + , unordered-containers, uuid }: mkDerivation { pname = "nri-redis"; - version = "0.1.0.4"; - sha256 = "1ws5j8r4ny8dhw2bf2zqvq42ab9h44ly562cjrl6ha5mlk78mvpq"; + version = "0.2.0.2"; + sha256 = "0hp8sbf7pvnplzg13n42xfp169japknm3z0szzspg2khi5fgwk86"; libraryHaskellDepends = [ - aeson async base bytestring conduit hedis nri-env-parser - nri-observability nri-prelude resourcet safe-exceptions text - unordered-containers uuid + aeson async base bytestring conduit containers cryptohash-sha1 + haskell-src-meta hedis megaparsec modern-uri nri-env-parser + nri-observability nri-prelude pcre-light resourcet safe-exceptions + template-haskell text unordered-containers uuid ]; testHaskellDepends = [ - aeson async base bytestring conduit hedis nri-env-parser - nri-observability nri-prelude resourcet safe-exceptions text - unordered-containers uuid + aeson async base bytestring conduit containers cryptohash-sha1 + haskell-src-meta hedis megaparsec modern-uri nri-env-parser + nri-observability nri-prelude pcre-light resourcet safe-exceptions + template-haskell text unordered-containers uuid ]; description = "An intuitive hedis wrapper library"; license = lib.licenses.bsd3; @@ -224018,13 +224333,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "numhask_0_12_0_3" = callPackage - ({ mkDerivation, base, QuickCheck }: + "numhask_0_12_1_0" = callPackage + ({ mkDerivation, base, doctest-parallel, QuickCheck }: mkDerivation { pname = "numhask"; - version = "0.12.0.3"; - sha256 = "0rxh2avhfb2m5ss8b70k7dv3scla9ki7a8d73hnqlcfp7vjwm9qk"; - libraryHaskellDepends = [ base QuickCheck ]; + version = "0.12.1.0"; + sha256 = "1709f96j4jk81cqadb2lngr35j7jv7rixjx1i7qcccqr80dxhbq6"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest-parallel QuickCheck ]; description = "A numeric class hierarchy"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -225652,6 +225968,24 @@ self: { broken = true; }) {}; + "ollama-haskell" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-client, http-types + , silently, tasty, tasty-hunit, text, time + }: + mkDerivation { + pname = "ollama-haskell"; + version = "0.1.0.2"; + sha256 = "12m9ar8fyfxj2bd2q6qgslmyh85fxzqvh09mgvxskdb14yxzil1c"; + libraryHaskellDepends = [ + aeson base bytestring http-client http-types text time + ]; + testHaskellDepends = [ base silently tasty tasty-hunit text ]; + description = "Ollama Haskell library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "olwrapper" = callPackage ({ mkDerivation, base, bytestring, fay, fay-jquery, fay-text, lens , mtl, snap, snap-core, snap-loader-dynamic, snap-loader-static @@ -226164,6 +226498,8 @@ self: { pname = "one-time-password"; version = "3.0.0.0"; sha256 = "0yark6agy421mk7zblzy4vpccbd1i53gpiysa0a7s9sh0szy4bql"; + revision = "3"; + editedCabalFile = "0dbck4bw97w1ci6yjgvgzzgbpr9xlnc8kghndigipxxy77sx5nqg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227554,8 +227890,8 @@ self: { }: mkDerivation { pname = "opentelemetry-plugin"; - version = "1.1.0"; - sha256 = "1lkfgkpbw340nh09dw53y4jv19plb6y19sbyb0fqpnf5g3zchmx0"; + version = "1.1.1"; + sha256 = "1sp6bzy0is704x18522b2kmbbsw3nbfz9x69rvidmpz0x52cpwbg"; libraryHaskellDepends = [ base bytestring containers ghc hs-opentelemetry-api hs-opentelemetry-propagator-w3c hs-opentelemetry-sdk mwc-random stm @@ -228146,8 +228482,8 @@ self: { }: mkDerivation { pname = "opt-env-conf"; - version = "0.5.1.0"; - sha256 = "024qqi8gfha21ch54dja0rrmcqalmxn6qgxypzvmqzxdmv1fcwjh"; + version = "0.6.0.2"; + sha256 = "1mwj5x3s40w7rgl6s87l29q47qv26nzrpilr1qfm0xinvrnq6bj2"; libraryHaskellDepends = [ aeson autodocodec autodocodec-nix autodocodec-schema autodocodec-yaml base containers hashable mtl path path-io @@ -230853,39 +231189,39 @@ self: { ]; }) {}; - "pandoc_3_4" = callPackage + "pandoc_3_5" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions - , commonmark-pandoc, containers, crypton-connection + , commonmark-pandoc, containers, crypton, crypton-connection , crypton-x509-system, data-default, deepseq, Diff, directory, djot , doclayout, doctemplates, emojis, exceptions, file-embed, filepath , Glob, gridtables, haddock-library, http-client, http-client-tls , http-types, ipynb, jira-wiki-markup, JuicyPixels, mime-types, mtl , network, network-uri, pandoc-types, parsec, pretty, pretty-show - , process, random, safe, scientific, SHA, skylighting - , skylighting-core, split, syb, tagsoup, tasty, tasty-bench - , tasty-golden, tasty-hunit, tasty-quickcheck, temporary, texmath - , text, text-conversions, time, tls, typst, unicode-collation + , process, random, safe, scientific, skylighting, skylighting-core + , split, syb, tagsoup, tasty, tasty-bench, tasty-golden + , tasty-hunit, tasty-quickcheck, temporary, texmath, text + , text-conversions, time, tls, typst, unicode-collation , unicode-transforms, unix, vector, xml, xml-conduit, xml-types , yaml, zip-archive, zlib }: mkDerivation { pname = "pandoc"; - version = "3.4"; - sha256 = "0kwq6xpycd5sv5h6mbiv08imnzzsgchvyxx5hzscha4kkk2hr0nw"; + version = "3.5"; + sha256 = "0p23nfdx8xb60g2xplpfh3084i04gi3hy88s8864i8mq5i5ajpql"; configureFlags = [ "-f-trypandoc" ]; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty array attoparsec base base64-bytestring binary blaze-html blaze-markup bytestring case-insensitive citeproc commonmark commonmark-extensions commonmark-pandoc containers - crypton-connection crypton-x509-system data-default deepseq + crypton crypton-connection crypton-x509-system data-default deepseq directory djot doclayout doctemplates emojis exceptions file-embed filepath Glob gridtables haddock-library http-client http-client-tls http-types ipynb jira-wiki-markup JuicyPixels mime-types mtl network network-uri pandoc-types parsec pretty - pretty-show process random safe scientific SHA skylighting + pretty-show process random safe scientific skylighting skylighting-core split syb tagsoup temporary texmath text text-conversions time tls typst unicode-collation unicode-transforms unix vector xml xml-conduit xml-types yaml @@ -230995,14 +231331,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "pandoc-cli_3_4" = callPackage + "pandoc-cli_3_5" = callPackage ({ mkDerivation, base, hslua-cli, pandoc, pandoc-lua-engine , pandoc-server, safe, temporary, text, wai-extra, warp }: mkDerivation { pname = "pandoc-cli"; - version = "3.4"; - sha256 = "0qrgjx1q7g80lx98580q3w4pddmh2qqpxkmg005hmdmp6hqvd30s"; + version = "3.5"; + sha256 = "0q6zhwgzipfcy36fsdnq5mkqq25kirscvfb347n3drmc2lnw5lmr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -231042,10 +231378,10 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.17.1"; - sha256 = "0md7i54rnvgn0yll7mwhi124nak0pfmpga34vnd996r6fgmnq5fb"; - revision = "3"; - editedCabalFile = "14zqqrv5mgd8kdnis2k97ydcbi2rr77cq09z918lwcfcx7dxsl6w"; + version = "0.3.18.0"; + sha256 = "01kj17rf53kshfw7dd1875xi6s43b84hr7dvbfbhsb1c10pvdwac"; + revision = "1"; + editedCabalFile = "014brzc3r46b93hi4wzlyx9qf9qcf1js5qvpwk5rvzqpvazjglkj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -231383,25 +231719,25 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "pandoc-lua-engine_0_3_2" = callPackage + "pandoc-lua-engine_0_3_3" = callPackage ({ mkDerivation, aeson, base, bytestring, citeproc, containers - , data-default, directory, doclayout, doctemplates, exceptions - , filepath, hslua, hslua-module-doclayout, hslua-module-path - , hslua-module-system, hslua-module-text, hslua-module-version - , hslua-module-zip, hslua-repl, lpeg, mtl, pandoc - , pandoc-lua-marshal, pandoc-types, parsec, SHA, tasty + , crypton, data-default, directory, doclayout, doctemplates + , exceptions, filepath, hslua, hslua-module-doclayout + , hslua-module-path, hslua-module-system, hslua-module-text + , hslua-module-version, hslua-module-zip, hslua-repl, lpeg, mtl + , pandoc, pandoc-lua-marshal, pandoc-types, parsec, tasty , tasty-golden, tasty-hunit, tasty-lua, text }: mkDerivation { pname = "pandoc-lua-engine"; - version = "0.3.2"; - sha256 = "0lh533m3xvr8c29mazdb09b7w7ivrlscc5dxzmrfnkwkr0friw8c"; + version = "0.3.3"; + sha256 = "0jzddmg2qnbdv83hrfmxhfibp8p1mm9j32vxm89kg6fbx688n5hw"; libraryHaskellDepends = [ - aeson base bytestring citeproc containers data-default doclayout - doctemplates exceptions hslua hslua-module-doclayout + aeson base bytestring citeproc containers crypton data-default + doclayout doctemplates exceptions hslua hslua-module-doclayout hslua-module-path hslua-module-system hslua-module-text hslua-module-version hslua-module-zip hslua-repl lpeg mtl pandoc - pandoc-lua-marshal pandoc-types parsec SHA text + pandoc-lua-marshal pandoc-types parsec text ]; testHaskellDepends = [ base bytestring data-default directory exceptions filepath hslua @@ -231413,28 +231749,6 @@ self: { }) {}; "pandoc-lua-marshal" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, exceptions - , hslua, hslua-list, hslua-marshalling, pandoc-types, QuickCheck - , safe, tasty, tasty-hunit, tasty-lua, tasty-quickcheck, text - }: - mkDerivation { - pname = "pandoc-lua-marshal"; - version = "0.2.8"; - sha256 = "0z58mn895hhgkl9lww2zxc0zrpqdnf6m8bpvxfdsh8az0sxgsgba"; - libraryHaskellDepends = [ - aeson base bytestring containers exceptions hslua hslua-list - hslua-marshalling pandoc-types safe text - ]; - testHaskellDepends = [ - aeson base bytestring containers exceptions hslua hslua-list - hslua-marshalling pandoc-types QuickCheck safe tasty tasty-hunit - tasty-lua tasty-quickcheck text - ]; - description = "Use pandoc types in Lua"; - license = lib.licenses.mit; - }) {}; - - "pandoc-lua-marshal_0_2_9" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, exceptions , hslua, hslua-list, hslua-marshalling, pandoc-types, QuickCheck , safe, tasty, tasty-hunit, tasty-lua, tasty-quickcheck, text @@ -231454,7 +231768,6 @@ self: { ]; description = "Use pandoc types in Lua"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "pandoc-markdown-ghci-filter" = callPackage @@ -231679,7 +231992,7 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "pandoc-server_0_1_0_8" = callPackage + "pandoc-server_0_1_0_9" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, data-default, doctemplates, pandoc, pandoc-types , servant-server, skylighting, text, unicode-collation, wai @@ -231687,8 +232000,8 @@ self: { }: mkDerivation { pname = "pandoc-server"; - version = "0.1.0.8"; - sha256 = "1ffsbi1ik0lx06xj1ffr2zpn4a9wn8lsawyhak77nqaih93336a5"; + version = "0.1.0.9"; + sha256 = "1bdfd0lq0vdrr8rvjxin6j011jg4kn210zzpz2lixvc8wfcw66w8"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring containers data-default doctemplates pandoc pandoc-types servant-server skylighting text @@ -232128,8 +232441,8 @@ self: { pname = "pantry"; version = "0.10.0"; sha256 = "1f0ck7j82km4sy1ia2iqv9aqkdr3p2h8sarbksrsx2dq68552xym"; - revision = "1"; - editedCabalFile = "1kz5glyqd86g8jg9n7cvgmamw0kw4fq2wsf7fd5hgjf4fhbs2scd"; + revision = "2"; + editedCabalFile = "1v2d03rzrj0gmilx2qa1c0y1srzjh96xq02sd7qarc2kjw4rjgyi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -234118,7 +234431,32 @@ self: { ]; description = "Hashing and checking of passwords"; license = lib.licenses.bsd3; - platforms = lib.platforms.x86; + maintainers = [ lib.maintainers.cdepillabout ]; + }) {}; + + "password_3_1_0_0" = callPackage + ({ mkDerivation, base, base-compat, base64, bytestring, Cabal + , cabal-doctest, crypton, doctest, memory, password-types + , QuickCheck, quickcheck-instances, scrypt, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text + }: + mkDerivation { + pname = "password"; + version = "3.1.0.0"; + sha256 = "0rmcmp9bwa4nqma1pphjga2bmd5axw3579v6i1sh5yih1cfqzi2q"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base64 bytestring crypton memory password-types + template-haskell text + ]; + testHaskellDepends = [ + base base-compat base64 bytestring crypton doctest memory + password-types QuickCheck quickcheck-instances scrypt tasty + tasty-hunit tasty-quickcheck template-haskell text + ]; + description = "Hashing and checking of passwords"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.cdepillabout ]; }) {}; @@ -234143,7 +234481,6 @@ self: { ]; description = "typeclass instances for password package"; license = lib.licenses.bsd3; - platforms = lib.platforms.x86; maintainers = [ lib.maintainers.cdepillabout ]; }) {}; @@ -236093,6 +236430,31 @@ self: { mainProgram = "perf-explore"; }) {}; + "perf_0_13_0_0" = callPackage + ({ mkDerivation, base, clock, containers, deepseq, formatn, mtl + , numhask-space, optparse-applicative, recursion-schemes, text + , vector + }: + mkDerivation { + pname = "perf"; + version = "0.13.0.0"; + sha256 = "0xqwg42cl9f1s9niyc2r9py75w26bp7rlax04ifjjbbq5y9aw2gb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base clock containers deepseq formatn mtl numhask-space + optparse-applicative recursion-schemes text vector + ]; + executableHaskellDepends = [ + base clock containers deepseq formatn mtl optparse-applicative text + ]; + benchmarkHaskellDepends = [ base ]; + description = "Performance methods and monad"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "perf-explore"; + }) {}; + "perf-analysis" = callPackage ({ mkDerivation, base, containers, deepseq, optparse-generic, perf , protolude, readme-lhs, scientific, tdigest, text, text-format @@ -237603,8 +237965,8 @@ self: { pname = "pg-entity"; version = "0.0.4.4"; sha256 = "0xbsys4h6p84m3vh076v5cjrmf2v9yl8d44zaknfxbjc8ssfbmh2"; - revision = "2"; - editedCabalFile = "19firm055d3j9gw8cf6qb6n2jy5jgs287mcgmskbcj78fs1a9g62"; + revision = "5"; + editedCabalFile = "1dawp5f6pha1z96bkx34whpqik20azx6aizcv8xrmj0ai6vvkhik"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -242242,6 +242604,8 @@ self: { pname = "pointfree"; version = "1.1.1.12"; sha256 = "0mrrdmslcdk2ld8g78i00jwidn765w3l7la0qdlawc2lc17w2ili"; + revision = "1"; + editedCabalFile = "1nl2rbkg4dl5ljg77fazg88xs496hx1q7vj3b9wiqvf96g9j2lyf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -246392,6 +246756,90 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ppad-hmac-drbg" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring + , criterion, ppad-sha256, ppad-sha512, primitive, tasty + , tasty-hunit + }: + mkDerivation { + pname = "ppad-hmac-drbg"; + version = "0.1.1"; + sha256 = "0wqkl3bk2yzyz4ldzx8njf9qawwfcr9ya3alpmdqid68bldagxl7"; + libraryHaskellDepends = [ base bytestring primitive ]; + testHaskellDepends = [ + attoparsec base base16-bytestring bytestring ppad-sha256 + ppad-sha512 tasty tasty-hunit + ]; + benchmarkHaskellDepends = [ + base bytestring criterion ppad-sha256 + ]; + description = "HMAC-based deterministic random bit generator"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "ppad-secp256k1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, criterion, deepseq, ppad-hmac-drbg, ppad-sha256 + , tasty, tasty-hunit, text + }: + mkDerivation { + pname = "ppad-secp256k1"; + version = "0.1.0"; + sha256 = "16a25c4l7bkv8sjjj0nf7i0ml6kvgvr9bajsgqx8aapbnamk6894"; + libraryHaskellDepends = [ + base bytestring ppad-hmac-drbg ppad-sha256 + ]; + testHaskellDepends = [ + aeson attoparsec base base16-bytestring bytestring tasty + tasty-hunit text + ]; + benchmarkHaskellDepends = [ + base base16-bytestring bytestring criterion deepseq + ]; + description = "Schnorr signatures & ECDSA on the elliptic curve secp256k1"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "ppad-sha256" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , criterion, SHA, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "ppad-sha256"; + version = "0.2.1"; + sha256 = "0l33nmpp26d9mha8cr2r4p8b1xp2211rdm1gd9rk6lfg1vzw7a1f"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ base bytestring criterion SHA ]; + description = "The SHA-256 and HMAC-SHA256 algorithms"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "ppad-sha512" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , criterion, SHA, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "ppad-sha512"; + version = "0.1.1"; + sha256 = "0hm4z1samk203p7m2qwfg58mcadmybc987plg31rwf29s0z63yvy"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ base bytestring criterion SHA ]; + description = "The SHA-512 and HMAC-SHA512 algorithms"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "ppm" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -246689,12 +247137,17 @@ self: { }) {}; "predicate-transformers" = callPackage - ({ mkDerivation, adjunctions, base, deepseq, lens, mtl }: + ({ mkDerivation, adjunctions, base, deepseq, pretty-simple + , prettyprinter, recover-rtti, text + }: mkDerivation { pname = "predicate-transformers"; - version = "0.15.0.0"; - sha256 = "0kjmdbm0a7c2vik0hansvkri7c9zp5cfazgk00r65syflsgfk91s"; - libraryHaskellDepends = [ adjunctions base deepseq lens mtl ]; + version = "0.17.0.0"; + sha256 = "0ifqa30w96jm5l9834qcga6ml2vyyk9ywd0ij7is0jf4gp1rdw5c"; + libraryHaskellDepends = [ + adjunctions base deepseq pretty-simple prettyprinter recover-rtti + text + ]; description = "A library for writing predicates and transformations over predicates in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -247529,17 +247982,18 @@ self: { "prettychart" = callPackage ({ mkDerivation, async, base, box, bytestring, chart-svg - , containers, markup-parse, numhask-space, optics-core, text, time - , web-rep + , containers, doctest-parallel, markup-parse, numhask-space + , optics-core, text, time, web-rep }: mkDerivation { pname = "prettychart"; - version = "0.2.0.0"; - sha256 = "1mpbn9i9h3g374nn6v7h664rypcxwbq3l94bxxmwy6jzpp8hzz0q"; + version = "0.2.2.0"; + sha256 = "1mj20bhpjn7gf7kb123zmn27bfpk1zncqqg606xmdcyx225m43al"; libraryHaskellDepends = [ async base box bytestring chart-svg containers markup-parse numhask-space optics-core text time web-rep ]; + testHaskellDepends = [ base doctest-parallel ]; description = "Pretty print charts from ghci"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -247995,8 +248449,8 @@ self: { pname = "primitive"; version = "0.9.0.0"; sha256 = "1iwr176mx2xc96vgvzlby8z8s9d4vhbj266n89hp6kf9j794nvb9"; - revision = "1"; - editedCabalFile = "0g6rsz6hbpyfwbai04gmxil7wfcs1nd0xxcycvqwfn9mkr0ca21f"; + revision = "2"; + editedCabalFile = "0nc7cd9921bzf31k48pnmx3k2bfaxakgv3jchn4215qzzx7by86y"; libraryHaskellDepends = [ base deepseq template-haskell transformers ]; @@ -248099,8 +248553,8 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.10.2"; - sha256 = "0z7xgd42dg5dq2ikjdbxjq39acv98s0p0sk3fincapw9vnxicnqy"; + version = "0.10.2.1"; + sha256 = "0h3q5zr0k3rns1mq4y56d2ji477h1kjqsv6hp3bbs0yfzkjjk5z2"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl list-t primitive primitive-unlifted profunctors vector @@ -248307,6 +248761,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "primitive-unlifted_2_2_0_0" = callPackage + ({ mkDerivation, array, base, bytestring, primitive, QuickCheck + , quickcheck-classes-base, stm, tasty, tasty-quickcheck, text-short + }: + mkDerivation { + pname = "primitive-unlifted"; + version = "2.2.0.0"; + sha256 = "06r10v5dp1a4zpvv8ffmjab8bjsn5gmkx7irr02xwahwb8q4dv69"; + libraryHaskellDepends = [ + array base bytestring primitive text-short + ]; + testHaskellDepends = [ + base primitive QuickCheck quickcheck-classes-base stm tasty + tasty-quickcheck + ]; + description = "Primitive GHC types with unlifted types inside"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "primula-board" = callPackage ({ mkDerivation, base, ConfigFile, containers, directory, happstack , happstack-helpers, happstack-server, happstack-state, hsp @@ -248744,12 +249218,12 @@ self: { license = lib.licenses.mit; }) {}; - "process_1_6_24_0" = callPackage + "process_1_6_25_0" = callPackage ({ mkDerivation, base, deepseq, directory, filepath, unix }: mkDerivation { pname = "process"; - version = "1.6.24.0"; - sha256 = "1fl1y0zc4dsifw1f5nkmy18l46i8wlkcq9h8jp2cm4gzww8x92qy"; + version = "1.6.25.0"; + sha256 = "0rbfwyz2418nw15fb5a8l1f8vsyzcz4wjakpx49b259rdibf0vs9"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; description = "Process libraries"; license = lib.licenses.bsd3; @@ -250031,8 +250505,8 @@ self: { }: mkDerivation { pname = "prop-unit"; - version = "0.1.2"; - sha256 = "0gs93yhfm2mc5x6j2khcmrxf1la84hy0gyixmcxwdvy675lx06p4"; + version = "0.1.3"; + sha256 = "0wiqdmlbxq4792lw3gm99fngbb5jyhwimqf4fb757aqm1jmi9h7b"; libraryHaskellDepends = [ base hedgehog tasty tasty-hedgehog ]; testHaskellDepends = [ base hedgehog tasty tasty-hedgehog tasty-hunit @@ -250171,8 +250645,8 @@ self: { pname = "proquint"; version = "0.1.0.0"; sha256 = "04hhvrrclyav0nhk6zqp9s58vxad8ndi6yw851qprd6h7wr57wg5"; - revision = "1"; - editedCabalFile = "1p3s3jpck7w9h5qxqp9w59mmf6yr9bgx339l1m01f6yjq720a6l6"; + revision = "2"; + editedCabalFile = "1bhc2cz76fi3rrn36nrgzi531f3p18k3n7q5mp1xyjz3vv0b2h2d"; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Proquints: Identifiers that are Readable, Spellable, and Pronounceable"; @@ -251759,6 +252233,26 @@ self: { broken = true; }) {}; + "pure-noise" = callPackage + ({ mkDerivation, base, deepseq, mwc-random, tasty, tasty-bench + , tasty-discover, tasty-hunit, tasty-quickcheck, vector + }: + mkDerivation { + pname = "pure-noise"; + version = "0.1.0.1"; + sha256 = "116w6scl7kranx567jhnrir9sh0ysjzs45gfhk970q0pzbkgnj1l"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ + base tasty tasty-discover tasty-hunit tasty-quickcheck vector + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base deepseq mwc-random tasty tasty-bench vector + ]; + description = "Performant, modern noise generation for Haskell with minimal dependencies. Based on FastNoiseLite."; + license = lib.licenses.bsd3; + }) {}; + "pure-priority-queue" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -253166,22 +253660,6 @@ self: { }) {}; "qrcode-core" = callPackage - ({ mkDerivation, base, binary, bytestring, case-insensitive - , containers, dlist, primitive, text, vector - }: - mkDerivation { - pname = "qrcode-core"; - version = "0.9.9"; - sha256 = "1bahj10gflc8i9wml8gkis50xwsj7vxf9zyj9b1zvlmld2qnlndw"; - libraryHaskellDepends = [ - base binary bytestring case-insensitive containers dlist primitive - text vector - ]; - description = "QR code library in pure Haskell"; - license = lib.licenses.mit; - }) {}; - - "qrcode-core_0_9_10" = callPackage ({ mkDerivation, base, binary, bytestring, case-insensitive , containers, dlist, primitive, text, vector }: @@ -253195,26 +253673,9 @@ self: { ]; description = "QR code library in pure Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "qrcode-juicypixels" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, JuicyPixels - , qrcode-core, text, vector - }: - mkDerivation { - pname = "qrcode-juicypixels"; - version = "0.8.5"; - sha256 = "0qgcdi77iyx04w2rx48nzk8lm9x368h9m4a468zcibn50cp4ynbg"; - libraryHaskellDepends = [ - base base64-bytestring bytestring JuicyPixels qrcode-core text - vector - ]; - description = "Converts a qrcode-core image to JuicyPixels"; - license = lib.licenses.mit; - }) {}; - - "qrcode-juicypixels_0_8_6" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, JuicyPixels , qrcode-core, text, vector }: @@ -253228,7 +253689,6 @@ self: { ]; description = "Converts a qrcode-core image to JuicyPixels"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "qsem" = callPackage @@ -254295,8 +254755,8 @@ self: { }: mkDerivation { pname = "quickcheck-quid"; - version = "0.0.1.5"; - sha256 = "0w54yxwmrf228q0bi3cymlfm2gbv098i0yfpm8xqp6wl5afm5291"; + version = "0.0.1.6"; + sha256 = "1vm8654n4s0ylqssihwkv5w7gg9ml6ks8cbvbdfvcff7xmc38yrv"; libraryHaskellDepends = [ base containers deepseq extra hashable QuickCheck text ]; @@ -257078,6 +257538,26 @@ self: { license = lib.licenses.asl20; }) {}; + "rawlock" = callPackage + ({ mkDerivation, base, io-classes, io-sim, mtl, nothunks + , QuickCheck, strict-mvar, strict-stm, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "rawlock"; + version = "0.1.0.0"; + sha256 = "07nh83k9xc1iszd2glh0nm8phblm67nazybxq7pgq7c89fgv3v0w"; + libraryHaskellDepends = [ + base io-classes nothunks strict-mvar strict-stm + ]; + testHaskellDepends = [ + base io-classes io-sim mtl QuickCheck strict-stm tasty + tasty-quickcheck + ]; + description = "A writer-biased RAW lock"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "rawr" = callPackage ({ mkDerivation, base, criterion, deepseq, doctest, ghc-datasize , ghc-prim, lens, tasty, tasty-hunit, template-haskell @@ -257375,29 +257855,29 @@ self: { ({ mkDerivation, aeson, aeson-pretty, amazonka, amazonka-core , amazonka-rds, amazonka-rds-data, amazonka-secretsmanager, base , base64-bytestring, bytestring, contravariant, generic-lens - , hedgehog, hedgehog-extras, http-client, hw-polysemy, microlens - , mtl, optparse-applicative, polysemy-log, polysemy-plugin - , polysemy-time, resourcet, stm, tasty, tasty-discover - , tasty-hedgehog, testcontainers, text, time, transformers, ulid - , uuid + , hedgehog, hedgehog-extras, http-client, hw-polysemy, hw-prelude + , microlens, mtl, optparse-applicative, polysemy-log + , polysemy-plugin, polysemy-time, resourcet, stm, tasty + , tasty-discover, tasty-hedgehog, testcontainers, text, time + , transformers, ulid, uuid }: mkDerivation { pname = "rds-data"; - version = "0.0.0.10"; - sha256 = "15kxk1k59b97nbs1kj2j8gy473bdzmzv7684kr3vwhd0mjwg69z2"; + version = "0.1.0.0"; + sha256 = "1ilphv9pff2ixd4rphir6j3lc41m0jngk0f4byb4v991xjr6ldz8"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-rds amazonka-rds-data amazonka-secretsmanager base base64-bytestring bytestring - contravariant generic-lens hw-polysemy microlens mtl polysemy-log - polysemy-plugin text time transformers ulid uuid + contravariant generic-lens hw-polysemy hw-prelude microlens mtl + polysemy-log polysemy-plugin text time transformers ulid uuid ]; executableHaskellDepends = [ aeson amazonka amazonka-rds-data base bytestring generic-lens - hedgehog http-client hw-polysemy microlens optparse-applicative - polysemy-log polysemy-plugin polysemy-time resourcet stm - testcontainers text time ulid uuid + hedgehog http-client hw-polysemy hw-prelude microlens + optparse-applicative polysemy-log polysemy-plugin polysemy-time + resourcet stm testcontainers text time ulid uuid ]; testHaskellDepends = [ aeson aeson-pretty amazonka amazonka-core amazonka-rds @@ -257680,8 +258160,8 @@ self: { }: mkDerivation { pname = "reactive-banana-automation"; - version = "0.5.6"; - sha256 = "161blkyhkff3z0blbrmrwmclhac481njn9ikb3x4ax0yfa1lpsvq"; + version = "0.5.7"; + sha256 = "1wj790yahgham9llbw3c642lmi9nliy4bx48d3pws3i6hpvvi7k7"; libraryHaskellDepends = [ base reactive-banana stm time transformers ]; @@ -258218,8 +258698,8 @@ self: { ({ mkDerivation, base, extra, mtl, primes, QuickCheck, random }: mkDerivation { pname = "real-dice"; - version = "0.1.0.3"; - sha256 = "1yrcvacxw0gl87lfw566k1hdf71nm2nrnw9ijqfc25y7fsb1qk2w"; + version = "0.1.0.4"; + sha256 = "1ibyp3zhfassg1yhfjnn636mbcbd6b7n42y2pzcnsmhjs8n78j2a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl primes ]; @@ -258471,18 +258951,26 @@ self: { }) {}; "recommender-als" = callPackage - ({ mkDerivation, base, containers, data-default-class, hmatrix - , parallel, random, vector + ({ mkDerivation, base, bytestring, cassava, containers + , data-default-class, hmatrix, optparse-applicative, parallel + , random, text, vector }: mkDerivation { pname = "recommender-als"; - version = "0.2.1.1"; - sha256 = "0qc91hn42mc2pmljb836chdas1jzsrqbg44cjylx31y0y72dmhdq"; + version = "0.2.2.0"; + sha256 = "19as4cd5p2y174zxn5rksa5hza5l667wkk9r40ny3lwmrgkng905"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers data-default-class hmatrix parallel random vector ]; + executableHaskellDepends = [ + base bytestring cassava containers data-default-class + optparse-applicative text vector + ]; description = "Recommendations using alternating least squares algorithm"; license = lib.licenses.bsd3; + mainProgram = "movielens"; }) {}; "record" = callPackage @@ -262114,10 +262602,8 @@ self: { }: mkDerivation { pname = "relude"; - version = "1.2.1.0"; - sha256 = "09fp8n2z6nz2yqkn8pgq56s6d971b4mgcaldkhc0ih3bz9dp8kvq"; - revision = "3"; - editedCabalFile = "1y4qgr64d02cqn46l8cqqwmzkkbd3v2w040b41z5inagbwbr50r8"; + version = "1.2.2.0"; + sha256 = "0ikp23nbzrxfalpsk6n8yg3byh43f8hp156wpxx45yc297gmgpil"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable mtl stm text transformers unordered-containers @@ -263282,15 +263768,20 @@ self: { "rerefined" = callPackage ({ mkDerivation, base, mono-traversable, QuickCheck , template-haskell, text, text-builder-linear, type-level-show + , type-spec }: mkDerivation { pname = "rerefined"; - version = "0.6.0"; - sha256 = "0msawph4qcl3ch2821bq1kfjmzkxl6vkhglcp6glimkcsmkbabyv"; + version = "0.8.0"; + sha256 = "1w6p7sfl5mcq37cqlyfk3zzfb3sbw12idhdnk97jbrn0psms12rk"; libraryHaskellDepends = [ base mono-traversable QuickCheck template-haskell text text-builder-linear type-level-show ]; + testHaskellDepends = [ + base mono-traversable QuickCheck template-haskell text + text-builder-linear type-level-show type-spec + ]; description = "Refinement types, again"; license = lib.licenses.mit; maintainers = [ lib.maintainers.raehik ]; @@ -263589,6 +264080,28 @@ self: { broken = true; }) {}; + "resource-registry" = callPackage + ({ mkDerivation, base, bimap, containers, generics-sop, io-classes + , mtl, nothunks, QuickCheck, quickcheck-state-machine, si-timers + , strict-mvar, strict-stm, tasty, tasty-quickcheck, tree-diff + }: + mkDerivation { + pname = "resource-registry"; + version = "0.1.0.0"; + sha256 = "0mkx8hf6k0117c15kq3cyqgxbfwjjk0yywp5xf6svdi5g2xpkg5p"; + libraryHaskellDepends = [ + base bimap containers io-classes mtl nothunks strict-stm + ]; + testHaskellDepends = [ + base containers generics-sop io-classes mtl QuickCheck + quickcheck-state-machine si-timers strict-mvar strict-stm tasty + tasty-quickcheck tree-diff + ]; + description = "Track allocated resources"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "resource-simple" = callPackage ({ mkDerivation, base, containers, monad-control, monad-fork , mtl-evil-instances, transformers, transformers-base @@ -265333,8 +265846,8 @@ self: { }: mkDerivation { pname = "ring-buffer"; - version = "0.4"; - sha256 = "14h1rzxzk9qzr6bimxng8nhxydngx92x75p1mrjfwbwi17bbwgby"; + version = "0.4.1"; + sha256 = "0j5ysm2aliq06cic2y21587lcighagih9vc48dr7z4mvrfym4yz7"; libraryHaskellDepends = [ base exceptions mtl primitive vector ]; testHaskellDepends = [ base HUnit QuickCheck vector ]; description = "A concurrent, mutable ring-buffer"; @@ -270132,7 +270645,7 @@ self: { license = lib.licenses.mit; }) {}; - "sbp_6_1_0" = callPackage + "sbp_6_2_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -270141,8 +270654,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "6.1.0"; - sha256 = "1ihnsxil3f1fccm6zf3daiw12qblmxmrpfs6spqnh2jfyxgmrmkx"; + version = "6.2.1"; + sha256 = "0cq2a62ipkbqmrryync5jqmlgyx5pgkrknk3lpcwmv1l1f9l9dgr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -272998,8 +273511,8 @@ self: { }: mkDerivation { pname = "sel"; - version = "0.0.1.0"; - sha256 = "0md8xdd7jci3jdq1l5acjfxgaz2ahiwz6c7cwam06x5kp0h1nik1"; + version = "0.0.2.0"; + sha256 = "0gidvbkcjgyq47gh2p19iawv8jcs7ajvih4mk6pwwbkjs8iybpx4"; libraryHaskellDepends = [ base base16 bytestring libsodium-bindings text text-display ]; @@ -274168,6 +274681,8 @@ self: { pname = "sequitur"; version = "0.2.0.0"; sha256 = "1k38xkhyika7aamzrkalc7kbz0v832amj4gxxs9l6si9v19ja185"; + revision = "1"; + editedCabalFile = "1l5jz58wxr5a20pjg842x931w195ab50n4w0jrbppchc836080fi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -276987,34 +277502,6 @@ self: { }) {}; "servant-static-th" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, containers - , directory, doctest, filepath, Glob, hspec-wai, http-media - , semigroups, servant, servant-blaze, servant-server, tasty - , tasty-hspec, tasty-hunit, template-haskell, text, wai - }: - mkDerivation { - pname = "servant-static-th"; - version = "1.0.0.0"; - sha256 = "1iky6bk92vzhsw31hfdhgclr4nq1kmic6w9mwd5fzjhbs5vcmm15"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-html bytestring containers directory filepath http-media - semigroups servant servant-blaze servant-server template-haskell - text - ]; - testHaskellDepends = [ - base blaze-html bytestring directory doctest filepath Glob - hspec-wai servant servant-blaze servant-server tasty tasty-hspec - tasty-hunit wai - ]; - description = "Embed a directory of static files in your Servant server"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "servant-static-th_1_0_0_1" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , directory, filepath, hspec, hspec-wai, http-media, semigroups , servant, servant-blaze, servant-server, tasty, tasty-hspec @@ -279771,8 +280258,8 @@ self: { }: mkDerivation { pname = "shellify"; - version = "0.11.0.1"; - sha256 = "1ighr9py1c2njiwdzb4fy0rlz7k8zb51la5mr8ciwh7r8zkmi0gv"; + version = "0.11.0.3"; + sha256 = "1hkf1p2qjb5jc7qkizwsrcb16fhnf2jvqg1y17ly0pgr22lkvxf1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -279845,10 +280332,8 @@ self: { }: mkDerivation { pname = "shellmet"; - version = "0.0.4.1"; - sha256 = "0jd05bazny7y25jnminal5wv30kxg6pzchswxpw5yac027qjagd0"; - revision = "1"; - editedCabalFile = "1ivpa3nrbp8qjam99m6dblhakc8gml1hhhigsmb708ndsyqfqa2i"; + version = "0.0.5.0"; + sha256 = "1yqz8nlhjbi5ngl548j4gy07m6dbvxfykj5y2gm4vviwvx0kgmz4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base process text ]; @@ -281900,22 +282385,23 @@ self: { }) {}; "simple-sql-parser" = callPackage - ({ mkDerivation, base, containers, megaparsec, mtl - , parser-combinators, prettyprinter, tasty, tasty-hunit, text + ({ mkDerivation, base, containers, filepath, hspec + , hspec-expectations, hspec-golden, hspec-megaparsec, megaparsec + , mtl, parser-combinators, pretty-show, prettyprinter + , raw-strings-qq, text }: mkDerivation { pname = "simple-sql-parser"; - version = "0.7.1"; - sha256 = "0jzmc5ian4y2jpng8c5xqf8igx5h186nw131vh6vq76nyzxxbx87"; - isLibrary = true; - isExecutable = true; + version = "0.8.0"; + sha256 = "01mymjr3gbdpkd660vz2v024b8jvzbzwqznmdxf3j2xpbmy36svw"; libraryHaskellDepends = [ base containers megaparsec mtl parser-combinators prettyprinter text ]; testHaskellDepends = [ - base containers megaparsec mtl parser-combinators prettyprinter - tasty tasty-hunit text + base containers filepath hspec hspec-expectations hspec-golden + hspec-megaparsec megaparsec mtl parser-combinators pretty-show + prettyprinter raw-strings-qq text ]; description = "A parser for SQL"; license = lib.licenses.bsd3; @@ -288678,13 +289164,14 @@ self: { }) {}; "specup" = callPackage - ({ mkDerivation, base, bytestring, extra, hspec, hspec-core - , megaparsec, optparse-applicative, stache, text, yaml + ({ mkDerivation, base, bytestring, directory, extra, hspec + , hspec-core, megaparsec, optparse-applicative, process, stache + , text, yaml }: mkDerivation { pname = "specup"; - version = "0.2.0.1"; - sha256 = "054v8qffs9wwl6vnfxmjv0753bchvsjibbvcs8fnnmy8si5hk80h"; + version = "0.2.0.2"; + sha256 = "19419bzrgaky1ja5isx15fl1xbi9yrxh8i7nd06mh7bmymsprxja"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -288693,7 +289180,9 @@ self: { executableHaskellDepends = [ base bytestring optparse-applicative text ]; - testHaskellDepends = [ base bytestring hspec hspec-core text ]; + testHaskellDepends = [ + base bytestring directory extra hspec hspec-core process text + ]; description = "Manage the application of templates to custom yaml"; license = lib.licenses.gpl2Only; mainProgram = "specup"; @@ -290727,15 +291216,15 @@ self: { mainProgram = "stack-all"; }) {}; - "stack-all_0_6_3" = callPackage + "stack-all_0_6_4" = callPackage ({ mkDerivation, aeson, base, cached-json-file, config-ini , directory, extra, filepath, http-query, process, simple-cmd , simple-cmd-args, text, yaml }: mkDerivation { pname = "stack-all"; - version = "0.6.3"; - sha256 = "14cqjaz8rc59sfy1px7a7bbv82dnrnaawf64q731ipl51smi0662"; + version = "0.6.4"; + sha256 = "1yvzglvaalk537fza2nhzjacm7aanrnwsz0grg00ln0a06hb8wcb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -292041,6 +292530,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "static-bytes_0_1_1" = callPackage + ({ mkDerivation, base, bytestring, hspec, hspec-discover, memory + , primitive, QuickCheck, rio, text, vector + }: + mkDerivation { + pname = "static-bytes"; + version = "0.1.1"; + sha256 = "14a0ww31y54hsvv2qf1wchpvzbsnxjjwgm13h9ysc3fclkwa0ba9"; + libraryHaskellDepends = [ + base bytestring memory primitive rio vector + ]; + testHaskellDepends = [ + base bytestring hspec memory primitive QuickCheck rio text vector + ]; + testToolDepends = [ hspec-discover ]; + description = "A Haskell library providing types representing 8, 16, 32, 64 or 128 bytes of data"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "static-canvas" = callPackage ({ mkDerivation, base, double-conversion, free, mtl, text }: mkDerivation { @@ -293966,27 +294475,6 @@ self: { }) {}; "streaming-bytestring" = callPackage - ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim - , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit - , tasty-smallcheck, transformers, transformers-base - }: - mkDerivation { - pname = "streaming-bytestring"; - version = "0.3.2"; - sha256 = "0rxsxm0an21d2wrngg61vdz7lqcigi7fs96n8003yfcnah63qnw8"; - libraryHaskellDepends = [ - base bytestring deepseq exceptions ghc-prim mmorph mtl resourcet - streaming transformers transformers-base - ]; - testHaskellDepends = [ - base bytestring resourcet smallcheck streaming tasty tasty-hunit - tasty-smallcheck transformers - ]; - description = "Fast, effectful byte streams"; - license = lib.licenses.bsd3; - }) {}; - - "streaming-bytestring_0_3_3" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit , tasty-smallcheck, transformers, transformers-base @@ -294005,7 +294493,6 @@ self: { ]; description = "Fast, effectful byte streams"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "streaming-cassava" = callPackage @@ -294420,20 +294907,24 @@ self: { }) {}; "streamly-archive" = callPackage - ({ mkDerivation, archive, base, bytestring, cryptonite, directory - , filepath, QuickCheck, streamly, streamly-core, tar, tasty - , tasty-hunit, tasty-quickcheck, temporary, zlib + ({ mkDerivation, archive, async, base, bytestring, containers + , cryptonite, directory, filepath, QuickCheck, split, streamly + , streamly-core, tar, tasty, tasty-hunit, tasty-quickcheck + , temporary, zlib }: mkDerivation { pname = "streamly-archive"; - version = "0.2.0"; - sha256 = "0sjshmvndrysbfpj0w05khpga2qsb375iqpfwl6d822vaaxsykq2"; + version = "0.3.0"; + sha256 = "1azjv8lsy4mp9brz6zdfls4srxr8zl3ki80d50k7ikzxhv117sp1"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base bytestring streamly streamly-core ]; + libraryHaskellDepends = [ + base bytestring containers streamly streamly-core + ]; librarySystemDepends = [ archive ]; testHaskellDepends = [ - base bytestring cryptonite directory filepath QuickCheck streamly - streamly-core tar tasty tasty-hunit tasty-quickcheck temporary zlib + async base bytestring containers cryptonite directory filepath + QuickCheck split streamly streamly-core tar tasty tasty-hunit + tasty-quickcheck temporary zlib ]; testSystemDepends = [ archive ]; description = "Stream data from archives using the streamly library"; @@ -294574,21 +295065,24 @@ self: { }) {}; "streamly-lmdb" = callPackage - ({ mkDerivation, async, base, bytestring, directory, lmdb - , QuickCheck, streamly, streamly-core, tasty, tasty-quickcheck - , temporary + ({ mkDerivation, async, base, bytestring, cereal, containers + , directory, lifted-base, lmdb, monad-control, mtl, QuickCheck + , random, safe-exceptions, stm, streamly, streamly-core, tasty + , tasty-hunit, tasty-quickcheck, temporary, transformers, vector }: mkDerivation { pname = "streamly-lmdb"; - version = "0.7.0"; - sha256 = "1hr3zpvvnazxss12nqys000vcgvbni3c7zl14pi3j838dsw72qwi"; + version = "0.8.0"; + sha256 = "1yi3nfkv8jd3wl4hap4zcxs760ff61a0yxqvqz0jv0f0164czjkp"; libraryHaskellDepends = [ - async base bytestring streamly streamly-core + base bytestring containers directory lifted-base monad-control + safe-exceptions stm streamly streamly-core ]; librarySystemDepends = [ lmdb ]; testHaskellDepends = [ - async base bytestring directory QuickCheck streamly streamly-core - tasty tasty-quickcheck temporary + async base bytestring cereal containers directory mtl QuickCheck + random streamly streamly-core tasty tasty-hunit tasty-quickcheck + temporary transformers vector ]; testSystemDepends = [ lmdb ]; description = "Stream data to or from LMDB databases using the streamly library"; @@ -296023,8 +296517,8 @@ self: { }: mkDerivation { pname = "strongweak"; - version = "0.9.1"; - sha256 = "0bq9vamnzidmcbapn6lc6vyz3lk2m0ld475z6a311xr5x0d70vad"; + version = "0.11.0"; + sha256 = "0bzx25pwc2mg92f72lj32g78yn5gx8pl8341cxbv3j0ysim1fhfj"; libraryHaskellDepends = [ base rerefined text text-builder-linear vector vector-sized ]; @@ -298525,14 +299019,14 @@ self: { license = "unknown"; }) {}; - "sydtest-aeson_0_2_0_0" = callPackage + "sydtest-aeson_0_2_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq , directory, path, path-io, sydtest, sydtest-discover, text }: mkDerivation { pname = "sydtest-aeson"; - version = "0.2.0.0"; - sha256 = "14acwqaxb3dizpqa6xz7wpnb2qssyfzqh4g3g7dxdbk04sypz34h"; + version = "0.2.0.1"; + sha256 = "0qxbsbrz1vyafg7wx2yappzqj821dr86cafx34rx15zbyrbkmpvz"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq path path-io sydtest text @@ -298657,6 +299151,25 @@ self: { broken = true; }) {}; + "sydtest-hspec_0_4_0_3" = callPackage + ({ mkDerivation, base, hspec, hspec-core, mtl, QuickCheck, stm + , sydtest, sydtest-discover + }: + mkDerivation { + pname = "sydtest-hspec"; + version = "0.4.0.3"; + sha256 = "1vnc6b8vswqbpz6l2rgx4r8k658wzdmv4ca601rfy03539n98nzl"; + libraryHaskellDepends = [ + base hspec-core mtl QuickCheck stm sydtest + ]; + testHaskellDepends = [ base hspec stm sydtest ]; + testToolDepends = [ sydtest-discover ]; + description = "An Hspec companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "sydtest-mongo" = callPackage ({ mkDerivation, base, binary, bson, bytestring, mongoDB, network , path, path-io, port-utils, process, sydtest, sydtest-discover @@ -300912,43 +301425,45 @@ self: { ({ mkDerivation, aeson, ansi-terminal, base, broadcast-chan , bytestring, conduit, containers, data-default, dbus , dbus-hslogger, directory, dyre, either, enclosed-exceptions - , filepath, gi-cairo, gi-cairo-connector, gi-cairo-render, gi-gdk + , filepath, gi-cairo-connector, gi-cairo-render, gi-gdk , gi-gdkpixbuf, gi-gdkx11, gi-glib, gi-gtk, gi-gtk-hs, gi-pango - , gtk-sni-tray, gtk-strut, gtk3, haskell-gi, haskell-gi-base - , hslogger, HStringTemplate, http-client, http-client-tls - , http-conduit, http-types, multimap, old-locale + , gtk-sni-tray, gtk-strut, gtk3, haskell-gi-base, hslogger, hspec + , hspec-core, hspec-discover, hspec-golden, HStringTemplate + , http-client, http-client-tls, http-conduit, http-types, multimap , optparse-applicative, parsec, process, rate-limit, regex-compat , safe, scotty, split, status-notifier-item, stm, template-haskell - , text, time, time-locale-compat, time-units, transformers - , transformers-base, tuple, unix, utf8-string, X11, xdg-basedir + , temporary, text, time, time-locale-compat, time-units + , transformers, tuple, unix, utf8-string, X11, xdg-basedir , xdg-desktop-entry, xml, xml-helpers, xmonad }: mkDerivation { pname = "taffybar"; - version = "4.0.2"; - sha256 = "1w1lsz8bk4xq4dzsfi2yf3x036a8y6b14jpil74c1xbicjc74gmg"; + version = "4.0.3"; + sha256 = "107hajq6y3hb9n80zncc8qi74dn6qqp7mic4xagnmah82sk1k5x9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal base broadcast-chan bytestring conduit containers data-default dbus dbus-hslogger directory dyre either - enclosed-exceptions filepath gi-cairo gi-cairo-connector - gi-cairo-render gi-gdk gi-gdkpixbuf gi-gdkx11 gi-glib gi-gtk - gi-gtk-hs gi-pango gtk-sni-tray gtk-strut haskell-gi - haskell-gi-base hslogger HStringTemplate http-client - http-client-tls http-conduit http-types multimap old-locale parsec + enclosed-exceptions filepath gi-cairo-connector gi-cairo-render + gi-gdk gi-gdkpixbuf gi-gdkx11 gi-glib gi-gtk gi-gtk-hs gi-pango + gtk-sni-tray gtk-strut haskell-gi-base hslogger HStringTemplate + http-client http-client-tls http-conduit http-types multimap parsec process rate-limit regex-compat safe scotty split status-notifier-item stm template-haskell text time - time-locale-compat time-units transformers transformers-base tuple - unix utf8-string X11 xdg-basedir xdg-desktop-entry xml xml-helpers - xmonad + time-locale-compat time-units transformers tuple unix utf8-string + X11 xdg-basedir xdg-desktop-entry xml xml-helpers xmonad ]; libraryPkgconfigDepends = [ gtk3 ]; executableHaskellDepends = [ base data-default directory hslogger optparse-applicative ]; executablePkgconfigDepends = [ gtk3 ]; + testHaskellDepends = [ + base directory filepath hspec hspec-core hspec-golden temporary + ]; + testToolDepends = [ hspec-discover ]; description = "A desktop bar similar to xmobar, but with more GUI"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; @@ -302695,6 +303210,8 @@ self: { pname = "tasty-flaky"; version = "0.1.0.0"; sha256 = "1p0lvfics2p98jhg46m1gl7lrpq73v1waxplvib77pl5q9ymlk87"; + revision = "1"; + editedCabalFile = "0kdx020wypr226q9syn1wiq3a7szyzy66khfzh3ssr290r0sknci"; libraryHaskellDepends = [ base retry tagged tasty ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Handle flaky Tasty-based tests"; @@ -304165,8 +304682,8 @@ self: { }: mkDerivation { pname = "telegram-bot-api"; - version = "7.4"; - sha256 = "0pbp14dg4qdf3vl93f46l6q1gdprkfvhfgi5ll3kln66z2bs40fq"; + version = "7.4.1"; + sha256 = "1ppjyq278ri2467vcyb1z01jsqbirls8lazi1lr8pk9z0sw8mz5y"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring cron filepath hashable http-api-data http-client http-client-tls monad-control mtl @@ -304189,8 +304706,10 @@ self: { }: mkDerivation { pname = "telegram-bot-simple"; - version = "0.14.2"; - sha256 = "10jwvx6m8zqzicfy3iyc9igxlnzyd8h320280q9s53420gzfpdf4"; + version = "0.14.3"; + sha256 = "0h7cpa5zbhz9y362djxznl2q1s0mj1ci6fg071i21fbk1fkjsmhf"; + revision = "1"; + editedCabalFile = "0warsrhsk3vqg9hyr5ircm01shls4n201z7nmjigli1nzzidljf8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -307400,6 +307919,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-show_3_11" = callPackage + ({ mkDerivation, array, base, base-compat-batteries, base-orphans + , bifunctors, bytestring, containers, criterion, deepseq + , deriving-compat, generic-deriving, ghc-boot-th, ghc-prim, hspec + , hspec-discover, QuickCheck, quickcheck-instances + , template-haskell, text, th-abstraction, transformers + , transformers-compat + }: + mkDerivation { + pname = "text-show"; + version = "3.11"; + sha256 = "1hp8bw5cmppdwqjvnmv7h38rckvdpxrzgcvbllgvf4zm9ns6dsr8"; + libraryHaskellDepends = [ + array base base-compat-batteries bifunctors bytestring containers + ghc-boot-th ghc-prim template-haskell text th-abstraction + transformers transformers-compat + ]; + testHaskellDepends = [ + array base base-compat-batteries base-orphans bytestring + deriving-compat generic-deriving ghc-prim hspec QuickCheck + quickcheck-instances template-haskell text transformers + transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; + description = "Efficient conversion of values into Text"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-show-instances" = callPackage ({ mkDerivation, aeson, base, base-compat, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim @@ -307437,6 +307986,42 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-show-instances_3_9_9" = callPackage + ({ mkDerivation, aeson, base, base-compat, bifunctors, binary + , containers, directory, generic-deriving, ghc-boot-th, ghc-prim + , haskeline, hpc, hspec, hspec-discover, nonempty-vector + , old-locale, old-time, pretty, QuickCheck, quickcheck-instances + , random, scientific, semigroups, tagged, template-haskell + , terminfo, text, text-short, text-show, th-orphans, time + , transformers, transformers-compat, unix, unordered-containers + , uuid-types, vector, xhtml + }: + mkDerivation { + pname = "text-show-instances"; + version = "3.9.9"; + sha256 = "0ip2ym2v3rh5bi6mjfxpzrbvbrpqyi2ccaf4kfg5sy0k0yv3nrhm"; + libraryHaskellDepends = [ + aeson base base-compat bifunctors binary containers directory + ghc-boot-th haskeline hpc nonempty-vector old-locale old-time + pretty random scientific semigroups tagged template-haskell + terminfo text text-short text-show time transformers unix + unordered-containers uuid-types vector xhtml + ]; + testHaskellDepends = [ + aeson base base-compat bifunctors binary containers directory + generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec + nonempty-vector old-locale old-time pretty QuickCheck + quickcheck-instances random scientific tagged template-haskell + terminfo text-short text-show th-orphans time transformers + transformers-compat unix unordered-containers uuid-types vector + xhtml + ]; + testToolDepends = [ hspec-discover ]; + description = "Additional instances for text-show"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-stream-decode" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, hspec, text }: @@ -308261,8 +308846,8 @@ self: { pname = "th-lift"; version = "0.8.4"; sha256 = "06x6njyn6p6shwj5n1znq017vwalr867ziwbwzimz9jbilipgigr"; - revision = "2"; - editedCabalFile = "1cwc4q408b9pina7069hi8v3m9nqa5c6sm8lamr5ssialiwchcig"; + revision = "3"; + editedCabalFile = "053glydkbz2h03s4l0isbabp4w4w4b8k3xfd61awf5vdnnyrq612"; libraryHaskellDepends = [ base ghc-prim template-haskell th-abstraction ]; @@ -308271,6 +308856,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-lift_0_8_5" = callPackage + ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction + }: + mkDerivation { + pname = "th-lift"; + version = "0.8.5"; + sha256 = "0xhivxk89y76jkgm636d1qan3ssgiqk2g23abzdfgpq29s6mm739"; + libraryHaskellDepends = [ + base ghc-prim template-haskell th-abstraction + ]; + testHaskellDepends = [ base ghc-prim template-haskell ]; + description = "Derive Template Haskell's Lift class for datatypes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-lift-instances" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck , template-haskell, text, th-lift, transformers, vector @@ -308311,8 +308912,8 @@ self: { pname = "th-orphans"; version = "0.13.14"; sha256 = "0z07qcbbsj2b3j9p1qr4jvlpa7qgjfjvymkjd6vbizka1wd2mnwx"; - revision = "3"; - editedCabalFile = "19gh8f082ia27ch7xjj41vwlp7234sv545hhb3kcwkmw9brc67aj"; + revision = "4"; + editedCabalFile = "10fq55a34h1cysgigf1s2vlb0ka9s7d0lklpk63zla53fx7jshrl"; libraryHaskellDepends = [ base mtl template-haskell th-compat th-lift th-reify-many ]; @@ -308324,6 +308925,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-orphans_0_13_15" = callPackage + ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover + , mtl, template-haskell, th-compat, th-lift, th-reify-many + }: + mkDerivation { + pname = "th-orphans"; + version = "0.13.15"; + sha256 = "1gayl4afrl9swqhb12z5z84zl8vx684xj90s9h57029a72vjrl0k"; + libraryHaskellDepends = [ + base mtl template-haskell th-compat th-lift th-reify-many + ]; + testHaskellDepends = [ + base bytestring ghc-prim hspec template-haskell th-lift + ]; + testToolDepends = [ hspec-discover ]; + description = "Orphan instances for TH datatypes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-pprint" = callPackage ({ mkDerivation, base, lens, pretty, template-haskell }: mkDerivation { @@ -311467,7 +312088,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "tls_2_1_0" = callPackage + "tls_2_1_1" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base , base16-bytestring, bytestring, cereal, crypton, crypton-x509 , crypton-x509-store, crypton-x509-validation, data-default-class @@ -311476,8 +312097,8 @@ self: { }: mkDerivation { pname = "tls"; - version = "2.1.0"; - sha256 = "1i84j49gb1dgyqf4rwdrnjp47rynmyavh05dkijbj82qdcxjmb6v"; + version = "2.1.1"; + sha256 = "1rzbyrc5x4zq0xdm5h4h0jh2l2ajhbjx5qny6x79ij7zv0c79hkp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -314387,7 +315008,7 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "tree-diff_0_3_1" = callPackage + "tree-diff_0_3_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base , bytestring, containers, criterion, deepseq, Diff, hashable , parsec, parsers, pretty, primitive, QuickCheck, scientific @@ -314397,10 +315018,8 @@ self: { }: mkDerivation { pname = "tree-diff"; - version = "0.3.1"; - sha256 = "0ixv5122yz6p6a0vfjn5hgp81bs6dx6x3q731cwjyx03dr9lzicb"; - revision = "1"; - editedCabalFile = "1ga0xnyv24fgjiifypq95l7nhlm86swqscakfm98kxqi91gbzr5y"; + version = "0.3.2"; + sha256 = "067lf9fw0lk9pay6di6scc00sfg9p0n2avxs0wsqlyin9xc9h18v"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base bytestring containers deepseq hashable parsec parsers pretty primitive QuickCheck @@ -316128,8 +316747,8 @@ self: { }: mkDerivation { pname = "twain"; - version = "2.1.2.0"; - sha256 = "1hkzp2g671dagmv1qznkf3mw3l2mslckg7h0a8x8633h6i3j6br0"; + version = "2.2.0.0"; + sha256 = "1d69hc5nxc6pxbwbf13ch9yfmf9zphznv1w9hmszbndjwpc767nj"; libraryHaskellDepends = [ aeson base bytestring case-insensitive cookie either exceptions http-types http2 text time transformers vault wai wai-extra @@ -318269,6 +318888,8 @@ self: { testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Plugin to faciliate type-level let"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "typelevel" = callPackage @@ -318708,12 +319329,12 @@ self: { license = lib.licenses.mit; }) {}; - "typst-symbols_0_1_6" = callPackage + "typst-symbols_0_1_7" = callPackage ({ mkDerivation, base, text }: mkDerivation { pname = "typst-symbols"; - version = "0.1.6"; - sha256 = "17a2grflk67vs68b2pxygvk7p50rj9fb3ri7fcwa19j9jnhg4zwl"; + version = "0.1.7"; + sha256 = "1f158pjvkbx05aj0nv4qwlz2h7a811v9r7nlhnp54vws4h4rdvnz"; libraryHaskellDepends = [ base text ]; description = "Symbol and emoji lookup for typst language"; license = lib.licenses.mit; @@ -318752,8 +319373,8 @@ self: { pname = "tz"; version = "0.1.3.6"; sha256 = "1vqnfk656i6j3j1bf9lc36adziv52x1b2ccq6afp8cka1nay2mcd"; - revision = "6"; - editedCabalFile = "0za67vc1lvadrl6r287cmkkz7cnharm1yhsyin8qbn9xlm5r8ci0"; + revision = "7"; + editedCabalFile = "0awsb34hf2r6j0qkl0b087hdwcig33cmnfjwrl5w3mj35ligffja"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq template-haskell time tzdata vector @@ -319755,8 +320376,8 @@ self: { }: mkDerivation { pname = "unclogging"; - version = "0.1.0.2"; - sha256 = "1w38pifsff5c2p22afnnw6c6n5qxivyvbdciy5z0d46q7nxqgysr"; + version = "0.1.0.3"; + sha256 = "1iy5aacr19xcabs0q2a2vqc43lsaxayy8avw0wbnkqnb5y7cjm5c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -319772,6 +320393,17 @@ self: { mainProgram = "unclogging"; }) {}; + "unconditional-jump" = callPackage + ({ mkDerivation, base, int-supply }: + mkDerivation { + pname = "unconditional-jump"; + version = "1.0.0"; + sha256 = "1nmzqph0wchzr2cq7009d9xfchryb0nis74mcj7nbkz42r14k570"; + libraryHaskellDepends = [ base int-supply ]; + description = "Unconditional jumps"; + license = lib.licenses.bsd3; + }) {}; + "unconstrained" = callPackage ({ mkDerivation }: mkDerivation { @@ -321479,15 +322111,15 @@ self: { }) {}; "universum" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, gauge - , ghc-prim, hashable, hedgehog, microlens, microlens-mtl, mtl + ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim + , hashable, hedgehog, microlens, microlens-mtl, mtl , safe-exceptions, stm, tasty, tasty-discover, tasty-hedgehog, text , transformers, unordered-containers, utf8-string, vector }: mkDerivation { pname = "universum"; - version = "1.8.2.1"; - sha256 = "06kv2p7792r4d7nsq1wx7vw5jy72fjacc2jwmkqfanaaapdr27q9"; + version = "1.8.2.2"; + sha256 = "0h8ckr60gm5wxly5zyij9avzmlzljp21njd1k9j13nj5z23i1idp"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text transformers @@ -321497,9 +322129,6 @@ self: { base bytestring hedgehog tasty tasty-hedgehog text ]; testToolDepends = [ tasty-discover ]; - benchmarkHaskellDepends = [ - base containers gauge text unordered-containers - ]; description = "Custom prelude used in Serokell"; license = lib.licenses.mit; }) {}; @@ -321538,8 +322167,8 @@ self: { }: mkDerivation { pname = "unix-compat"; - version = "0.7.2"; - sha256 = "02v9lr7i7m3nrd8wkg2psdm41i7vc0mzaqks89ds05lv9qsjqf2q"; + version = "0.7.3"; + sha256 = "11qxh9l2kqx4pqphbbmcbmc9bb2mifnjmzlcbkak5mjj163sskvs"; libraryHaskellDepends = [ base unix ]; testHaskellDepends = [ base directory extra hspec HUnit monad-parallel temporary @@ -323607,8 +324236,8 @@ self: { }: mkDerivation { pname = "utxorpc"; - version = "0.0.10.0"; - sha256 = "0y1v4a8shg05mphcly4n77qf8a3jp43girc9kf3302p8sjgx2zv2"; + version = "0.0.11.0"; + sha256 = "1bnkhm21g67x1jr7lwybg5yj5n34jlhkf5j2fqzczdfggv4z6vnq"; libraryHaskellDepends = [ base proto-lens proto-lens-protobuf-types proto-lens-runtime ]; @@ -325467,8 +326096,8 @@ self: { pname = "vector"; version = "0.13.1.0"; sha256 = "1vpcxn0zkhmvksz373iz66bv42f358jv3zqg390vk2mbkqkp5wk3"; - revision = "1"; - editedCabalFile = "03fpy8vnjyk7hw6sci361pmb05jl5z05yb08yjv5wxqxnp7jq0xw"; + revision = "2"; + editedCabalFile = "0ii5bzccaw632sjz9avbasmfabxc82w9vrn6lala9x9d1dyllmn8"; libraryHaskellDepends = [ base deepseq primitive vector-stream ]; testHaskellDepends = [ base base-orphans doctest HUnit primitive QuickCheck random tasty @@ -326060,8 +326689,8 @@ self: { pname = "vector-stream"; version = "0.1.0.1"; sha256 = "0z5z88flyassdpgga412qci6brr9gyljbx875wd479fy9crhgxfh"; - revision = "1"; - editedCabalFile = "17sa7mq3maphzgwdjwxr1q9dm92gz4hcbyk0d3hkayqxswp9x9hn"; + revision = "2"; + editedCabalFile = "0lcsvwlpipdiafw7w6lf2mqfg5b8fmh2jrrs3s6j7hsjm09vs3id"; libraryHaskellDepends = [ base ghc-prim ]; description = "Efficient Streams"; license = lib.licenses.bsd3; @@ -327201,8 +327830,8 @@ self: { }: mkDerivation { pname = "vivid"; - version = "0.5.2.0"; - sha256 = "1p4x6q2ks259xzigj31f8bz3562k07dzj77a9bnhl934sl85hz6q"; + version = "0.5.2.1"; + sha256 = "006y380fva59xr5wv6vn802wxssd91fgvfvb3g65zscv8dhb0z5d"; libraryHaskellDepends = [ base binary bytestring cereal containers directory filepath hashable MonadRandom mtl network process random random-shuffle @@ -328570,6 +329199,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "wai-logger_2_5_0" = callPackage + ({ mkDerivation, base, byteorder, bytestring, fast-logger + , http-types, network, wai + }: + mkDerivation { + pname = "wai-logger"; + version = "2.5.0"; + sha256 = "1171qfz6wlmq69virwvlg79j4smk6sqhdvrdpnisr50zdc3x7ysw"; + libraryHaskellDepends = [ + base byteorder bytestring fast-logger http-types network wai + ]; + description = "A logging system for WAI"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "wai-logger-buffered" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , http-types, time, wai, warp @@ -329279,6 +329924,8 @@ self: { pname = "wai-middleware-throttle"; version = "0.3.0.1"; sha256 = "0mpw7b56k1a89kzwa3v4c4ff66m0py9s9p2jan2zhp8k3b8862jq"; + revision = "1"; + editedCabalFile = "1d6zyjpvjm03vsmi04n9zdmaxlq5by326lyf0xlvh05562jnvrqc"; libraryHaskellDepends = [ base bytestring bytestring-builder cache clock containers hashable http-types mtl network safe-exceptions stm text token-bucket @@ -330137,42 +330784,6 @@ self: { broken = true; }) {}; - "warp_3_3_30" = callPackage - ({ mkDerivation, array, auto-update, base, bsb-http-chunked - , bytestring, case-insensitive, containers, crypton-x509, directory - , gauge, ghc-prim, hashable, hspec, hspec-discover, http-client - , http-date, http-types, http2, iproute, network, process - , QuickCheck, recv, simple-sendfile, stm, streaming-commons, text - , time-manager, unix, unliftio, vault, wai, word8 - }: - mkDerivation { - pname = "warp"; - version = "3.3.30"; - sha256 = "1i5fnvc9n7w013asj7ckpfb59ybbvhif4d6f4g5jwwad50jmlbpg"; - libraryHaskellDepends = [ - array auto-update base bsb-http-chunked bytestring case-insensitive - containers crypton-x509 ghc-prim hashable http-date http-types - http2 iproute network recv simple-sendfile stm streaming-commons - text time-manager unix unliftio vault wai word8 - ]; - testHaskellDepends = [ - array auto-update base bsb-http-chunked bytestring case-insensitive - containers crypton-x509 directory ghc-prim hashable hspec - http-client http-date http-types http2 iproute network process - QuickCheck recv simple-sendfile stm streaming-commons text - time-manager unix unliftio vault wai word8 - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - auto-update base bytestring containers crypton-x509 gauge hashable - http-date http-types network recv time-manager unix unliftio - ]; - description = "A fast, light-weight web server for WAI applications"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.alexfmpe ]; - }) {}; - "warp" = callPackage ({ mkDerivation, array, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, crypton-x509, directory @@ -330208,7 +330819,7 @@ self: { maintainers = [ lib.maintainers.alexfmpe ]; }) {}; - "warp_3_4_2" = callPackage + "warp_3_4_3" = callPackage ({ mkDerivation, array, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, crypton-x509, directory , gauge, ghc-prim, hashable, hspec, hspec-discover, http-client @@ -330218,8 +330829,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.4.2"; - sha256 = "0b7f5darsa7n2bwlnj46xrgwbrb46yl62qyrcq84hvdpq2sfnxdl"; + version = "3.4.3"; + sha256 = "1g6g3bm8a4yjrd3h6r31ypf93r2as93d7cy17z6chwv8p41v0c86"; libraryHaskellDepends = [ array auto-update base bsb-http-chunked bytestring case-insensitive containers crypton-x509 ghc-prim hashable http-date http-types @@ -330906,15 +331517,16 @@ self: { "web-rep" = callPackage ({ mkDerivation, async, base, bifunctors, box, box-socket - , bytestring, flatparse, markup-parse, mtl, optics-core - , optics-extra, optparse-applicative, profunctors, scotty - , string-interpolate, text, transformers, unordered-containers - , wai-middleware-static, wai-websockets, websockets + , bytestring, doctest-parallel, flatparse, markup-parse, mtl + , optics-core, optics-extra, optparse-applicative, profunctors + , scotty, string-interpolate, text, transformers + , unordered-containers, wai-middleware-static, wai-websockets + , websockets }: mkDerivation { pname = "web-rep"; - version = "0.12.1.0"; - sha256 = "0hiqmivic82plziwa2fvc3rfz1h60f8i7vcb6hw65pfrz1aswk6n"; + version = "0.12.3.0"; + sha256 = "10k2fm7g1p54v6gnn045vgc8p58xal17vxin9ah11xqr0dddk7sa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -330926,6 +331538,7 @@ self: { executableHaskellDepends = [ base box markup-parse optics-core optparse-applicative ]; + testHaskellDepends = [ base doctest-parallel ]; description = "representations of a web page"; license = lib.licenses.bsd3; mainProgram = "web-rep-example"; @@ -331171,20 +331784,20 @@ self: { }) {}; "web3-crypto" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, cryptonite + ({ mkDerivation, aeson, base, bytestring, containers, crypton , hspec, hspec-contrib, hspec-discover, hspec-expectations, memory , memory-hexstring, text, uuid-types, vector }: mkDerivation { pname = "web3-crypto"; - version = "1.0.0.0"; - sha256 = "16ygvnkxcalh7a0h7l1bj5gyir79gihcwzzqk31qibvd1r17mwd6"; + version = "1.0.1.0"; + sha256 = "0p5bg9riai1z6wsii4q1i5135v7lcbdgspkhwvacy57w7yda3kda"; libraryHaskellDepends = [ - aeson base bytestring containers cryptonite memory memory-hexstring + aeson base bytestring containers crypton memory memory-hexstring text uuid-types vector ]; testHaskellDepends = [ - aeson base bytestring containers cryptonite hspec hspec-contrib + aeson base bytestring containers crypton hspec hspec-contrib hspec-discover hspec-expectations memory memory-hexstring text uuid-types vector ]; @@ -331634,8 +332247,8 @@ self: { }: mkDerivation { pname = "webdriver-wrapper"; - version = "0.2.0.0"; - sha256 = "0dirnaxab9ddaa5jbqn0bhqlmh8x311vmq0il8xh0r3df5cvmgcg"; + version = "0.2.0.1"; + sha256 = "1dvd2649vapwd8qcfv6arsi119rffbb89mzcpdcwdf827x243sci"; libraryHaskellDepends = [ aeson async base bytestring directory extra filepath http-conduit http-types process process-extras retry string-interpolate tar text @@ -333313,6 +333926,8 @@ self: { pname = "window-utils"; version = "0.2.2.0"; sha256 = "08s9rjpc2idrb5mgrnbwj2d0m8aj33g4v9djyvrkqnq5jb8mbzrz"; + revision = "1"; + editedCabalFile = "154cqir749zr19vap4zxm1dfj6ylz6p7rpqm0n0kmg2vl05ksimv"; libraryHaskellDepends = [ base bytestring JuicyPixels text vector X11 ]; @@ -333526,6 +334141,26 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "witch_1_2_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, HUnit, tagged + , template-haskell, text, time, transformers + }: + mkDerivation { + pname = "witch"; + version = "1.2.2.0"; + sha256 = "0wsy6fd75famn40vhj4ziygqai20szz17x9c4ddz073az4kig4d6"; + libraryHaskellDepends = [ + base bytestring containers tagged template-haskell text time + ]; + testHaskellDepends = [ + base bytestring containers HUnit tagged text time transformers + ]; + description = "Convert values from one type into another"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "with-index" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -339279,8 +339914,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.14.10"; - sha256 = "0as6k36cq8w1p8nqjlnlc8ji45slynxg4aj3p6ping177lw5232h"; + version = "0.14.11"; + sha256 = "11lwp60b11fkkasqflvslp489jrlg9l2x3wlzasikymy729lkrij"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -339554,19 +340189,17 @@ self: { "yaya" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, comonad, doctest - , either, foldable1-classes-compat, free, kan-extensions, lens - , profunctors, strict, template-haskell, th-abstraction - , transformers + , either, free, kan-extensions, lens, profunctors, strict + , template-haskell, th-abstraction, transformers }: mkDerivation { pname = "yaya"; - version = "0.6.2.0"; - sha256 = "1k6w1c89s7c416xjxm23mllcm68l8ya6m7jw2ml9axwsns27kx98"; + version = "0.6.2.2"; + sha256 = "0b6sd8rdp6qys45s2lps0nhmqbs9x63axmhh3k71y81lmzyq1cax"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base comonad either foldable1-classes-compat free kan-extensions - lens profunctors strict template-haskell th-abstraction - transformers + base comonad either free kan-extensions lens profunctors strict + template-haskell th-abstraction transformers ]; testHaskellDepends = [ base doctest ]; description = "Total recursion schemes"; @@ -339581,8 +340214,8 @@ self: { }: mkDerivation { pname = "yaya-containers"; - version = "0.1.2.0"; - sha256 = "03rfpzsrjimlp40s5pbn2fd5v4cby529nhmsh9xna7n8xf6jmm05"; + version = "0.1.2.1"; + sha256 = "17akwh7inlcnizhx600ydf5j6fgbl25cnwm2fr2f6rlabkxvraki"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers yaya ]; testHaskellDepends = [ base doctest ]; @@ -339597,8 +340230,8 @@ self: { }: mkDerivation { pname = "yaya-hedgehog"; - version = "0.3.0.2"; - sha256 = "1kyqbqp84whi9jsygk7x2vhja76h45fk75k7bgh9jwjqfj83zy7s"; + version = "0.3.0.3"; + sha256 = "1adqxgpgarwka93h9xzx6443vj6b0nx4cyrh3dp38zcq2c7xji2v"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base deriving-compat hedgehog yaya ]; testHaskellDepends = [ @@ -339611,14 +340244,14 @@ self: { "yaya-quickcheck" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, doctest, QuickCheck - , splitmix, yaya + , yaya }: mkDerivation { pname = "yaya-quickcheck"; - version = "0.2.0.1"; - sha256 = "0ncnp0m93fyjn9vqp8s0vbvra3v6nin8sh5jr58rv1r5538hkyr5"; + version = "0.2.0.2"; + sha256 = "13c8zyv83sik5ms2p49850jrpvhmr4wacz27ib79pbgp2lh538n9"; setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base QuickCheck splitmix yaya ]; + libraryHaskellDepends = [ base QuickCheck yaya ]; testHaskellDepends = [ base doctest ]; description = "QuickCheck testing support for the Yaya recursion scheme library"; license = lib.licenses.agpl3Plus; @@ -339645,15 +340278,15 @@ self: { }) {}; "yaya-unsafe" = callPackage - ({ mkDerivation, base, bifunctors, Cabal, cabal-doctest, comonad - , doctest, free, hedgehog, lens, yaya, yaya-hedgehog + ({ mkDerivation, base, Cabal, cabal-doctest, comonad, doctest, free + , hedgehog, lens, yaya, yaya-hedgehog }: mkDerivation { pname = "yaya-unsafe"; - version = "0.4.1.1"; - sha256 = "0s3fna5b0g5jxbndzmqsy9bqz8b4ry7p88kspnzv8shrq271mmmk"; + version = "0.4.1.2"; + sha256 = "0n4c2zf6ds2y4433j44hi890rwjchd09qfrdx2s61vis28xqyc1k"; setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base bifunctors comonad free lens yaya ]; + libraryHaskellDepends = [ base comonad free lens yaya ]; testHaskellDepends = [ base doctest hedgehog yaya yaya-hedgehog ]; description = "Non-total extensions to the Yaya recursion scheme library"; license = lib.licenses.agpl3Plus; @@ -340965,6 +341598,29 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-form_1_7_9" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, containers, data-default + , email-validate, hspec, network-uri, persistent, resourcet + , shakespeare, text, time, transformers, wai, xss-sanitize + , yesod-core, yesod-persistent + }: + mkDerivation { + pname = "yesod-form"; + version = "1.7.9"; + sha256 = "1s59d3ccf76dmi43ivcfzbah9b0y18i9c3gv66dmcwy5f6wqhd52"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html blaze-markup + byteable bytestring containers data-default email-validate + network-uri persistent resourcet shakespeare text time transformers + wai xss-sanitize yesod-core yesod-persistent + ]; + testHaskellDepends = [ base hspec text time ]; + description = "Form handling support for Yesod Web Framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-form-bootstrap4" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, shakespeare, text , yesod-core, yesod-form @@ -342006,6 +342662,34 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-test_1_6_19" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, bytestring, case-insensitive, conduit, containers + , cookie, hspec, hspec-core, html-conduit, http-types, HUnit + , memory, mtl, network, pretty-show, text, time, transformers + , unliftio, unliftio-core, wai, wai-extra, xml-conduit, xml-types + , yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-test"; + version = "1.6.19"; + sha256 = "0snq06yps28lkxfc1mhsvbv2kq0h0mi16zjdfrahm4zaz8axkqka"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html blaze-markup + bytestring case-insensitive conduit containers cookie hspec-core + html-conduit http-types HUnit memory mtl network pretty-show text + time transformers wai wai-extra xml-conduit xml-types yesod-core + ]; + testHaskellDepends = [ + base bytestring containers cookie hspec html-conduit http-types + HUnit text unliftio unliftio-core wai wai-extra xml-conduit + yesod-core yesod-form + ]; + description = "integration testing for WAI/Yesod Applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-test-json" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hspec , http-types, HUnit, text, transformers, wai, wai-test @@ -342268,25 +342952,24 @@ self: { "yi" = callPackage ({ mkDerivation, base, microlens-platform, mtl - , optparse-applicative, yi-core, yi-frontend-vty, yi-keymap-emacs - , yi-keymap-vim, yi-misc-modes, yi-mode-haskell, yi-mode-javascript - , yi-rope + , optparse-applicative, yi-core, yi-frontend-pango, yi-frontend-vty + , yi-keymap-emacs, yi-keymap-vim, yi-misc-modes, yi-mode-haskell + , yi-mode-javascript, yi-rope }: mkDerivation { pname = "yi"; - version = "0.19.0"; - sha256 = "1m383r5gx3r9l0mh88gcv3rjnr1ig9rivwg2qz963xqjyhr8y2ni"; + version = "0.19.2"; + sha256 = "04ppydc16w6m0ldvpxq2xr313rwak18c4k4i1jsqlb8drcwfx7ch"; configureFlags = [ "-fpango" "-fvty" ]; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base microlens-platform mtl optparse-applicative yi-core - yi-frontend-vty yi-keymap-emacs yi-keymap-vim yi-misc-modes - yi-mode-haskell yi-mode-javascript yi-rope + yi-frontend-pango yi-frontend-vty yi-keymap-emacs yi-keymap-vim + yi-misc-modes yi-mode-haskell yi-mode-javascript yi-rope ]; description = "Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; mainProgram = "yi"; }) {}; @@ -342307,6 +342990,7 @@ self: { description = "Add-ons to Yi, the Haskell-Scriptable Editor"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yi-core" = callPackage @@ -342321,8 +343005,8 @@ self: { }: mkDerivation { pname = "yi-core"; - version = "0.19.3"; - sha256 = "0l0rqvgm1i43x2q4cwdxwy9bmpvgw0wxmcij31yyx2py01ws863i"; + version = "0.19.4"; + sha256 = "0gahw4cxzk9vfx2cnf63vgpcbn874aandml844z3jj6w4v78vbps"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-default directory dlist dynamic-state exceptions filepath hashable ListLike @@ -342337,7 +343021,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq yi-rope ]; description = "Yi editor core library"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-dynamic-configuration" = callPackage @@ -342354,7 +343037,6 @@ self: { ]; description = "Dynamic configuration support for Yi"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-emacs-colours" = callPackage @@ -342366,7 +343048,6 @@ self: { libraryHaskellDepends = [ base containers split yi-language ]; description = "Simple mapping from colour names used in emacs to Color"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-frontend-pango" = callPackage @@ -342376,8 +343057,8 @@ self: { }: mkDerivation { pname = "yi-frontend-pango"; - version = "0.19.1"; - sha256 = "1ijvgxfbwnfpij3qajsci8hllb8n1p3iwd2n1wcp029kwpjhgzk9"; + version = "0.19.2"; + sha256 = "1rghdvcf22rwkjq1p8jdrwlsixy5fi9yclbzfwgyrchzqbrv9nqy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers filepath glib gtk microlens-platform mtl @@ -342386,25 +343067,23 @@ self: { ]; description = "Pango frontend for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-frontend-vty" = callPackage ({ mkDerivation, base, containers, data-default, dlist - , microlens-platform, pointedlist, stm, text, vty, yi-core - , yi-language, yi-rope + , microlens-platform, pointedlist, stm, text, vty + , vty-crossplatform, yi-core, yi-language, yi-rope }: mkDerivation { pname = "yi-frontend-vty"; - version = "0.19.0"; - sha256 = "1vdpfqmvig16jissmra1p9zc42fs4kf2bxspy23bf8mihfr99ays"; + version = "0.19.1"; + sha256 = "1n73vvyzwl1f94z1gwr2pacw0hnm2gqcqwbji3qps301802337vs"; libraryHaskellDepends = [ base containers data-default dlist microlens-platform pointedlist - stm text vty yi-core yi-language yi-rope + stm text vty vty-crossplatform yi-core yi-language yi-rope ]; description = "Vty frontend for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-fuzzy-open" = callPackage @@ -342423,7 +343102,6 @@ self: { ]; description = "Fuzzy open plugin for yi"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-gtk" = callPackage @@ -342451,7 +343129,6 @@ self: { ]; description = "Yi editor incremental reader"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-keymap-cua" = callPackage @@ -342467,7 +343144,6 @@ self: { ]; description = "Cua keymap for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-keymap-emacs" = callPackage @@ -342487,7 +343163,6 @@ self: { ]; description = "Emacs keymap for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-keymap-vim" = callPackage @@ -342516,7 +343191,6 @@ self: { ]; description = "Vim keymap for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-language" = callPackage @@ -342528,8 +343202,8 @@ self: { }: mkDerivation { pname = "yi-language"; - version = "0.19.0"; - sha256 = "18r875casrk66ck8q9p1r0c4cfjjgyd5l3gxldr95rqdjci3c09z"; + version = "0.19.1"; + sha256 = "0vy0dsrgg3mg1v982v71rlyshsf64rzx25x667ybsk27sl7jp6r0"; libraryHaskellDepends = [ array base binary containers data-default hashable microlens-platform oo-prototypes pointedlist regex-base regex-tdfa @@ -342544,8 +343218,6 @@ self: { ]; description = "Collection of language-related Yi libraries"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-misc-modes" = callPackage @@ -342554,8 +343226,8 @@ self: { }: mkDerivation { pname = "yi-misc-modes"; - version = "0.19.0"; - sha256 = "1g65mfafrq5dzcrcapisvyvs5frwjmy50zfkxrv0wfsdcfapkn7s"; + version = "0.19.1"; + sha256 = "1j0rq3495ywac5yk5ar7c77jfahi8rm3ivf25wdw0kbfc764bs95"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform text yi-core yi-language yi-rope @@ -342563,7 +343235,6 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor miscellaneous modes"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-mode-haskell" = callPackage @@ -342572,8 +343243,8 @@ self: { }: mkDerivation { pname = "yi-mode-haskell"; - version = "0.19.0"; - sha256 = "1hnwxqzaqg7zyfr7rd3l0la5hc8f4px4d0y78kq3xpy4pzx3yr8y"; + version = "0.19.1"; + sha256 = "1hhf98gvwfl8y51jkab1nxvm8ma1h19qjqzc7nvmjb9mz9c4clzw"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform text yi-core yi-language yi-rope @@ -342581,7 +343252,6 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor haskell mode"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-mode-javascript" = callPackage @@ -342591,10 +343261,8 @@ self: { }: mkDerivation { pname = "yi-mode-javascript"; - version = "0.19.0"; - sha256 = "1zgx36kagalna8lk60i0djn6mvl6ki55x4kc7mzq2mgzcs292zq1"; - revision = "1"; - editedCabalFile = "09hdiy51i9piyh6889hzjhna8g9hlblrzgzkl8x6rc6pl12dg3wc"; + version = "0.19.1"; + sha256 = "0d1ishhv6sfk0q711rbapr5srf28n7rrf0m5kjd382r13266wr3a"; libraryHaskellDepends = [ array base binary data-default dlist filepath microlens-platform mtl text yi-core yi-language yi-rope @@ -342602,7 +343270,6 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor javascript mode"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-monokai" = callPackage @@ -342615,6 +343282,7 @@ self: { description = "Monokai colour theme for the Yi text editor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yi-rope" = callPackage @@ -342654,7 +343322,6 @@ self: { ]; description = "Snippet support for yi"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-solarized" = callPackage @@ -342667,6 +343334,7 @@ self: { description = "Solarized colour theme for the Yi text editor"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yi-spolsky" = callPackage @@ -342679,6 +343347,7 @@ self: { description = "Spolsky colour theme for the Yi text editor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yi-vty" = callPackage diff --git a/pkgs/development/haskell-modules/patches/password-3.0.4.0-scrypt-conditional.patch b/pkgs/development/haskell-modules/patches/password-3.0.4.0-scrypt-conditional.patch new file mode 100644 index 000000000000..1e9cc4c65ded --- /dev/null +++ b/pkgs/development/haskell-modules/patches/password-3.0.4.0-scrypt-conditional.patch @@ -0,0 +1,21 @@ +diff --git a/password/password.cabal b/password/password.cabal +index 506457e..8fa978b 100644 +--- a/password.cabal ++++ b/password.cabal +@@ -186,6 +186,8 @@ test-suite password-tasty + other-modules: + Scrypt + Data.Password.Scrypt ++ build-depends: ++ scrypt + ghc-options: + -threaded -O2 -rtsopts -with-rtsopts=-N + build-depends: +@@ -195,7 +197,6 @@ test-suite password-tasty + , bytestring + , memory + , quickcheck-instances +- , scrypt + , tasty + , tasty-hunit + , tasty-quickcheck diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 0d2ebd009731..7e926d682810 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -140,10 +140,6 @@ let ] ++ lib.optionals (x11Support && stdenv.hostPlatform.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Fix darwin build https://bugs.python.org/issue34027 - ../3.7/darwin-libutil.patch - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # Disable the use of ldconfig in ctypes.util.find_library (since diff --git a/pkgs/development/interpreters/python/cpython/3.11/darwin-libutil.patch b/pkgs/development/interpreters/python/cpython/3.11/darwin-libutil.patch deleted file mode 100644 index 92b846be0002..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.11/darwin-libutil.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 40229bce0f..3cc604930e 100644 ---- a/Modules/posixmodule.c -+++ b/Modules/posixmodule.c -@@ -7258,7 +7258,7 @@ os_sched_getaffinity_impl(PyObject *module, pid_t pid) - #ifdef HAVE_UTMP_H - #include - #endif /* HAVE_UTMP_H */ --#elif defined(HAVE_LIBUTIL_H) -+#elif defined(HAVE_LIBUTIL_H) && !defined(__APPLE__) - #include - #elif defined(HAVE_UTIL_H) - #include diff --git a/pkgs/development/interpreters/python/cpython/3.14/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.14/no-ldconfig.patch new file mode 100644 index 000000000000..5d176dd38de7 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.14/no-ldconfig.patch @@ -0,0 +1,40 @@ +diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py +index 117bf06cb01..ff50cb083bd 100644 +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -280,34 +280,7 @@ def find_library(name, is64 = False): + else: + + def _findSoname_ldconfig(name): +- import struct +- if struct.calcsize('l') == 4: +- machine = os.uname().machine + '-32' +- else: +- machine = os.uname().machine + '-64' +- mach_map = { +- 'x86_64-64': 'libc6,x86-64', +- 'ppc64-64': 'libc6,64bit', +- 'sparc64-64': 'libc6,64bit', +- 's390x-64': 'libc6,64bit', +- 'ia64-64': 'libc6,IA-64', +- } +- abi_type = mach_map.get(machine, 'libc6') +- +- # XXX assuming GLIBC's ldconfig (with option -p) +- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s' +- regex = os.fsencode(regex % (re.escape(name), abi_type)) +- try: +- with subprocess.Popen(['/sbin/ldconfig', '-p'], +- stdin=subprocess.DEVNULL, +- stderr=subprocess.DEVNULL, +- stdout=subprocess.PIPE, +- env={'LC_ALL': 'C', 'LANG': 'C'}) as p: +- res = re.search(regex, p.stdout.read()) +- if res: +- return os.fsdecode(res.group(1)) +- except OSError: +- pass ++ return None + + def _findLib_ld(name): + # See issue #9998 for why this is needed diff --git a/pkgs/development/interpreters/python/cpython/3.7/darwin-libutil.patch b/pkgs/development/interpreters/python/cpython/3.7/darwin-libutil.patch deleted file mode 100644 index 51e3cb6d7f11..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.7/darwin-libutil.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index c3682b4..16826c6 100644 ---- a/Modules/posixmodule.c -+++ b/Modules/posixmodule.c -@@ -5880,15 +5880,13 @@ error: - #if defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) || defined(HAVE_DEV_PTMX) - #ifdef HAVE_PTY_H - #include --#else -+#endif - #ifdef HAVE_LIBUTIL_H - #include --#else -+#endif - #ifdef HAVE_UTIL_H - #include --#endif /* HAVE_UTIL_H */ --#endif /* HAVE_LIBUTIL_H */ --#endif /* HAVE_PTY_H */ -+#endif - #ifdef HAVE_STROPTS_H - #include - #endif diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index f9da42de0b1c..20c7c0c145ef 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -271,11 +271,6 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { ] ++ optionals mimetypesSupport [ # Make the mimetypes module refer to the right file ./mimetypes.patch - ] ++ optionals (pythonAtLeast "3.7" && pythonOlder "3.11") [ - # Fix darwin build https://bugs.python.org/issue34027 - ./3.7/darwin-libutil.patch - ] ++ optionals (pythonAtLeast "3.11") [ - ./3.11/darwin-libutil.patch ] ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.hostPlatform.isDarwin) [ # Stop checking for TCL/TK in global macOS locations ./3.9/darwin-tcl-tk.patch diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 5fd049a9e964..7f0c8ce68110 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -93,6 +93,18 @@ in { hash = "sha256-CG3liC48sxDU3KSEV1IuLkgBjs1D2pzfgn9qB1nvsH0="; inherit passthruFun; }; + + python314 = callPackage ./cpython { + self = __splicedPackages.python314; + sourceVersion = { + major = "3"; + minor = "14"; + patch = "0"; + suffix = "a1"; + }; + hash = "sha256-PkZLDLt1NeLbNCYv0ZoKOT0OYr4PQ7FRPtmDebBU6tQ="; + inherit passthruFun; + }; # Minimal versions of Python (built without optional dependencies) python3Minimal = (callPackage ./cpython ({ self = __splicedPackages.python3Minimal; diff --git a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh index 3d70de729f2d..430951bac7c9 100644 --- a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh @@ -1,22 +1,27 @@ # Setup hook to use for pip projects -echo "Sourcing pip-build-hook" +# shellcheck shell=bash -declare -a pipBuildFlags +echo "Sourcing pip-build-hook" pipBuildPhase() { echo "Executing pipBuildPhase" runHook preBuild mkdir -p dist + + local -a flagsArray=( + --verbose + --no-index + --no-deps + --no-clean + --no-build-isolation + --wheel-dir dist + ) + concatTo flagsArray pipBuildFlags + echo "Creating a wheel..." - @pythonInterpreter@ -m pip wheel \ - --verbose \ - --no-index \ - --no-deps \ - --no-clean \ - --no-build-isolation \ - --wheel-dir dist \ - $pipBuildFlags . + echoCmd 'pip build flags' "${flagsArray[@]}" + @pythonInterpreter@ -m pip wheel "${flagsArray[@]}" . echo "Finished creating a wheel..." runHook postBuild diff --git a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh index a4f08b8b14cb..0f718a6c4bb8 100644 --- a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh @@ -1,17 +1,27 @@ # Setup hook for pip. -echo "Sourcing pip-install-hook" +# shellcheck shell=bash -declare -a pipInstallFlags +echo "Sourcing pip-install-hook" pipInstallPhase() { echo "Executing pipInstallPhase" runHook preInstall + # shellcheck disable=SC2154 mkdir -p "$out/@pythonSitePackages@" export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH" + local -a flagsArray=( + --no-index + --no-warn-script-location + --prefix="$out" + --no-cache + ) + concatTo flagsArray pipInstallFlags + pushd dist || return 1 - @pythonInterpreter@ -m pip install ./*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache $pipInstallFlags + echoCmd 'pip install flags' "${flagsArray[@]}" + @pythonInterpreter@ -m pip install ./*.whl "${flagsArray[@]}" popd || return 1 runHook postInstall diff --git a/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix b/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix index 4153c21ca4f9..f862429d3987 100644 --- a/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix +++ b/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix @@ -10,9 +10,9 @@ ''; # the source of the example project projectSource = runCommand "my-project-source" {} '' - mkdir -p $out/src + mkdir -p $out/src/my_project cp ${pyprojectToml} $out/pyproject.toml - touch $out/src/__init__.py + touch $out/src/my_project/__init__.py ''; in # this build must never triger conflicts @@ -20,11 +20,13 @@ pname = "dont-propagate-conflicting-deps"; version = "0.0.0"; src = projectSource; - format = "pyproject"; - propagatedBuildInputs = [ + pyproject = true; + dependencies = [ # At least one dependency of `build` should be included here to # keep the test meaningful (mkConflict pythonOnBuildForHost.pkgs.tomli) + ]; + build-system = [ # setuptools is also needed to build the example project pythonOnBuildForHost.pkgs.setuptools ]; diff --git a/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh b/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh index dd49d935bcee..88472b468688 100644 --- a/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh @@ -1,12 +1,22 @@ # Setup hook to use for pypa/build projects +# shellcheck shell=bash + echo "Sourcing pypa-build-hook" pypaBuildPhase() { echo "Executing pypaBuildPhase" runHook preBuild + local -a flagsArray=( + --no-isolation + --outdir dist/ + --wheel + ) + concatTo flagsArray pypaBuildFlags + echo "Creating a wheel..." - @build@/bin/pyproject-build --no-isolation --outdir dist/ --wheel $pypaBuildFlags + echoCmd 'pypa build flags' "${flagsArray[@]}" + @build@/bin/pyproject-build "${flagsArray[@]}" echo "Finished creating a wheel..." runHook postBuild diff --git a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh index 591060aca6d0..c3c758d6a902 100644 --- a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh @@ -1,22 +1,28 @@ +# shellcheck shell=bash + # Setup hook for checking whether Python imports succeed echo "Sourcing python-imports-check-hook.sh" pythonImportsCheckPhase() { echo "Executing pythonImportsCheckPhase" - if [ -n "$pythonImportsCheck" ]; then - echo "Check whether the following modules can be imported: $pythonImportsCheck" - pythonImportsCheckOutput=$out - if [ -n "$python" ]; then + if [[ -n "${pythonImportsCheck[*]-}" ]]; then + echo "Check whether the following modules can be imported: ${pythonImportsCheck[*]}" + # shellcheck disable=SC2154 + pythonImportsCheckOutput="$out" + if [[ -n "${python-}" ]]; then echo "Using python specific output \$python for imports check" pythonImportsCheckOutput=$python fi export PYTHONPATH="$pythonImportsCheckOutput/@pythonSitePackages@:$PYTHONPATH" - (cd $pythonImportsCheckOutput && @pythonCheckInterpreter@ -c 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ["pythonImportsCheck"].split()))') + # Python modules and namespaces names are Python identifiers, which must not contain spaces. + # See https://docs.python.org/3/reference/lexical_analysis.html + # shellcheck disable=SC2048,SC2086 + (cd "$pythonImportsCheckOutput" && @pythonCheckInterpreter@ -c 'import sys; import importlib; list(map(lambda mod: importlib.import_module(mod), sys.argv[1:]))' ${pythonImportsCheck[*]}) fi } -if [ -z "${dontUsePythonImportsCheck-}" ]; then +if [[ -z "${dontUsePythonImportsCheck-}" ]]; then echo "Using pythonImportsCheckPhase" appendToVar preDistPhases pythonImportsCheckPhase fi diff --git a/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh b/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh index 5c5b840e05c3..add56f5b6413 100644 --- a/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh @@ -1,20 +1,26 @@ # Clean up __init__.py's found in namespace directories +# shellcheck shell=bash + echo "Sourcing python-namespaces-hook" pythonNamespacesHook() { echo "Executing pythonNamespacesHook" - for namespace in ${pythonNamespaces[@]}; do + # Python namespaces names are Python identifiers, which must not contain spaces. + # See https://docs.python.org/3/reference/lexical_analysis.html + # shellcheck disable=SC2048 + for namespace in ${pythonNamespaces[*]-}; do echo "Enforcing PEP420 namespace: ${namespace}" # split namespace into segments. "azure.mgmt" -> "azure mgmt" - IFS='.' read -ra pathSegments <<<$namespace + IFS='.' read -ra pathSegments <<<"$namespace" + # shellcheck disable=SC2154 constructedPath=$out/@pythonSitePackages@ # Need to remove the __init__.py at each namespace level # E.g `azure/__init__.py` and `azure/mgmt/__init__.py` # The __pycache__ entry also needs to be removed - for pathSegment in ${pathSegments[@]}; do + for pathSegment in "${pathSegments[@]}"; do constructedPath=${constructedPath}/${pathSegment} pathToRemove=${constructedPath}/__init__.py pycachePath=${constructedPath}/__pycache__/ @@ -30,9 +36,9 @@ pythonNamespacesHook() { # event of a "meta-package" package, which will just install # other packages, but not produce anything in site-packages # besides meta information - if [ -d "${constructedPath}/../" -a -z ${dontRemovePth-} ]; then + if [[ -d "${constructedPath}/../" ]] && [[ -z "${dontRemovePth-}" ]]; then # .pth files are located in the parent directory of a module - @findutils@/bin/find ${constructedPath}/../ -name '*-nspkg.pth' -exec rm -v "{}" + + @findutils@/bin/find "${constructedPath}/../" -name '*-nspkg.pth' -exec rm -v "{}" + fi # remove __pycache__/ entry, can be interpreter specific. E.g. __init__.cpython-38.pyc @@ -46,6 +52,6 @@ pythonNamespacesHook() { echo "Finished executing pythonNamespacesHook" } -if [ -z "${dontUsePythonNamespacesHook-}" -a -n "${pythonNamespaces-}" ]; then +if [[ -z "${dontUsePythonNamespacesHook-}" ]] && [[ -n "${pythonNamespaces-}" ]]; then postFixupHooks+=(pythonNamespacesHook) fi diff --git a/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh b/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh index 83b79d01fa40..be54b546cadb 100644 --- a/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh @@ -1,9 +1,12 @@ # Setup hook for storing dist folder (wheels/sdists) in a separate output +# shellcheck shell=bash + echo "Sourcing python-catch-conflicts-hook.sh" pythonOutputDistPhase() { echo "Executing pythonOutputDistPhase" if [[ -d dist ]]; then + # shellcheck disable=SC2154 mv "dist" "$dist" else cat >&2 <= 1)); then echo "pythonRelaxDepsHook: resulting METADATA for '$wheel':" + # shellcheck disable=SC2086 cat $metadata_file fi diff --git a/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh b/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh index ad9e3c07cf24..43c991b74469 100644 --- a/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh @@ -1,11 +1,14 @@ # Clean up top-level tests directory in site-package installation. +# shellcheck shell=bash + echo "Sourcing python-remove-tests-dir-hook" pythonRemoveTestsDir() { echo "Executing pythonRemoveTestsDir" - rm -rf $out/@pythonSitePackages@/tests - rm -rf $out/@pythonSitePackages@/test + # shellcheck disable=SC2154 + rm -rf "$out/@pythonSitePackages@/tests" + rm -rf "$out/@pythonSitePackages@/test" echo "Finished executing pythonRemoveTestsDir" } diff --git a/pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh b/pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh index 917c19ef9b31..5a0916f8acc4 100644 --- a/pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh +++ b/pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh @@ -1,3 +1,5 @@ +# shellcheck shell=bash + echo "Sourcing setuptools-rust-hook" setuptoolsRustSetup() { diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index b850c79be87a..795bceede768 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, substituteAll, fetchurl , zlibSupport ? true, zlib -, bzip2, pkg-config, libffi, darwin +, bzip2, pkg-config, libffi , sqlite, openssl, ncurses, python, expat, tcl, tk, tclPackages, libX11 , gdbm, db, xz, python-setup-hook , optimizationLevel ? "jit", boehmgc @@ -63,8 +63,6 @@ in with passthru; stdenv.mkDerivation rec { zlib ] ++ lib.optionals (lib.any (l: l == optimizationLevel) [ "0" "1" "2" "3"]) [ boehmgc - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libutil ]; # Remove bootstrap python from closure diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 383a175ef3cd..4dece3870ae6 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -216,7 +216,7 @@ let for makefile in $extMakefiles; do make -C "$(dirname "$makefile")" distclean done - find "$out/${finalAttrs.passthru.gemPath}" \( -name gem_make.out -o -name mkmf.log \) -delete + find "$out/${finalAttrs.passthru.gemPath}" \( -name gem_make.out -o -name mkmf.log -o -name exts.mk \) -delete # Bundler tries to create this directory mkdir -p $out/nix-support cat > $out/nix-support/setup-hook < -Date: Fri, 21 Jun 2024 18:59:49 +0000 -Subject: [PATCH] avfoundation.m: macOS SDK 10.12 compatibility - ---- - libavdevice/avfoundation.m | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m -index d9b17ccdae..2a1f66d751 100644 ---- a/libavdevice/avfoundation.m -+++ b/libavdevice/avfoundation.m -@@ -762,7 +762,7 @@ static int get_audio_config(AVFormatContext *s) - return 0; - } - --static NSArray* getDevicesWithMediaType(AVMediaType mediaType) { -+static NSArray* getDevicesWithMediaType(NSString * mediaType) { - #if ((TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (TARGET_OS_OSX && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500)) - NSMutableArray *deviceTypes = nil; - if (mediaType == AVMediaTypeVideo) { --- -2.44.0 - diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index eac16d659dac..d07551608a54 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -9,14 +9,6 @@ let initArgs: ffmpegVariant: callPackage ./generic.nix ( { - inherit (darwin.apple_sdk.frameworks) - Accelerate - AppKit - AudioToolbox - AVFoundation - CoreImage - VideoToolbox - ; inherit (darwin) xcode; inherit (cudaPackages) cuda_cudart cuda_nvcc libnpp; } diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 5e627c0d0f32..33cebfb2a9a3 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -36,12 +36,9 @@ , withAlsa ? withHeadlessDeps && stdenv.hostPlatform.isLinux # Alsa in/output supporT , withAmf ? withHeadlessDeps && lib.meta.availableOn stdenv.hostPlatform amf # AMD Media Framework video encoding , withAom ? withHeadlessDeps # AV1 reference encoder -, withAppKit ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple AppKit framework , withAribb24 ? withFullDeps # ARIB text and caption decoding , withAribcaption ? withFullDeps && lib.versionAtLeast version "6.1" # ARIB STD-B24 Caption Decoder/Renderer , withAss ? withHeadlessDeps && stdenv.hostPlatform == stdenv.buildPlatform # (Advanced) SubStation Alpha subtitle rendering -, withAudioToolbox ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple AudioToolbox -, withAvFoundation ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple AVFoundation framework , withAvisynth ? withFullDeps # AviSynth script files reading , withBluray ? withFullDeps # BluRay reading , withBs2b ? withFullDeps # bs2b DSP library @@ -51,7 +48,6 @@ , withCelt ? withHeadlessDeps # CELT decoder , withChromaprint ? withFullDeps # Audio fingerprinting , withCodec2 ? withFullDeps # codec2 en/decoding -, withCoreImage ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple CoreImage framework , withCuda ? withFullDeps && withNvcodec , withCudaLLVM ? withFullDeps , withCudaNVCC ? withFullDeps && withUnfree && config.cudaSupport @@ -76,7 +72,10 @@ , withIlbc ? withFullDeps # iLBC de/encoding , withJack ? withFullDeps && !stdenv.hostPlatform.isDarwin # Jack audio , withJxl ? withFullDeps && lib.versionAtLeast version "5" # JPEG XL de/encoding +, withKvazaar ? withFullDeps # HEVC encoding , withLadspa ? withFullDeps # LADSPA audio filtering +, withLc3 ? withFullDeps && lib.versionAtLeast version "7.1" # LC3 de/encoding +, withLcevcdec ? withFullDeps && lib.versionAtLeast version "7.1" # LCEVC decoding , withLcms2 ? withFullDeps # ICC profile support via lcms2 , withLzma ? withHeadlessDeps # xz-utils , withMetal ? false # Unfree and requires manual downloading of files @@ -101,6 +100,7 @@ , withQrencode ? withFullDeps && lib.versionAtLeast version "7" # QR encode generation , withQuirc ? withFullDeps && lib.versionAtLeast version "7" # QR decoding , withRav1e ? withFullDeps # AV1 encoder (focused on speed and safety) +, withRist ? withHeadlessDeps # Reliable Internet Stream Transport (RIST) protocol , withRtmp ? withFullDeps # RTMP[E] support , withRubberband ? withFullDeps && withGPL # Rubberband filter , withSamba ? withFullDeps && !stdenv.hostPlatform.isDarwin && withGPLv3 # Samba protocol @@ -121,7 +121,6 @@ , withV4l2M2m ? withV4l2 , withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # Vaapi hardware acceleration , withVdpau ? withSmallDeps && !stdenv.hostPlatform.isMinGW # Vdpau hardware acceleration -, withVideoToolbox ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple VideoToolbox , withVidStab ? withHeadlessDeps && withGPL # Video stabilization , withVmaf ? withFullDeps && !stdenv.hostPlatform.isAarch64 && lib.versionAtLeast version "5" # Netflix's VMAF (Video Multi-Method Assessment Fusion) , withVoAmrwbenc ? withFullDeps && withVersion3 # AMR-WB encoder @@ -129,6 +128,7 @@ , withVpl ? false # Hardware acceleration via intel libvpl , withVpx ? withHeadlessDeps && stdenv.buildPlatform == stdenv.hostPlatform # VP8 & VP9 de/encoding , withVulkan ? withSmallDeps && !stdenv.hostPlatform.isDarwin +, withVvenc ? withFullDeps && lib.versionAtLeast version "7.1" # H.266/VVC encoding , withWebp ? withHeadlessDeps # WebP encoder , withX264 ? withHeadlessDeps && withGPL # H.264/AVC encoder , withX265 ? withHeadlessDeps && withGPL # H.265/HEVC encoder @@ -247,8 +247,10 @@ , gsm , harfbuzz , intel-media-sdk +, kvazaar , ladspaH , lame +, lcevcdec , lcms2 , libaom , libaribcaption @@ -268,6 +270,7 @@ , libilbc , libjack2 , libjxl +, liblc3 , libmodplug , libmysofa , libopenmpt @@ -276,6 +279,7 @@ , libplacebo_5 , libpulseaudio , libraw1394 +, librist , librsvg , libssh , libtensorflow @@ -321,6 +325,7 @@ , vo-amrwbenc , vulkan-headers , vulkan-loader +, vvenc , x264 , x265 , xavs @@ -333,14 +338,9 @@ , zlib , zvbi /* - * Darwin frameworks + * Darwin */ -, Accelerate -, AppKit -, AudioToolbox -, AVFoundation -, CoreImage -, VideoToolbox +, apple-sdk_15 , xcode # unfree contains metalcc and metallib /* * Cuda Packages @@ -465,7 +465,6 @@ stdenv.mkDerivation (finalAttrs: { }) ] ++ optionals (lib.versionAtLeast version "7.1") [ - ./0001-avfoundation.m-macOS-SDK-10.12-compatibility.patch ./fix-fate-ffmpeg-spec-disposition-7.1.patch # Expose a private API for Chromium / Qt WebEngine. @@ -560,14 +559,11 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withAlsa "alsa") (enableFeature withAmf "amf") (enableFeature withAom "libaom") - (enableFeature withAppKit "appkit") (enableFeature withAribb24 "libaribb24") ] ++ optionals (versionAtLeast version "6.1") [ (enableFeature withAribcaption "libaribcaption") ] ++ [ (enableFeature withAss "libass") - (enableFeature withAudioToolbox "audiotoolbox") - (enableFeature withAvFoundation "avfoundation") (enableFeature withAvisynth "avisynth") (enableFeature withBluray "libbluray") (enableFeature withBs2b "libbs2b") @@ -577,7 +573,6 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withCelt "libcelt") (enableFeature withChromaprint "chromaprint") (enableFeature withCodec2 "libcodec2") - (enableFeature withCoreImage "coreimage") (enableFeature withCuda "cuda") (enableFeature withCudaLLVM "cuda-llvm") (enableFeature withCudaNVCC "cuda-nvcc") @@ -609,7 +604,11 @@ stdenv.mkDerivation (finalAttrs: { ] ++ optionals (versionAtLeast finalAttrs.version "5.0") [ (enableFeature withJxl "libjxl") ] ++ [ + (enableFeature withKvazaar "libkvazaar") (enableFeature withLadspa "ladspa") + ] ++ optionals (versionAtLeast version "7.1") [ + (enableFeature withLc3 "liblc3") + (enableFeature withLcevcdec "liblcevc-dec") ] ++ optionals (versionAtLeast version "5.1") [ (enableFeature withLcms2 "lcms2") ] ++ [ @@ -642,6 +641,7 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withQuirc "libquirc") ] ++ [ (enableFeature withRav1e "librav1e") + (enableFeature withRist "librist") (enableFeature withRtmp "librtmp") (enableFeature withRubberband "librubberband") (enableFeature withSamba "libsmbclient") @@ -667,13 +667,15 @@ stdenv.mkDerivation (finalAttrs: { ] ++ optionals (versionAtLeast version "6.0") [ (enableFeature withVpl "libvpl") ] ++ [ - (enableFeature withVideoToolbox "videotoolbox") (enableFeature withVidStab "libvidstab") # Actual min. version 2.0 (enableFeature withVmaf "libvmaf") (enableFeature withVoAmrwbenc "libvo-amrwbenc") (enableFeature withVorbis "libvorbis") (enableFeature withVpx "libvpx") (enableFeature withVulkan "vulkan") + ] ++ optionals (versionAtLeast version "7.1") [ + (enableFeature withVvenc "libvvenc") + ] ++ [ (enableFeature withWebp "libwebp") (enableFeature withX264 "libx264") (enableFeature withX265 "libx265") @@ -732,15 +734,13 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withCudaNVCC [ cuda_nvcc ]; buildInputs = [] + ++ optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ] ++ optionals withAlsa [ alsa-lib ] ++ optionals withAmf [ amf-headers ] ++ optionals withAom [ libaom ] - ++ optionals withAppKit [ AppKit ] ++ optionals withAribb24 [ aribb24 ] ++ optionals withAribcaption [ libaribcaption ] ++ optionals withAss [ libass ] - ++ optionals withAudioToolbox [ AudioToolbox ] - ++ optionals withAvFoundation [ AVFoundation ] ++ optionals withAvisynth [ avisynthplus ] ++ optionals withBluray [ libbluray ] ++ optionals withBs2b [ libbs2b ] @@ -750,7 +750,6 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withCelt [ celt ] ++ optionals withChromaprint [ chromaprint ] ++ optionals withCodec2 [ codec2 ] - ++ optionals withCoreImage [ CoreImage ] ++ optionals withCudaNVCC [ cuda_cudart cuda_nvcc ] ++ optionals withDav1d [ dav1d ] ++ optionals withDc1394 [ libdc1394 libraw1394 ] @@ -772,7 +771,10 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withIlbc [ libilbc ] ++ optionals withJack [ libjack2 ] ++ optionals withJxl [ libjxl ] + ++ optionals withKvazaar [ kvazaar ] ++ optionals withLadspa [ ladspaH ] + ++ optionals withLc3 [ liblc3 ] + ++ optionals withLcevcdec [ lcevcdec ] ++ optionals withLcms2 [ lcms2 ] ++ optionals withLzma [ xz ] ++ optionals withMfx [ intel-media-sdk ] @@ -793,8 +795,9 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withQrencode [ qrencode ] ++ optionals withQuirc [ quirc ] ++ optionals withRav1e [ rav1e ] + ++ optionals withRist [ librist ] ++ optionals withRtmp [ rtmpdump ] - ++ optionals withRubberband ([ rubberband ] ++ lib.optional stdenv.hostPlatform.isDarwin Accelerate) + ++ optionals withRubberband [ rubberband ] ++ optionals withSamba [ samba ] ++ optionals withSdl2 [ SDL2 ] ++ optionals withShaderc [ shaderc ] @@ -812,7 +815,6 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withV4l2 [ libv4l ] ++ optionals withVaapi [ (if withSmallDeps then libva else libva-minimal) ] ++ optionals withVdpau [ libvdpau ] - ++ optionals withVideoToolbox [ VideoToolbox ] ++ optionals withVidStab [ vid-stab ] ++ optionals withVmaf [ libvmaf ] ++ optionals withVoAmrwbenc [ vo-amrwbenc ] @@ -820,6 +822,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withVpl [ libvpl ] ++ optionals withVpx [ libvpx ] ++ optionals withVulkan [ vulkan-headers vulkan-loader ] + ++ optionals withVvenc [ vvenc ] ++ optionals withWebp [ libwebp ] ++ optionals withX264 [ x264 ] ++ optionals withX265 [ x265 ] diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index a611cb38d836..09dde042848b 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -283,14 +283,14 @@ stdenv.mkDerivation ({ homepage = "https://www.gnu.org/software/libc/"; description = "GNU C Library"; - longDescription = - '' Any Unix-like operating system needs a C library: the library which - defines the "system calls" and other basic facilities such as - open, malloc, printf, exit... + longDescription = '' + Any Unix-like operating system needs a C library: the library which + defines the "system calls" and other basic facilities such as + open, malloc, printf, exit... - The GNU C library is used as the C library in the GNU system and - most systems with the Linux kernel. - ''; + The GNU C library is used as the C library in the GNU system and + most systems with the Linux kernel. + ''; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index 9d014c266753..2700dad0db09 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -43,8 +43,8 @@ let self = stdenv.mkDerivation rec { branch = "4"; description = "GNU multiple precision arithmetic library"; - longDescription = - '' GMP is a free library for arbitrary precision arithmetic, operating + longDescription = '' + GMP is a free library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers. There is no practical limit to the precision except the ones implied by the available memory in the machine GMP runs on. GMP has a rich diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index e1a8ff0ecdc1..458c7928c00e 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -64,27 +64,27 @@ let self = stdenv.mkDerivation rec { gpl2Only ]; - longDescription = - '' GMP is a free library for arbitrary precision arithmetic, operating - on signed integers, rational numbers, and floating point numbers. - There is no practical limit to the precision except the ones implied - by the available memory in the machine GMP runs on. GMP has a rich - set of functions, and the functions have a regular interface. + longDescription = '' + GMP is a free library for arbitrary precision arithmetic, operating + on signed integers, rational numbers, and floating point numbers. + There is no practical limit to the precision except the ones implied + by the available memory in the machine GMP runs on. GMP has a rich + set of functions, and the functions have a regular interface. - The main target applications for GMP are cryptography applications - and research, Internet security applications, algebra systems, - computational algebra research, etc. + The main target applications for GMP are cryptography applications + and research, Internet security applications, algebra systems, + computational algebra research, etc. - GMP is carefully designed to be as fast as possible, both for small - operands and for huge operands. The speed is achieved by using - fullwords as the basic arithmetic type, by using fast algorithms, - with highly optimised assembly code for the most common inner loops - for a lot of CPUs, and by a general emphasis on speed. + GMP is carefully designed to be as fast as possible, both for small + operands and for huge operands. The speed is achieved by using + fullwords as the basic arithmetic type, by using fast algorithms, + with highly optimised assembly code for the most common inner loops + for a lot of CPUs, and by a general emphasis on speed. - GMP is faster than any other bignum library. The advantage for GMP - increases with the operand sizes for many operations, since GMP uses - asymptotically faster algorithms. - ''; + GMP is faster than any other bignum library. The advantage for GMP + increases with the operand sizes for many operations, since GMP uses + asymptotically faster algorithms. + ''; platforms = platforms.all; maintainers = [ ]; diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 3e9395668c85..964c0acb7c78 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -98,7 +98,8 @@ stdenv.mkDerivation rec { sed '2iexit 77' -i tests/{pkgconfig,fastopen}.sh sed '/^void doit(void)/,/^{/ s/{/{ exit(77);/' -i tests/{trust-store,psk-file}.c sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh - '' + lib.optionalString stdenv.hostPlatform.isMusl '' # See https://gitlab.com/gnutls/gnutls/-/issues/945 + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + # See https://gitlab.com/gnutls/gnutls/-/issues/945 sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool.sh '' + lib.optionalString stdenv.hostPlatform.isLinux '' sed '2iexit 77' -i tests/{ktls,ktls_keyupdate}.sh diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 1dd516ec99cf..ee467e8ad18a 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -24,7 +24,7 @@ # nixpkgs-update: no auto update stdenv.mkDerivation rec { pname = "grpc"; - version = "1.66.1"; # N.B: if you change this, please update: + version = "1.67.0"; # N.B: if you change this, please update: # pythonPackages.grpcio # pythonPackages.grpcio-channelz # pythonPackages.grpcio-health-checking @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-CmQUUbIYPWRS7q7OX+TmkTvoqtJAUEwhL/lev8JdB8U="; + hash = "sha256-NjoSm3ZiHqe0QeVRFWO2FheoOzKjSX2oyiCM3qNUxhM="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index e353edd59333..a838efc15a70 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, fetchpatch2 , fetchurl , meson , ninja @@ -21,13 +22,21 @@ stdenv.mkDerivation rec { version = "1.4.1"; outputs = [ "out" "dev" ] - ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; + ++ lib.optionals withIntrospection [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "VySWVDV9PVGxQDFRaaJMBnHeeqUsb3XIxcmr1Ao1JSk="; }; + patches = [ + (fetchpatch2 { + # https://gitlab.gnome.org/GNOME/gssdp/-/merge_requests/11 + url = "https://gitlab.gnome.org/GNOME/gssdp/-/commit/db9d02c22005be7e5e81b43a3ab777250bd7b27b.diff"; + hash = "sha256-DJQrg6MhzpX8R0QaNnqdwA1+v8xncDU8jcX+I3scW1M="; + }) + ]; + strictDeps = true; depsBuildBuild = [ @@ -64,7 +73,7 @@ stdenv.mkDerivation rec { # Bail out! GLib-GIO-FATAL-CRITICAL: g_inet_address_to_string: assertion 'G_IS_INET_ADDRESS (address)' failed doCheck = !stdenv.hostPlatform.isDarwin; - postFixup = lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) '' + postFixup = lib.optionalString withIntrospection '' # Move developer documentation to devdoc output. # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. find -L "$out/share/doc" -type f -regex '.*\.devhelp2?' -print0 \ diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 15208becc301..1ff6d193268e 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "harfbuzz${lib.optionalString withIcu "-icu"}"; - version = "9.0.0"; + version = "10.0.1"; src = fetchurl { url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz"; - hash = "sha256-pBsnLO65IMVyY+yFFgRULZ7IXuMDBQbZRmIGfHtquJ4="; + hash = "sha256-sssTvTUZBMuQOPkH3A3uCuBxJwYSQv41VrJ5XE6XSPw="; }; postPatch = '' diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 9293077b1aa7..021776ed3856 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation (finalAttrs: { # cgit) that are needed here should be included directly in Nixpkgs as # files. patches = [ + # https://github.com/libffi/libffi/pull/857 + # function label needs to come before .cfi_startproc + ./label-before-cfi_startproc.patch ]; strictDeps = true; diff --git a/pkgs/development/libraries/libffi/label-before-cfi_startproc.patch b/pkgs/development/libraries/libffi/label-before-cfi_startproc.patch new file mode 100644 index 000000000000..379c670b4546 --- /dev/null +++ b/pkgs/development/libraries/libffi/label-before-cfi_startproc.patch @@ -0,0 +1,47 @@ +From 3065c530d3aa50c2b5ee9c01f88a9c0b61732805 Mon Sep 17 00:00:00 2001 +From: Ivan Tadeu Ferreira Antunes Filho +Date: Mon, 16 Sep 2024 16:10:39 -0400 +Subject: [PATCH] Move cfi_startproc after CNAME(label) + +This is a fix for https://github.com/libffi/libffi/issues/852: error: invalid CFI advance_loc expression on apple targets. + +The CFI for darwin arm64 was broken because the CNAME macro was being used after the +cfi_startproc macro. +--- + src/aarch64/sysv.S | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/aarch64/sysv.S b/src/aarch64/sysv.S +index 6a9a5611f..e83bc65de 100644 +--- a/src/aarch64/sysv.S ++++ b/src/aarch64/sysv.S +@@ -89,8 +89,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + x5 closure + */ + +- cfi_startproc + CNAME(ffi_call_SYSV): ++ cfi_startproc + BTI_C + PAC_CFI_WINDOW_SAVE + /* Sign the lr with x1 since that is the CFA which is the modifer used in auth instructions */ +@@ -348,8 +348,8 @@ CNAME(ffi_closure_SYSV_V): + #endif + + .align 4 +- cfi_startproc + CNAME(ffi_closure_SYSV): ++ cfi_startproc + BTI_C + SIGN_LR + PAC_CFI_WINDOW_SAVE +@@ -647,8 +647,8 @@ CNAME(ffi_go_closure_SYSV_V): + #endif + + .align 4 +- cfi_startproc + CNAME(ffi_go_closure_SYSV): ++ cfi_startproc + BTI_C + SIGN_LR_LINUX_ONLY + PAC_CFI_WINDOW_SAVE diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix index af0ae5f73a7d..847894d06587 100644 --- a/pkgs/development/libraries/libgit2/default.nix +++ b/pkgs/development/libraries/libgit2/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libgit2"; - version = "1.8.1"; + version = "1.8.4"; # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib outputs = ["lib" "dev" "out"]; @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libgit2"; repo = "libgit2"; rev = "v${finalAttrs.version}"; - hash = "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY="; + hash = "sha256-AVhDq9nC2ccwFYJmejr0hmnyV4AxZLamuHktYPlkzUs="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 7f9aac48e725..181462dc39dd 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -87,7 +87,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ automake autoconf libtool pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ]; + # This is part of the Darwin bootstrap, so we don’t always get + # `libutil.dylib` automatically propagated through the SDK. + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + (lib.getLib darwin.libutil) + ]; preConfigure = '' LIBTOOLIZE=libtoolize ./autogen.sh diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index b7c90f36db74..6c349d679871 100644 --- a/pkgs/development/libraries/mesa/common.nix +++ b/pkgs/development/libraries/mesa/common.nix @@ -5,14 +5,14 @@ # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa rec { pname = "mesa"; - version = "24.2.5"; + version = "24.2.6"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-GghJVjR9NrlNLAd8c1lG8E6/WECqO+Ti3F6JRMgd2jQ="; + hash = "sha256-yoX2DvinzqrG+rekiqO/iG6F6Zn63WC+ZaathimxO1g="; }; meta = { diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index efea4a4cc81f..1f126d256870 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "nspr"; - version = "4.35"; + version = "4.36"; src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - hash = "sha256-fqMpfqWWm10lpd2NR/JEPNqI6e50YwH24eFCb4pqvI8="; + hash = "sha256-Vd7DF/FAHNLl26hE00C5MKt1R/gYF5pAArzmLm8caJU="; }; patches = [ diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 6d5a19409b69..f8735c294a07 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation(finalAttrs: { pname = "pipewire"; - version = "1.2.5"; + version = "1.2.6"; outputs = [ "out" @@ -75,7 +75,7 @@ stdenv.mkDerivation(finalAttrs: { owner = "pipewire"; repo = "pipewire"; rev = finalAttrs.version; - sha256 = "sha256-cYzcEit5zW29GYhvH/pTXqnYFi6AEaS5wl8nD74eWVY="; + sha256 = "sha256-AmrbA1YQBeETLC9u9rQ2f85rG9TASvcbCZ/Xlz7ICdY="; }; patches = [ diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 9b06dea56b6b..e16562d85eb1 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -5,11 +5,7 @@ , libjack2 , pkg-config , which -, AudioUnit -, AudioToolbox -, CoreAudio -, CoreServices -, Carbon }: +}: stdenv.mkDerivation rec { pname = "portaudio"; @@ -22,14 +18,14 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ pkg-config which ]; - buildInputs = [ libjack2 ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform alsa-lib) [ alsa-lib ]; + buildInputs = + [ libjack2 ] + ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform alsa-lib) [ alsa-lib ]; configureFlags = [ "--disable-mac-universal" "--enable-cxx" ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=nullability-inferred-on-nested-type -Wno-error=nullability-completeness-on-arrays -Wno-error=implicit-const-int-float-conversion"; - propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ]; - # Disable parallel build as it fails as: # make: *** No rule to make target '../../../lib/libportaudio.la', # needed by 'libportaudiocpp.la'. Stop. diff --git a/pkgs/development/libraries/protobuf/25.nix b/pkgs/development/libraries/protobuf/25.nix index a5a6a3419b5f..5a22c869ed0e 100644 --- a/pkgs/development/libraries/protobuf/25.nix +++ b/pkgs/development/libraries/protobuf/25.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix ({ - version = "25.4"; - hash = "sha256-dIouv6QaX6Tlahjrdz250DJkKjZ74/EwoQjTs3vBS/U="; + version = "25.5"; + hash = "sha256-DFLlk4T8ODo3lmvrANlkIsrmDXZHmqMPTYxDWaz56qA="; } // args) diff --git a/pkgs/development/libraries/protobuf/28.nix b/pkgs/development/libraries/protobuf/28.nix index 340bac0ffe43..ae6940fa050e 100644 --- a/pkgs/development/libraries/protobuf/28.nix +++ b/pkgs/development/libraries/protobuf/28.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix ( { - version = "28.2"; - hash = "sha256-+ogjfmsbPUhqETJyHxoc1gYW/7a/JMc5l1gb/7WDqLE="; + version = "28.3"; + hash = "sha256-+bb5RxITzxuX50ItmpQhWEG1kMfvlizWTMJJzwlhhYM="; } // args ) diff --git a/pkgs/development/libraries/qcoro/default.nix b/pkgs/development/libraries/qcoro/default.nix index e178dd5240d6..877292493dba 100644 --- a/pkgs/development/libraries/qcoro/default.nix +++ b/pkgs/development/libraries/qcoro/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "qcoro"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "danvratil"; repo = "qcoro"; rev = "v${version}"; - sha256 = "sha256-C4k5ClsMwzxURAQBGV5WBwlRr5N0SvUMJobZ+ROT0EY="; + sha256 = "sha256-teRuWtNR8r/MHZhqphazr7Jmn43qsHGv9eXOGrhSND0="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 240e914241ed..b94be6d893d2 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -28,15 +28,7 @@ let qtCompatVersion = srcs.qtbase.version; patches = { - qtbase = lib.optionals stdenv.hostPlatform.isDarwin [ - ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch - - # Patch framework detection to support X.framework/X.tbd, - # extending the current support for X.framework/X. - ./qtbase.patch.d/0012-qtbase-tbd-frameworks.patch - - ./qtbase.patch.d/0014-aarch64-darwin.patch - ] ++ [ + qtbase = [ ./qtbase.patch.d/0003-qtbase-mkspecs.patch ./qtbase.patch.d/0004-qtbase-replace-libdir.patch ./qtbase.patch.d/0005-qtbase-cmake.patch diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch deleted file mode 100644 index 9d2a47c7c348..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch +++ /dev/null @@ -1,485 +0,0 @@ -From 5ec1d1009d9943f20e82ffc087deabb31d447e75 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Milan=20P=C3=A4ssler?= -Date: Fri, 3 Apr 2020 21:07:58 +0200 -Subject: [PATCH 01/11] qtbase-mkspecs-mac - ---- - mkspecs/common/mac.conf | 2 +- - mkspecs/features/mac/default_post.prf | 206 -------------------------- - mkspecs/features/mac/default_pre.prf | 58 -------- - mkspecs/features/mac/sdk.mk | 25 ---- - mkspecs/features/mac/sdk.prf | 61 -------- - 5 files changed, 1 insertion(+), 351 deletions(-) - delete mode 100644 mkspecs/features/mac/sdk.mk - delete mode 100644 mkspecs/features/mac/sdk.prf - -diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 61bea952b2..9909dae726 100644 ---- a/mkspecs/common/mac.conf -+++ b/mkspecs/common/mac.conf -@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ - - QMAKE_FIX_RPATH = install_name_tool -id - --QMAKE_LFLAGS_RPATH = -Wl,-rpath, -+QMAKE_LFLAGS_RPATH = - QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip - - QMAKE_LFLAGS_REL_RPATH = -diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index abc6d82ade..59b94fe5b6 100644 ---- a/mkspecs/features/mac/default_post.prf -+++ b/mkspecs/features/mac/default_post.prf -@@ -1,9 +1,5 @@ - load(default_post) - --# Recompute SDK version in case the user set it explicitly --sdk_version = $$QMAKE_MAC_SDK_VERSION --QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) -- - contains(TEMPLATE, .*app) { - !macx-xcode:if(isEmpty(BUILDS)|build_pass) { - # Detect changes to the platform SDK -@@ -16,36 +12,6 @@ contains(TEMPLATE, .*app) { - QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk) - } - -- # Detect incompatible SDK versions -- -- isEmpty(QT_MAC_SDK_VERSION_MIN): \ -- QT_MAC_SDK_VERSION_MIN = $$QT_MAC_SDK_VERSION -- -- !versionAtLeast(QMAKE_MAC_SDK_VERSION, $$QT_MAC_SDK_VERSION_MIN): \ -- warning("Qt requires at least version $$QT_MAC_SDK_VERSION_MIN of the platform SDK," \ -- "you're building against version $${QMAKE_MAC_SDK_VERSION}. Please upgrade.") -- -- !isEmpty(QT_MAC_SDK_VERSION_MAX) { -- # For Qt developers only -- !isEmpty($$list($$(QT_MAC_SDK_NO_VERSION_CHECK))): \ -- CONFIG += sdk_no_version_check -- -- QMAKE_MAC_SDK_MAJOR_VERSION = $$replace(QMAKE_MAC_SDK_VERSION, "(\\d+)(\\.\\d+)(\\.\\d+)?", \\1) -- -- !sdk_no_version_check:!versionAtMost(QMAKE_MAC_SDK_MAJOR_VERSION, $$QT_MAC_SDK_VERSION_MAX) { -- warning("Qt has only been tested with version $$QT_MAC_SDK_VERSION_MAX"\ -- "of the platform SDK, you're using $${QMAKE_MAC_SDK_MAJOR_VERSION}.") -- warning("This is an unsupported configuration. You may experience build issues," \ -- "and by using") -- warning("the $$QMAKE_MAC_SDK_VERSION SDK you are opting in to new features" \ -- "that Qt has not been prepared for.") -- -- warning("Please downgrade the SDK you use to build your app to version" \ -- "$$QT_MAC_SDK_VERSION_MAX, or configure") -- warning("with CONFIG+=sdk_no_version_check when running qmake" \ -- "to silence this warning.") -- } -- } - } - - !no_objective_c:CONFIG += objective_c -@@ -73,230 +39,6 @@ qt { - } - } - --# Add the same default rpaths as Xcode does for new projects. --# This is especially important for iOS/tvOS/watchOS where no other option is possible. --!no_default_rpath { -- uikit: QMAKE_RPATHDIR += @executable_path/Frameworks -- else: QMAKE_RPATHDIR += @executable_path/../Frameworks -- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks --} -- --# Don't pass -headerpad_max_install_names when using Bitcode. --# In that case the linker emits a warning stating that the flag is ignored when --# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962). --# Using this flag is also unnecessary in practice on UIKit platforms since they --# are sandboxed, and only UIKit platforms support bitcode to begin with. --!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD -- --app_extension_api_only { -- QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION --} -- --macos { -- !isEmpty(QMAKE_APPLE_DEVICE_ARCHS) { -- # If the user has requested a specific set of architectures, -- # build all of those by default, but limited to only those. -- CONFIG -= only_active_arch -- } else { -- # Otherwise allow building all of the architectures available -- # in Qt, but only build the active arch (unless the user has -- # manually overridden this via CONFIG -= only_active_arch). -- QMAKE_APPLE_DEVICE_ARCHS = $$QT_ARCHS -- } --} -- --macx-xcode { -- qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO -- !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ -- qmake_pkginfo_typeinfo.value = $$QMAKE_PKGINFO_TYPEINFO -- else: \ -- qmake_pkginfo_typeinfo.value = "????" -- QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo -- -- bundle_version = $$VERSION -- isEmpty(bundle_version): bundle_version = 1.0.0 -- -- l = $$split(bundle_version, '.') 0 0 # make sure there are at least three -- VER_MAJ = $$member(l, 0, 0) -- VER_MIN = $$member(l, 1, 1) -- VER_PAT = $$member(l, 2, 2) -- unset(l) -- -- qmake_full_version.name = QMAKE_FULL_VERSION -- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} -- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version -- -- qmake_short_version.name = QMAKE_SHORT_VERSION -- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN} -- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version -- -- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { -- debug_information_format.name = DEBUG_INFORMATION_FORMAT -- debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT -- debug_information_format.build = debug -- QMAKE_MAC_XCODE_SETTINGS += debug_information_format -- } -- -- QMAKE_XCODE_ARCHS = -- -- arch_device.name = "ARCHS[sdk=$${device.sdk}*]" -- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_MAC_XCODE_SETTINGS += arch_device -- -- simulator { -- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]" -- arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS -- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS -- QMAKE_MAC_XCODE_SETTINGS += arch_simulator -- } -- -- only_active_arch.name = ONLY_ACTIVE_ARCH -- only_active_arch.value = YES -- only_active_arch.build = debug -- QMAKE_MAC_XCODE_SETTINGS += only_active_arch --} else { -- device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS -- simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS -- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS -- -- single_arch: VALID_ARCHS = $$first(VALID_ARCHS) -- -- macos { -- only_active_arch: DEFAULT_ARCHS = $$system("uname -m") -- else: DEFAULT_ARCHS = $$VALID_ARCHS -- } -- -- ARCHS = $(filter $(EXPORT_VALID_ARCHS), \ -- $(if $(ARCHS), $(ARCHS), \ -- $(if $(EXPORT_DEFAULT_ARCHS), $(EXPORT_DEFAULT_ARCHS), \ -- $(EXPORT_VALID_ARCHS)))) -- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ARCHS), $(EXPORT_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) -- -- QMAKE_EXTRA_VARIABLES += VALID_ARCHS DEFAULT_ARCHS ARCHS ARCH_ARGS -- -- arch_flags = $(EXPORT_ARCH_ARGS) -- -- QMAKE_CFLAGS += $$arch_flags -- QMAKE_CXXFLAGS += $$arch_flags -- QMAKE_LFLAGS += $$arch_flags -- -- QMAKE_PCH_ARCHS = $$VALID_ARCHS -- -- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET -- ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET -- tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET -- watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET -- -- # If we're doing a simulator and device build, device and simulator -- # architectures use different paths and flags for the sysroot and -- # deployment target switch, so we must multiplex them across multiple -- # architectures using -Xarch. Otherwise we fall back to the simple path. -- # This is not strictly necessary, but results in cleaner command lines -- # and makes it easier for people to override EXPORT_VALID_ARCHS to limit -- # individual rules to a different set of architecture(s) from the overall -- # build (such as machtest in QtCore). -- simulator:device { -- QMAKE_XARCH_CFLAGS = -- QMAKE_XARCH_LFLAGS = -- QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS -- -- for (arch, VALID_ARCHS) { -- contains(VALID_SIMULATOR_ARCHS, $$arch) { -- sdk = $$simulator.sdk -- version_identifier = $$simulator.deployment_identifier -- } else { -- sdk = $$device.sdk -- version_identifier = $$device.deployment_identifier -- } -- -- version_min_flags = \ -- -Xarch_$${arch} \ -- -m$${version_identifier}-version-min=$$deployment_target -- QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \ -- -Xarch_$${arch} \ -- -isysroot$$xcodeSDKInfo(Path, $$sdk) -- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \ -- -Xarch_$${arch} \ -- -isysroot$$xcodeSDKInfo(Path, $$sdk) -- -- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch}) -- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch}) -- -- QMAKE_EXTRA_VARIABLES += \ -- QMAKE_XARCH_CFLAGS_$${arch} \ -- QMAKE_XARCH_LFLAGS_$${arch} -- } -- -- QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) -- QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) -- QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS) -- } else { -- simulator { -- version_identifier = $$simulator.deployment_identifier -- sysroot_path = $$xcodeSDKInfo(Path, $$simulator.sdk) -- } else { -- version_identifier = $$device.deployment_identifier -- sysroot_path = $$xcodeSDKInfo(Path, $$device.sdk) -- } -- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target -- QMAKE_CFLAGS += -isysroot $$sysroot_path $$version_min_flag -- QMAKE_CXXFLAGS += -isysroot $$sysroot_path $$version_min_flag -- QMAKE_LFLAGS += -isysroot $$sysroot_path $$version_min_flag -- } -- -- # Enable precompiled headers for multiple architectures -- QMAKE_CFLAGS_USE_PRECOMPILE = -- for (arch, VALID_ARCHS) { -- icc_pch_style: \ -- use_flag = "-pch-use " -- else: \ -- use_flag = -include -- -- # Only use Xarch with multi-arch, as the option confuses ccache -- count(VALID_ARCHS, 1, greaterThan): \ -- QMAKE_CFLAGS_USE_PRECOMPILE += \ -- -Xarch_$${arch} -- -- QMAKE_CFLAGS_USE_PRECOMPILE += \ -- $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}} -- } -- icc_pch_style { -- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT} -- QMAKE_CFLAGS_USE_PRECOMPILE = -- } else { -- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- } -- -- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT} --} -- --!equals(sdk_version, $$QMAKE_MAC_SDK_VERSION) { -- # Explicit SDK version has been set, respect that -- QMAKE_LFLAGS += -Wl,-sdk_version -Wl,$$sdk_version --} -- --cache(QMAKE_XCODE_DEVELOPER_PATH, stash) --!isEmpty(QMAKE_XCODE_VERSION): \ -- cache(QMAKE_XCODE_VERSION, stash) -- --QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() -- --xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER --xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX --isEmpty(xcode_product_bundle_identifier_setting.value): \ -- xcode_product_bundle_identifier_setting.value = "com.yourcompany" --xcode_product_bundle_target = $$QMAKE_BUNDLE --isEmpty(xcode_product_bundle_target): \ -- xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier} --xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}" --QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting -- - !macx-xcode { - generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS - generate_xcode_project.target = xcodeproj -diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index 2c91ba6679..a6ab233825 100644 ---- a/mkspecs/features/mac/default_pre.prf -+++ b/mkspecs/features/mac/default_pre.prf -@@ -21,61 +21,3 @@ macos { - } - - load(default_pre) -- --isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { -- # Get path of Xcode's Developer directory -- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") -- isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \ -- error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.") -- -- # Make sure Xcode path is valid -- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ -- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") --} -- --isEmpty(QMAKE_XCODEBUILD_PATH): \ -- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null") -- --!isEmpty(QMAKE_XCODEBUILD_PATH) { -- # Make sure Xcode is set up properly -- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \ -- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.") -- -- isEmpty(QMAKE_XCODE_VERSION) { -- # Extract Xcode version using xcodebuild -- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version") -- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) -- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") -- unset(xcode_version) -- } --} -- --isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { -- QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist -- exists($$QMAKE_XCODE_PREFERENCES_FILE): \ -- QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null") -- -- !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \ -- cache(QMAKE_TARGET_BUNDLE_PREFIX) --} -- --QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon -- --# Make the default debug info format for static debug builds --# DWARF instead of DWARF with dSYM. This cuts down build times --# for application debug builds significantly, as Xcode doesn't --# have to pull out all the DWARF info from the Qt static libs --# and put it into a dSYM file. We don't need that dSYM file in --# the first place, since the information is available in the --# object files inside the archives (static libraries). --macx-xcode:qtConfig(static): \ -- QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf -- --# This variable is used by the xcode_dynamic_library_suffix --# feature, which allows Xcode to choose the Qt libraries to link to --# at build time, depending on the current Xcode SDK and configuration. --QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX -- --xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP --xcode_copy_phase_strip_setting.value = NO --QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting -diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk ---- a/mkspecs/features/mac/sdk.mk -+++ b/mkspecs/features/mac/sdk.mk -@@ -1,27 +0,0 @@ -- --ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) -- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>/dev/null -- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND)) -- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) -- # We don't want to complain about out of date SDK unless the target needs to be remade. -- # This covers use-cases such as running 'make check' after moving the build to a -- # computer without Xcode or with a different Xcode version. -- TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0) -- ifeq ($(TARGET_UP_TO_DATE),0) -- ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),) -- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.) -- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),) -- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.) -- else ifneq ($(CURRENT_MAC_SDK_VERSION),) -- $(info The $(EXPORT_QMAKE_MAC_SDK) platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) -- else -- $(info Unknown error resolving current platform SDK version.) -- endif -- $(info This requires a fresh build of your project. Please wipe the build directory) -- ifneq ($(EXPORT__QMAKE_STASH_),) -- $(info including the qmake cache in $(EXPORT__QMAKE_STASH_)) -- endif -- $(error ^) -- endif -- endif --endif -diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -deleted file mode 100644 -index 3a9c2778bb..0000000000 ---- a/mkspecs/features/mac/sdk.prf -+++ /dev/null -@@ -1,61 +0,0 @@ -- --isEmpty(QMAKE_MAC_SDK): \ -- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") -- --contains(QMAKE_MAC_SDK, .*/.*): \ -- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)") -- --defineReplace(xcodeSDKInfo) { -- info = $$1 -- equals(info, "Path"): \ -- infoarg = --show-sdk-path -- equals(info, "PlatformPath"): \ -- infoarg = --show-sdk-platform-path -- equals(info, "SDKVersion"): \ -- infoarg = --show-sdk-version -- sdk = $$2 -- isEmpty(sdk): \ -- sdk = $$QMAKE_MAC_SDK -- -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { -- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null") -- # --show-sdk-platform-path won't work for Command Line Tools; this is fine -- # only used by the XCTest backend to testlib -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \ -- error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg") -- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) -- } -- -- return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info})) --} -- --QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path) --QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath) --QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) -- --isEmpty(QMAKE_EXPORT_INCDIR_OPENGL) { -- QMAKE_EXPORT_INCDIR_OPENGL = $$QMAKE_INCDIR_OPENGL -- sysrootified = -- for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val -- QMAKE_INCDIR_OPENGL = $$sysrootified --} -- --QMAKESPEC_NAME = $$basename(QMAKESPEC) -- --# Resolve SDK version of various tools --for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL QMAKE_LINK_C QMAKE_LINK_C_SHLIB)) { -- tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool} -- !isEmpty($$tool_variable) { -- $$tool = $$eval($$tool_variable) -- next() -- } -- -- value = $$eval($$tool) -- isEmpty(value): next() -- -- sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null") -- isEmpty(sysrooted): next() -- -- $$tool = $$sysrooted $$member(value, 1, -1) -- cache($$tool_variable, set stash, $$tool) --} -diff --git a/mkspecs/features/mac/toolchain.prf b/mkspecs/features/mac/toolchain.prf -deleted file mode 100644 -index df191eb13c..0000000000 ---- a/mkspecs/features/mac/toolchain.prf -+++ /dev/null -@@ -1,5 +0,0 @@ --# Ensure that we process sdk.prf first, as it will update QMAKE_CXX, --# which the default path determination uses. --sdk: load(sdk) -- --load(toolchain) diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch deleted file mode 100644 index 8a5939978a6b..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 84dbbfebd4..615bfed124 100644 ---- a/src/gui/Qt5GuiConfigExtras.cmake.in -+++ b/src/gui/Qt5GuiConfigExtras.cmake.in -@@ -119,6 +119,10 @@ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs) - if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}") - set(Qt5Gui_${_cmake_lib_name}_LIBRARY) - endif() -+ set(Qt5Gui_${_cmake_lib_name}_LIBRARY "${Qt5Gui_${_cmake_lib_name}_LIBRARY}/${_lib}.tbd") -+ if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}") -+ set(Qt5Gui_${_cmake_lib_name}_LIBRARY) -+ endif() - !!ENDIF - if (NOT Qt5Gui_${_cmake_lib_name}_LIBRARY) - # The above find_library call doesn\'t work for finding diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch deleted file mode 100644 index f0809f8f9a3f..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch +++ /dev/null @@ -1,275 +0,0 @@ -From abc52460201bc5c7603505bb187138b0c59291aa Mon Sep 17 00:00:00 2001 -From: Mushroom -Date: Sun, 20 Dec 2020 00:11:41 +0000 -Subject: [PATCH] [QtBase] Split macOS platforms by architecture - -Currently macOS only has one platform, which forces the default arch to -x86_64. This patch splits the platforms by architecture, and defaults to -the same as the host. - -This stops M1-based macs from compiling x64 binaries by default, -instead making them compile native binaries. - -[ChangeLog][QtBase][Platform Specific Changes][OS X] Split macOS -platforms so it doesn't default to the x64 architecture every time - -Change-Id: I34891b107bb24f68371df1c8f087eb0ad5b5dd95 ---- - configure | 9 +++- - .../clang-macx-desktop.conf} | 8 ++-- - mkspecs/common/macx.conf | 1 - - .../Info.plist.app | 0 - .../Info.plist.dSYM.in | 0 - .../Info.plist.disable_highdpi | 0 - .../Info.plist.lib | 0 - mkspecs/macx-clang-arm64/qmake.conf | 7 ++++ - .../qplatformdefs.h | 0 - mkspecs/macx-clang-x64/Info.plist.app | 24 +++++++++++ - mkspecs/macx-clang-x64/Info.plist.dSYM.in | 18 ++++++++ - .../macx-clang-x64/Info.plist.disable_highdpi | 8 ++++ - mkspecs/macx-clang-x64/Info.plist.lib | 20 +++++++++ - mkspecs/macx-clang-x64/qmake.conf | 7 ++++ - mkspecs/macx-clang-x64/qplatformdefs.h | 41 +++++++++++++++++++ - 15 files changed, 137 insertions(+), 6 deletions(-) - rename mkspecs/{macx-clang/qmake.conf => common/clang-macx-desktop.conf} (83%) - rename mkspecs/{macx-clang => macx-clang-arm64}/Info.plist.app (100%) - rename mkspecs/{macx-clang => macx-clang-arm64}/Info.plist.dSYM.in (100%) - rename mkspecs/{macx-clang => macx-clang-arm64}/Info.plist.disable_highdpi (100%) - rename mkspecs/{macx-clang => macx-clang-arm64}/Info.plist.lib (100%) - create mode 100644 mkspecs/macx-clang-arm64/qmake.conf - rename mkspecs/{macx-clang => macx-clang-arm64}/qplatformdefs.h (100%) - create mode 100644 mkspecs/macx-clang-x64/Info.plist.app - create mode 100644 mkspecs/macx-clang-x64/Info.plist.dSYM.in - create mode 100644 mkspecs/macx-clang-x64/Info.plist.disable_highdpi - create mode 100644 mkspecs/macx-clang-x64/Info.plist.lib - create mode 100644 mkspecs/macx-clang-x64/qmake.conf - create mode 100644 mkspecs/macx-clang-x64/qplatformdefs.h - -diff --git a/configure b/configure -index b6c9b462f24..a86f2ceaa5b 100755 ---- a/configure -+++ b/configure -@@ -556,7 +556,14 @@ PLATFORM_NOTES= - if [ -z "$PLATFORM" ]; then - case "$UNAME_SYSTEM:$UNAME_RELEASE" in - Darwin:*) -- PLATFORM=macx-clang -+ case "$UNAME_MACHINE" in -+ arm64) -+ PLATFORM=macx-clang-arm64 -+ ;; -+ *) -+ PLATFORM=macx-clang-x64 -+ ;; -+ esac - ;; - AIX:*) - #PLATFORM=aix-g++ -diff --git a/mkspecs/macx-clang/qmake.conf b/mkspecs/common/clang-macx-desktop.conf -similarity index 83% -rename from mkspecs/macx-clang/qmake.conf -rename to mkspecs/common/clang-macx-desktop.conf -index 0cf1f31b60d..042319a2aa3 100644 ---- a/mkspecs/macx-clang/qmake.conf -+++ b/mkspecs/common/clang-macx-desktop.conf -@@ -24,9 +24,9 @@ QMAKE_LIBS_X11 = -lX11 -lXext -lm - QMAKE_LIBDIR_X11 = /opt/X11/lib - QMAKE_INCDIR_X11 = /opt/X11/include - --include(../common/macx.conf) --include(../common/gcc-base-mac.conf) --include(../common/clang.conf) --include(../common/clang-mac.conf) -+include(macx.conf) -+include(gcc-base-mac.conf) -+include(clang.conf) -+include(clang-mac.conf) - - load(qt_config) -diff --git a/mkspecs/macx-clang/Info.plist.app b/mkspecs/macx-clang-arm64/Info.plist.app -similarity index 100% -rename from mkspecs/macx-clang/Info.plist.app -rename to mkspecs/macx-clang-arm64/Info.plist.app -diff --git a/mkspecs/macx-clang/Info.plist.dSYM.in b/mkspecs/macx-clang-arm64/Info.plist.dSYM.in -similarity index 100% -rename from mkspecs/macx-clang/Info.plist.dSYM.in -rename to mkspecs/macx-clang-arm64/Info.plist.dSYM.in -diff --git a/mkspecs/macx-clang/Info.plist.disable_highdpi b/mkspecs/macx-clang-arm64/Info.plist.disable_highdpi -similarity index 100% -rename from mkspecs/macx-clang/Info.plist.disable_highdpi -rename to mkspecs/macx-clang-arm64/Info.plist.disable_highdpi -diff --git a/mkspecs/macx-clang/Info.plist.lib b/mkspecs/macx-clang-arm64/Info.plist.lib -similarity index 100% -rename from mkspecs/macx-clang/Info.plist.lib -rename to mkspecs/macx-clang-arm64/Info.plist.lib -diff --git a/mkspecs/macx-clang-arm64/qmake.conf b/mkspecs/macx-clang-arm64/qmake.conf -new file mode 100644 -index 00000000000..0cc2361e696 ---- /dev/null -+++ b/mkspecs/macx-clang-arm64/qmake.conf -@@ -0,0 +1,7 @@ -+# -+# qmake configuration for Clang on OS X (arm64) -+# -+ -+QMAKE_APPLE_DEVICE_ARCHS=arm64 -+ -+include(../common/clang-macx-desktop.conf) -diff --git a/mkspecs/macx-clang/qplatformdefs.h b/mkspecs/macx-clang-arm64/qplatformdefs.h -similarity index 100% -rename from mkspecs/macx-clang/qplatformdefs.h -rename to mkspecs/macx-clang-arm64/qplatformdefs.h -diff --git a/mkspecs/macx-clang-x64/Info.plist.app b/mkspecs/macx-clang-x64/Info.plist.app -new file mode 100644 -index 00000000000..fa592af0897 ---- /dev/null -+++ b/mkspecs/macx-clang-x64/Info.plist.app -@@ -0,0 +1,24 @@ -+ -+ -+ -+ -+ CFBundleExecutable -+ ${EXECUTABLE_NAME} -+ CFBundleIconFile -+ ${ASSETCATALOG_COMPILER_APPICON_NAME} -+ CFBundleIdentifier -+ ${PRODUCT_BUNDLE_IDENTIFIER} -+ CFBundlePackageType -+ APPL -+ CFBundleSignature -+ ${QMAKE_PKGINFO_TYPEINFO} -+ LSMinimumSystemVersion -+ ${MACOSX_DEPLOYMENT_TARGET} -+ NOTE -+ This file was generated by Qt/QMake. -+ NSPrincipalClass -+ NSApplication -+ NSSupportsAutomaticGraphicsSwitching -+ -+ -+ -diff --git a/mkspecs/macx-clang-x64/Info.plist.dSYM.in b/mkspecs/macx-clang-x64/Info.plist.dSYM.in -new file mode 100644 -index 00000000000..a8c8d0d4fb5 ---- /dev/null -+++ b/mkspecs/macx-clang-x64/Info.plist.dSYM.in -@@ -0,0 +1,18 @@ -+ -+ -+ -+ -+ CFBundleIdentifier -+ com.apple.xcode.dsym.$${BUNDLEIDENTIFIER} -+ CFBundlePackageType -+ dSYM -+ CFBundleSignature -+ ???? -+!!IF !isEmpty(VERSION) -+ CFBundleShortVersionString -+ $${VER_MAJ}.$${VER_MIN} -+ CFBundleVersion -+ $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} -+!!ENDIF -+ -+ -diff --git a/mkspecs/macx-clang-x64/Info.plist.disable_highdpi b/mkspecs/macx-clang-x64/Info.plist.disable_highdpi -new file mode 100644 -index 00000000000..a9b89888ad4 ---- /dev/null -+++ b/mkspecs/macx-clang-x64/Info.plist.disable_highdpi -@@ -0,0 +1,8 @@ -+ -+ -+ -+ -+ NSHighResolutionCapable -+ NO -+ -+ -diff --git a/mkspecs/macx-clang-x64/Info.plist.lib b/mkspecs/macx-clang-x64/Info.plist.lib -new file mode 100644 -index 00000000000..34752ec40d9 ---- /dev/null -+++ b/mkspecs/macx-clang-x64/Info.plist.lib -@@ -0,0 +1,20 @@ -+ -+ -+ -+ -+ CFBundleExecutable -+ ${EXECUTABLE_NAME} -+ CFBundleIdentifier -+ ${PRODUCT_BUNDLE_IDENTIFIER} -+ CFBundlePackageType -+ FMWK -+ CFBundleShortVersionString -+ ${QMAKE_SHORT_VERSION} -+ CFBundleSignature -+ ${QMAKE_PKGINFO_TYPEINFO} -+ CFBundleVersion -+ ${QMAKE_FULL_VERSION} -+ NOTE -+ Please, do NOT change this file -- It was generated by Qt/QMake. -+ -+ -diff --git a/mkspecs/macx-clang-x64/qmake.conf b/mkspecs/macx-clang-x64/qmake.conf -new file mode 100644 -index 00000000000..1ac373b53b4 ---- /dev/null -+++ b/mkspecs/macx-clang-x64/qmake.conf -@@ -0,0 +1,7 @@ -+# -+# qmake configuration for Clang on OS X (arm64) -+# -+ -+QMAKE_APPLE_DEVICE_ARCHS=x86_64 -+ -+include(../common/clang-macx-desktop.conf) -diff --git a/mkspecs/macx-clang-x64/qplatformdefs.h b/mkspecs/macx-clang-x64/qplatformdefs.h -new file mode 100644 -index 00000000000..063491dd900 ---- /dev/null -+++ b/mkspecs/macx-clang-x64/qplatformdefs.h -@@ -0,0 +1,41 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2016 The Qt Company Ltd. -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the qmake spec of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 3 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL3 included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 3 requirements -+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 2.0 or (at your option) the GNU General -+** Public license version 3 or any later version approved by the KDE Free -+** Qt Foundation. The licenses are as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-2.0.html and -+** https://www.gnu.org/licenses/gpl-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+#include "../common/mac/qplatformdefs.h" -+ diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 0dadaeeaf916..eb3fc8af96d7 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -4,7 +4,7 @@ , coreutils, bison, flex, gdb, gperf, lndir, perl, pkg-config, python3 , which # darwin support -, darwinMinVersionHook, apple-sdk, apple-sdk_10_14, apple-sdk_14, xcbuild +, apple-sdk_13, darwinMinVersionHook, xcbuild , dbus, fontconfig, freetype, glib, harfbuzz, icu, libdrm, libX11, libXcomposite , libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng , libxcb @@ -38,12 +38,14 @@ let then "linux-generic-g++" else throw "Please add a qtPlatformCross entry for ${plat.config}"; - # Per https://doc.qt.io/qt-5/macos.html#supported-versions: deployment target = 10.13, build SDK = 14.x. - # Note that Qt propagates the 10.14 SDK instead of the 10.13 SDK to make sure that applications linked to Qt - # support automatic dark mode on x86_64-darwin (see: https://developer.apple.com/documentation/appkit/nsappearancecustomization/choosing_a_specific_appearance_for_your_macos_app). - propagatedAppleSDK = if lib.versionOlder (lib.getVersion apple-sdk) "10.14" then apple-sdk_10_14 else apple-sdk; - propagatedMinVersionHook = darwinMinVersionHook "10.13"; - buildAppleSDK = apple-sdk_14; + # Per https://doc.qt.io/qt-5/macos.html#supported-versions: deployment target = 10.13, build SDK = 13.x or 14.x. + # Despite advertising support for the macOS 14 SDK, the build system sets the maximum to 13 and complains + # about 14, so we just use that. + deploymentTarget = "10.13"; + darwinVersionInputs = [ + apple-sdk_13 + (darwinMinVersionHook deploymentTarget) + ]; in stdenv.mkDerivation (finalAttrs: ({ @@ -60,11 +62,8 @@ stdenv.mkDerivation (finalAttrs: ({ # Image formats libjpeg libpng pcre2 - ] ++ ( - if stdenv.hostPlatform.isDarwin then [ - propagatedAppleSDK - propagatedMinVersionHook - ] else [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) ( + [ dbus glib udev # Text rendering @@ -84,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: ({ [ libinput ] ++ lib.optional withGtk3 gtk3 ) - ++ lib.optional stdenv.isDarwin buildAppleSDK + ++ lib.optional stdenv.isDarwin darwinVersionInputs ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups ++ lib.optional (mysqlSupport) libmysqlclient @@ -146,13 +145,27 @@ stdenv.mkDerivation (finalAttrs: ({ patchShebangs ./bin '' + ( if stdenv.hostPlatform.isDarwin then '' + for file in \ + configure \ + mkspecs/features/mac/asset_catalogs.prf \ + mkspecs/features/mac/default_pre.prf \ + mkspecs/features/mac/sdk.mk \ + mkspecs/features/mac/sdk.prf + do + substituteInPlace "$file" \ + --replace-quiet /usr/bin/xcode-select '${lib.getExe' xcbuild "xcode-select"}' \ + --replace-quiet /usr/bin/xcrun '${lib.getExe' xcbuild "xcrun"}' \ + --replace-quiet /usr/libexec/PlistBuddy '${lib.getExe' xcbuild "PlistBuddy"}' + done + substituteInPlace configure \ - --replace-fail '/usr/bin/xcode-select' '${lib.getBin xcbuild}/bin/xcode-select' \ - --replace-fail '/usr/bin/xcrun' '${lib.getBin xcbuild}/bin/xcrun' \ - --replace-fail '/System/Library/Frameworks/Cocoa.framework' "$SDKROOT/System/Library/Frameworks/Cocoa.framework" - substituteInPlace ./mkspecs/common/mac.conf \ - --replace-fail "/System/Library/Frameworks/OpenGL.framework/" "$SDKROOT/System/Library/Frameworks/OpenGL.framework/" \ - --replace-fail "/System/Library/Frameworks/AGL.framework/" "$SDKROOT/System/Library/Frameworks/AGL.framework/" + --replace-fail /System/Library/Frameworks/Cocoa.framework "$SDKROOT/System/Library/Frameworks/Cocoa.framework" + + substituteInPlace mkspecs/common/macx.conf \ + --replace-fail 'CONFIG += ' 'CONFIG += no_default_rpath ' \ + --replace-fail \ + 'QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13' \ + 'QMAKE_MACOSX_DEPLOYMENT_TARGET = ${deploymentTarget}' '' else lib.optionalString libGLSupported '' sed -i mkspecs/common/linux.conf \ -e "/^QMAKE_INCDIR_OPENGL/ s|$|${lib.getDev libGL}/include|" \ @@ -326,6 +339,7 @@ stdenv.mkDerivation (finalAttrs: ({ "-qt-freetype" "-qt-libpng" "-no-framework" + "-no-rpath" ] else [ "-rpath" ] ++ [ diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 18d9d7459feb..38ad37fc0364 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -20,7 +20,7 @@ , systemd , enableProprietaryCodecs ? true , gn -, apple-sdk_13, cctools, cups, bootstrap_cmds, xcbuild, writeScriptBin +, cctools, cups, bootstrap_cmds, xcbuild, writeScriptBin , ffmpeg ? null , lib, stdenv , version ? null @@ -51,8 +51,7 @@ let in -# Override the SDK because Qt WebEngine doesn’t seem to build using the 14.4 SDK. -(qtModule.override { apple-sdk_for_qt = apple-sdk_13; }) ({ +qtModule ({ pname = "qtwebengine"; nativeBuildInputs = [ bison flex git gperf ninja pkg-config (python.withPackages(ps: [ ps.html5lib ])) which gn nodejs diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index ee59ee76d9e9..d3d810cbbf68 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -2,8 +2,8 @@ , stdenv , buildPackages , mkDerivation -, apple-sdk_14 -, apple-sdk_for_qt ? apple-sdk_14 +, apple-sdk_13 +, darwinMinVersionHook , perl , qmake , patches @@ -28,7 +28,10 @@ mkDerivation (args // { buildInputs = args.buildInputs or [ ] # Per https://doc.qt.io/qt-5/macos.html#supported-versions - ++ lib.optionals stdenv.isDarwin [ apple-sdk_for_qt ]; + ++ lib.optionals stdenv.isDarwin [ + apple-sdk_13 + (darwinMinVersionHook "10.13") + ]; nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index e090744bc463..0fcae043a793 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -7,11 +7,11 @@ , fetchpatch2 , makeSetupHook , makeWrapper +, runCommand , gst_all_1 , libglvnd , darwin , apple-sdk_15 -, apple-sdk_12 , darwinMinVersionHook , buildPackages , python3 @@ -32,29 +32,36 @@ let }); # Per . - # This should reflect the lowest “Target Platform” and the - # highest “Build Environment”. - apple-sdk_qt = apple-sdk_15; - darwinDeploymentTargetDeps = [ - apple-sdk_12 + # This should reflect the highest “Build Environment” and the + # lowest “Target Platform”. + darwinVersionInputs = [ + apple-sdk_15 (darwinMinVersionHook "12.0") ]; + + onlyPluginsAndQml = drv: let + drv' = drv.__spliced.targetTarget or drv; + inherit (self.qtbase) qtPluginPrefix qtQmlPrefix; + in (runCommand "${drv'.name}-only-plugins-qml" { } '' + mkdir -p $(dirname "$out/${qtPluginPrefix}") + test -d "${drv'}/${qtPluginPrefix}" && ln -s "${drv'}/${qtPluginPrefix}" "$out/${qtPluginPrefix}" || true + test -d "${drv'}/${qtQmlPrefix}" && ln -s "${drv'}/${qtQmlPrefix}" "$out/${qtQmlPrefix}" || true + ''); in { - inherit callPackage srcs; + inherit callPackage srcs darwinVersionInputs; qtModule = callPackage ./qtModule.nix { - inherit apple-sdk_qt; + inherit darwinVersionInputs; }; qtbase = callPackage ./modules/qtbase.nix { withGtk3 = !stdenv.hostPlatform.isMinGW; - inherit apple-sdk_qt darwinDeploymentTargetDeps; + inherit darwinVersionInputs; inherit (srcs.qtbase) src version; patches = [ ./patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch - ./patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch ./patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch ./patches/0004-qtbase-qt-cmake-always-use-cmake-from-path.patch ./patches/0005-qtbase-find-tools-in-PATH.patch @@ -167,10 +174,27 @@ let qtwebview = callPackage ./modules/qtwebview.nix { }; wrapQtAppsHook = callPackage - ({ makeBinaryWrapper }: makeSetupHook + ({ makeBinaryWrapper, qtwayland, qtbase }: + makeSetupHook { name = "wrap-qt6-apps-hook"; propagatedBuildInputs = [ makeBinaryWrapper ]; + depsTargetTargetPropagated = [ + (onlyPluginsAndQml qtbase) + ] ++ lib.optionals (lib.meta.availableOn stdenv.targetPlatform qtwayland) [ + (onlyPluginsAndQml qtwayland) + ]; + } ./hooks/wrap-qt-apps-hook.sh) + { }; + + wrapQtAppsNoGuiHook = callPackage + ({ makeBinaryWrapper, qtbase }: makeSetupHook + { + name = "wrap-qt6-apps-no-gui-hook"; + propagatedBuildInputs = [ makeBinaryWrapper ]; + depsTargetTargetPropagated = [ + (onlyPluginsAndQml qtbase) + ]; } ./hooks/wrap-qt-apps-hook.sh) { }; diff --git a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh index 1ccfbd0cba38..48beac0b04fa 100644 --- a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh @@ -75,9 +75,12 @@ else # Only set up Qt once. fi qtPreHook() { - # Check that wrapQtAppsHook is used, or it is explicitly disabled. + # Check that wrapQtAppsHook/wrapQtAppsNoGuiHook is used, or it is explicitly disabled. if [[ -z "$__nix_wrapQtAppsHook" && -z "$dontWrapQtApps" ]]; then - echo >&2 "Error: wrapQtAppsHook is not used, and dontWrapQtApps is not set." + echo >&2 "Error: this derivation depends on qtbase, but no wrapping behavior was specified." + echo >&2 " - If this is a graphical application, add wrapQtAppsHook to nativeBuildInputs" + echo >&2 " - If this is a CLI application, add wrapQtAppsNoGuiHook to nativeBuildInputs" + echo >&2 " - If this is a library or you need custom wrapping logic, set dontWrapQtApps = true" exit 1 fi } diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index 78365891d6fb..9df79ccc89be 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -67,8 +67,7 @@ , unixODBCDrivers # darwin , moveBuildTree -, apple-sdk_qt -, darwinDeploymentTargetDeps +, darwinVersionInputs , xcbuild # mingw , pkgsBuildBuild @@ -155,8 +154,7 @@ stdenv.mkDerivation rec { xorg.libXtst xorg.xcbutilcursor libepoxy - ] ++ lib.optionals stdenv.hostPlatform.isDarwin darwinDeploymentTargetDeps - ++ lib.optionals libGLSupported [ + ] ++ lib.optionals libGLSupported [ libGL ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ vulkan-headers @@ -167,9 +165,7 @@ stdenv.mkDerivation rec { at-spi2-core ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libinput) [ libinput - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_qt - ] + ] ++ lib.optionals stdenv.hostPlatform.isDarwin darwinVersionInputs ++ lib.optional withGtk3 gtk3 ++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient ++ lib.optional (postgresql != null && lib.meta.availableOn stdenv.hostPlatform postgresql) postgresql; @@ -177,7 +173,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which cmake xmlstarlet ninja ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ]; - propagatedNativeBuildInputs = [ lndir ]; + propagatedNativeBuildInputs = [ lndir ] + # I’m not sure if this is necessary, but the macOS mkspecs stuff + # tries to call `xcrun xcodebuild`, so better safe than sorry. + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; strictDeps = true; @@ -186,7 +185,24 @@ stdenv.mkDerivation rec { inherit patches; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace cmake/QtPublicAppleHelpers.cmake --replace-fail "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" + # TODO: Verify that this catches all the occurrences? + for file in \ + cmake/QtPublicAppleHelpers.cmake \ + mkspecs/features/mac/asset_catalogs.prf \ + mkspecs/features/mac/default_pre.prf \ + mkspecs/features/mac/sdk.mk \ + mkspecs/features/mac/sdk.prf \ + mkspecs/features/permissions.prf \ + src/corelib/Qt6CoreMacros.cmake + do + substituteInPlace "$file" \ + --replace-quiet /usr/bin/xcrun '${lib.getExe' xcbuild "xcrun"}' \ + --replace-quiet /usr/bin/xcode-select '${lib.getExe' xcbuild "xcode-select"}' \ + --replace-quiet /usr/libexec/PlistBuddy '${lib.getExe' xcbuild "PlistBuddy"}' + done + + substituteInPlace mkspecs/common/macx.conf \ + --replace-fail 'CONFIG += ' 'CONFIG += no_default_rpath ' ''; fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh; @@ -211,19 +227,13 @@ stdenv.mkDerivation rec { "-DQT_FEATURE_journald=${if systemdSupport then "ON" else "OFF"}" "-DQT_FEATURE_vulkan=ON" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # error: 'path' is unavailable: introduced in macOS 10.15 - "-DQT_FEATURE_cxx17_filesystem=OFF" + "-DQT_FEATURE_rpath=OFF" ] ++ lib.optionals isCrossBuild [ "-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}" "-DQt6HostInfo_DIR=${pkgsBuildBuild.qt6.qtbase}/lib/cmake/Qt6HostInfo" ] ++ lib.optional (qttranslations != null && !isCrossBuild) "-DINSTALL_TRANSLATIONSDIR=${qttranslations}/translations"; - env.NIX_LDFLAGS = toString (lib.optionals stdenv.hostPlatform.isDarwin [ - # Undefined symbols for architecture arm64: "___gss_c_nt_hostbased_service_oid_desc" - "-framework GSS" - ]); - env.NIX_CFLAGS_COMPILE = "-DNIXPKGS_QT_PLUGIN_PREFIX=\"${qtPluginPrefix}\""; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index 54346345e4e3..d3d55685f5fb 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -1,4 +1,5 @@ -{ qtModule +{ lib +, qtModule , qtbase , qtdeclarative , wayland @@ -22,4 +23,9 @@ qtModule { postPatch = '' cp ${wayland-scanner}/share/wayland/wayland.xml src/3rdparty/protocol/wayland/wayland.xml ''; + + meta = { + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.darwin; + }; } diff --git a/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch b/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch deleted file mode 100644 index fbe49379533b..000000000000 --- a/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch +++ /dev/null @@ -1,469 +0,0 @@ -diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 61bea952b2..9909dae726 100644 ---- a/mkspecs/common/mac.conf -+++ b/mkspecs/common/mac.conf -@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ - - QMAKE_FIX_RPATH = install_name_tool -id - --QMAKE_LFLAGS_RPATH = -Wl,-rpath, -+QMAKE_LFLAGS_RPATH = - QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip - - QMAKE_LFLAGS_REL_RPATH = -diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index 22c84d6473..4d46762bec 100644 ---- a/mkspecs/features/mac/default_post.prf -+++ b/mkspecs/features/mac/default_post.prf -@@ -15,278 +15,10 @@ contains(TEMPLATE, .*app) { - - QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk) - } -- -- # Detect incompatible SDK versions -- # The CMake equivalent is in cmake/QtPublicAppleHelpers.cmake. -- -- isEmpty(QT_MAC_SDK_VERSION_MIN): \ -- QT_MAC_SDK_VERSION_MIN = $$QT_MAC_SDK_VERSION -- -- !versionAtLeast(QMAKE_MAC_SDK_VERSION, $$QT_MAC_SDK_VERSION_MIN): \ -- warning("Qt requires at least version $$QT_MAC_SDK_VERSION_MIN of the platform SDK," \ -- "you're building against version $${QMAKE_MAC_SDK_VERSION}. Please upgrade.") -- -- !isEmpty(QT_MAC_SDK_VERSION_MAX) { -- # For Qt developers only -- !isEmpty($$list($$(QT_MAC_SDK_NO_VERSION_CHECK))): \ -- CONFIG += sdk_no_version_check -- -- QMAKE_MAC_SDK_MAJOR_VERSION = $$replace(QMAKE_MAC_SDK_VERSION, "(\\d+)(\\.\\d+)(\\.\\d+)?", \\1) -- -- !sdk_no_version_check:!versionAtMost(QMAKE_MAC_SDK_MAJOR_VERSION, $$QT_MAC_SDK_VERSION_MAX) { -- warning("Qt has only been tested with version $$QT_MAC_SDK_VERSION_MAX"\ -- "of the platform SDK, you're using $${QMAKE_MAC_SDK_MAJOR_VERSION}.") -- warning("This is an unsupported configuration. You may experience build issues," \ -- "and by using") -- warning("the $$QMAKE_MAC_SDK_VERSION SDK you are opting in to new features" \ -- "that Qt has not been prepared for.") -- -- warning("Please downgrade the SDK you use to build your app to version" \ -- "$$QT_MAC_SDK_VERSION_MAX, or configure") -- warning("with CONFIG+=sdk_no_version_check when running qmake" \ -- "to silence this warning.") -- } -- } - } - - !no_objective_c:CONFIG += objective_c - --# Add the same default rpaths as Xcode does for new projects. --# This is especially important for iOS/tvOS/watchOS where no other option is possible. --!no_default_rpath { -- uikit: QMAKE_RPATHDIR += @executable_path/Frameworks -- else: QMAKE_RPATHDIR += @executable_path/../Frameworks -- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks --} -- --# Don't pass -headerpad_max_install_names when using Bitcode. --# In that case the linker emits a warning stating that the flag is ignored when --# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962). --# Using this flag is also unnecessary in practice on UIKit platforms since they --# are sandboxed, and only UIKit platforms support bitcode to begin with. --!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD -- --app_extension_api_only { -- QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION --} -- --macos { -- !isEmpty(QMAKE_APPLE_DEVICE_ARCHS) { -- # If the user has requested a specific set of architectures, -- # build all of those by default, but limited to only those. -- CONFIG -= only_active_arch -- } else { -- # Otherwise allow building all of the architectures available -- # in Qt, but only build the active arch (unless the user has -- # manually overridden this via CONFIG -= only_active_arch). -- QMAKE_APPLE_DEVICE_ARCHS = $$QT_ARCHS -- } --} -- --macx-xcode { -- qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO -- !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ -- qmake_pkginfo_typeinfo.value = $$QMAKE_PKGINFO_TYPEINFO -- else: \ -- qmake_pkginfo_typeinfo.value = "????" -- QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo -- -- bundle_version = $$VERSION -- isEmpty(bundle_version): bundle_version = 1.0.0 -- -- l = $$split(bundle_version, '.') 0 0 # make sure there are at least three -- VER_MAJ = $$member(l, 0, 0) -- VER_MIN = $$member(l, 1, 1) -- VER_PAT = $$member(l, 2, 2) -- unset(l) -- -- qmake_full_version.name = QMAKE_FULL_VERSION -- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} -- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version -- -- qmake_short_version.name = QMAKE_SHORT_VERSION -- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN} -- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version -- -- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { -- debug_information_format.name = DEBUG_INFORMATION_FORMAT -- debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT -- debug_information_format.build = debug -- QMAKE_MAC_XCODE_SETTINGS += debug_information_format -- } -- -- QMAKE_XCODE_ARCHS = -- -- !isEmpty(QMAKE_APPLE_DEVICE_ARCHS) { -- arch_device.name = "ARCHS[sdk=$${device.sdk}*]" -- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_MAC_XCODE_SETTINGS += arch_device -- } -- -- ios:simulator { -- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]" -- arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS -- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS -- QMAKE_MAC_XCODE_SETTINGS += arch_simulator -- } -- -- only_active_arch.name = ONLY_ACTIVE_ARCH -- only_active_arch.value = YES -- only_active_arch.build = debug -- QMAKE_MAC_XCODE_SETTINGS += only_active_arch --} else { -- device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS -- ios:simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS -- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS -- -- single_arch: VALID_ARCHS = $$first(VALID_ARCHS) -- -- macos { -- only_active_arch: DEFAULT_ARCHS = $$system("uname -m") -- else: DEFAULT_ARCHS = $$VALID_ARCHS -- } -- -- ARCHS = $(filter $(EXPORT_VALID_ARCHS), \ -- $(if $(ARCHS), $(ARCHS), \ -- $(if $(EXPORT_DEFAULT_ARCHS), $(EXPORT_DEFAULT_ARCHS), \ -- $(EXPORT_VALID_ARCHS)))) -- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ARCHS), $(EXPORT_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) -- -- QMAKE_EXTRA_VARIABLES += VALID_ARCHS DEFAULT_ARCHS ARCHS ARCH_ARGS -- -- arch_flags = $(EXPORT_ARCH_ARGS) -- -- QMAKE_CFLAGS += $$arch_flags -- QMAKE_CXXFLAGS += $$arch_flags -- QMAKE_LFLAGS += $$arch_flags -- -- QMAKE_PCH_ARCHS = $$VALID_ARCHS -- -- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET -- ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET -- tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET -- watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET -- -- # If we're doing a simulator and device build, device and simulator -- # architectures use different paths and flags for the sysroot and -- # deployment target switch, so we must multiplex them across multiple -- # architectures using -Xarch. Otherwise we fall back to the simple path. -- # This is not strictly necessary, but results in cleaner command lines -- # and makes it easier for people to override EXPORT_VALID_ARCHS to limit -- # individual rules to a different set of architecture(s) from the overall -- # build (such as machtest in QtCore). -- ios:simulator:device { -- QMAKE_XARCH_CFLAGS = -- QMAKE_XARCH_LFLAGS = -- QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS -- -- for (arch, VALID_ARCHS) { -- contains(VALID_SIMULATOR_ARCHS, $$arch) { -- sdk = $$simulator.sdk -- version_identifier = $$simulator.deployment_identifier -- platform_identifier = $$simulator.sdk -- } else { -- sdk = $$device.sdk -- version_identifier = $$device.deployment_identifier -- platform_identifier = $$device.sdk -- } -- -- version_min_flags = \ -- -Xarch_$${arch} \ -- -m$${version_identifier}-version-min=$$deployment_target -- QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \ -- -Xarch_$${arch} \ -- -isysroot$$xcodeSDKInfo(Path, $$sdk) -- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \ -- -Xarch_$${arch} \ -- -isysroot$$xcodeSDKInfo(Path, $$sdk) -- -- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch}) -- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch}) -- -- QMAKE_EXTRA_VARIABLES += \ -- QMAKE_XARCH_CFLAGS_$${arch} \ -- QMAKE_XARCH_LFLAGS_$${arch} -- } -- -- QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) -- QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) -- QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS) -- } else { -- ios:simulator { -- version_identifier = $$simulator.deployment_identifier -- platform_identifier = $$simulator.sdk -- sysroot_path = $$xcodeSDKInfo(Path, $$simulator.sdk) -- } else { -- version_identifier = $$device.deployment_identifier -- platform_identifier = $$device.sdk -- sysroot_path = $$xcodeSDKInfo(Path, $$device.sdk) -- } -- QMAKE_CFLAGS += -isysroot $$sysroot_path -- QMAKE_CXXFLAGS += -isysroot $$sysroot_path -- QMAKE_LFLAGS += -isysroot $$sysroot_path -- -- !isEmpty(version_identifier):!isEmpty(deployment_target) { -- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target -- QMAKE_CFLAGS += $$version_min_flag -- QMAKE_CXXFLAGS += $$version_min_flag -- QMAKE_LFLAGS += $$version_min_flag -- } -- } -- -- # Enable precompiled headers for multiple architectures -- QMAKE_CFLAGS_USE_PRECOMPILE = -- for (arch, VALID_ARCHS) { -- icc_pch_style: \ -- use_flag = "-pch-use " -- else: \ -- use_flag = -include -- -- # Only use Xarch with multi-arch, as the option confuses ccache -- count(VALID_ARCHS, 1, greaterThan): \ -- QMAKE_CFLAGS_USE_PRECOMPILE += \ -- -Xarch_$${arch} -- -- QMAKE_CFLAGS_USE_PRECOMPILE += \ -- $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}} -- } -- icc_pch_style { -- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT} -- QMAKE_CFLAGS_USE_PRECOMPILE = -- } else { -- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- } -- -- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT} --} -- --!equals(sdk_version, $$QMAKE_MAC_SDK_VERSION) { -- # Explicit SDK version has been set, respect that -- QMAKE_LFLAGS += -Wl,-sdk_version -Wl,$$sdk_version --} -- --cache(QMAKE_XCODE_DEVELOPER_PATH, stash) --!isEmpty(QMAKE_XCODE_VERSION): \ -- cache(QMAKE_XCODE_VERSION, stash) -- --QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() -- --xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER --xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX --isEmpty(xcode_product_bundle_identifier_setting.value): \ -- xcode_product_bundle_identifier_setting.value = "com.yourcompany" --xcode_product_bundle_target = $$QMAKE_BUNDLE --isEmpty(xcode_product_bundle_target): \ -- xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier} --xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}" --QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting -- - !macx-xcode { - generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS - generate_xcode_project.target = xcodeproj -diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e3534561a5..3b01424e67 100644 ---- a/mkspecs/features/mac/default_pre.prf -+++ b/mkspecs/features/mac/default_pre.prf -@@ -1,60 +1,2 @@ - CONFIG = asset_catalogs rez $$CONFIG - load(default_pre) -- --isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { -- # Get path of Xcode's Developer directory -- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") -- isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \ -- error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.") -- -- # Make sure Xcode path is valid -- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ -- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") --} -- --isEmpty(QMAKE_XCODEBUILD_PATH): \ -- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null") -- --!isEmpty(QMAKE_XCODEBUILD_PATH) { -- # Make sure Xcode is set up properly -- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \ -- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.") -- -- isEmpty(QMAKE_XCODE_VERSION) { -- # Extract Xcode version using xcodebuild -- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version") -- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) -- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") -- unset(xcode_version) -- } --} -- --isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { -- QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist -- exists($$QMAKE_XCODE_PREFERENCES_FILE): \ -- QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null") -- -- !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \ -- cache(QMAKE_TARGET_BUNDLE_PREFIX) --} -- --QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon -- --# Make the default debug info format for static debug builds --# DWARF instead of DWARF with dSYM. This cuts down build times --# for application debug builds significantly, as Xcode doesn't --# have to pull out all the DWARF info from the Qt static libs --# and put it into a dSYM file. We don't need that dSYM file in --# the first place, since the information is available in the --# object files inside the archives (static libraries). --macx-xcode:qtConfig(static): \ -- QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf -- --# This variable is used by the xcode_dynamic_library_suffix --# feature, which allows Xcode to choose the Qt libraries to link to --# at build time, depending on the current Xcode SDK and configuration. --QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX -- --xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP --xcode_copy_phase_strip_setting.value = NO --QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting -diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk -index a32ceacb6c..e69de29bb2 100644 ---- a/mkspecs/features/mac/sdk.mk -+++ b/mkspecs/features/mac/sdk.mk -@@ -1,27 +0,0 @@ -- --ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) -- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>/dev/null -- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND)) -- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) -- # We don't want to complain about out of date SDK unless the target needs to be remade. -- # This covers use-cases such as running 'make check' after moving the build to a -- # computer without Xcode or with a different Xcode version. -- TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0) -- ifeq ($(TARGET_UP_TO_DATE),0) -- ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),) -- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.) -- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),) -- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.) -- else ifneq ($(CURRENT_MAC_SDK_VERSION),) -- $(info The $(EXPORT_QMAKE_MAC_SDK) platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) -- else -- $(info Unknown error resolving current platform SDK version.) -- endif -- $(info This requires a fresh build of your project. Please wipe the build directory) -- ifneq ($(EXPORT__QMAKE_STASH_),) -- $(info including the qmake cache in $(EXPORT__QMAKE_STASH_)) -- endif -- $(error ^) -- endif -- endif --endif -diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 3a9c2778bb..e69de29bb2 100644 ---- a/mkspecs/features/mac/sdk.prf -+++ b/mkspecs/features/mac/sdk.prf -@@ -1,61 +0,0 @@ -- --isEmpty(QMAKE_MAC_SDK): \ -- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") -- --contains(QMAKE_MAC_SDK, .*/.*): \ -- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)") -- --defineReplace(xcodeSDKInfo) { -- info = $$1 -- equals(info, "Path"): \ -- infoarg = --show-sdk-path -- equals(info, "PlatformPath"): \ -- infoarg = --show-sdk-platform-path -- equals(info, "SDKVersion"): \ -- infoarg = --show-sdk-version -- sdk = $$2 -- isEmpty(sdk): \ -- sdk = $$QMAKE_MAC_SDK -- -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { -- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null") -- # --show-sdk-platform-path won't work for Command Line Tools; this is fine -- # only used by the XCTest backend to testlib -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \ -- error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg") -- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) -- } -- -- return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info})) --} -- --QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path) --QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath) --QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) -- --isEmpty(QMAKE_EXPORT_INCDIR_OPENGL) { -- QMAKE_EXPORT_INCDIR_OPENGL = $$QMAKE_INCDIR_OPENGL -- sysrootified = -- for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val -- QMAKE_INCDIR_OPENGL = $$sysrootified --} -- --QMAKESPEC_NAME = $$basename(QMAKESPEC) -- --# Resolve SDK version of various tools --for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL QMAKE_LINK_C QMAKE_LINK_C_SHLIB)) { -- tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool} -- !isEmpty($$tool_variable) { -- $$tool = $$eval($$tool_variable) -- next() -- } -- -- value = $$eval($$tool) -- isEmpty(value): next() -- -- sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null") -- isEmpty(sysrooted): next() -- -- $$tool = $$sysrooted $$member(value, 1, -1) -- cache($$tool_variable, set stash, $$tool) --} -diff --git a/mkspecs/features/mac/toolchain.prf b/mkspecs/features/mac/toolchain.prf -index df191eb13c..e69de29bb2 100644 ---- a/mkspecs/features/mac/toolchain.prf -+++ b/mkspecs/features/mac/toolchain.prf -@@ -1,5 +0,0 @@ --# Ensure that we process sdk.prf first, as it will update QMAKE_CXX, --# which the default path determination uses. --sdk: load(sdk) -- --load(toolchain) diff --git a/pkgs/development/libraries/qt-6/qtModule.nix b/pkgs/development/libraries/qt-6/qtModule.nix index 610649497ba8..8b09c8cb19b8 100644 --- a/pkgs/development/libraries/qt-6/qtModule.nix +++ b/pkgs/development/libraries/qt-6/qtModule.nix @@ -1,6 +1,6 @@ { lib , stdenv -, apple-sdk_qt +, darwinVersionInputs , cmake , ninja , perl @@ -22,7 +22,7 @@ stdenv.mkDerivation (args // { buildInputs = args.buildInputs or [ ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_qt ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin darwinVersionInputs; nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ cmake ninja perl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ]; propagatedBuildInputs = diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 63e2572614fa..df28ee6cb39b 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib, readline, ncurses +{ lib, stdenv, fetchurl, unzip, zlib, readline, ncurses , updateAutotoolsGnuConfigScriptsHook # for tests @@ -24,11 +24,15 @@ stdenv.mkDerivation rec { url = "https://sqlite.org/2024/sqlite-autoconf-${archiveVersion version}.tar.gz"; hash = "sha256-Z9P+bSaObq3crjcn/OWPzI6cU4ab3Qegxh443fKWUHE="; }; + docsrc = fetchurl { + url = "https://sqlite.org/2024/sqlite-doc-${archiveVersion version}.zip"; + hash = "sha256-6WkTH5PKefvGTVdyShA1c1iBVVpSYA2+acaeq3LJ/NE="; + }; - outputs = [ "bin" "dev" "out" ]; + outputs = [ "bin" "dev" "man" "doc" "out" ]; separateDebugInfo = stdenv.hostPlatform.isLinux; - nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook unzip ]; buildInputs = [ zlib ] ++ lib.optionals interactive [ readline ncurses ]; # required for aarch64 but applied for all arches for simplicity @@ -82,6 +86,10 @@ stdenv.mkDerivation rec { postInstall = '' # Do not contaminate dependent libtool-based projects with sqlite dependencies. sed -i $out/lib/libsqlite3.la -e "s/dependency_libs=.*/dependency_libs='''/" + + mkdir -p $doc/share/doc + unzip $docsrc + mv sqlite-doc-${archiveVersion version} $doc/share/doc/sqlite ''; doCheck = false; # fails to link against tcl diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 7988785382a4..86cb1b427734 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.10.8"; + version = "3.10.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiohttp"; rev = "refs/tags/v${version}"; - hash = "sha256-ksvGRzar1Gp+86WrRFwyHoEdthyzvaAbyubdIhON/sk="; + hash = "sha256-c2mnt2ZQ7d7WO7Z8eDaUo9y+v0V0JwXUa1WJI9bwGTM="; }; patches = [ diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 298bd4d7e33c..c5e13ea20f1c 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "4.6.0"; + version = "4.6.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = "anyio"; rev = "refs/tags/${version}"; - hash = "sha256-aC/+46SWrpt+4MtvrqZq4gljWb3Kgps2r2/CeN0JfHE="; + hash = "sha256-8QLOAjQpiNtbd+YSHfqcBVdtMSGJFRevOcacZErKuso="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/bootstrap/flit-core/default.nix b/pkgs/development/python-modules/bootstrap/flit-core/default.nix index bdd4a0f535ff..01e9e43f3acd 100644 --- a/pkgs/development/python-modules/bootstrap/flit-core/default.nix +++ b/pkgs/development/python-modules/bootstrap/flit-core/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta ; - sourceRoot = "${src.name}/flit_core"; + postPatch = "cd flit_core"; buildPhase = '' runHook preBuild diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index b5077ddc5f66..75b9e2a4703e 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "build"; - version = "1.2.2"; + version = "1.2.2.post1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "pypa"; repo = "build"; rev = "refs/tags/${version}"; - hash = "sha256-pord65+Mg3TmHpAtU6PQAzxAmGtNu6MSxTruJsnA0EE="; + hash = "sha256-PHS7CjdKo5u4VTpbo409zLQAOmslV9bX0j0S83Gdv1U="; }; postPatch = '' diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix index 515bbbe509d5..170ffd907128 100644 --- a/pkgs/development/python-modules/clickclick/default.nix +++ b/pkgs/development/python-modules/clickclick/default.nix @@ -7,7 +7,7 @@ pyyaml, six, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ]; propagatedBuildInputs = [ flake8 diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix index 117fa8c08948..038186c8d3aa 100644 --- a/pkgs/development/python-modules/dbus-next/default.nix +++ b/pkgs/development/python-modules/dbus-next/default.nix @@ -6,7 +6,7 @@ setuptools, dbus, pytest, - pytest-cov, + pytest-cov-stub, pytest-asyncio, pytest-timeout, }: @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeCheckInputs = [ dbus pytest - pytest-cov + pytest-cov-stub pytest-asyncio pytest-timeout ]; diff --git a/pkgs/development/python-modules/echo/default.nix b/pkgs/development/python-modules/echo/default.nix index a07f10e8a4b1..376938a55cbe 100644 --- a/pkgs/development/python-modules/echo/default.nix +++ b/pkgs/development/python-modules/echo/default.nix @@ -11,7 +11,7 @@ qtpy, pyqt6, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -51,7 +51,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ]; pythonImportsCheck = [ "echo" ]; diff --git a/pkgs/development/python-modules/fairscale/default.nix b/pkgs/development/python-modules/fairscale/default.nix index 4472d6e24a4f..e870e2c934e7 100644 --- a/pkgs/development/python-modules/fairscale/default.nix +++ b/pkgs/development/python-modules/fairscale/default.nix @@ -11,7 +11,7 @@ # check inputs pytestCheckHook, parameterized, - pytest-cov, + pytest-cov-stub, pytest-timeout, remote-pdb, }: @@ -51,7 +51,7 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook parameterized - pytest-cov + pytest-cov-stub pytest-timeout remote-pdb ]; diff --git a/pkgs/development/python-modules/fast-histogram/default.nix b/pkgs/development/python-modules/fast-histogram/default.nix index d0621c1b539e..3a3ada743a4e 100644 --- a/pkgs/development/python-modules/fast-histogram/default.nix +++ b/pkgs/development/python-modules/fast-histogram/default.nix @@ -10,7 +10,7 @@ numpy, wheel, hypothesis, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -38,7 +38,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook hypothesis - pytest-cov + pytest-cov-stub ]; pytestFlagsArray = [ "${builtins.placeholder "out"}/${python.sitePackages}" ]; diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 1f29059bba72..e9ed6eb2e2ea 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.115.0"; + version = "0.115.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "fastapi"; rev = "refs/tags/${version}"; - hash = "sha256-TewFTbYdWIHcgRH+YNxNEUZVlaUn2aTZ0YFmDPrPZl4="; + hash = "sha256-JIaPgZVbz887liVwd3YtubJm+L4tFCM9Jcn9/smjiKo="; }; build-system = [ pdm-backend ]; @@ -106,24 +106,20 @@ buildPythonPackage rec { disabledTests = [ # Coverage test "test_fastapi_cli" - # ResourceWarning: Unclosed - "test_openapi_schema" ]; disabledTestPaths = [ # Don't test docs and examples "docs_src" - # databases is incompatible with SQLAlchemy 2.0 - "tests/test_tutorial/test_async_sql_databases" "tests/test_tutorial/test_sql_databases" ]; pythonImportsCheck = [ "fastapi" ]; meta = with lib; { - changelog = "https://github.com/tiangolo/fastapi/releases/tag/${version}"; + changelog = "https://github.com/fastapi/fastapi/releases/tag/${version}"; description = "Web framework for building APIs"; - homepage = "https://github.com/tiangolo/fastapi"; + homepage = "https://github.com/fastapi/fastapi"; license = licenses.mit; maintainers = with maintainers; [ wd15 ]; }; diff --git a/pkgs/development/python-modules/flit-core/default.nix b/pkgs/development/python-modules/flit-core/default.nix index 05157efb8648..628234d2955f 100644 --- a/pkgs/development/python-modules/flit-core/default.nix +++ b/pkgs/development/python-modules/flit-core/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { inherit (flit) src patches; - sourceRoot = "${src.name}/flit_core"; + postPatch = "cd flit_core"; # Tests are run in the "flit" package. doCheck = false; diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 9284de7d1184..825e4435535a 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -28,6 +28,11 @@ buildPythonPackage rec { hash = "sha256-yl2+PcKr7xRW4oIBWl+gzh/nKhSNu5GH9fWKRGgaNHU="; }; + patches = [ + # https://github.com/pypa/flit/commit/6ab62c91d0db451b5e9ab000f0dba5471550b442.patch + ./python314-compat.patch + ]; + nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flit/python314-compat.patch b/pkgs/development/python-modules/flit/python314-compat.patch new file mode 100644 index 000000000000..439592e3a63b --- /dev/null +++ b/pkgs/development/python-modules/flit/python314-compat.patch @@ -0,0 +1,41 @@ +From 6ab62c91d0db451b5e9ab000f0dba5471550b442 Mon Sep 17 00:00:00 2001 +From: Thomas A Caswell +Date: Tue, 28 May 2024 10:25:13 -0400 +Subject: [PATCH] MNT: fix compatibility with Python 3.14 + +The ast.Str class was deprecated in 3.8 and will be removed in 3.14 +--- + flit_core/flit_core/common.py | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/flit_core/flit_core/common.py b/flit_core/flit_core/common.py +index 6625224b..8bcda3fb 100644 +--- a/flit_core/flit_core/common.py ++++ b/flit_core/flit_core/common.py +@@ -148,6 +148,10 @@ def get_docstring_and_version_via_ast(target): + with target_path.open('rb') as f: + node = ast.parse(f.read()) + for child in node.body: ++ if sys.version_info >= (3, 8): ++ target_type = ast.Constant ++ else: ++ target_type = ast.Str + # Only use the version from the given module if it's a simple + # string assignment to __version__ + is_version_str = ( +@@ -157,10 +161,13 @@ def get_docstring_and_version_via_ast(target): + and target.id == "__version__" + for target in child.targets + ) +- and isinstance(child.value, ast.Str) ++ and isinstance(child.value, target_type) + ) + if is_version_str: +- version = child.value.s ++ if sys.version_info >= (3, 8): ++ version = child.value.value ++ else: ++ version = child.value.s + break + return ast.get_docstring(node), version + diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix index 3c1b2ce83efd..f11178381f4b 100644 --- a/pkgs/development/python-modules/flufl/lock.nix +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -5,7 +5,7 @@ fetchPypi, hatchling, psutil, - pytest-cov, + pytest-cov-stub, pytestCheckHook, pythonOlder, sybil, @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub sybil ]; diff --git a/pkgs/development/python-modules/googlemaps/default.nix b/pkgs/development/python-modules/googlemaps/default.nix index 0e936dd7e183..c4396a52ae30 100644 --- a/pkgs/development/python-modules/googlemaps/default.nix +++ b/pkgs/development/python-modules/googlemaps/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - pytest-cov, + pytest-cov-stub, pytestCheckHook, pythonOlder, requests, @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; nativeCheckInputs = [ - pytest-cov + pytest-cov-stub pytestCheckHook responses ]; diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix index 75c3ade1b51d..c1e6a20f17bf 100644 --- a/pkgs/development/python-modules/grpcio-channelz/default.nix +++ b/pkgs/development/python-modules/grpcio-channelz/default.nix @@ -12,13 +12,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-channelz"; - version = "1.66.2"; + version = "1.67.0"; pyproject = true; src = fetchPypi { pname = "grpcio_channelz"; inherit version; - hash = "sha256-SQTHg3UjQ2YkiV2QYmlPKQt/Mzg7KWoex8SXtuTH7Rk="; + hash = "sha256-F2Jfq6lOYn4RsjP9Ay21G67F6HkGeY3SIEk26Z0BWnE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix index c96b71d3f5fc..ff73160db9a8 100644 --- a/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -11,13 +11,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-health-checking"; - version = "1.66.2"; + version = "1.67.0"; format = "setuptools"; src = fetchPypi { pname = "grpcio_health_checking"; inherit version; - hash = "sha256-yQ35YiRWBC7DSV03qzC190ckqsW11VMU8HPu9eJHChM="; + hash = "sha256-PepxXVboJQ/wW6Se9RF/g2skD/N5vkY2DCbO/ZydsRo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix index c37492ccf476..b00a0bb51b73 100644 --- a/pkgs/development/python-modules/grpcio-reflection/default.nix +++ b/pkgs/development/python-modules/grpcio-reflection/default.nix @@ -12,13 +12,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-reflection"; - version = "1.66.2"; + version = "1.67.0"; pyproject = true; src = fetchPypi { pname = "grpcio_reflection"; inherit version; - hash = "sha256-rdgn4t61bpaAPIKs4dTnf6DI7DdH1jmOmVH3OdcQZ9Q="; + hash = "sha256-xHFDc4sYl7bOSvXg4zjIXJruX9y7M1XTaKjcrkbYkzw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index 1d203369e10b..27de864281cb 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -13,7 +13,7 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-status"; - version = "1.66.2"; + version = "1.67.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_status"; inherit version; - hash = "sha256-+1XLtcLmcGL3pNXJnkidB0+1fphnjVw8ZpKi102J6a4="; + hash = "sha256-w+Wob6AH6eJjzV+YioqQdITaTKq1godOoqSmCSc0BGs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index 0d38efffbc14..1a174b5ba587 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -13,7 +13,7 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.66.2"; + version = "1.67.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_testing"; inherit version; - hash = "sha256-pje9w7MSutXZKQd2dP0TS0zJbkm0P39OwQVLR28ZRgQ="; + hash = "sha256-YVRnu0aObDSfYCIKlrvMKin70hmwDdip96I+Qyi7+Dw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index c256496573fd..51b1012a972e 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -12,13 +12,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.66.2"; - format = "setuptools"; + version = "1.67.0"; + pyproject = true; src = fetchPypi { pname = "grpcio_tools"; inherit version; - hash = "sha256-SjbgeRPSa6XM/SaFumPKl/JrCMJJ0syedN2jfvpJ1+Q="; + hash = "sha256-GBs9TmG4MULBguw2bzB5sAI1CXQ5huVMlGXKOMrCVfg="; }; outputs = [ diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index ed425b7125df..c8c98cd8a031 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -2,17 +2,14 @@ lib, stdenv, buildPythonPackage, - fetchPypi, - grpc, - six, - protobuf, - enum34 ? null, - futures ? null, - isPy27, - pkg-config, - cython, c-ares, + cython, + fetchPypi, openssl, + pkg-config, + protobuf, + pythonOlder, + setuptools, zlib, }: @@ -21,12 +18,14 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio"; - format = "setuptools"; - version = "1.66.2"; + version = "1.67.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-VjWIxYe3XDS5KLxChUjlsA6jjEaXIYGk2Ldbp+PyQjE="; + hash = "sha256-4JCyVT4Noch1RJyOdQc91EFd1xyb3mpAYkD99MDuRnw="; }; outputs = [ @@ -34,6 +33,8 @@ buildPythonPackage rec { "dev" ]; + build-system = [ setuptools ]; + nativeBuildInputs = [ cython pkg-config @@ -44,15 +45,8 @@ buildPythonPackage rec { openssl zlib ]; - propagatedBuildInputs = - [ - six - protobuf - ] - ++ lib.optionals (isPy27) [ - enum34 - futures - ]; + + dependencies = [ protobuf ]; preBuild = '' @@ -79,8 +73,9 @@ buildPythonPackage rec { meta = with lib; { description = "HTTP/2-based RPC framework"; - license = licenses.asl20; homepage = "https://grpc.io/grpc/python/"; + changelog = "https://github.com/grpc/grpc/releases/tag/v${version}"; + license = licenses.asl20; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index 45a7b6862421..d6130ef31287 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -17,7 +17,7 @@ setproctitle, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -50,7 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ] ++ lib.flatten (lib.attrValues optional-dependencies); meta = { diff --git a/pkgs/development/python-modules/haystack-ai/default.nix b/pkgs/development/python-modules/haystack-ai/default.nix index c5d12912633e..f1ac68d9374a 100644 --- a/pkgs/development/python-modules/haystack-ai/default.nix +++ b/pkgs/development/python-modules/haystack-ai/default.nix @@ -42,7 +42,7 @@ pylint, pytest, pytest-asyncio, - pytest-cov, + pytest-cov-stub, # , pytest-custom-exit-code python-multipart, reno, @@ -167,7 +167,7 @@ buildPythonPackage rec { pylint pytest pytest-asyncio - pytest-cov + pytest-cov-stub # pytest-custom-exit-code python-multipart reno diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 0c489b5c30d2..8ce6d5d4f4ec 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, isPyPy, substituteAll, @@ -98,15 +97,21 @@ buildPythonPackage rec { "tests/test_swf.py" ]; - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ - # Segmentation fault - "test_bayer_write" - # RuntimeError: No valid H.264 encoder was found with the ffmpeg installation - "test_writer_file_properly_closed" - "test_writer_pixelformat_size_verbose" - "test_writer_ffmpeg_params" - "test_reverse_read" - ]; + disabledTests = + [ + # Pillow 11.0.0 compat + # https://github.com/imageio/imageio/issues/1104 + "test_gif" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Segmentation fault + "test_bayer_write" + # RuntimeError: No valid H.264 encoder was found with the ffmpeg installation + "test_writer_file_properly_closed" + "test_writer_pixelformat_size_verbose" + "test_writer_ffmpeg_params" + "test_reverse_read" + ]; meta = { description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats"; diff --git a/pkgs/development/python-modules/injector/default.nix b/pkgs/development/python-modules/injector/default.nix index 7ce90c23f622..734b3b3f6d33 100644 --- a/pkgs/development/python-modules/injector/default.nix +++ b/pkgs/development/python-modules/injector/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, typing-extensions, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ]; pythonImportsCheck = [ "injector" ]; diff --git a/pkgs/development/python-modules/iocapture/default.nix b/pkgs/development/python-modules/iocapture/default.nix index a36a01eeeead..0e44cad6916b 100644 --- a/pkgs/development/python-modules/iocapture/default.nix +++ b/pkgs/development/python-modules/iocapture/default.nix @@ -4,7 +4,7 @@ fetchPypi, flexmock, pytest, - pytest-cov, + pytest-cov-stub, six, }: @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeCheckInputs = [ flexmock pytest - pytest-cov + pytest-cov-stub six ]; diff --git a/pkgs/development/python-modules/ipfshttpclient/default.nix b/pkgs/development/python-modules/ipfshttpclient/default.nix index e44127372172..263870816dab 100644 --- a/pkgs/development/python-modules/ipfshttpclient/default.nix +++ b/pkgs/development/python-modules/ipfshttpclient/default.nix @@ -8,7 +8,7 @@ py-multiaddr, requests, pytestCheckHook, - pytest-cov, + pytest-cov-stub, pytest-dependency, pytest-localserver, pytest-mock, @@ -42,7 +42,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub pytest-dependency pytest-localserver pytest-mock diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 33c3c0a8a754..45cd52fdbac3 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -42,13 +42,13 @@ buildPythonPackage rec { pname = "ipython"; - version = "8.27.0"; + version = "8.29.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-C5mi3J8V/WhpLomOVWhyXG1JxSfTap+1lg/73qqC/34="; + hash = "sha256-QLYOFbIlkUUO73PkCgJ893vWUudXUj7rxb18fEmCkOs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index 8bf7e67b9ecd..627bdeadfc1e 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - pytest-cov, + pytest-cov-stub, setuptools, }: @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ]; pytestFlagsArray = [ "isbnlib/test/" ]; diff --git a/pkgs/development/python-modules/jwt/default.nix b/pkgs/development/python-modules/jwt/default.nix index fc058f7d7004..2da80c7e183c 100644 --- a/pkgs/development/python-modules/jwt/default.nix +++ b/pkgs/development/python-modules/jwt/default.nix @@ -6,7 +6,7 @@ cryptography, freezegun, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook freezegun - pytest-cov + pytest-cov-stub ]; pythonImportsCheck = [ "jwt" ]; diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index ede8b745c0f7..6e69ea0488c4 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "markupsafe"; - version = "3.0.1"; + version = "3.0.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "pallets"; repo = "markupsafe"; rev = "refs/tags/${version}"; - hash = "sha256-YMvEfrIwGy5Ug4EjkiWOlijEWltWSjJGDrpseH86778="; + hash = "sha256-BqCkQqPhjEx3qB/k3d3fSirR/HDBa7e4kpx3/VSwXJM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/meson-python/add-build-flags.sh b/pkgs/development/python-modules/meson-python/add-build-flags.sh index d9327960eb1d..e1b2588f07fc 100644 --- a/pkgs/development/python-modules/meson-python/add-build-flags.sh +++ b/pkgs/development/python-modules/meson-python/add-build-flags.sh @@ -1,9 +1,9 @@ mesonPythonBuildFlagsHook() { # Add all of mesonFlags to -Csetup-args for pypa builds for f in $mesonFlags; do - pypaBuildFlags+=" -Csetup-args=$f" + appendToVar pypaBuildFlags "-Csetup-args=$f" # This requires pip>23.0.1, see: https://meson-python.readthedocs.io/en/latest/how-to-guides/config-settings.html - pipBuildFlags+=" --config-settings=setup-args=$f" + appendToVar pipBuildFlags "--config-settings=setup-args=$f" done } diff --git a/pkgs/development/python-modules/monero/default.nix b/pkgs/development/python-modules/monero/default.nix index a0ef05cb3b05..4fdab49a521e 100644 --- a/pkgs/development/python-modules/monero/default.nix +++ b/pkgs/development/python-modules/monero/default.nix @@ -9,7 +9,7 @@ six, varint, pytestCheckHook, - pytest-cov, + pytest-cov-stub, responses, }: @@ -44,7 +44,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub responses ]; diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 118cef585d22..e4cee7571da9 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -37,14 +37,14 @@ buildPythonPackage rec { pname = "moto"; - version = "5.0.16"; + version = "5.0.18"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-9K+xdqlkzXpw2pvF4FPUMQlhTOPKsmBEvLtTYQQ13/Q="; + hash = "sha256-inrS9ToubMnbL/ZcDg1LXX54vAC4Jcnh/2zDlDceduk="; }; build-system = [ setuptools ]; @@ -255,11 +255,11 @@ buildPythonPackage rec { "tests/test_cognitoidp/test_cognitoidp.py" ]; - meta = with lib; { - description = "Module to allow your tests to easily mock out AWS Services"; + meta = { + description = "Allows your tests to easily mock out AWS Services"; homepage = "https://github.com/getmoto/moto"; changelog = "https://github.com/getmoto/moto/blob/${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = [ ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ onny ]; }; } diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index 7bbd361cb2b1..98be7873032a 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitLab, argon2-cffi, bcrypt, cryptography, @@ -14,15 +14,20 @@ buildPythonPackage rec { pname = "passlib"; version = "1.7.4"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-3v1Q9ytlxUAqssVzgwppeOXyAq0NmEeTyN3ixBUuvgQ"; + src = fetchFromGitLab { + domain = "foss.heptapod.net"; + owner = "python-libs"; + repo = "passlib"; + rev = "refs/tags/${version}"; + hash = "sha256-Mx2Xg/KAEfvfep2B/gWATTiAPJc+f22MTcsEdRpt3n8="; }; + build-system = [ setuptools ]; + dependencies = [ setuptools ]; optional-dependencies = { @@ -60,10 +65,11 @@ buildPythonPackage rec { "--deselect=passlib/tests/test_handlers.py::sha256_crypt_os_crypt_test::test_82_crypt_support" ]; - meta = with lib; { + meta = { + changelog = "https://foss.heptapod.net/python-libs/passlib/-/blob/${version}/docs/history/${lib.versions.majorMinor version}.rst"; description = "Password hashing library for Python"; homepage = "https://foss.heptapod.net/python-libs/passlib"; - license = licenses.bsdOriginal; - maintainers = [ ]; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index b7ac8fefb3a8..40a921726a67 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "paste"; version = "3.10.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "cdent"; + owner = "pasteorg"; repo = "paste"; rev = "refs/tags/${version}"; hash = "sha256-NY/h6hbpluEu1XAv3o4mqoG+l0LXfM1dw7+G0Rm1E4o="; @@ -26,7 +26,9 @@ buildPythonPackage rec { patchShebangs tests/cgiapp_data/ ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ setuptools six ]; @@ -43,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tools for using a Web Server Gateway Interface stack"; homepage = "https://pythonpaste.readthedocs.io/"; - changelog = "https://github.com/cdent/paste/blob/${version}/docs/news.txt"; + changelog = "https://github.com/pasteorg/paste/blob/${version}/docs/news.txt"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix index a68134dfdc31..7d1eacb847e0 100644 --- a/pkgs/development/python-modules/pastedeploy/default.nix +++ b/pkgs/development/python-modules/pastedeploy/default.nix @@ -4,27 +4,30 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pastedeploy"; - version = "3.0.1"; - format = "setuptools"; + version = "3.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Pylons"; - repo = pname; + repo = "pastedeploy"; rev = "refs/tags/${version}"; hash = "sha256-8MNeOcYPEYAfghZN/K/1v/tAAdgz/fCvuVnBoru+81Q="; }; postPatch = '' substituteInPlace pytest.ini \ - --replace " --cov" "" + --replace-fail " --cov" "" ''; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "paste.deploy" ]; diff --git a/pkgs/development/python-modules/pdm-backend/default.nix b/pkgs/development/python-modules/pdm-backend/default.nix index 98c6b451ee6f..b7a7f87a4fd0 100644 --- a/pkgs/development/python-modules/pdm-backend/default.nix +++ b/pkgs/development/python-modules/pdm-backend/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pdm-backend"; - version = "2.4.1"; + version = "2.4.3"; pyproject = true; src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm-backend"; rev = "refs/tags/${version}"; - hash = "sha256-YQavUP3RaZns9byli54feVtG92Stozr3T66WouQwF+s="; + hash = "sha256-XbHlzt00R0kB8I6nRvteAgpFlUTAvBcF5iaQD5V30ok="; }; env.PDM_BUILD_SCM_VERSION = version; diff --git a/pkgs/development/python-modules/pettingzoo/default.nix b/pkgs/development/python-modules/pettingzoo/default.nix index e2e562f0d0f1..f388de21a026 100644 --- a/pkgs/development/python-modules/pettingzoo/default.nix +++ b/pkgs/development/python-modules/pettingzoo/default.nix @@ -17,7 +17,7 @@ pre-commit, pynput, pytest, - pytest-cov, + pytest-cov-stub, pytest-markdown-docs, pytest-xdist, pytestCheckHook, @@ -87,7 +87,7 @@ buildPythonPackage rec { pre-commit pynput pytest - pytest-cov + pytest-cov-stub pytest-markdown-docs pytest-xdist ]; diff --git a/pkgs/development/python-modules/pgmpy/default.nix b/pkgs/development/python-modules/pgmpy/default.nix index 1217f573cdcd..810f1aa26859 100644 --- a/pkgs/development/python-modules/pgmpy/default.nix +++ b/pkgs/development/python-modules/pgmpy/default.nix @@ -20,7 +20,7 @@ # tests pytestCheckHook, - pytest-cov, + pytest-cov-stub, coverage, mock, black, @@ -69,7 +69,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook # xdoctest - pytest-cov + pytest-cov-stub coverage mock black diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index be57d452680b..caa81ce9720b 100644 --- a/pkgs/development/python-modules/pillow-heif/default.nix +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "pillow-heif"; - version = "0.18.0"; + version = "0.20.0"; pyproject = true; src = fetchFromGitHub { owner = "bigcat88"; repo = "pillow_heif"; rev = "refs/tags/v${version}"; - hash = "sha256-+HQvDf5aovUtZ++BoD22B012N32A+7++O/jbpkIVQws="; + hash = "sha256-a1qCxI+mMuEYsCk2CUYGNKCe+SONuvVizqUvmQKy3sE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pillow-simd/default.nix b/pkgs/development/python-modules/pillow-simd/default.nix deleted file mode 100644 index 2d3551d171e9..000000000000 --- a/pkgs/development/python-modules/pillow-simd/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - stdenv, - buildPythonPackage, - fetchFromGitHub, - isPyPy, - isPy3k, - olefile, - freetype, - libjpeg, - zlib, - libtiff, - libwebp, - libxcrypt, - tcl, - lcms2, - libxcb, - tk, - libX11, - openjpeg, - libimagequant, - pyroma, - numpy, - defusedxml, - pytestCheckHook, - setuptools, -}@args: - -import ../pillow/generic.nix ( - rec { - pname = "Pillow-SIMD"; - # check for release version on https://pypi.org/project/Pillow-SIMD/#history - # does not match the latest pillow release version! - version = "9.0.0.post1"; - format = "setuptools"; - - disabled = !isPy3k; - - src = fetchFromGitHub { - owner = "uploadcare"; - repo = "pillow-simd"; - rev = "v${version}"; - hash = "sha256-qTZYhgHjVMXqoYl3mG1xVrFaWrPidSY8HlyFQizV27Y="; - }; - - meta = with lib; { - broken = - (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; - homepage = "https://python-pillow.github.io/pillow-perf/"; - description = "Friendly PIL fork - SIMD version"; - longDescription = '' - Pillow-SIMD is "following" Pillow. Pillow-SIMD versions are 100% compatible drop-in replacements for Pillow of the same version. - - SIMD stands for "single instruction, multiple data" and its essence is in performing the same operation on multiple data points simultaneously by using multiple processing elements. Common CPU SIMD instruction sets are MMX, SSE-SSE4, AVX, AVX2, AVX512, NEON. - - Currently, Pillow-SIMD can be compiled with SSE4 (default) or AVX2 support. - ''; - license = licenses.hpnd; - maintainers = [ ]; - }; - } - // args -) diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index b5257f5101d2..30d741052a09 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -3,26 +3,35 @@ stdenv, buildPythonPackage, pythonOlder, - fetchPypi, - isPyPy, - defusedxml, - olefile, + fetchFromGitHub, + + # build-system + setuptools, + pkg-config, + + # native dependencies freetype, + lcms2, + libimagequant, libjpeg, - zlib, + libraqm, libtiff, libwebp, - libxcrypt, - tcl, - lcms2, - tk, - libX11, libxcb, openjpeg, - libimagequant, + tkinter, + zlib, + + # optional dependencies + defusedxml, + olefile, + typing-extensions, + + # tests numpy, + pytest-cov-stub, pytestCheckHook, - setuptools, + # for passthru.tests imageio, matplotlib, @@ -30,45 +39,112 @@ pydicom, reportlab, sage, -}@args: +}: -import ./generic.nix ( - rec { - pname = "pillow"; - version = "10.4.0"; - format = "pyproject"; +buildPythonPackage rec { + pname = "pillow"; + version = "11.0.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + src = fetchFromGitHub { + owner = "python-pillow"; + repo = "pillow"; + rev = "refs/tags/${version}"; + hash = "sha256-vWNqzA2ZfJcWexXw790RgyYtP8WDtahoQIX16otCRnk="; + }; - src = fetchPypi { - pname = "pillow"; - inherit version; - hash = "sha256-Fmwc1NJDCbMNYfefSpEUt7IxPXRQkSJ3hV/139fNSgY="; - }; + build-system = [ setuptools ]; - passthru.tests = { - inherit - imageio - matplotlib - pilkit - pydicom - reportlab - sage - ; - }; + nativeBuildInputs = [ pkg-config ]; - meta = with lib; { - homepage = "https://python-pillow.org/"; - description = "Friendly PIL fork (Python Imaging Library)"; - longDescription = '' - The Python Imaging Library (PIL) adds image processing - capabilities to your Python interpreter. This library - supports many file formats, and provides powerful image - processing and graphics capabilities. - ''; - license = licenses.hpnd; - maintainers = with maintainers; [ prikhi ]; - }; - } - // args -) + # https://pillow.readthedocs.io/en/latest/installation/building-from-source.html#building-from-source + buildInputs = [ + freetype + lcms2 + libimagequant + libjpeg + libraqm + libtiff + libwebp + libxcb + openjpeg + tkinter + zlib + ]; + + pypaBuildFlags = [ + # Disable platform guessing, which tries various FHS paths + "--config=setting=--disable-platform-guessing" + ]; + + preConfigure = + let + getLibAndInclude = pkg: ''"${pkg.out}/lib", "${lib.getDev pkg}/include"''; + in + '' + # The build process fails to find the pkg-config files for these dependencies + substituteInPlace setup.py \ + --replace-fail 'IMAGEQUANT_ROOT = None' 'IMAGEQUANT_ROOT = ${getLibAndInclude libimagequant}' \ + --replace-fail 'JPEG2K_ROOT = None' 'JPEG2K_ROOT = ${getLibAndInclude openjpeg}' + + # Build with X11 support + export LDFLAGS="$LDFLAGS -L${libxcb}/lib" + export CFLAGS="$CFLAGS -I${libxcb.dev}/include" + ''; + + optional-dependencies = { + fpx = [ olefile ]; + mic = [ olefile ]; + typing = lib.optionals (pythonOlder "3.10") [ typing-extensions ]; + xmp = [ defusedxml ]; + }; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + numpy + ] ++ lib.flatten (lib.attrValues optional-dependencies); + + disabledTests = + [ + # Code quality mismathch 9 vs 10 + "test_pyroma" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Disable darwin tests which require executables: `iconutil` and `screencapture` + "test_grab" + "test_grabclipboard" + "test_save" + ]; + + disabledTestPaths = lib.optionals stdenv.isDarwin [ + # Crashes the interpreter + "Tests/test_imagetk.py" + ]; + + passthru.tests = { + inherit + imageio + matplotlib + pilkit + pydicom + reportlab + sage + ; + }; + + meta = with lib; { + homepage = "https://python-pillow.org"; + changelog = "https://pillow.readthedocs.io/en/stable/releasenotes/${version}.html"; + description = "Friendly PIL fork (Python Imaging Library)"; + longDescription = '' + The Python Imaging Library (PIL) adds image processing + capabilities to your Python interpreter. This library + supports many file formats, and provides powerful image + processing and graphics capabilities. + ''; + license = licenses.mit-cmu; + maintainers = with maintainers; [ hexa ]; + }; + +} diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix deleted file mode 100644 index 1ecaea6b205d..000000000000 --- a/pkgs/development/python-modules/pillow/generic.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ - pname, - version, - src, - patches ? [ ], - meta, - passthru ? { }, - ... -}@args: - -with args; - -buildPythonPackage rec { - inherit - pname - version - format - src - meta - passthru - patches - ; - - # Disable imagefont tests, because they don't work well with infinality: - # https://github.com/python-pillow/Pillow/issues/1259 - postPatch = '' - rm Tests/test_imagefont.py - ''; - - disabledTests = - [ - # Code quality mismathch 9 vs 10 - "test_pyroma" - - # pillow-simd - "test_roundtrip" - "test_basic" - "test_custom_metadata" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Disable darwin tests which require executables: `iconutil` and `screencapture` - "test_grab" - "test_grabclipboard" - "test_save" - ]; - - propagatedBuildInputs = [ - olefile - ] ++ lib.optionals (lib.versionAtLeast version "8.2.0") [ defusedxml ]; - - nativeCheckInputs = [ - pytestCheckHook - numpy - ]; - - nativeBuildInputs = [ setuptools ]; - - buildInputs = - [ - freetype - libjpeg - openjpeg - libimagequant - zlib - libtiff - libwebp - libxcrypt - tcl - lcms2 - ] - ++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ] - ++ lib.optionals (isPyPy) [ - tk - libX11 - ]; - - # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. - # NOTE: The Pillow install script will, by default, add paths like /usr/lib - # and /usr/include to the search paths. This can break things when building - # on a non-NixOS system that has some libraries installed that are not - # installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't - # build Pillow with this support). We patch the `disable_platform_guessing` - # setting here, instead of passing the `--disable-platform-guessing` - # command-line option, since the command-line option doesn't work when we run - # tests. - preConfigure = - let - libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"''; - libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; - in - '' - sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; - s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ; - s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; - s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; - s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; - s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ; - s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;' - export LDFLAGS="$LDFLAGS -L${libwebp}/lib" - export CFLAGS="$CFLAGS -I${libwebp}/include" - '' - + lib.optionalString (lib.versionAtLeast version "7.1.0") '' - export LDFLAGS="$LDFLAGS -L${libxcb}/lib" - export CFLAGS="$CFLAGS -I${libxcb.dev}/include" - ''; -} diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix index 3585d4a7721b..0651404dc477 100644 --- a/pkgs/development/python-modules/plaster/default.nix +++ b/pkgs/development/python-modules/plaster/default.nix @@ -2,7 +2,7 @@ buildPythonPackage, fetchPypi, pytest, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -21,6 +21,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest - pytest-cov + pytest-cov-stub ]; } diff --git a/pkgs/development/python-modules/property-manager/default.nix b/pkgs/development/python-modules/property-manager/default.nix index e1eee500812e..71fa0e1aeddb 100644 --- a/pkgs/development/python-modules/property-manager/default.nix +++ b/pkgs/development/python-modules/property-manager/default.nix @@ -6,7 +6,7 @@ verboselogs, coloredlogs, pytest, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ pytest - pytest-cov + pytest-cov-stub ]; meta = with lib; { diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 228f8140fbe6..8e0cc3cc7a51 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "protobuf"; - version = "5.28.2"; + version = "5.28.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-WTeWdP8RlxdAT3RUZHkTeHA08D/nBJy+8ddKl7tFk/A="; + hash = "sha256-ZLrbxJGApeQB83P5znqx0Ytj991KnNxDySufC0gc73s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index 9782458b4ccb..605936dd8637 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -8,7 +8,7 @@ fs, # for fonttools extras setuptools-scm, pytestCheckHook, - pytest-cov, + pytest-cov-stub, pytest-xdist, runAllTests ? false, psautohint, # for passthru.tests @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub pytest-xdist ]; disabledTests = lib.optionals (!runAllTests) [ diff --git a/pkgs/development/python-modules/pyevtk/default.nix b/pkgs/development/python-modules/pyevtk/default.nix index 2164ffb9e118..1e84651b6de3 100644 --- a/pkgs/development/python-modules/pyevtk/default.nix +++ b/pkgs/development/python-modules/pyevtk/default.nix @@ -5,7 +5,7 @@ setuptools, numpy, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ]; pythonImportsCheck = [ "pyevtk" ]; diff --git a/pkgs/development/python-modules/pyexcel-xls/default.nix b/pkgs/development/python-modules/pyexcel-xls/default.nix index c372ca08adf1..81bcc8ade772 100644 --- a/pkgs/development/python-modules/pyexcel-xls/default.nix +++ b/pkgs/development/python-modules/pyexcel-xls/default.nix @@ -8,7 +8,7 @@ xlwt, pyexcel, pytestCheckHook, - pytest-cov, + pytest-cov-stub, setuptools, }: @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pyexcel - pytest-cov + pytest-cov-stub ]; postPatch = '' diff --git a/pkgs/development/python-modules/pymaven-patch/default.nix b/pkgs/development/python-modules/pymaven-patch/default.nix index c390123e4c5a..a8622f2e9bd5 100644 --- a/pkgs/development/python-modules/pymaven-patch/default.nix +++ b/pkgs/development/python-modules/pymaven-patch/default.nix @@ -7,7 +7,7 @@ six, lxml, pytestCheckHook, - pytest-cov, + pytest-cov-stub, mock, }: buildPythonPackage rec { @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub mock ]; diff --git a/pkgs/development/python-modules/pyscaffold/default.nix b/pkgs/development/python-modules/pyscaffold/default.nix index 127ca5bb96c2..5a0b13086071 100644 --- a/pkgs/development/python-modules/pyscaffold/default.nix +++ b/pkgs/development/python-modules/pyscaffold/default.nix @@ -23,7 +23,7 @@ certifi, flake8, pytest, - pytest-cov, + pytest-cov-stub, pytest-randomly, pytest-xdist, sphinx, @@ -80,7 +80,7 @@ buildPythonPackage rec { flake8 pre-commit pytest - pytest-cov + pytest-cov-stub pytest-randomly pytest-xdist setuptools diff --git a/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix b/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix index a34bf93334e9..d5ba7c9b6d82 100644 --- a/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix @@ -11,7 +11,7 @@ configupdater, pre-commit, pytest, - pytest-cov, + pytest-cov-stub, pytest-xdist, tox, virtualenv, @@ -44,7 +44,7 @@ buildPythonPackage rec { configupdater pre-commit pytest - pytest-cov + pytest-cov-stub pytest-xdist setuptools-scm tox diff --git a/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix b/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix index ee4bc3aa728b..0ee14743b5e9 100644 --- a/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix @@ -11,7 +11,7 @@ pyscaffold, pre-commit, pytest, - pytest-cov, + pytest-cov-stub, pytest-xdist, tox, virtualenv, @@ -45,7 +45,7 @@ buildPythonPackage rec { configupdater pre-commit pytest - pytest-cov + pytest-cov-stub pytest-xdist setuptools-scm tox diff --git a/pkgs/development/python-modules/pyscaffoldext-django/default.nix b/pkgs/development/python-modules/pyscaffoldext-django/default.nix index e0e9ca4cf69f..6270dbc2d1d5 100644 --- a/pkgs/development/python-modules/pyscaffoldext-django/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-django/default.nix @@ -10,7 +10,7 @@ configupdater, pre-commit, pytest, - pytest-cov, + pytest-cov-stub, pytest-xdist, tox, virtualenv, @@ -42,7 +42,7 @@ buildPythonPackage rec { configupdater pre-commit pytest - pytest-cov + pytest-cov-stub pytest-xdist setuptools-scm tox diff --git a/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix b/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix index 9763ba8ace95..cc70d4098ab8 100644 --- a/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix @@ -11,7 +11,7 @@ configupdater, pre-commit, pytest, - pytest-cov, + pytest-cov-stub, pytest-xdist, tox, virtualenv, @@ -44,7 +44,7 @@ buildPythonPackage rec { configupdater pre-commit pytest - pytest-cov + pytest-cov-stub pytest-xdist setuptools-scm tox diff --git a/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix b/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix index 4d6157ed4d99..d84320a77a95 100644 --- a/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix @@ -11,7 +11,7 @@ configupdater, pre-commit, pytest, - pytest-cov, + pytest-cov-stub, pytest-xdist, tox, twine, @@ -46,7 +46,7 @@ buildPythonPackage rec { configupdater pre-commit pytest - pytest-cov + pytest-cov-stub pytest-xdist setuptools-scm tox diff --git a/pkgs/development/python-modules/pyscaffoldext-travis/default.nix b/pkgs/development/python-modules/pyscaffoldext-travis/default.nix index 6c08f6c23adc..4eeaafd14c22 100644 --- a/pkgs/development/python-modules/pyscaffoldext-travis/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-travis/default.nix @@ -10,7 +10,7 @@ configupdater, pre-commit, pytest, - pytest-cov, + pytest-cov-stub, pytest-xdist, tox, virtualenv, @@ -42,7 +42,7 @@ buildPythonPackage rec { configupdater pre-commit pytest - pytest-cov + pytest-cov-stub pytest-xdist setuptools-scm tox diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix index 652e84d9a366..840af05e4bab 100644 --- a/pkgs/development/python-modules/pyside6/default.nix +++ b/pkgs/development/python-modules/pyside6/default.nix @@ -11,8 +11,6 @@ shiboken6, llvmPackages, symlinkJoin, - libGL, - darwin, }: let packages = with python.pkgs.qt6; [ @@ -70,7 +68,6 @@ stdenv.mkDerivation (finalAttrs: { # cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS # reside in the same directory as QtCore.framework, which is not true for Nix. # We therefore symLink all required and optional Qt modules in one directory tree ("qt_linked"). - # Also we remove "Designer" from darwin build, due to linking failure postPatch = '' # Don't ignore optional Qt modules @@ -98,26 +95,18 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ]; buildInputs = - if stdenv.hostPlatform.isLinux then - # qtwebengine fails under darwin - # see https://github.com/NixOS/nixpkgs/pull/312987 - packages ++ [ python.pkgs.qt6.qtwebengine ] - else - with darwin.apple_sdk_11_0.frameworks; - [ - qt_linked - libGL - cups - # frameworks - IOKit - DiskArbitration - CoreBluetooth - EventKit - AVFoundation - Contacts - AGL - AppKit - ]; + python.pkgs.qt6.darwinVersionInputs + ++ ( + if stdenv.hostPlatform.isLinux then + # qtwebengine fails under darwin + # see https://github.com/NixOS/nixpkgs/pull/312987 + packages ++ [ python.pkgs.qt6.qtwebengine ] + else + [ + qt_linked + cups + ] + ); propagatedBuildInputs = [ shiboken6 ]; diff --git a/pkgs/development/python-modules/pystac/default.nix b/pkgs/development/python-modules/pystac/default.nix index c97862176e26..3f118b581a5c 100644 --- a/pkgs/development/python-modules/pystac/default.nix +++ b/pkgs/development/python-modules/pystac/default.nix @@ -7,7 +7,7 @@ html5lib, jsonschema, - pytest-cov, + pytest-cov-stub, pytest-mock, pytest-recording, python-dateutil, @@ -36,7 +36,7 @@ buildPythonPackage rec { html5lib jsonschema pytestCheckHook - pytest-cov + pytest-cov-stub pytest-mock pytest-recording requests-mock diff --git a/pkgs/development/python-modules/pytest-cid/default.nix b/pkgs/development/python-modules/pytest-cid/default.nix index b73648e2a673..ae5b5e848855 100644 --- a/pkgs/development/python-modules/pytest-cid/default.nix +++ b/pkgs/development/python-modules/pytest-cid/default.nix @@ -6,7 +6,7 @@ flit-core, py-cid, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ]; pythonImportsCheck = [ "pytest_cid" ]; diff --git a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix index 9908c3b2b4ff..cdb9765243c0 100644 --- a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix +++ b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchPypi, pytest, - pytest-cov, + pytest-cov-stub, pytest-doctestplus, pytestCheckHook, pythonOlder, @@ -28,7 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytest-doctestplus - pytest-cov + pytest-cov-stub ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-notebook/default.nix b/pkgs/development/python-modules/pytest-notebook/default.nix index 21f40beb6a89..f66f42081c58 100644 --- a/pkgs/development/python-modules/pytest-notebook/default.nix +++ b/pkgs/development/python-modules/pytest-notebook/default.nix @@ -12,7 +12,7 @@ black, coverage, ipykernel, - pytest-cov, + pytest-cov-stub, pytest-regressions, pytestCheckHook, }: @@ -54,7 +54,7 @@ buildPythonPackage rec { black coverage ipykernel - pytest-cov + pytest-cov-stub pytest-regressions pytestCheckHook ]; diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index f6a5ded15e74..72f6e8c8d485 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -23,7 +23,7 @@ # tests pip, - pytest-cov, + pytest-cov-stub, pytest7CheckHook, setuptools, }: @@ -59,7 +59,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pip - pytest-cov + pytest-cov-stub # Failed: DID NOT WARN. No warnings of type (,) were emitted. pytest7CheckHook setuptools diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index 716162be03a4..f1877c11e12e 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -3,7 +3,7 @@ fetchPypi, buildPythonPackage, sphinx, - pytest-cov, + pytest-cov-stub, pytest, mako, numpy, @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeCheckInputs = [ sphinx - pytest-cov + pytest-cov-stub pytest ]; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 4677b47f1188..e5b2db20a1c0 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -48,8 +48,8 @@ let # nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy # # The update script uses sed regexes to replace them with the updated hashes. - version = "1.14.0"; - srcHash = "sha256-rNplvbDExmMfcPuvhs+y9j5/9G6QR1GdMgQLty6oi2c="; + version = "1.14.1"; + srcHash = "sha256-eYuUHr9wZMXvEsIhssGR35JnRBNGaOL/j1LNM5sHuYY="; datasetsHashes = { ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3"; ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj"; diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix index 1268b5d12dfb..6116279af427 100644 --- a/pkgs/development/python-modules/sentence-transformers/default.nix +++ b/pkgs/development/python-modules/sentence-transformers/default.nix @@ -23,7 +23,7 @@ accelerate, datasets, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -57,7 +57,7 @@ buildPythonPackage rec { accelerate datasets pytestCheckHook - pytest-cov + pytest-cov-stub ]; pythonImportsCheck = [ "sentence_transformers" ]; diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix index 911f68900789..e5889977ed13 100644 --- a/pkgs/development/python-modules/shiboken6/default.nix +++ b/pkgs/development/python-modules/shiboken6/default.nix @@ -35,6 +35,7 @@ stdenv'.mkDerivation (finalAttrs: { llvmPackages.llvm llvmPackages.libclang python.pkgs.qt6.qtbase + python.pkgs.qt6.darwinVersionInputs python.pkgs.ninja python.pkgs.packaging python.pkgs.setuptools diff --git a/pkgs/development/python-modules/snapshottest/default.nix b/pkgs/development/python-modules/snapshottest/default.nix index 4c697fcdb923..244a1627f11c 100644 --- a/pkgs/development/python-modules/snapshottest/default.nix +++ b/pkgs/development/python-modules/snapshottest/default.nix @@ -6,7 +6,7 @@ six, termcolor, pytestCheckHook, - pytest-cov, + pytest-cov-stub, django, }: @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeCheckInputs = [ django pytestCheckHook - pytest-cov + pytest-cov-stub ]; pythonImportsCheck = [ "snapshottest" ]; diff --git a/pkgs/development/python-modules/sortedcollections/default.nix b/pkgs/development/python-modules/sortedcollections/default.nix index 3ee4eff75023..a525167635b6 100644 --- a/pkgs/development/python-modules/sortedcollections/default.nix +++ b/pkgs/development/python-modules/sortedcollections/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - pytest-cov, + pytest-cov-stub, pytestCheckHook, sortedcontainers, }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sortedcontainers ]; nativeCheckInputs = [ - pytest-cov + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index dc79c8b664e5..f39899a2c5b6 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -115,6 +115,9 @@ buildPythonPackage rec { "test_class_alias_having_doccomment" "test_class_alias_for_imported_object_having_doccomment" "test_decorators" + # racy with too many threads + # https://github.com/NixOS/nixpkgs/issues/353176 + "test_document_toc_only" # Assertion error "test_gettext_literalblock_additional" # requires cython_0, but fails miserably on 3.11 diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index c68e0f515ce5..c1b0fa8be4bd 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.39.2"; + version = "0.40.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "encode"; repo = "starlette"; rev = "refs/tags/${version}"; - hash = "sha256-sAvtqeyfyMf+xt78bqlaNYW9xYYCFkiW45OVlI9itgg="; + hash = "sha256-CBkDDsIw9LAIeAzN5E9gdEvznFugoa/RilPmnwcJBy4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/stups-fullstop/default.nix b/pkgs/development/python-modules/stups-fullstop/default.nix index 494c8ecf1e9e..a2662d754c55 100644 --- a/pkgs/development/python-modules/stups-fullstop/default.nix +++ b/pkgs/development/python-modules/stups-fullstop/default.nix @@ -7,7 +7,7 @@ stups-cli-support, stups-zign, pytest, - pytest-cov, + pytest-cov-stub, isPy3k, }: @@ -36,7 +36,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest - pytest-cov + pytest-cov-stub ]; meta = with lib; { diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index d9eb7d949f12..bf06b126c668 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -21,7 +21,7 @@ tomli, pytestCheckHook, - pytest-cov, + pytest-cov-stub, pytest-xdist, mypy, sympy, @@ -62,7 +62,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub pytest-xdist mypy sympy diff --git a/pkgs/development/python-modules/tf2onnx/default.nix b/pkgs/development/python-modules/tf2onnx/default.nix index 54a837089bc8..5049d5043775 100644 --- a/pkgs/development/python-modules/tf2onnx/default.nix +++ b/pkgs/development/python-modules/tf2onnx/default.nix @@ -14,7 +14,7 @@ pytestCheckHook, graphviz, parameterized, - pytest-cov, + pytest-cov-stub, pyyaml, timeout-decorator, onnxruntime, @@ -57,7 +57,7 @@ buildPythonPackage rec { pytestCheckHook graphviz parameterized - pytest-cov + pytest-cov-stub pyyaml timeout-decorator keras diff --git a/pkgs/development/python-modules/torch-geometric/default.nix b/pkgs/development/python-modules/torch-geometric/default.nix index 80286ff1a950..d1342510d7af 100644 --- a/pkgs/development/python-modules/torch-geometric/default.nix +++ b/pkgs/development/python-modules/torch-geometric/default.nix @@ -53,7 +53,7 @@ onnx, onnxruntime, pytest, - pytest-cov, + pytest-cov-stub, # tests pytestCheckHook, @@ -138,7 +138,7 @@ buildPythonPackage rec { onnx onnxruntime pytest - pytest-cov + pytest-cov-stub ]; }; diff --git a/pkgs/development/python-modules/unstructured-api-tools/default.nix b/pkgs/development/python-modules/unstructured-api-tools/default.nix index 0eae368c30c3..656fa897e8d2 100644 --- a/pkgs/development/python-modules/unstructured-api-tools/default.nix +++ b/pkgs/development/python-modules/unstructured-api-tools/default.nix @@ -22,7 +22,7 @@ flake8, httpx, ipython, - pytest-cov, + pytest-cov-stub, requests, requests-toolbelt, nbdev, @@ -77,7 +77,7 @@ buildPythonPackage { flake8 httpx ipython - pytest-cov + pytest-cov-stub requests requests-toolbelt nbdev diff --git a/pkgs/development/python-modules/unstructured-inference/default.nix b/pkgs/development/python-modules/unstructured-inference/default.nix index b773ea48f99a..cf51d6bdf973 100644 --- a/pkgs/development/python-modules/unstructured-inference/default.nix +++ b/pkgs/development/python-modules/unstructured-inference/default.nix @@ -17,7 +17,7 @@ click, httpx, mypy, - pytest-cov, + pytest-cov-stub, pdf2image, }: @@ -53,7 +53,7 @@ buildPythonPackage rec { click httpx mypy - pytest-cov + pytest-cov-stub pdf2image huggingface-hub ]; diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index 6625de40c87c..74667094daa2 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -51,7 +51,7 @@ freezegun, # , label-studio-sdk mypy, - pytest-cov, + pytest-cov-stub, pytest-mock, vcrpy, grpcio, @@ -137,7 +137,7 @@ buildPythonPackage { click freezegun mypy - pytest-cov + pytest-cov-stub pytest-mock vcrpy grpcio diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index f0d29c6381a8..ab72df02971f 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.31.0"; + version = "0.32.0"; disabled = pythonOlder "3.8"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "encode"; repo = "uvicorn"; rev = "refs/tags/${version}"; - hash = "sha256-Au8+8l8JfOUeLDxN2UONP0W+fsb38QCAunblmxJdGus="; + hash = "sha256-LTioJNDq1zsy/FO6lBgRW8Ow5qyxUD8NjNCj4nIrVDM="; }; outputs = [ diff --git a/pkgs/development/python-modules/validator-collection/default.nix b/pkgs/development/python-modules/validator-collection/default.nix index 818471e62d1c..341739ff6e5a 100644 --- a/pkgs/development/python-modules/validator-collection/default.nix +++ b/pkgs/development/python-modules/validator-collection/default.nix @@ -34,7 +34,7 @@ pyparsing, pytest, pytest-benchmark, - pytest-cov, + pytest-cov-stub, pytz, readme-renderer, requests, @@ -106,7 +106,7 @@ buildPythonPackage rec { pyparsing pytest pytest-benchmark - pytest-cov + pytest-cov-stub pytz readme-renderer requests diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index 7dd1e7a818f9..2794a7a1699b 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -4,7 +4,7 @@ fetchPypi, isPy27, pytestCheckHook, - pytest-cov, + pytest-cov-stub, setuptools, }: @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ]; checkPhase = '' diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 6da0b68c6c05..feafb29bcbd3 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "werkzeug"; - version = "3.0.4"; + version = "3.0.6"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-NPI3FQayUN9NT4S/57CSHkdiUldiu9k2YUkJ/iXNcwY="; + hash = "sha256-qN1Z1N4oynBHGjTLp5vtX37y4Danazqwg1R0JG60H40="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix index b23be6f21314..8790b380b769 100644 --- a/pkgs/development/python-modules/xformers/default.nix +++ b/pkgs/development/python-modules/xformers/default.nix @@ -11,7 +11,7 @@ torch, # check dependencies pytestCheckHook, - pytest-cov, + pytest-cov-stub, # , pytest-mpi pytest-timeout, # , pytorch-image-models @@ -102,7 +102,7 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub pytest-timeout hydra-core fairscale diff --git a/pkgs/development/skaware-packages/execline/default.nix b/pkgs/development/skaware-packages/execline/default.nix index a99f1f589264..eb552cd23957 100644 --- a/pkgs/development/skaware-packages/execline/default.nix +++ b/pkgs/development/skaware-packages/execline/default.nix @@ -16,8 +16,8 @@ in skawarePackages.buildPackage { # ${version}.3 and so on are created. manpages = skawarePackages.buildManPages { pname = "execline-man-pages"; - version = "2.9.6.0.1"; - sha256 = "sha256-0lyX3rIUZ2JqWioRSm22uDS+q9ONkwIZxfR5E2pSDC4="; + version = "2.9.6.1.1"; + sha256 = "sha256-bj+74zTkGKLdLEb1k4iHfNI1lAuxLBASc5++m17Y0O8="; description = "Port of the documentation for the execline suite to mdoc"; maintainers = [ lib.maintainers.sternenseemann ]; }; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/tests.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/tests.nix index 0976d1c2d5a6..768804ecd555 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/tests.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/tests.nix @@ -104,7 +104,7 @@ let } ${# Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609 # about why to create a subdir for the workspace. - '' cp -r ${workspaceDir} wd && chmod ug+rw -R wd && cd wd '' + ''cp -r ${workspaceDir} wd && chmod ug+rw -R wd && cd wd'' } ${# run the actual test snippet bazelScript diff --git a/pkgs/development/tools/haskell/hadrian/make-hadrian.nix b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix index fb9ee89f7cdb..8db821a9794d 100644 --- a/pkgs/development/tools/haskell/hadrian/make-hadrian.nix +++ b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix @@ -52,4 +52,7 @@ callPackage' ./hadrian.nix ({ # to build hadrian. (Hackage-released conditional dependencies are handled # in ./hadrian.nix without requiring intervention here.) inherit ghc-platform ghc-toolchain; +} // lib.optionalAttrs (lib.versionAtLeast ghcVersion "9.11") { + # See https://gitlab.haskell.org/ghc/ghc/-/commit/145a6477854d4003a07573d5e7ffa0c9a64ae29c + Cabal = bootPkgs.Cabal_3_14_0_0; }) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 1e465654badd..4d90fa66ea7d 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -72,18 +72,18 @@ stdenv.mkDerivation (finalAttrs: { # not need to know binutils' BINDIR at all. It's an absolute path # where libraries are stored. ./plugins-no-BINDIR.patch - ] ++ lib.optionals hostPlatform.isDarwin [ - # Note: Conditional to avoid Linux rebuilds on staging-next. Remove the conditional with the next update. + # ld64 needs `-undefined dynamic_lookup` to link `libctf-nobfd.dylib`, but the Darwin # version detection in `libtool.m4` fails to detect the Darwin version correctly. ./0001-libtool.m4-update-macos-version-detection-block.patch - ] - # Adds AVR-specific options to "size" for compatibility with Atmel's downstream distribution - # Patch from arch-community - # https://github.com/archlinux/svntogit-community/blob/c8d53dd1734df7ab15931f7fad0c9acb8386904c/trunk/avr-size.patch - ++ lib.optional targetPlatform.isAvr ./avr-size.patch - ++ lib.optional stdenv.targetPlatform.isWindows ./windres-locate-gcc.patch - ; + + # Adds AVR-specific options to "size" for compatibility with Atmel's downstream distribution + # Patch from arch-community + # https://github.com/archlinux/svntogit-community/blob/c8d53dd1734df7ab15931f7fad0c9acb8386904c/trunk/avr-size.patch + ./avr-size.patch + + ./windres-locate-gcc.patch + ]; outputs = [ "out" "info" "man" "dev" ] # Ideally we would like to always install 'lib' into a separate diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index f936ae7c89eb..19783b407567 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -117,10 +117,10 @@ stdenv.mkDerivation rec { ++ lib.optional enableDebuginfod "--with-debuginfod=yes" ++ lib.optional (!enableSim) "--disable-sim"; - postInstall = - '' # Remove Info files already provided by Binutils and other packages. - rm -v $out/share/info/bfd.info - ''; + postInstall = '' + # Remove Info files already provided by Binutils and other packages. + rm -v $out/share/info/bfd.info + ''; # TODO: Investigate & fix the test failures. doCheck = false; diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index e630489ffae3..da9b2c9cbcb0 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { postPatch = '' - patchShebangs tp/maintain + patchShebangs tp/maintain/regenerate_commands_perl_info.pl '' # This patch is needed for IEEE-standard long doubles on # powerpc64; it does not apply cleanly to texinfo 5.x or @@ -125,7 +125,7 @@ stdenv.mkDerivation { postFixup = optionalString crossBuildTools '' for f in "$out"/bin/{pod2texi,texi2any}; do substituteInPlace "$f" \ - --replace ${buildPackages.perl}/bin/perl ${perl}/bin/perl + --replace-fail ${buildPackages.perl}/bin/perl ${perl}/bin/perl done ''; diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index a45754a6b70c..70e695cb1f05 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -5,15 +5,15 @@ let rustfmt-nightly = rustfmt.override { asNightly = true; }; in rustPlatform.buildRustPackage rec { pname = "rust-bindgen-unwrapped"; - version = "0.69.4"; + version = "0.70.1"; src = fetchCrate { pname = "bindgen-cli"; inherit version; - hash = "sha256-5fwJq1WsL3IEcVUjsyqKdQU8VufbbPk6TglwJg3C1Gw="; + hash = "sha256-6FRcW/VGqlmLjb64UYqk21HmQ8u0AdVD3S2F+9D/vQo="; }; - cargoHash = "sha256-UROy/MyPBKJe+EaiUIDbOYKVbge0C9LsmfnsvOLEONE="; + cargoHash = "sha256-oTeIh5278nckh5fFaEFjWht11ovGmN80MaLJl4k4NAs="; buildInputs = [ (lib.getLib clang.cc) ]; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix index b179544eaee3..84934b592171 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix @@ -11,7 +11,6 @@ groff, compatIfNeeded, fts, - darwin, stdenv, }: @@ -44,8 +43,7 @@ mkDerivation { # fts header is needed. glibc already has this header, but musl doesn't, # so make sure pkgsMusl.netbsd.install still builds in case you want to # remove it! - ++ [ fts ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ]; + ++ [ fts ]; installPhase = '' runHook preInstall diff --git a/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix b/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix index 29b41f60b054..3382128b0e91 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix @@ -91,7 +91,7 @@ mkAppleDerivation { env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include"; buildInputs = lib.optionals (lib.versionOlder (lib.getVersion apple-sdk) "10.13") [ - apple-sdk_10_13 + (apple-sdk_10_13.override { enableBootstrap = true; }) ]; meta.description = "Darwin file copying library"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/package.nix index 615e9b840751..0803ff7a4dad 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/package.nix @@ -20,15 +20,12 @@ mkAppleDerivation (finalAttrs: { xcodeHash = "sha256-IiTqhEJIZ8JYjlpBS7ITwYlp8ndU6cehus9TIr+5LYM="; - patches = - lib.optionals hostPlatform.isStatic [ - # Use gperf to implement module loading statically by looking up the module functions in the static binary. - ./patches/0001-Support-static-module-loading.patch - ] - ++ [ - # Avoid out of bounds write with ISO-2022 - ./patches/0002-Fix-ISO-2022-out-of-bounds-write-with-encoded-charac.patch - ]; + patches = [ + # Use gperf to implement module loading statically by looking up the module functions in the static binary. + ./patches/0001-Support-static-module-loading.patch + # Avoid out of bounds write with ISO-2022 + ./patches/0002-Fix-ISO-2022-out-of-bounds-write-with-encoded-charac.patch + ]; # Propagate `out` only when there are dylibs to link (i.e., don’t propagate when doing a static build). propagatedBuildOutputs = lib.optionalString (!hostPlatform.isStatic) "out"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix index c783b1edfe56..95f35054e026 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix @@ -21,7 +21,7 @@ mkAppleDerivation { ]; buildInputs = [ - apple-sdk_14 + (apple-sdk_14.override { enableBootstrap = true; }) copyfile ]; diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index b5e4b22dabf0..8c8adfb5e124 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libbpf"; - version = "1.4.6"; + version = "1.4.7"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - hash = "sha256-TGwGEYapanhp2RjnH6Mo+kQFmqFEX0LcAZTCk6SyIk8="; + hash = "sha256-iknPdJ1vJ5y1ncsHx+nAc6gmvJWbo1Wg6mFTfa2KDBM="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix b/pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix new file mode 100644 index 000000000000..87847c368eba --- /dev/null +++ b/pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix @@ -0,0 +1,129 @@ +# PostgreSQL's build system for extensions (PGXS) makes the following assumptions: +# - All extensions will be installed in the same prefix as PostgreSQL itself. +# - pg_config is able to return the correct paths for bindir/libdir/datadir etc. +# +# Both of those assumptions break with nix. Since each extension is a separate +# derivation, we need to put all its files into a different folder. At the same +# time, pg_config only points to the PostgreSQL derivation's paths. +# +# When building extensions, the paths provided by pg_config are used for two +# purposes: +# - To find postgres libs and headers and reference those paths via -L and -I flags. +# - To determine the correct install directory. +# +# The PGXS Makefiles also support an environment variable DESTDIR, which is added as +# a prefix to all install locations. This is primarily used for temporary installs +# while running the test suite. Since pg_config returns absolute paths to /nix/store +# for us, using DESTDIR will result in install locations of the form: +# $DESTIDR/nix/store//... +# +# In multiple iterations, the following approaches have been tried to work around all +# of this: +# 1. For a long time, all extensions in nixpkgs just overwrote the installPhase +# and moved the respective files to the correct location manually. This approach +# is not maintainable, because whenever upstream adds a new file, we'd have to +# make sure the file is correctly installed as well. Additionally, it makes adding +# a new extension harder than it should be. +# +# 2. A wrapper around pg_config could just replace the returned paths with paths to +# $out of currently building derivation, i.e. the extension. This works for install- +# ation, but breaks for any of the libs and headers the extension needs from postgres +# itself. +# +# 3. A variation of 2., but make the pg_config wrapper only return the changed paths +# during the installPahse. During configure and build, it would return the regular +# paths to the PostgreSQL derivation. This works better, but not for every case. +# Some extensions try to be smarter and search for the "postgres" binary to deduce +# the necessary paths from that. Those would still need special handling. +# +# 4. Use the fact that DESTDIR is prepended to every installation directory - and only +# there, to run a replacement of all Makefiles in postgres' lib/pgxs/ folder and +# all Makefiles in the extension's source. "$DESTDIR/$bindir" can be replaced with +# "$out/bin" etc. - thus mapping the installPhase directly into the right output. +# This works beautifully - for the majority of cases. But it doesn't work for +# some extensions that use CMake. And it doesn't work for some extensions that use +# custom variables instead of the default "bindir" and friends. +# +# 5. Just set DESTDIR to the extensions's output and then clean up afterward. This will +# result in paths like this: +# /nix/store//nix/store//... +# Directly after the installPhase, we'll move the files in the right folder. +# This seems to work consistently across all extensions we have in nixpkgs right now. +# Of course, it would break down for any extension that doesn't support DESTDIR - +# but that just means PGXS is not used either, so that's OK. +# +# This last approach is the one we're taking in this file. To make sure the removal of the +# nested nix/store happens immediately after the installPhase, before any other postInstall +# hooks run, this needs to be run in an override of `mkDerivation` and not in a setup hook. + +{ + lib, + stdenv, + postgresql, +}: + +args: + +let + buildPostgresqlExtension = finalAttrs: prevAttrs: { + buildInputs = [ postgresql ] ++ prevAttrs.buildInputs or [ ]; + + installFlags = [ + "DESTDIR=${placeholder "out"}" + ] ++ prevAttrs.installFlags or [ ]; + + postInstall = + '' + # DESTDIR + pg_config install the files into + # /nix/store//nix/store//... + # We'll now remove the /nix/store/ part: + if [[ -d "$out${postgresql}" ]]; then + cp -alt "$out" "$out${postgresql}"/* + rm -r "$out${postgresql}" + fi + + if [[ -d "$out${postgresql.dev}" ]]; then + mkdir -p "''${dev:-$out}" + cp -alt "''${dev:-$out}" "$out${postgresql.dev}"/* + rm -r "$out${postgresql.dev}" + fi + + if [[ -d "$out${postgresql.lib}" ]]; then + mkdir -p "''${lib:-$out}" + cp -alt "''${lib:-$out}" "$out${postgresql.lib}"/* + rm -r "$out${postgresql.lib}" + fi + + if [[ -d "$out${postgresql.doc}" ]]; then + mkdir -p "''${doc:-$out}" + cp -alt "''${doc:-$out}" "$out${postgresql.doc}"/* + rm -r "$out${postgresql.doc}" + fi + + if [[ -d "$out${postgresql.man}" ]]; then + mkdir -p "''${man:-$out}" + cp -alt "''${man:-$out}" "$out${postgresql.man}"/* + rm -r "$out${postgresql.man}" + fi + + # In some cases (postgis) parts of the install script + # actually work "OK", before we add DESTDIR, so some + # files end up in + # /nix/store//nix/store//... + if [[ -d "$out$out" ]]; then + cp -alt "$out" "$out$out"/* + rm -r "$out$out" + fi + + if [[ -d "$out/nix/store" ]]; then + if ! rmdir "$out/nix/store" "$out/nix"; then + find "$out/nix" + nixErrorLog 'Found left-overs in $out/nix/store, make sure to move them into $out properly.' + exit 1 + fi + fi + '' + + prevAttrs.postInstall or ""; + }; +in +stdenv.mkDerivation (lib.extends buildPostgresqlExtension (lib.toFunction args)) diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix index 695a0093c225..a9f74bc76ec1 100644 --- a/pkgs/servers/sql/postgresql/ext/age.nix +++ b/pkgs/servers/sql/postgresql/ext/age.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, bison, fetchFromGitHub, flex, perl, postgresql }: +{ lib, stdenv, bison, fetchFromGitHub, flex, perl, postgresql, buildPostgresqlExtension }: let hashes = { @@ -11,7 +11,7 @@ let "12" = "sha256-JFNk17ESsIt20dwXrfBkQ5E6DbZzN/Q9eS6+WjCXGd4="; }; in -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "age"; version = "1.5.0-rc0"; @@ -22,20 +22,12 @@ stdenv.mkDerivation rec { hash = hashes.${lib.versions.major postgresql.version} or (throw "Source for Age is not available for ${postgresql.version}"); }; - buildInputs = [ postgresql ]; - makeFlags = [ "BISON=${bison}/bin/bison" "FLEX=${flex}/bin/flex" "PERL=${perl}/bin/perl" ]; - installPhase = '' - install -D -t $out/lib *${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - passthru.tests = stdenv.mkDerivation { inherit version src; diff --git a/pkgs/servers/sql/postgresql/ext/anonymizer.nix b/pkgs/servers/sql/postgresql/ext/anonymizer.nix index afb517c6b5a0..66de2544eae6 100644 --- a/pkgs/servers/sql/postgresql/ext/anonymizer.nix +++ b/pkgs/servers/sql/postgresql/ext/anonymizer.nix @@ -1,23 +1,16 @@ -{ lib, stdenv, pg-dump-anon, postgresql, runtimeShell, jitSupport, llvm, nixosTests }: +{ lib, stdenv, pg-dump-anon, postgresql, runtimeShell, jitSupport, llvm, buildPostgresqlExtension, nixosTests }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "postgresql_anonymizer"; inherit (pg-dump-anon) version src; - buildInputs = [ postgresql ]; nativeBuildInputs = [ postgresql ] ++ lib.optional jitSupport llvm; strictDeps = true; - makeFlags = [ - "BINDIR=${placeholder "out"}/bin" - "datadir=${placeholder "out"}/share/postgresql" - "pkglibdir=${placeholder "out"}/lib" - "DESTDIR=" - ]; - - postInstall = '' + # Needs to be after postInstall, where removeNestedNixStore runs + preFixup = '' cat >$out/bin/pg_dump_anon.sh <<'EOF' #!${runtimeShell} echo "This script is deprecated by upstream. To use the new script," diff --git a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix index 750551a9cbfe..4c8d723354d2 100644 --- a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix +++ b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, postgresql, boost182, postgresqlTestExtension }: +{ stdenv, lib, fetchFromGitHub, postgresql, boost182, postgresqlTestExtension, buildPostgresqlExtension }: let version = "1.7.0"; @@ -20,7 +20,7 @@ let }; in -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "apache_datasketches"; inherit version; @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = main_src.name; - buildInputs = [ postgresql boost182 ]; + buildInputs = [ boost182 ]; patchPhase = '' runHook prePatch @@ -36,31 +36,6 @@ stdenv.mkDerivation (finalAttrs: { runHook postPatch ''; - installPhase = '' - runHook preInstall - install -D -m 644 ./datasketches${postgresql.dlSuffix} -t $out/lib/ - cat \ - sql/datasketches_cpc_sketch.sql \ - sql/datasketches_kll_float_sketch.sql \ - sql/datasketches_kll_double_sketch.sql \ - sql/datasketches_theta_sketch.sql \ - sql/datasketches_frequent_strings_sketch.sql \ - sql/datasketches_hll_sketch.sql \ - sql/datasketches_aod_sketch.sql \ - sql/datasketches_req_float_sketch.sql \ - sql/datasketches_quantiles_double_sketch.sql \ - > sql/datasketches--${version}.sql - install -D -m 644 ./datasketches.control -t $out/share/postgresql/extension - install -D -m 644 \ - ./sql/datasketches--${version}.sql \ - ./sql/datasketches--1.3.0--1.4.0.sql \ - ./sql/datasketches--1.4.0--1.5.0.sql \ - ./sql/datasketches--1.5.0--1.6.0.sql \ - ./sql/datasketches--1.6.0--1.7.0.sql \ - -t $out/share/postgresql/extension - runHook postInstall - ''; - passthru.tests.extension = postgresqlTestExtension { inherit (finalAttrs) finalPackage; sql = '' diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix index b4c08b4ceab1..98d79051ddf7 100644 --- a/pkgs/servers/sql/postgresql/ext/citus.nix +++ b/pkgs/servers/sql/postgresql/ext/citus.nix @@ -4,9 +4,10 @@ , fetchFromGitHub , lz4 , postgresql +, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "citus"; version = "12.1.2"; @@ -20,23 +21,8 @@ stdenv.mkDerivation rec { buildInputs = [ curl lz4 - postgresql ]; - installPhase = '' - runHook preInstall - - install -D -t $out/lib src/backend/columnar/citus_columnar${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension src/backend/columnar/build/sql/*.sql - install -D -t $out/share/postgresql/extension src/backend/columnar/*.control - - install -D -t $out/lib src/backend/distributed/citus${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension src/backend/distributed/build/sql/*.sql - install -D -t $out/share/postgresql/extension src/backend/distributed/*.control - - runHook postInstall - ''; - meta = with lib; { # "Our soft policy for Postgres version compatibility is to support Citus' # latest release with Postgres' 3 latest releases." diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index c9f01190c912..2236f815a823 100644 --- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix @@ -1,11 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, protobufc }: +{ lib, stdenv, fetchFromGitHub, postgresql, protobufc, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "cstore_fdw"; version = "unstable-2022-03-08"; nativeBuildInputs = [ protobufc ]; - buildInputs = [ postgresql ]; src = fetchFromGitHub { owner = "citusdata"; @@ -14,14 +13,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-02wcCqs8A5ZOZX080fgcNJTQrYQctnlwnA8+YPaRTZc="; }; - installPhase = '' - mkdir -p $out/{lib,share/postgresql/extension} - - cp *.so $out/lib - cp *.sql $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension - ''; - meta = with lib; { broken = versionAtLeast postgresql.version "14"; description = "Columnar storage for PostgreSQL"; diff --git a/pkgs/servers/sql/postgresql/ext/h3-pg.nix b/pkgs/servers/sql/postgresql/ext/h3-pg.nix index 1a0c701c7702..ec73b97999c5 100644 --- a/pkgs/servers/sql/postgresql/ext/h3-pg.nix +++ b/pkgs/servers/sql/postgresql/ext/h3-pg.nix @@ -5,9 +5,10 @@ , h3_4 , postgresql , postgresqlTestExtension +, buildPostgresqlExtension }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "h3-pg"; version = "4.1.3"; @@ -32,16 +33,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ h3_4 - postgresql ]; - installPhase = '' - install -D -t $out/lib h3/h3.so - install -D -t $out/share/postgresql/extension h3/h3-*.sql h3/h3.control - install -D -t $out/lib h3_postgis/h3_postgis.so - install -D -t $out/share/postgresql/extension h3_postgis/h3_postgis-*.sql h3_postgis/h3_postgis.control - ''; - passthru.tests.extension = postgresqlTestExtension { inherit (finalAttrs) finalPackage; withPackages = [ "postgis" ]; diff --git a/pkgs/servers/sql/postgresql/ext/hypopg.nix b/pkgs/servers/sql/postgresql/ext/hypopg.nix index 534a21bb6d69..3bc868a79f49 100644 --- a/pkgs/servers/sql/postgresql/ext/hypopg.nix +++ b/pkgs/servers/sql/postgresql/ext/hypopg.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, gitUpdater }: +{ lib, stdenv, fetchFromGitHub, postgresql, gitUpdater, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "hypopg"; version = "1.4.1"; @@ -11,14 +11,6 @@ stdenv.mkDerivation rec { hash = "sha256-88uKPSnITRZ2VkelI56jZ9GWazG/Rn39QlyHKJKSKMM="; }; - buildInputs = [ postgresql ]; - - installPhase = '' - install -D -t $out/lib *${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.control - install -D -t $out/share/postgresql/extension *.sql - ''; - passthru = { updateScript = gitUpdater { ignoredVersions = "beta"; diff --git a/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix b/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix index 092212aa3de0..eb84ec54c028 100644 --- a/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix +++ b/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "jsonb_deep_sum"; version = "unstable-2021-12-24"; @@ -11,16 +11,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-W1wNILAwTAjFPezq+grdRMA59KEnMZDz69n9xQUqdc0="; }; - buildInputs = [ postgresql ]; - - installPhase = '' - mkdir -p $out/{lib,share/postgresql/extension} - - cp *${postgresql.dlSuffix} $out/lib - cp *.sql $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension - ''; - meta = with lib; { description = "PostgreSQL extension to easily add jsonb numeric"; homepage = "https://github.com/furstenheim/jsonb_deep_sum"; diff --git a/pkgs/servers/sql/postgresql/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/lantern.nix index 0138594cd105..07147be45c16 100644 --- a/pkgs/servers/sql/postgresql/ext/lantern.nix +++ b/pkgs/servers/sql/postgresql/ext/lantern.nix @@ -5,9 +5,10 @@ , openssl , postgresql , postgresqlTestExtension +, buildPostgresqlExtension }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "postgresql-lantern"; version = "0.4.1"; @@ -29,19 +30,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openssl - postgresql ]; - installPhase = '' - runHook preInstall - - install -D -t $out/lib lantern${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension lantern-*.sql - install -D -t $out/share/postgresql/extension lantern.control - - runHook postInstall - ''; - cmakeFlags = [ "-DBUILD_FOR_DISTRIBUTING=ON" "-S ../lantern_hnsw" diff --git a/pkgs/servers/sql/postgresql/ext/periods.nix b/pkgs/servers/sql/postgresql/ext/periods.nix index 422d6ddaf2b3..c5c0d4a8dc42 100644 --- a/pkgs/servers/sql/postgresql/ext/periods.nix +++ b/pkgs/servers/sql/postgresql/ext/periods.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "periods"; version = "1.2.2"; @@ -11,14 +11,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-ezt+MtDqPM8OmJCD6oQTS644l+XHZoxuivq0PUIXOY8="; }; - buildInputs = [ postgresql ]; - - installPhase = '' - install -D -t $out/lib *${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - meta = with lib; { description = "PostgreSQL extension implementing SQL standard functionality for PERIODs and SYSTEM VERSIONING"; homepage = "https://github.com/xocolatl/periods"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index 74bf0b8eda64..45b8f9562bf2 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_auto_failover"; version = "2.1"; @@ -11,14 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-OIWykfFbVskrkPG/zSmZtZjc+W956KSfIzK7f5QOqpI="; }; - buildInputs = postgresql.buildInputs ++ [ postgresql ]; - - installPhase = '' - install -D -t $out/bin src/bin/pg_autoctl/pg_autoctl - install -D -t $out/lib src/monitor/pgautofailover.so - install -D -t $out/share/postgresql/extension src/monitor/*.sql - install -D -t $out/share/postgresql/extension src/monitor/pgautofailover.control - ''; + buildInputs = postgresql.buildInputs; meta = with lib; { description = "PostgreSQL extension and service for automated failover and high-availability"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix index f47ce5694588..e7980e305bf3 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, postgresql }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_bigm"; version = "1.2-20200228"; @@ -19,16 +19,8 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ postgresql ]; - makeFlags = [ "USE_PGXS=1" ]; - installPhase = '' - install -D -t $out/lib pg_bigm${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - meta = with lib; { description = "Text similarity measurement and index searching based on bigrams"; homepage = "https://pgbigm.osdn.jp/"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix index 3dea36f7e740..2fef4b7c22c3 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -1,11 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_cron"; version = "1.6.4"; - buildInputs = [ postgresql ]; - src = fetchFromGitHub { owner = "citusdata"; repo = pname; @@ -13,14 +11,6 @@ stdenv.mkDerivation rec { hash = "sha256-t1DpFkPiSfdoGG2NgNT7g1lkvSooZoRoUrix6cBID40="; }; - installPhase = '' - mkdir -p $out/{lib,share/postgresql/extension} - - cp *${postgresql.dlSuffix} $out/lib - cp *.sql $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension - ''; - meta = with lib; { description = "Run Cron jobs through PostgreSQL"; homepage = "https://github.com/citusdata/pg_cron"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix index 57bf1b62e15f..c815a02229e8 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitLab, postgresql }: +{ lib, stdenv, fetchFromGitLab, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_ed25519"; version = "0.2"; src = fetchFromGitLab { @@ -10,17 +10,6 @@ stdenv.mkDerivation rec { sha256 = "16w3qx3wj81bzfhydl2pjhn8b1jak6h7ja9wq1kc626g0siggqi0"; }; - buildInputs = [ postgresql ]; - - installPhase = '' - mkdir -p $out/bin # For buildEnv to setup proper symlinks. See #22653 - mkdir -p $out/{lib,share/postgresql/extension} - - cp *.so $out/lib - cp *.sql $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension - ''; - meta = with lib; { description = "PostgreSQL extension for signing and verifying ed25519 signatures"; homepage = "https://gitlab.com/dwagin/pg_ed25519"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_embedding.nix b/pkgs/servers/sql/postgresql/ext/pg_embedding.nix index a4c1e72cc5e4..e79cef2f29af 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_embedding.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_embedding.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_embedding"; version = "0.3.6"; @@ -11,14 +11,6 @@ stdenv.mkDerivation rec { hash = "sha256-NTBxsQB8mR7e/CWwkCEyDiYhi3Nxl/aKgRBwqc0THcI="; }; - buildInputs = [ postgresql ]; - - installPhase = '' - install -D -t $out/lib *.so - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - meta = with lib; { description = "PostgreSQL extension implementing the HNSW algorithm for vector similarity search"; homepage = "https://github.com/neondatabase/pg_embedding"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix index 8983acb3152a..db5c360196e2 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: let source = { @@ -28,7 +28,7 @@ let }; }.${lib.versions.major postgresql.version} or (throw "Source for pg_hint_plan is not available for ${postgresql.version}"); in -stdenv.mkDerivation { +buildPostgresqlExtension { pname = "pg_hint_plan"; inherit (source) version; @@ -44,14 +44,6 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace "LDFLAGS+=-Wl,--build-id" "" ''; - buildInputs = [ postgresql ]; - - installPhase = '' - install -D -t $out/lib pg_hint_plan${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - meta = with lib; { description = "Extension to tweak PostgreSQL execution plans using so-called 'hints' in SQL comments"; homepage = "https://github.com/ossc-db/pg_hint_plan"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix index a60601aef569..4a754bf81a9f 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix @@ -1,11 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_hll"; version = "2.18"; - buildInputs = [ postgresql ]; - src = fetchFromGitHub { owner = "citusdata"; repo = "postgresql-hll"; @@ -13,12 +11,6 @@ stdenv.mkDerivation rec { hash = "sha256-Latdxph1Ura8yKEokEjalJ+/GY+pAKOT3GXjuLprj6c="; }; - installPhase = '' - install -D -t $out/lib hll${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - meta = with lib; { description = "HyperLogLog for PostgreSQL"; homepage = "https://github.com/citusdata/postgresql-hll"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix index fcae540d1356..3abf23077bb2 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_ivm"; version = "1.9"; @@ -11,14 +11,6 @@ stdenv.mkDerivation rec { hash = "sha256-Qcie7sbXcMbQkMoFIYBfttmvlYooESdSk2DyebHKPlk="; }; - buildInputs = [ postgresql ]; - - installPhase = '' - install -D -t $out/lib pg_ivm${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - meta = with lib; { description = "Materialized views with IVM (Incremental View Maintenance) for PostgreSQL"; homepage = "https://github.com/sraoss/pg_ivm"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_libversion.nix b/pkgs/servers/sql/postgresql/ext/pg_libversion.nix index b5c3ad6acab8..174a8ffc8993 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_libversion.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_libversion.nix @@ -5,9 +5,10 @@ , pkg-config , postgresql , libversion +, buildPostgresqlExtension }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "pg_libversion"; version = "2.0.1"; @@ -23,20 +24,9 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - postgresql libversion ]; - installPhase = '' - runHook preInstall - - install -D -t $out/lib libversion${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - - runHook postInstall - ''; - passthru.updateScript = gitUpdater { }; meta = with lib; { diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix index a86f53eeef05..a4e0cb2f06c2 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_net.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, curl, postgresql }: +{ lib, stdenv, fetchFromGitHub, curl, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_net"; version = "0.8.0"; - buildInputs = [ curl postgresql ]; + buildInputs = [ curl ]; src = fetchFromGitHub { owner = "supabase"; @@ -15,14 +15,6 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-error"; - installPhase = '' - mkdir -p $out/{lib,share/postgresql/extension} - - cp *${postgresql.dlSuffix} $out/lib - cp sql/*.sql $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension - ''; - meta = with lib; { description = "Async networking for Postgres"; homepage = "https://github.com/supabase/pg_net"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index 87ee50411b75..19c7efdf70f2 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -1,11 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_partman"; version = "5.1.0"; - buildInputs = [ postgresql ]; - src = fetchFromGitHub { owner = "pgpartman"; repo = pname; @@ -13,15 +11,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-GrVOJ5ywZMyqyDroYDLdKkXDdIJSDGhDfveO/ZvrmYs="; }; - installPhase = '' - mkdir -p $out/{lib,share/postgresql/extension} - - cp src/*${postgresql.dlSuffix} $out/lib - cp updates/* $out/share/postgresql/extension - cp -r sql/* $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension - ''; - meta = with lib; { description = "Partition management extension for PostgreSQL"; homepage = "https://github.com/pgpartman/pg_partman"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_rational.nix b/pkgs/servers/sql/postgresql/ext/pg_rational.nix index df80ea49a541..084c51e7846e 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_rational.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_rational.nix @@ -2,9 +2,10 @@ , fetchFromGitHub , lib , postgresql +, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_rational"; version = "0.0.2"; @@ -15,20 +16,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-Sp5wuX2nP3KGyWw7MFa11rI1CPIKIWBt8nvBSsASIEw="; }; - buildInputs = [ postgresql ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{lib,share/postgresql/extension} - - cp *${postgresql.dlSuffix} $out/lib - cp *.sql $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension - - runHook postInstall - ''; - meta = with lib; { description = "Precise fractional arithmetic for PostgreSQL"; homepage = "https://github.com/begriffs/pg_rational"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix index 1fe9fd3cac87..1dc879275ca7 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix @@ -1,11 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_relusage"; version = "0.0.1"; - buildInputs = [ postgresql ]; - src = fetchFromGitHub { owner = "adept"; repo = pname; @@ -13,12 +11,6 @@ stdenv.mkDerivation rec { sha256 = "8hJNjQ9MaBk3J9a73l+yQMwMW/F2N8vr5PO2o+5GvYs="; }; - installPhase = '' - install -D -t $out/lib *${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - meta = with lib; { description = "pg_relusage extension for PostgreSQL: discover and log the relations used in your statements"; homepage = "https://github.com/adept/pg_relusage"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index b251e9e752f6..ffad30742d23 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -4,13 +4,14 @@ , postgresql , postgresqlTestExtension , testers +, buildPostgresqlExtension }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "pg_repack"; version = "1.5.0"; - buildInputs = postgresql.buildInputs ++ [ postgresql ]; + buildInputs = postgresql.buildInputs; src = fetchFromGitHub { owner = "reorg"; @@ -19,12 +20,6 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-do80phyMxwcRIkYyUt9z02z7byNQhK+pbSaCUmzG+4c="; }; - installPhase = '' - install -D bin/pg_repack -t $out/bin/ - install -D lib/pg_repack${postgresql.dlSuffix} -t $out/lib/ - install -D lib/{pg_repack--${finalAttrs.version}.sql,pg_repack.control} -t $out/share/postgresql/extension - ''; - passthru.tests = { version = testers.testVersion { package = finalAttrs.finalPackage; diff --git a/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix b/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix index 682275fbf15c..644548f4ed98 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, postgresqlTestHook }: +{ lib, stdenv, fetchFromGitHub, postgresql, postgresqlTestHook, buildPostgresqlExtension }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "pg_roaringbitmap"; version = "0.5.4"; @@ -11,16 +11,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-E6vqawnsRsAIajGDgJcTUWV1H8GFFboTjhmVfemUGbs="; }; - buildInputs = [ - postgresql - ]; - - installPhase = '' - install -D -t $out/lib roaringbitmap${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension roaringbitmap-*.sql - install -D -t $out/share/postgresql/extension roaringbitmap.control - ''; - meta = with lib; { description = "RoaringBitmap extension for PostgreSQL"; homepage = "https://github.com/ChenHuajun/pg_roaringbitmap"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix index 4aeec3e31f09..14d4db415923 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: with { "12" = { @@ -27,12 +27,10 @@ with { }; }."${lib.versions.major postgresql.version}" or (throw "pg_safeupdate: version specification for pg ${postgresql.version} missing."); -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg-safeupdate"; inherit version; - buildInputs = [ postgresql ]; - src = fetchFromGitHub { owner = "eradman"; repo = pname; @@ -40,10 +38,6 @@ stdenv.mkDerivation rec { inherit sha256; }; - installPhase = '' - install -D safeupdate${postgresql.dlSuffix} -t $out/lib - ''; - meta = with lib; { description = "Simple extension to PostgreSQL that requires criteria for UPDATE and DELETE"; homepage = "https://github.com/eradman/pg-safeupdate"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index 8bcb8777c57b..4ec5bd83fc47 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, postgresql, unstableGitUpdater }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, postgresql, unstableGitUpdater, buildPostgresqlExtension }: -stdenv.mkDerivation { +buildPostgresqlExtension { pname = "pg_similarity"; version = "1.0-unstable-2021-01-12"; @@ -21,15 +21,8 @@ stdenv.mkDerivation { }) ]; - buildInputs = [ postgresql ]; - makeFlags = [ "USE_PGXS=1" ]; - installPhase = '' - install -D pg_similarity${postgresql.dlSuffix} -t $out/lib/ - install -D ./{pg_similarity--unpackaged--1.0.sql,pg_similarity--1.0.sql,pg_similarity.control} -t $out/share/postgresql/extension - ''; - passthru.updateScript = unstableGitUpdater {}; meta = { diff --git a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix index 7d03b21d989d..ba2f4443c557 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, postgresqlTestExtension }: +{ lib, stdenv, fetchFromGitHub, postgresql, postgresqlTestExtension, buildPostgresqlExtension }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "pg_squeeze"; version = "1.7.0"; @@ -11,20 +11,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Kh1wSOvV5Rd1CG/na3yzbWzvaR8SJ6wmTZOnM+lbgik="; }; - buildInputs = [ - postgresql - ]; - - installPhase = '' - runHook preInstall - - install -D -t $out/lib pg_squeeze${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension pg_squeeze-*.sql - install -D -t $out/share/postgresql/extension pg_squeeze.control - - runHook postInstall - ''; - passthru.tests.extension = postgresqlTestExtension { inherit (finalAttrs) finalPackage; postgresqlExtraSettings = '' diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix index b210db910411..8c6aa60be32a 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix @@ -1,11 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_topn"; version = "2.7.0"; - buildInputs = [ postgresql ]; - src = fetchFromGitHub { owner = "citusdata"; repo = "postgresql-topn"; @@ -13,14 +11,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-lP6Iil/BUv4ga+co+oBpKv1FBqFuBGfNjueEolM6png="; }; - installPhase = '' - mkdir -p $out/{lib,share/postgresql/extension} - - cp *${postgresql.dlSuffix} $out/lib - cp *.sql $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension - ''; - meta = with lib; { description = "Efficient querying of 'top values' for PostgreSQL"; homepage = "https://github.com/citusdata/postgresql-topn"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix index 80afe05db808..81a4e69015e2 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix @@ -2,14 +2,13 @@ , stdenv , fetchFromGitHub , postgresql +, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_uuidv7"; version = "1.5.0"; - buildInputs = [ postgresql ]; - src = fetchFromGitHub { owner = "fboulnois"; repo = "pg_uuidv7"; @@ -17,11 +16,6 @@ stdenv.mkDerivation rec { hash = "sha256-oVyRtjl3KsD3j96qvQb8bFLMhoWO81OudOL4wVXrjzI="; }; - installPhase = '' - install -D -t $out/lib pg_uuidv7${postgresql.dlSuffix} - install -D {sql/pg_uuidv7--${lib.versions.majorMinor version}.sql,pg_uuidv7.control} -t $out/share/postgresql/extension - ''; - meta = with lib; { description = "Tiny Postgres extension to create version 7 UUIDs"; homepage = "https://github.com/fboulnois/pg_uuidv7"; diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix index 1079a13b2dfc..d50da6c7e282 100644 --- a/pkgs/servers/sql/postgresql/ext/pgaudit.nix +++ b/pkgs/servers/sql/postgresql/ext/pgaudit.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libkrb5, openssl, postgresql }: +{ lib, stdenv, fetchFromGitHub, libkrb5, openssl, postgresql, buildPostgresqlExtension }: let source = { @@ -28,7 +28,7 @@ let }; }.${lib.versions.major postgresql.version} or (throw "Source for pgaudit is not available for ${postgresql.version}"); in -stdenv.mkDerivation { +buildPostgresqlExtension { pname = "pgaudit"; inherit (source) version; @@ -39,16 +39,10 @@ stdenv.mkDerivation { hash = source.hash; }; - buildInputs = [ libkrb5 openssl postgresql ]; + buildInputs = [ libkrb5 openssl ]; makeFlags = [ "USE_PGXS=1" ]; - installPhase = '' - install -D -t $out/lib pgaudit${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - meta = with lib; { description = "Open Source PostgreSQL Audit Logging"; homepage = "https://github.com/pgaudit/pgaudit"; diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix index 7bac053d920c..b0a75a44fcfc 100644 --- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix +++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, unstableGitUpdater, nixosTests, postgresqlTestExtension }: +{ lib, stdenv, fetchFromGitHub, postgresql, unstableGitUpdater, nixosTests, postgresqlTestExtension, buildPostgresqlExtension }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "pgjwt"; version = "0-unstable-2023-03-02"; @@ -11,12 +11,6 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-nDZEDf5+sFc1HDcG2eBNQj+kGcdAYRXJseKi9oww+JU="; }; - dontBuild = true; - installPhase = '' - mkdir -p $out/share/postgresql/extension - cp pg*sql *.control $out/share/postgresql/extension - ''; - passthru.updateScript = unstableGitUpdater { }; passthru.tests = lib.recurseIntoAttrs { diff --git a/pkgs/servers/sql/postgresql/ext/pgmq.nix b/pkgs/servers/sql/postgresql/ext/pgmq.nix index 2cbf3caa4333..8a5319efb66b 100644 --- a/pkgs/servers/sql/postgresql/ext/pgmq.nix +++ b/pkgs/servers/sql/postgresql/ext/pgmq.nix @@ -3,9 +3,10 @@ stdenv, fetchFromGitHub, postgresql, + buildPostgresqlExtension, }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pgmq"; version = "1.4.4"; @@ -20,17 +21,6 @@ stdenv.mkDerivation rec { dontConfigure = true; - buildInputs = [ postgresql ]; - - installPhase = '' - runHook preInstall - - install -D -t $out/share/postgresql/extension sql/*.sql - install -D -t $out/share/postgresql/extension *.control - - runHook postInstall - ''; - meta = { description = "Lightweight message queue like AWS SQS and RSMQ but on Postgres"; homepage = "https://tembo.io/pgmq"; diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 3a7c9e237f98..3d855f5e1977 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, pkg-config, postgresql, msgpack-c, groonga }: +{ lib, stdenv, fetchurl, pkg-config, postgresql, msgpack-c, groonga, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pgroonga"; version = "3.2.3"; @@ -10,23 +10,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ postgresql msgpack-c groonga ]; + buildInputs = [ msgpack-c groonga ]; makeFlags = [ "HAVE_MSGPACK=1" "MSGPACK_PACKAGE_NAME=msgpack-c" ]; - installPhase = '' - install -D pgroonga${postgresql.dlSuffix} -t $out/lib/ - install -D pgroonga.control -t $out/share/postgresql/extension - install -D data/pgroonga-*.sql -t $out/share/postgresql/extension - - install -D pgroonga_database${postgresql.dlSuffix} -t $out/lib/ - install -D pgroonga_database.control -t $out/share/postgresql/extension - install -D data/pgroonga_database-*.sql -t $out/share/postgresql/extension - ''; - meta = with lib; { description = "PostgreSQL extension to use Groonga as the index"; longDescription = '' diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index d67a21755a06..65bc5ee7c8c5 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, perl, cmake, boost }: +{ lib, stdenv, fetchFromGitHub, postgresql, perl, cmake, boost, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pgrouting"; version = "3.6.3"; nativeBuildInputs = [ cmake perl ]; - buildInputs = [ postgresql boost ]; + buildInputs = [ boost ]; src = fetchFromGitHub { owner = "pgRouting"; @@ -14,12 +14,6 @@ stdenv.mkDerivation rec { hash = "sha256-VCoapUM7Vh4W1DUE/gWQ9YIRLbw63XlOWsgajJW+XNU="; }; - installPhase = '' - install -D lib/*.so -t $out/lib - install -D sql/pgrouting--${version}.sql -t $out/share/postgresql/extension - install -D sql/common/pgrouting.control -t $out/share/postgresql/extension - ''; - meta = with lib; { description = "PostgreSQL/PostGIS extension that provides geospatial routing functionality"; homepage = "https://pgrouting.org/"; diff --git a/pkgs/servers/sql/postgresql/ext/pgsodium.nix b/pkgs/servers/sql/postgresql/ext/pgsodium.nix index 59ddfcd74c8c..9e72787c56ee 100644 --- a/pkgs/servers/sql/postgresql/ext/pgsodium.nix +++ b/pkgs/servers/sql/postgresql/ext/pgsodium.nix @@ -4,9 +4,10 @@ , libsodium , postgresql , postgresqlTestExtension +, buildPostgresqlExtension }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "pgsodium"; version = "3.1.9"; @@ -19,20 +20,11 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libsodium - postgresql ]; - installPhase = '' - runHook preInstall - - install -D -t $out/lib pgsodium${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension sql/pgsodium-*.sql - install -D -t $out/share/postgresql/extension pgsodium.control - + postInstall = '' install -D -t $out/share/pgsodium/getkey_scripts getkey_scripts/* ln -s $out/share/pgsodium/getkey_scripts/pgsodium_getkey_urandom.sh $out/share/postgresql/extension/pgsodium_getkey - - runHook postInstall ''; passthru.tests.extension = postgresqlTestExtension { diff --git a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix index bfe9052acf58..c71e255cdb51 100644 --- a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix +++ b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, curl, postgresql }: +{ lib, stdenv, fetchFromGitHub, curl, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pgsql-http"; version = "1.6.0"; @@ -11,13 +11,7 @@ stdenv.mkDerivation rec { hash = "sha256-CPHfx7vhWfxkXsoKTzyFuTt47BPMvzi/pi1leGcuD60="; }; - buildInputs = [ curl postgresql ]; - - installPhase = '' - install -D -t $out/lib *${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; + buildInputs = [ curl ]; meta = with lib; { description = "HTTP client for PostgreSQL, retrieve a web page from inside the database"; diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix index 24ad1f610e8f..b09734c5f07d 100644 --- a/pkgs/servers/sql/postgresql/ext/pgtap.nix +++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix @@ -1,5 +1,6 @@ { lib , stdenv +, buildPostgresqlExtension , fetchFromGitHub , perl , perlPackages @@ -8,7 +9,7 @@ , which }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "pgtap"; version = "1.3.3"; @@ -21,10 +22,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ postgresql perl perlPackages.TAPParserSourceHandlerpgTAP which ]; - installPhase = '' - install -D {sql/pgtap--${finalAttrs.version}.sql,pgtap.control} -t $out/share/postgresql/extension - ''; - passthru.tests.extension = stdenv.mkDerivation { name = "pgtap-test"; dontUnpack = true; diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix index 619c5e7ab24d..08db0762eddf 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pgvector"; version = "0.6.2"; @@ -11,14 +11,6 @@ stdenv.mkDerivation rec { hash = "sha256-r+TpFJg6WrMn0L2B7RpmSRvw3XxpHzMRtpFWDCzLvgs="; }; - buildInputs = [ postgresql ]; - - installPhase = '' - install -D -t $out/lib vector${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension sql/vector-*.sql - install -D -t $out/share/postgresql/extension vector.control - ''; - meta = with lib; { description = "Open-source vector similarity search for PostgreSQL"; homepage = "https://github.com/pgvector/pgvector"; diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index e03a3bf51fe5..b5924fed6ec2 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, postgresqlTestExtension }: +{ lib, stdenv, fetchFromGitHub, postgresql, postgresqlTestExtension, buildPostgresqlExtension }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "plpgsql-check"; version = "2.7.5"; @@ -11,14 +11,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-CD/G/wX6o+mC6gowlpFe1DdJWyh3cB9wxSsW2GXrENE="; }; - buildInputs = [ postgresql ]; - - installPhase = '' - install -D -t $out/lib *${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - passthru.tests.extension = postgresqlTestExtension { inherit (finalAttrs) finalPackage; sql = "CREATE EXTENSION plpgsql_check;"; diff --git a/pkgs/servers/sql/postgresql/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/plr.nix index b30b59b86d2a..1c2266e7cfb6 100644 --- a/pkgs/servers/sql/postgresql/ext/plr.nix +++ b/pkgs/servers/sql/postgresql/ext/plr.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, R, postgresql }: +{ lib, stdenv, fetchFromGitHub, pkg-config, R, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "plr"; version = "8.4.7"; @@ -12,15 +12,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ R postgresql ]; + buildInputs = [ R ]; makeFlags = [ "USE_PGXS=1" ]; - installPhase = '' - install -D plr${postgresql.dlSuffix} -t $out/lib/ - install -D {plr--*.sql,plr.control} -t $out/share/postgresql/extension - ''; - meta = with lib; { description = "PL/R - R Procedural Language for PostgreSQL"; homepage = "https://github.com/postgres-plr/plr"; diff --git a/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8/default.nix index 2c375babd464..e9a9195078ed 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8/default.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8/default.nix @@ -5,6 +5,7 @@ , perl , postgresql , jitSupport +, buildPostgresqlExtension # For test , runCommand , coreutils @@ -13,7 +14,7 @@ let libv8 = nodejs_20.libv8; -in stdenv.mkDerivation (finalAttrs: { +in buildPostgresqlExtension (finalAttrs: { pname = "plv8"; version = "3.2.3"; @@ -36,7 +37,6 @@ in stdenv.mkDerivation (finalAttrs: { buildInputs = [ libv8 - postgresql ]; buildFlags = [ "all" ]; @@ -48,11 +48,6 @@ in stdenv.mkDerivation (finalAttrs: { "V8_OUTDIR=${libv8}/lib" ]; - installFlags = [ - # PGXS only supports installing to postgresql prefix so we need to redirect this - "DESTDIR=${placeholder "out"}" - ]; - # No configure script. dontConfigure = true; @@ -60,14 +55,6 @@ in stdenv.mkDerivation (finalAttrs: { patchShebangs ./generate_upgrade.sh ''; - postInstall = '' - # Move the redirected to proper directory. - # There appear to be no references to the install directories - # so changing them does not cause issues. - mv "$out/nix/store"/*/* "$out" - rmdir "$out/nix/store"/* "$out/nix/store" "$out/nix" - ''; - passthru = { tests = let diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index afd24f85928e..68aefc1e605d 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -21,12 +21,13 @@ postgresqlTestExtension, jitSupport, llvm, + buildPostgresqlExtension, }: let gdal = gdalMinimal; in -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "postgis"; version = "3.5.0"; @@ -42,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxml2 - postgresql geos proj gdal @@ -68,20 +68,18 @@ stdenv.mkDerivation (finalAttrs: { # postgis config directory assumes /include /lib from the same root for json-c library env.NIX_LDFLAGS = "-L${lib.getLib json_c}/lib"; + setOutputFlags = false; preConfigure = '' sed -i 's@/usr/bin/file@${file}/bin/file@' configure - configureFlags="--datadir=$out/share/postgresql --datarootdir=$out/share/postgresql --bindir=$out/bin --docdir=$doc/share/doc/${finalAttrs.pname} --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev} --disable-extension-upgrades-install" - - makeFlags="PERL=${perl}/bin/perl datadir=$out/share/postgresql pkglibdir=$out/lib bindir=$out/bin docdir=$doc/share/doc/${finalAttrs.pname}" ''; + + configureFlags = [ + "--with-gdalconfig=${gdal}/bin/gdal-config" + "--with-jsondir=${json_c.dev}" + "--disable-extension-upgrades-install" + ]; + postConfigure = '' - sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; - s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g - " \ - "raster/loader/Makefile"; - sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g - " \ - "raster/scripts/python/Makefile"; mkdir -p $out/bin # postgis' build system assumes it is being installed to the same place as postgresql, and looks @@ -89,12 +87,13 @@ stdenv.mkDerivation (finalAttrs: { ln -s ${postgresql}/bin/postgres $out/bin/postgres ''; + makeFlags = [ + "PERL=${perl}/bin/perl" + ]; + doCheck = stdenv.hostPlatform.isLinux; preCheck = '' - substituteInPlace regress/run_test.pl --replace-fail "/share/contrib/postgis" "$out/share/postgresql/contrib/postgis" - substituteInPlace regress/Makefile --replace-fail 's,\$$libdir,$(REGRESS_INSTALLDIR)/lib,g' "s,\\$\$libdir,$PWD/regress/00-regress-install$out/lib,g" \ - --replace-fail '$(REGRESS_INSTALLDIR)/share/contrib/postgis/*.sql' "$PWD/regress/00-regress-install$out/share/postgresql/contrib/postgis/*.sql" substituteInPlace doc/postgis-out.xml --replace-fail "http://docbook.org/xml/5.0/dtd/docbook.dtd" "${docbook5}/xml/dtd/docbook/docbookx.dtd" # The test suite hardcodes it to use /tmp. export PGIS_REG_TMPDIR="$TMPDIR/pgis_reg" diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix index 728f3b348c69..c4203b42f362 100644 --- a/pkgs/servers/sql/postgresql/ext/repmgr.nix +++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix @@ -5,9 +5,10 @@ , flex , curl , json_c +, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "repmgr"; version = "5.4.1"; @@ -20,16 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex ]; - buildInputs = postgresql.buildInputs ++ [ postgresql curl json_c ]; - - installPhase = '' - mkdir -p $out/{bin,lib,share/postgresql/extension} - - cp repmgr{,d} $out/bin - cp *${postgresql.dlSuffix} $out/lib - cp *.sql $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension - ''; + buildInputs = postgresql.buildInputs ++ [ curl json_c ]; meta = with lib; { homepage = "https://repmgr.org/"; diff --git a/pkgs/servers/sql/postgresql/ext/rum.nix b/pkgs/servers/sql/postgresql/ext/rum.nix index 629fddfcbb30..f681efd5b9df 100644 --- a/pkgs/servers/sql/postgresql/ext/rum.nix +++ b/pkgs/servers/sql/postgresql/ext/rum.nix @@ -4,9 +4,10 @@ fetchFromGitHub, postgresql, postgresqlTestHook, + buildPostgresqlExtension, }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "rum"; version = "1.3.14"; @@ -17,16 +18,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-VsfpxQqRBu9bIAP+TfMRXd+B3hSjuhU2NsutocNiCt8="; }; - buildInputs = [ postgresql ]; - makeFlags = [ "USE_PGXS=1" ]; - installPhase = '' - install -D -t $out/lib *${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.control - install -D -t $out/share/postgresql/extension *.sql - ''; - passthru.tests.extension = stdenv.mkDerivation { inherit (finalAttrs) version; pname = "rum-test"; diff --git a/pkgs/servers/sql/postgresql/ext/smlar.nix b/pkgs/servers/sql/postgresql/ext/smlar.nix index 4188c3b9c99a..478abc1b0b9a 100644 --- a/pkgs/servers/sql/postgresql/ext/smlar.nix +++ b/pkgs/servers/sql/postgresql/ext/smlar.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchgit, postgresql }: +{ lib, stdenv, fetchgit, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "smlar-unstable"; version = "2021-11-08"; @@ -10,16 +10,8 @@ stdenv.mkDerivation rec { hash = "sha256-AC6w7uYw0OW70pQpWbK1A3rkCnMvTJzTCAdFiY3rO7A="; }; - buildInputs = [ postgresql ]; - makeFlags = [ "USE_PGXS=1" ]; - installPhase = '' - install -D -t $out/lib *.so - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - meta = with lib; { description = "Compute similary of any one-dimensional arrays"; homepage = "http://sigaev.ru/git/gitweb.cgi?p=smlar.git"; diff --git a/pkgs/servers/sql/postgresql/ext/system_stats.nix b/pkgs/servers/sql/postgresql/ext/system_stats.nix index 03d3034079a1..bf2930807417 100644 --- a/pkgs/servers/sql/postgresql/ext/system_stats.nix +++ b/pkgs/servers/sql/postgresql/ext/system_stats.nix @@ -3,13 +3,12 @@ lib, stdenv, postgresql, + buildPostgresqlExtension, }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "system_stats"; version = "3.2"; - buildInputs = [ postgresql ]; - src = fetchFromGitHub { owner = "EnterpriseDB"; repo = "system_stats"; @@ -19,18 +18,6 @@ stdenv.mkDerivation rec { buildFlags = [ "PG_CFLAGS=-Wno-error=vla" ]; - installPhase = '' - runHook preInstall - - mkdir -p $out/{lib,share/postgresql/extension} - - cp *${postgresql.dlSuffix} $out/lib - cp *.sql $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension - - runHook postInstall - ''; - meta = with lib; { description = "A Postgres extension for exposing system metrics such as CPU, memory and disk information"; homepage = "https://github.com/EnterpriseDB/system_stats"; diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix index 2dbf344fc624..97d5dec1566c 100644 --- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, freetds, unstableGitUpdater }: +{ lib, stdenv, fetchFromGitHub, postgresql, freetds, unstableGitUpdater, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "tds_fdw"; version = "2.0.4"; - buildInputs = [ postgresql freetds ]; + buildInputs = [ freetds ]; src = fetchFromGitHub { owner = "tds-fdw"; @@ -13,13 +13,6 @@ stdenv.mkDerivation rec { hash = "sha256-ruelOHueaHx1royLPvDM8Abd1rQD62R4KXgtHY9qqTw="; }; - installPhase = '' - version="$(sed -En "s,^default_version *= *'([^']*)'.*,\1,p" tds_fdw.control)" - install -D tds_fdw${postgresql.dlSuffix} -t $out/lib - install -D sql/tds_fdw.sql "$out/share/postgresql/extension/tds_fdw--$version.sql" - install -D tds_fdw.control -t $out/share/postgresql/extension - ''; - meta = with lib; { description = "PostgreSQL foreign data wrapper to connect to TDS databases (Sybase and Microsoft SQL Server)"; homepage = "https://github.com/tds-fdw/tds_fdw"; diff --git a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix index cb401829b242..0be3dd60db8d 100644 --- a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix +++ b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix @@ -1,11 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "temporal_tables"; version = "1.2.2"; - buildInputs = [ postgresql ]; - src = fetchFromGitHub { owner = "arkhipov"; repo = "temporal_tables"; @@ -13,12 +11,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-7+DCSPAPhsokWDq/5IXNhd7jY6FfzxxUjlsg/VJeD3k="; }; - installPhase = '' - install -D -t $out/lib temporal_tables${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - meta = with lib; { description = "Temporal Tables PostgreSQL Extension"; homepage = "https://github.com/arkhipov/temporal_tables"; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index ab4736c5f7e9..2ef5bb3ae988 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, cmake, postgresql, openssl, libkrb5, nixosTests, enableUnfree ? true }: +{ lib, stdenv, fetchFromGitHub, cmake, postgresql, openssl, libkrb5, nixosTests, enableUnfree ? true, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; version = "2.14.2"; nativeBuildInputs = [ cmake ]; - buildInputs = [ postgresql openssl libkrb5 ]; + buildInputs = [ openssl libkrb5 ]; src = fetchFromGitHub { owner = "timescale"; diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix index b42095acd715..d1e1fe4741df 100644 --- a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix +++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation { +buildPostgresqlExtension { pname = "tsearch-extras"; version = "0.4"; @@ -11,13 +11,6 @@ stdenv.mkDerivation { sha256 = "18j0saqblg3jhrz38splk173xjwdf32c67ymm18m8n5y94h8d2ba"; }; - buildInputs = [ postgresql ]; - - installPhase = '' - install -D tsearch_extras${postgresql.dlSuffix} -t $out/lib/ - install -D ./{tsearch_extras--1.0.sql,tsearch_extras.control} -t $out/share/postgresql/extension - ''; - meta = with lib; { description = "Provides a few PostgreSQL functions for a lower-level data full text search"; homepage = "https://github.com/zulip/tsearch_extras/"; diff --git a/pkgs/servers/sql/postgresql/ext/tsja.nix b/pkgs/servers/sql/postgresql/ext/tsja.nix index de19b047fe9c..cb6a38951551 100644 --- a/pkgs/servers/sql/postgresql/ext/tsja.nix +++ b/pkgs/servers/sql/postgresql/ext/tsja.nix @@ -2,7 +2,6 @@ , fetchzip , nixosTests , stdenv - , mecab , postgresql }: diff --git a/pkgs/servers/sql/postgresql/ext/wal2json.nix b/pkgs/servers/sql/postgresql/ext/wal2json.nix index f7d581f2c8dd..adc57f333fcf 100644 --- a/pkgs/servers/sql/postgresql/ext/wal2json.nix +++ b/pkgs/servers/sql/postgresql/ext/wal2json.nix @@ -1,13 +1,12 @@ { lib, - stdenv, - callPackage, fetchFromGitHub, postgresql, + buildPostgresqlExtension, nixosTests, }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "wal2json"; version = "2.6"; @@ -18,15 +17,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-+QoACPCKiFfuT2lJfSUmgfzC5MXf75KpSoc2PzPxKyM="; }; - buildInputs = [ postgresql ]; - makeFlags = [ "USE_PGXS=1" ]; - installPhase = '' - install -D -t $out/lib *${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension sql/*.sql - ''; - passthru.tests = nixosTests.postgresql.wal2json.passthru.override postgresql; meta = with lib; { diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 7d59f6349d57..2562105b2411 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -301,6 +301,7 @@ let ''; installPhase = "touch $out"; } // extraArgs); + buildPostgresqlExtension = newSuper.callPackage ./buildPostgresqlExtension.nix {}; }; newSelf = self // scope; newSuper = { callPackage = newScope (scope // this.pkgs); }; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index e31e1fc75b22..3cb95ad14bc2 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -4158,11 +4158,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xorg-server"; - version = "21.1.13"; + version = "21.1.14"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-21.1.13.tar.xz"; - sha256 = "033lvjihidc68v08izrr63va8jhkfmzcjg0d6rm26wizjkah4nml"; + url = "mirror://xorg/individual/xserver/xorg-server-21.1.14.tar.xz"; + sha256 = "0dgfajrnkr8d61z1fjn249s3q1pm23v9w2f1aqb7sx64pp7048cg"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 9577547033b7..ee5e5282ea7e 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.5.tar.xz mirror://xorg/individual/util/makedepend-1.0.9.tar.xz mirror://xorg/individual/util/util-macros-1.20.1.tar.xz mirror://xorg/individual/util/xorg-cf-files-1.0.8.tar.xz -mirror://xorg/individual/xserver/xorg-server-21.1.13.tar.xz +mirror://xorg/individual/xserver/xorg-server-21.1.14.tar.xz diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 4d6fd822db78..2dfb34e40372 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -133,6 +133,17 @@ let ln -s "${compiler-rt.out}/lib" "$rsrc/lib" ln -s "${compiler-rt.out}/share" "$rsrc/share" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags + '' + + lib.optionalString (isFromBootstrapFiles prevStage.llvmPackages.clang-unwrapped) '' + # Work around the `-nostdlibinc` patch in the bootstrap tools. + # TODO: Remove after the bootstrap tools have been updated. + substituteAll ${builtins.toFile "add-flags-extra.sh" '' + if [ "@darwinMinVersion@" ]; then + NIX_CFLAGS_COMPILE_@suffixSalt@+=" -idirafter $SDKROOT/usr/include" + NIX_CFLAGS_COMPILE_@suffixSalt@+=" -iframework $SDKROOT/System/Library/Frameworks" + fi + ''} add-flags-extra.sh + cat add-flags-extra.sh >> $out/nix-support/add-flags.sh ''; cc = prevStage.llvmPackages.clang-unwrapped; @@ -180,6 +191,7 @@ let shell = bash + "/bin/bash"; initialPath = [ bash + prevStage.file bootstrapTools ]; @@ -337,9 +349,11 @@ let inherit (prevStage.darwin) Csu adv_cmds + copyfile libiconv libresolv libsbuf + libutil system_cmds ; }; @@ -359,6 +373,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check ld64 = null; coreutils = null; + file = null; gnugrep = null; pbzx = null; @@ -405,6 +420,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check coreutils = bootstrapTools; cpio = bootstrapTools; + file = null; gnugrep = bootstrapTools; pbzx = bootstrapTools; @@ -438,9 +454,15 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check bintools = selfDarwin.binutils-unwrapped; - # Bootstrap tools cctools needs the hook and wrappers to make sure things are signed properly. + # Bootstrap tools cctools needs the hook and wrappers to make sure things are signed properly, + # and additional linker flags to work around a since‐removed patch. # This can be dropped once the bootstrap tools cctools has been updated to 1010.6. extraBuildCommands = '' + printf %s ${lib.escapeShellArg '' + extraBefore+=("-F$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks") + extraBefore+=("-L$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib") + ''} >> $out/nix-support/add-local-ldflags-before.sh + echo 'source ${selfDarwin.postLinkSignHook}' >> $out/nix-support/post-link-hook export signingUtils=${selfDarwin.signingUtils} @@ -683,6 +705,11 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # Bootstrap tools cctools needs the hook and wrappers to make sure things are signed properly. # This can be dropped once the bootstrap tools cctools has been updated to 1010.6. extraBuildCommands = '' + printf %s ${lib.escapeShellArg '' + extraBefore+=("-F$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks") + extraBefore+=("-L$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib") + ''} >> $out/nix-support/add-local-ldflags-before.sh + echo 'source ${selfDarwin.postLinkSignHook}' >> $out/nix-support/post-link-hook export signingUtils=${selfDarwin.signingUtils} @@ -1016,6 +1043,8 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # Build expand-response-params with last stage like below inherit (prevStage) expand-response-params; }; + # Avoid rebuilding bmake (and Python) just for locales + locale = superDarwin.locale.override { inherit (prevStage) bmake; }; } ); @@ -1246,7 +1275,8 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check patch ; - "apple-sdk_${sdkMajorVersion}" = self.apple-sdk; + # TODO: Simplify when dropping support for macOS < 11. + "apple-sdk_${builtins.replaceStrings [ "." ] [ "_" ] sdkMajorVersion}" = self.apple-sdk; darwin = super.darwin.overrideScope ( _: _: diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index b2b6576c4acd..d4d5ee46638a 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -413,7 +413,7 @@ else let enableParallelChecking = attrs.enableParallelChecking or true; enableParallelInstalling = attrs.enableParallelInstalling or true; } // optionalAttrs (hardeningDisable != [] || hardeningEnable != [] || stdenv.hostPlatform.isMusl) { - NIX_HARDENING_ENABLE = enabledHardeningOptions; + NIX_HARDENING_ENABLE = builtins.concatStringsSep " " enabledHardeningOptions; } // optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform ? gcc.arch) { requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.gcc.arch}" ]; } // optionalAttrs (stdenv.buildPlatform.isDarwin) ( diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 0287b3a90a2a..72fdbef981da 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -15,6 +15,7 @@ shopt -s inherit_errexit # $NIX_DEBUG must be a documented integer level, if set, so we can use it safely as an integer. # See the `Verbosity` enum in the Nix source for these levels. if ! [[ -z ${NIX_DEBUG-} || $NIX_DEBUG == [0-7] ]]; then + # shellcheck disable=SC2016 printf 'The `NIX_DEBUG` environment variable has an unexpected value: %s\n' "${NIX_DEBUG}" echo "It can only be unset or an integer between 0 and 7." exit 1 @@ -396,7 +397,7 @@ concatTo() { for arg in "$@"; do IFS="=" read -r name default <<< "$arg" local -n nameref="$name" - if [[ ! -n "${nameref[@]}" && -n "$default" ]]; then + if [[ -z "${nameref[*]}" && -n "$default" ]]; then targetref+=( "$default" ) elif type=$(declare -p "$name" 2> /dev/null); then case "${type#* }" in @@ -1073,6 +1074,10 @@ substituteInPlace() { fileNames+=("$arg") shift done + if ! [[ "${#fileNames[@]}" -gt 0 ]]; then + echo >&2 "substituteInPlace called without any files to operate on (files must come before options!)" + return 1 + fi for file in "${fileNames[@]}"; do substitute "$file" "$file" "$@" diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index 45ff442ae9da..9f477ccdc3b3 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -131,6 +131,9 @@ in stdenv.mkDerivation { ASAN_OPTIONS=use_sigaltstack=0 ${emulator} ./sanitizers ''} + echo "Check whether CC and LD with NIX_X_USE_RESPONSE_FILE hardcodes all required binaries..." >&2 + NIX_CC_USE_RESPONSE_FILE=1 NIX_LD_USE_RESPONSE_FILE=1 ${CC} -v + touch $out ''; diff --git a/pkgs/test/cc-wrapper/hardening.nix b/pkgs/test/cc-wrapper/hardening.nix index 270e9a2e8761..fb30d17841e3 100644 --- a/pkgs/test/cc-wrapper/hardening.nix +++ b/pkgs/test/cc-wrapper/hardening.nix @@ -178,6 +178,13 @@ in nameDrvAfterAttrName ({ ignorePie = false; }); + pieExplicitEnabledStructuredAttrs = brokenIf stdenv.hostPlatform.isStatic (checkTestBin (f2exampleWithStdEnv stdenv { + hardeningEnable = [ "pie" ]; + __structuredAttrs = true; + }) { + ignorePie = false; + }); + relROExplicitEnabled = checkTestBin (f2exampleWithStdEnv stdenv { hardeningEnable = [ "relro" ]; }) { diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 8b10fa1c98d4..cbca093bcb4f 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -55,17 +55,17 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/gzip/"; description = "GNU zip compression program"; - longDescription = - ''gzip (GNU zip) is a popular data compression program written by - Jean-loup Gailly for the GNU project. Mark Adler wrote the - decompression part. + longDescription = '' + gzip (GNU zip) is a popular data compression program written by + Jean-loup Gailly for the GNU project. Mark Adler wrote the + decompression part. - We developed this program as a replacement for compress because of - the Unisys and IBM patents covering the LZW algorithm used by - compress. These patents made it impossible for us to use compress, - and we needed a replacement. The superior compression ratio of gzip - is just a bonus. - ''; + We developed this program as a replacement for compress because of + the Unisys and IBM patents covering the LZW algorithm used by + compress. These patents made it impossible for us to use compress, + and we needed a replacement. The superior compression ratio of gzip + is just a bonus. + ''; platforms = lib.platforms.all; diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index c05350ba9b64..47619ac751b3 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -65,19 +65,19 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/tukaani-project/xz/releases/tag/v${finalAttrs.version}"; description = "General-purpose data compression software, successor of LZMA"; homepage = "https://tukaani.org/xz/"; - longDescription = - '' XZ Utils is free general-purpose data compression software with high - compression ratio. XZ Utils were written for POSIX-like systems, - but also work on some not-so-POSIX systems. XZ Utils are the - successor to LZMA Utils. + longDescription = '' + XZ Utils is free general-purpose data compression software with high + compression ratio. XZ Utils were written for POSIX-like systems, + but also work on some not-so-POSIX systems. XZ Utils are the + successor to LZMA Utils. - The core of the XZ Utils compression code is based on LZMA SDK, but - it has been modified quite a lot to be suitable for XZ Utils. The - primary compression algorithm is currently LZMA2, which is used - inside the .xz container format. With typical files, XZ Utils - create 30 % smaller output than gzip and 15 % smaller output than - bzip2. - ''; + The core of the XZ Utils compression code is based on LZMA SDK, but + it has been modified quite a lot to be suitable for XZ Utils. The + primary compression algorithm is currently LZMA2, which is used + inside the .xz container format. With typical files, XZ Utils + create 30 % smaller output than gzip and 15 % smaller output than + bzip2. + ''; license = with licenses; [ gpl2Plus lgpl21Plus ]; maintainers = with maintainers; [ sander ]; platforms = platforms.all; diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index dbbe59e7468e..6baac4dc90d9 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = "graphviz"; - version = "12.1.2"; + version = "12.2.0"; src = fetchFromGitLab { owner = "graphviz"; repo = "graphviz"; rev = version; - hash = "sha256-dRqGqnSGldr1Vb/wzR+jcuXCoAw35pTdm84wqJlA0mA="; + hash = "sha256-BSqCI9nIDjymPbCPWGFdWmqfyjuTkIsL1r0qv+Qjy10="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/mailctl/default.nix b/pkgs/tools/networking/mailctl/default.nix deleted file mode 100644 index 2e6233269280..000000000000 --- a/pkgs/tools/networking/mailctl/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ mkDerivation -, fetchFromGitHub -, aeson -, base -, base64 -, bytestring -, containers -, directory -, hsyslog -, http-conduit -, lib -, network-uri -, optparse-applicative -, pretty-simple -, process -, random -, strings -, template-haskell -, text -, time -, twain -, unix -, utf8-string -, warp -, yaml -}: -mkDerivation rec { - pname = "mailctl"; - version = "0.9.2"; - - src = fetchFromGitHub { - owner = "pdobsan"; - repo = "mailctl"; - rev = version; - hash = "sha256-frT+fRJpixSvpb2+C34Z47zbMqvmDHdESItXb9YVbfU="; - }; - - isLibrary = true; - isExecutable = true; - - libraryHaskellDepends = [ - aeson - base - base64 - bytestring - containers - directory - hsyslog - http-conduit - network-uri - optparse-applicative - pretty-simple - process - random - strings - template-haskell - text - time - twain - unix - utf8-string - warp - yaml - ]; - - executableHaskellDepends = [ - aeson - base - base64 - bytestring - containers - directory - hsyslog - http-conduit - network-uri - optparse-applicative - pretty-simple - process - random - strings - template-haskell - text - time - twain - unix - utf8-string - warp - yaml - ]; - - description = "OAuth2 tool for mail clients"; - homepage = "https://github.com/pdobsan/mailctl"; - changelog = "https://github.com/pdobsan/mailctl/releases/tag/${version}"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ aidalgol ]; - mainProgram = "mailctl"; -} diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 85347c24418f..16e487e346a1 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -51,13 +51,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://git.alpinelinux.org/aports/plain/main/openssh/gss-serv.c.patch?id=a7509603971ce2f3282486a43bb773b1b522af83"; sha256 = "sha256-eFFOd4B2nccRZAQWwdBPBoKWjfEdKEVGJvKZAzLu3HU="; }) - - (fetchpatch { - name = "musl.patch"; - url = "https://anongit.mindrot.org/openssh.git/patch/?id=8b664df75966e5aed8dabea00b8838303d3488b8"; - hash = "sha256-siVg1mnGiZ2aP3IIY4y1WAp3nkOk0XKSBDqYfw6lrQg="; - }) - # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch ] ++ extraPatches; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 96505155fb34..2bda81df9003 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -5,11 +5,11 @@ in { openssh = common rec { pname = "openssh"; - version = "9.8p1"; + version = "9.9p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-3YvQAqN5tdSZ37BQ3R+pr4Ap6ARh9LtsUjxJlz9aOfM="; + hash = "sha256-s0P7zb/4fxWxmG5uFdbU/Jp9NgZr5rf7UHCHuo+WbAI="; }; extraPatches = [ ./ssh-keysign-8.5.patch ]; @@ -18,12 +18,12 @@ in openssh_hpn = common rec { pname = "openssh-with-hpn"; - version = "9.8p1"; + version = "9.9p1"; extraDesc = " with high performance networking patches"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-3YvQAqN5tdSZ37BQ3R+pr4Ap6ARh9LtsUjxJlz9aOfM="; + hash = "sha256-s0P7zb/4fxWxmG5uFdbU/Jp9NgZr5rf7UHCHuo+WbAI="; }; extraPatches = let url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/7ba88c964b6e5724eec462021d984da3989e6a08/security/openssh-portable/files/extra-patch-hpn"; in @@ -58,12 +58,12 @@ in openssh_gssapi = common rec { pname = "openssh-with-gssapi"; - version = "9.8p1"; + version = "9.9p1"; extraDesc = " with GSSAPI support"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-3YvQAqN5tdSZ37BQ3R+pr4Ap6ARh9LtsUjxJlz9aOfM="; + hash = "sha256-s0P7zb/4fxWxmG5uFdbU/Jp9NgZr5rf7UHCHuo+WbAI="; }; extraPatches = [ @@ -71,8 +71,8 @@ in (fetchpatch { name = "openssh-gssapi.patch"; - url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-3/debian/patches/gssapi.patch"; - hash = "sha256-BnmEZ5pMIbbysesMSm54ykdweH4JudM9D4Pn5uWf3EY="; + url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-2/debian/patches/gssapi.patch"; + hash = "sha256-cQF5psMZpLWwVqK9CNi+Q8wHn6w6ffQUJRNI5jKGgD0="; }) ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cb5dacc505ca..2b156761aa47 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1340,7 +1340,6 @@ mapAliases { yacc = throw "'yacc' has been renamed to/replaced by 'bison'"; # Converted to throw 2024-10-17 yafaray-core = libyafaray; # Added 2022-09-23 - yi = throw "'yi' has been removed, as it was broken and unmaintained"; # added 2024-05-09 youtrack_2022_3 = throw "'youtrack_2022_3' has been removed as it was deprecated. Please update to the 'youtrack' package."; # Added 2024-10-17 yrd = throw "'yrd' has been removed, as it was broken and unmaintained"; # added 2024-05-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec4442b22ebe..3c839400615b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5893,6 +5893,9 @@ with pkgs; yamllint = with python3Packages; toPythonApplication yamllint; + # To expose more packages for Yi, override the extraPackages arg. + yi = callPackage ../applications/editors/yi/wrapper.nix { }; + yaydl = callPackage ../tools/video/yaydl { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -7603,15 +7606,25 @@ with pkgs; bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; x11Support = true; }; + python314Full = python314.override { + self = python314Full; + pythonAttr = "python314Full"; + bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; + x11Support = true; + }; # https://py-free-threading.github.io python313FreeThreading = python313.override { pythonAttr = "python313FreeThreading"; enableGIL = false; }; + python314FreeThreading = python314.override { + pythonAttr = "python313FreeThreading"; + enableGIL = false; + }; pythonInterpreters = callPackage ./../development/interpreters/python { }; - inherit (pythonInterpreters) python27 python39 python310 python311 python312 python313 python3Minimal pypy27 pypy310 pypy39 rustpython; + inherit (pythonInterpreters) python27 python39 python310 python311 python312 python313 python314 python3Minimal pypy27 pypy310 pypy39 rustpython; # List of extensions with overrides to apply to all Python package sets. pythonPackagesExtensions = [ ]; @@ -7623,6 +7636,7 @@ with pkgs; python311Packages = recurseIntoAttrs python311.pkgs; python312Packages = recurseIntoAttrs python312.pkgs; python313Packages = python313.pkgs; + python314Packages = python314.pkgs; pypyPackages = pypy.pkgs; pypy2Packages = pypy2.pkgs; pypy27Packages = pypy27.pkgs; @@ -10719,9 +10733,7 @@ with pkgs; utils = true; }; - portaudio = callPackage ../development/libraries/portaudio { - inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit CoreAudio CoreServices Carbon; - }; + portaudio = callPackage ../development/libraries/portaudio { }; portmidi = callPackage ../development/libraries/portmidi { inherit (darwin.apple_sdk.frameworks) Carbon CoreAudio CoreFoundation CoreMIDI CoreServices; @@ -13638,10 +13650,7 @@ with pkgs; cdparanoia = cdparanoiaIII; - cdparanoiaIII = callPackage ../applications/audio/cdparanoia { - inherit (darwin) IOKit; - inherit (darwin.apple_sdk.frameworks) Carbon; - }; + cdparanoiaIII = callPackage ../applications/audio/cdparanoia { }; brotab = callPackage ../tools/misc/brotab { python = python3; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index d33cb84c62c2..8602eeca2980 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -403,6 +403,7 @@ mapAliases ({ pdfminer = pdfminer-six; # added 2022-05-25 pdfx = throw "pdfx has been removed because the upstream repository was archived in 2023"; # Added 2024-10-04 pep257 = pydocstyle; # added 2022-04-12 + pillow-simd = throw "pillow-simd has been removed for lagging behind pillow upstream, which exposes it to various security issues."; # Added 2024-10-24 pixelmatch = "pixelmatch has been removed as it was unmaintained"; # Added 2024-08-18 pkutils = throw "pkutils was removed as it was unused and is not applicable to modern Python build tools"; # added 2024-07-28 poetry = throw "poetry was promoted to a top-level attribute, use poetry-core to build Python packages"; # added 2023-01-09 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0390abd70eb4..5562b7ea464a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10203,19 +10203,24 @@ self: super: with self; { pillowfight = callPackage ../development/python-modules/pillowfight { }; pillow = callPackage ../development/python-modules/pillow { - inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; - inherit (pkgs.xorg) libX11 libxcb; + inherit (pkgs) + freetype + lcms2 + libimagequant + libjpeg + libraqm + libtiff + libwebp + openjpeg + zlib + ; + inherit (pkgs.xorg) libxcb; }; pillow-heif = callPackage ../development/python-modules/pillow-heif { }; pillow-jpls = callPackage ../development/python-modules/pillow-jpls { }; - pillow-simd = callPackage ../development/python-modules/pillow-simd { - inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; - inherit (pkgs.xorg) libX11; - }; - pims = callPackage ../development/python-modules/pims { }; pinboard = callPackage ../development/python-modules/pinboard { }; @@ -15629,7 +15634,6 @@ self: super: with self; { }; grpcioTF = self.grpcio.override { protobuf = protobufTF; - grpc = grpcTF; }; tensorboard-plugin-profileTF = self.tensorboard-plugin-profile.override { protobuf = protobuf-pythonTF; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index e83e8a794fa7..7a5a87ccf42e 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -379,6 +379,7 @@ let xmobar xmonadctl xmonad-with-packages + yi zsh-git-prompt ; @@ -560,9 +561,8 @@ let compilerNames.ghc9101 ] released; Cabal_3_10_3_0 = released; - Cabal-syntax_3_10_3_0 = released; Cabal_3_12_1_0 = released; - Cabal-syntax_3_12_1_0 = released; + Cabal_3_14_0_0 = released; cabal2nix = lib.subtractLists [ compilerNames.ghc9101 ] released; @@ -590,9 +590,6 @@ let language-nix = lib.subtractLists [ compilerNames.ghc9101 ] released; - large-hashable = [ - compilerNames.ghc928 - ]; nix-paths = released; titlecase = lib.subtractLists [ compilerNames.ghc9101