diff options
1108 files changed, 17821 insertions, 12278 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 47069c9a79458..3c300d00c6ba4 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -118,13 +118,13 @@ /pkgs/development/interpreters/python/hooks @FRidh @jonringer # Haskell -/doc/languages-frameworks/haskell.section.md @cdepillabout @sternenseemann @maralorn -/maintainers/scripts/haskell @cdepillabout @sternenseemann @maralorn -/pkgs/development/compilers/ghc @cdepillabout @sternenseemann @maralorn -/pkgs/development/haskell-modules @cdepillabout @sternenseemann @maralorn -/pkgs/test/haskell @cdepillabout @sternenseemann @maralorn -/pkgs/top-level/release-haskell.nix @cdepillabout @sternenseemann @maralorn -/pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn +/doc/languages-frameworks/haskell.section.md @cdepillabout @sternenseemann @maralorn @ncfavier +/maintainers/scripts/haskell @cdepillabout @sternenseemann @maralorn @ncfavier +/pkgs/development/compilers/ghc @cdepillabout @sternenseemann @maralorn @ncfavier +/pkgs/development/haskell-modules @cdepillabout @sternenseemann @maralorn @ncfavier +/pkgs/test/haskell @cdepillabout @sternenseemann @maralorn @ncfavier +/pkgs/top-level/release-haskell.nix @cdepillabout @sternenseemann @maralorn @ncfavier +/pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn @ncfavier # Perl /pkgs/development/interpreters/perl @stigtsp @zakame @dasJ diff --git a/doc/hooks/meson.section.md b/doc/hooks/meson.section.md index fd7779e6468f6..3a7fb50320827 100644 --- a/doc/hooks/meson.section.md +++ b/doc/hooks/meson.section.md @@ -1,25 +1,83 @@ # Meson {#meson} -Overrides the configure phase to run meson to generate Ninja files. To run these files, you should accompany Meson with ninja. By default, `enableParallelBuilding` is enabled as Meson supports parallel building almost everywhere. +[Meson](https://mesonbuild.com/) is an open source meta build system meant to be +fast and user-friendly. -## Variables controlling Meson {#variables-controlling-meson} +In Nixpkgs, meson comes with a setup hook that overrides the configure, check, +and install phases. -### `mesonFlags` {#mesonflags} +Being a meta build system, meson needs an accompanying backend. In the context +of Nixpkgs, the typical companion backend is [Ninja](#ninja), that provides a +setup hook registering ninja-based build and install phases. -Controls the flags passed to meson. +## Variables controlling Meson {#meson-variables-controlling} -### `mesonBuildType` {#mesonbuildtype} +### Meson Exclusive Variables {#meson-exclusive-variables} -Which [`--buildtype`](https://mesonbuild.com/Builtin-options.html#core-options) to pass to Meson. We default to `plain`. +#### `mesonFlags` {#meson-flags} -### `mesonAutoFeatures` {#mesonautofeatures} +Controls the flags passed to `meson setup` during configure phase. -What value to set [`-Dauto_features=`](https://mesonbuild.com/Builtin-options.html#core-options) to. We default to `enabled`. +#### `mesonWrapMode` {#meson-wrap-mode} -### `mesonWrapMode` {#mesonwrapmode} +Which value is passed as +[`-Dwrap_mode=`](https://mesonbuild.com/Builtin-options.html#core-options) +to. In Nixpkgs the default value is `nodownload`, so that no subproject will be +downloaded (since network access is already disabled during deployment in +Nixpkgs). -What value to set [`-Dwrap_mode=`](https://mesonbuild.com/Builtin-options.html#core-options) to. We default to `nodownload` as we disallow network access. +Note: Meson allows pre-population of subprojects that would otherwise be +downloaded. -### `dontUseMesonConfigure` {#dontusemesonconfigure} +#### `mesonBuildType` {#meson-build-type} -Disables using Meson’s `configurePhase`. +Which value is passed as +[`--buildtype`](https://mesonbuild.com/Builtin-options.html#core-options) to +`meson setup` during configure phase. In Nixpkgs the default value is `plain`. + +#### `mesonAutoFeatures` {#meson-auto-features} + +Which value is passed as +[`-Dauto_features=`](https://mesonbuild.com/Builtin-options.html#core-options) +to `meson setup` during configure phase. In Nixpkgs the default value is +`enabled`, meaning that every feature declared as "auto" by the meson scripts +will be enabled. + +#### `mesonCheckFlags` {#meson-check-flags} + +Controls the flags passed to `meson test` during check phase. + +#### `mesonInstallFlags` {#meson-install-flags} + +Controls the flags passed to `meson install` during install phase. + +#### `mesonInstallTags` {#meson-install-tags} + +A list of installation tags passed to Meson's commandline option +[`--tags`](https://mesonbuild.com/Installing.html#installation-tags) during +install phase. + +Note: `mesonInstallTags` should be a list of strings, that will be converted to +a comma-separated string that is recognized to `--tags`. +Example: `mesonInstallTags = [ "emulator" "assembler" ];` will be converted to +`--tags emulator,assembler`. + +#### `dontUseMesonConfigure` {#dont-use-meson-configure} + +When set to true, don't use the predefined `mesonConfigurePhase`. + +#### `dontUseMesonCheck` {#dont-use-meson-check} + +When set to true, don't use the predefined `mesonCheckPhase`. + +#### `dontUseMesonInstall` {#dont-use-meson-install} + +When set to true, don't use the predefined `mesonInstallPhase`. + +### Honored variables {#meson-honored-variables} + +The following variables commonly used by `stdenv.mkDerivation` are honored by +Meson setup hook. + +- `prefixKey` +- `enableParallelBuilding` diff --git a/doc/hooks/ninja.section.md b/doc/hooks/ninja.section.md index 4b0e33feb5c39..bbc9481088041 100644 --- a/doc/hooks/ninja.section.md +++ b/doc/hooks/ninja.section.md @@ -1,3 +1,5 @@ # ninja {#ninja} Overrides the build, install, and check phase to run ninja instead of make. You can disable this behavior with the `dontUseNinjaBuild`, `dontUseNinjaInstall`, and `dontUseNinjaCheck`, respectively. Parallel building is enabled by default in Ninja. + +Note that if the [Meson setup hook](#meson) is also active, Ninja's install and check phases will be disabled in favor of Meson's. diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md index 9ba0fef2a27bb..978ec07cb961e 100644 --- a/doc/languages-frameworks/dotnet.section.md +++ b/doc/languages-frameworks/dotnet.section.md @@ -138,7 +138,9 @@ in buildDotnetModule rec { src = ./.; projectFile = "src/project.sln"; - nugetDeps = ./deps.nix; # File generated with `nix-build -A package.passthru.fetch-deps`. + # File generated with `nix-build -A package.passthru.fetch-deps`. + # To run fetch-deps when this file does not yet exist, set nugetDeps to null + nugetDeps = ./deps.nix; projectReferences = [ referencedProject ]; # `referencedProject` must contain `nupkg` in the folder structure. diff --git a/lib/fileset/default.nix b/lib/fileset/default.nix index 81be1af9d8a1a..15af0813eec71 100644 --- a/lib/fileset/default.nix +++ b/lib/fileset/default.nix @@ -12,14 +12,18 @@ let _printFileset _intersection _difference + _mirrorStorePath + _fetchGitSubmodulesMinver ; inherit (builtins) + isBool isList isPath pathExists seq typeOf + nixVersion ; inherit (lib.lists) @@ -34,6 +38,7 @@ let inherit (lib.strings) isStringLike + versionOlder ; inherit (lib.filesystem) @@ -47,6 +52,7 @@ let inherit (lib.trivial) isFunction pipe + inPureEvalMode ; in { @@ -596,4 +602,111 @@ in { # We could also return the original fileset argument here, # but that would then duplicate work for consumers of the fileset, because then they have to coerce it again actualFileset; + + /* + Create a file set containing all [Git-tracked files](https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository) in a repository. + + This function behaves like [`gitTrackedWith { }`](#function-library-lib.fileset.gitTrackedWith) - using the defaults. + + Type: + gitTracked :: Path -> FileSet + + Example: + # Include all files tracked by the Git repository in the current directory + gitTracked ./. + + # Include only files tracked by the Git repository in the parent directory + # that are also in the current directory + intersection ./. (gitTracked ../.) + */ + gitTracked = + /* + The [path](https://nixos.org/manual/nix/stable/language/values#type-path) to the working directory of a local Git repository. + This directory must contain a `.git` file or subdirectory. + */ + path: + # See the gitTrackedWith implementation for more explanatory comments + let + fetchResult = builtins.fetchGit path; + in + if inPureEvalMode then + throw "lib.fileset.gitTracked: This function is currently not supported in pure evaluation mode, since it currently relies on `builtins.fetchGit`. See https://github.com/NixOS/nix/issues/9292." + else if ! isPath path then + throw "lib.fileset.gitTracked: Expected the argument to be a path, but it's a ${typeOf path} instead." + else if ! pathExists (path + "/.git") then + throw "lib.fileset.gitTracked: Expected the argument (${toString path}) to point to a local working tree of a Git repository, but it's not." + else + _mirrorStorePath path fetchResult.outPath; + + /* + Create a file set containing all [Git-tracked files](https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository) in a repository. + The first argument allows configuration with an attribute set, + while the second argument is the path to the Git working tree. + If you don't need the configuration, + you can use [`gitTracked`](#function-library-lib.fileset.gitTracked) instead. + + This is equivalent to the result of [`unions`](#function-library-lib.fileset.unions) on all files returned by [`git ls-files`](https://git-scm.com/docs/git-ls-files) + (which uses [`--cached`](https://git-scm.com/docs/git-ls-files#Documentation/git-ls-files.txt--c) by default). + + :::{.warning} + Currently this function is based on [`builtins.fetchGit`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-fetchGit) + As such, this function causes all Git-tracked files to be unnecessarily added to the Nix store, + without being re-usable by [`toSource`](#function-library-lib.fileset.toSource). + + This may change in the future. + ::: + + Type: + gitTrackedWith :: { recurseSubmodules :: Bool ? false } -> Path -> FileSet + + Example: + # Include all files tracked by the Git repository in the current directory + # and any submodules under it + gitTracked { recurseSubmodules = true; } ./. + */ + gitTrackedWith = + { + /* + (optional, default: `false`) Whether to recurse into [Git submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) to also include their tracked files. + + If `true`, this is equivalent to passing the [--recurse-submodules](https://git-scm.com/docs/git-ls-files#Documentation/git-ls-files.txt---recurse-submodules) flag to `git ls-files`. + */ + recurseSubmodules ? false, + }: + /* + The [path](https://nixos.org/manual/nix/stable/language/values#type-path) to the working directory of a local Git repository. + This directory must contain a `.git` file or subdirectory. + */ + path: + let + # This imports the files unnecessarily, which currently can't be avoided + # because `builtins.fetchGit` is the only function exposing which files are tracked by Git. + # With the [lazy trees PR](https://github.com/NixOS/nix/pull/6530), + # the unnecessarily import could be avoided. + # However a simpler alternative still would be [a builtins.gitLsFiles](https://github.com/NixOS/nix/issues/2944). + fetchResult = builtins.fetchGit { + url = path; + + # This is the only `fetchGit` parameter that makes sense in this context. + # We can't just pass `submodules = recurseSubmodules` here because + # this would fail for Nix versions that don't support `submodules`. + ${if recurseSubmodules then "submodules" else null} = true; + }; + in + if inPureEvalMode then + throw "lib.fileset.gitTrackedWith: This function is currently not supported in pure evaluation mode, since it currently relies on `builtins.fetchGit`. See https://github.com/NixOS/nix/issues/9292." + else if ! isBool recurseSubmodules then + throw "lib.fileset.gitTrackedWith: Expected the attribute `recurseSubmodules` of the first argument to be a boolean, but it's a ${typeOf recurseSubmodules} instead." + else if recurseSubmodules && versionOlder nixVersion _fetchGitSubmodulesMinver then + throw "lib.fileset.gitTrackedWith: Setting the attribute `recurseSubmodules` to `true` is only supported for Nix version ${_fetchGitSubmodulesMinver} and after, but Nix version ${nixVersion} is used." + else if ! isPath path then + throw "lib.fileset.gitTrackedWith: Expected the second argument to be a path, but it's a ${typeOf path} instead." + # We can identify local working directories by checking for .git, + # see https://git-scm.com/docs/gitrepository-layout#_description. + # Note that `builtins.fetchGit` _does_ work for bare repositories (where there's no `.git`), + # even though `git ls-files` wouldn't return any files in that case. + else if ! pathExists (path + "/.git") then + throw "lib.fileset.gitTrackedWith: Expected the second argument (${toString path}) to point to a local working tree of a Git repository, but it's not." + else + _mirrorStorePath path fetchResult.outPath; } diff --git a/lib/fileset/internal.nix b/lib/fileset/internal.nix index 6b5cea066afde..0769e654c8fb8 100644 --- a/lib/fileset/internal.nix +++ b/lib/fileset/internal.nix @@ -825,4 +825,27 @@ rec { ${baseNameOf root} = fromFile (baseNameOf root) rootType; }; + + # Support for `builtins.fetchGit` with `submodules = true` was introduced in 2.4 + # https://github.com/NixOS/nix/commit/55cefd41d63368d4286568e2956afd535cb44018 + _fetchGitSubmodulesMinver = "2.4"; + + # Mirrors the contents of a Nix store path relative to a local path as a file set. + # Some notes: + # - The store path is read at evaluation time. + # - The store path must not include files that don't exist in the respective local path. + # + # Type: Path -> String -> FileSet + _mirrorStorePath = localPath: storePath: + let + recurse = focusedStorePath: + mapAttrs (name: type: + if type == "directory" then + recurse (focusedStorePath + "/${name}") + else + type + ) (builtins.readDir focusedStorePath); + in + _create localPath + (recurse storePath); } diff --git a/lib/fileset/tests.sh b/lib/fileset/tests.sh index ebf9b6c37bf23..3c88ebdd05592 100755 --- a/lib/fileset/tests.sh +++ b/lib/fileset/tests.sh @@ -43,15 +43,29 @@ crudeUnquoteJSON() { cut -d \" -f2 } -prefixExpression='let - lib = import <nixpkgs/lib>; - internal = import <nixpkgs/lib/fileset/internal.nix> { - inherit lib; - }; -in -with lib; -with internal; -with lib.fileset;' +prefixExpression() { + echo 'let + lib = + (import <nixpkgs/lib>) + ' + if [[ "${1:-}" == "--simulate-pure-eval" ]]; then + echo ' + .extend (final: prev: { + trivial = prev.trivial // { + inPureEvalMode = true; + }; + })' + fi + echo ' + ; + internal = import <nixpkgs/lib/fileset/internal.nix> { + inherit lib; + }; + in + with lib; + with internal; + with lib.fileset;' +} # Check that two nix expression successfully evaluate to the same value. # The expressions have `lib.fileset` in scope. @@ -60,7 +74,7 @@ expectEqual() { local actualExpr=$1 local expectedExpr=$2 if actualResult=$(nix-instantiate --eval --strict --show-trace 2>"$tmp"/actualStderr \ - --expr "$prefixExpression ($actualExpr)"); then + --expr "$(prefixExpression) ($actualExpr)"); then actualExitCode=$? else actualExitCode=$? @@ -68,7 +82,7 @@ expectEqual() { actualStderr=$(< "$tmp"/actualStderr) if expectedResult=$(nix-instantiate --eval --strict --show-trace 2>"$tmp"/expectedStderr \ - --expr "$prefixExpression ($expectedExpr)"); then + --expr "$(prefixExpression) ($expectedExpr)"); then expectedExitCode=$? else expectedExitCode=$? @@ -95,8 +109,9 @@ expectEqual() { # Usage: expectStorePath NIX expectStorePath() { local expr=$1 - if ! result=$(nix-instantiate --eval --strict --json --read-write-mode --show-trace \ - --expr "$prefixExpression ($expr)"); then + if ! result=$(nix-instantiate --eval --strict --json --read-write-mode --show-trace 2>"$tmp"/stderr \ + --expr "$(prefixExpression) ($expr)"); then + cat "$tmp/stderr" >&2 die "$expr failed to evaluate, but it was expected to succeed" fi # This is safe because we assume to get back a store path in a string @@ -108,10 +123,16 @@ expectStorePath() { # The expression has `lib.fileset` in scope. # Usage: expectFailure NIX REGEX expectFailure() { + if [[ "$1" == "--simulate-pure-eval" ]]; then + maybePure="--simulate-pure-eval" + shift + else + maybePure="" + fi local expr=$1 local expectedErrorRegex=$2 if result=$(nix-instantiate --eval --strict --read-write-mode --show-trace 2>"$tmp/stderr" \ - --expr "$prefixExpression $expr"); then + --expr "$(prefixExpression $maybePure) $expr"); then die "$expr evaluated successfully to $result, but it was expected to fail" fi stderr=$(<"$tmp/stderr") @@ -128,12 +149,12 @@ expectTrace() { local expectedTrace=$2 nix-instantiate --eval --show-trace >/dev/null 2>"$tmp"/stderrTrace \ - --expr "$prefixExpression trace ($expr)" || true + --expr "$(prefixExpression) trace ($expr)" || true actualTrace=$(sed -n 's/^trace: //p' "$tmp/stderrTrace") nix-instantiate --eval --show-trace >/dev/null 2>"$tmp"/stderrTraceVal \ - --expr "$prefixExpression traceVal ($expr)" || true + --expr "$(prefixExpression) traceVal ($expr)" || true actualTraceVal=$(sed -n 's/^trace: //p' "$tmp/stderrTraceVal") @@ -1251,6 +1272,179 @@ expectEqual 'trace (intersection ./a (fromSource (lib.cleanSourceWith { }))) null' 'trace ./a/b null' rm -rf -- * +## lib.fileset.gitTracked/gitTrackedWith + +# The first/second argument has to be a path +expectFailure 'gitTracked null' 'lib.fileset.gitTracked: Expected the argument to be a path, but it'\''s a null instead.' +expectFailure 'gitTrackedWith {} null' 'lib.fileset.gitTrackedWith: Expected the second argument to be a path, but it'\''s a null instead.' + +# The path has to contain a .git directory +expectFailure 'gitTracked ./.' 'lib.fileset.gitTracked: Expected the argument \('"$work"'\) to point to a local working tree of a Git repository, but it'\''s not.' +expectFailure 'gitTrackedWith {} ./.' 'lib.fileset.gitTrackedWith: Expected the second argument \('"$work"'\) to point to a local working tree of a Git repository, but it'\''s not.' + +# recurseSubmodules has to be a boolean +expectFailure 'gitTrackedWith { recurseSubmodules = null; } ./.' 'lib.fileset.gitTrackedWith: Expected the attribute `recurseSubmodules` of the first argument to be a boolean, but it'\''s a null instead.' + +# recurseSubmodules = true is not supported on all Nix versions +if [[ "$(nix-instantiate --eval --expr "$(prefixExpression) (versionAtLeast builtins.nixVersion _fetchGitSubmodulesMinver)")" == true ]]; then + fetchGitSupportsSubmodules=1 +else + fetchGitSupportsSubmodules= + expectFailure 'gitTrackedWith { recurseSubmodules = true; } ./.' 'lib.fileset.gitTrackedWith: Setting the attribute `recurseSubmodules` to `true` is only supported for Nix version 2.4 and after, but Nix version [0-9.]+ is used.' +fi + +# Checks that `gitTrackedWith` contains the same files as `git ls-files` +# for the current working directory. +# If --recurse-submodules is passed, the flag is passed through to `git ls-files` +# and as `recurseSubmodules` to `gitTrackedWith` +checkGitTrackedWith() { + if [[ "${1:-}" == "--recurse-submodules" ]]; then + gitLsFlags="--recurse-submodules" + gitTrackedArg="{ recurseSubmodules = true; }" + else + gitLsFlags="" + gitTrackedArg="{ }" + fi + + # All files listed by `git ls-files` + expectedFiles=() + while IFS= read -r -d $'\0' file; do + # If there are submodules but --recurse-submodules isn't passed, + # `git ls-files` lists them as empty directories, + # we need to filter that out since we only want to check/count files + if [[ -f "$file" ]]; then + expectedFiles+=("$file") + fi + done < <(git ls-files -z $gitLsFlags) + + storePath=$(expectStorePath 'toSource { root = ./.; fileset = gitTrackedWith '"$gitTrackedArg"' ./.; }') + + # Check that each expected file is also in the store path with the same content + for expectedFile in "${expectedFiles[@]}"; do + if [[ ! -e "$storePath"/"$expectedFile" ]]; then + die "Expected file $expectedFile to exist in $storePath, but it doesn't.\nGit status:\n$(git status)\nStore path contents:\n$(find "$storePath")" + fi + if ! diff "$expectedFile" "$storePath"/"$expectedFile"; then + die "Expected file $expectedFile to have the same contents as in $storePath, but it doesn't.\nGit status:\n$(git status)\nStore path contents:\n$(find "$storePath")" + fi + done + + # This is a cheap way to verify the inverse: That all files in the store path are also expected + # We just count the number of files in both and verify they're the same + actualFileCount=$(find "$storePath" -type f -printf . | wc -c) + if [[ "${#expectedFiles[@]}" != "$actualFileCount" ]]; then + die "Expected ${#expectedFiles[@]} files in $storePath, but got $actualFileCount.\nGit status:\n$(git status)\nStore path contents:\n$(find "$storePath")" + fi +} + + +# Runs checkGitTrackedWith with and without --recurse-submodules +# Allows testing both variants together +checkGitTracked() { + checkGitTrackedWith + if [[ -n "$fetchGitSupportsSubmodules" ]]; then + checkGitTrackedWith --recurse-submodules + fi +} + +createGitRepo() { + git init -q "$1" + # Only repo-local config + git -C "$1" config user.name "Nixpkgs" + git -C "$1" config user.email "nixpkgs@nixos.org" + # Get at least a HEAD commit, needed for older Nix versions + git -C "$1" commit -q --allow-empty -m "Empty commit" +} + +# Check the error message for pure eval mode +createGitRepo . +expectFailure --simulate-pure-eval 'toSource { root = ./.; fileset = gitTracked ./.; }' 'lib.fileset.gitTracked: This function is currently not supported in pure evaluation mode, since it currently relies on `builtins.fetchGit`. See https://github.com/NixOS/nix/issues/9292.' +expectFailure --simulate-pure-eval 'toSource { root = ./.; fileset = gitTrackedWith {} ./.; }' 'lib.fileset.gitTrackedWith: This function is currently not supported in pure evaluation mode, since it currently relies on `builtins.fetchGit`. See https://github.com/NixOS/nix/issues/9292.' +rm -rf -- * + +# Go through all stages of Git files +# See https://www.git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository + +# Empty repository +createGitRepo . +checkGitTracked + +# Untracked file +echo a > a +checkGitTracked + +# Staged file +git add a +checkGitTracked + +# Committed file +git commit -q -m "Added a" +checkGitTracked + +# Edited file +echo b > a +checkGitTracked + +# Removed file +git rm -f -q a +checkGitTracked + +rm -rf -- * + +# gitignored file +createGitRepo . +echo a > .gitignore +touch a +git add -A +checkGitTracked + +# Add it regardless (needs -f) +git add -f a +checkGitTracked +rm -rf -- * + +# Directory +createGitRepo . +mkdir -p d1/d2/d3 +touch d1/d2/d3/a +git add d1 +checkGitTracked +rm -rf -- * + +# Submodules +createGitRepo . +createGitRepo sub + +# Untracked submodule +git -C sub commit -q --allow-empty -m "Empty commit" +checkGitTracked + +# Tracked submodule +git submodule add ./sub sub >/dev/null +checkGitTracked + +# Untracked file +echo a > sub/a +checkGitTracked + +# Staged file +git -C sub add a +checkGitTracked + +# Committed file +git -C sub commit -q -m "Add a" +checkGitTracked + +# Changed file +echo b > sub/b +checkGitTracked + +# Removed file +git -C sub rm -f -q a +checkGitTracked + +rm -rf -- * + # TODO: Once we have combinators and a property testing library, derive property tests from https://en.wikipedia.org/wiki/Algebra_of_sets echo >&2 tests ok diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 2790ea08d9701..ada8c66e3618b 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -43,6 +43,10 @@ rec { elaborate = args': let args = if lib.isString args' then { system = args'; } else args'; + + # TODO: deprecate args.rustc in favour of args.rust after 23.05 is EOL. + rust = assert !(args ? rust && args ? rustc); args.rust or args.rustc or {}; + final = { # Prefer to parse `config` as it is strictly more informative. parsed = parse.mkSystemFromString (if args ? config then args.config else args.system); @@ -159,9 +163,101 @@ rec { ({ linux-kernel = args.linux-kernel or {}; gcc = args.gcc or {}; - rustc = args.rustc or {}; } // platforms.select final) - linux-kernel gcc rustc; + linux-kernel gcc; + + # TODO: remove after 23.05 is EOL, with an error pointing to the rust.* attrs. + rustc = args.rustc or {}; + + rust = rust // { + # Once args.rustc.platform.target-family is deprecated and + # removed, there will no longer be any need to modify any + # values from args.rust.platform, so we can drop all the + # "args ? rust" etc. checks, and merge args.rust.platform in + # /after/. + platform = rust.platform or {} // { + # https://doc.rust-lang.org/reference/conditional-compilation.html#target_arch + arch = + /**/ if rust ? platform then rust.platform.arch + else if final.isAarch32 then "arm" + else if final.isMips64 then "mips64" # never add "el" suffix + else if final.isPower64 then "powerpc64" # never add "le" suffix + else final.parsed.cpu.name; + + # https://doc.rust-lang.org/reference/conditional-compilation.html#target_os + os = + /**/ if rust ? platform then rust.platform.os or "none" + else if final.isDarwin then "macos" + else final.parsed.kernel.name; + + # https://doc.rust-lang.org/reference/conditional-compilation.html#target_family + target-family = + /**/ if args ? rust.platform.target-family then args.rust.platform.target-family + else if args ? rustc.platform.target-family + then + ( + # Since https://github.com/rust-lang/rust/pull/84072 + # `target-family` is a list instead of single value. + let + f = args.rustc.platform.target-family; + in + if builtins.isList f then f else [ f ] + ) + else lib.optional final.isUnix "unix" + ++ lib.optional final.isWindows "windows"; + + # https://doc.rust-lang.org/reference/conditional-compilation.html#target_vendor + vendor = let + inherit (final.parsed) vendor; + in rust.platform.vendor or { + "w64" = "pc"; + }.${vendor.name} or vendor.name; + }; + + # The name of the rust target, even if it is custom. Adjustments are + # because rust has slightly different naming conventions than we do. + rustcTarget = let + inherit (final.parsed) cpu kernel abi; + cpu_ = rust.platform.arch or { + "armv7a" = "armv7"; + "armv7l" = "armv7"; + "armv6l" = "arm"; + "armv5tel" = "armv5te"; + "riscv64" = "riscv64gc"; + }.${cpu.name} or cpu.name; + vendor_ = final.rust.platform.vendor; + in rust.config + or "${cpu_}-${vendor_}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; + + # The name of the rust target if it is standard, or the json file + # containing the custom target spec. + rustcTargetSpec = + /**/ if rust ? platform + then builtins.toFile (final.rust.rustcTarget + ".json") (builtins.toJSON rust.platform) + else final.rust.rustcTarget; + + # The name of the rust target if it is standard, or the + # basename of the file containing the custom target spec, + # without the .json extension. + # + # This is the name used by Cargo for target subdirectories. + cargoShortTarget = + lib.removeSuffix ".json" (baseNameOf "${final.rust.rustcTargetSpec}"); + + # When used as part of an environment variable name, triples are + # uppercased and have all hyphens replaced by underscores: + # + # https://github.com/rust-lang/cargo/pull/9169 + # https://github.com/rust-lang/cargo/issues/8285#issuecomment-634202431 + cargoEnvVarTarget = + lib.strings.replaceStrings ["-"] ["_"] + (lib.strings.toUpper final.rust.cargoShortTarget); + + # True if the target is no_std + # https://github.com/rust-lang/rust/blob/2e44c17c12cec45b6a682b1e53a04ac5b5fcc9d2/src/bootstrap/config.rs#L415-L421 + isNoStdTarget = + builtins.any (t: lib.hasInfix t final.rust.rustcTarget) ["-none" "nvptx" "switch" "-uefi"]; + }; linuxArch = if final.isAarch32 then "arm" diff --git a/lib/tests/release.nix b/lib/tests/release.nix index c8d6b810122ec..6e5b071173673 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -25,11 +25,13 @@ let ]; nativeBuildInputs = [ nix + pkgs.gitMinimal ] ++ lib.optional pkgs.stdenv.isLinux pkgs.inotify-tools; strictDeps = true; } '' datadir="${nix}/share" export TEST_ROOT=$(pwd)/test-tmp + export HOME=$(mktemp -d) export NIX_BUILD_HOOK= export NIX_CONF_DIR=$TEST_ROOT/etc export NIX_LOCALSTATE_DIR=$TEST_ROOT/var diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 911f71a2cf05e..da13f66838cea 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -371,6 +371,15 @@ githubId = 124545; name = "Anthony Cowley"; }; + acuteenvy = { + matrix = "@acuteenvy:matrix.org"; + github = "acuteenvy"; + githubId = 126529524; + name = "Lena"; + keys = [{ + fingerprint = "CE85 54F7 B9BC AC0D D648 5661 AB5F C04C 3C94 443F"; + }]; + }; adamcstephens = { email = "happy.plan4249@valkor.net"; matrix = "@adam:valkor.net"; @@ -2536,6 +2545,12 @@ githubId = 4621; name = "Brad Ediger"; }; + brahyerr = { + name = "Bryant Pham"; + email = "bp@1829847@gmail.com"; + github = "brahyerr"; + githubId = 120991075; + }; brainrape = { email = "martonboros@gmail.com"; github = "brainrake"; @@ -5988,13 +6003,6 @@ githubId = 92793; name = "Friedrich von Never"; }; - fortuneteller2k = { - email = "lythe1107@gmail.com"; - matrix = "@fortuneteller2k:matrix.org"; - github = "fortuneteller2k"; - githubId = 20619776; - name = "fortuneteller2k"; - }; fpletz = { email = "fpletz@fnordicwalking.de"; github = "fpletz"; @@ -6103,6 +6111,10 @@ github = "frogamic"; githubId = 10263813; name = "Dominic Shelton"; + matrix = "@frogamic:beeper.com"; + keys = [{ + fingerprint = "779A 7CA8 D51C C53A 9C51 43F7 AAE0 70F0 67EC 00A5"; + }]; }; frontsideair = { email = "photonia@gmail.com"; @@ -8295,6 +8307,15 @@ githubId = 18501; name = "Julien Langlois"; }; + jfly = { + name = "Jeremy Fleischman"; + email = "jeremyfleischman@gmail.com"; + github = "jfly"; + githubId = 277474; + keys = [{ + fingerprint = "F1F1 3395 8E8E 9CC4 D9FC 9647 1931 9CD8 416A 642B"; + }]; + }; jfrankenau = { email = "johannes@frankenau.net"; github = "jfrankenau"; @@ -11209,6 +11230,12 @@ githubId = 11810057; name = "Matt Snider"; }; + matusf = { + email = "matus.ferech@gmail.com"; + github = "matusf"; + githubId = 18228995; + name = "Matúš Ferech"; + }; maurer = { email = "matthew.r.maurer+nix@gmail.com"; github = "maurer"; @@ -12061,6 +12088,13 @@ github = "ribosomerocker"; githubId = 46468162; }; + moni = { + email = "lythe1107@gmail.com"; + matrix = "@fortuneteller2k:matrix.org"; + github = "moni"; + githubId = 20619776; + name = "moni"; + }; monsieurp = { email = "monsieurp@gentoo.org"; github = "monsieurp"; @@ -12466,6 +12500,11 @@ fingerprint = "9E6A 25F2 C1F2 9D76 ED00 1932 1261 173A 01E1 0298"; }]; }; + nadir-ishiguro = { + github = "nadir-ishiguro"; + githubId = 23151917; + name = "nadir-ishiguro"; + }; nadrieril = { email = "nadrieril@gmail.com"; github = "Nadrieril"; @@ -12719,6 +12758,12 @@ githubId = 13920346; name = "Sébastien Iooss"; }; + netthier = { + email = "netthier@proton.me"; + name = "nett_hier"; + github = "netthier"; + githubId = 66856670; + }; networkexception = { name = "networkException"; email = "nix@nwex.de"; @@ -19552,6 +19597,12 @@ github = "yanganto"; githubId = 10803111; }; + yannip = { + email = "yPapandreou7@gmail.com"; + github = "YanniPapandreou"; + githubId = 15948162; + name = "Yanni Papandreou"; + }; yarny = { github = "Yarny0"; githubId = 41838844; @@ -19596,6 +19647,13 @@ fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4"; }]; }; + YellowOnion = { + name = "Daniel Hill"; + email = "daniel@gluo.nz"; + github = "YellowOnion"; + githubId = 364160; + matrix = "@woobilicious:matrix.org"; + }; yesbox = { email = "jesper.geertsen.jonsson@gmail.com"; github = "yesbox"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index a3dac082ddb72..78cfca24d96b1 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -1,9 +1,9 @@ name,src,ref,server,version,luaversion,maintainers alt-getopt,,,,,,arobyn bit32,,,,5.3.0-1,5.1,lblasc -argparse,https://github.com/luarocks/argparse.git,,,,, -basexx,https://github.com/teto/basexx.git,,,,, -binaryheap,https://github.com/Tieske/binaryheap.lua,,,,,vcunat +argparse,,,,,, +basexx,,,,,, +binaryheap,,,,,,vcunat busted,,,,,, cassowary,,,,,,marsam alerque cldr,,,,,,alerque @@ -12,8 +12,7 @@ cosmo,,,,,,marsam coxpcall,,,,1.17.0-1,, cqueues,,,,,,vcunat cyan,,,,,, -cyrussasl,https://github.com/JorjBauer/lua-cyrussasl.git,,,,, -digestif,https://github.com/astoff/digestif.git,,,0.2-1,5.3, +digestif,https://github.com/astoff/digestif.git,,,,5.3, dkjson,,,,,, fennel,,,,,,misterio77 fifo,,,,,, @@ -24,7 +23,7 @@ http,,,,0.3-0,,vcunat inspect,,,,,, jsregexp,,,,,, ldbus,,,http://luarocks.org/dev,,, -ldoc,https://github.com/stevedonovan/LDoc.git,,,,, +ldoc,,,,,, lgi,,,,,, linenoise,https://github.com/hoelzro/lua-linenoise.git,,,,, ljsyscall,,,,,5.1,lblasc @@ -40,7 +39,7 @@ lrexlib-posix,,,,,, lua-cjson,,,,,, lua-cmsgpack,,,,,, lua-curl,,,,,, -lua-iconv,,,,,, +lua-ffi-zlib,,,,,, lua-lsp,,,,,, lua-messagepack,,,,,, lua-protobuf,,,,,,lockejan @@ -83,30 +82,30 @@ luaunit,,,,,,lockejan luautf8,,,,,,pstn luazip,,,,,, lua-yajl,,,,,,pstn +lua-iconv,,,,7.0.0,, luuid,,,,,, luv,,,,1.44.2-1,, lush.nvim,https://github.com/rktjmp/lush.nvim,,,,,teto lyaml,,,,,,lblasc -magick,,,,,,donovanglover +magick,,,,,5.1,donovanglover markdown,,,,,, mediator_lua,,,,,, middleclass,,,,,, mpack,,,,,, moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn -nui-nvim,,,,,,mrcjkb +nui.nvim,,,,,,mrcjkb nvim-client,https://github.com/neovim/lua-client.git,,,,, nvim-cmp,https://github.com/hrsh7th/nvim-cmp,,,,, penlight,https://github.com/lunarmodules/Penlight.git,,,,,alerque plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,5.1, rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,, rest.nvim,,,,,5.1,teto -readline,,,,,, rustaceanvim,,,,,,mrcjkb say,https://github.com/Olivine-Labs/say.git,,,,, serpent,,,,,,lockejan sqlite,,,,,, std._debug,https://github.com/lua-stdlib/_debug.git,,,,, -std.normalize,https://github.com/lua-stdlib/normalize.git,,,,, +std.normalize,,,,,, stdlib,,,,41.2.2,,vyp teal-language-server,,,http://luarocks.org/dev,,, telescope.nvim,,,,,5.1, diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index 44a445875d918..cc0f4ef742d11 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -26,7 +26,7 @@ import urllib.parse import urllib.request import xml.etree.ElementTree as ET from dataclasses import asdict, dataclass -from datetime import datetime +from datetime import UTC, datetime from functools import wraps from multiprocessing.dummy import Pool from pathlib import Path @@ -788,14 +788,12 @@ def update_plugins(editor: Editor, args): autocommit = not args.no_commit if autocommit: - from datetime import date - try: repo = git.Repo(os.getcwd()) - updated = date.today().strftime('%m-%d-%Y') + updated = datetime.now(tz=UTC).strftime('%Y-%m-%d') print(args.outfile) commit(repo, - f"{editor.attr_path}: updated the {updated}", [args.outfile] + f"{editor.attr_path}: update on {updated}", [args.outfile] ) except git.InvalidGitRepositoryError as e: print(f"Not in a git repository: {e}", file=sys.stderr) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 3ad43f2a34e42..db66b8fe86893 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -398,6 +398,7 @@ with lib.maintainers; { cdepillabout expipiplus1 maralorn + ncfavier sternenseemann ]; githubTeams = [ @@ -916,7 +917,6 @@ with lib.maintainers; { tts = { members = [ - hexa mic92 ]; scope = "coqui-ai TTS (formerly Mozilla TTS) and leaf packages"; diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 0b54b8b32a35b..21c798b3b4a46 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -660,5 +660,5 @@ If reloading the module is not an option, proceed to [Nuclear option](#sec-relea #### Nuclear option {#sec-release-23.05-migration-pipewire-nuclear} If all else fails, you can still manually copy the contents of the default configuration file -from `${pkgs.pipewire.lib}/share/pipewire` to `/etc/pipewire` and edit it to fully override the default. +from `${pkgs.pipewire}/share/pipewire` to `/etc/pipewire` and edit it to fully override the default. However, this should be done only as a last resort. Please talk to the Pipewire maintainers if you ever need to do this. diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 08fd671e2a71a..e5e4e713ae276 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -104,6 +104,8 @@ - [eris-server](https://codeberg.org/eris/eris-go). [ERIS](https://eris.codeberg.page/) is an encoding for immutable storage and this server provides block exchange as well as content decoding over HTTP and through a FUSE file-system. Available as [services.eris-server](#opt-services.eris-server.enable). +- [forgejo](https://forgejo.org/), a git forge. Previously deployed as a drop-in replacement package in the [gitea module](#opt-services.gitea.package). Available as [services.forgejo](#opt-services.forgejo.enable). See migration instructions in the [NixOS manual](#module-forgejo) on how to migrate your forgejo instance using [`services.gitea.package = pkgs.forgejo`](#opt-services.gitea.package) to [`services.forgejo`](#opt-services.forgejo.enable). + - hardware/infiniband.nix adds infiniband subnet manager support using an [opensm](https://github.com/linux-rdma/opensm) systemd-template service, instantiated on card guids. The module also adds kernel modules and cli tooling to help administrators debug and measure performance. Available as [hardware.infiniband.enable](#opt-hardware.infiniband.enable). - [zwave-js](https://github.com/zwave-js/zwave-js-server), a small server wrapper around Z-Wave JS to access it via a WebSocket. Available as [services.zwave-js](#opt-services.zwave-js.enable). @@ -143,6 +145,9 @@ ## Backward Incompatibilities {#sec-release-23.11-incompatibilities} +- `services.postgresql.ensurePermissions` has been deprecated in favor of `services.postgresql.ensureUsers.*.ensureDBOwnership` which simplifies the setup of database owned by a certain system user + in local database contexts (which make use of peer authentication via UNIX sockets), migration guidelines were provided in the NixOS manual, please refer to them if you are affected by a PostgreSQL 15 changing the way `GRANT ALL PRIVILEGES` is working. `services.postgresql.ensurePermissions` will be removed in 24.05. All NixOS modules were migrated using one of the strategy, e.g. `ensureDBOwnership` or `postStart`. More about this situation can be learnt in https://github.com/NixOS/nixpkgs/pull/266270. + - `network-online.target` has been fixed to no longer time out for systems with `networking.useDHCP = true` and `networking.useNetworkd = true`. Workarounds for this can be removed. @@ -270,6 +275,18 @@ - `fileSystems.<name>.autoResize` now uses `systemd-growfs` to resize the file system online in stage 2. This means that `f2fs` and `ext2` can no longer be auto resized, while `xfs` and `btrfs` now can be. +- `fuse3` has been updated from 3.11.0 to 3.16.2; see [ChangeLog.rst](https://github.com/libfuse/libfuse/blob/fuse-3.16.2/ChangeLog.rst#libfuse-3162-2023-10-10) for an overview of the changes. + + Unsupported mount options are no longer silently accepted [(since 3.15.0)](https://github.com/libfuse/libfuse/blob/fuse-3.16.2/ChangeLog.rst#libfuse-3150-2023-06-09). The [affected mount options](https://github.com/libfuse/libfuse/commit/dba6b3983af34f30de01cf532dff0b66f0ed6045) are: `atime`, `diratime`, `lazytime`, `nolazytime`, `relatime`, `norelatime`, `strictatime`. + + For example, + + ```bash + $ sshfs 127.0.0.1:/home/test/testdir /home/test/sshfs_mnt -o atime` + ``` + + would previously terminate successfully with the mount point established, now it outputs the error message ``fuse: unknown option(s): `-o atime'`` and terminates with exit status 1. + - `nixos-rebuild {switch,boot,test,dry-activate}` now runs the system activation inside `systemd-run`, creating an ephemeral systemd service and protecting the system switch against issues like network disconnections during remote (e.g. SSH) sessions. This has the side effect of running the switch in an isolated environment, that could possible break post-switch scripts that depends on things like environment variables being set. If you want to opt-out from this behavior for now, you may set the `NIXOS_SWITCH_USE_DIRTY_ENV` environment variable before running `nixos-rebuild`. However, keep in mind that this option will be removed in the future. - The `services.vaultwarden.config` option default value was changed to make Vaultwarden only listen on localhost, following the [secure defaults for most NixOS services](https://github.com/NixOS/nixpkgs/issues/100192). @@ -306,7 +323,7 @@ - The default `kops` version is now 1.28.0 and support for 1.25 and older has been dropped. -- `pharo` has been updated to latest stable (PharoVM 10.0.5), which is compatible with the latest stable and oldstable images (Pharo 10 and 11). The VM in question is the 64bit Spur. The 32bit version has been dropped due to lack of maintenance. The Cog VM has been deleted because it is severily outdated. Finally, the `pharo-launcher` package has been deleted because it was not compatible with the newer VM, and due to lack of maintenance. +- `pharo` has been updated to latest stable (PharoVM 10.0.8), which is compatible with the latest stable and oldstable images (Pharo 10 and 11). The VM in question is the 64bit Spur. The 32bit version has been dropped due to lack of maintenance. The Cog VM has been deleted because it is severily outdated. Finally, the `pharo-launcher` package has been deleted because it was not compatible with the newer VM, and due to lack of maintenance. - Emacs mainline version 29 was introduced. This new version includes many major additions, most notably `tree-sitter` support (enabled by default) and the pgtk variant (useful for Wayland users), which is available under the attribute `emacs29-pgtk`. diff --git a/nixos/modules/config/stevenblack.nix b/nixos/modules/config/stevenblack.nix index 30ef7ff259f09..7e6235169847a 100644 --- a/nixos/modules/config/stevenblack.nix +++ b/nixos/modules/config/stevenblack.nix @@ -30,5 +30,5 @@ in ++ optionals (activatedHosts == [ ]) [ "${pkgs.stevenblack-blocklist}/hosts" ]; }; - meta.maintainers = [ maintainers.fortuneteller2k maintainers.artturin ]; + meta.maintainers = [ maintainers.moni maintainers.artturin ]; } diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 71737cd8ebc41..2f9edba4f0c9c 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -257,6 +257,7 @@ foreach my $path (glob "/sys/class/{block,mmc_host}/*") { # Add bcache module, if needed. my @bcacheDevices = glob("/dev/bcache*"); +@bcacheDevices = grep(!qr#dev/bcachefs.*#, @bcacheDevices); if (scalar @bcacheDevices > 0) { push @initrdAvailableKernelModules, "bcache"; } @@ -467,6 +468,19 @@ EOF # boot.tmp.useTmpfs option in configuration.nix (managed declaratively). next if ($mountPoint eq "/tmp" && $fsType eq "tmpfs"); + # This should work for single and multi-device systems. + # still needs subvolume support + if ($fsType eq "bcachefs") { + my ($status, @info) = runCommand("bcachefs fs usage $rootDir$mountPoint"); + my $UUID = $info[0]; + + if ($status == 0 && $UUID =~ /^Filesystem:[ \t\n]*([0-9a-z-]+)/) { + $stableDevPath = "UUID=$1"; + } else { + print STDERR "warning: can't find bcachefs mount UUID falling back to device-path"; + } + } + # Emit the filesystem. $fileSystems .= <<EOF; fileSystems.\"$mountPoint\" = diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md index d65d9616e2f2d..e5e0b7efec29a 100644 --- a/nixos/modules/services/databases/postgresql.md +++ b/nixos/modules/services/databases/postgresql.md @@ -39,6 +39,125 @@ By default, PostgreSQL stores its databases in {file}`/var/lib/postgresql/$psqlS services.postgresql.dataDir = "/data/postgresql"; ``` +## Initializing {#module-services-postgres-initializing} + +As of NixOS 23.11, +`services.postgresql.ensureUsers.*.ensurePermissions` has been +deprecated, after a change to default permissions in PostgreSQL 15 +invalidated most of its previous use cases: + +- In psql < 15, `ALL PRIVILEGES` used to include `CREATE TABLE`, where + in psql >= 15 that would be a separate permission +- psql >= 15 instead gives only the database owner create permissions +- Even on psql < 15 (or databases migrated to >= 15), it is + recommended to manually assign permissions along these lines + - https://www.postgresql.org/docs/release/15.0/ + - https://www.postgresql.org/docs/15/ddl-schemas.html#DDL-SCHEMAS-PRIV + +### Assigning ownership {#module-services-postgres-initializing-ownership} + +Usually, the database owner should be a database user of the same +name. This can be done with +`services.postgresql.ensureUsers.*.ensureDBOwnership = true;`. + +If the database user name equals the connecting system user name, +postgres by default will accept a passwordless connection via unix +domain socket. This makes it possible to run many postgres-backed +services without creating any database secrets at all + +### Assigning extra permissions {#module-services-postgres-initializing-extra-permissions} + +For many cases, it will be enough to have the database user be the +owner. Until `services.postgresql.ensureUsers.*.ensurePermissions` has +been re-thought, if more users need access to the database, please use +one of the following approaches: + +**WARNING:** `services.postgresql.initialScript` is not recommended +for `ensurePermissions` replacement, as that is *only run on first +start of PostgreSQL*. + +**NOTE:** all of these methods may be obsoleted, when `ensure*` is +reworked, but it is expected that they will stay viable for running +database migrations. + +**NOTE:** please make sure that any added migrations are idempotent (re-runnable). + +#### as superuser {#module-services-postgres-initializing-extra-permissions-superuser} + +**Advantage:** compatible with postgres < 15, because it's run +as the database superuser `postgres`. + +##### in database `postStart` {#module-services-postgres-initializing-extra-permissions-superuser-post-start} + +**Disadvantage:** need to take care of ordering yourself. In this +example, `mkAfter` ensures that permissions are assigned after any +databases from `ensureDatabases` and `extraUser1` from `ensureUsers` +are already created. + +```nix + systemd.services.postgresql.postStart = lib.mkAfter '' + $PSQL service1 -c 'GRANT SELECT ON ALL TABLES IN SCHEMA public TO "extraUser1"' + $PSQL service1 -c 'GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO "extraUser1"' + # .... + ''; +``` + +##### in intermediate oneshot service {#module-services-postgres-initializing-extra-permissions-superuser-oneshot} + +```nix + systemd.services."migrate-service1-db1" = { + serviceConfig.Type = "oneshot"; + requiredBy = "service1.service"; + before = "service1.service"; + after = "postgresql.service"; + serviceConfig.User = "postgres"; + environment.PSQL = "psql --port=${toString services.postgresql.port}"; + path = [ postgresql ]; + script = '' + $PSQL service1 -c 'GRANT SELECT ON ALL TABLES IN SCHEMA public TO "extraUser1"' + $PSQL service1 -c 'GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO "extraUser1"' + # .... + ''; + }; +``` + +#### as service user {#module-services-postgres-initializing-extra-permissions-service-user} + +**Advantage:** re-uses systemd's dependency ordering; + +**Disadvantage:** relies on service user having grant permission. To be combined with `ensureDBOwnership`. + +##### in service `preStart` {#module-services-postgres-initializing-extra-permissions-service-user-pre-start} + +```nix + environment.PSQL = "psql --port=${toString services.postgresql.port}"; + path = [ postgresql ]; + systemd.services."service1".preStart = '' + $PSQL -c 'GRANT SELECT ON ALL TABLES IN SCHEMA public TO "extraUser1"' + $PSQL -c 'GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO "extraUser1"' + # .... + ''; +``` + +##### in intermediate oneshot service {#module-services-postgres-initializing-extra-permissions-service-user-oneshot} + +```nix + systemd.services."migrate-service1-db1" = { + serviceConfig.Type = "oneshot"; + requiredBy = "service1.service"; + before = "service1.service"; + after = "postgresql.service"; + serviceConfig.User = "service1"; + environment.PSQL = "psql --port=${toString services.postgresql.port}"; + path = [ postgresql ]; + script = '' + $PSQL -c 'GRANT SELECT ON ALL TABLES IN SCHEMA public TO "extraUser1"' + $PSQL -c 'GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO "extraUser1"' + # .... + ''; + }; +``` + ## Upgrading {#module-services-postgres-upgrading} ::: {.note} diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index af4db5c9611f6..a9067d5974a95 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -168,7 +168,12 @@ in ensurePermissions = mkOption { type = types.attrsOf types.str; default = {}; + visible = false; # This option has been deprecated. description = lib.mdDoc '' + This option is DEPRECATED and should not be used in nixpkgs anymore, + use `ensureDBOwnership` instead. It can also break with newer + versions of PostgreSQL (≥ 15). + Permissions to ensure for the user, specified as an attribute set. The attribute names specify the database and tables to grant the permissions for. The attribute values specify the permissions to grant. You may specify one or @@ -187,6 +192,16 @@ in ''; }; + ensureDBOwnership = mkOption { + type = types.bool; + default = false; + description = mdDoc '' + Grants the user ownership to a database with the same name. + This database must be defined manually in + [](#opt-services.postgresql.ensureDatabases). + ''; + }; + ensureClauses = mkOption { description = lib.mdDoc '' An attrset of clauses to grant to the user. Under the hood this uses the @@ -338,26 +353,21 @@ in }); default = []; description = lib.mdDoc '' - Ensures that the specified users exist and have at least the ensured permissions. + Ensures that the specified users exist. The PostgreSQL users will be identified using peer authentication. This authenticates the Unix user with the same name only, and that without the need for a password. - This option will never delete existing users or remove permissions, especially not when the value of this - option is changed. This means that users created and permissions assigned once through this option or - otherwise have to be removed manually. + This option will never delete existing users or remove DB ownership of databases + once granted with `ensureDBOwnership = true;`. This means that this must be + cleaned up manually when changing after changing the config in here. ''; example = literalExpression '' [ { name = "nextcloud"; - ensurePermissions = { - "DATABASE nextcloud" = "ALL PRIVILEGES"; - }; } { name = "superuser"; - ensurePermissions = { - "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES"; - }; + ensureDBOwnership = true; } ] ''; @@ -445,6 +455,27 @@ in config = mkIf cfg.enable { + assertions = map ({ name, ensureDBOwnership, ... }: { + assertion = ensureDBOwnership -> builtins.elem name cfg.ensureDatabases; + message = '' + For each database user defined with `services.postgresql.ensureUsers` and + `ensureDBOwnership = true;`, a database with the same name must be defined + in `services.postgresql.ensureDatabases`. + + Offender: ${name} has not been found among databases. + ''; + }) cfg.ensureUsers; + # `ensurePermissions` is now deprecated, let's avoid it. + warnings = lib.optional (any ({ ensurePermissions, ... }: ensurePermissions != {}) cfg.ensureUsers) " + `services.postgresql.*.ensurePermissions` is used in your expressions, + this option is known to be broken with newer PostgreSQL versions, + consider migrating to `services.postgresql.*.ensureDBOwnership` or + consult the release notes or manual for more migration guidelines. + + This option will be removed in NixOS 24.05 unless it sees significant + maintenance improvements. + "; + services.postgresql.settings = { hba_file = "${pkgs.writeText "pg_hba.conf" cfg.authentication}"; @@ -556,12 +587,15 @@ in ${ concatMapStrings (user: - let + let userPermissions = concatStringsSep "\n" (mapAttrsToList (database: permission: ''$PSQL -tAc 'GRANT ${permission} ON ${database} TO "${user.name}"' '') user.ensurePermissions ); + dbOwnershipStmt = optionalString + user.ensureDBOwnership + ''$PSQL -tAc 'ALTER DATABASE "${user.name}" OWNER TO "${user.name}";' ''; filteredClauses = filterAttrs (name: value: value != null) user.ensureClauses; @@ -572,6 +606,8 @@ in $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc 'CREATE USER "${user.name}"' ${userPermissions} ${userClauses} + + ${dbOwnershipStmt} '' ) cfg.ensureUsers diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index ae695baf42c60..07ca2727cf48e 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -115,8 +115,7 @@ in { environment.systemPackages = [ cfg.package ] ++ lib.optional cfg.jack.enable jack-libs; - systemd.packages = [ cfg.package ] - ++ lib.optional cfg.pulse.enable cfg.package.pulse; + systemd.packages = [ cfg.package ]; # PipeWire depends on DBUS but doesn't list it. Without this booting # into a terminal results in the service crashing with an error. @@ -130,9 +129,13 @@ in { systemd.user.sockets.pipewire.enable = !cfg.systemWide; systemd.user.services.pipewire.enable = !cfg.systemWide; + # Mask pw-pulse if it's not wanted + systemd.user.services.pipewire-pulse.enable = cfg.pulse.enable; + systemd.user.sockets.pipewire-pulse.enable = cfg.pulse.enable; + systemd.sockets.pipewire.wantedBy = lib.mkIf cfg.socketActivation [ "sockets.target" ]; systemd.user.sockets.pipewire.wantedBy = lib.mkIf cfg.socketActivation [ "sockets.target" ]; - systemd.user.sockets.pipewire-pulse.wantedBy = lib.mkIf (cfg.socketActivation && cfg.pulse.enable) ["sockets.target"]; + systemd.user.sockets.pipewire-pulse.wantedBy = lib.mkIf cfg.socketActivation [ "sockets.target" ]; services.udev.packages = [ cfg.package ]; @@ -140,14 +143,14 @@ in { environment.etc."alsa/conf.d/49-pipewire-modules.conf" = mkIf cfg.alsa.enable { text = '' pcm_type.pipewire { - libs.native = ${cfg.package.lib}/lib/alsa-lib/libasound_module_pcm_pipewire.so ; + libs.native = ${cfg.package}/lib/alsa-lib/libasound_module_pcm_pipewire.so ; ${optionalString enable32BitAlsaPlugins - "libs.32Bit = ${pkgs.pkgsi686Linux.pipewire.lib}/lib/alsa-lib/libasound_module_pcm_pipewire.so ;"} + "libs.32Bit = ${pkgs.pkgsi686Linux.pipewire}/lib/alsa-lib/libasound_module_pcm_pipewire.so ;"} } ctl_type.pipewire { - libs.native = ${cfg.package.lib}/lib/alsa-lib/libasound_module_ctl_pipewire.so ; + libs.native = ${cfg.package}/lib/alsa-lib/libasound_module_ctl_pipewire.so ; ${optionalString enable32BitAlsaPlugins - "libs.32Bit = ${pkgs.pkgsi686Linux.pipewire.lib}/lib/alsa-lib/libasound_module_ctl_pipewire.so ;"} + "libs.32Bit = ${pkgs.pkgsi686Linux.pipewire}/lib/alsa-lib/libasound_module_ctl_pipewire.so ;"} } ''; }; diff --git a/nixos/modules/services/development/zammad.nix b/nixos/modules/services/development/zammad.nix index 7dd143eebf12f..d24ed24ef3956 100644 --- a/nixos/modules/services/development/zammad.nix +++ b/nixos/modules/services/development/zammad.nix @@ -204,7 +204,7 @@ in assertions = [ { - assertion = cfg.database.createLocally -> cfg.database.user == "zammad"; + assertion = cfg.database.createLocally -> cfg.database.user == "zammad" && cfg.database.name == "zammad"; message = "services.zammad.database.user must be set to \"zammad\" if services.zammad.database.createLocally is set to true"; } { @@ -231,7 +231,7 @@ in ensureUsers = [ { name = cfg.database.user; - ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/finance/odoo.nix b/nixos/modules/services/finance/odoo.nix index eec7c4e30cc48..b8574ed09af9c 100644 --- a/nixos/modules/services/finance/odoo.nix +++ b/nixos/modules/services/finance/odoo.nix @@ -121,7 +121,7 @@ in ensureDatabases = [ "odoo" ]; ensureUsers = [{ name = "odoo"; - ensurePermissions = { "DATABASE odoo" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; }]; }; }); diff --git a/nixos/modules/services/mail/listmonk.nix b/nixos/modules/services/mail/listmonk.nix index 11b2a5186229b..cea1bc9560815 100644 --- a/nixos/modules/services/mail/listmonk.nix +++ b/nixos/modules/services/mail/listmonk.nix @@ -168,7 +168,7 @@ in { ensureUsers = [{ name = "listmonk"; - ensurePermissions = { "DATABASE listmonk" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; }]; ensureDatabases = [ "listmonk" ]; diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index 22a4e3c451ab1..4e29f567ed92c 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -179,14 +179,22 @@ in }; }; + assertions = [ + { + assertion = localDB -> cfg.database.username == cfg.database.dbname; + message = '' + When setting up a DB and its owner user, the owner and the DB name must be + equal! + ''; + } + ]; + services.postgresql = mkIf localDB { enable = true; ensureDatabases = [ cfg.database.dbname ]; ensureUsers = [ { name = cfg.database.username; - ensurePermissions = { - "DATABASE ${cfg.database.username}" = "ALL PRIVILEGES"; - }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/mail/sympa.nix b/nixos/modules/services/mail/sympa.nix index 7a5047b2bea54..04ae46f66eeaf 100644 --- a/nixos/modules/services/mail/sympa.nix +++ b/nixos/modules/services/mail/sympa.nix @@ -218,7 +218,7 @@ in default = null; example = "/run/keys/sympa-dbpassword"; description = lib.mdDoc '' - A file containing the password for {option}`services.sympa.database.user`. + A file containing the password for {option}`services.sympa.database.name`. ''; }; @@ -342,6 +342,7 @@ in db_type = cfg.database.type; db_name = cfg.database.name; + db_user = cfg.database.name; } // (optionalAttrs (cfg.database.host != null) { db_host = cfg.database.host; @@ -355,9 +356,6 @@ in // (optionalAttrs (cfg.database.port != null) { db_port = cfg.database.port; }) - // (optionalAttrs (cfg.database.user != null) { - db_user = cfg.database.user; - }) // (optionalAttrs (cfg.mta.type == "postfix") { sendmail_aliases = "${dataDir}/sympa_transport"; aliases_program = "${pkgs.postfix}/bin/postmap"; @@ -393,7 +391,7 @@ in users.groups.${group} = {}; assertions = [ - { assertion = cfg.database.createLocally -> cfg.database.user == user; + { assertion = cfg.database.createLocally -> cfg.database.user == user && cfg.database.name == cfg.database.user; message = "services.sympa.database.user must be set to ${user} if services.sympa.database.createLocally is set to true"; } { assertion = cfg.database.createLocally -> cfg.database.passwordFile == null; @@ -579,7 +577,7 @@ in ensureDatabases = [ cfg.database.name ]; ensureUsers = [ { name = cfg.database.user; - ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/matrix/matrix-sliding-sync.nix b/nixos/modules/services/matrix/matrix-sliding-sync.nix index 9807cde409197..84bb38f35aeb0 100644 --- a/nixos/modules/services/matrix/matrix-sliding-sync.nix +++ b/nixos/modules/services/matrix/matrix-sliding-sync.nix @@ -74,9 +74,9 @@ in services.postgresql = lib.optionalAttrs cfg.createDatabase { enable = true; ensureDatabases = [ "matrix-sliding-sync" ]; - ensureUsers = [ rec { + ensureUsers = [ { name = "matrix-sliding-sync"; - ensurePermissions."DATABASE \"${name}\"" = "ALL PRIVILEGES"; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/matrix/mautrix-facebook.nix b/nixos/modules/services/matrix/mautrix-facebook.nix index 671040500df84..d7cf024bb8077 100644 --- a/nixos/modules/services/matrix/mautrix-facebook.nix +++ b/nixos/modules/services/matrix/mautrix-facebook.nix @@ -135,9 +135,7 @@ in { ensureDatabases = ["mautrix-facebook"]; ensureUsers = [{ name = "mautrix-facebook"; - ensurePermissions = { - "DATABASE \"mautrix-facebook\"" = "ALL PRIVILEGES"; - }; + ensureDBOwnership = true; }]; }; diff --git a/nixos/modules/services/misc/atuin.nix b/nixos/modules/services/misc/atuin.nix index 8d2c1b5242ffa..2d6ffc510ce55 100644 --- a/nixos/modules/services/misc/atuin.nix +++ b/nixos/modules/services/misc/atuin.nix @@ -73,9 +73,7 @@ in enable = true; ensureUsers = [{ name = "atuin"; - ensurePermissions = { - "DATABASE atuin" = "ALL PRIVILEGES"; - }; + ensureDBOwnership = true; }]; ensureDatabases = [ "atuin" ]; }; diff --git a/nixos/modules/services/misc/forgejo.md b/nixos/modules/services/misc/forgejo.md new file mode 100644 index 0000000000000..6a34073820856 --- /dev/null +++ b/nixos/modules/services/misc/forgejo.md @@ -0,0 +1,79 @@ +# Forgejo {#module-forgejo} + +Forgejo is a soft-fork of gitea, with strong community focus, as well +as on self-hosting and federation. [Codeberg](https://codeberg.org) is +deployed from it. + +See [upstream docs](https://forgejo.org/docs/latest/). + +The method of choice for running forgejo is using [`services.forgejo`](#opt-services.forgejo.enable). + +::: {.warning} +Running forgejo using `services.gitea.package = pkgs.forgejo` is no longer +recommended. +If you experience issues with your instance using `services.gitea`, +**DO NOT** report them to the `services.gitea` module maintainers. +**DO** report them to the `services.forgejo` module maintainers instead. +::: + +## Migration from Gitea {#module-forgejo-migration-gitea} + +::: {.note} +Migrating is, while not strictly necessary at this point, highly recommended. +Both modules and projects are likely to divide further with each release. +Which might lead to an even more involved migration. +::: + +### Full-Migration {#module-forgejo-migration-gitea-default} + +This will migrate the state directory (data), rename and chown the database and +delete the gitea user. + +::: {.note} +This will also change the git remote ssh-url user from `gitea@` to `forgejo@`, +when using the host's openssh server (default) instead of the integrated one. +::: + +Instructions for PostgreSQL (default). Adapt accordingly for other databases: + +```sh +systemctl stop gitea +mv /var/lib/gitea /var/lib/forgejo +runuser -u postgres -- psql -c ' + ALTER USER gitea RENAME TO forgejo; + ALTER DATABASE gitea RENAME TO forgejo; +' +nixos-rebuild switch +systemctl stop forgejo +chown -R forgejo:forgejo /var/lib/forgejo +systemctl restart forgejo +``` + +### Alternatively, keeping the gitea user {#module-forgejo-migration-gitea-impersonate} + +Alternatively, instead of renaming the database, copying the state folder and +changing the user, the forgejo module can be set up to re-use the old storage +locations and database, instead of having to copy or rename them. +Make sure to disable `services.gitea`, when doing this. + +```nix +services.gitea.enable = false; + +services.forgejo = { + enable = true; + user = "gitea"; + group = "gitea"; + stateDir = "/var/lib/gitea"; + database.name = "gitea"; + database.user = "gitea"; +}; + +users.users,gitea = { + home = "/var/lib/gitea"; + useDefaultShell = true; + group = "gitea"; + isSystemUser = true; +}; + +users.groups.gitea = {}; +``` diff --git a/nixos/modules/services/misc/forgejo.nix b/nixos/modules/services/misc/forgejo.nix index 90b5f16f4189b..15966adfe38e7 100644 --- a/nixos/modules/services/misc/forgejo.nix +++ b/nixos/modules/services/misc/forgejo.nix @@ -357,6 +357,14 @@ in assertion = cfg.database.createDatabase -> useSqlite || cfg.database.user == cfg.user; message = "services.forgejo.database.user must match services.forgejo.user if the database is to be automatically provisioned"; } + { assertion = cfg.database.createDatabase && usePostgresql -> cfg.database.user == cfg.database.name; + message = '' + When creating a database via NixOS, the db user and db name must be equal! + If you already have an existing DB+user and this assertion is new, you can safely set + `services.forgejo.createDatabase` to `false` because removal of `ensureUsers` + and `ensureDatabases` doesn't have any effect. + ''; + } ]; services.forgejo.settings = { @@ -423,7 +431,7 @@ in ensureUsers = [ { name = cfg.database.user; - ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; @@ -677,5 +685,6 @@ in }; }; + meta.doc = ./forgejo.md; meta.maintainers = with lib.maintainers; [ bendlas emilylange ]; } diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 3f690f85d623b..be528a2989918 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -394,6 +394,14 @@ in { assertion = cfg.database.createDatabase -> useSqlite || cfg.database.user == cfg.user; message = "services.gitea.database.user must match services.gitea.user if the database is to be automatically provisioned"; } + { assertion = cfg.database.createDatabase && usePostgresql -> cfg.database.user == cfg.database.name; + message = '' + When creating a database via NixOS, the db user and db name must be equal! + If you already have an existing DB+user and this assertion is new, you can safely set + `services.gitea.createDatabase` to `false` because removal of `ensureUsers` + and `ensureDatabases` doesn't have any effect. + ''; + } ]; services.gitea.settings = { @@ -461,7 +469,7 @@ in ensureDatabases = [ cfg.database.name ]; ensureUsers = [ { name = cfg.database.user; - ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index a296fd3816bbb..20fa71507b6b0 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -267,7 +267,7 @@ in { assertion = cfg.database.passwordFile != null || cfg.database.socket != null; message = "one of services.redmine.database.socket or services.redmine.database.passwordFile must be set"; } - { assertion = cfg.database.createLocally -> cfg.database.user == cfg.user; + { assertion = cfg.database.createLocally -> cfg.database.user == cfg.user && cfg.database.user == cfg.database.name; message = "services.redmine.database.user must be set to ${cfg.user} if services.redmine.database.createLocally is set true"; } { assertion = cfg.database.createLocally -> cfg.database.socket != null; @@ -315,7 +315,7 @@ in ensureDatabases = [ cfg.database.name ]; ensureUsers = [ { name = cfg.database.user; - ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/misc/sourcehut/service.nix b/nixos/modules/services/misc/sourcehut/service.nix index 18c2f5effc5a5..f08d5eb468719 100644 --- a/nixos/modules/services/misc/sourcehut/service.nix +++ b/nixos/modules/services/misc/sourcehut/service.nix @@ -249,10 +249,13 @@ in ensureDatabases = [ srvCfg.postgresql.database ]; ensureUsers = map (name: { inherit name; - ensurePermissions = { "DATABASE \"${srvCfg.postgresql.database}\"" = "ALL PRIVILEGES"; }; + # We don't use it because we have a special default database name with dots. + # TODO(for maintainers of sourcehut): migrate away from custom preStart script. + ensureDBOwnership = false; }) [srvCfg.user]; }; + services.sourcehut.settings = mkMerge [ { "${srv}.sr.ht".origin = mkDefault "https://${srv}.${cfg.settings."sr.ht".global-domain}"; @@ -378,10 +381,11 @@ in extraService ])) extraServices) - # Work around 'pq: permission denied for schema public' with postgres v15, until a - # solution for `services.postgresql.ensureUsers` is found. + # Work around 'pq: permission denied for schema public' with postgres v15. # See https://github.com/NixOS/nixpkgs/issues/216989 # Workaround taken from nixos/forgejo: https://github.com/NixOS/nixpkgs/pull/262741 + # TODO(to maintainers of sourcehut): please migrate away from this workaround + # by migrating away from database name defaults with dots. (lib.mkIf ( cfg.postgresql.enable && lib.strings.versionAtLeast config.services.postgresql.package.version "15.0" diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 5e21407042b6a..f84d677f14d85 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -1841,6 +1841,7 @@ in serviceConfig = { WorkingDirectory = cfg.dataDir; User = "grafana"; + Restart = "on-failure"; RuntimeDirectory = "grafana"; RuntimeDirectoryMode = "0755"; # Hardening diff --git a/nixos/modules/services/monitoring/zabbix-proxy.nix b/nixos/modules/services/monitoring/zabbix-proxy.nix index 85da416ba6c33..503e81b48a587 100644 --- a/nixos/modules/services/monitoring/zabbix-proxy.nix +++ b/nixos/modules/services/monitoring/zabbix-proxy.nix @@ -203,7 +203,7 @@ in { assertion = !config.services.zabbixServer.enable; message = "Please choose one of services.zabbixServer or services.zabbixProxy."; } - { assertion = cfg.database.createLocally -> cfg.database.user == user; + { assertion = cfg.database.createLocally -> cfg.database.user == user && cfg.database.name == cfg.database.user; message = "services.zabbixProxy.database.user must be set to ${user} if services.zabbixProxy.database.createLocally is set true"; } { assertion = cfg.database.createLocally -> cfg.database.passwordFile == null; @@ -252,7 +252,7 @@ in ensureDatabases = [ cfg.database.name ]; ensureUsers = [ { name = cfg.database.user; - ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix index 2b50280e3969a..0607188d21319 100644 --- a/nixos/modules/services/monitoring/zabbix-server.nix +++ b/nixos/modules/services/monitoring/zabbix-server.nix @@ -191,7 +191,7 @@ in config = mkIf cfg.enable { assertions = [ - { assertion = cfg.database.createLocally -> cfg.database.user == user; + { assertion = cfg.database.createLocally -> cfg.database.user == user && cfg.database.user == cfg.database.name; message = "services.zabbixServer.database.user must be set to ${user} if services.zabbixServer.database.createLocally is set true"; } { assertion = cfg.database.createLocally -> cfg.database.passwordFile == null; @@ -240,7 +240,7 @@ in ensureDatabases = [ cfg.database.name ]; ensureUsers = [ { name = cfg.database.user; - ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/networking/ircd-hybrid/builder.sh b/nixos/modules/services/networking/ircd-hybrid/builder.sh index d9d2e4264dfd1..07a3788abf7d2 100644 --- a/nixos/modules/services/networking/ircd-hybrid/builder.sh +++ b/nixos/modules/services/networking/ircd-hybrid/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup doSub() { diff --git a/nixos/modules/services/security/hockeypuck.nix b/nixos/modules/services/security/hockeypuck.nix index 127134bc5dba5..56c13d791920c 100644 --- a/nixos/modules/services/security/hockeypuck.nix +++ b/nixos/modules/services/security/hockeypuck.nix @@ -55,7 +55,7 @@ in { ensureDatabases = [ "hockeypuck" ]; ensureUsers = [{ name = "hockeypuck"; - ensurePermissions."DATABASE hockeypuck" = "ALL PRIVILEGES"; + ensureDBOwnership = true; }]; }; ``` diff --git a/nixos/modules/services/web-apps/coder.nix b/nixos/modules/services/web-apps/coder.nix index 469a29bc3aa8c..f65211308c402 100644 --- a/nixos/modules/services/web-apps/coder.nix +++ b/nixos/modules/services/web-apps/coder.nix @@ -149,8 +149,8 @@ in { config = mkIf cfg.enable { assertions = [ - { assertion = cfg.database.createLocally -> cfg.database.username == name; - message = "services.coder.database.username must be set to ${user} if services.coder.database.createLocally is set true"; + { assertion = cfg.database.createLocally -> cfg.database.username == name && cfg.database.database == cfg.database.username; + message = "services.coder.database.username must be set to ${name} if services.coder.database.createLocally is set true"; } ]; @@ -193,10 +193,8 @@ in { cfg.database.database ]; ensureUsers = [{ - name = cfg.database.username; - ensurePermissions = { - "DATABASE \"${cfg.database.database}\"" = "ALL PRIVILEGES"; - }; + name = cfg.user; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/web-apps/gotosocial.nix b/nixos/modules/services/web-apps/gotosocial.nix index f7ae018d5b7cc..9c21719a57590 100644 --- a/nixos/modules/services/web-apps/gotosocial.nix +++ b/nixos/modules/services/web-apps/gotosocial.nix @@ -128,9 +128,7 @@ in ensureUsers = [ { name = "gotosocial"; - ensurePermissions = { - "DATABASE gotosocial" = "ALL PRIVILEGES"; - }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/web-apps/invidious.nix b/nixos/modules/services/web-apps/invidious.nix index 5603ef7392e82..e4fbc6fd93689 100644 --- a/nixos/modules/services/web-apps/invidious.nix +++ b/nixos/modules/services/web-apps/invidious.nix @@ -109,15 +109,17 @@ let # Default to using the local database if we create it services.invidious.database.host = lib.mkDefault null; + + # TODO(raitobezarius to maintainers of invidious): I strongly advise to clean up the kemal specific + # thing for 24.05 and use `ensureDBOwnership`. + # See https://github.com/NixOS/nixpkgs/issues/216989 + systemd.services.postgresql.postStart = lib.mkAfter '' + $PSQL -tAc 'ALTER DATABASE "${cfg.settings.db.dbname}" OWNER TO "${cfg.settings.db.user}";' + ''; services.postgresql = { enable = true; + ensureUsers = lib.singleton { name = cfg.settings.db.user; ensureDBOwnership = false; }; ensureDatabases = lib.singleton cfg.settings.db.dbname; - ensureUsers = lib.singleton { - name = cfg.settings.db.user; - ensurePermissions = { - "DATABASE ${cfg.settings.db.dbname}" = "ALL PRIVILEGES"; - }; - }; # This is only needed because the unix user invidious isn't the same as # the database user. This tells postgres to map one to the other. identMap = '' @@ -136,6 +138,7 @@ let documentation = [ "https://docs.invidious.io/Database-Information-and-Maintenance.md" ]; startAt = lib.mkDefault "weekly"; path = [ config.services.postgresql.package ]; + after = [ "postgresql.service" ]; script = '' psql ${cfg.settings.db.dbname} ${cfg.settings.db.user} -c "DELETE FROM nonces * WHERE expire < current_timestamp" psql ${cfg.settings.db.dbname} ${cfg.settings.db.user} -c "TRUNCATE TABLE videos" diff --git a/nixos/modules/services/web-apps/lemmy.nix b/nixos/modules/services/web-apps/lemmy.nix index 20d9dcb7c2661..32389f7a59dd8 100644 --- a/nixos/modules/services/web-apps/lemmy.nix +++ b/nixos/modules/services/web-apps/lemmy.nix @@ -146,7 +146,7 @@ in ensureDatabases = [ cfg.settings.database.database ]; ensureUsers = [{ name = cfg.settings.database.user; - ensurePermissions."DATABASE ${cfg.settings.database.database}" = "ALL PRIVILEGES"; + ensureDBOwnership = true; }]; }; diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index d861f9e251bed..8686506b1c282 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -612,7 +612,7 @@ in { config = lib.mkIf cfg.enable (lib.mkMerge [{ assertions = [ { - assertion = databaseActuallyCreateLocally -> (cfg.user == cfg.database.user); + assertion = databaseActuallyCreateLocally -> (cfg.user == cfg.database.user && cfg.database.user == cfg.database.name); message = '' For local automatic database provisioning (services.mastodon.database.createLocally == true) with peer authentication (services.mastodon.database.host == "/run/postgresql") to work services.mastodon.user @@ -845,8 +845,8 @@ in { enable = true; ensureUsers = [ { - name = cfg.database.user; - ensurePermissions."DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; + name = cfg.database.name; + ensureDBOwnership = true; } ]; ensureDatabases = [ cfg.database.name ]; diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixos/modules/services/web-apps/mediawiki.nix index 8b494b7c12083..ce7bcd94b3f01 100644 --- a/nixos/modules/services/web-apps/mediawiki.nix +++ b/nixos/modules/services/web-apps/mediawiki.nix @@ -454,7 +454,7 @@ in { assertion = cfg.database.createLocally -> (cfg.database.type == "mysql" || cfg.database.type == "postgres"); message = "services.mediawiki.createLocally is currently only supported for database type 'mysql' and 'postgres'"; } - { assertion = cfg.database.createLocally -> cfg.database.user == user; + { assertion = cfg.database.createLocally -> cfg.database.user == user && cfg.database.name == cfg.database.user; message = "services.mediawiki.database.user must be set to ${user} if services.mediawiki.database.createLocally is set true"; } { assertion = cfg.database.createLocally -> cfg.database.socket != null; @@ -486,7 +486,7 @@ in ensureDatabases = [ cfg.database.name ]; ensureUsers = [{ name = cfg.database.user; - ensurePermissions = { "DATABASE \"${cfg.database.name}\"" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; }]; }; diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix index 3374c746ad3dd..5c8c93c13c434 100644 --- a/nixos/modules/services/web-apps/miniflux.nix +++ b/nixos/modules/services/web-apps/miniflux.nix @@ -6,13 +6,10 @@ let defaultAddress = "localhost:8080"; - dbUser = "miniflux"; - dbName = "miniflux"; - pgbin = "${config.services.postgresql.package}/bin"; preStart = pkgs.writeScript "miniflux-pre-start" '' #!${pkgs.runtimeShell} - ${pgbin}/psql "${dbName}" -c "CREATE EXTENSION IF NOT EXISTS hstore" + ${pgbin}/psql "miniflux" -c "CREATE EXTENSION IF NOT EXISTS hstore" ''; in @@ -62,7 +59,7 @@ in services.miniflux.config = { LISTEN_ADDR = mkDefault defaultAddress; - DATABASE_URL = "user=${dbUser} host=/run/postgresql dbname=${dbName}"; + DATABASE_URL = "user=miniflux host=/run/postgresql dbname=miniflux"; RUN_MIGRATIONS = "1"; CREATE_ADMIN = "1"; }; @@ -70,12 +67,10 @@ in services.postgresql = { enable = true; ensureUsers = [ { - name = dbUser; - ensurePermissions = { - "DATABASE ${dbName}" = "ALL PRIVILEGES"; - }; + name = "miniflux"; + ensureDBOwnership = true; } ]; - ensureDatabases = [ dbName ]; + ensureDatabases = [ "miniflux" ]; }; systemd.services.miniflux-dbsetup = { @@ -97,7 +92,7 @@ in serviceConfig = { ExecStart = "${cfg.package}/bin/miniflux"; - User = dbUser; + User = "miniflux"; DynamicUser = true; RuntimeDirectory = "miniflux"; RuntimeDirectoryMode = "0700"; diff --git a/nixos/modules/services/web-apps/mobilizon.nix b/nixos/modules/services/web-apps/mobilizon.nix index 343c5cead2b15..bb4319b51a2fa 100644 --- a/nixos/modules/services/web-apps/mobilizon.nix +++ b/nixos/modules/services/web-apps/mobilizon.nix @@ -347,12 +347,18 @@ in # Taken from here: # https://framagit.org/framasoft/mobilizon/-/blob/1.1.0/priv/templates/setup_db.eex + # TODO(to maintainers of mobilizon): the owner database alteration is necessary + # as PostgreSQL 15 changed their behaviors w.r.t. to privileges. + # See https://github.com/NixOS/nixpkgs/issues/216989 to get rid + # of that workaround. script = '' psql "${repoSettings.database}" -c "\ CREATE EXTENSION IF NOT EXISTS postgis; \ CREATE EXTENSION IF NOT EXISTS pg_trgm; \ CREATE EXTENSION IF NOT EXISTS unaccent;" + psql -tAc 'ALTER DATABASE "${repoSettings.database}" OWNER TO "${dbUser}";' + ''; serviceConfig = { @@ -372,9 +378,10 @@ in ensureUsers = [ { name = dbUser; - ensurePermissions = { - "DATABASE \"${repoSettings.database}\"" = "ALL PRIVILEGES"; - }; + # Given that `dbUser` is potentially arbitrarily custom, we will perform + # manual fixups in mobilizon-postgres. + # TODO(to maintainers of mobilizon): Feel free to simplify your setup by using `ensureDBOwnership`. + ensureDBOwnership = false; } ]; extraPlugins = with postgresql.pkgs; [ postgis ]; diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix index b617e9a593795..04ae6bd7f1754 100644 --- a/nixos/modules/services/web-apps/moodle.nix +++ b/nixos/modules/services/web-apps/moodle.nix @@ -194,7 +194,7 @@ in config = mkIf cfg.enable { assertions = [ - { assertion = cfg.database.createLocally -> cfg.database.user == user; + { assertion = cfg.database.createLocally -> cfg.database.user == user && cfg.database.user == cfg.database.name; message = "services.moodle.database.user must be set to ${user} if services.moodle.database.createLocally is set true"; } { assertion = cfg.database.createLocally -> cfg.database.passwordFile == null; @@ -220,7 +220,7 @@ in ensureDatabases = [ cfg.database.name ]; ensureUsers = [ { name = cfg.database.user; - ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/web-apps/netbox.nix b/nixos/modules/services/web-apps/netbox.nix index 8ba1852848e5b..3b9434e3d3456 100644 --- a/nixos/modules/services/web-apps/netbox.nix +++ b/nixos/modules/services/web-apps/netbox.nix @@ -257,9 +257,7 @@ in { ensureUsers = [ { name = "netbox"; - ensurePermissions = { - "DATABASE netbox" = "ALL PRIVILEGES"; - }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index f9713cac47e94..f1ac3770d403c 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -1042,7 +1042,7 @@ in { ensureDatabases = [ cfg.config.dbname ]; ensureUsers = [{ name = cfg.config.dbuser; - ensurePermissions = { "DATABASE ${cfg.config.dbname}" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; }]; }; diff --git a/nixos/modules/services/web-apps/onlyoffice.nix b/nixos/modules/services/web-apps/onlyoffice.nix index 3494f2fa21f09..f958566b91f09 100644 --- a/nixos/modules/services/web-apps/onlyoffice.nix +++ b/nixos/modules/services/web-apps/onlyoffice.nix @@ -198,7 +198,7 @@ in ensureDatabases = [ "onlyoffice" ]; ensureUsers = [{ name = "onlyoffice"; - ensurePermissions = { "DATABASE \"onlyoffice\"" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; }]; }; }; diff --git a/nixos/modules/services/web-apps/outline.nix b/nixos/modules/services/web-apps/outline.nix index 0e3bd07c1fc14..d97b45d624187 100644 --- a/nixos/modules/services/web-apps/outline.nix +++ b/nixos/modules/services/web-apps/outline.nix @@ -581,7 +581,7 @@ in enable = true; ensureUsers = [{ name = "outline"; - ensurePermissions."DATABASE outline" = "ALL PRIVILEGES"; + ensureDBOwnership = true; }]; ensureDatabases = [ "outline" ]; }; diff --git a/nixos/modules/services/web-apps/peering-manager.nix b/nixos/modules/services/web-apps/peering-manager.nix index 7012df6dffbfd..d6f6077268d46 100644 --- a/nixos/modules/services/web-apps/peering-manager.nix +++ b/nixos/modules/services/web-apps/peering-manager.nix @@ -186,9 +186,7 @@ in { ensureUsers = [ { name = "peering-manager"; - ensurePermissions = { - "DATABASE \"peering-manager\"" = "ALL PRIVILEGES"; - }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/web-apps/pixelfed.nix b/nixos/modules/services/web-apps/pixelfed.nix index 159fb52476aab..b0a25dcce9efe 100644 --- a/nixos/modules/services/web-apps/pixelfed.nix +++ b/nixos/modules/services/web-apps/pixelfed.nix @@ -271,7 +271,6 @@ in { ensureDatabases = [ cfg.database.name ]; ensureUsers = [{ name = user; - ensurePermissions = { }; }]; }; diff --git a/nixos/modules/services/web-apps/plantuml-server.nix b/nixos/modules/services/web-apps/plantuml-server.nix index 5ebee48c3e0b5..1fa69814c6c9f 100644 --- a/nixos/modules/services/web-apps/plantuml-server.nix +++ b/nixos/modules/services/web-apps/plantuml-server.nix @@ -1,123 +1,110 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) + literalExpression + mdDoc + mkEnableOption + mkIf + mkOption + mkPackageOptionMD + mkRemovedOptionModule + types + ; cfg = config.services.plantuml-server; in { + imports = [ + (mkRemovedOptionModule [ "services" "plantuml-server" "allowPlantumlInclude" ] "This option has been removed from PlantUML.") + ]; + options = { services.plantuml-server = { - enable = mkEnableOption (lib.mdDoc "PlantUML server"); + enable = mkEnableOption (mdDoc "PlantUML server"); - package = mkOption { - type = types.package; - default = pkgs.plantuml-server; - defaultText = literalExpression "pkgs.plantuml-server"; - description = lib.mdDoc "PlantUML server package to use"; - }; + package = mkPackageOptionMD pkgs "plantuml-server" { }; packages = { - jdk = mkOption { - type = types.package; - default = pkgs.jdk; - defaultText = literalExpression "pkgs.jdk"; - description = lib.mdDoc "JDK package to use for the server"; - }; - jetty = mkOption { - type = types.package; - default = pkgs.jetty; - defaultText = literalExpression "pkgs.jetty"; - description = lib.mdDoc "Jetty package to use for the server"; + jdk = mkPackageOptionMD pkgs "jdk" { }; + jetty = mkPackageOptionMD pkgs "jetty" { + default = "jetty_11"; + extraDescription = '' + At the time of writing (v1.2023.12), PlantUML Server does not support + Jetty versions higher than 12.x. + + Jetty 12.x has introduced major breaking changes, see + <https://github.com/jetty/jetty.project/releases/tag/jetty-12.0.0> and + <https://eclipse.dev/jetty/documentation/jetty-12/programming-guide/index.html#pg-migration-11-to-12> + ''; }; }; user = mkOption { type = types.str; default = "plantuml"; - description = lib.mdDoc "User which runs PlantUML server."; + description = mdDoc "User which runs PlantUML server."; }; group = mkOption { type = types.str; default = "plantuml"; - description = lib.mdDoc "Group which runs PlantUML server."; + description = mdDoc "Group which runs PlantUML server."; }; home = mkOption { - type = types.str; + type = types.path; default = "/var/lib/plantuml"; - description = lib.mdDoc "Home directory of the PlantUML server instance."; + description = mdDoc "Home directory of the PlantUML server instance."; }; listenHost = mkOption { type = types.str; default = "127.0.0.1"; - description = lib.mdDoc "Host to listen on."; + description = mdDoc "Host to listen on."; }; listenPort = mkOption { type = types.int; default = 8080; - description = lib.mdDoc "Port to listen on."; + description = mdDoc "Port to listen on."; }; plantumlLimitSize = mkOption { type = types.int; default = 4096; - description = lib.mdDoc "Limits image width and height."; + description = mdDoc "Limits image width and height."; }; - graphvizPackage = mkOption { - type = types.package; - default = pkgs.graphviz; - defaultText = literalExpression "pkgs.graphviz"; - description = lib.mdDoc "Package containing the dot executable."; - }; + graphvizPackage = mkPackageOptionMD pkgs "graphviz" { }; plantumlStats = mkOption { type = types.bool; default = false; - description = lib.mdDoc "Set it to on to enable statistics report (https://plantuml.com/statistics-report)."; + description = mdDoc "Set it to on to enable statistics report (https://plantuml.com/statistics-report)."; }; httpAuthorization = mkOption { type = types.nullOr types.str; default = null; - description = lib.mdDoc "When calling the proxy endpoint, the value of HTTP_AUTHORIZATION will be used to set the HTTP Authorization header."; - }; - - allowPlantumlInclude = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc "Enables !include processing which can read files from the server into diagrams. Files are read relative to the current working directory."; + description = mdDoc "When calling the proxy endpoint, the value of HTTP_AUTHORIZATION will be used to set the HTTP Authorization header."; }; }; }; config = mkIf cfg.enable { - users.users.${cfg.user} = { - isSystemUser = true; - group = cfg.group; - home = cfg.home; - createHome = true; - }; - - users.groups.${cfg.group} = {}; - systemd.services.plantuml-server = { description = "PlantUML server"; wantedBy = [ "multi-user.target" ]; path = [ cfg.home ]; + environment = { PLANTUML_LIMIT_SIZE = builtins.toString cfg.plantumlLimitSize; GRAPHVIZ_DOT = "${cfg.graphvizPackage}/bin/dot"; PLANTUML_STATS = if cfg.plantumlStats then "on" else "off"; HTTP_AUTHORIZATION = cfg.httpAuthorization; - ALLOW_PLANTUML_INCLUDE = if cfg.allowPlantumlInclude then "true" else "false"; }; script = '' ${cfg.packages.jdk}/bin/java \ @@ -128,13 +115,40 @@ in jetty.http.host=${cfg.listenHost} \ jetty.http.port=${builtins.toString cfg.listenPort} ''; + serviceConfig = { User = cfg.user; Group = cfg.group; + StateDirectory = mkIf (cfg.home == "/var/lib/plantuml") "plantuml"; + StateDirectoryMode = mkIf (cfg.home == "/var/lib/plantuml") "0750"; + + # Hardening + AmbientCapabilities = [ "" ]; + CapabilityBoundingSet = [ "" ]; + DynamicUser = true; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateNetwork = false; PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" ]; }; }; }; - meta.maintainers = with lib.maintainers; [ truh ]; + meta.maintainers = with lib.maintainers; [ truh anthonyroussel ]; } diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 7b2e3be4295e8..a8fb37d2c5ecd 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -529,6 +529,15 @@ let assertion = cfg.database.password != null -> cfg.database.passwordFile == null; message = "Cannot set both password and passwordFile"; } + { + assertion = cfg.database.createLocally -> cfg.database.name == cfg.user && cfg.database.user == cfg.user; + message = '' + When creating a database via NixOS, the db user and db name must be equal! + If you already have an existing DB+user and this assertion is new, you can safely set + `services.tt-rss.database.createLocally` to `false` because removal of `ensureUsers` + and `ensureDatabases` doesn't have any effect. + ''; + } ]; services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") { @@ -632,8 +641,8 @@ let enable = mkDefault true; ensureDatabases = [ cfg.database.name ]; ensureUsers = [ - { name = cfg.user; - ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + { name = cfg.database.user; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/web-servers/hydron.nix b/nixos/modules/services/web-servers/hydron.nix index 4434965b217a0..9d30fdc0caab0 100644 --- a/nixos/modules/services/web-servers/hydron.nix +++ b/nixos/modules/services/web-servers/hydron.nix @@ -93,7 +93,7 @@ in with lib; { ensureDatabases = [ "hydron" ]; ensureUsers = [ { name = "hydron"; - ensurePermissions = { "DATABASE hydron" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/web-servers/jboss/builder.sh b/nixos/modules/services/web-servers/jboss/builder.sh index ac573089cd5a7..8c49b87db0604 100644 --- a/nixos/modules/services/web-servers/jboss/builder.sh +++ b/nixos/modules/services/web-servers/jboss/builder.sh @@ -1,6 +1,6 @@ set -e -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup mkdir -p $out/bin diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 96b42066b2239..7d06e0131d9d0 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -88,9 +88,20 @@ def write_loader_conf(profile: str | None, generation: int, specialisation: str def get_bootspec(profile: str | None, generation: int) -> BootSpec: - boot_json_path = os.path.realpath("%s/%s" % (system_dir(profile, generation, None), "boot.json")) - boot_json_f = open(boot_json_path, 'r') - bootspec_json = json.load(boot_json_f) + system_directory = system_dir(profile, generation, None) + boot_json_path = os.path.realpath("%s/%s" % (system_directory, "boot.json")) + if os.path.isfile(boot_json_path): + boot_json_f = open(boot_json_path, 'r') + bootspec_json = json.load(boot_json_f) + else: + boot_json_str = subprocess.check_output([ + "@bootspecTools@/bin/synthesize", + "--version", + "1", + system_directory, + "/dev/stdout"], + universal_newlines=True) + bootspec_json = json.loads(boot_json_str) return bootspec_from_json(bootspec_json) def bootspec_from_json(bootspec_json: Dict) -> BootSpec: diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 1086ab80b14f1..9d55c21077d13 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -16,6 +16,8 @@ let systemd = config.systemd.package; + bootspecTools = pkgs.bootspec; + nix = config.nix.package.out; timeout = optionalString (config.boot.loader.timeout != null) config.boot.loader.timeout; diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix index 4eadec239e67d..af7ba7aa6a0f0 100644 --- a/nixos/modules/tasks/filesystems/bcachefs.nix +++ b/nixos/modules/tasks/filesystems/bcachefs.nix @@ -6,23 +6,39 @@ let bootFs = filterAttrs (n: fs: (fs.fsType == "bcachefs") && (utils.fsNeededForBoot fs)) config.fileSystems; - mountCommand = pkgs.runCommand "mount.bcachefs" {} '' - mkdir -p $out/bin - cat > $out/bin/mount.bcachefs <<EOF - #!/bin/sh - exec "/bin/bcachefs" mount "\$@" - EOF - chmod +x $out/bin/mount.bcachefs - ''; - commonFunctions = '' prompt() { local name="$1" printf "enter passphrase for $name: " } + tryUnlock() { local name="$1" local path="$2" + local success=false + local target + local uuid=$(echo -n $path | sed -e 's,UUID=\(.*\),\1,g') + + printf "waiting for device to appear $path" + for try in $(seq 10); do + if [ -e $path ]; then + success=true + break + else + target=$(blkid --uuid $uuid) + if [ $? == 0 ]; then + success=true + break + fi + fi + echo -n "." + sleep 1 + done + printf "\n" + if [ $success == true ]; then + path=$target + fi + if bcachefs unlock -c $path > /dev/null 2> /dev/null; then # test for encryption prompt $name until bcachefs unlock $path 2> /dev/null; do # repeat until successfully unlocked @@ -30,6 +46,8 @@ let prompt $name done printf "unlocking successful.\n" + else + echo "Cannot unlock device $uuid with path $path" >&2 fi } ''; @@ -77,13 +95,11 @@ in { config = mkIf (elem "bcachefs" config.boot.supportedFilesystems) (mkMerge [ { - # We do not want to include bachefs in the fsPackages for systemd-initrd - # because we provide the unwrapped version of mount.bcachefs - # through the extraBin option, which will make it available for use. - system.fsPackages = lib.optional (!config.boot.initrd.systemd.enable) pkgs.bcachefs-tools; - environment.systemPackages = lib.optional (config.boot.initrd.systemd.enable) pkgs.bcachefs-tools; + # needed for systemd-remount-fs + system.fsPackages = [ pkgs.bcachefs-tools ]; # use kernel package with bcachefs support until it's in mainline + # TODO replace with requireKernelConfig boot.kernelPackages = pkgs.linuxPackages_testing_bcachefs; systemd.services = lib.mapAttrs' (mkUnits "") (lib.filterAttrs (n: fs: (fs.fsType == "bcachefs") && (!utils.fsNeededForBoot fs)) config.fileSystems); @@ -92,15 +108,14 @@ in (mkIf ((elem "bcachefs" config.boot.initrd.supportedFilesystems) || (bootFs != {})) { # chacha20 and poly1305 are required only for decryption attempts boot.initrd.availableKernelModules = [ "bcachefs" "sha256" "chacha20" "poly1305" ]; - boot.initrd.systemd.extraBin = { + # do we need this? boot/systemd.nix:566 & boot/systemd/initrd.nix:357 "bcachefs" = "${pkgs.bcachefs-tools}/bin/bcachefs"; - "mount.bcachefs" = "${mountCommand}/bin/mount.bcachefs"; + "mount.bcachefs" = "${pkgs.bcachefs-tools}/bin/mount.bcachefs"; }; - boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/bcachefs - copy_bin_and_libs ${mountCommand}/bin/mount.bcachefs + copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/mount.bcachefs ''; boot.initrd.extraUtilsCommandsTest = lib.mkIf (!config.boot.initrd.systemd.enable) '' $out/bin/bcachefs version diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index f44fcfcf54ab6..6c127efa4cea2 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -124,6 +124,7 @@ in { apfs = runTest ./apfs.nix; appliance-repart-image = runTest ./appliance-repart-image.nix; apparmor = handleTest ./apparmor.nix {}; + archi = handleTest ./archi.nix {}; atd = handleTest ./atd.nix {}; atop = handleTest ./atop.nix {}; atuin = handleTest ./atuin.nix {}; @@ -656,6 +657,7 @@ in { phylactery = handleTest ./web-apps/phylactery.nix {}; pict-rs = handleTest ./pict-rs.nix {}; pinnwand = handleTest ./pinnwand.nix {}; + plantuml-server = handleTest ./plantuml-server.nix {}; plasma-bigscreen = handleTest ./plasma-bigscreen.nix {}; plasma5 = handleTest ./plasma5.nix {}; plasma5-systemd-start = handleTest ./plasma5-systemd-start.nix {}; diff --git a/nixos/tests/archi.nix b/nixos/tests/archi.nix new file mode 100644 index 0000000000000..59f2e940c0050 --- /dev/null +++ b/nixos/tests/archi.nix @@ -0,0 +1,31 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "archi"; + meta.maintainers = with lib.maintainers; [ paumr ]; + + nodes.machine = { pkgs, ... }: { + imports = [ + ./common/x11.nix + ]; + + environment.systemPackages = with pkgs; [ archi ]; + }; + + enableOCR = true; + + testScript = '' + machine.wait_for_x() + + with subtest("createEmptyModel via CLI"): + machine.succeed("Archi -application com.archimatetool.commandline.app -consoleLog -nosplash --createEmptyModel --saveModel smoke.archimate") + machine.copy_from_vm("smoke.archimate", "") + + with subtest("UI smoketest"): + machine.succeed("DISPLAY=:0 Archi --createEmptyModel >&2 &") + machine.wait_for_window("Archi") + + # wait till main UI is open + machine.wait_for_text("Welcome to Archi") + + machine.screenshot("welcome-screen") + ''; +}) diff --git a/nixos/tests/dex-oidc.nix b/nixos/tests/dex-oidc.nix index 37275a97ef0fb..e54ae18ca9373 100644 --- a/nixos/tests/dex-oidc.nix +++ b/nixos/tests/dex-oidc.nix @@ -49,7 +49,7 @@ import ./make-test-python.nix ({ lib, ... }: { ensureUsers = [ { name = "dex"; - ensurePermissions = { "DATABASE dex" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/tests/ferretdb.nix b/nixos/tests/ferretdb.nix index 9ad7397ade80c..7251198af77dc 100644 --- a/nixos/tests/ferretdb.nix +++ b/nixos/tests/ferretdb.nix @@ -39,7 +39,7 @@ with import ../lib/testing-python.nix { inherit system; }; ensureDatabases = [ "ferretdb" ]; ensureUsers = [{ name = "ferretdb"; - ensurePermissions."DATABASE ferretdb" = "ALL PRIVILEGES"; + ensureDBOwnership = true; }]; }; diff --git a/nixos/tests/freshrss-pgsql.nix b/nixos/tests/freshrss-pgsql.nix index 055bd51ed43d7..c685f4a8159b8 100644 --- a/nixos/tests/freshrss-pgsql.nix +++ b/nixos/tests/freshrss-pgsql.nix @@ -22,9 +22,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { ensureUsers = [ { name = "freshrss"; - ensurePermissions = { - "DATABASE freshrss" = "ALL PRIVILEGES"; - }; + ensureDBOwnership = true; } ]; initialScript = pkgs.writeText "postgresql-password" '' diff --git a/nixos/tests/grafana/basic.nix b/nixos/tests/grafana/basic.nix index 8bf4caad7fbfc..dd389bc8a3d1f 100644 --- a/nixos/tests/grafana/basic.nix +++ b/nixos/tests/grafana/basic.nix @@ -55,7 +55,7 @@ let ensureDatabases = [ "grafana" ]; ensureUsers = [{ name = "grafana"; - ensurePermissions."DATABASE grafana" = "ALL PRIVILEGES"; + ensureDBOwnership = true; }]; }; systemd.services.grafana.after = [ "postgresql.service" ]; diff --git a/nixos/tests/hockeypuck.nix b/nixos/tests/hockeypuck.nix index 2b9dba8720aba..675d6b226ad20 100644 --- a/nixos/tests/hockeypuck.nix +++ b/nixos/tests/hockeypuck.nix @@ -35,7 +35,7 @@ in { ensureDatabases = [ "hockeypuck" ]; ensureUsers = [{ name = "hockeypuck"; - ensurePermissions."DATABASE hockeypuck" = "ALL PRIVILEGES"; + ensureDBOwnership = true; }]; }; }; diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index e97e8a467b187..e1588088ba198 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -9,13 +9,11 @@ in { nodes.hass = { pkgs, ... }: { services.postgresql = { enable = true; - - # FIXME: hack for https://github.com/NixOS/nixpkgs/issues/216989 - # Should be replaced with ensureUsers again when a solution for that is found - initialScript = pkgs.writeText "hass-setup-db.sql" '' - CREATE ROLE hass WITH LOGIN; - CREATE DATABASE hass WITH OWNER hass; - ''; + ensureDatabases = [ "hass" ]; + ensureUsers = [{ + name = "hass"; + ensureDBOwnership = true; + }]; }; services.home-assistant = { diff --git a/nixos/tests/invidious.nix b/nixos/tests/invidious.nix index 582d1550fff1a..701e8e5e7a3fc 100644 --- a/nixos/tests/invidious.nix +++ b/nixos/tests/invidious.nix @@ -44,8 +44,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { enable = true; initialScript = pkgs.writeText "init-postgres-with-password" '' CREATE USER kemal WITH PASSWORD 'correct horse battery staple'; - CREATE DATABASE invidious; - GRANT ALL PRIVILEGES ON DATABASE invidious TO kemal; + CREATE DATABASE invidious OWNER kemal; ''; }; }; diff --git a/nixos/tests/paperless.nix b/nixos/tests/paperless.nix index 22409e8992367..6a51cc522bdc5 100644 --- a/nixos/tests/paperless.nix +++ b/nixos/tests/paperless.nix @@ -17,7 +17,7 @@ import ./make-test-python.nix ({ lib, ... }: { ensureDatabases = [ "paperless" ]; ensureUsers = [ { name = config.services.paperless.user; - ensurePermissions = { "DATABASE \"paperless\"" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/tests/pgadmin4.nix b/nixos/tests/pgadmin4.nix index cb8de87c9ee31..3ee7ed19fa1c5 100644 --- a/nixos/tests/pgadmin4.nix +++ b/nixos/tests/pgadmin4.nix @@ -19,14 +19,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: authentication = '' host all all localhost trust ''; - ensureUsers = [ - { - name = "postgres"; - ensurePermissions = { - "DATABASE \"postgres\"" = "ALL PRIVILEGES"; - }; - } - ]; }; services.pgadmin = { diff --git a/nixos/tests/pgbouncer.nix b/nixos/tests/pgbouncer.nix index 1e72327d42005..bb5afd35ee28f 100644 --- a/nixos/tests/pgbouncer.nix +++ b/nixos/tests/pgbouncer.nix @@ -17,7 +17,8 @@ in systemd.services.postgresql = { postStart = '' - ${pkgs.postgresql}/bin/psql -U postgres -c "ALTER ROLE testuser WITH LOGIN PASSWORD 'testpass'"; + ${pkgs.postgresql}/bin/psql -U postgres -c "ALTER ROLE testuser WITH LOGIN PASSWORD 'testpass'"; + ${pkgs.postgresql}/bin/psql -U postgres -c "ALTER DATABASE testdb OWNER TO testuser;"; ''; }; @@ -28,9 +29,6 @@ in ensureUsers = [ { name = "testuser"; - ensurePermissions = { - "DATABASE testdb" = "ALL PRIVILEGES"; - }; }]; authentication = '' local testdb testuser scram-sha-256 @@ -40,7 +38,7 @@ in pgbouncer = { enable = true; listenAddress = "localhost"; - databases = { testdb = "host=/run/postgresql/ port=5432 auth_user=testuser dbname=testdb"; }; + databases = { test = "host=/run/postgresql/ port=5432 auth_user=testuser dbname=testdb"; }; authType = "scram-sha-256"; authFile = testAuthFile; }; @@ -55,7 +53,7 @@ in # Test if we can make a query through PgBouncer one.wait_until_succeeds( - "psql 'postgres://testuser:testpass@localhost:6432/testdb' -c 'SELECT 1;'" + "psql 'postgres://testuser:testpass@localhost:6432/test' -c 'SELECT 1;'" ) ''; }) diff --git a/nixos/tests/plantuml-server.nix b/nixos/tests/plantuml-server.nix new file mode 100644 index 0000000000000..460c30919aecf --- /dev/null +++ b/nixos/tests/plantuml-server.nix @@ -0,0 +1,20 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "plantuml-server"; + meta.maintainers = with lib.maintainers; [ anthonyroussel ]; + + nodes.machine = { pkgs, ... }: { + environment.systemPackages = [ pkgs.curl ]; + services.plantuml-server.enable = true; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("plantuml-server.service") + machine.wait_for_open_port(8080) + + with subtest("Generate chart"): + chart_id = machine.succeed("curl -sSf http://localhost:8080/plantuml/coder -d 'Alice -> Bob'") + machine.succeed("curl -sSf http://localhost:8080/plantuml/txt/{}".format(chart_id)) + ''; +}) diff --git a/nixos/tests/pleroma.nix b/nixos/tests/pleroma.nix index c80f48e52ed51..08a01585f8778 100644 --- a/nixos/tests/pleroma.nix +++ b/nixos/tests/pleroma.nix @@ -25,18 +25,6 @@ import ./make-test-python.nix ({ pkgs, ... }: let - # Fix for https://github.com/ihabunek/toot/pull/405. Includes - # https://github.com/ihabunek/toot/pull/405. TOREMOVE when - # toot > 0.38.1 - patched-toot = pkgs.toot.overrideAttrs (old: { - version = "unstable-24-09-2023"; - src = pkgs.fetchFromGitHub { - owner = "ihabunek"; - repo = "toot"; - rev = "30857f570d64a26da80d0024227a8259f7cb65b5"; - sha256 = "sha256-BxrI7UY9bfqPzS+VLqCFSmu4PkIkvhntcEeNJb1AzOs="; - }; - }); send-toot = pkgs.writeScriptBin "send-toot" '' set -eux # toot is using the requests library internally. This library @@ -195,7 +183,7 @@ import ./make-test-python.nix ({ pkgs, ... }: security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ]; networking.extraHosts = hosts nodes; environment.systemPackages = with pkgs; [ - patched-toot + pkgs.toot send-toot ]; }; diff --git a/nixos/tests/powerdns-admin.nix b/nixos/tests/powerdns-admin.nix index d7bacb24eec5d..d326d74a98261 100644 --- a/nixos/tests/powerdns-admin.nix +++ b/nixos/tests/powerdns-admin.nix @@ -87,9 +87,7 @@ let ensureUsers = [ { name = "powerdnsadmin"; - ensurePermissions = { - "DATABASE powerdnsadmin" = "ALL PRIVILEGES"; - }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/tests/sftpgo.nix b/nixos/tests/sftpgo.nix index db0098d2ac48c..a5bb1981d2c3c 100644 --- a/nixos/tests/sftpgo.nix +++ b/nixos/tests/sftpgo.nix @@ -156,7 +156,7 @@ in ensureDatabases = [ "sftpgo" ]; ensureUsers = [{ name = "sftpgo"; - ensurePermissions."DATABASE sftpgo" = "ALL PRIVILEGES"; + ensureDBOwnership = true; }]; }; diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix index 13007d0d80d84..a592504addc03 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -277,4 +277,20 @@ in machine.wait_for_unit("multi-user.target") ''; }; + + no-bootspec = makeTest + { + name = "systemd-boot-no-bootspec"; + meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; + + nodes.machine = { + imports = [ common ]; + boot.bootspec.enable = false; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("multi-user.target") + ''; + }; } diff --git a/nixos/tests/tandoor-recipes.nix b/nixos/tests/tandoor-recipes.nix index f3369da99a055..18beaac6f062c 100644 --- a/nixos/tests/tandoor-recipes.nix +++ b/nixos/tests/tandoor-recipes.nix @@ -5,6 +5,29 @@ import ./make-test-python.nix ({ lib, ... }: { nodes.machine = { pkgs, ... }: { services.tandoor-recipes = { enable = true; + extraConfig = { + DB_ENGINE = "django.db.backends.postgresql"; + POSTGRES_HOST = "/run/postgresql"; + POSTGRES_USER = "tandoor_recipes"; + POSTGRES_DB = "tandoor_recipes"; + }; + }; + + services.postgresql = { + enable = true; + ensureDatabases = [ "tandoor_recipes" ]; + ensureUsers = [ + { + name = "tandoor_recipes"; + ensureDBOwnership = true; + } + ]; + }; + + systemd.services = { + tandoor-recipes = { + after = [ "postgresql.service" ]; + }; }; }; diff --git a/nixos/tests/vikunja.nix b/nixos/tests/vikunja.nix index 2660aa9767ca7..60fd5ce13854e 100644 --- a/nixos/tests/vikunja.nix +++ b/nixos/tests/vikunja.nix @@ -33,7 +33,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { ensureDatabases = [ "vikunja-api" ]; ensureUsers = [ { name = "vikunja-api"; - ensurePermissions = { "DATABASE \"vikunja-api\"" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/tests/wiki-js.nix b/nixos/tests/wiki-js.nix index fd054a9c59093..8b3c51935a6c4 100644 --- a/nixos/tests/wiki-js.nix +++ b/nixos/tests/wiki-js.nix @@ -10,14 +10,15 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { enable = true; settings.db.host = "/run/postgresql"; settings.db.user = "wiki-js"; + settings.db.db = "wiki-js"; settings.logLevel = "debug"; }; services.postgresql = { enable = true; - ensureDatabases = [ "wiki" ]; + ensureDatabases = [ "wiki-js" ]; ensureUsers = [ { name = "wiki-js"; - ensurePermissions."DATABASE wiki" = "ALL PRIVILEGES"; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix index 937b505af2acd..592af9a094f1d 100644 --- a/nixos/tests/wordpress.nix +++ b/nixos/tests/wordpress.nix @@ -67,7 +67,7 @@ rec { networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; }; }) {} [ - "6_3" + "6_3" "6_4" ]; testScript = '' diff --git a/pkgs/applications/audio/aucatctl/default.nix b/pkgs/applications/audio/aucatctl/default.nix index cf53a20700a52..d3f814a7db897 100644 --- a/pkgs/applications/audio/aucatctl/default.nix +++ b/pkgs/applications/audio/aucatctl/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ sndio ] - ++ lib.optional (!stdenv.isDarwin && !stdenv.targetPlatform.isBSD) + ++ lib.optional (!stdenv.isDarwin && !stdenv.hostPlatform.isBSD) libbsd; outputs = [ "out" "man" ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { preBuild = '' makeFlagsArray+=("PREFIX=$out") '' + lib.optionalString - (!stdenv.isDarwin && !stdenv.targetPlatform.isBSD) '' + (!stdenv.isDarwin && !stdenv.hostPlatform.isBSD) '' makeFlagsArray+=(LDADD="-lsndio -lbsd") # Fix warning about implicit declaration of function 'strlcpy' diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index d3c1d868d21fb..05094d655b9dc 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake , makeWrapper , wrapGAppsHook @@ -15,6 +14,8 @@ , lv2 , lilv , mpg123 +, opusfile +, rapidjson , serd , sord , sqlite @@ -61,13 +62,13 @@ stdenv.mkDerivation rec { pname = "audacity"; - version = "3.3.3"; + version = "3.4.1"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "audacity"; + repo = "audacity"; rev = "Audacity-${version}"; - hash = "sha256-m38Awdv2ew+MKqd68x/ZsRBwidM2KJ3BRykIKgnFSx4="; + hash = "sha256-g9VdwVRrZrIKd4VUU12C691aM2ilgTJdW5Ic7sokk4M="; }; postPatch = '' @@ -77,7 +78,7 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isLinux '' substituteInPlace libraries/lib-files/FileNames.cpp \ --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h - '' + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinMinVersion "11.0") '' + '' + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") '' sed -z -i "s/NSAppearanceName.*systemAppearance//" src/AudacityApp.mm ''; @@ -109,8 +110,10 @@ stdenv.mkDerivation rec { lilv lv2 mpg123 + opusfile pcre portmidi + rapidjson serd sord soundtouch diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 34b4b7ab18833..f2627d65ff561 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -121,6 +121,13 @@ in clangStdenv.mkDerivation { ./autogen.sh ''; + postPatch = '' + # Fix the build on c++17 compiler: + # https://github.com/DeaDBeeF-Player/deadbeef/issues/3012 + # TODO: remove after 1.9.5 release. + substituteInPlace plugins/adplug/Makefile.am --replace 'adplug_la_CXXFLAGS = ' 'adplug_la_CXXFLAGS = -std=c++11 ' + ''; + meta = with lib; { description = "Ultimate Music Player for GNU/Linux"; homepage = "http://deadbeef.sourceforge.net/"; diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index a773bbfa1c545..f0aebf4e4a32a 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , autoconf , automake , which @@ -33,7 +34,13 @@ stdenv.mkDerivation rec { hash = "sha256-aAJ+k+kkOS6k835mEW7BvgAIYGhUHxf7Q4P5cKO8XTk="; }; - patches = lib.optionals mbrolaSupport [ + patches = [ + # Fix build with Clang 16. + (fetchpatch { + url = "https://github.com/espeak-ng/espeak-ng/commit/497c6217d696c1190c3e8b992ff7b9110eb3bedd.patch"; + hash = "sha256-KfzqnRyQfz6nuMKnsHoUzb9rn9h/Pg54mupW1Cr+Zx0="; + }) + ] ++ lib.optionals mbrolaSupport [ # Hardcode correct mbrola paths. (substituteAll { src = ./mbrola.patch; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 503e72dfe0e30..34329fb2ea84d 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,29 +1,19 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, buildPackages, pkg-config, cmake +{ stdenv, lib, fetchFromGitHub, buildPackages, pkg-config, cmake , alsa-lib, glib, libjack2, libsndfile, libpulseaudio , AppKit, AudioUnit, CoreAudio, CoreMIDI, CoreServices }: stdenv.mkDerivation rec { pname = "fluidsynth"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - sha256 = "sha256-RqhlpvMbRSwdcY2uuFAdJnihN3aObcLVMuvCZ294dgo="; + hash = "sha256-3qLmo9Ibl44v6Jj5Ix17ixwqfPt3ITTXUqBETF5pzE4="; }; - patches = [ - # Fixes bad CMAKE_INSTALL_PREFIX + CMAKE_INSTALL_LIBDIR concatenation for Darwin install name dir - # Remove when PR merged & in release - (fetchpatch { - name = "0001-Fix-incorrect-way-of-turning-CMAKE_INSTALL_LIBDIR-absolute.patch"; - url = "https://github.com/FluidSynth/fluidsynth/pull/1261/commits/03cd38dd909fc24aa39553d869afbb4024416de8.patch"; - hash = "sha256-nV+MbFttnbNBO4zWnPLpnnEuoiESkV9BGFlUS9tQQfk="; - }) - ]; - outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ]; diff --git a/pkgs/applications/audio/galaxy-buds-client/default.nix b/pkgs/applications/audio/galaxy-buds-client/default.nix index f3a0ba8c6e933..15125358e4647 100644 --- a/pkgs/applications/audio/galaxy-buds-client/default.nix +++ b/pkgs/applications/audio/galaxy-buds-client/default.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "galaxy-buds-client"; - version = "4.5.2"; + version = "4.5.4"; src = fetchFromGitHub { owner = "ThePBone"; repo = "GalaxyBudsClient"; rev = version; - hash = "sha256-bnJ1xvqos+JP0KF8Z7mX8/8IozcaRCgaRL3cSO3V120="; + hash = "sha256-mmhXTtESjc8uNULc9zV2Qy/815BEEL7ybdnjArF2CXY="; }; projectFile = [ "GalaxyBudsClient/GalaxyBudsClient.csproj" ]; diff --git a/pkgs/applications/audio/galaxy-buds-client/deps.nix b/pkgs/applications/audio/galaxy-buds-client/deps.nix index d45dd12b8b20a..1e72808d90681 100644 --- a/pkgs/applications/audio/galaxy-buds-client/deps.nix +++ b/pkgs/applications/audio/galaxy-buds-client/deps.nix @@ -2,33 +2,42 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "0.10.14"; sha256 = "0nn3xgkf7v47dwpnsxjg0b25ifqa4mbq02ja5rvnlc3q2k6k0fxv"; }) + (fetchNuGet { pname = "Avalonia"; version = "0.10.18"; sha256 = "01x7fc8rdkzba40piwi1ngsk7f8jawzn5bcq2la96hphsiahaarh"; }) (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.14"; sha256 = "0diw3l2nblapvvhnpl28fcgmqg845rlp8cszcvzhd8g6mcm54r7i"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.14"; sha256 = "0r0p1g80pj06d8i7mq0kj00bpnsdlrxkh31r9166c779in34y946"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.14"; sha256 = "133w2s2jrjj8731s7xq06c8b4zwn00lb7cn8c1iypqaa82krvkq2"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.14"; sha256 = "06v18kmq10z5gmdqpnvn3aws2ir14gnnz0gvkbj7f68bfggzcg3s"; }) - (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "0.10.14"; sha256 = "1qmggiigsn2rkqr0fhrfvyx138dvazihj64r1s4azq014530r0pk"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.14"; sha256 = "1h0h20cq6hds2mljn1457s42n6pcq821l1d6da2ijncmhk6rdwnl"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.14"; sha256 = "1hnski71ynqqlddfnbhall4fx3ndh04774kzykzparm8nd9aqaam"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.13"; sha256 = "0k5y0w164m03q278m4wr7zzf3vfq9nb0am9vmmprivpn1xwwa7ml"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.14"; sha256 = "1cvyg94avqdscniszshx5r3vfvx0cnna262sp89ad4bianmd4qkj"; }) - (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "0.10.13"; sha256 = "1msrsxzya1l0grfxk17yizfvy2vg4i7hyw1aw54s8gf7x3gpzn86"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.14"; sha256 = "1c1jdxsnqrzwrcalrvc7x34x1zxc5qcpfxx4fkqca99ngw4b0blj"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.14"; sha256 = "182nza6rqndxlwi089r06ladfc6j8vsgqzd7xq21s91zbcbcidar"; }) - (fetchNuGet { pname = "Avalonia.Xaml.Behaviors"; version = "0.10.13"; sha256 = "0cs42z2vz679mdic7fbxzjs53xm2lp37wcnh843nz86qvma5280k"; }) - (fetchNuGet { pname = "Avalonia.Xaml.Interactions"; version = "0.10.13"; sha256 = "0s5fcsy2hs2wphd5cs4dnk4aw8zs5bbzisg0ba5akqpzwpps8fs1"; }) - (fetchNuGet { pname = "Avalonia.Xaml.Interactivity"; version = "0.10.13"; sha256 = "19kxbgs0nbiw9zq1f9fsawnw0sl5c880z2dfidnjp99vvfda9rzs"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.18"; sha256 = "1qbb527jvhv2p8dcxi7lhm3lczy96j546gb5w09gh90dmzaq45bw"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.18"; sha256 = "0iaby5696km0yl0bs2a8i6a5ypras54mimnmh9wjwarwniqj8yjs"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.18"; sha256 = "1qsrzv1fz73p46p9v60qqds229znfv9hawnams5hxwl46jn2v9cp"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.18"; sha256 = "173apfayxkm3lgj7xk9xzsbxmdhv44svr49ccqnd1dii7y69bgny"; }) + (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "0.10.18"; sha256 = "0vcbhwckzxgcq9wxim91zk30kzjaydr9szl4rbr3rz85447hj9pi"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.18"; sha256 = "1hvmjs7wfcbycviky79g1p5q3bzs8j31sr53nnqxqy6pnbmg0nxg"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.18"; sha256 = "0phxxz4r1llklvp4svy9qlsms3qw77crai3ww70g03fifmmr9qq2"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.16"; sha256 = "1rla042nc9mc36qnpipszrf0sffwi5d83cr9dmihpa015bby42pz"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.18"; sha256 = "1vi83d9q6m2zd7b5snyzjxsj3vdp5bmi5vqhfslzghslpbhj2zwv"; }) + (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "0.10.16"; sha256 = "1gsm421gzzymc6rys4sw4hds33grg2mwpnm5xpbhwfh4bnbfblg8"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.18"; sha256 = "1rvqydbzdi2n6jw4xx9q8i025w5zsgcli9vmv0vw1d51rd4cnc4k"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.18"; sha256 = "0bzhbnz0dimxbpjxcrphnjn8nk37hqw0b83s2nsha4gzqvpc75b2"; }) + (fetchNuGet { pname = "Avalonia.Xaml.Behaviors"; version = "0.10.17"; sha256 = "05g761may9xa1n75lmzib5hknjk7k0nz453bmg2d5m0xxqw6yc13"; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactions"; version = "0.10.17"; sha256 = "0k0xnbayplndc6xld98jdla8zv769aj5s285cpbdgm2dril0rywj"; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactivity"; version = "0.10.17"; sha256 = "0smxxr0b8585x0fq57y3jcaxpl5qyxmkr0c6pd83bsczk8p4rjfy"; }) (fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; }) (fetchNuGet { pname = "Config.Net"; version = "4.15.0"; sha256 = "0hsyma0r8hssz2h7bx38rr8ajx28x5ya2h4k665cbd65z3cs1di1"; }) (fetchNuGet { pname = "Config.Net.Json"; version = "4.15.0"; sha256 = "1q6v4pj76h0hhn26ln4kc8vg75jm8jnlp1ssnrqzwxy88yf82z4h"; }) (fetchNuGet { pname = "CS-Script.Core"; version = "1.4.2-preview"; sha256 = "0djliiixl3ncc1b29s9knal1ascg359na0pacsm73p98ad1f7pzh"; }) - (fetchNuGet { pname = "Fizzler"; version = "1.2.0"; sha256 = "1b8kvqli5wql53ab9fwyg78h572z4f286s8rjb9xxmsyav1hsyll"; }) + (fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; }) + (fetchNuGet { pname = "Fizzler"; version = "1.2.1"; sha256 = "1w5jb1d0figbv68dydbnlcsfmqlc3sv9z1zxp7d79dg2dkarc4qm"; }) (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2-preview.178"; sha256 = "1p5nwzl7jpypsd6df7hgcf47r977anjlyv21wacmalsj6lvdgnvn"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.1-preview.1"; sha256 = "1g5g7mnfr668hww9r84pfl04x0s44cq5ppykqg406a0lkdb2g8yp"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.1-preview.108"; sha256 = "0xs4px4fy5b6glc77rqswzpi5ddhxvbar1md6q9wla7hckabnq0z"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2-preview.178"; sha256 = "1402ylkxbgcnagcarqlfvg4gppy2pqs3bmin4n5mphva1g7bqb2p"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.1-preview.108"; sha256 = "16wvgvyra2g1b38rxxgkk85wbz89hspixs54zfcm4racgmj1mrj4"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2-preview.178"; sha256 = "0p8miaclnbfpacc1jaqxwfg0yfx9byagi4j4k91d9621vd19i8b2"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.1-preview.1"; sha256 = "0z0fadsicysa77ji4fnjkaaqfpc0d1w7x9qlkq40kb3jg7xhsmyx"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.1-preview.108"; sha256 = "16v7lrwwif2f5zfkx08n6y6w3m56mh4hy757biv0w9yffaf200js"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2-preview.178"; sha256 = "1n9jay9sji04xly6n8bzz4591fgy8i65p21a8mv5ip9lsyj1c320"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.1-preview.108"; sha256 = "15kqb353snwpavz3jja63mq8xjqsrw1f902scm8wxmsqrm5q6x55"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2-preview.178"; sha256 = "1r5syii96wv8q558cvsqw3lr10cdw6677lyiy82p6i3if51v3mr7"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.1"; sha256 = "15671jvv5j98rkv249nn1fchxcd9gq8b37iwjqbmijig3r4ir718"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.108"; sha256 = "0n6ymn9jqms3mk5hg0ar4y9jmh96myl6q0jimn7ahb1a8viq55k1"; }) (fetchNuGet { pname = "InputSimulatorCore"; version = "1.0.5"; sha256 = "1vfqhqjcrpzahhvv5kyh6pk6j5c06wd0b2831y31fbxpdkxhbs2p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) (fetchNuGet { pname = "libsodium"; version = "1.0.18"; sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; }) @@ -112,16 +121,21 @@ (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; sha256 = "1i7j870l47gan3gpnnlzkccn5lbm7518cnkp25a3g5gp9l0dbwpw"; }) (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) (fetchNuGet { pname = "Serilog.Sinks.Trace"; version = "3.0.0"; sha256 = "10byjmh2s0c13lmnzfw24qmr11kry9hg9y5fib3556y7759qwbqv"; }) - (fetchNuGet { pname = "ShimSkiaSharp"; version = "0.5.13"; sha256 = "0gzsiv85g0i8jmjl0nplvljqrgc4y42ds1q0f1x1hdqbnn7vsav2"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.0-preview.178"; sha256 = "062g14s6b2bixanpwihj3asm3jwvfw15mhvzqv6901afrlgzx4nk"; }) - (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.0-preview.178"; sha256 = "1gwk81iq6zipab3dhpwydrqm2mqz67hpx7asvhna3mx0phrp2zqd"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.0-preview.178"; sha256 = "07kga1j51l3l302nvf537zg5clf6rflinjy0xd6i06cmhpkf3ksw"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.0-preview.178"; sha256 = "14p95nxccs6yq4rn2h9zbb60k0232k6349zdpy31jcfr6gc99cgi"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.0-preview.178"; sha256 = "09jmcg5k1vpsal8jfs90mwv0isf2y5wq3h4hd77rv6vffn5ic4sm"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.0-preview.178"; sha256 = "0ficil702lv3fvwpngbqh5l85i05l5jafzyh4jprzshr2qbnd8nl"; }) - (fetchNuGet { pname = "Svg.Custom"; version = "0.5.13"; sha256 = "1a6rwgwwqg98dhk5hdb38iffa39khcrvfwskl6i5j3xgvgzzq2lx"; }) - (fetchNuGet { pname = "Svg.Model"; version = "0.5.13"; sha256 = "0rxm79asyx1dji8x7q1z47mzy6zh8qbgw7py6xfkfj89cai6x4p8"; }) - (fetchNuGet { pname = "Svg.Skia"; version = "0.5.13"; sha256 = "1f00mzx7gzfhy42yldi3jzaivsl3byspak22rji86iq0vczz28zg"; }) + (fetchNuGet { pname = "ShimSkiaSharp"; version = "0.5.16"; sha256 = "06qf63bx6m18wbhvzfs89m5yl5s08spgg02gr7qy8j36r04k6cc5"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1-preview.1"; sha256 = "1i1px67hcr9kygmbfq4b9nqzlwm7v2gapsp4isg9i19ax5g8dlhm"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1-preview.108"; sha256 = "01sm36hdgmcgkai9m09xn2qfz8v7xhh803n8fng8rlxwnw60rgg6"; }) + (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.1-preview.1"; sha256 = "0r14s3zyn3cpic02j80xjh8x6dd8g671f9nfnng5zk1x497qdw3a"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1-preview.1"; sha256 = "1r9qr3civk0ws1z7hg322qyr8yjm10853zfgs03szr2lvdqiy7d1"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1-preview.108"; sha256 = "19jf2jcq2spwbpx3cfdi2a95jf4y8205rh56lmkh8zsxd2k7fjyp"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1-preview.1"; sha256 = "1w55nrwpl42psn6klia5a9aw2j1n25hpw2fdhchypm9f0v2iz24h"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1-preview.108"; sha256 = "1vcpqd7slh2b9gsacpd7mk1266r1xfnkm6230k8chl3ng19qlf15"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.1"; sha256 = "0mwj2yl4gn40lry03yqkj7sbi1drmm672dv88481sgah4c21lzrq"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.108"; sha256 = "0a89gqjw8k97arr0kyd0fm3f46k1qamksbnyns9xdlgydjg557dd"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.1"; sha256 = "1k50abd147pif9z9lkckbbk91ga1vv6k4skjz2n7wpll6fn0fvlv"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.108"; sha256 = "05g9blprq5msw3wshrgsk19y0fvhjlqiybs1vdyhfmww330jlypn"; }) + (fetchNuGet { pname = "Svg.Custom"; version = "0.5.16"; sha256 = "0qp0vmknclaahf1aj8y2jl4xbaq30rf4ia55fpawxi25dfxsa4wy"; }) + (fetchNuGet { pname = "Svg.Model"; version = "0.5.16"; sha256 = "0c2hk7wgvd2lbc96jxnkcwmzbbdnwgnhh4km9ijb5248qkghs1b1"; }) + (fetchNuGet { pname = "Svg.Skia"; version = "0.5.16"; sha256 = "0ra6svakyg5h6m19ww5yrxl85w8yi3v5vrzqgcnqlvzndk696cyf"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) @@ -154,6 +168,7 @@ (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) diff --git a/pkgs/applications/audio/industrializer/default.nix b/pkgs/applications/audio/industrializer/default.nix index 97862104a057c..80cb8f76981d7 100644 --- a/pkgs/applications/audio/industrializer/default.nix +++ b/pkgs/applications/audio/industrializer/default.nix @@ -6,6 +6,7 @@ , automake , gnome2 , gtk2 +, libGL , libjack2 , libtool , libxml2 @@ -27,6 +28,7 @@ stdenv.mkDerivation rec { audiofile gnome2.gtkglext gtk2 + libGL libjack2 libtool libxml2 diff --git a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix index 935e3a9503836..032ee8ec03c6b 100644 --- a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix +++ b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, faust, meson, ninja, pkg-config -, boost, cairo, fftw, ladspa-sdk, libxcb, lv2, xcbutilwm +, boost, cairo, fftw, ladspa-sdk, libxcb, lv2, xcbutilwm, xorg , zita-convolver, zita-resampler }: @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { libxcb lv2 xcbutilwm + xorg.xcbutil zita-convolver zita-resampler ]; diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 348dcfb5986f1..94ee6ad53e69f 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -21,11 +21,11 @@ assert withConplay -> !libOnly; stdenv.mkDerivation rec { pname = "${lib.optionalString libOnly "lib"}mpg123"; - version = "1.31.3"; + version = "1.32.3"; src = fetchurl { url = "mirror://sourceforge/mpg123/mpg123-${version}.tar.bz2"; - hash = "sha256-HKd9Omml/4RbegU294P+5VThBBE5prl49q/hT1gUrRo="; + hash = "sha256-LZkTpX1O6PSXoYLG6CWCYCQJeCpPtIHpif7r9ENYZ7Q="; }; outputs = [ "out" "dev" "man" ] ++ lib.optional withConplay "conplay"; diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/applications/audio/paulstretch/default.nix index 5e781a9f51158..d85b543baed45 100644 --- a/pkgs/applications/audio/paulstretch/default.nix +++ b/pkgs/applications/audio/paulstretch/default.nix @@ -30,8 +30,9 @@ stdenv.mkDerivation { ]; patches = [ + # https://github.com/paulnasca/paulstretch_cpp/pull/12 (fetchpatch { - url = "https://github.com/paulnasca/paulstretch_cpp/pull/12.patch"; + url = "https://github.com/paulnasca/paulstretch_cpp/commit/d8671b36135fe66839b11eadcacb474cc8dae0d1.patch"; sha256 = "0lx1rfrs53afkiz1drp456asqgj5yv6hx3lkc01165cv1jsbw6q4"; }) ]; diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index b5cf860ad9b7c..dcbb7586eebe9 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -2,6 +2,7 @@ , fetchurl , autoPatchelfHook , makeWrapper +, undmg , alsa-lib , curl @@ -14,14 +15,16 @@ , xdotool , which -, jackSupport ? true +, jackSupport ? stdenv.isLinux , jackLibrary -, pulseaudioSupport ? config.pulseaudio or true +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux , libpulseaudio }: let - url_for_platform = version: arch: "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${arch}.tar.xz"; + url_for_platform = version: arch: if stdenv.isDarwin + then "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_universal.dmg" + else "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${arch}.tar.xz"; in stdenv.mkDerivation rec { pname = "reaper"; @@ -29,26 +32,32 @@ stdenv.mkDerivation rec { src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; - hash = { + hash = if stdenv.isDarwin then "sha256-jaT+3cIFVfBopgeeTkpNs9rFX50unlPJogdhkI9bsWU=" else { x86_64-linux = "sha256-P/PnbJPr4ErDz5ho1/dLERhqkKjdetHzKpCpfVZAYb0="; aarch64-linux = "sha256-PdnBVlHwoEEv2SPq/p5oyiOlduCEqL35gAY+QIJU1Ys="; }.${stdenv.hostPlatform.system}; }; nativeBuildInputs = [ - autoPatchelfHook makeWrapper - xdg-utils # Required for desktop integration + ] ++ lib.optionals stdenv.isLinux [ which + autoPatchelfHook + xdg-utils # Required for desktop integration + ] ++ lib.optionals stdenv.isDarwin [ + undmg ]; + sourceRoot = lib.optionalString stdenv.isDarwin "Reaper.app"; + buildInputs = [ - alsa-lib stdenv.cc.cc.lib # reaper and libSwell need libstdc++.so.6 + ] ++ lib.optionals stdenv.isLinux [ gtk3 + alsa-lib ]; - runtimeDependencies = [ + runtimeDependencies = lib.optionals stdenv.isLinux [ gtk3 # libSwell needs libgdk-3.so.0 ] ++ lib.optional jackSupport jackLibrary @@ -56,7 +65,13 @@ stdenv.mkDerivation rec { dontBuild = true; - installPhase = '' + installPhase = if stdenv.isDarwin then '' + runHook preInstall + mkdir -p "$out/Applications/Reaper.app" + cp -r * "$out/Applications/Reaper.app/" + makeWrapper "$out/Applications/Reaper.app/Contents/MacOS/REAPER" "$out/bin/reaper" + runHook postInstall + '' else '' runHook preInstall HOME="$out/share" XDG_DATA_HOME="$out/share" ./install-reaper.sh \ @@ -89,7 +104,7 @@ stdenv.mkDerivation rec { homepage = "https://www.reaper.fm/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; maintainers = with maintainers; [ jfrankenau ilian orivej uniquepointer viraptor ]; }; } diff --git a/pkgs/applications/audio/reaper/updater.sh b/pkgs/applications/audio/reaper/updater.sh index 750bea346bbc3..31832f7173c66 100755 --- a/pkgs/applications/audio/reaper/updater.sh +++ b/pkgs/applications/audio/reaper/updater.sh @@ -5,7 +5,7 @@ set -euo pipefail reaper_ver=$(curl -Ls https://www.reaper.fm/download.php | grep -o 'Version [0-9]\.[0-9]*' | head -n1 | cut -d' ' -f2) -function set_hash_for_arch() { +function set_hash_for_linux() { local arch=$1 pkg_hash=$(nix-prefetch-url https://www.reaper.fm/files/${reaper_ver%.*}.x/reaper${reaper_ver/./}_linux_$arch.tar.xz) pkg_hash=$(nix hash to-sri "sha256:$pkg_hash") @@ -14,5 +14,15 @@ function set_hash_for_arch() { update-source-version reaper "${reaper_ver}" "$pkg_hash" --system=$arch-linux } -set_hash_for_arch aarch64 -set_hash_for_arch x86_64 +function set_hash_for_darwin() { + local arch=$1 + pkg_hash=$(nix-prefetch-url https://www.reaper.fm/files/${reaper_ver%.*}.x/reaper${reaper_ver/./}_universal.dmg) + pkg_hash=$(nix hash to-sri "sha256:$pkg_hash") + # reset the version so the second architecture update doesn't get ignored + update-source-version reaper 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" --system=$arch-darwin + update-source-version reaper "${reaper_ver}" "$pkg_hash" --system=$arch-darwin +} + +set_hash_for_linux aarch64 +set_hash_for_linux x86_64 +set_hash_for_darwin aarch64 diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 1d43d11c60cfd..d1ac18eabbcf3 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, alsa-lib, freetype, ftgl, libjack2, libX11, lv2 +{ lib, stdenv, fetchFromGitHub, fetchpatch, alsa-lib, freetype, ftgl, libjack2, libX11, lv2 , libGLU, libGL, pkg-config, ttf_bitstream_vera }: @@ -10,9 +10,18 @@ stdenv.mkDerivation rec { owner = "pantherb"; repo = "setBfree"; rev = "v${version}"; - sha256 = "sha256-e/cvD/CtT8dY1lYcsZ21DC8pNqKXqKfC/eRXX8k01eI="; + hash = "sha256-e/cvD/CtT8dY1lYcsZ21DC8pNqKXqKfC/eRXX8k01eI="; }; + patches = [ + # link with -lGL can remove on next update + (fetchpatch { + name = "ui-add-lGL.patch"; + url = "https://github.com/pantherb/setBfree/commit/756437db43fbf5481f101d8fc695f8b11192047f.patch"; + hash = "sha256-49PYTayD4TchAApfFvj3DLc4EBTxH8LYx48TtdSRwwA="; + }) + ]; + postPatch = '' substituteInPlace common.mak \ --replace /usr/local "$out" \ diff --git a/pkgs/applications/audio/stone-phaser/default.nix b/pkgs/applications/audio/stone-phaser/default.nix index b9ca1a1790de8..4feaf9cd99ac2 100644 --- a/pkgs/applications/audio/stone-phaser/default.nix +++ b/pkgs/applications/audio/stone-phaser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, libjack2, mesa, pkg-config }: +{ lib, stdenv, fetchFromGitHub, xorg, cairo, libGL, lv2, libjack2, mesa, pkg-config }: stdenv.mkDerivation rec { pname = "stone-phaser"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 cairo lv2 libjack2 mesa + xorg.libX11 cairo libGL lv2 libjack2 mesa ]; postPatch = '' diff --git a/pkgs/applications/audio/string-machine/default.nix b/pkgs/applications/audio/string-machine/default.nix index a146ea8cd977a..312cf1db5bac2 100644 --- a/pkgs/applications/audio/string-machine/default.nix +++ b/pkgs/applications/audio/string-machine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost, cairo, lv2, pkg-config }: +{ lib, stdenv, fetchFromGitHub, boost, cairo, libGL, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "string-machine"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - boost cairo lv2 + boost cairo libGL lv2 ]; makeFlags = [ diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 52ddd5302191e..47c2297274c89 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tauon"; - version = "7.6.7"; + version = "7.7.0"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${finalAttrs.version}"; - hash = "sha256-d25JM2LUQw6KYPojc+Pn40IwCYWLE9un0YAMIBC1NVg="; + hash = "sha256-FNRG0NKHQpPHb3P1M0eshFuGu9lyWFgmufFC5aqr7n0="; }; postUnpack = '' diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index 865d82a73562c..877f670d68617 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libogg, libvorbis, libao, pkg-config, curl +{ lib, stdenv, fetchurl, fetchpatch, libogg, libvorbis, libao, pkg-config, curl, libiconv , speex, flac , autoreconfHook }: @@ -11,8 +11,18 @@ stdenv.mkDerivation rec { sha256 = "1c7h4ivgfdyygz2hyh6nfibxlkz8kdk868a576qkkjgj5gn78xyv"; }; + patches = lib.optionals stdenv.cc.isClang [ + # Fixes a call to undeclared function `utf8_decode`. + # https://github.com/xiph/vorbis-tools/pull/33 + (fetchpatch { + url = "https://github.com/xiph/vorbis-tools/commit/8a645f78b45ae7e370c0dc2a52d0f2612aa6110b.patch"; + hash = "sha256-RkT9Xa0pRu/oO9E9qhDa17L0luWgYHI2yINIkPZanmI="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libogg libvorbis libao curl speex flac ]; + buildInputs = [ libogg libvorbis libao curl speex flac ] + ++ lib.optionals stdenv.isDarwin [ libiconv ]; meta = with lib; { description = "Extra tools for Ogg-Vorbis audio codec"; diff --git a/pkgs/applications/backup/proxmox-backup-client/default.nix b/pkgs/applications/backup/proxmox-backup-client/default.nix index 49ad9cccc9ce3..8e6da71a1eadb 100644 --- a/pkgs/applications/backup/proxmox-backup-client/default.nix +++ b/pkgs/applications/backup/proxmox-backup-client/default.nix @@ -88,7 +88,7 @@ rustPlatform.buildRustPackage { postBuild = '' make -C docs \ DEB_VERSION=${version} DEB_VERSION_UPSTREAM=${version} \ - RUSTC_TARGET=${stdenv.targetPlatform.config} \ + RUSTC_TARGET=${stdenv.hostPlatform.config} \ BUILD_MODE=release \ proxmox-backup-client.1 pxar.1 ''; diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index c07f94e5baeeb..dbada09c1b6e9 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -1,5 +1,5 @@ { autoreconfHook, boost180, cargo, coreutils, curl, cxx-rs, db62, fetchFromGitHub -, git, hexdump, lib, libevent, libsodium, makeWrapper, rust, rustPlatform +, git, hexdump, lib, libevent, libsodium, makeWrapper, rustPlatform , pkg-config, Security, stdenv, testers, tl-expected, utf8cpp, util-linux, zcash, zeromq }: @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec { configureFlags = [ "--disable-tests" "--with-boost-libdir=${lib.getLib boost180}/lib" - "RUST_TARGET=${rust.toRustTargetSpec stdenv.hostPlatform}" + "RUST_TARGET=${stdenv.hostPlatform.rust.rustcTargetSpec}" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/cosmic-edit/default.nix b/pkgs/applications/editors/cosmic-edit/default.nix index 9b53bb5ef9263..2adfc012bc6cf 100644 --- a/pkgs/applications/editors/cosmic-edit/default.nix +++ b/pkgs/applications/editors/cosmic-edit/default.nix @@ -15,11 +15,6 @@ , fontconfig , freetype , wayland -, expat -, udev -, which -, lld -, util-linuxMinimal }: rustPlatform.buildRustPackage rec { @@ -51,8 +46,8 @@ rustPlatform.buildRustPackage rec { substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" ''; - nativeBuildInputs = [ cmake just pkg-config which lld util-linuxMinimal makeWrapper ]; - buildInputs = [ libxkbcommon libinput fontconfig freetype wayland expat udev glib gtk3 ]; + nativeBuildInputs = [ cmake just pkg-config makeWrapper ]; + buildInputs = [ libxkbcommon libinput fontconfig freetype wayland glib gtk3 ]; dontUseJustBuild = true; @@ -74,6 +69,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-edit"; description = "Text Editor for the COSMIC Desktop Environment"; license = licenses.gpl3Only; + mainProgram = "cosmic-edit"; maintainers = with maintainers; [ ahoneybun ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix index 82f1c6bfaaae8..ff5cce83103e5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix @@ -65,7 +65,7 @@ self: let }); xeft = super.xeft.overrideAttrs (old: let - libExt = pkgs.stdenv.targetPlatform.extensions.sharedLibrary; + libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary; in { dontUnpack = false; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 2808ec7fcc0f5..84c991ad17c27 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -118,7 +118,7 @@ self: let }); jinx = super.jinx.overrideAttrs (old: let - libExt = pkgs.stdenv.targetPlatform.extensions.sharedLibrary; + libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary; in { dontUnpack = false; @@ -159,7 +159,7 @@ self: let ); xeft = super.xeft.overrideAttrs (old: let - libExt = pkgs.stdenv.targetPlatform.extensions.sharedLibrary; + libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary; in { dontUnpack = false; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index ccde3ca0303ba..117adcd47a9c4 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -23,6 +23,8 @@ in ebuild-mode = callPackage ./manual-packages/ebuild-mode { }; + el-easydraw = callPackage ./manual-packages/el-easydraw { }; + elisp-ffi = callPackage ./manual-packages/elisp-ffi { }; emacspeak = callPackage ./manual-packages/emacspeak { }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix new file mode 100644 index 0000000000000..608777208bb6b --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix @@ -0,0 +1,45 @@ +{ lib +, melpaBuild +, fetchFromGitHub +, writeText +, unstableGitUpdater +, gzip +}: + +let + rev = "de68851724072c6695e675f090b33a8abec040c9"; +in +melpaBuild { + pname = "edraw"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "misohena"; + repo = "el-easydraw"; + inherit rev; + hash = "sha256-l9i+HCRKnKiDqID+bfAOPE7LpVBZp1AOPkceX8KbDXM="; + }; + + commit = rev; + + packageRequires = [ gzip ]; + + recipe = writeText "recipe" '' + (edraw + :repo "misohena/el-easydraw" + :fetcher github + :files + ("*.el" + "msg")) + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + homepage = "https://github.com/misohena/el-easydraw"; + description = "Embedded drawing tool for Emacs"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ brahyerr ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index c2754d7fc30f7..cd45cfc787271 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -315,7 +315,7 @@ let ivy-rtags = fix-rtags super.ivy-rtags; jinx = super.jinx.overrideAttrs (old: let - libExt = pkgs.stdenv.targetPlatform.extensions.sharedLibrary; + libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary; in { nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config diff --git a/pkgs/applications/editors/molsketch/default.nix b/pkgs/applications/editors/molsketch/default.nix index 55db4096ce153..aa336ce45e213 100644 --- a/pkgs/applications/editors/molsketch/default.nix +++ b/pkgs/applications/editors/molsketch/default.nix @@ -48,6 +48,6 @@ mkDerivation rec { description = "2D molecule editor"; homepage = "https://sourceforge.net/projects/molsketch/"; license = licenses.gpl2Plus; - maintainers = [ maintainers.fortuneteller2k ]; + maintainers = [ maintainers.moni ]; }; } diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index f1c38d2915dc4..a7e0e4c770577 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -212,7 +212,7 @@ rec { # having no RC generated should autodisable init.vim wrapping nvim_autowrap = runTest nvim_via_override '' - ! grep "-u" ${nvimShouldntWrap}/bin/nvim + ! grep ${nvimShouldntWrap}/bin/nvim ''; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 0fbb54df01acd..d61a2fe5e5a81 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -7,8 +7,10 @@ , neovimUtils , vimUtils , perl +, lndir }: -neovim: + +neovim-unwrapped: let wrapper = { @@ -62,7 +64,7 @@ let # wrapper with most arguments we need, excluding those that cause problems to # generate rplugin.vim, but still required for the final wrapper. finalMakeWrapperArgs = - [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" ] + [ "${neovim-unwrapped}/bin/nvim" "${placeholder "out"}/bin/nvim" ] ++ [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ] ++ lib.optionals wrapRc [ "--add-flags" "-u ${writeText "init.vim" neovimRcContent}" ] ++ commonWrapperArgs @@ -72,36 +74,45 @@ let in assert withPython2 -> throw "Python2 support has been removed from the neovim wrapper, please remove withPython2 and python2Env."; - symlinkJoin { - name = "neovim-${lib.getVersion neovim}${extraName}"; + stdenv.mkDerivation (finalAttrs: { + name = "neovim-${lib.getVersion neovim-unwrapped}${extraName}"; + + __structuredAttrs = true; + dontUnpack = true; + inherit viAlias vimAlias withNodeJs withPython3 withPerl; + inherit wrapRc providerLuaRc packpathDirs; + inherit python3Env rubyEnv; + withRuby = rubyEnv != null; + inherit wrapperArgs; + # Remove the symlinks created by symlinkJoin which we need to perform # extra actions upon postBuild = lib.optionalString stdenv.isLinux '' rm $out/share/applications/nvim.desktop - substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ + substitute ${neovim-unwrapped}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ --replace 'Name=Neovim' 'Name=Neovim wrapper' '' - + lib.optionalString withPython3 '' + + lib.optionalString finalAttrs.withPython3 '' makeWrapper ${python3Env.interpreter} $out/bin/nvim-python3 --unset PYTHONPATH '' - + lib.optionalString (rubyEnv != null) '' - ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby + + lib.optionalString (finalAttrs.rubyEnv != null) '' + ln -s ${finalAttrs.rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby '' - + lib.optionalString withNodeJs '' + + lib.optionalString finalAttrs.withNodeJs '' ln -s ${nodePackages.neovim}/bin/neovim-node-host $out/bin/nvim-node '' - + lib.optionalString withPerl '' + + lib.optionalString finalAttrs.withPerl '' ln -s ${perlEnv}/bin/perl $out/bin/nvim-perl '' - + lib.optionalString vimAlias '' + + lib.optionalString finalAttrs.vimAlias '' ln -s $out/bin/nvim $out/bin/vim '' - + lib.optionalString viAlias '' + + lib.optionalString finalAttrs.viAlias '' ln -s $out/bin/nvim $out/bin/vi '' + lib.optionalString (manifestRc != null) (let manifestWrapperArgs = - [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim-wrapper" ] ++ commonWrapperArgs; + [ "${neovim-unwrapped}/bin/nvim" "${placeholder "out"}/bin/nvim-wrapper" ] ++ commonWrapperArgs; in '' echo "Generating remote plugin manifest" export NVIM_RPLUGIN_MANIFEST=$out/rplugin.vim @@ -139,26 +150,33 @@ let makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${wrapperArgsStr} ''; - paths = [ neovim ]; + buildPhase = '' + runHook preBuild + mkdir -p $out + for i in ${neovim-unwrapped}; do + lndir -silent $i $out + done + runHook postBuild + ''; preferLocalBuild = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper lndir ]; passthru = { inherit providerLuaRc packpathDirs; - unwrapped = neovim; + unwrapped = neovim-unwrapped; initRc = neovimRcContent; tests = callPackage ./tests { }; }; - meta = neovim.meta // { + meta = neovim-unwrapped.meta // { # To prevent builds on hydra hydraPlatforms = []; # prefer wrapper over the package - priority = (neovim.meta.priority or 0) - 1; + priority = (neovim-unwrapped.meta.priority or 0) - 1; }; - }; + }); in lib.makeOverridable wrapper diff --git a/pkgs/applications/editors/ox/default.nix b/pkgs/applications/editors/ox/default.nix index 8822912640079..2e67e83e972b3 100644 --- a/pkgs/applications/editors/ox/default.nix +++ b/pkgs/applications/editors/ox/default.nix @@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/curlpipe/ox"; changelog = "https://github.com/curlpipe/ox/releases/tag/${version}"; license = licenses.gpl2Only; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/applications/editors/qxmledit/default.nix index 4b59da01ba21b..bbb8d39a5f7a2 100644 --- a/pkgs/applications/editors/qxmledit/default.nix +++ b/pkgs/applications/editors/qxmledit/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, qmake, qtbase, qtxmlpatterns, qtsvg, qtscxml -, qtquick1, libGLU }: +, libGLU }: stdenv.mkDerivation rec { pname = "qxmledit"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase qtxmlpatterns qtsvg qtscxml qtquick1 libGLU ]; + buildInputs = [ qtbase qtxmlpatterns qtsvg qtscxml libGLU ]; qmakeFlags = [ "CONFIG+=release" ]; diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index b9a386684f9ed..ef0f15734a24a 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -29,6 +29,12 @@ stdenv.mkDerivation (finalAttrs: { zlib ]; + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p "$out/Applications" + mv "$out/bin/texstudio.app" "$out/Applications" + rm -d "$out/bin" + ''; + meta = with lib; { description = "TeX and LaTeX editor"; longDescription='' @@ -39,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://texstudio.org"; changelog = "https://github.com/texstudio-org/texstudio/blob/${version}/utilities/manual/CHANGELOG.txt"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ ajs124 cfouche ]; }; }) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 0179dabe39454..83d61b37bfc67 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "9.0.1897"; + version = "9.0.2048"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-ywxJ9evXWbqZ6o6EqDIQWK16J05McAdvPl0Y9cW5Zvc="; + hash = "sha256-zR2iPiD4/gf5BnxYoe3cx2ebGWE1P2bY4Cg15gveFgg="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/emulators/dosbox/default.nix b/pkgs/applications/emulators/dosbox/default.nix index 4a6d229762b0e..d0c9d8450e2b4 100644 --- a/pkgs/applications/emulators/dosbox/default.nix +++ b/pkgs/applications/emulators/dosbox/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , autoreconfHook , SDL , SDL_net @@ -23,6 +24,14 @@ stdenv.mkDerivation rec { hash = "sha256-wNE91+0u02O2jeYVR1eB6JHNWC6BYrXDZpE3UCIiJgo="; }; + patches = [ + (fetchpatch { + url = "https://github.com/joncampbell123/dosbox-x/commit/006d5727d36d1ec598e387f2f1a3c521e3673dcb.patch"; + includes = [ "src/gui/render_templates_sai.h" ]; + hash = "sha256-HSO29/LgZRKQ3HQBA0QF5henG8pCSoe1R2joYNPcUcE="; + }) + ]; + nativeBuildInputs = [ autoreconfHook copyDesktopItems diff --git a/pkgs/applications/gis/grass/clang-integer-conversion.patch b/pkgs/applications/gis/grass/clang-integer-conversion.patch new file mode 100644 index 0000000000000..85145f45c37d0 --- /dev/null +++ b/pkgs/applications/gis/grass/clang-integer-conversion.patch @@ -0,0 +1,21 @@ +diff -ur a/db/drivers/mysql/db.c b/db/drivers/mysql/db.c +--- a/db/drivers/mysql/db.c 1969-12-31 19:00:01.000000000 -0500 ++++ b/db/drivers/mysql/db.c 2023-11-09 23:26:25.329700495 -0500 +@@ -52,9 +52,16 @@ + + db_get_login2("mysql", name, &user, &password, &host, &port); + ++ const char* errstr; ++ unsigned int port_number = (unsigned int)strtonum(port, 0, 65536, &errstr); ++ if (errstr != NULL) { ++ db_d_append_error("%s", errstr); ++ return DB_FAILED; ++ } ++ + connection = mysql_init(NULL); + res = mysql_real_connect(connection, host, user, password, +- connpar.dbname, port, NULL, 0); ++ connpar.dbname, port_number, NULL, 0); + + if (res == NULL) { + db_d_append_error("%s\n%s", _("Connection failed."), diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 0f250a80b9704..cd0d6dbc93863 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -81,12 +81,13 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - # On Darwin the installer tries to symlink the help files into a system - # directory - patches = [ ./no_symbolic_links.patch ]; + patches = lib.optionals stdenv.isDarwin [ + # Fix conversion of const char* to unsigned int. + ./clang-integer-conversion.patch + ]; # Correct mysql_config query - patchPhase = '' + postPatch = '' substituteInPlace configure --replace "--libmysqld-libs" "--libs" ''; diff --git a/pkgs/applications/gis/grass/no_symbolic_links.patch b/pkgs/applications/gis/grass/no_symbolic_links.patch deleted file mode 100644 index ef09b97b70371..0000000000000 --- a/pkgs/applications/gis/grass/no_symbolic_links.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/include/Make/Install.make b/include/Make/Install.make -index 0aba138..8ba74bc 100644 ---- a/include/Make/Install.make -+++ b/include/Make/Install.make -@@ -116,11 +116,6 @@ real-install: | $(INST_DIR) $(UNIX_BIN) - -$(INSTALL) config.status $(INST_DIR)/config.status - -$(CHMOD) -R a+rX $(INST_DIR) 2>/dev/null - --ifneq ($(findstring darwin,$(ARCH)),) -- @# enable OSX Help Viewer -- @/bin/ln -sfh "$(INST_DIR)/docs/html" /Library/Documentation/Help/GRASS-$(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR) --endif -- - $(INST_DIR) $(UNIX_BIN): - $(MAKE_DIR_CMD) $@ - -diff --git a/macosx/app/build_html_user_index.sh b/macosx/app/build_html_user_index.sh -index 04e63eb..c9d9c2c 100755 ---- a/macosx/app/build_html_user_index.sh -+++ b/macosx/app/build_html_user_index.sh -@@ -140,7 +140,6 @@ else - # echo "<tr><td valign=\"top\"><a href=\"$HTMLDIRG/$i\">$BASENAME</a></td> <td>$SHORTDESC</td></tr>" >> $FULLINDEX - # make them local to user to simplify page links - echo "<tr><td valign=\"top\"><a href=\"global_$i\">$BASENAME</a></td> <td>$SHORTDESC</td></tr>" >> $FULLINDEX -- ln -sf "$HTMLDIRG/$i" global_$i - done - done - fi -@@ -183,8 +182,3 @@ echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\"> - </html>" > $i.html - done - --# add Help Viewer links in user docs folder -- --mkdir -p $HOME/Library/Documentation/Help/ --ln -sfh ../../GRASS/$GRASS_MMVER/Modules/docs/html $HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER-addon --ln -sfh $GISBASE/docs/html $HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index 96a53b5efbac6..e611a56a66247 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -26,8 +26,9 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { + # https://github.com/autotrace/autotrace/pull/105 name = "imagemagick7-support.patch"; - url = "https://github.com/autotrace/autotrace/pull/105.patch"; + url = "https://github.com/autotrace/autotrace/compare/170488e1871d50aad7a800b901e33ded7d31773a...c26a2a059926c595a00839c8d9961e9381206579.patch"; hash = "sha256-Q82LRF/BsJ/Ii2s+7yaYHs9agMKYVYIMnbwqz8P92s0="; }) ]; diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 5cd574bf9b79c..79e66d8ed9880 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, libGL , libjpeg , libexif , giflib @@ -17,6 +18,7 @@ , sane-backends , libXpm , libepoxy +, pixman , poppler , mesa , lirc @@ -42,6 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config which ]; buildInputs = [ + libGL libexif libjpeg libpng @@ -56,6 +59,7 @@ stdenv.mkDerivation rec { libdrm libXpm libepoxy + pixman poppler lirc mesa diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 857365cd66d53..1ef114c9c4964 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -51,13 +51,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "freecad"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; rev = finalAttrs.version; - hash = "sha256-rwt81Z+Bp8uZlR4iuGQEDKBu/Dr9Rqg7d9SsCdofTUU="; + hash = "sha256-OX4s9rbGsAhH7tLJkUJYyq2A2vCdkq/73iqYo9adogs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/gscreenshot/default.nix b/pkgs/applications/graphics/gscreenshot/default.nix index 9cc53a9c521a8..dc077e63e302c 100644 --- a/pkgs/applications/graphics/gscreenshot/default.nix +++ b/pkgs/applications/graphics/gscreenshot/default.nix @@ -18,13 +18,13 @@ python3Packages.buildPythonApplication rec { pname = "gscreenshot"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "thenaterhood"; repo = "${pname}"; rev = "v${version}"; - sha256 = "sLJ+Fk+ePrmJeSllGd30uEQ/uFDl5CIob//1cDLKZHg="; + sha256 = "sha256-Ha9PTvr6XNGhe4I0ZUwrdbsNHWhz+Ubw2gp+ctLTO64="; }; # needed for wrapGAppsHook to function diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 0f96680bb0738..8bddaa96abd5d 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "551"; + version = "552"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-P/U44ndfucbRnwGLdSnnA0VE4K40zPz3wtNpQj8rh5Q="; + hash = "sha256-MaS9WxYlbQ7V/2mrETKS0UyWb5IzCrSwDcp4UlVS3zk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/rnote/Cargo.lock b/pkgs/applications/graphics/rnote/Cargo.lock index 2e77a4d66e617..c678290754e9f 100644 --- a/pkgs/applications/graphics/rnote/Cargo.lock +++ b/pkgs/applications/graphics/rnote/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -18,30 +18,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom 0.2.10", - "once_cell", - "version_check", -] - -[[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] [[package]] name = "alsa" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8512c9117059663fb5606788fbca3619e2a91dac0e3fe516242eab1fa6be5e44" +checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47" dependencies = [ "alsa-sys", "bitflags 1.3.2", @@ -76,24 +65,23 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" [[package]] name = "anstyle-parse" @@ -115,9 +103,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -125,9 +113,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "approx" @@ -168,9 +156,9 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", "event-listener", @@ -186,7 +174,7 @@ dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand", + "fastrand 1.9.0", "futures-lite", "slab", ] @@ -217,7 +205,7 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.22", + "rustix 0.37.23", "slab", "socket2", "waker-fn", @@ -225,9 +213,9 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] @@ -257,7 +245,7 @@ dependencies = [ "cfg-if", "event-listener", "futures-lite", - "rustix 0.37.22", + "rustix 0.37.23", "signal-hook", "windows-sys 0.48.0", ] @@ -302,9 +290,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "autocxx" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a19c80ba8384f11f11024462523829c2989a3fd7afb8ac70637abdd25bd3b8a" +checksum = "1ba64dd33efd8f09724143d45ab91b48aebcee52f4fb11add3464c998fab47dc" dependencies = [ "aquamarine", "autocxx-macro", @@ -314,9 +302,9 @@ dependencies = [ [[package]] name = "autocxx-bindgen" -version = "0.62.1" +version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91f11671d76c2c02f3e6906bb06b13a9046cd069d095ff14a94d9c9a7bd40a20" +checksum = "6c9fb7b8dd83a582e12157367773d8d1195f2dea54d4250aaf3426abae3237aa" dependencies = [ "bitflags 1.3.2", "cexpr", @@ -326,32 +314,33 @@ dependencies = [ "lazycell", "log", "peeking_take_while", + "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 1.0.109", + "syn 2.0.29", "which", ] [[package]] name = "autocxx-build" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37823c07a43c1a8d09aaad7ba8785df1b3160dcf0ee1c4e7e83177e9ebc2d804" +checksum = "955e602d2d68b79ca5d674984259234fad2c8d869ad99011699e0a3cd76f38cd" dependencies = [ "autocxx-engine", "env_logger 0.9.3", "indexmap 1.9.3", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] name = "autocxx-engine" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa19cbb6614361e61806db4526bd373415dfe0cb95f6bf811a2ddbd6fa4a8115" +checksum = "5918896fc1d44a647345fd5e8c74208424e394a76bdd2942398f4aff81ec7ab1" dependencies = [ "aquamarine", "autocxx-bindgen", @@ -371,7 +360,7 @@ dependencies = [ "rustversion", "serde_json", "strum_macros", - "syn 1.0.109", + "syn 2.0.29", "tempfile", "thiserror", "version_check", @@ -379,22 +368,22 @@ dependencies = [ [[package]] name = "autocxx-macro" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7313f823cd7e017cf80b46254d9bd78e4cb86b33b7e2cd08e1af312ee7bc77cf" +checksum = "8e594e68d030b6eb1ce7e2b40958f4f4ae7150c588c76d76b9f8178d41c47d80" dependencies = [ "autocxx-parser", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] name = "autocxx-parser" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a16532d5349c8f165534d95ce2cf70a4aefaf1f33146fe8273f77d3a2f817796" +checksum = "2ef00b2fc378804c31c4fbd693a7fea93f8a90467dce331dae1e4ce41e542953" dependencies = [ "indexmap 1.9.3", "itertools 0.10.5", @@ -404,15 +393,15 @@ dependencies = [ "quote", "serde", "serde_json", - "syn 1.0.109", + "syn 2.0.29", "thiserror", ] [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -472,9 +461,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "block" @@ -492,7 +481,7 @@ dependencies = [ "async-lock", "async-task", "atomic-waker", - "fastrand", + "fastrand 1.9.0", "futures-lite", "log", ] @@ -523,11 +512,11 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cairo-rs" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3603c4028a5e368d09b51c8b624b9a46edcd7c3778284077a6125af73c9f0a" +checksum = "d859b656775a6b1dd078d3e5924884e6ea88aa649a7fdde03d5b2ec56ffcc10b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cairo-sys-rs", "glib", "libc", @@ -537,9 +526,9 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "691d0c66b1fb4881be80a760cb8fe76ea97218312f9dfe2c9cc0f496ca279cb1" +checksum = "bd4d115132e01c0165e3bf5f56aedee8980b0b96ede4eb000b693c05a8adb8ff" dependencies = [ "glib-sys", "libc", @@ -554,11 +543,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -578,9 +568,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.3" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c" +checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" dependencies = [ "smallvec", "target-lexicon", @@ -620,9 +610,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.10" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a" +checksum = "1d5f1946157a96594eb2d2c10eb7ad9a2b27518cb3000209dec700c35df9197d" dependencies = [ "clap_builder", "clap_derive", @@ -631,43 +621,33 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.10" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d" +checksum = "78116e32a042dd73c2901f0dc30790d20ff3447f3e3472fad359e8c3d282bcd6" dependencies = [ "anstream", "anstyle", "clap_lex", - "once_cell", "strsim", ] [[package]] -name = "clap_complete" -version = "4.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6b5c519bab3ea61843a7923d074b04245624bb84a64a8c150f5deb014e388b" -dependencies = [ - "clap", -] - -[[package]] name = "clap_derive" -version = "4.3.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "cmake" @@ -733,12 +713,6 @@ dependencies = [ ] [[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] name = "core-foundation-sys" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -806,9 +780,9 @@ dependencies = [ [[package]] name = "critical-section" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" +checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "crossbeam-channel" @@ -861,19 +835,15 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "cssparser" -version = "0.29.6" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa" +checksum = "5b3df4f93e5fbbe73ec01ec8d3f68bba73107993a5b1e7519273c32db9b0d5be" dependencies = [ "cssparser-macros", "dtoa-short", "itoa", - "matches", - "phf 0.10.1", - "proc-macro2", - "quote", + "phf 0.11.2", "smallvec", - "syn 1.0.109", ] [[package]] @@ -883,14 +853,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] name = "cxx" -version = "1.0.97" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88abab2f5abbe4c56e8f1fb431b784d710b709888f35755a160e62e33fe38e8" +checksum = "28403c86fc49e3401fdf45499ba37fad6493d9329449d6449d7f0e10f4654d28" dependencies = [ "cc", "cxxbridge-flags", @@ -900,31 +870,31 @@ dependencies = [ [[package]] name = "cxx-gen" -version = "0.7.97" +version = "0.7.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83f6f8cddb97c1510ef1e7e849a40d60cd97377766187633ac6b9162dd862fd8" +checksum = "665584721578167d2658c879999867a3874d90494f5aa6325518540a8ee7b67c" dependencies = [ "codespan-reporting", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] name = "cxxbridge-flags" -version = "1.0.97" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3816ed957c008ccd4728485511e3d9aaf7db419aa321e3d2c5a2f3411e36c8" +checksum = "e2a6f5e1dfb4b34292ad4ea1facbfdaa1824705b231610087b00b17008641809" [[package]] name = "cxxbridge-macro" -version = "1.0.97" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26acccf6f445af85ea056362561a24ef56cdc15fcc685f03aec50b9c702cb6d" +checksum = "50c49547d73ba8dcfd4ad7325d64c6d5391ff4224d498fc39a6f3f49825a530d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] @@ -985,6 +955,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" [[package]] +name = "data-url" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" + +[[package]] name = "derive_builder" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1021,32 +997,21 @@ version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ - "convert_case", "proc-macro2", "quote", - "rustc_version", "syn 1.0.109", ] [[package]] -name = "directories" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" +name = "dialoguer" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", + "console", + "shell-words", + "tempfile", + "zeroize", ] [[package]] @@ -1057,9 +1022,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dtoa" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "519b83cd10f5f6e969625a409f735182bea5558cd8b64c655806ceaae36f1999" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" [[package]] name = "dtoa-short" @@ -1082,9 +1047,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encode_unicode" @@ -1094,9 +1059,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -1129,15 +1094,15 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -1171,9 +1136,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "exr" -version = "1.6.5" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85a7b44a196573e272e0cf0bcf130281c71e9a0c67062954b3323fd364bfdac9" +checksum = "d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18" dependencies = [ "bit_field", "flume", @@ -1201,6 +1166,12 @@ dependencies = [ ] [[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + +[[package]] name = "fdeflate" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1221,9 +1192,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -1265,9 +1236,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fontconfig-parser" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ab2e12762761366dcb876ab8b6e0cfa4797ddcd890575919f008b5ba655672a" +checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" dependencies = [ "roxmltree", ] @@ -1365,7 +1336,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -1382,7 +1353,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] @@ -1426,11 +1397,10 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "695d6bc846438c5708b07007537b9274d883373dd30858ca881d7d71b5540717" +checksum = "bbc9c2ed73a81d556b65d08879ba4ee58808a6b1927ce915262185d6d547c6f3" dependencies = [ - "bitflags 1.3.2", "gdk-pixbuf-sys", "gio", "glib", @@ -1440,9 +1410,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9285ec3c113c66d7d0ab5676599176f1f42f4944ca1b581852215bf5694870cb" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" dependencies = [ "gio-sys", "glib-sys", @@ -1453,11 +1423,10 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff" +checksum = "6982d9815ed6ac95b0467b189e81f29dea26d08a732926ec113e65744ed3f96c" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "gdk-pixbuf", "gdk4-sys", @@ -1469,9 +1438,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64" +checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1486,9 +1455,9 @@ dependencies = [ [[package]] name = "geo" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5d07d2288645058f3c78bc64eadd615335791cd5adb632e9865840afbc13dad" +checksum = "1645cf1d7fea7dac1a66f7357f3df2677ada708b8d9db8e9b043878930095a96" dependencies = [ "earcutr", "float_next_after", @@ -1496,19 +1465,19 @@ dependencies = [ "geographiclib-rs", "log", "num-traits", - "robust", - "rstar 0.10.0", + "robust 1.1.0", + "rstar", ] [[package]] name = "geo-types" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1019f6d372c5b53143f08deee4168d05c22920fe5e0f51f0dfb0e8ffb67ec11e" +checksum = "9705398c5c7b26132e74513f4ee7c1d7dafd786004991b375c172be2be0eecaa" dependencies = [ "approx", "num-traits", - "rstar 0.10.0", + "rstar", "serde", ] @@ -1523,17 +1492,6 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" @@ -1577,17 +1535,16 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "gio" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6973e92937cf98689b6a054a9e56c657ed4ff76de925e36fc331a15f0c5d30a" +checksum = "7884cba6b1c5db1607d970cadf44b14a43913d42bc68766eea6a5e2fe0891524" dependencies = [ - "bitflags 1.3.2", "futures-channel", "futures-core", "futures-io", @@ -1603,9 +1560,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ccf87c30a12c469b6d958950f6a9c09f2be20b7773f7e70d20b867fdf2628c3" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" dependencies = [ "glib-sys", "gobject-sys", @@ -1616,11 +1573,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fad45ba8d4d2cea612b432717e834f48031cd8853c8aaf43b2c79fec8d144b" +checksum = "331156127e8166dd815cf8d2db3a5beb492610c716c03ee6db4f2d07092af0a7" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "futures-channel", "futures-core", "futures-executor", @@ -1639,24 +1596,23 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca5c79337338391f1ab8058d6698125034ce8ef31b72a442437fa6c8580de26" +checksum = "179643c50bf28d20d2f6eacd2531a88f2f5d9747dd0b86b8af1e8bb5dd0de3c0" dependencies = [ - "anyhow", "heck", "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] name = "glib-sys" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d80aa6ea7bba0baac79222204aa786a6293078c210abe69ef1336911d4bdc4f0" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" dependencies = [ "libc", "system-deps", @@ -1670,9 +1626,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gobject-sys" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd34c3317740a6358ec04572c1bcfd3ac0b5b6529275fae255b237b314bb8062" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" dependencies = [ "glib-sys", "libc", @@ -1681,9 +1637,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def4bb01265b59ed548b05455040d272d989b3012c42d4c1bbd39083cb9b40d9" +checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" dependencies = [ "glib", "graphene-sys", @@ -1692,9 +1648,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1856fc817e6a6675e36cea0bd9a3afe296f5d9709d1e2d3182803ac77f0ab21d" +checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" dependencies = [ "glib-sys", "libc", @@ -1704,11 +1660,10 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c" +checksum = "cc25855255120f294d874acd6eaf4fbed7ce1cdc550e2d8415ea57fafbe816d5" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "gdk4", "glib", @@ -1720,9 +1675,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0" +checksum = "e1ecf3a63bf1223d68f80f72cc896c4d8c80482fbce1c9a12c66d3de7290ee46" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1736,11 +1691,10 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.6.6" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b" +checksum = "a3b095b26f2a2df70be1805d3590eeb9d7a05ecb5be9649b82defc72dc56228c" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "field-offset", "futures-channel", @@ -1753,15 +1707,14 @@ dependencies = [ "gtk4-macros", "gtk4-sys", "libc", - "once_cell", "pango", ] [[package]] name = "gtk4-macros" -version = "0.6.6" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a4d6b61570f76d3ee542d984da443b1cd69b6105264c61afec3abed08c2500f" +checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" dependencies = [ "anyhow", "proc-macro-crate", @@ -1773,9 +1726,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f" +checksum = "7b0bdde87c50317b4f355bcbb4a9c2c414ece1b7c824fb4ad4ba8f3bdb2c6603" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1813,9 +1766,6 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] [[package]] name = "hashbrown" @@ -1853,9 +1803,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "humantime" @@ -1916,9 +1866,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.6" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ "bytemuck", "byteorder", @@ -1962,9 +1912,9 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.5" +version = "0.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057" +checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" dependencies = [ "console", "instant", @@ -1982,9 +1932,8 @@ checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] name = "ink-stroke-modeler-rs" version = "0.1.0" -source = "git+https://github.com/flxzt/ink-stroke-modeler-rs?rev=3752d28280934c21eec31b14c59cb70f9574d6e7#3752d28280934c21eec31b14c59cb70f9574d6e7" +source = "git+https://github.com/flxzt/ink-stroke-modeler-rs?rev=b67f11b2c174a9ae4a54c22313cf8c218ff0946a#b67f11b2c174a9ae4a54c22313cf8c218ff0946a" dependencies = [ - "anyhow", "autocxx", "autocxx-build", "cmake", @@ -2009,23 +1958,42 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.2", "libc", "windows-sys 0.48.0", ] [[package]] +name = "is-docker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +dependencies = [ + "once_cell", +] + +[[package]] name = "is-terminal" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "rustix 0.38.2", + "hermit-abi 0.3.2", + "rustix 0.38.9", "windows-sys 0.48.0", ] [[package]] +name = "is-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] + +[[package]] name = "is_ci" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2060,9 +2028,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jni" @@ -2160,11 +2128,10 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libadwaita" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab9c0843f9f23ff25634df2743690c3a1faffe0a190e60c490878517eb81abf" +checksum = "06444f4ca05a60693da6e9e2b591bd40a298e65a118a8d5e830771718b3e0253" dependencies = [ - "bitflags 1.3.2", "gdk-pixbuf", "gdk4", "gio", @@ -2177,9 +2144,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4231cb2499a9f0c4cdfa4885414b33e39901ddcac61150bc0bb4ff8a57ede404" +checksum = "021cfe3d1fcfa82411765a791f7e9b32f35dd98ce88d2e3fa10e7320f5cc8ce7" dependencies = [ "gdk4-sys", "gio-sys", @@ -2215,24 +2182,19 @@ checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "librsvg" -version = "2.56.2" -source = "git+https://gitlab.gnome.org/GNOME/librsvg?tag=2.56.2#5c74c40bb3f4f7e6c347e7712e0293188e70c6ed" +version = "2.57.0-beta.2" +source = "git+https://gitlab.gnome.org/GNOME/librsvg?rev=58c52b742d7623b9a4e94975fb65cbf4a9ff13f1#58c52b742d7623b9a4e94975fb65cbf4a9ff13f1" dependencies = [ - "anyhow", - "byteorder", "cairo-rs", "cast", - "chrono", - "clap", - "clap_complete", "cssparser", - "data-url", + "data-url 0.3.0", "encoding_rs", "float-cmp", "gdk-pixbuf", "gio", "glib", - "itertools 0.10.5", + "itertools 0.11.0", "language-tags", "libc", "locale_config", @@ -2249,7 +2211,6 @@ dependencies = [ "selectors", "string_cache", "system-deps", - "thiserror", "tinyvec", "url", "xml5ever", @@ -2272,9 +2233,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "locale_config" @@ -2301,9 +2262,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "mac" @@ -2337,7 +2298,7 @@ checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" dependencies = [ "log", "phf 0.10.1", - "phf_codegen 0.10.0", + "phf_codegen", "string_cache", "string_cache_codegen", "tendril", @@ -2385,9 +2346,9 @@ dependencies = [ [[package]] name = "miette" -version = "5.9.0" +version = "5.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a236ff270093b0b67451bc50a509bd1bad302cb1d3c7d37d5efe931238581fa9" +checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" dependencies = [ "backtrace", "backtrace-ext", @@ -2406,13 +2367,13 @@ dependencies = [ [[package]] name = "miette-derive" -version = "5.9.0" +version = "5.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4901771e1d44ddb37964565c654a3223ba41a594d02b8da471cc4464912b5cfa" +checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] @@ -2433,18 +2394,18 @@ dependencies = [ [[package]] name = "moveit" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7d756ffe4e38013507d35bf726a93fcdae2cae043ab5ce477f13857a335030d" +checksum = "87d7335204cb6ef7bd647fa6db0be3e4d7aa25b5823a7aa030027ddf512cefba" dependencies = [ "cxx", ] [[package]] name = "nalgebra" -version = "0.32.2" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d68d47bba83f9e2006d117a9a33af1524e655516b8919caac694427a6fb1e511" +checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa" dependencies = [ "approx", "matrixmultiply", @@ -2459,9 +2420,9 @@ dependencies = [ [[package]] name = "nalgebra-macros" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766" +checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998" dependencies = [ "proc-macro2", "quote", @@ -2474,7 +2435,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ - "getrandom 0.2.10", + "getrandom", ] [[package]] @@ -2524,12 +2485,6 @@ dependencies = [ ] [[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] name = "nom" version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2541,9 +2496,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", "serde", @@ -2568,7 +2523,7 @@ checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] @@ -2594,9 +2549,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", "libm", @@ -2608,7 +2563,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.2", "libc", ] @@ -2670,9 +2625,9 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] @@ -2707,10 +2662,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] -name = "option-ext" -version = "0.2.0" +name = "open" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" +checksum = "cfabf1927dce4d6fdf563d63328a0a506101ced3ec780ca2135747336c98cef8" +dependencies = [ + "is-wsl", + "libc", + "pathdiff", +] [[package]] name = "optional" @@ -2726,9 +2686,9 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "palette" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1641aee47803391405d0a1250e837d2336fdddd18b27f3ddb8c1d80ce8d7f43" +checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" dependencies = [ "approx", "fast-srgb8", @@ -2738,22 +2698,21 @@ dependencies = [ [[package]] name = "palette_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c02bfa6b3ba8af5434fa0531bf5701f750d983d4260acd6867faca51cdc4484" +checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] name = "pango" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35be456fc620e61f62dff7ff70fbd54dcbaf0a4b920c0f16de1107c47d921d48" +checksum = "06a9e54b831d033206160096b825f2070cf5fda7e35167b1c01e9e774f9202d1" dependencies = [ - "bitflags 1.3.2", "gio", "glib", "libc", @@ -2763,9 +2722,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3da69f9f3850b0d8990d462f8c709561975e95f689c1cdf0fecdebde78b35195" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" dependencies = [ "glib-sys", "gobject-sys", @@ -2775,11 +2734,10 @@ dependencies = [ [[package]] name = "pangocairo" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86bf29cb1c2e73817944f66011fb12135e1c6d268e8e4c5cfc689101c25822cf" +checksum = "57036589a9cfcacf83f9e606d15813fc6bf03f0e9e69aa2b5e3bb85af86b38a5" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "glib", "libc", @@ -2789,9 +2747,9 @@ dependencies = [ [[package]] name = "pangocairo-sys" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94dfd38d9bf8ff5f881be2107ba49fcb22090d247aa00133f8dadf96b122b97a" +checksum = "fc3c8ff676a37e7a72ec1d5fc029f91c407278083d2752784ff9f5188c108833" dependencies = [ "cairo-sys-rs", "glib-sys", @@ -2824,16 +2782,16 @@ checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall", "smallvec", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] name = "parry2d-f64" -version = "0.13.4" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f612055f319eb83e67841fdf00248eee26045a1759b5d94fa9c6ecce7c1e78d" +checksum = "82bb5868f03fac0eb9ff77ab24dd6c2e7606b44f0ff745784a49de4e67486e78" dependencies = [ "approx", "arrayvec", @@ -2853,9 +2811,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "path-slash" @@ -2864,6 +2822,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" [[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] name = "peeking_take_while" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2877,22 +2841,11 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "phf" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -dependencies = [ - "phf_shared 0.8.0", -] - -[[package]] -name = "phf" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" dependencies = [ - "phf_macros 0.10.0", "phf_shared 0.10.0", - "proc-macro-hack", ] [[package]] @@ -2901,22 +2854,12 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ - "phf_macros 0.11.2", + "phf_macros", "phf_shared 0.11.2", ] [[package]] name = "phf_codegen" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", -] - -[[package]] -name = "phf_codegen" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" @@ -2927,22 +2870,12 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" -dependencies = [ - "phf_shared 0.8.0", - "rand 0.7.3", -] - -[[package]] -name = "phf_generator" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" dependencies = [ "phf_shared 0.10.0", - "rand 0.8.5", + "rand", ] [[package]] @@ -2952,21 +2885,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ "phf_shared 0.11.2", - "rand 0.8.5", -] - -[[package]] -name = "phf_macros" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", + "rand", ] [[package]] @@ -2979,16 +2898,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.23", -] - -[[package]] -name = "phf_shared" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher", + "syn 2.0.29", ] [[package]] @@ -3018,7 +2928,7 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "piet" version = "0.6.2" -source = "git+https://github.com/linebender/piet?rev=1d8a6fd627d8d6492bc42a42c734205a981077f8#1d8a6fd627d8d6492bc42a42c734205a981077f8" +source = "git+https://github.com/linebender/piet?rev=88e8e6c6fe41d8c99e3bccbf3a076b3661c4472a#88e8e6c6fe41d8c99e3bccbf3a076b3661c4472a" dependencies = [ "kurbo", "unic-bidi", @@ -3027,7 +2937,7 @@ dependencies = [ [[package]] name = "piet-cairo" version = "0.6.2" -source = "git+https://github.com/linebender/piet?rev=1d8a6fd627d8d6492bc42a42c734205a981077f8#1d8a6fd627d8d6492bc42a42c734205a981077f8" +source = "git+https://github.com/linebender/piet?rev=88e8e6c6fe41d8c99e3bccbf3a076b3661c4472a#88e8e6c6fe41d8c99e3bccbf3a076b3661c4472a" dependencies = [ "cairo-rs", "pango", @@ -3039,29 +2949,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -3077,9 +2987,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "png" -version = "0.17.9" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -3116,24 +3026,22 @@ dependencies = [ [[package]] name = "poppler-rs" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee1ec912c55fee25056d29dbe119c5f3b83ec521760f6381f01f3bd033ad7203" +checksum = "8eeee26af64d7c1bfdb436d831fb78e65a325ade17f380e6bee7af2bc9859b8e" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "gio", "glib", "libc", - "once_cell", "poppler-sys-rs", ] [[package]] name = "poppler-sys-rs" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bee91b998f39990a8600149c5b62a113e13ea5eabe1e577985756f45cf5e28" +checksum = "568f80975a5d4270c97bbfd6283f873b2204c92b67b803237c2e705fde4362a1" dependencies = [ "cairo-sys-rs", "gio-sys", @@ -3145,9 +3053,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.3.3" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794" +checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" [[package]] name = "ppv-lite86" @@ -3173,12 +3081,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.1.25" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" dependencies = [ "proc-macro2", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] @@ -3216,16 +3124,10 @@ dependencies = [ ] [[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -3241,46 +3143,22 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.29" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[package]] name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", - "rand_pcg 0.2.1", -] - -[[package]] -name = "rand" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -3290,16 +3168,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -3308,7 +3177,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom", ] [[package]] @@ -3318,25 +3187,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" dependencies = [ "num-traits", - "rand 0.8.5", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", + "rand", ] [[package]] @@ -3345,7 +3196,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e" dependencies = [ - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -3390,15 +3241,6 @@ checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" [[package]] name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" @@ -3407,21 +3249,22 @@ dependencies = [ ] [[package]] -name = "redox_users" -version = "0.4.3" +name = "regex" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", - "thiserror", + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", ] [[package]] -name = "regex" -version = "1.8.4" +name = "regex-automata" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" dependencies = [ "aho-corasick", "memchr", @@ -3430,9 +3273,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "rgb" @@ -3445,16 +3288,18 @@ dependencies = [ [[package]] name = "rnote" -version = "0.7.1" +version = "0.8.2" dependencies = [ "anyhow", + "base64", "cairo-rs", - "directories", "fs_extra", "futures", "gettext-rs", "gtk4", + "ijson", "image", + "itertools 0.11.0", "kurbo", "libadwaita", "log", @@ -3467,17 +3312,20 @@ dependencies = [ "piet-cairo", "poppler-rs", "pretty_env_logger", - "rand 0.8.5", + "rand", "rand_distr", - "rand_pcg 0.3.1", + "rand_pcg", "rayon", "regex", "rnote-compose", "rnote-engine", + "rough_piet", + "roughr", "same-file", "serde", "serde_json", "svg", + "thiserror", "unicode-segmentation", "url", "winresource", @@ -3485,12 +3333,17 @@ dependencies = [ [[package]] name = "rnote-cli" -version = "0.7.1" +version = "0.8.2" dependencies = [ "anyhow", + "atty", "clap", + "dialoguer", "indicatif", "log", + "nalgebra", + "open", + "parry2d-f64", "rnote-compose", "rnote-engine", "smol", @@ -3498,10 +3351,11 @@ dependencies = [ [[package]] name = "rnote-compose" -version = "0.1.0" +version = "0.8.2" dependencies = [ "anyhow", "base64", + "clap", "ink-stroke-modeler-rs", "kurbo", "log", @@ -3509,12 +3363,13 @@ dependencies = [ "num-derive 0.4.0", "num-traits", "once_cell", + "palette", "parry2d-f64", "piet", "piet-cairo", - "rand 0.8.5", + "rand", "rand_distr", - "rand_pcg 0.3.1", + "rand_pcg", "regex", "rough_piet", "roughr", @@ -3524,16 +3379,18 @@ dependencies = [ [[package]] name = "rnote-engine" -version = "0.1.0" +version = "0.8.2" dependencies = [ "anyhow", "approx", "base64", "cairo-rs", "chrono", + "clap", "flate2", "futures", "geo", + "gio", "glib", "gtk4", "ijson", @@ -3550,15 +3407,17 @@ dependencies = [ "piet", "piet-cairo", "poppler-rs", - "rand 0.8.5", + "rand", "rand_distr", - "rand_pcg 0.3.1", + "rand_pcg", "rayon", "regex", "rnote-compose", "rodio", + "rough_piet", + "roughr", "roxmltree", - "rstar 0.11.0", + "rstar", "semver", "serde", "serde_json", @@ -3577,6 +3436,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5864e7ef1a6b7bcf1d6ca3f655e65e724ed3b52546a0d0a663c991522f552ea" [[package]] +name = "robust" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30" + +[[package]] name = "rodio" version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3610,7 +3475,7 @@ dependencies = [ "num-traits", "palette", "points_on_curve", - "rand 0.8.5", + "rand", "svg_path_ops", "svgtypes 0.8.2", ] @@ -3626,17 +3491,6 @@ dependencies = [ [[package]] name = "rstar" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f39465655a1e3d8ae79c6d9e007f4953bfc5d55297602df9dc38f9ae9f1359a" -dependencies = [ - "heapless", - "num-traits", - "smallvec", -] - -[[package]] -name = "rstar" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73111312eb7a2287d229f06c00ff35b51ddee180f017ab6dec1f69d62ac098d6" @@ -3669,9 +3523,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.22" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8818fa822adcc98b18fedbb3632a6a33213c070556b5aa7c4c8cc21cff565c4c" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ "bitflags 1.3.2", "errno", @@ -3683,22 +3537,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.2" +version = "0.38.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4" +checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.3", + "linux-raw-sys 0.4.5", "windows-sys 0.48.0", ] [[package]] name = "rustversion" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rustybuzz" @@ -3718,15 +3572,15 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "safe_arch" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62a7484307bd40f8f7ccbacccac730108f2cae119a3b11c74485b48aa9ea650f" +checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" dependencies = [ "bytemuck", ] @@ -3742,23 +3596,24 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "selectors" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416" +checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cssparser", "derive_more", "fxhash", "log", - "phf 0.8.0", - "phf_codegen 0.8.0", + "new_debug_unreachable", + "phf 0.10.1", + "phf_codegen", "precomputed-hash", "servo_arc", "smallvec", @@ -3766,38 +3621,38 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.166" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.166" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.99" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -3815,15 +3670,20 @@ dependencies = [ [[package]] name = "servo_arc" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741" +checksum = "d036d71a959e00c77a63538b90a6c2390969f9772b096ea837205c6bd0491a44" dependencies = [ - "nodrop", "stable_deref_trait", ] [[package]] +name = "shell-words" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + +[[package]] name = "shlex" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3831,9 +3691,9 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "signal-hook" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ "libc", "signal-hook-registry", @@ -3863,9 +3723,9 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "simplecss" @@ -3878,15 +3738,15 @@ dependencies = [ [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -3903,9 +3763,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "smawk" @@ -3948,7 +3808,7 @@ checksum = "88e65803986868d2372c582007c39ba89936a36ea5f236bf7a7728dc258f04f9" dependencies = [ "num-traits", "optional", - "robust", + "robust 0.2.3", "smallvec", ] @@ -4166,9 +4026,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.23" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -4190,9 +4050,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.8" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "temp-dir" @@ -4202,15 +4062,14 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "tempfile" -version = "3.6.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ - "autocfg", "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix 0.37.22", + "fastrand 2.0.0", + "redox_syscall", + "rustix 0.38.9", "windows-sys 0.48.0", ] @@ -4257,29 +4116,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] name = "tiff" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" dependencies = [ "flate2", "jpeg-decoder", @@ -4325,9 +4184,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", @@ -4346,9 +4205,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.11" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ "indexmap 2.0.0", "serde", @@ -4452,19 +4311,15 @@ checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" [[package]] name = "unicode-ident" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-linebreak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" -dependencies = [ - "hashbrown 0.12.3", - "regex", -] +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" @@ -4531,7 +4386,7 @@ version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d19bf93d230813599927d88557014e0908ecc3531666d47c634c6838bc8db408" dependencies = [ - "data-url", + "data-url 0.2.0", "flate2", "imagesize", "kurbo", @@ -4613,12 +4468,6 @@ dependencies = [ [[package]] name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" @@ -4650,7 +4499,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -4684,7 +4533,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4724,9 +4573,9 @@ dependencies = [ [[package]] name = "wide" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40018623e2dba2602a9790faba8d33f2ebdebf4b86561b83928db735f8784728" +checksum = "aa469ffa65ef7e0ba0f164183697b89b854253fd31aeb92358b7b6155177d62f" dependencies = [ "bytemuck", "safe_arch", @@ -4778,7 +4627,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -4796,7 +4645,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -4816,17 +4665,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -4837,9 +4686,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -4849,9 +4698,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -4861,9 +4710,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -4873,9 +4722,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -4885,9 +4734,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -4897,9 +4746,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -4909,24 +4758,24 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.4.7" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] [[package]] name = "winresource" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cd38cf1ae6704c0bd03ee663068b8303b9c4bb069f83143c21ef25b19d1bc30" +checksum = "77e2aaaf8cfa92078c0c0375423d631f82f2f57979c2884fdd5f604a11e45329" dependencies = [ "toml", "version_check", @@ -4962,6 +4811,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] +name = "zeroize" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" + +[[package]] name = "zune-inflate" version = "0.2.54" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index 78aa102c7765c..e62359730eba7 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -6,6 +6,7 @@ , cargo , cmake , desktop-file-utils +, dos2unix , glib , gstreamer , gtk4 @@ -25,21 +26,21 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.7.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - hash = "sha256-QcgmL6lLi/3QXnlcEsVyTqNUfjSm+R+nhRzRvw8M9Qc="; + hash = "sha256-cIy2+Q6HSLwbT0XXDK88Z0mdu46vWSZNTVl8MphXhw0="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "ink-stroke-modeler-rs-0.1.0" = "sha256-1abfrPehOGc/ye/iFIwYPd6HJX6P8OP2vGBSJfeo+c8="; - "librsvg-2.56.2" = "sha256-uCHKDC4nc7J0k9qsmzF6etkWOoNq51Dddd9uQw5DOT0="; - "piet-0.6.2" = "sha256-If0qiZkgXeLvsrECItV9/HmhTk1H52xmVO7cUsD9dcU="; + "ink-stroke-modeler-rs-0.1.0" = "sha256-WfZwezohm8+ZXiKZlssTX+b/Izk1M4jFwxQejeTfc6M="; + "librsvg-2.57.0-beta.2" = "sha256-8k5KWhm9PIpdmf2DByTyrqX5mGAa+a7ZDGmVO2ERhTU="; + "piet-0.6.2" = "sha256-WrQok0T7uVQEp8SvNWlgqwQHfS7q0510bnP1ecr+s1Q="; }; }; @@ -47,6 +48,7 @@ stdenv.mkDerivation rec { appstream-glib # For appstream-util cmake desktop-file-utils # For update-desktop-database + dos2unix meson ninja pkg-config @@ -79,10 +81,9 @@ stdenv.mkDerivation rec { ]; postPatch = '' - pushd build-aux - chmod +x cargo_build.py meson_post_install.py - patchShebangs cargo_build.py meson_post_install.py - popd + dos2unix build-aux/*.py # FIXME remove once updated to 0.9.0 + chmod +x build-aux/*.py + patchShebangs build-aux ''; meta = with lib; { diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix index f36d91df5978a..78fc52996dc51 100644 --- a/pkgs/applications/kde/marble.nix +++ b/pkgs/applications/kde/marble.nix @@ -2,7 +2,7 @@ , extra-cmake-modules, kdoctools , qtscript, qtsvg, qtquickcontrols, qtwebengine , krunner, shared-mime-info, kparts, knewstuff -, gpsd, perl, protobuf3_21 +, gpsd, perl, protobuf_21 }: mkDerivation { @@ -15,7 +15,7 @@ mkDerivation { outputs = [ "out" "dev" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools perl ]; propagatedBuildInputs = [ - protobuf3_21 qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts + protobuf_21 qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts knewstuff gpsd ]; preConfigure = '' diff --git a/pkgs/applications/misc/adobe-reader/builder.sh b/pkgs/applications/misc/adobe-reader/builder.sh index 6047c08264301..4291da80576d0 100644 --- a/pkgs/applications/misc/adobe-reader/builder.sh +++ b/pkgs/applications/misc/adobe-reader/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup echo "unpacking $src..." diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 04c30deef773e..33e834100044d 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "cherrytree"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; - rev = version; - hash = "sha256-A/4OcsAOECgQnENj2l9BX713KHG+zk5cJE+yyHXw1TM="; + rev = "refs/tags/v${version}"; + hash = "sha256-ZGw6gESKaio89mt3VPm/uqHwlUQ0/8vIydv/WsOYQ20="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/effitask/default.nix b/pkgs/applications/misc/effitask/default.nix index a380a06741e7c..50172b9d1cb45 100644 --- a/pkgs/applications/misc/effitask/default.nix +++ b/pkgs/applications/misc/effitask/default.nix @@ -5,7 +5,6 @@ , openssl , gtk3 , stdenv -, rust }: rustPlatform.buildRustPackage rec { @@ -28,7 +27,7 @@ rustPlatform.buildRustPackage rec { # default installPhase don't install assets installPhase = '' runHook preInstall - make install PREFIX="$out" TARGET="target/${rust.toRustTarget stdenv.hostPlatform}/release/effitask" + make install PREFIX="$out" TARGET="target/${stdenv.hostPlatform.rust.rustcTarget}/release/effitask" runHook postInstall ''; diff --git a/pkgs/applications/misc/flavours/default.nix b/pkgs/applications/misc/flavours/default.nix index ed7fb78708222..db625793adc7f 100644 --- a/pkgs/applications/misc/flavours/default.nix +++ b/pkgs/applications/misc/flavours/default.nix @@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Misterio77/flavours"; changelog = "https://github.com/Misterio77/flavours/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ fortuneteller2k misterio77 ]; + maintainers = with maintainers; [ moni misterio77 ]; }; } diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 271d571a5314d..a8de9a4ddec85 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { ] ++ (with python3.pkgs; [ setuptools-scm sphinx - sphinxcontrib_newsfeed + sphinxcontrib-newsfeed ]); propagatedBuildInputs = with python3.pkgs;[ @@ -62,7 +62,7 @@ python3.pkgs.buildPythonApplication rec { --fish <(_KHAL_COMPLETE=fish_source $out/bin/khal) # man page - PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib_newsfeed ])}/bin:$PATH" \ + PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib-newsfeed ])}/bin:$PATH" \ make -C doc man installManPage doc/build/man/khal.1 diff --git a/pkgs/applications/misc/kile-wl/default.nix b/pkgs/applications/misc/kile-wl/default.nix index 33423f474af35..842499f845a68 100644 --- a/pkgs/applications/misc/kile-wl/default.nix +++ b/pkgs/applications/misc/kile-wl/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://gitlab.com/snakedye/kile"; license = licenses.mit; platforms = platforms.linux; # It's meant for river, a wayland compositor - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; mainProgram = "kile"; }; } diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index ba004e343844b..38da8824cb0d2 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -16,11 +16,10 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - name = "system-makedeps.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/system-makedeps.patch?h=llpp&id=0d2913056aaf3dbf7431e57b7b08b55568ba076c"; - hash = "sha256-t9PLXsM8+exCeYqJBe0LSDK0D2rpktmozS8qNcEAcHo="; + name = "system-makedeps-and-ocaml5.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/system-makedeps-and-ocaml5.patch?h=llpp&id=32955e115f914bb96348d288f9af9c6e3e80a02b"; + hash = "sha256-3rcPsR+M8Jx7M8GHUIsw0WNBvp6aE7BcPr4yk2vT9Ik="; }) - ./fix-mupdf.patch ]; postPatch = '' diff --git a/pkgs/applications/misc/llpp/fix-mupdf.patch b/pkgs/applications/misc/llpp/fix-mupdf.patch deleted file mode 100644 index 1a3c2516fc113..0000000000000 --- a/pkgs/applications/misc/llpp/fix-mupdf.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/link.c -+++ b/link.c -@@ -1522,8 +1522,9 @@ static void *mainloop (void UNUSED_ATTR *unused) - if (pdf && nameddest && *nameddest) { - fz_point xy; - struct pagedim *pdim; -- int pageno = pdf_lookup_anchor (state.ctx, pdf, nameddest, -+ fz_location location = fz_resolve_link (state.ctx, state.doc, nameddest, - &xy.x, &xy.y); -+ int pageno = location.page; - pdim = pdimofpageno (pageno); - xy = fz_transform_point (xy, pdim->ctm); - printd ("a %d %d %d", pageno, (int) xy.x, (int) xy.y); diff --git a/pkgs/applications/misc/mission-center/default.nix b/pkgs/applications/misc/mission-center/default.nix index 4bdb2b03291fe..8384fc1ce4567 100644 --- a/pkgs/applications/misc/mission-center/default.nix +++ b/pkgs/applications/misc/mission-center/default.nix @@ -23,6 +23,7 @@ , glib , graphene , gtk4 +, libGL , libadwaita , libdrm , mesa @@ -92,6 +93,7 @@ stdenv.mkDerivation rec { glib graphene gtk4 + libGL libadwaita libdrm mesa diff --git a/pkgs/applications/misc/mupdf/0003-Fix-cpp-build.patch b/pkgs/applications/misc/mupdf/0003-Fix-cpp-build.patch new file mode 100644 index 0000000000000..c658b237dddb7 --- /dev/null +++ b/pkgs/applications/misc/mupdf/0003-Fix-cpp-build.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/wrap/cpp.py b/scripts/wrap/cpp.py +index 51ac5f1..b5c0b5a 100644 +--- a/scripts/wrap/cpp.py ++++ b/scripts/wrap/cpp.py +@@ -4595,7 +4595,7 @@ def cpp_source( + */ + typedef unsigned long size_t; + ''')) +- if state.state_.macos: ++ if state.state_.linux or state.state_.macos: + f.write( textwrap.dedent(''' + /* + Workaround on MacOS: we need to define fixed-size int types diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 606649d5bb12d..db08bd5c14ce7 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -1,13 +1,13 @@ { stdenv , lib , fetchurl -, fetchpatch , fetchFromGitHub , copyDesktopItems , makeDesktopItem , desktopToDarwinBundle , buildPackages , pkg-config +, fixDarwinDylibNames , freetype , harfbuzz , openjpeg @@ -26,19 +26,26 @@ , enableGL ? true , freeglut , libGLU +, enableOcr ? false +, leptonica +, tesseract +, enableCxx ? false +, python3 +, enablePython ? false +, which +, swig , xcbuild , gitUpdater # for passthru.tests , cups-filters -, python3 , zathura +, mupdf }: -let - # OpenJPEG version is hardcoded in package source - openJpegVersion = with stdenv; - lib.versions.majorMinor (lib.getVersion openjpeg); +assert enablePython -> enableCxx; + +let freeglut-mupdf = freeglut.overrideAttrs (old: rec { pname = "freeglut-mupdf"; @@ -53,47 +60,58 @@ let in stdenv.mkDerivation rec { - version = "1.23.0"; + version = "1.23.5"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "sha256-3kFAaS5pMULDEeAwrBVuOO4XXXq2wb4QxcmuljhGFk4="; + sha256 = "sha256-blZ5zfqu+cfoniljlSIM4sEz7T3K1RpHhmczbG6uxwY="; }; patches = [ ./0001-Use-command-v-in-favor-of-which.patch ./0002-Add-Darwin-deps.patch + ./0003-Fix-cpp-build.patch ]; postPatch = '' - sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c substituteInPlace Makerules --replace "(shell pkg-config" "(shell $PKG_CONFIG" - ''; - # Use shared libraries to decrease size - buildFlags = [ "shared" ]; + patchShebangs scripts/mupdfwrap.py + + # slip in makeFlags when building bindings + sed -i -e 's/^\( *make_args *=\)/\1 """ $(echo ''${makeFlagsArray[@]@Q})"""/' scripts/wrap/__main__.py + + # fix libclang unnamed struct format + for wrapper in ./scripts/wrap/{cpp,state}.py; do + substituteInPlace "$wrapper" --replace 'struct (unnamed' '(unnamed struct' + done + ''; makeFlags = [ "prefix=$(out)" + "shared=yes" "USE_SYSTEM_LIBS=yes" "PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" ] ++ lib.optionals (!enableX11) [ "HAVE_X11=no" ] - ++ lib.optionals (!enableGL) [ "HAVE_GLUT=no" ]; + ++ lib.optionals (!enableGL) [ "HAVE_GLUT=no" ] + ++ lib.optionals (enableOcr) [ "USE_TESSERACT=yes" ]; nativeBuildInputs = [ pkg-config ] ++ lib.optional (enableGL || enableX11) copyDesktopItems - ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ++ lib.optionals (enableCxx || enablePython) [ python3 python3.pkgs.setuptools python3.pkgs.libclang ] + ++ lib.optionals (enablePython) [ which swig ] + ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle fixDarwinDylibNames xcbuild ]; buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg gumbo ] - ++ lib.optional stdenv.isDarwin xcbuild ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableCurl [ curl openssl ] ++ lib.optionals enableGL ( - if stdenv.isDarwin then - with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] - else - [ freeglut-mupdf libGLU ] - ) + if stdenv.isDarwin then + with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] + else + [ freeglut-mupdf libGLU ] + ) + ++ lib.optionals enableOcr [ leptonica tesseract ] ; outputs = [ "bin" "dev" "out" "man" "doc" ]; @@ -102,6 +120,12 @@ stdenv.mkDerivation rec { rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib} ''; + postBuild = lib.optionalString (enableCxx || enablePython) '' + for dir in build/*; do + ./scripts/mupdfwrap.py -d "$dir" -b ${lib.optionalString (enableCxx) "01"}${lib.optionalString (enablePython) "23"} + done + ''; + desktopItems = [ (makeDesktopItem { name = pname; @@ -136,7 +160,7 @@ stdenv.mkDerivation rec { Name: mupdf Description: Library for rendering PDF documents Version: ${version} - Libs: -L$out/lib -lmupdf -lmupdf-third + Libs: -L$out/lib -lmupdf Cflags: -I$dev/include EOF @@ -148,7 +172,16 @@ stdenv.mkDerivation rec { ln -s "$bin/bin/mupdf-gl" "$bin/bin/mupdf" '' else lib.optionalString (enableX11) '' ln -s "$bin/bin/mupdf-x11" "$bin/bin/mupdf" - ''); + '') + (lib.optionalString (enableCxx) '' + cp platform/c++/include/mupdf/*.h $out/include/mupdf + cp build/*/libmupdfcpp.so $out/lib + '') + (lib.optionalString (enablePython) ('' + mkdir -p $out/${python3.sitePackages}/mupdf + cp build/*/_mupdf.so $out/${python3.sitePackages} + cp build/*/mupdf.py $out/${python3.sitePackages}/mupdf/__init__.py + '' + lib.optionalString (stdenv.isDarwin) '' + install_name_tool -add_rpath $out/lib $out/${python3.sitePackages}/_mupdf.so + '')); enableParallelBuilding = true; @@ -156,6 +189,7 @@ stdenv.mkDerivation rec { tests = { inherit cups-filters zathura; inherit (python3.pkgs) pikepdf pymupdf; + mupdf-all = mupdf.override { enableCurl = true; enableGL = true; enableOcr = true; enableCxx = true; enablePython = true; }; }; updateScript = gitUpdater { @@ -169,7 +203,7 @@ stdenv.mkDerivation rec { description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; changelog = "https://git.ghostscript.com/?p=mupdf.git;a=blob_plain;f=CHANGES;hb=${version}"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ vrthra fpletz ]; + maintainers = with maintainers; [ vrthra fpletz lilyinstarlight ]; platforms = platforms.unix; mainProgram = "mupdf"; }; diff --git a/pkgs/applications/misc/safecloset/default.nix b/pkgs/applications/misc/safecloset/default.nix index bf3e8866f7a15..ce774e5a668f1 100644 --- a/pkgs/applications/misc/safecloset/default.nix +++ b/pkgs/applications/misc/safecloset/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "safecloset"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "Canop"; repo = "safecloset"; rev = "v${version}"; - hash = "sha256-ZvJbPbKS7HZ9R4Z9bMrXVjKtIdKE5dkp115dmHv7uJY="; + hash = "sha256-buIceYP/dZMDw3tyrzj1bY6+sIIPaVJIVj1L//jZnws="; }; - cargoHash = "sha256-vyn/rcptkJLjXg8qjAnzc2bDjz2r0LsGa8toyybgdbM="; + cargoHash = "sha256-rxNp9dOvy/UTx6Q9pzZGccEKmIiWxzWVYyMxb+h5bqw="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index 329bf2aada875..3a59a2542eaf2 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -58,7 +58,8 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace pdf_viewer_build_config.pro \ - --replace "-lmupdf-threads" "-lgumbo -lharfbuzz -lfreetype -ljbig2dec -ljpeg -lopenjp2" + --replace "-lmupdf-threads" "-lgumbo -lharfbuzz -lfreetype -ljbig2dec -ljpeg -lopenjp2" \ + --replace "-lmupdf-third" "" substituteInPlace pdf_viewer/main.cpp \ --replace "/usr/share/sioyek" "$out/share" \ --replace "/etc/sioyek" "$out/etc" diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 9c6c8f93f3f72..b9ac311bcea7e 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.27.0"; + version = "2.27.1"; src = fetchFromGitHub { owner = "spicetify"; repo = "spicetify-cli"; rev = "v${version}"; - hash = "sha256-5WIITzm9yZWB847WHL+okwpULdwHegtZfvsVrAzwTO0="; + hash = "sha256-Z+paJAuzUnCdCSx2UHg1HV14vDo3jWsyUrcbEnvqTm0="; }; - vendorHash = "sha256-VktAO3yKCdm5yz/RRLeLv6zzyGrwuHC/i8WdJtqZoYc="; + vendorHash = "sha256-H2kSTsYiD9HResHes+7YxUyNcjtM0SLpDPUC0Y518VM="; ldflags = [ "-s -w" diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 17692a22b7b94..2fe734fde00e7 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF" # NSFilenamesPboardType is deprecated in 10.14+ - ++ lib.optional stdenv.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${if stdenv.isAarch64 then "10.13" else stdenv.targetPlatform.darwinSdkVersion}"; + ++ lib.optional stdenv.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${if stdenv.isAarch64 then "10.13" else stdenv.hostPlatform.darwinSdkVersion}"; doCheck = true; diff --git a/pkgs/applications/misc/tiramisu/default.nix b/pkgs/applications/misc/tiramisu/default.nix index 8d1e1910cbc94..3e8f101f871e5 100644 --- a/pkgs/applications/misc/tiramisu/default.nix +++ b/pkgs/applications/misc/tiramisu/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Sweets/tiramisu"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ wishfort36 fortuneteller2k ]; + maintainers = with maintainers; [ wishfort36 moni ]; }; } diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 0faa36302fc9b..e74cb435e212b 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "toot"; - version = "0.38.1"; + version = "0.38.2"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = "refs/tags/${version}"; - sha256 = "sha256-gT9xKFanQhptt46nkdzYsZ6Vu0Nab0oRsvEHVRNf8DQ="; + sha256 = "sha256-0L/5i+m0rh1VjsZ0N2cshi+Nw951ASjMf5y6JxV53ko="; }; nativeCheckInputs = with python3Packages; [ pytest ]; @@ -30,4 +30,3 @@ python3Packages.buildPythonApplication rec { }; } - diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 2c36b3411cdda..e1cf49f61aec5 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { pname = "upwork"; - version = "5.8.0.31"; + version = "5.8.0.33"; src = requireFile { name = "${pname}_${version}_amd64.deb"; url = "https://www.upwork.com/ab/downloads/os/linux/"; - sha256 = "sha256-tQV6v0U6xxqBl7nQaBhXSrc9iv+7SPHfABTiJJQDnPI="; + sha256 = "sha256-MU0usTAfNNMN8OYmS6dWU6Xk2o5dg5J0V7OQiv3dLug="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix index d70918f2e7ce3..b54df7e951689 100644 --- a/pkgs/applications/misc/volnoti/default.nix +++ b/pkgs/applications/misc/volnoti/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { # Fix dbus interface headers. See # https://github.com/davidbrazdil/volnoti/pull/10 (fetchpatch { - url = "https://github.com/davidbrazdil/volnoti/pull/10.patch"; + url = "https://github.com/davidbrazdil/volnoti/commit/623ad8ea5c3ac8720d00a2ced4b6163aae38c119.patch"; sha256 = "046zfdjmvhb7jrsgh04vfgi35sgy1zkrhd3bzdby3nvds1wslfam"; }) ]; diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 1e4ec0f7653f5..f6eb5cfd45e1a 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -41,6 +41,10 @@ stdenv.mkDerivation rec { PKG_CONFIG_ZATHURA_PLUGINDIR= "lib/zathura"; + postPatch = '' + sed -i -e '/^mupdfthird =/d' -e 's/, mupdfthird//g' meson.build + ''; + passthru.updateScript = gitUpdater { url = "https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"; }; diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 8130f9f775849..164851bc2756f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation { pciutils ]; appendRunpaths = [ - "${pipewire.lib}/lib" + "${pipewire}/lib" ]; installPhase = diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index e1d79afac0441..9f778ed50082b 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , nix-update-script , cmake , pkg-config @@ -18,23 +17,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.17.2"; + version = "1.17.3"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${finalAttrs.version}"; - hash = "sha256-x80le9/mkL57NQGgmqAdbixYGxcoKKO3Rl+BlpOzTwc="; + hash = "sha256-YPC+mwXKZOOhLtUU+WHdkQtHFYfIYOiadbuAHLvAXxM="; }; - patches = [ - # Remove on next release - (fetchpatch { - url = "https://github.com/skyjake/lagrange/commit/e8295f0065e8ecddab2e291e420098ac7981e0a9.patch"; - hash = "sha256-s8Ryace6DOjw4C4h1Kb2ti5oygvsAAs/MF9pC3eQbAM="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config zip ]; buildInputs = [ the-foundation ] diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/default.nix index 4dde2d57d7e03..ec00983663b4d 100644 --- a/pkgs/applications/networking/browsers/librewolf/default.nix +++ b/pkgs/applications/networking/browsers/librewolf/default.nix @@ -21,6 +21,7 @@ in # not in `badPlatforms` because cross-compilation on 64-bit machine might work. maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; + mainProgram = "librewolf"; }; tests = [ nixosTests.librewolf ]; updateScript = callPackage ./update.nix { diff --git a/pkgs/applications/networking/browsers/vieb/default.nix b/pkgs/applications/networking/browsers/vieb/default.nix index 7c1beb43dca23..fa5fad4934c10 100644 --- a/pkgs/applications/networking/browsers/vieb/default.nix +++ b/pkgs/applications/networking/browsers/vieb/default.nix @@ -58,7 +58,7 @@ buildNpmPackage rec { homepage = "https://vieb.dev/"; changelog = "https://github.com/Jelmerro/Vieb/releases/tag/${version}"; description = "Vim Inspired Electron Browser"; - maintainers = with maintainers; [ gebner fortuneteller2k tejing ]; + maintainers = with maintainers; [ gebner tejing ]; platforms = platforms.unix; license = licenses.gpl3Plus; }; diff --git a/pkgs/applications/networking/browsers/webmacs/default.nix b/pkgs/applications/networking/browsers/webmacs/default.nix index de3c1cfdcdba8..2f63670128bb1 100644 --- a/pkgs/applications/networking/browsers/webmacs/default.nix +++ b/pkgs/applications/networking/browsers/webmacs/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , mkDerivationWith , fetchFromGitHub , python3Packages @@ -6,6 +7,8 @@ }: mkDerivationWith python3Packages.buildPythonApplication rec { + inherit stdenv; + pname = "webmacs"; version = "0.8"; diff --git a/pkgs/applications/networking/cluster/kluctl/default.nix b/pkgs/applications/networking/cluster/kluctl/default.nix index 2f6939347729b..99e311ff3e20b 100644 --- a/pkgs/applications/networking/cluster/kluctl/default.nix +++ b/pkgs/applications/networking/cluster/kluctl/default.nix @@ -33,6 +33,6 @@ buildGoModule rec { description = "The missing glue to put together large Kubernetes deployments"; homepage = "https://kluctl.io/"; license = licenses.asl20; - maintainers = with maintainers; [ sikmir ]; + maintainers = with maintainers; [ sikmir netthier ]; }; } diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix index 8c15855576b88..ab2eb86164aa4 100644 --- a/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.3.0"; + version = "2.3.5"; src = fetchFromGitHub { owner = "kubefirst"; repo = pname; rev = "v${version}"; - hash = "sha256-5znZMr0Dj6kpKJbypICN5+Fv/+3FgTLBok3YMrWaHdo="; + hash = "sha256-RqysUaHLgTNuTeLt5xsD06Qxv5qsGTPE0H7r4RqPf30="; }; - vendorHash = "sha256-/iAGUnIMH2+IrvvXig56SpZ0eTfVwaCgGMUDp5/MtEo="; + vendorHash = "sha256-IH43F809dr6LGb87pqW2G9xrJLsQcHfjOm5PUj8r4Qo="; ldflags = [ "-s" "-w" "-X github.com/kubefirst/runtime/configs.K1Version=v${version}"]; diff --git a/pkgs/applications/networking/cluster/rke/default.nix b/pkgs/applications/networking/cluster/rke/default.nix index 8021d55156a6d..f5b60daeac2df 100644 --- a/pkgs/applications/networking/cluster/rke/default.nix +++ b/pkgs/applications/networking/cluster/rke/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rke"; - version = "1.4.10"; + version = "1.4.11"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-rr6CN5ik4vuLNqzNPvISfRfOjTcD48pSre2K6xr6xSk="; + hash = "sha256-bsvAyyf/ITIm8pxVF61idM91Ztd/2ufH2lBHR6a7lCQ="; }; vendorHash = "sha256-3bivFrn2xDyILD1ugSr7IehhNq4vkqShFQI3sbeY0iY="; diff --git a/pkgs/applications/networking/cluster/tfautomv/default.nix b/pkgs/applications/networking/cluster/tfautomv/default.nix index 7409ec8ea4460..358dfd0a39fde 100644 --- a/pkgs/applications/networking/cluster/tfautomv/default.nix +++ b/pkgs/applications/networking/cluster/tfautomv/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tfautomv"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "busser"; repo = pname; rev = "v${version}"; - hash = "sha256-A1/sf+QjxQ8S2Cqmw9mD0r4aqA2Ssopeni0YNLND9L8="; + hash = "sha256-irB0Kfd8eqIKq0ooJRxB0X4t2/1aFCNYRwaG6lAw3ic="; }; - vendorHash = "sha256-zAshnSqZT9lx9EWvJsMwi6rqvhUWJ/3uJnk+44TGzlU="; + vendorHash = "sha256-Wc5hpiHL5I01IodcHX0IzeKfthkFS7SuUxmaxOU6WkA="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 74b34d4d3e980..dccdf634b599e 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -2,11 +2,11 @@ let pname = "rambox"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage"; - sha256 = "sha256-6fnO/e5lFrY5t2sCbrrYHck29NKt2Y+FH0N2cxunvZs="; + sha256 = "sha256-P6ia7IU6OQJQXANy1snIZEqarKUcRmgbkP6L+UMwi+8="; }; desktopItem = (makeDesktopItem { diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index f612ec524a7b1..99c7cbbc7d8ee 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -6,7 +6,6 @@ , qtbase , qttools , qtmultimedia -, qtquick1 , qtquickcontrols , openssl , protobuf @@ -38,7 +37,6 @@ mkDerivation rec { qtbase qttools qtmultimedia - qtquick1 qtquickcontrols openssl protobuf diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index d3c6a33d248bb..63d8b250b96a7 100644 --- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -4,11 +4,11 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "3.9.9"; + version = "3.9.10"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb"; - hash = "sha256-50mVmE+q2VYJXIv2iD6ppS83We0aJRT9vje+zpJcdq0="; + hash = "sha256-VLHkFiIwfjCHr08wTsD8rMWSvHEswZCKl2XJr61cQYE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 266c843931b64..5d5c8301378df 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.106.0.212"; + version = "8.108.0.205"; rpath = lib.makeLibraryPath [ alsa-lib @@ -68,7 +68,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "sha256-TlqhCj5nyL8SEo3M6ahPLYOTDrEjHvxtu1qFSR8LtkM="; + sha256 = "sha256-9V+/tTFco69NkCeswbGobr3ZxcS3q+Zd7fiei4N8uTY="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/localproxy/default.nix b/pkgs/applications/networking/localproxy/default.nix index 019da46951241..719b730817b41 100644 --- a/pkgs/applications/networking/localproxy/default.nix +++ b/pkgs/applications/networking/localproxy/default.nix @@ -3,14 +3,14 @@ , fetchFromGitHub , cmake , openssl -, protobuf3_21 +, protobuf_21 , catch2 , boost181 , icu }: let boost = boost181.override { enableStatic = true; }; - protobuf = protobuf3_21.override { enableShared = false; }; + protobuf = protobuf_21.override { enableShared = false; }; in stdenv.mkDerivation (finalAttrs: { pname = "localproxy"; diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index 4f61935faac16..702e92c04c325 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "mailspring"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb"; - hash = "sha256-aAqkltVxIlGwRVGM+1QkrVgfnitl+D3Xb0qi0o8ow+Q="; + hash = "sha256-6dTAPetJgYrvIEtu+2QxcBOeYFZfN/dFhM0CZFzcC/E="; }; nativeBuildInputs = [ @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { openssl (lib.getLib udev) libappindicator + libsecret ]; unpackPhase = '' diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 9ac8c83dc5e70..8d0bc45c4a029 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { # https://github.com/neomutt/neomutt/issues/3773#issuecomment-1493295144 ./fix-open-very-large-mailbox.patch (fetchpatch { + # https://github.com/neomutt/neomutt/pull/3933 name = "disable-incorrect-tests.patch"; - url = "https://github.com/neomutt/neomutt/pull/3933.patch"; + url = "https://github.com/neomutt/neomutt/compare/f624551b86cdb53224b5b48304a808ca2815111e...a9a1d99e6c0fdf367188125451300fa89d3e801a.patch"; hash = "sha256-Plei063T8XyXF4/7/nAb6/4OyXz72vBAXHwls9WL1vM="; excludes = [".github/workflows/macos.yml"]; }) diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix index 71a53aa3344bd..0904fd5c75807 100644 --- a/pkgs/applications/networking/mullvad/mullvad.nix +++ b/pkgs/applications/networking/mullvad/mullvad.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { # talpid-core wants libwg.a in build/lib/{triple} preBuild = '' - dest=build/lib/${stdenv.targetPlatform.config} + dest=build/lib/${stdenv.hostPlatform.config} mkdir -p $dest ln -s ${libwg}/lib/libwg.a $dest ''; diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index 8a46b5a476c1e..3ca23647251a1 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -16,8 +16,9 @@ let patches = [ # gradle 7 support + # https://github.com/freenet/fred/pull/827 (fetchpatch { - url = "https://github.com/freenet/fred/pull/827.patch"; + url = "https://github.com/freenet/fred/commit/8991303493f2c0d9933f645337f0a7a5a979e70a.patch"; sha256 = "sha256-T1zymxRTADVhhwp2TyB+BC/J4gZsT/CUuMrT4COlpTY="; }) ]; diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 931b788156d38..b159bd0a996ac 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -190,6 +190,8 @@ stdenv.mkDerivation rec { "-DTARGET_OS_IPHONE=0" "-DTARGET_OS_WATCH=0" "-include AudioToolbox/AudioToolbox.h" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=incompatible-function-pointer-types" ]); NIX_LDFLAGS = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index cfb35e526806f..e87ea1bbe5149 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -11,18 +11,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.12.5"; + version = "0.13.4"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - hash = "sha256-+2YYTnQDU9AkCjWvUEsddgu8GVJk0VUCMkEeWhW/u0w="; + hash = "sha256-oUgxYVnSPlUxQW3egZuzGad1IduvG9pvgFiR9jmljQU="; }; modRoot = "./agent"; - vendorHash = "sha256-lZ7W7YpigcVaLO9HoS5V379nyKHemRh9Z2NjlZbJcPg="; + vendorHash = "sha256-SNQuw9RRWuRndUwUiXwGs95CrXRrk72Gey5h1rtwWeo="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 9df26b6bb8453..1baf1c40eb14b 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -30,6 +30,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl ]; + patches = [ + # https://github.com/WayneD/rsync/issues/511#issuecomment-1774612577 + # original source: https://build.opensuse.org/package/view_file/network/rsync/rsync-fortified-strlcpy-fix.patch?expand=1&rev=3f8dd2f4a404c96c0f69176e60893714 + ./rsync-fortified-strlcpy-fix.patch + ]; + buildInputs = [ libiconv zlib popt ] ++ lib.optional enableACLs acl ++ lib.optional enableZstd zstd diff --git a/pkgs/applications/networking/sync/rsync/rsync-fortified-strlcpy-fix.patch b/pkgs/applications/networking/sync/rsync/rsync-fortified-strlcpy-fix.patch new file mode 100644 index 0000000000000..296445b4bb563 --- /dev/null +++ b/pkgs/applications/networking/sync/rsync/rsync-fortified-strlcpy-fix.patch @@ -0,0 +1,49 @@ +From 1f83963f59960150e8c46112daa8411324c1f209 Mon Sep 17 00:00:00 2001 +From: Jiri Slaby <jslaby@suse.cz> +Date: Fri, 18 Aug 2023 08:26:20 +0200 +Subject: [PATCH] exclude: fix crashes with fortified strlcpy() + +Fortified (-D_FORTIFY_SOURCE=2 for gcc) builds make strlcpy() crash when +its third parameter (size) is larger than the buffer: + $ rsync -FFXHav '--filter=merge global-rsync-filter' Align-37-43/ xxx + sending incremental file list + *** buffer overflow detected ***: terminated + +It's in the exclude code in setup_merge_file(): + strlcpy(y, save, MAXPATHLEN); + +Note the 'y' pointer was incremented, so it no longer points to memory +with MAXPATHLEN "owned" bytes. + +Fix it by remembering the number of copied bytes into the 'save' buffer +and use that instead of MAXPATHLEN which is clearly incorrect. + +Fixes #511. +--- + exclude.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/exclude.c b/exclude.c +index ffe55b167..1a5de3b9e 100644 +--- a/exclude.c ++++ b/exclude.c +@@ -720,7 +720,8 @@ static BOOL setup_merge_file(int mergelist_num, filter_rule *ex, + parent_dirscan = True; + while (*y) { + char save[MAXPATHLEN]; +- strlcpy(save, y, MAXPATHLEN); ++ /* copylen is strlen(y) which is < MAXPATHLEN. +1 for \0 */ ++ size_t copylen = strlcpy(save, y, MAXPATHLEN) + 1; + *y = '\0'; + dirbuf_len = y - dirbuf; + strlcpy(x, ex->pattern, MAXPATHLEN - (x - buf)); +@@ -734,7 +735,7 @@ static BOOL setup_merge_file(int mergelist_num, filter_rule *ex, + lp->head = NULL; + } + lp->tail = NULL; +- strlcpy(y, save, MAXPATHLEN); ++ strlcpy(y, save, copylen); + while ((*x++ = *y++) != '/') {} + } + parent_dirscan = False; + diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 042f623366db6..35c6620c34c4d 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -13,13 +13,13 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.26.0"; + version = "1.26.1"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-JsjZzOYBQ5DD7BsBq/lO2AZvC3Rx4mGr5cUJEU6ufNc="; + hash = "sha256-R7JTHlNP1guKRfiDjPVi1lnvfUAXuPDNDAMTGmbj3Hc="; }; vendorHash = "sha256-XYXIj+7xe33hCYM6Z9tqGSgr/P0LVlaPNf3T0PrxU7I="; diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index dfa19511327dc..3e281d59bc9d9 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.3.7"; + version = "0.3.8"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz"; - hash = "sha256-Z2iNYNpf0a3kXBLaJeGVYIW5EGiBuMPdFNK2jSpnmws="; + hash = "sha256-3ICeKSqzx1zp/KpaAFl9qLSaugWm4HZrKjrDCWz9ok4="; stripRoot = false; }; diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index 91fea99ff1e51..cd640e89bf876 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { "-DUSE_POPPLER=${if usePoppler then "ON" else "OFF"}" "-DUSE_MUPDF=${if useMupdf then "ON" else "OFF"}" "-DUSE_QTPDF=OFF" - "-DLINK_MUPDF_THIRD=ON" + "-DLINK_MUPDF_THIRD=OFF" "-DUSE_EXTERNAL_RENDERER=${if useExternalRenderer then "ON" else "OFF"}" "-DLINK_MUJS=OFF" "-DLINK_GUMBO=ON" diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index c9e787f6d9a71..b21f3edaa5322 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -7,11 +7,11 @@ python3Packages.buildPythonApplication rec { pname = "zim"; - version = "0.75.1"; + version = "0.75.2"; src = fetchurl { url = "https://zim-wiki.org/downloads/zim-${version}.tar.gz"; - sha256 = "sha256-iOF11/fhQYlvnpWJidJS1yJVavF7xLxvBl59VCh9A4U="; + hash = "sha256-QIkNsFsWeNHEcXhGHHZyJDMMW2lNvdwMJLGxeCZaLdI="; }; buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; @@ -54,6 +54,7 @@ python3Packages.buildPythonApplication rec { changelog = "https://github.com/zim-desktop-wiki/zim-desktop-wiki/blob/${version}/CHANGELOG.md"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; + mainProgram = "zim"; broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790 }; } diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 6a196cdea350c..c3f7b58fa1ba6 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { # # nix-shell maintainers/scripts/update.nix --argstr package uhd --argstr commit true # - version = "4.5.0.0"; + version = "4.6.0.0"; outputs = [ "out" "dev" ]; @@ -63,14 +63,14 @@ stdenv.mkDerivation (finalAttrs: { rev = "v${finalAttrs.version}"; # The updateScript relies on the `src` using `hash`, and not `sha256. To # update the correct hash for the `src` vs the `uhdImagesSrc` - hash = "sha256-0EqMBaQiNr8PE542YNkPvX3o1HhnhrO0Kz1euphY6Ps="; + hash = "sha256-9ZGt0ZrGbprCmpAuOue6pg2gliu4MvlRFHGxyMJeKAc="; }; # Firmware images are downloaded (pre-built) from the respective release on Github uhdImagesSrc = fetchurl { url = "https://github.com/EttusResearch/uhd/releases/download/v${finalAttrs.version}/uhd-images_${finalAttrs.version}.tar.xz"; # Please don't convert this to a hash, in base64, see comment near src's # hash. - sha256 = "13cn41wv7vldk4vx7vy3jbb3wb3a5vpfg3ay893klpi6vzxc1dly"; + sha256 = "17g503mhndaabrdl7qai3rdbafr8xx8awsyr7h2bdzwzprzmh4m3"; }; passthru = { updateScript = [ @@ -141,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postPhases = [ "installFirmware" "removeInstalledTests" ] - ++ optionals (enableUtils && stdenv.targetPlatform.isLinux) [ "moveUdevRules" ] + ++ optionals (enableUtils && stdenv.hostPlatform.isLinux) [ "moveUdevRules" ] ; # UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images` diff --git a/pkgs/applications/science/biology/flywheel-cli/default.nix b/pkgs/applications/science/biology/flywheel-cli/default.nix index 7d74b51f6066f..254a3c011d276 100644 --- a/pkgs/applications/science/biology/flywheel-cli/default.nix +++ b/pkgs/applications/science/biology/flywheel-cli/default.nix @@ -5,7 +5,7 @@ }: let - inherit (stdenv.targetPlatform) system; + inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; os = { diff --git a/pkgs/applications/science/chemistry/apbs/default.nix b/pkgs/applications/science/chemistry/apbs/default.nix index f4a2bab4243d6..228c77ee5c0e4 100644 --- a/pkgs/applications/science/chemistry/apbs/default.nix +++ b/pkgs/applications/science/chemistry/apbs/default.nix @@ -33,6 +33,10 @@ let "-DBUILD_SUPERLU=OFF" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int"; + }; + buildInputs = [ blas superlu @@ -92,6 +96,10 @@ stdenv.mkDerivation (finalAttrs: { "-DENABLE_TESTS=1" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; + }; + doCheck = true; meta = with lib; { diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index 89fb3534c6070..5794d7077af96 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -12,7 +12,7 @@ zlibSupport ? true, zlib, libuniqueSupport ? true, libunique, libpngSupport ? true, libpng, - openglSupport ? !stdenv.isDarwin + openglSupport ? !stdenv.isDarwin, libGL }: let @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = with lib; [ gtk2 fftw ] ++ - optional openglSupport gnome2.gtkglext ++ + optionals openglSupport [ gnome2.gtkglext libGL ] ++ optional openexrSupport openexr ++ optional libXmuSupport xorg.libXmu ++ optional fitsSupport cfitsio ++ diff --git a/pkgs/applications/science/electronics/kicad/addons/default.nix b/pkgs/applications/science/electronics/kicad/addons/default.nix new file mode 100644 index 0000000000000..5170e7efce363 --- /dev/null +++ b/pkgs/applications/science/electronics/kicad/addons/default.nix @@ -0,0 +1,5 @@ +{ kicad }: +{ + kikit = kicad.callPackage ./kikit.nix { addonName = "kikit"; }; + kikit-library = kicad.callPackage ./kikit.nix { addonName = "kikit-library"; }; +} diff --git a/pkgs/applications/science/electronics/kicad/addons/kikit.nix b/pkgs/applications/science/electronics/kicad/addons/kikit.nix new file mode 100644 index 0000000000000..6e5fc5ad96781 --- /dev/null +++ b/pkgs/applications/science/electronics/kicad/addons/kikit.nix @@ -0,0 +1,52 @@ +# For building the multiple addons that are in the kikit repo. +{ stdenv +, bc +, kikit +, zip +, python3 +, addonName +, addonPath +}: +let + # This python is only used when building the package, it's not the python + # environment that will ultimately run the code packaged here. The python env defined + # in KiCad will import the python code packaged here when KiCad starts up. + python = python3.withPackages (ps: with ps; [ click ]); + kikit-module = python3.pkgs.toPythonModule (kikit.override { inherit python3; }); + + # The following different addons can be built from the same source. + targetSpecs = { + "kikit" = { + makeTarget = "pcm-kikit"; + resultZip = "pcm-kikit.zip"; + description = "KiCad plugin and a CLI tool to automate several tasks in a standard KiCad workflow"; + }; + "kikit-library" = { + makeTarget = "pcm-lib"; + resultZip = "pcm-kikit-lib.zip"; + description = "KiKit uses these symbols and footprints to annotate your boards (e.g., to place a tab in a panel)."; + }; + }; + targetSpec = targetSpecs.${addonName}; +in +stdenv.mkDerivation { + name = "kicadaddon-${addonName}"; + inherit (kikit-module) src version; + + nativeBuildInputs = [ python bc zip ]; + propagatedBuildInputs = [ kikit-module ]; + + buildPhase = '' + patchShebangs scripts/setJson.py + make ${targetSpec.makeTarget} + ''; + + installPhase = '' + mkdir $out + mv build/${targetSpec.resultZip} $out/${addonPath} + ''; + + meta = kikit-module.meta // { + description = targetSpec.description; + }; +} diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 3403e410cf85f..a2e5bbe72a56a 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -69,6 +69,8 @@ stdenv.mkDerivation rec { patches = [ # upstream issue 12941 (attempted to upstream, but appreciably unacceptable) ./writable.patch + # https://gitlab.com/kicad/code/kicad/-/issues/15687 + ./runtime_stock_data_path.patch ]; # tagged releases don't have "unknown" diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index a49c813036d38..c6c66839e4bc5 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,4 +1,6 @@ { lib, stdenv +, runCommand +, newScope , fetchFromGitLab , gnome , dconf @@ -11,6 +13,8 @@ , callPackages , librsvg , cups +, unzip +, jq , pname ? "kicad" , stable ? true @@ -18,6 +22,7 @@ , libngspice , withScripting ? true , python3 +, addons ? [ ] , debug ? false , sanitizeAddress ? false , sanitizeThreads ? false @@ -27,6 +32,14 @@ , symlinkJoin }: +# `addons`: https://dev-docs.kicad.org/en/addons/ +# +# ```nix +# kicad = pkgs.kicad.override { +# addons = with pkgs.kicadAddons; [ kikit kikit-library ]; +# }; +# ``` + # The `srcs` parameter can be used to override the kicad source code # and all libraries, which are otherwise inaccessible # to overlays since most of the kicad build expression has been @@ -106,6 +119,32 @@ let wxGTK = wxGTK32; python = python3; wxPython = python.pkgs.wxPython_4_2; + addonPath = "addon.zip"; + addonsDrvs = map (pkg: pkg.override { inherit addonPath python3; }) addons; + + addonsJoined = + runCommand "addonsJoined" + { + inherit addonsDrvs; + nativeBuildInputs = [ unzip jq ]; + } '' + mkdir $out + + for pkg in $addonsDrvs; do + unzip $pkg/addon.zip -d unpacked + + folder_name=$(jq .identifier unpacked/metadata.json --raw-output | tr . _) + for d in unpacked/*; do + if [ -d "$d" ]; then + dest=$out/share/kicad/scripting/$(basename $d)/$folder_name + mkdir -p $(dirname $dest) + + mv $d $dest + fi + done + rm -r unpacked + done + ''; inherit (lib) concatStringsSep flatten optionalString optionals; in @@ -113,6 +152,7 @@ stdenv.mkDerivation rec { # Common libraries, referenced during runtime, via the wrapper. passthru.libraries = callPackages ./libraries.nix { inherit libSrc; }; + passthru.callPackage = newScope { inherit addonPath python3; }; base = callPackage ./base.nix { inherit stable baseName; inherit kicadSrc kicadVersion; @@ -131,7 +171,7 @@ stdenv.mkDerivation rec { dontFixup = true; pythonPath = optionals (withScripting) - [ wxPython python.pkgs.six python.pkgs.requests ]; + [ wxPython python.pkgs.six python.pkgs.requests ] ++ addonsDrvs; nativeBuildInputs = [ makeWrapper ] ++ optionals (withScripting) @@ -164,6 +204,17 @@ stdenv.mkDerivation rec { "--set-default KICAD7_SYMBOL_DIR ${symbols}/share/kicad/symbols" "--set-default KICAD7_TEMPLATE_DIR ${template_dir}" ] + ++ optionals (addons != [ ]) ( + let stockDataPath = symlinkJoin { + name = "kicad_stock_data_path"; + paths = [ + "${base}/share/kicad" + "${addonsJoined}/share/kicad" + ]; + }; + in + [ "--set-default NIX_KICAD7_STOCK_DATA_PATH ${stockDataPath}" ] + ) ++ optionals (with3d) [ "--set-default KICAD7_3DMODEL_DIR ${packages3d}/share/kicad/3dmodels" diff --git a/pkgs/applications/science/electronics/kicad/runtime_stock_data_path.patch b/pkgs/applications/science/electronics/kicad/runtime_stock_data_path.patch new file mode 100644 index 0000000000000..16f7e493c6238 --- /dev/null +++ b/pkgs/applications/science/electronics/kicad/runtime_stock_data_path.patch @@ -0,0 +1,15 @@ +diff --git a/common/paths.cpp b/common/paths.cpp +index a74cdd9..790cc58 100644 +--- a/common/paths.cpp ++++ b/common/paths.cpp +@@ -151,6 +151,10 @@ wxString PATHS::GetStockDataPath( bool aRespectRunFromBuildDir ) + { + wxString path; + ++ if( wxGetEnv( wxT( "NIX_KICAD7_STOCK_DATA_PATH" ), &path ) ) { ++ return path; ++ } ++ + if( aRespectRunFromBuildDir && wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) ) + { + // Allow debugging from build dir by placing relevant files/folders in the build root diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index 0a93759947d70..06e8a94a4c537 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -44,6 +44,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + env = lib.optionalAttrs stdenv.isDarwin { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + # NOTE(jleightcap): the `make check` target only runs a "Hello, World"-esque sanity check. # the tests in the doInstallCheck phase run a full regression test suite. # however, these tests currently fail upstream on aarch64 diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/applications/science/logic/aiger/default.nix index 4f3f585c220cb..5b9e8f62aa01c 100644 --- a/pkgs/applications/science/logic/aiger/default.nix +++ b/pkgs/applications/science/logic/aiger/default.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1ish0dw0nf9gyghxsdhpy1jjiy5wp54c993swp85xp7m6vdx6l0y"; }; + patches = [ + # Fix implicit declaration of `isatty`, which is an error with newer versions of clang. + ./fix-missing-header.patch + ]; + enableParallelBuilding = true; configurePhase = '' diff --git a/pkgs/applications/science/logic/aiger/fix-missing-header.patch b/pkgs/applications/science/logic/aiger/fix-missing-header.patch new file mode 100644 index 0000000000000..5f0101bd7a03d --- /dev/null +++ b/pkgs/applications/science/logic/aiger/fix-missing-header.patch @@ -0,0 +1,11 @@ +diff -ur a/aigunconstraint.c b/aigunconstraint.c +--- a/aigunconstraint.c 2013-10-06 09:08:03.000000000 -0400 ++++ b/aigunconstraint.c 2023-10-27 08:55:01.678566389 -0400 +@@ -26,6 +26,7 @@ + #include <stdarg.h> + #include <stdlib.h> + #include <string.h> ++#include <unistd.h> + + static const char * USAGE = + "usage: aigunconstraint [-h][-v] [<input> [<output>]]\n" diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index a79b74740e680..ec1fc6b11d25c 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz"; - sha256 = "sha256-RJ2uc/GIWU/fDJijSzYS8GdL7zUkeExOLWXtTbi8ZLk="; + hash = "sha256-gBgDC+GH948JMsjzo/SOpWDzJXu0g58YX1VW28PeorI="; }; buildInputs = [ which ]; diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix index 253c88705aea3..a3c1aa3f131d9 100644 --- a/pkgs/applications/science/logic/vampire/default.nix +++ b/pkgs/applications/science/logic/vampire/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { # https://github.com/vprover/vampire/pull/54 (fetchpatch { name = "fix-apple-cygwin-defines.patch"; - url = "https://github.com/vprover/vampire/pull/54.patch"; + url = "https://github.com/vprover/vampire/commit/b4bddd3bcac6a7688742da75c369b7b3213f6d1c.patch"; sha256 = "0i6nrc50wlg1dqxq38lkpx4rmfb3lf7s8f95l4jkvqp0nxa20cza"; }) # https://github.com/vprover/vampire/pull/55 (fetchpatch { name = "fix-wait-any.patch"; - url = "https://github.com/vprover/vampire/pull/55.patch"; + url = "https://github.com/vprover/vampire/commit/6da10eabb333aec54cdf13833ea33cb851159543.patch"; sha256 = "1pwfpwpl23bqsgkmmvw6bnniyvp5j9v8l3z9s9pllfabnfcrcz9l"; }) ]; diff --git a/pkgs/applications/science/math/readstat/default.nix b/pkgs/applications/science/math/readstat/default.nix index efbf80ba16ed2..08555d12640fa 100644 --- a/pkgs/applications/science/math/readstat/default.nix +++ b/pkgs/applications/science/math/readstat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libiconv }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libiconv }: stdenv.mkDerivation rec { pname = "readstat"; @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-4lRJgZPB2gfaQ9fQKvDDpGhy1eDNT/nT1QmeZlCmCis="; }; + patches = [ + (fetchpatch { + url = "https://github.com/WizardMac/ReadStat/commit/211c342a1cfe46fb7fb984730dd7a29ff4752f35.patch"; + hash = "sha256-nkaEgusylVu7NtzSzBklBuOnqO9qJPovf0qn9tTE6ls="; + }) + ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ libiconv ]; @@ -22,5 +29,6 @@ stdenv.mkDerivation rec { description = "Command-line tool (+ C library) for converting SAS, Stata, and SPSS files"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ swflint ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 8064a965bd1f6..97754c04d95ce 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -104,11 +104,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-GqMgoi0tsP7zcCcPumhdsbvhPB6fgw1ufx6gHlc6iSc="; }) - # https://github.com/sagemath/sage/pull/36006, positively reviewed + # https://github.com/sagemath/sage/pull/36006, landed in 10.2.beta2 (fetchpatch { name = "gmp-6.3-upgrade.patch"; - url = "https://github.com/sagemath/sage/commit/d88bc3815c0901bfdeaa3e4a31107c084199f614.diff"; - sha256 = "sha256-dXaEwk2wXxmx02sCw4Vu9mF0ZrydhFD4LRwNAiQsPgM="; + url = "https://github.com/sagemath/sage/commit/5e841de46c3baa99cd1145b36ff9163e9340a55c.diff"; + sha256 = "sha256-fJPDryLtGBQz9qHDiCkBwjiW2lN6v7HiHgxY7CTeHcs="; }) # https://github.com/sagemath/sage/pull/36279, landed in 10.2.beta4 @@ -117,6 +117,20 @@ stdenv.mkDerivation rec { url = "https://github.com/sagemath/sage/commit/0fcf88935908440930c5f79202155aca4ad57518.diff"; sha256 = "sha256-mvqAHaTCXsxPv901L8HSTnrfghfXYdq0wfLoP/cYQZI="; }) + + # https://github.com/sagemath/sage/pull/35658, landed in 10.1.beta2 + (fetchpatch { + name = "sphinx-7-upgrade.patch"; + url = "https://github.com/sagemath/sage/commit/cacd9a89b5c4fdcf84a8dd2b7d5bdc10cc78109a.diff"; + sha256 = "sha256-qJvliTJjR3XBc5pH6Q0jtm8c4bhtZcTcF3O04Ro1uaU="; + }) + + # https://github.com/sagemath/sage/pull/36296, landed in 10.2.beta4 + (fetchpatch { + name = "duplicate-args-region_plot.patch"; + url = "https://github.com/sagemath/sage/commit/461727b453712550a2c5dc0ae11933523255aaed.diff"; + sha256 = "sha256-mC8084VQoUBk4hocALF+Y9Cwb38Zt360eldi/SSjna8="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/terminal-emulators/contour/default.nix b/pkgs/applications/terminal-emulators/contour/default.nix index 9c44946f38269..1a036106c6dfc 100644 --- a/pkgs/applications/terminal-emulators/contour/default.nix +++ b/pkgs/applications/terminal-emulators/contour/default.nix @@ -103,7 +103,7 @@ mkDerivation rec { homepage = "https://github.com/contour-terminal/contour"; changelog = "https://github.com/contour-terminal/contour/raw/v${version}/Changelog.md"; license = licenses.asl20; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix index c6a250d9123a6..528c82fe81993 100644 --- a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix +++ b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , mkDerivation , qtbase -, qtquick1 , qmltermwidget , qtquickcontrols2 , qtgraphicaleffects @@ -28,7 +27,6 @@ mkDerivation rec { buildInputs = [ qtbase - qtquick1 qmltermwidget qtquickcontrols2 qtgraphicaleffects diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 6179c1719d33b..b0d8dd7a4b399 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "384"; + version = "388"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-Me+HB0DOrgIMPEtKlgHH9Hv9RmcsGq8tITpWXWTLw3M="; + hash = "sha256-rEKTReb5N6WUWonUJaJl/ubCFfxmnb3GoDJuIfTF9nQ="; }; strictDeps = true; diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index d6727d327ce5c..4c99078ab275b 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { ) ''; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; + }; + postInstall = '' wrapProgram $out/bin/cvssync --prefix PATH : ${lib.makeBinPath [ rsync ]} wrapProgram $out/bin/cvsconvert --prefix PATH : $out/bin:${lib.makeBinPath [ diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 9f039c4ab0044..4ee553c6c4be8 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -40,6 +40,10 @@ stdenv.mkDerivation rec { "AR=${stdenv.cc.targetPrefix}ar" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; + }; + doCheck = false; # fails 1 of 1 tests meta = with lib; { diff --git a/pkgs/applications/version-management/git-credential-manager/default.nix b/pkgs/applications/version-management/git-credential-manager/default.nix index ae99781f83e72..962bf18b366b6 100644 --- a/pkgs/applications/version-management/git-credential-manager/default.nix +++ b/pkgs/applications/version-management/git-credential-manager/default.nix @@ -20,13 +20,13 @@ assert withLibsecretSupport -> withGuiSupport; buildDotnetModule rec { pname = "git-credential-manager"; - version = "2.3.2"; + version = "2.4.1"; src = fetchFromGitHub { owner = "git-ecosystem"; repo = "git-credential-manager"; rev = "v${version}"; - hash = "sha256-vfv6dCmTuDsh6MaD2HAKlxZtQGVE0B5HJZPnoAUwUnM="; + hash = "sha256-Uf0EXaGM4k9Aanz16B9xA2EcseXTI9lLCws/ZVNb3e8="; }; projectFile = "src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj"; diff --git a/pkgs/applications/version-management/git-credential-manager/deps.nix b/pkgs/applications/version-management/git-credential-manager/deps.nix index 96dbf0bb96570..053da15bd50c0 100644 --- a/pkgs/applications/version-management/git-credential-manager/deps.nix +++ b/pkgs/applications/version-management/git-credential-manager/deps.nix @@ -2,20 +2,21 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "11.0.0-preview6"; sha256 = "14m7bg6ric8hpa2kmkhff6hpljfa73snbkj8fqida7hfd0nhggyl"; }) + (fetchNuGet { pname = "Avalonia"; version = "11.0.4"; sha256 = "0jid0x90dc8m609wqwbq87014yzih2iimz74wm6zi1j02k080jk0"; }) (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.0-preview6"; sha256 = "12lps97bqgd65z0y4d73ql2rcxaaaylb2x8fqvkb2jbrd76n30wz"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.0-preview6"; sha256 = "1kk4ids80gzkf8llasmcairmmz6yfsi7mbld21gb3sdwdf0wf92y"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.0-preview6"; sha256 = "18rabqzs5namzi0y6435blm6j54cnwsc8bkq2daj9bim5njy56pm"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.0-preview6"; sha256 = "0l9c7zakk17xyag9cl9nxq4j6wzlr6kgzzwpl7zwj7f3vypxlp6v"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.0-preview6"; sha256 = "0ni3y5qkpsz2s5hflkipwmpmb21b2mfs6h06rrvrq95m4l0bil7i"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.0-preview6"; sha256 = "0m1zbcbypj06xkmyjx56smh5smi02gdvn6xbqi92k185aiiwicj1"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0-preview6"; sha256 = "0wws5z8vmagzh7x47mlgf780579d5zqv0hyd649sycdxkaadcz5r"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0-preview6"; sha256 = "15572ibkb7ihgdmcxzj3avb1g4lcqrjxdxgf66ifvfyjj49vfi8h"; }) - (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.0-preview6"; sha256 = "1hm8ax9bq7vj458f2lrcppv3ylc6zmmdwp6zkbf2s6fv7nhvpmgf"; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.0-preview6"; sha256 = "1b1y2a3bkwz38a5nvwqhw23gp10a63046qiprapyxp589gbkf8cj"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.0-preview6"; sha256 = "0img9zmrppikzgw48j5a3svcrv9skbh13wzrdqnk0648n8fgj9k4"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.0-preview6"; sha256 = "04923qvlpgszr1zlcg0pfxzsgqgdjcrpqgkqlrlp62ac6yv8dr9g"; }) + (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.4"; sha256 = "1sqdcaknqazq4mw2x1jb6pfmfnyhpkd4xh6fl4ld85qikzzj7796"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.4"; sha256 = "10kc1pfyi0jq29xavq059vfjm51igi45yikz7i1ys061zbjs0n62"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.4"; sha256 = "101jlqx24d19nk0nd7x19pvbjjybckzgqh9h78c85vb98xbwh3ky"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.4"; sha256 = "1dxylsvaffzravz64rwq2wjjlr3392i5153nmkqk89ldaq70wjja"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.4"; sha256 = "1sbgs6d1b751h0ipq249w7z3aclpfb42sw3f7g31vin9w8wxwa6q"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.4"; sha256 = "10fyr63sqb4xyr7rlk94rzjbnb9mbln95mb9papip5kb3sm8jx60"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.4"; sha256 = "096436hhg45v02pp4f43mf00xn6blx7x66sb8fq5j4jn7479fynp"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.4"; sha256 = "1ysmq4f8bxabpq3nhcrrvgwvxb9z7gx9565bvdyksdhsq16wyxym"; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.4"; sha256 = "03zdixi6m9g4mcxmp24z8dzamzqqy9i0wg069m4gl5p3wcvfbqla"; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.4"; sha256 = "1rncb8ifqarjc5gfh6ld0ldahvxy57a2hzi7vs826an4zl3r0yrx"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.4"; sha256 = "07ijkpbhz59gvsxsik8mib8rhpm5yrpnjz66sjnxl8m0ghqnkf02"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.4"; sha256 = "0xq6xqd3cwwdcqsipvrs4rpf82nqhr45ispwjj4dxlyn4i1n8ryd"; }) (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) @@ -107,6 +108,5 @@ (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.14.0"; sha256 = "1j7ifcv621z5kjafs0c1qw4xcgv4kd4hwp0qamhcrllvshd2mabq"; }) - (fetchNuGet { pname = "Tmds.DBus.SourceGenerator"; version = "0.0.4"; sha256 = "16qa3xi0ip2nvgnjjqj64ppjdrf4p4skrfqzfnb39rp0k7v8smfx"; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; }) ] diff --git a/pkgs/applications/version-management/git-credential-manager/update.sh b/pkgs/applications/version-management/git-credential-manager/update.sh index e87352a36521e..fc9ef4199678d 100755 --- a/pkgs/applications/version-management/git-credential-manager/update.sh +++ b/pkgs/applications/version-management/git-credential-manager/update.sh @@ -1,23 +1,15 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq nix-prefetch nix coreutils gnused - -cd "$(dirname "$0")" - -set -euo pipefail - -latestVersion="$(curl -s "https://api.github.com/repos/git-ecosystem/git-credential-manager/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')" -currentVersion="$(nix-instantiate --eval -E "with import ../../../.. {}; git-credential-manager.version" | tr -d '"')" - -if [[ "$latestVersion" == "$currentVersion" ]]; then - echo "up to date" - exit 0 +#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts +set -eo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +new_version="$(curl -s "https://api.github.com/repos/git-ecosystem/git-credential-manager/releases?per_page=1" | jq -r '.[0].name' | sed 's|^GCM ||')" +old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" +if [[ "$new_version" == "$old_version" ]]; then + echo "Up to date" + exit 0 fi -echo "updating $currentVersion -> $latestVersion" - -sed -i -e "s/version = \"${currentVersion}\"/version = \"${latestVersion}\"/" default.nix -hash="$(nix-prefetch -f "$(pwd)/../../../.." git-credential-manager)" -sed -i -Ee "s/hash = \"sha256-[A-Za-z0-9/+=]{44}\"/hash = \"${hash}\"/" default.nix - - -$(nix-build ../../../.. -A git-credential-manager.fetch-deps --no-out-link) +cd ../../../.. +update-source-version git-credential-manager "$new_version" +$(nix-build -A git-credential-manager.fetch-deps --no-out-link) diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index 0f630f049ba96..36cda3dfc722d 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.171"; + version = "5.12.174"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-K2d12isOOPs8ba77VhQSXRHSYLZZIkZJlM9d3/G4nOo="; + hash = "sha256-juCiPulDVDDg9+DXUf9Gp/1lMoQ0NKLUTrzOqlv+32w="; }; - cargoHash = "sha256-m5b57dJ6IRJ10eJRF5lj2+WiNswHxj08LgXz7KJiTaw="; + cargoHash = "sha256-Wtw7GBPUci4fbplQDtz1Yxrf+7+3ABIe7GPN/gUER6I="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index bc5d3aa8b33d6..c3e715ad46fe4 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv -, ruby_3_0, tzdata, git, nettools, nixosTests, nodejs, openssl +, ruby_3_2, tzdata, git, nettools, nixosTests, nodejs, openssl , gitlabEnterprise ? false, callPackage, yarn , fixup_yarn_lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config }: @@ -17,7 +17,7 @@ let rubyEnv = bundlerEnv rec { name = "gitlab-env-${version}"; - ruby = ruby_3_0; + ruby = ruby_3_2; gemdir = ./rubyEnv; gemset = let x = import (gemdir + "/gemset.nix") src; diff --git a/pkgs/applications/version-management/hub/default.nix b/pkgs/applications/version-management/hub/default.nix index 0ed9d70c46232..4486c71605da3 100644 --- a/pkgs/applications/version-management/hub/default.nix +++ b/pkgs/applications/version-management/hub/default.nix @@ -23,13 +23,15 @@ buildGoModule rec { patches = [ # Fix `fish` completions + # https://github.com/github/hub/pull/3036 (fetchpatch { - url = "https://github.com/github/hub/pull/3036.patch"; + url = "https://github.com/github/hub/commit/439b7699e79471fc789929bcdea2f30bd719963e.patch"; hash = "sha256-pR/OkGa2ICR4n1pLNx8E2UTtLeDwFtXxeeTB94KFjC4="; }) # Fix `bash` completions + # https://github.com/github/hub/pull/2948 (fetchpatch { - url = "https://github.com/github/hub/pull/2948.patch"; + url = "https://github.com/github/hub/commit/64b291006f208fc7db1d5be96ff7db5535f1d853.patch"; hash = "sha256-jGFFIvSKEIpTQY0Wz63cqciUk25MzPHv5Z1ox8l7wmo="; }) ]; diff --git a/pkgs/applications/version-management/sapling/Cargo.lock b/pkgs/applications/version-management/sapling/Cargo.lock index 2c0463dc21d0b..20f5616cc39fa 100644 --- a/pkgs/applications/version-management/sapling/Cargo.lock +++ b/pkgs/applications/version-management/sapling/Cargo.lock @@ -23,9 +23,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -38,35 +38,27 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" +checksum = "0453232ace82dee0dd0b4c87a59bd90f7b53b314f3e0f61fe2ee7c8a16482289" [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if 1.0.0", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" -version = "1.0.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -87,6 +79,18 @@ dependencies = [ ] [[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] name = "android_system_properties" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -105,19 +109,67 @@ dependencies = [ ] [[package]] +name = "anstream" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anstyle-parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" dependencies = [ "backtrace", ] [[package]] name = "arbitrary" -version = "1.3.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "arc-swap" @@ -133,9 +185,9 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "assert-json-diff" @@ -156,9 +208,9 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-compression" -version = "0.3.15" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" dependencies = [ "brotli", "bzip2", @@ -186,17 +238,17 @@ dependencies = [ "log", "parking", "polling", - "rustix", + "rustix 0.37.27", "slab", - "socket2", + "socket2 0.4.10", "waker-fn", ] [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] @@ -205,7 +257,7 @@ dependencies = [ name = "async-runtime" version = "0.1.0" dependencies = [ - "futures 0.3.28", + "futures 0.3.29", "num_cpus", "once_cell", "tokio", @@ -213,13 +265,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] @@ -227,6 +279,7 @@ name = "atexit" version = "0.1.0" dependencies = [ "once_cell", + "tracing", ] [[package]] @@ -261,7 +314,7 @@ dependencies = [ "anyhow", "chrono", "configmodel", - "indexmap", + "indexmap 1.9.3", "once_cell", "pem", "simple_asn1", @@ -274,9 +327,9 @@ dependencies = [ [[package]] name = "auto_impl" -version = "0.4.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cbf586c80ada5e5ccdecae80d3ef0854f224e2dd74435f8d87e6831b8d0a38" +checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89" dependencies = [ "proc-macro-error", "proc-macro2", @@ -295,15 +348,19 @@ name = "backingstore" version = "0.1.0" dependencies = [ "anyhow", + "async-runtime", "configloader", + "constructors", "eagerepo", "edenapi", - "env_logger 0.10.0", + "env_logger 0.10.1", "identity", + "indexedlog", "libc", "log", "manifest", - "parking_lot 0.11.2", + "parking_lot", + "repo", "revisionstore", "tracing", "tracing-collector", @@ -312,46 +369,45 @@ dependencies = [ ] [[package]] +name = "backingstore-benches" +version = "0.1.0" +dependencies = [ + "backingstore", + "configloader", + "identity", + "minibench", + "procinfo", + "repo", + "tempfile", + "types", +] + +[[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide 0.6.2", + "miniz_oxide", "object", "rustc-demangle", ] [[package]] name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" - -[[package]] -name = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.1" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f1e31e207a6b8fb791a38ea3105e6cb541f55e4d029902d3039a4ad07cc4105" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "bindag" @@ -376,6 +432,7 @@ dependencies = [ "pyblackbox", "pybytes", "pycats", + "pycext", "pycheckout", "pyclientinfo", "pycliparser", @@ -389,6 +446,7 @@ dependencies = [ "pydrawdag", "pyeagerepo", "pyedenapi", + "pyedenclient", "pyerror", "pyexchange", "pyfail", @@ -399,10 +457,12 @@ dependencies = [ "pyidentity", "pyindexedlog", "pyio", + "pylinelog", "pylock", "pylz4", "pymanifest", "pymetalog", + "pymodules", "pymutationstore", "pynodeipc", "pynodemap", @@ -420,9 +480,12 @@ dependencies = [ "pysptui", "pystatus", "pythreading", + "pytoml", "pytracing", "pytreestate", + "pyversion", "pyvlq", + "pywebview", "pyworker", "pyworkingcopy", "pyxdiff", @@ -431,6 +494,14 @@ dependencies = [ ] [[package]] +name = "bindings-lib" +version = "0.1.0" +dependencies = [ + "cpython", + "hgcommands", +] + +[[package]] name = "bit-set" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -452,6 +523,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] +name = "bitmaps" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" +dependencies = [ + "typenum", +] + +[[package]] name = "blackbox" version = "0.1.0" dependencies = [ @@ -461,7 +547,7 @@ dependencies = [ "lazy_static", "libc", "minibench", - "parking_lot 0.11.2", + "parking_lot", "serde", "serde_alt", "serde_cbor", @@ -472,20 +558,18 @@ dependencies = [ [[package]] name = "blake2" -version = "0.9.2" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "crypto-mac", - "digest 0.9.0", - "opaque-debug", + "digest 0.10.7", ] [[package]] name = "blake3" -version = "1.3.3" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" +checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" dependencies = [ "arrayref", "arrayvec", @@ -493,7 +577,6 @@ dependencies = [ "cfg-if 1.0.0", "constant_time_eq", "digest 0.10.7", - "rayon", ] [[package]] @@ -516,9 +599,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.3.4" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -527,9 +610,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -537,9 +620,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.5.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" dependencies = [ "memchr", "serde", @@ -547,40 +630,30 @@ dependencies = [ [[package]] name = "bufsize" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51bbc61bc8800fb287f3394487c159af745cdf2e74743f12245d874ce20eb529" +checksum = "da2a4f1be8d12d1d69cbcfd3e740dddba696710847cf8630f6676860045345e8" dependencies = [ - "bytes 1.4.0", + "bytes", ] [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "0.4.12" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -dependencies = [ - "byteorder", - "iovec", -] +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" dependencies = [ "serde", ] @@ -618,7 +691,7 @@ version = "0.1.0" dependencies = [ "anyhow", "configmodel", - "indexmap", + "indexmap 1.9.3", "serde", "serde_json", "thiserror", @@ -628,11 +701,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -656,12 +730,12 @@ dependencies = [ "async-trait", "configmodel", "fail", - "futures 0.3.28", + "futures 0.3.29", "io", "manifest", "manifest-tree", "minibytes", - "parking_lot 0.11.2", + "parking_lot", "pathmatcher", "progress-model", "quickcheck", @@ -684,18 +758,15 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ + "android-tzdata", "iana-time-zone", - "js-sys", - "num-integer", "num-traits", "serde", - "time 0.1.45", - "wasm-bindgen", - "winapi 0.3.9", + "windows-targets 0.48.5", ] [[package]] @@ -706,7 +777,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap 0.11.0", "unicode-width", @@ -720,20 +791,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", - "bitflags", - "clap_derive", - "clap_lex", - "indexmap", + "bitflags 1.3.2", + "clap_derive 3.2.25", + "clap_lex 0.2.4", + "indexmap 1.9.3", "once_cell", "regex", "strsim 0.10.0", "termcolor", - "terminal_size", + "terminal_size 0.2.6", "textwrap 0.16.0", "unicase", ] [[package]] +name = "clap" +version = "4.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +dependencies = [ + "clap_builder", + "clap_derive 4.4.7", +] + +[[package]] +name = "clap_builder" +version = "4.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +dependencies = [ + "anstream", + "anstyle", + "clap_lex 0.6.0", + "strsim 0.10.0", + "terminal_size 0.3.0", + "unicase", + "unicode-width", +] + +[[package]] name = "clap_derive" version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -747,6 +843,18 @@ dependencies = [ ] [[package]] +name = "clap_derive" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] name = "clap_lex" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -756,6 +864,12 @@ dependencies = [ ] [[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] name = "clidispatch" version = "0.1.0" dependencies = [ @@ -765,11 +879,13 @@ dependencies = [ "configloader", "configmodel", "hgplain", + "hostname 0.1.0", "identity", "indexedlog", "io", "network-doctor", "repo", + "sampling", "termlogger", "thiserror", "thrift-types", @@ -784,10 +900,20 @@ name = "clientinfo" version = "0.1.0" dependencies = [ "anyhow", - "configmodel", "hostname 0.1.0", + "lazy_static", + "rand 0.8.5", "serde", "serde_json", + "tracing", +] + +[[package]] +name = "clientinfo_async" +version = "0.1.0" +dependencies = [ + "clientinfo", + "tokio", ] [[package]] @@ -796,7 +922,8 @@ version = "0.1.0" dependencies = [ "anyhow", "cpython", - "cpython_ext", + "indexmap 1.9.3", + "serde", "shlex", "thiserror", ] @@ -824,32 +951,55 @@ dependencies = [ [[package]] name = "cloned" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" + +[[package]] +name = "codegen" +version = "0.1.0" +dependencies = [ + "zstdelta", +] [[package]] name = "codegen_includer_proc_macro" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "quote", ] [[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] name = "colored" -version = "1.9.3" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" +checksum = "5a5f741c91823341bebf717d4c71bda820630ce065443b58bd1b7451af008355" dependencies = [ - "atty", + "is-terminal", "lazy_static", "winapi 0.3.9", ] [[package]] name = "comfy-table" -version = "6.1.4" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e7b787b0dc42e8111badfdbe4c3059158ccb2db8780352fa1b01e8ccf45cc4d" +checksum = "7e959d788268e3bf9d35ace83e81b124190378e4c91c9067524675e33394b8ba" dependencies = [ "crossterm", "strum", @@ -858,18 +1008,41 @@ dependencies = [ ] [[package]] +name = "commandserver" +version = "0.1.0" +dependencies = [ + "anyhow", + "atexit", + "configmodel", + "dirs 2.0.2", + "fn-error-context", + "fs2", + "identity", + "libc", + "nodeipc", + "once_cell", + "procutil", + "serde", + "spawn-ext", + "system-command", + "tracing", + "udsipc", + "version", +] + +[[package]] name = "commitcloudsubscriber" version = "0.1.0" dependencies = [ "anyhow", "filetime", - "futures 0.3.28", + "futures 0.3.29", "hostcaps", "identity", "lazy_static", "log", "mime", - "parking_lot 0.11.2", + "parking_lot", "regex", "reqwest", "reqwest-eventsource", @@ -882,6 +1055,42 @@ dependencies = [ ] [[package]] +name = "commits-git" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "commits-trait", + "dag", + "factory", + "fs-err", + "futures 0.3.29", + "gitdag", + "metalog", + "minibytes", + "parking_lot", + "refencode", + "storemodel", + "tracing", + "types", +] + +[[package]] +name = "commits-trait" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "dag", + "futures 0.3.29", + "metalog", + "minibytes", + "serde", + "storemodel", + "types", +] + +[[package]] name = "conch-parser" version = "0.1.1" dependencies = [ @@ -899,11 +1108,11 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ - "crossbeam-utils 0.8.15", + "crossbeam-utils 0.8.16", ] [[package]] @@ -913,13 +1122,11 @@ dependencies = [ "anyhow", "async-trait", "codegen_includer_proc_macro", + "config_types", "const-cstr", "fbthrift", - "futures 0.3.28", - "once_cell", + "futures 0.3.29", "ref-cast", - "serde", - "serde_derive", "thiserror", "thrift_compiler", "tracing", @@ -933,17 +1140,47 @@ dependencies = [ "anyhow", "async-trait", "codegen_includer_proc_macro", + "config_thrift_types", "const-cstr", "fbthrift", - "futures 0.3.28", + "futures 0.3.29", + "ref-cast", + "thiserror", + "thrift_compiler", + "tracing", + "tracing-futures", +] + +[[package]] +name = "config_thrift_types" +version = "0.1.0" +dependencies = [ + "anyhow", + "codegen_includer_proc_macro", + "fbthrift", + "futures 0.3.29", + "once_cell", + "ref-cast", + "serde", + "serde_derive", + "thiserror", + "thrift_compiler", +] + +[[package]] +name = "config_types" +version = "0.1.0" +dependencies = [ + "anyhow", + "codegen_includer_proc_macro", + "fbthrift", + "futures 0.3.29", "once_cell", "ref-cast", "serde", "serde_derive", "thiserror", "thrift_compiler", - "tracing", - "tracing-futures", ] [[package]] @@ -951,7 +1188,7 @@ name = "configloader" version = "0.1.0" dependencies = [ "anyhow", - "base64 0.11.0", + "base64 0.13.1", "configmodel", "configset", "dirs 2.0.2", @@ -962,19 +1199,17 @@ dependencies = [ "hostname 0.3.1", "http-client", "identity", - "lazy_static", "minibench", "minibytes", "once_cell", - "parking_lot 0.11.2", "regex", "serde", "serde_json", "serde_urlencoded 0.7.1", - "sha2 0.10.6", + "sha2 0.10.8", "staticconfig", - "tempdir", "tempfile", + "testutil", "tracing", "types", "unionconfig", @@ -1001,9 +1236,9 @@ version = "0.1.0" dependencies = [ "configmodel", "hgrc-parser", - "indexmap", + "indexmap 1.9.3", "minibytes", - "tempdir", + "tempfile", "tracing", "util", ] @@ -1028,9 +1263,21 @@ checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6" [[package]] name = "constant_time_eq" -version = "0.2.5" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] +name = "constructors" +version = "0.1.0" +dependencies = [ + "commits-git", + "eagerepo", + "edenapi", + "gitstore", + "hgcommits", + "once_cell", +] [[package]] name = "control-point" @@ -1038,14 +1285,42 @@ version = "0.1.0" dependencies = [ "anyhow", "lazy_static", - "parking_lot 0.11.2", + "parking_lot", "serde_json", - "tempdir", + "tempfile", "tracing", "util", ] [[package]] +name = "cookie" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +dependencies = [ + "percent-encoding", + "time", + "version_check", +] + +[[package]] +name = "cookie_store" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d606d0fba62e13cf04db20536c05cb7f13673c161cb47a47a82b9b9e7d3f1daa" +dependencies = [ + "cookie", + "idna 0.2.3", + "log", + "publicsuffix", + "serde", + "serde_derive", + "serde_json", + "time", + "url", +] + +[[package]] name = "copytrace" version = "0.1.0" dependencies = [ @@ -1055,10 +1330,13 @@ dependencies = [ "dag", "git2", "hg-metrics", + "lru-cache", "manifest", "manifest-tree", + "parking_lot", "pathhistory", "pathmatcher", + "serde", "storemodel", "thiserror", "tokio", @@ -1086,9 +1364,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -1114,7 +1392,7 @@ dependencies = [ "async-runtime", "cpython", "cpython_ext", - "futures 0.3.28", + "futures 0.3.29", "itertools", "tokio", ] @@ -1125,10 +1403,9 @@ version = "0.1.0" dependencies = [ "anyhow", "cpython", - "io", "libc", "once_cell", - "parking_lot 0.11.2", + "parking_lot", "python3-sys", "serde", "serde_bytes", @@ -1148,30 +1425,16 @@ dependencies = [ [[package]] name = "crossbeam" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-channel 0.4.4", - "crossbeam-deque 0.7.4", - "crossbeam-epoch 0.8.2", - "crossbeam-queue 0.2.3", - "crossbeam-utils 0.7.2", -] - -[[package]] -name = "crossbeam" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" dependencies = [ "cfg-if 1.0.0", "crossbeam-channel 0.5.8", - "crossbeam-deque 0.8.3", - "crossbeam-epoch 0.9.14", - "crossbeam-queue 0.3.8", - "crossbeam-utils 0.8.15", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils 0.8.16", ] [[package]] @@ -1185,33 +1448,12 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-channel" version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.15", -] - -[[package]] -name = "crossbeam-deque" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed" -dependencies = [ - "crossbeam-epoch 0.8.2", - "crossbeam-utils 0.7.2", - "maybe-uninit", + "crossbeam-utils 0.8.16", ] [[package]] @@ -1221,57 +1463,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if 1.0.0", - "crossbeam-epoch 0.9.14", - "crossbeam-utils 0.8.15", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "lazy_static", - "maybe-uninit", - "memoffset 0.5.6", - "scopeguard", + "crossbeam-epoch", + "crossbeam-utils 0.8.16", ] [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if 1.0.0", - "crossbeam-utils 0.8.15", - "memoffset 0.8.0", + "crossbeam-utils 0.8.16", + "memoffset 0.9.0", "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-queue" version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.15", + "crossbeam-utils 0.8.16", ] [[package]] @@ -1286,45 +1502,34 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "crossterm" -version = "0.25.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" +checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crossterm_winapi", "libc", "mio", - "parking_lot 0.12.1", - "signal-hook 0.3.15", + "parking_lot", + "signal-hook 0.3.17", "signal-hook-mio", "winapi 0.3.9", ] [[package]] name = "crossterm_winapi" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" dependencies = [ "winapi 0.3.9", ] @@ -1340,23 +1545,13 @@ dependencies = [ ] [[package]] -name = "crypto-mac" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] name = "csscolorparser" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" dependencies = [ "lab", - "phf 0.11.1", + "phf 0.11.2", ] [[package]] @@ -1371,11 +1566,11 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.3.1" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7394a21d012ce5c850497fb774b167d81b99f060025fbf06ee92b9848bd97eb2" +checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf" dependencies = [ - "nix 0.26.2", + "nix 0.27.1", "windows-sys 0.48.0", ] @@ -1390,15 +1585,15 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "socket2", + "socket2 0.4.10", "winapi 0.3.9", ] [[package]] name = "curl-sys" -version = "0.4.62+curl-8.1.0" +version = "0.4.68+curl-8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "274ef7ef7c1113c7611af49ce248a700afa1171045a1aaa40137030773f993b8" +checksum = "b4a0d18d88360e374b16b2273c832b5e57258ffc1d4aa4f96b108e0738d5752f" dependencies = [ "cc", "libc", @@ -1407,7 +1602,51 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "winapi 0.3.9", + "windows-sys 0.48.0", +] + +[[package]] +name = "cxx" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7129e341034ecb940c9072817cd9007974ea696844fc4dd582dc1653a7fbe2e8" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a24f3f5f8eed71936f21e570436f024f5c2e25628f7496aa7ccd03b90109d5" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn 2.0.39", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06fdd177fc61050d63f67f5bd6351fac6ab5526694ea8e359cd9cd3b75857f44" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "587663dd5fb3d10932c8aecfe7c844db1bcf0aee93eeab08fac13dc1212c2e7f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", ] [[package]] @@ -1416,16 +1655,16 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "bitflags", + "bitflags 1.3.2", "byteorder", "dag-types", "dev-logger", "drawdag", "fail", "fs2", - "futures 0.3.28", + "futures 0.3.29", "indexedlog", - "indexmap", + "indexmap 1.9.3", "mincode", "minibytes", "nonblocking", @@ -1466,15 +1705,15 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.4.0" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.12.3", + "hashbrown 0.14.2", "lock_api", "once_cell", - "parking_lot_core 0.9.7", + "parking_lot_core", "rayon", "serde", ] @@ -1490,9 +1729,18 @@ dependencies = [ [[package]] name = "deltae" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef311e2c0a388b9ba56c839ac68d33b92d18ce7104d0acc4375cb479e2b9a53" +checksum = "5729f5117e208430e437df2f4843f5e5952997175992d1414f94c57d61e270b4" + +[[package]] +name = "deranged" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] [[package]] name = "dev-logger" @@ -1590,12 +1838,12 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "configloader", "configmodel", "dag", "edenapi_trait", + "factory", "fail", - "futures 0.3.28", + "futures 0.3.29", "hgstore", "http", "identity", @@ -1603,7 +1851,7 @@ dependencies = [ "metalog", "minibytes", "nonblocking", - "parking_lot 0.11.2", + "parking_lot", "storemodel", "tempfile", "thiserror", @@ -1623,7 +1871,7 @@ dependencies = [ "pretty_assertions", "serde", "serde_json", - "sha2 0.10.6", + "sha2 0.10.8", "structopt", ] @@ -1634,23 +1882,23 @@ dependencies = [ "anyhow", "async-runtime", "async-trait", - "bytes 1.4.0", + "bytes", "chrono", + "clientinfo", + "clientinfo_async", "configmodel", "edenapi_trait", "edenapi_types", - "futures 0.3.28", + "futures 0.3.29", "hg-http", "http-client", "itertools", - "lazy_static", "metrics", "minibytes", "once_cell", - "parking_lot 0.11.2", + "parking_lot", "pprint", "progress-model", - "rand 0.8.5", "repo_name", "serde", "serde_cbor", @@ -1669,10 +1917,10 @@ dependencies = [ "anyhow", "blake2", "cloned", - "crossbeam 0.8.2", + "crossbeam", "edenapi", "edenapi_types", - "futures 0.3.28", + "futures 0.3.29", "itertools", "minibytes", "tokio", @@ -1689,7 +1937,7 @@ dependencies = [ "auth", "configmodel", "edenapi_types", - "futures 0.3.28", + "futures 0.3.29", "http", "http-client", "minibytes", @@ -1704,7 +1952,9 @@ name = "edenapi_types" version = "0.1.0" dependencies = [ "anyhow", - "bytes 1.4.0", + "blake2", + "blake3", + "bytes", "dag-types", "insta_ext", "paste", @@ -1716,38 +1966,56 @@ dependencies = [ "serde_bytes", "serde_derive", "serde_json", + "sha1", + "sha2 0.10.8", "thiserror", "type_macros", "types", ] [[package]] -name = "edenfs_client" +name = "edenfs-client" version = "0.1.0" dependencies = [ "anyhow", - "byteorder", - "chrono", + "async-runtime", + "clientinfo", "fbthrift_socket", + "fs-err", "identity", - "io", "serde", - "sha2 0.10.6", - "status", - "thiserror", "thrift-types", - "tokio", "tokio-uds-compat", "toml", + "tracing", + "types", +] + +[[package]] +name = "edenfs_ffi" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "cxx", + "cxx-build", + "futures 0.3.29", + "identity", + "manifest", + "manifest-tree", + "once_cell", + "pathmatcher", + "repo", + "sparse", + "tokio", "types", - "util", ] [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encode_unicode" @@ -1766,23 +2034,23 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "enum_dispatch" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" +checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] @@ -1797,9 +2065,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -1809,24 +2077,28 @@ dependencies = [ ] [[package]] -name = "errno" -version = "0.3.1" +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "erased-serde" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", + "serde", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "errno" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" dependencies = [ - "cc", "libc", + "windows-sys 0.48.0", ] [[package]] @@ -1874,6 +2146,14 @@ dependencies = [ ] [[package]] +name = "factory" +version = "0.1.0" +dependencies = [ + "anyhow", + "tracing", +] + +[[package]] name = "fail" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1885,6 +2165,16 @@ dependencies = [ ] [[package]] +name = "fancy-regex" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0678ab2d46fa5195aaf59ad034c083d351377d4af57f3e073c074d0da3e3c766" +dependencies = [ + "bit-set", + "regex", +] + +[[package]] name = "faster-hex" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1900,30 +2190,51 @@ dependencies = [ ] [[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] name = "fb303_core" version = "0.0.0" -source = "git+https://github.com/facebook/fb303.git?branch=main#5ed29aacd750ec0eb3914f255feab6705fe9d90e" +source = "git+https://github.com/facebook/fb303.git?branch=main#b43090b2a64a33076412ab593ee1ada5e48a7a9c" dependencies = [ "anyhow", "async-trait", "codegen_includer_proc_macro", "const-cstr", + "fb303_core_types", "fbthrift", - "futures 0.3.28", + "futures 0.3.29", + "ref-cast", + "thiserror", + "thrift_compiler", + "tracing", + "tracing-futures", +] + +[[package]] +name = "fb303_core_types" +version = "0.0.0" +source = "git+https://github.com/facebook/fb303.git?branch=main#b43090b2a64a33076412ab593ee1ada5e48a7a9c" +dependencies = [ + "anyhow", + "codegen_includer_proc_macro", + "fbthrift", + "futures 0.3.29", "once_cell", "ref-cast", "serde", "serde_derive", "thiserror", "thrift_compiler", - "tracing", - "tracing-futures", ] [[package]] name = "fbinit" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "fbinit_macros", "quickcheck", @@ -1932,7 +2243,7 @@ dependencies = [ [[package]] name = "fbinit_macros" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "proc-macro2", "quote", @@ -1942,18 +2253,18 @@ dependencies = [ [[package]] name = "fbthrift" version = "0.0.1+unstable" -source = "git+https://github.com/facebook/fbthrift.git?branch=main#68e4e25248eee387a2aa869cac55a18e1041649b" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#7ba2d200ef5654b277c9ae85fe8b3bdbe15433e0" dependencies = [ "anyhow", "async-trait", - "base64 0.11.0", + "base64 0.13.1", "bufsize", - "bytes 1.4.0", - "futures 0.3.28", + "bytes", + "futures 0.3.29", "ghost", "num-derive", "num-traits", - "ordered-float 1.1.1", + "ordered-float", "panic-message", "serde_json", "thiserror", @@ -1962,34 +2273,34 @@ dependencies = [ [[package]] name = "fbthrift_framed" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "byteorder", - "bytes 1.4.0", - "tokio-util 0.6.10", + "bytes", + "tokio-util 0.7.10", ] [[package]] name = "fbthrift_socket" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "anyhow", - "bytes 1.4.0", + "bytes", "fbthrift", "fbthrift_framed", "fbthrift_util", - "futures 0.3.28", + "futures 0.3.29", "tokio", "tokio-tower", - "tokio-util 0.6.10", + "tokio-util 0.7.10", "tower-service", ] [[package]] name = "fbthrift_util" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "tokio", ] @@ -2018,13 +2329,13 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "windows-sys 0.48.0", ] @@ -2042,16 +2353,23 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.22" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ - "cfg-if 1.0.0", "crc32fast", - "futures 0.1.31", - "libc", - "miniz_oxide 0.4.4", - "tokio-io", + "miniz_oxide", +] + +[[package]] +name = "fn-error-context" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cd66269887534af4b0c3e3337404591daa8dc8b9b2b3db71f9523beb4bafb41" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", ] [[package]] @@ -2077,9 +2395,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -2097,6 +2415,15 @@ dependencies = [ ] [[package]] +name = "fs-err" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5fd9bcbe8b1087cbd395b51498c01bc997cef73e778a80b77a811af5e2d29f" +dependencies = [ + "autocfg", +] + +[[package]] name = "fs2" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2147,9 +2474,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -2162,9 +2489,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -2172,15 +2499,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -2189,9 +2516,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" @@ -2199,7 +2526,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -2210,26 +2537,26 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-timer" @@ -2239,9 +2566,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures 0.1.31", "futures-channel", @@ -2288,9 +2615,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if 1.0.0", "libc", @@ -2299,20 +2626,20 @@ dependencies = [ [[package]] name = "ghost" -version = "0.1.9" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77ac7b51b8e6313251737fcef4b1c01a2ea102bde68415b62c0ee9268fec357" +checksum = "ef81e7cedce6ab54cd5dc7b3400c442c8d132fe03200a1be0637db7ef308ff17" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] name = "gimli" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "git2" @@ -2320,7 +2647,7 @@ version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0155506aab710a86160ddb504a480d2964d7ab5b9e62419be69e0032bc5931c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "libgit2-sys", "log", @@ -2337,7 +2664,7 @@ dependencies = [ "dag", "git2", "nonblocking", - "parking_lot 0.11.2", + "parking_lot", "tracing", ] @@ -2347,7 +2674,8 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "futures 0.3.28", + "factory", + "fs-err", "git2", "minibytes", "storemodel", @@ -2362,33 +2690,34 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.10" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ - "aho-corasick 0.7.20", + "aho-corasick", "bstr", "fnv", "log", "regex", + "serde", ] [[package]] name = "h2" -version = "0.3.19" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ - "bytes 1.4.0", + "bytes", "fnv", "futures-core", "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 2.1.0", "slab", "tokio", - "tokio-util 0.7.8", + "tokio-util 0.7.10", "tracing", ] @@ -2404,7 +2733,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" dependencies = [ - "ahash 0.4.7", + "ahash 0.4.8", ] [[package]] @@ -2415,11 +2744,12 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.13.2" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", + "allocator-api2", ] [[package]] @@ -2448,18 +2778,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -2487,7 +2808,7 @@ name = "hg-metrics" version = "0.1.0" dependencies = [ "once_cell", - "parking_lot 0.11.2", + "parking_lot", ] [[package]] @@ -2505,8 +2826,10 @@ dependencies = [ "cliparser", "clone", "comfy-table", + "commandserver", "configloader", "configmodel", + "constructors", "cpython", "cpython_ext", "ctrlc", @@ -2514,39 +2837,43 @@ dependencies = [ "debugtop", "eagerepo", "edenapi", - "edenfs_client", + "edenfs-client", "exchange", "fail", "flate2", "formatter", + "fs-err", "fsyncglob", "hg-http", + "hg-metrics", "hgplain", "hgtime", "hostname 0.3.1", "identity", "indexedlog", "libc", + "metalog", "metrics-render", "migration", "mincode", "minibytes", "network-doctor", "nodeipc", - "once_cell", - "parking_lot 0.11.2", + "parking_lot", "pathmatcher", "procinfo", "progress-model", "progress-render", "pyconfigloader", + "pyedenclient", + "pyio", + "pymodules", "python3-sys", "pytracing", "rand 0.8.5", "repo", "repo_name", "revisionstore", - "revsets", "runlog", "sampling", "serde", @@ -2573,19 +2900,17 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", + "commits-trait", "dag", "edenapi", - "futures 0.3.28", - "gitdag", - "metalog", + "factory", + "fs-err", + "futures 0.3.29", "minibytes", - "parking_lot 0.11.2", - "refencode", + "parking_lot", "revlogindex", - "serde", "storemodel", "streams", - "thiserror", "tracing", "types", "zstore", @@ -2605,6 +2930,8 @@ dependencies = [ "identity", "libc", "pyblackbox", + "tracing", + "webview-app", "winapi 0.3.9", ] @@ -2637,17 +2964,26 @@ dependencies = [ ] [[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] name = "hostcaps" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ - "lazy_static", + "once_cell", ] [[package]] name = "hostname" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "anyhow", "hostname 0.3.1", @@ -2666,13 +3002,13 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ - "bytes 1.4.0", + "bytes", "fnv", - "itoa 1.0.6", + "itoa 1.0.9", ] [[package]] @@ -2681,7 +3017,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.4.0", + "bytes", "http", "pin-project-lite", ] @@ -2693,19 +3029,20 @@ dependencies = [ "anyhow", "assert_matches", "async-compression", - "atty", - "crossbeam 0.8.2", + "async-runtime", + "clientinfo", + "crossbeam", "curl", "curl-sys", - "env_logger 0.10.0", - "futures 0.3.28", + "env_logger 0.10.1", + "futures 0.3.29", "http", "lru-cache", "maplit", "mockito", "once_cell", "openssl", - "parking_lot 0.11.2", + "parking_lot", "paste", "pin-project 0.4.30", "regex", @@ -2715,7 +3052,7 @@ dependencies = [ "structopt", "thiserror", "tokio", - "tokio-util 0.6.10", + "tokio-util 0.7.10", "tracing", "url", "zstd", @@ -2729,9 +3066,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -2741,11 +3078,11 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ - "bytes 1.4.0", + "bytes", "futures-channel", "futures-core", "futures-util", @@ -2754,9 +3091,9 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.6", + "itoa 1.0.9", "pin-project-lite", - "socket2", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -2765,10 +3102,11 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ + "futures-util", "http", "hyper", "rustls", @@ -2782,7 +3120,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.4.0", + "bytes", "hyper", "native-tls", "tokio", @@ -2791,16 +3129,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -2819,13 +3157,24 @@ dependencies = [ "anyhow", "dirs 2.0.2", "once_cell", - "parking_lot 0.11.2", + "parking_lot", "tempfile", "tracing", ] [[package]] name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" @@ -2835,6 +3184,16 @@ dependencies = [ ] [[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] name = "ignore" version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2852,11 +3211,26 @@ dependencies = [ ] [[package]] +name = "im" +version = "15.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9" +dependencies = [ + "bitmaps", + "rand_core 0.6.4", + "rand_xoshiro", + "sized-chunks", + "typenum", + "version_check", +] + +[[package]] name = "indexedlog" version = "0.1.0" dependencies = [ "atomicfile", "byteorder", + "configmodel", "dev-logger", "fs2", "hex", @@ -2872,6 +3246,7 @@ dependencies = [ "tracing", "twox-hash", "vlqencoding", + "winapi 0.3.9", ] [[package]] @@ -2888,10 +3263,20 @@ dependencies = [ ] [[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown 0.14.2", +] + +[[package]] name = "insta" -version = "1.29.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a28d25139df397cbca21408bb742cf6837e04cdbebf1b07b760caf971d6a972" +checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" dependencies = [ "console", "lazy_static", @@ -2921,60 +3306,69 @@ dependencies = [ name = "io" version = "0.1.0" dependencies = [ - "atty", "configmodel", "hgplain", "once_cell", - "parking_lot 0.11.2", + "parking_lot", "pipe", "streampager", - "terminal_size", + "terminal_size 0.3.0", "termwiz", + "time-interval", ] [[package]] name = "io-lifetimes" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.3", "libc", "windows-sys 0.48.0", ] [[package]] -name = "iovec" -version = "0.1.4" +name = "ipnet" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] -name = "ipnet" -version = "2.7.2" +name = "is-docker" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +dependencies = [ + "once_cell", +] [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", + "hermit-abi 0.3.3", + "rustix 0.38.24", "windows-sys 0.48.0", ] [[package]] +name = "is-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] + +[[package]] name = "itertools" -version = "0.10.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] @@ -2987,24 +3381,24 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] @@ -3050,9 +3444,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.144" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libgit2-sys" @@ -3070,15 +3464,26 @@ dependencies = [ [[package]] name = "libnghttp2-sys" -version = "0.1.7+1.45.0" +version = "0.1.8+1.55.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f" +checksum = "4fae956c192dadcdb5dace96db71fa0b827333cce7c7b38dc71446f024d8a340" dependencies = [ "cc", "libc", ] [[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] name = "libssh2-sys" version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3094,9 +3499,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.9" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "libc", @@ -3114,6 +3519,23 @@ dependencies = [ ] [[package]] +name = "linelog" +version = "0.1.0" +dependencies = [ + "im", + "rand_chacha 0.3.1", +] + +[[package]] +name = "link-cplusplus" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9" +dependencies = [ + "cc", +] + +[[package]] name = "linked-hash-map" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3126,6 +3548,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] +name = "linux-raw-sys" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" + +[[package]] name = "local-encoding" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3138,9 +3566,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -3148,21 +3576,20 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" dependencies = [ - "cfg-if 1.0.0", "value-bag", ] [[package]] name = "lru" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03f1160296536f10c833a82dca22267d5486734230d47bf00bf435885814ba1e" +checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" dependencies = [ - "hashbrown 0.13.2", + "hashbrown 0.14.2", ] [[package]] @@ -3211,12 +3638,12 @@ name = "manifest-tree" version = "0.1.0" dependencies = [ "anyhow", - "crossbeam 0.8.2", + "crossbeam", "manifest", "minibench", "minibytes", "once_cell", - "parking_lot 0.11.2", + "parking_lot", "pathmatcher", "progress-model", "quickcheck", @@ -3247,20 +3674,20 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] -name = "maybe-uninit" -version = "2.0.0" +name = "matches" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memmap2" @@ -3279,15 +3706,6 @@ checksum = "a64a92489e2744ce060c349162be1c5f33c6969234104dbd99ddb5feb08b8c15" [[package]] name = "memoffset" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" @@ -3297,9 +3715,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -3314,7 +3732,7 @@ dependencies = [ "lazy_static", "mincode", "minibytes", - "parking_lot 0.11.2", + "parking_lot", "quickcheck", "rand_chacha 0.3.1", "rand_core 0.6.4", @@ -3330,7 +3748,7 @@ dependencies = [ name = "metrics" version = "0.1.0" dependencies = [ - "futures 0.3.28", + "futures 0.3.29", "once_cell", ] @@ -3387,7 +3805,7 @@ version = "0.1.0" name = "minibytes" version = "0.1.0" dependencies = [ - "bytes 1.4.0", + "bytes", "memmap2", "quickcheck", "serde", @@ -3401,33 +3819,23 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.6" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -3441,7 +3849,7 @@ dependencies = [ "identity", "libc", "serde", - "sha2 0.10.6", + "sha2 0.10.8", "toml", ] @@ -3483,14 +3891,14 @@ name = "mutationstore" version = "0.1.0" dependencies = [ "anyhow", - "bitflags", + "bitflags 1.3.2", "dag", "drawdag", - "futures 0.3.28", + "futures 0.3.29", "indexedlog", "rand 0.8.5", "rand_chacha 0.3.1", - "tempdir", + "tempfile", "types", "vlqencoding", ] @@ -3535,7 +3943,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", "memoffset 0.6.5", @@ -3543,14 +3951,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags", + "bitflags 2.4.1", "cfg-if 1.0.0", "libc", - "static_assertions", ] [[package]] @@ -3560,12 +3967,18 @@ dependencies = [ "anyhow", "filedescriptor 0.7.3", "libc", - "once_cell", + "nodeipc_derive", + "paste", "serde", "serde_json", + "winapi 0.3.9", ] [[package]] +name = "nodeipc_derive" +version = "0.1.0" + +[[package]] name = "nodemap" version = "0.1.0" dependencies = [ @@ -3601,7 +4014,7 @@ dependencies = [ name = "nonblocking" version = "0.1.0" dependencies = [ - "futures 0.3.28", + "futures 0.3.29", ] [[package]] @@ -3616,9 +4029,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.2.6" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -3648,20 +4061,20 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.3", "libc", ] @@ -3676,18 +4089,18 @@ dependencies = [ [[package]] name = "object" -version = "0.30.3" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "opaque-debug" @@ -3696,12 +4109,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] +name = "open" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a083c0c7e5e4a8ec4176346cf61f67ac674e8bfb059d9226e1c54a96b377c12" +dependencies = [ + "is-wsl", + "libc", + "pathdiff", +] + +[[package]] name = "openssl" -version = "0.10.52" +version = "0.10.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" +checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33" dependencies = [ - "bitflags", + "bitflags 2.4.1", "cfg-if 1.0.0", "foreign-types", "libc", @@ -3718,7 +4142,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] @@ -3729,9 +4153,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.87" +version = "0.9.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" +checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" dependencies = [ "cc", "libc", @@ -3741,24 +4165,16 @@ dependencies = [ [[package]] name = "ordered-float" -version = "1.1.1" +version = "3.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" dependencies = [ "num-traits", + "rand 0.8.5", "serde", ] [[package]] -name = "ordered-float" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" -dependencies = [ - "num-traits", -] - -[[package]] name = "ordered-multimap" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3770,18 +4186,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.5.0" +version = "6.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" - -[[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi 0.3.9", -] +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" [[package]] name = "overload" @@ -3797,20 +4204,9 @@ checksum = "384e52fd8fbd4cbe3c317e8216260c21a0f9134de108cea8a4dd4e7e152c472d" [[package]] name = "parking" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" - -[[package]] -name = "parking_lot" -version = "0.11.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -3819,41 +4215,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.7", + "parking_lot_core", ] [[package]] name = "parking_lot_core" -version = "0.8.6" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if 1.0.0", - "instant", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.4.1", "smallvec", - "winapi 0.3.9", + "windows-targets 0.48.5", ] [[package]] -name = "parking_lot_core" -version = "0.9.7" +name = "paste" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "windows-sys 0.45.0", -] +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] -name = "paste" -version = "1.0.12" +name = "pathdiff" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pathhistory" @@ -3866,6 +4254,7 @@ dependencies = [ "dev-logger", "manifest", "manifest-tree", + "sha1", "storemodel", "tokio", "tracing", @@ -3877,14 +4266,17 @@ name = "pathmatcher" version = "0.1.0" dependencies = [ "anyhow", - "bitflags", + "bitflags 1.3.2", + "fancy-regex", + "fs-err", + "glob", "globset", "ignore", - "parking_lot 0.11.2", - "regex-automata", - "regex-syntax 0.6.29", + "parking_lot", + "regex-automata 0.3.9", "tempfile", "thiserror", + "tracing", "types", "util", ] @@ -3902,25 +4294,31 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "perthread" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" [[package]] name = "pest" -version = "2.6.0" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e68e84bfb01f0507134eac1e9b410a12ba379d064eab48c50ba4ce329a527b70" +checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" dependencies = [ + "memchr", "thiserror", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.6.0" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b79d4c71c865a25a4322296122e3924d30bc8ee0834c8bfc8b95f7f054afbfb" +checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" dependencies = [ "pest", "pest_generator", @@ -3928,26 +4326,26 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.6.0" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c435bf1076437b851ebc8edc3a18442796b30f1728ffea6262d59bbe28b077e" +checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] name = "pest_meta" -version = "2.6.0" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745a452f8eb71e39ffd8ee32b3c5f51d03845f99786fa9b68db6ff509c505411" +checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" dependencies = [ "once_cell", "pest", - "sha2 0.10.6", + "sha2 0.10.8", ] [[package]] @@ -3961,45 +4359,45 @@ dependencies = [ [[package]] name = "phf" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_macros", - "phf_shared 0.11.1", + "phf_shared 0.11.2", ] [[package]] name = "phf_codegen" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" dependencies = [ "phf_generator", - "phf_shared 0.11.1", + "phf_shared 0.11.2", ] [[package]] name = "phf_generator" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared 0.11.1", + "phf_shared 0.11.2", "rand 0.8.5", ] [[package]] name = "phf_macros" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator", - "phf_shared 0.11.1", + "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] @@ -4013,9 +4411,9 @@ dependencies = [ [[package]] name = "phf_shared" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] @@ -4031,11 +4429,11 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ - "pin-project-internal 1.1.0", + "pin-project-internal 1.1.3", ] [[package]] @@ -4051,20 +4449,20 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -4089,16 +4487,16 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plist" -version = "1.4.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590" +checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" dependencies = [ - "base64 0.21.1", - "indexmap", + "base64 0.21.5", + "indexmap 2.1.0", "line-wrap", "quick-xml", "serde", - "time 0.3.21", + "time", ] [[package]] @@ -4108,7 +4506,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "concurrent-queue", "libc", @@ -4118,6 +4516,12 @@ dependencies = [ ] [[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "pprint" version = "0.1.0" dependencies = [ @@ -4133,13 +4537,11 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pretty_assertions" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ - "ctor", "diff", - "output_vt100", "yansi", ] @@ -4169,9 +4571,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.58" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -4186,13 +4588,24 @@ dependencies = [ ] [[package]] +name = "procutil" +version = "0.1.0" +dependencies = [ + "libc", + "once_cell", + "tracing", + "winapi 0.3.9", +] + +[[package]] name = "progress-model" version = "0.1.0" dependencies = [ "arc-swap", "once_cell", - "parking_lot 0.11.2", + "parking_lot", "paste", + "thread_local", "tokio", "tracing", ] @@ -4203,10 +4616,27 @@ version = "0.1.0" dependencies = [ "progress-model", "termwiz", + "unicode-segmentation", "unicode-width", ] [[package]] +name = "psl-types" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" + +[[package]] +name = "publicsuffix" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457" +dependencies = [ + "idna 0.3.0", + "psl-types", +] + +[[package]] name = "pulldown-cmark" version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4222,6 +4652,7 @@ dependencies = [ "atexit", "cpython", "cpython_ext", + "procutil", ] [[package]] @@ -4250,7 +4681,6 @@ name = "pybytes" version = "0.1.0" dependencies = [ "cpython", - "cpython_ext", "minibytes", "python3-sys", ] @@ -4259,12 +4689,19 @@ dependencies = [ name = "pycats" version = "0.1.0" dependencies = [ - "anyhow", "cats", "cpython", "cpython_ext", "pyconfigloader", - "url", +] + +[[package]] +name = "pycext" +version = "0.1.0" +dependencies = [ + "cc", + "cpython", + "python3-sys", ] [[package]] @@ -4285,8 +4722,6 @@ dependencies = [ "pystatus", "pytreestate", "storemodel", - "treestate", - "types", "vfs", ] @@ -4297,7 +4732,6 @@ dependencies = [ "clientinfo", "cpython", "cpython_ext", - "pyconfigloader", ] [[package]] @@ -4308,7 +4742,6 @@ dependencies = [ "cliparser", "configmodel", "cpython", - "cpython_ext", "pyconfigloader", ] @@ -4325,27 +4758,23 @@ dependencies = [ name = "pyconfigloader" version = "0.1.0" dependencies = [ - "anyhow", "configloader", "cpython", "cpython_ext", "util", - "version", ] [[package]] name = "pycopytrace" version = "0.1.0" dependencies = [ - "anyhow", "async-runtime", "configmodel", "copytrace", "cpython", "cpython_ext", "dag", - "parking_lot 0.11.2", - "pymanifest", + "parking_lot", "storemodel", "types", ] @@ -4359,11 +4788,12 @@ dependencies = [ "cpython", "cpython_ext", "dag", - "futures 0.3.28", + "futures 0.3.29", "hgcommits", "minibytes", - "parking_lot 0.11.2", + "parking_lot", "pyedenapi", + "pyio", "pymetalog", "storemodel", ] @@ -4373,7 +4803,6 @@ name = "pydiffhelpers" version = "0.1.0" dependencies = [ "cpython", - "cpython_ext", ] [[package]] @@ -4382,7 +4811,7 @@ version = "0.1.0" dependencies = [ "cpython", "cpython_ext", - "encoding", + "dirs 2.0.2", ] [[package]] @@ -4390,7 +4819,6 @@ name = "pydoctor" version = "0.1.0" dependencies = [ "cpython", - "cpython_ext", "network-doctor", "pyconfigloader", ] @@ -4407,14 +4835,12 @@ dependencies = [ name = "pyeagerepo" version = "0.1.0" dependencies = [ - "anyhow", "async-runtime", "cpython", "cpython_ext", "dag", "eagerepo", "edenapi_types", - "pyconfigloader", "pydag", "pyedenapi", "storemodel", @@ -4426,7 +4852,6 @@ version = "0.1.0" dependencies = [ "anyhow", "async-runtime", - "blake2", "cpython", "cpython_async", "cpython_ext", @@ -4434,18 +4859,27 @@ dependencies = [ "edenapi", "edenapi_ext", "edenapi_types", - "futures 0.3.28", + "futures 0.3.29", "hgstore", "minibytes", "progress-model", "pyconfigloader", - "pyprogress", "pyrevisionstore", "revisionstore", "types", ] [[package]] +name = "pyedenclient" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "edenfs-client", + "types", +] + +[[package]] name = "pyerror" version = "0.1.0" dependencies = [ @@ -4455,15 +4889,14 @@ dependencies = [ "cpython_ext", "dag", "edenapi", - "hgcommits", "http-client", "indexedlog", "metalog", + "pathmatcher", "repo", "repolock", "revisionstore", "revlogindex", - "treestate", "types", ] @@ -4502,7 +4935,6 @@ dependencies = [ name = "pygitstore" version = "0.1.0" dependencies = [ - "anyhow", "cpython", "cpython_ext", "gitstore", @@ -4551,14 +4983,22 @@ dependencies = [ name = "pyio" version = "0.1.0" dependencies = [ - "clidispatch", "cpython", "cpython_ext", + "io", "pyconfigloader", "termstyle", ] [[package]] +name = "pylinelog" +version = "0.1.0" +dependencies = [ + "cpython", + "linelog", +] + +[[package]] name = "pylock" version = "0.1.0" dependencies = [ @@ -4585,7 +5025,7 @@ dependencies = [ "cpython_ext", "manifest", "manifest-tree", - "parking_lot 0.11.2", + "parking_lot", "pathmatcher", "pypathmatcher", "types", @@ -4598,7 +5038,17 @@ dependencies = [ "cpython", "cpython_ext", "metalog", - "parking_lot 0.11.2", + "parking_lot", +] + +[[package]] +name = "pymodules" +version = "0.1.0" +dependencies = [ + "cpython", + "minibytes", + "pybytes", + "python-modules", ] [[package]] @@ -4658,6 +5108,7 @@ dependencies = [ "cpython", "cpython_ext", "pathmatcher", + "tracing", "types", ] @@ -4676,6 +5127,7 @@ version = "0.1.0" dependencies = [ "cpython", "cpython_ext", + "procutil", "spawn-ext", ] @@ -4714,7 +5166,7 @@ dependencies = [ "cpython", "cpython_ext", "minibytes", - "parking_lot 0.11.2", + "parking_lot", "renderdag", ] @@ -4722,16 +5174,20 @@ dependencies = [ name = "pyrepo" version = "0.1.0" dependencies = [ + "configmodel", "cpython", "cpython_ext", - "parking_lot 0.11.2", + "parking_lot", "pyconfigloader", "pydag", + "pyeagerepo", "pyedenapi", "pymetalog", + "pyrevisionstore", "pyworkingcopy", "repo", "repolock", + "revisionstore", "util", "workingcopy", ] @@ -4746,10 +5202,10 @@ dependencies = [ "configmodel", "cpython", "cpython_ext", - "futures 0.3.28", + "futures 0.3.29", "io", "minibytes", - "parking_lot 0.11.2", + "parking_lot", "pyconfigloader", "revisionstore", "storemodel", @@ -4762,7 +5218,6 @@ version = "0.1.0" dependencies = [ "cpython", "cpython_ext", - "dag", "pybytes", "pydag", "revlogindex", @@ -4787,6 +5242,17 @@ dependencies = [ "cpython_ext", "status", "types", + "util", +] + +[[package]] +name = "python-modules" +version = "0.1.0" +dependencies = [ + "codegen", + "once_cell", + "phf 0.11.2", + "zstdelta", ] [[package]] @@ -4804,6 +5270,16 @@ name = "pythreading" version = "0.1.0" dependencies = [ "cpython", + "rand 0.8.5", +] + +[[package]] +name = "pytoml" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "toml", ] [[package]] @@ -4814,7 +5290,7 @@ dependencies = [ "cpython_ext", "lazy_static", "mincode", - "parking_lot 0.11.2", + "parking_lot", "python3-sys", "serde_json", "tracing", @@ -4830,7 +5306,7 @@ dependencies = [ "anyhow", "cpython", "cpython_ext", - "parking_lot 0.11.2", + "parking_lot", "pathmatcher", "pypathmatcher", "treestate", @@ -4839,22 +5315,40 @@ dependencies = [ ] [[package]] +name = "pyversion" +version = "0.1.0" +dependencies = [ + "cpython", + "version", +] + +[[package]] name = "pyvlq" version = "0.1.0" dependencies = [ "cpython", "cpython_ext", + "pyio", "vlqencoding", ] [[package]] +name = "pywebview" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "webview-app", +] + +[[package]] name = "pyworker" version = "0.1.0" dependencies = [ "anyhow", "cpython", "cpython_ext", - "crossbeam 0.7.3", + "crossbeam", "memmap2", "minibytes", "pyrevisionstore", @@ -4873,15 +5367,16 @@ dependencies = [ "anyhow", "cpython", "cpython_ext", + "fs-err", "io", - "parking_lot 0.11.2", + "parking_lot", "pathmatcher", "pyconfigloader", - "pymanifest", "pypathmatcher", "pystatus", "pytreestate", - "storemodel", + "sparse", + "types", "workingcopy", ] @@ -4916,9 +5411,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.28.2" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] @@ -4937,7 +5432,7 @@ dependencies = [ [[package]] name = "quickcheck_arbitrary_derive" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "proc-macro2", "quickcheck", @@ -4958,9 +5453,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.27" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -5011,6 +5506,7 @@ dependencies = [ "libc", "rand_chacha 0.3.1", "rand_core 0.6.4", + "serde", ] [[package]] @@ -5063,7 +5559,8 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.11", + "serde", ] [[package]] @@ -5076,10 +5573,19 @@ dependencies = [ ] [[package]] +name = "rand_xoshiro" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" +dependencies = [ + "rand_core 0.6.4", +] + +[[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -5087,14 +5593,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel 0.5.8", - "crossbeam-deque 0.8.3", - "crossbeam-utils 0.8.15", - "num_cpus", + "crossbeam-deque", + "crossbeam-utils 0.8.16", ] [[package]] @@ -5108,51 +5612,51 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.9", - "redox_syscall 0.2.16", + "getrandom 0.2.11", + "libredox", "thiserror", ] [[package]] name = "ref-cast" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43faa91b1c8b36841ee70e97188a869d37ae21759da6846d4be66de5bf7b12c" +checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d2275aab483050ab2a7364c1a46604865ee7d6906684e08db0f090acf74f9e7" +checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] @@ -5164,13 +5668,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.2" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ - "aho-corasick 1.0.1", + "aho-corasick", "memchr", - "regex-syntax 0.7.2", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -5183,6 +5688,28 @@ dependencies = [ ] [[package]] +name = "regex-automata" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.5", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] + +[[package]] name = "regex-syntax" version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5190,9 +5717,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + +[[package]] +name = "regex-syntax" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "remove_dir_all" @@ -5207,7 +5740,7 @@ dependencies = [ name = "renderdag" version = "0.1.0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "dag", "itertools", "nonblocking", @@ -5221,18 +5754,20 @@ version = "0.1.0" dependencies = [ "anyhow", "async-runtime", + "commits-trait", "configloader", "configmodel", + "constructors", "eagerepo", "edenapi", + "factory", "fail", - "gitstore", - "hgcommits", + "fs-err", "identity", "manifest-tree", "metalog", "once_cell", - "parking_lot 0.11.2", + "parking_lot", "refencode", "repolock", "revisionstore", @@ -5262,8 +5797,9 @@ version = "0.1.0" dependencies = [ "anyhow", "configmodel", + "fs-err", "fs2", - "parking_lot 0.11.2", + "parking_lot", "tempfile", "thiserror", "tracing", @@ -5272,12 +5808,14 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "base64 0.21.1", - "bytes 1.4.0", + "base64 0.21.5", + "bytes", + "cookie", + "cookie_store", "encoding_rs", "futures-core", "futures-util", @@ -5302,10 +5840,11 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded 0.7.1", + "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls", - "tokio-util 0.7.8", + "tokio-util 0.7.10", "tower-service", "url", "wasm-bindgen", @@ -5318,9 +5857,9 @@ dependencies = [ [[package]] name = "reqwest-eventsource" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f03f570355882dd8d15acc3a313841e6e90eddbc76a93c748fd82cc13ba9f51" +checksum = "f529a5ff327743addc322af460761dff5b50e0c826b9e6ac44c3195c50bb2026" dependencies = [ "eventsource-stream", "futures-core", @@ -5339,18 +5878,18 @@ dependencies = [ "anyhow", "async-runtime", "async-trait", - "auth", - "bincode", - "blake2", - "blake3", "byteorder", + "clientinfo", + "clientinfo_async", "configmodel", - "crossbeam 0.8.2", + "crossbeam", "curl", "edenapi", "edenapi_types", "fbinit", - "futures 0.3.28", + "fn-error-context", + "fs-err", + "futures 0.3.29", "hex", "hg-http", "hg-metrics", @@ -5359,7 +5898,6 @@ dependencies = [ "http", "http-client", "indexedlog", - "lazy_static", "lfs_protocol", "lz4-pyframe", "manifest-tree", @@ -5369,8 +5907,7 @@ dependencies = [ "minibytes", "mockito", "mpatch", - "once_cell", - "parking_lot 0.11.2", + "parking_lot", "progress-model", "quickcheck", "quickcheck_arbitrary_derive", @@ -5383,7 +5920,8 @@ dependencies = [ "serde_derive", "serde_json", "sha1", - "sha2 0.10.6", + "sha2 0.10.8", + "stats", "storemodel", "tempfile", "thiserror", @@ -5422,7 +5960,7 @@ dependencies = [ "lz4-pyframe", "minibytes", "nonblocking", - "parking_lot 0.11.2", + "parking_lot", "radixbuf", "tempfile", "thiserror", @@ -5435,7 +5973,9 @@ version = "0.1.0" dependencies = [ "anyhow", "async-runtime", + "configmodel", "dag", + "edenapi", "metalog", "refencode", "thiserror", @@ -5445,17 +5985,16 @@ dependencies = [ [[package]] name = "ring" -version = "0.16.20" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", + "getrandom 0.2.11", "libc", - "once_cell", "spin", "untrusted", - "web-sys", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] @@ -5468,7 +6007,7 @@ dependencies = [ "fs2", "hg-http", "libc", - "parking_lot 0.11.2", + "parking_lot", "progress-model", "rand 0.8.5", "repo", @@ -5496,23 +6035,36 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.37.19" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ad981d6c340a49cdc40a1028d9c6084ec7e9fa33fcb839cab656a267071e234" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys 0.4.11", "windows-sys 0.48.0", ] [[package]] name = "rustls" -version = "0.21.1" +version = "0.21.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" +checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" dependencies = [ "log", "ring", @@ -5522,9 +6074,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -5534,18 +6086,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.1", + "base64 0.21.5", ] [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ "ring", "untrusted", @@ -5553,15 +6105,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "safemem" @@ -5583,18 +6135,19 @@ name = "sampling" version = "0.1.0" dependencies = [ "configmodel", - "once_cell", - "parking_lot 0.11.2", + "parking_lot", + "serde", + "serde_json", "tracing", ] [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -5604,7 +6157,7 @@ dependencies = [ "anyhow", "clap 2.34.0", "commitcloudsubscriber", - "env_logger 0.10.0", + "env_logger 0.10.1", "libc", "log", "serde", @@ -5615,15 +6168,21 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "scratch" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ "ring", "untrusted", @@ -5631,11 +6190,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -5644,9 +6203,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -5672,9 +6231,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.163" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] @@ -5686,11 +6245,11 @@ version = "0.1.0" [[package]] name = "serde_bser" version = "0.3.1" -source = "git+https://github.com/facebook/watchman.git?branch=main#5a1c58828bacef2a8f0303f21223e62de720852f" +source = "git+https://github.com/facebook/watchman.git?branch=main#4bec06637edeb66496e53d678095fb427040b462" dependencies = [ "anyhow", "byteorder", - "bytes 1.4.0", + "bytes", "serde", "serde_bytes", "thiserror", @@ -5698,9 +6257,9 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.9" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" dependencies = [ "serde", ] @@ -5717,31 +6276,40 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", +] + +[[package]] +name = "serde_fmt" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d4ddca14104cd60529e8c7f7ba71a2c8acd8f7f5cfcdc2faf97eeb7c3010a4" +dependencies = [ + "serde", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ - "itoa 1.0.6", + "itoa 1.0.9", "ryu", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -5765,16 +6333,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.6", + "itoa 1.0.9", "ryu", "serde", ] [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -5802,9 +6370,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -5813,9 +6381,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -5831,9 +6399,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "signal-hook" @@ -5847,9 +6415,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ "libc", "signal-hook-registry", @@ -5863,7 +6431,7 @@ checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" dependencies = [ "libc", "mio", - "signal-hook 0.3.15", + "signal-hook 0.3.17", ] [[package]] @@ -5877,26 +6445,37 @@ dependencies = [ [[package]] name = "similar" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" +checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" [[package]] name = "simple_asn1" -version = "0.4.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692ca13de57ce0613a363c8c2f1de925adebc81b04c923ac60c5488bb44abe4b" +checksum = "8eb4ea60fb301dc81dfc113df680571045d375ab7345d171c5dc7d7e13107a80" dependencies = [ "chrono", "num-bigint", "num-traits", + "thiserror", ] [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "sized-chunks" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" +dependencies = [ + "bitmaps", + "typenum", +] [[package]] name = "skeptic" @@ -5910,33 +6489,43 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi 0.3.9", ] [[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] name = "sorted_vector_map" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "itertools", "quickcheck", @@ -5947,7 +6536,7 @@ name = "sparse" version = "0.1.0" dependencies = [ "anyhow", - "futures 0.3.28", + "futures 0.3.29", "globset", "once_cell", "pathmatcher", @@ -5969,9 +6558,9 @@ dependencies = [ [[package]] name = "spin" -version = "0.5.2" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "static_assertions" @@ -5984,7 +6573,7 @@ name = "staticconfig" version = "0.1.0" dependencies = [ "configmodel", - "phf 0.11.1", + "phf 0.11.2", "staticconfig_macros", ] @@ -5993,7 +6582,30 @@ name = "staticconfig_macros" version = "0.1.0" dependencies = [ "hgrc-parser", - "indexmap", + "indexmap 1.9.3", +] + +[[package]] +name = "stats" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" +dependencies = [ + "fbinit", + "futures 0.3.29", + "once_cell", + "perthread", + "stats_traits", + "tokio_shim", +] + +[[package]] +name = "stats_traits" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" +dependencies = [ + "auto_impl", + "dashmap", + "fbinit", ] [[package]] @@ -6008,10 +6620,13 @@ name = "storemodel" version = "0.1.0" dependencies = [ "anyhow", + "async-runtime", "async-trait", - "auto_impl", - "futures 0.3.28", + "configmodel", + "edenapi_trait", + "futures 0.3.29", "minibytes", + "serde", "types", ] @@ -6022,7 +6637,7 @@ dependencies = [ "bit-set", "dirs 2.0.2", "enum_dispatch", - "indexmap", + "indexmap 1.9.3", "lazy_static", "lru", "memmap2", @@ -6046,7 +6661,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "futures 0.3.28", + "futures 0.3.29", "pin-project 0.4.30", "tokio", ] @@ -6114,9 +6729,71 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "sval" -version = "1.0.0-alpha.5" +version = "2.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15df12a8db7c216a04b4b438f90d50d5335cd38f161b56389c9f5c9d96d0873" + +[[package]] +name = "sval_buffer" +version = "2.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57e80556bc8acea0446e574ce542ad6114a76a0237f28a842bc01ca3ea98f479" +dependencies = [ + "sval", + "sval_ref", +] + +[[package]] +name = "sval_dynamic" +version = "2.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d93d2259edb1d7b4316179f0a98c62e3ffc726f47ab200e07cfe382771f57b8" +dependencies = [ + "sval", +] + +[[package]] +name = "sval_fmt" +version = "2.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "532f7f882226f7a5a4656f5151224aaebf8217e0d539cb1595b831bace921343" +dependencies = [ + "itoa 1.0.9", + "ryu", + "sval", +] + +[[package]] +name = "sval_json" +version = "2.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45f6ee7c7b87caf59549e9fe45d6a69c75c8019e79e212a835c5da0e92f0ba08" +checksum = "76e03bd8aa0ae6ee018f7ae95c9714577687a4415bd1a5f19b26e34695f7e072" +dependencies = [ + "itoa 1.0.9", + "ryu", + "sval", +] + +[[package]] +name = "sval_ref" +version = "2.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75ed054f2fb8c2a0ab5d36c1ec57b412919700099fc5e32ad8e7a38b23e1a9e1" +dependencies = [ + "sval", +] + +[[package]] +name = "sval_serde" +version = "2.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ff191c4ff05b67e3844c161021427646cde5d6624597958be158357d9200586" +dependencies = [ + "serde", + "sval", + "sval_buffer", + "sval_fmt", +] [[package]] name = "syn" @@ -6131,9 +6808,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.16" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -6153,6 +6830,31 @@ dependencies = [ ] [[package]] +name = "system-command" +version = "0.1.0" + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] name = "tempdir" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6164,22 +6866,22 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.5.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if 1.0.0", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", + "fastrand 2.0.1", + "redox_syscall 0.4.1", + "rustix 0.38.24", + "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] @@ -6190,7 +6892,17 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ - "rustix", + "rustix 0.37.27", + "windows-sys 0.48.0", +] + +[[package]] +name = "terminal_size" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix 0.38.24", "windows-sys 0.48.0", ] @@ -6203,7 +6915,7 @@ dependencies = [ "dirs 4.0.0", "fnv", "nom 5.1.3", - "phf 0.11.1", + "phf 0.11.2", "phf_codegen", ] @@ -6245,7 +6957,7 @@ checksum = "25e302bfaa2555ca7fb55eee19051ad43e510153b19cb880d6da5acb65a72ab9" dependencies = [ "anyhow", "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "cassowary", "cfg-if 1.0.0", "filedescriptor 0.8.2", @@ -6260,7 +6972,7 @@ dependencies = [ "nix 0.24.3", "num-derive", "num-traits", - "ordered-float 3.7.0", + "ordered-float", "pest", "pest_derive", "phf 0.10.1", @@ -6282,6 +6994,14 @@ dependencies = [ ] [[package]] +name = "testutil" +version = "0.1.0" +dependencies = [ + "once_cell", + "parking_lot", +] + +[[package]] name = "textwrap" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6296,28 +7016,28 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" dependencies = [ - "terminal_size", + "terminal_size 0.2.6", "unicode-width", ] [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] @@ -6341,14 +7061,12 @@ dependencies = [ "const-cstr", "fb303_core", "fbthrift", - "futures 0.3.28", - "once_cell", + "futures 0.3.29", "ref-cast", - "serde", - "serde_derive", "sorted_vector_map", "thiserror", "thrift_compiler", + "thrift_types", "tracing", "tracing-futures", ] @@ -6362,7 +7080,7 @@ dependencies = [ "config_thrift", "fb303_core", "fbthrift", - "futures 0.3.28", + "futures 0.3.29", "thiserror", "thrift", ] @@ -6370,33 +7088,44 @@ dependencies = [ [[package]] name = "thrift_compiler" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "anyhow", - "clap 2.34.0", + "clap 4.4.8", + "serde", "which", ] [[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +name = "thrift_types" +version = "0.1.0" dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", + "anyhow", + "codegen_includer_proc_macro", + "config_thrift", + "fb303_core", + "fbthrift", + "futures 0.3.29", + "once_cell", + "ref-cast", + "serde", + "serde_derive", + "sorted_vector_map", + "thiserror", + "thrift_compiler", ] [[package]] name = "time" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ - "itoa 1.0.6", + "deranged", + "itoa 1.0.9", "libc", "num_threads", + "powerfmt", "serde", "time-core", "time-macros", @@ -6404,20 +7133,34 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-interval" +version = "0.1.0" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] [[package]] +name = "tinyfiledialogs" +version = "3.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e25fa0bc43a6566e2cc6d7ac96df3fa5a57beba34445bead1b368ba8fe9ca568" +dependencies = [ + "cc", + "libc", +] + +[[package]] name = "tinyvec" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6434,44 +7177,33 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.1" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" dependencies = [ - "autocfg", - "bytes 1.4.0", + "backtrace", + "bytes", "libc", "mio", "num_cpus", - "parking_lot 0.12.1", + "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.5", "tokio-macros", "tracing", "windows-sys 0.48.0", ] [[package]] -name = "tokio-io" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "log", -] - -[[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] @@ -6486,9 +7218,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ "rustls", "tokio", @@ -6503,7 +7235,7 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util 0.7.8", + "tokio-util 0.7.10", ] [[package]] @@ -6512,11 +7244,11 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4322b6e2ebfd3be4082c16df4341505ef333683158b55f22afaf3f61565d728" dependencies = [ - "crossbeam 0.8.2", + "crossbeam", "futures-core", "futures-sink", "futures-util", - "pin-project 1.1.0", + "pin-project 1.1.3", "tokio", "tower", "tower-service", @@ -6526,10 +7258,10 @@ dependencies = [ [[package]] name = "tokio-uds-compat" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "async-io", - "futures 0.3.28", + "futures 0.3.29", "tokio", "tracing", "uds_windows", @@ -6541,7 +7273,7 @@ version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" dependencies = [ - "bytes 1.4.0", + "bytes", "futures-core", "futures-io", "futures-sink", @@ -6553,23 +7285,39 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ - "bytes 1.4.0", + "bytes", "futures-core", + "futures-io", "futures-sink", + "futures-util", + "hashbrown 0.14.2", "pin-project-lite", + "slab", "tokio", "tracing", ] [[package]] +name = "tokio_shim" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" +dependencies = [ + "futures 0.3.29", + "pin-project 0.4.30", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] name = "toml" -version = "0.7.4" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", @@ -6579,20 +7327,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.10" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ - "indexmap", + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -6627,11 +7375,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if 1.0.0", "log", "pin-project-lite", "tracing-attributes", @@ -6648,22 +7395,22 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] name = "tracing-collector" version = "0.1.0" dependencies = [ - "indexmap", + "indexmap 1.9.3", "libc", - "parking_lot 0.11.2", + "parking_lot", "serde", "serde_json", "tracing", @@ -6673,9 +7420,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -6687,20 +7434,20 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "futures 0.3.28", + "futures 0.3.29", "futures-task", - "pin-project 1.1.0", + "pin-project 1.1.3", "tracing", ] [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] @@ -6719,7 +7466,7 @@ name = "tracing-runtime-callsite" version = "0.1.0" dependencies = [ "once_cell", - "parking_lot 0.11.2", + "parking_lot", "regex", "tracing", ] @@ -6728,10 +7475,7 @@ dependencies = [ name = "tracing-sampler" version = "0.1.0" dependencies = [ - "once_cell", "sampling", - "serde", - "serde_json", "tempfile", "tracing", "tracing-serde", @@ -6750,21 +7494,21 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", "once_cell", - "parking_lot 0.12.1", + "parking_lot", "regex", "serde", "serde_json", "sharded-slab", "smallvec", "thread_local", - "time 0.3.21", + "time", "tracing", "tracing-core", "tracing-log", @@ -6799,8 +7543,10 @@ name = "treestate" version = "0.1.0" dependencies = [ "anyhow", - "bitflags", + "atomicfile", + "bitflags 1.3.2", "byteorder", + "fs-err", "fs2", "identity", "itertools", @@ -6809,7 +7555,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "repolock", - "sha2 0.10.6", + "sha2 0.10.8", "tempfile", "thiserror", "tracing", @@ -6848,9 +7594,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "types" @@ -6876,9 +7622,9 @@ dependencies = [ [[package]] name = "ucd-trie" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "uds_windows" @@ -6891,10 +7637,21 @@ dependencies = [ ] [[package]] +name = "udsipc" +version = "0.1.0" +dependencies = [ + "anyhow", + "fn-error-context", + "fs-err", + "nodeipc", + "uds_windows", +] + +[[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -6907,9 +7664,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -6928,9 +7685,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -6943,24 +7700,24 @@ name = "unionconfig" version = "0.1.0" dependencies = [ "configmodel", - "indexmap", + "indexmap 1.9.3", "staticconfig", ] [[package]] name = "untrusted" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", - "idna", + "idna 0.4.0", "percent-encoding", ] @@ -6985,20 +7742,20 @@ dependencies = [ "once_cell", "rand 0.8.5", "shellexpand", - "tempdir", "tempfile", "thiserror", + "widestring", "winapi 0.3.9", ] [[package]] name = "uuid" -version = "1.3.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ "atomic", - "getrandom 0.2.9", + "getrandom 0.2.11", "serde", "sha1_smol", ] @@ -7011,13 +7768,38 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.0.0-alpha.9" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" +checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" +dependencies = [ + "value-bag-serde1", + "value-bag-sval2", +] + +[[package]] +name = "value-bag-serde1" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ba39dc791ecb35baad371a3fc04c6eab688c04937d2e0ac6c22b612c0357bf" +dependencies = [ + "erased-serde", + "serde", + "serde_fmt", +] + +[[package]] +name = "value-bag-sval2" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3e06c10810a57bbf45778d023d432a50a1daa7d185991ae06bcfb6c654d0945" dependencies = [ - "ctor", "sval", - "version_check", + "sval_buffer", + "sval_dynamic", + "sval_fmt", + "sval_json", + "sval_ref", + "sval_serde", ] [[package]] @@ -7047,7 +7829,7 @@ name = "vfs" version = "0.1.0" dependencies = [ "anyhow", - "crossbeam 0.8.2", + "crossbeam", "dashmap", "fsinfo", "identity", @@ -7086,15 +7868,15 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -7102,11 +7884,10 @@ dependencies = [ [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -7118,21 +7899,15 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -7140,24 +7915,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.36" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -7167,9 +7942,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7177,28 +7952,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "wasm-streams" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" dependencies = [ "futures-util", "js-sys", @@ -7210,11 +7985,11 @@ dependencies = [ [[package]] name = "watchman_client" version = "0.8.0" -source = "git+https://github.com/facebook/watchman.git?branch=main#5a1c58828bacef2a8f0303f21223e62de720852f" +source = "git+https://github.com/facebook/watchman.git?branch=main#4bec06637edeb66496e53d678095fb427040b462" dependencies = [ "anyhow", - "bytes 1.4.0", - "futures 0.3.28", + "bytes", + "futures 0.3.29", "maplit", "serde", "serde_bser", @@ -7226,31 +8001,41 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.63" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "webpki" -version = "0.22.0" +name = "webpki-roots" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" + +[[package]] +name = "webview-app" +version = "0.1.0" dependencies = [ - "ring", - "untrusted", + "anyhow", + "base64 0.13.1", + "dirs 2.0.2", + "open", + "serde", + "serde_json", + "tinyfiledialogs", + "tracing", + "version", + "webview-sys", ] [[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +name = "webview-sys" +version = "0.6.2" dependencies = [ - "webpki", + "cc", ] [[package]] @@ -7282,7 +8067,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75e78c0cc60a76de5d93f9dad05651105351e151b6446ab305514945d7588aa" dependencies = [ "log", - "ordered-float 3.7.0", + "ordered-float", "strsim 0.10.0", "thiserror", "wezterm-dynamic-derive", @@ -7301,16 +8086,23 @@ dependencies = [ [[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix 0.38.24", ] [[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[package]] name = "winapi" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7340,9 +8132,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi 0.3.9", ] @@ -7354,27 +8146,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.48.5", ] [[package]] @@ -7392,7 +8169,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.5", ] [[package]] @@ -7412,17 +8189,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -7433,9 +8210,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -7445,9 +8222,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -7457,9 +8234,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -7469,9 +8246,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -7481,9 +8258,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -7493,9 +8270,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -7505,26 +8282,27 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.4.6" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi 0.3.9", + "cfg-if 1.0.0", + "windows-sys 0.48.0", ] [[package]] @@ -7534,16 +8312,19 @@ dependencies = [ "anyhow", "async-runtime", "async-trait", - "bitflags", + "bitflags 1.3.2", + "configloader", "configmodel", - "crossbeam 0.8.2", - "edenfs_client", - "futures 0.3.28", + "crossbeam", + "edenfs-client", + "fs-err", + "futures 0.3.29", + "hgtime", "identity", "io", "manifest", "manifest-tree", - "parking_lot 0.11.2", + "parking_lot", "pathmatcher", "progress-model", "repolock", @@ -7552,10 +8333,8 @@ dependencies = [ "sparse", "status", "storemodel", - "tempdir", "tempfile", "thiserror", - "thrift-types", "tokio", "tracing", "treestate", @@ -7596,32 +8375,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] +name = "zerocopy" +version = "0.7.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] name = "zstd" -version = "0.11.2+zstd.1.5.2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", "pkg-config", ] @@ -7645,7 +8442,7 @@ dependencies = [ "lru-cache", "mincode", "minibytes", - "parking_lot 0.11.2", + "parking_lot", "quickcheck", "serde", "sha1", diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 85a4e4d901f24..3a51d280db569 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -16,9 +16,12 @@ , fixup_yarn_lock , glibcLocales , libiconv +, Cocoa , CoreFoundation +, CoreGraphics , CoreServices , Security +, WebKit , enableMinimal ? false }: @@ -45,7 +48,7 @@ let owner = "facebook"; repo = "sapling"; rev = version; - hash = "sha256-NwOexCU+TdZAdruivqRuqhwt0veryeGykLdH6vth+p4="; + hash = "sha256-+LxvPJkyq/6gtcBQepZ5pVGXP1/h30zhCHVfUGPUzFE="; }; addonsSrc = "${src}/addons"; @@ -53,7 +56,7 @@ let # Fetches the Yarn modules in Nix to to be used as an offline cache yarnOfflineCache = fetchYarnDeps { yarnLock = "${addonsSrc}/yarn.lock"; - sha256 = "sha256-AlY7/cdGr4i87+wMhPBh/+LFDoF8aC23OLDEHu9lYqU="; + sha256 = "sha256-3JFrVk78EiNVLLXkCFbuRnXwYHNfVv1pBPBS1yCHtPU="; }; # Builds the NodeJS server that runs with `sl web` @@ -77,6 +80,14 @@ let yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress patchShebangs node_modules + # TODO: build-tar.py tries to run 'yarn install'. We patched + # shebangs node_modules, so we don't want 'yarn install' + # changing files. We should disable the 'yarn install' in + # build-tar.py to be safe. + ${python3Packages.python}/bin/python3 build-tar.py \ + --output isl-dist.tar.xz \ + --yarn 'yarn --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress' + runHook postBuild ''; @@ -84,8 +95,7 @@ let runHook preInstall mkdir -p $out - cd isl - node release.js $out + install isl-dist.tar.xz $out/isl-dist.tar.xz runHook postInstall ''; @@ -103,14 +113,20 @@ python3Packages.buildPythonApplication { lockFile = ./Cargo.lock; outputHashes = { "abomonation-0.7.3+smallvec1" = "sha256-AxEXR6GC8gHjycIPOfoViP7KceM29p2ZISIt4iwJzvM="; - "cloned-0.1.0" = "sha256-MKyj91z+hciJOg4Lhb6ik7zUgCwuHsX8N9HVSP2JkKE="; - "fb303_core-0.0.0" = "sha256-5AU54rpeDub2Iol56S4X+xfdU07zWAtOyCNRBZLzUZA="; - "fbthrift-0.0.1+unstable" = "sha256-n4ES6zRyTgsNxbrM4AUraJ6W4tLHiKdfSyL3Yd0ET34="; - "serde_bser-0.3.1" = "sha256-PkQx2/axT/7LQ4Mvfz1AYBWKXGvaTHkOP2jtljvuYxY="; + "cloned-0.1.0" = "sha256-dtAyQq6fgxvr1RXPQHGiCQesvitsKpVkis4c50uolLc="; + "fb303_core-0.0.0" = "sha256-j+4zPXxewRxJsPQaAfvcpSkGNKw3d+inVL45Ibo7Q4E="; + "fbthrift-0.0.1+unstable" = "sha256-fsIL07PFu645eJFttIJU4sRSjIVuA4BMJ6kYAA0BpwY="; + "serde_bser-0.3.1" = "sha256-h50EJL6twJwK90sBXu40Oap4SfiT4kQAK1+bA8XKdHw="; }; }; postPatch = '' cp ${./Cargo.lock} Cargo.lock + '' + lib.optionalString (!enableMinimal) '' + # If asked, we optionally patch in a hardcoded path to the + # 'nodejs' package, so that 'sl web' always works. Without the + # patch, 'sl web' will still work if 'nodejs' is in $PATH. + substituteInPlace lib/config/loader/src/builtin_static/core.rs \ + --replace '"#);' $'[web]\nnode-path=${nodejs}/bin/node\n"#);' ''; # Since the derivation builder doesn't have network access to remain pure, @@ -122,23 +138,8 @@ python3Packages.buildPythonApplication { sed -i "s|https://files.pythonhosted.org/packages/[[:alnum:]]*/[[:alnum:]]*/[[:alnum:]]*/|file://$NIX_BUILD_TOP/$sourceRoot/hack_pydeps/|g" $sourceRoot/setup.py ''; - # Now, copy the "sl web" (aka edenscm-isl) results into the output of this - # package, so that the command can actually work. NOTES: - # - # 1) This applies on all systems (so no conditional a la postFixup) - # 2) This doesn't require any kind of fixup itself, so we leave it out - # of postFixup for that reason, too - # 3) If asked, we optionally patch in a hardcoded path to the 'nodejs' package, - # so that 'sl web' always works - # 4) 'sl web' will still work if 'nodejs' is in $PATH, just not OOTB - preFixup = '' - sitepackages=$out/lib/${python3Packages.python.libPrefix}/site-packages - chmod +w $sitepackages - cp -r ${isl} $sitepackages/edenscm-isl - '' + lib.optionalString (!enableMinimal) '' - chmod +w $sitepackages/edenscm-isl/run-isl - substituteInPlace $sitepackages/edenscm-isl/run-isl \ - --replace 'NODE=node' 'NODE=${nodejs}/bin/node' + postInstall = '' + install ${isl}/isl-dist.tar.xz $out/lib/isl-dist.tar.xz ''; postFixup = lib.optionalString stdenv.isLinux '' @@ -159,9 +160,12 @@ python3Packages.buildPythonApplication { ] ++ lib.optionals stdenv.isDarwin [ curl libiconv + Cocoa CoreFoundation + CoreGraphics CoreServices Security + WebKit ]; HGNAME = "sl"; @@ -183,6 +187,9 @@ python3Packages.buildPythonApplication { echo "OK!" ''; + # Expose isl to nix repl as sapling.isl. + passthru.isl = isl; + meta = with lib; { description = "A Scalable, User-Friendly Source Control System"; homepage = "https://sapling-scm.com"; diff --git a/pkgs/applications/version-management/sapling/deps.json b/pkgs/applications/version-management/sapling/deps.json index 36d89f3cd1b36..7e7ca0b09dad8 100644 --- a/pkgs/applications/version-management/sapling/deps.json +++ b/pkgs/applications/version-management/sapling/deps.json @@ -1,78 +1,5 @@ { - "links": [ - { - "sha256": "0dgg5x4nvdpfiz552diy11xg72y14s38hjz9qxygafnfgybg6hab", - "url": "https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl" - }, - { - "sha256": "0dq9f7irmml1nm9a2rx8dd6m2dqmzjj1x40mk0rg619wrdfsaj0b", - "url": "https://files.pythonhosted.org/packages/39/7b/88dbb785881c28a102619d46423cb853b46dbccc70d3ac362d99773a78ce/pexpect-4.8.0-py2.py3-none-any.whl" - }, - { - "sha256": "0r4xy2sqwyhwlwj81zvhzbnx7a7r4xdz9xyzzkjczlx7gk1cig1d", - "url": "https://files.pythonhosted.org/packages/23/6a/210816c943c9aeeb29e4e18a298f14bf0e118fe222a23e13bfcc2d41b0a4/ipython-7.16.1-py3-none-any.whl" - }, - { - "sha256": "0wwi1c6md4vkbcsfsf8dklf3vr4mcdj4mpxkanwgb6jb1432x5yw", - "url": "https://files.pythonhosted.org/packages/3d/57/4d9c9e3ae9a255cd4e1106bb57e24056d3d0709fc01b2e3e345898e49d5b/simplegeneric-0.8.1.zip" - }, - { - "sha256": "16sgpg57kxx5jh467d9qwc2hwshfvdbl0xkafdp3qspvbfp46qc0", - "url": "https://files.pythonhosted.org/packages/44/6f/7120676b6d73228c96e17f1f794d8ab046fc910d781c8d151120c3f1569e/toml-0.10.2-py2.py3-none-any.whl" - }, - { - "sha256": "1qn3bnyd7gdwkyk8nvlhiy3c6zbwjd49fjxj0gp8xxi9faiysiwz", - "url": "https://files.pythonhosted.org/packages/44/98/5b86278fbbf250d239ae0ecb724f8572af1c91f4a11edf4d36a206189440/colorama-0.4.4-py2.py3-none-any.whl" - }, - { - "sha256": "0mfj5d1bgpy1clfgwrkmjqm2pv70pm01jp4iyyhphc96kyifdg7v", - "url": "https://files.pythonhosted.org/packages/4c/1c/ff6546b6c12603d8dd1070aa3c3d273ad4c07f5771689a7b69a550e8c951/backcall-0.2.0-py2.py3-none-any.whl" - }, - { - "sha256": "0yxz45fzjsq6zh5f9cjl0gf4vfg1l7rd79zyb3ih544layjg3ff8", - "url": "https://files.pythonhosted.org/packages/4e/78/56aa1b5f4d8ac548755ae767d84f0be54fdd9d404197a3d9e4659d272348/setuptools-57.0.0-py3-none-any.whl" - }, - { - "sha256": "1177pfa343r378020a85l3b16ak479qgyvh8k5719fgbkhm81d5y", - "url": "https://files.pythonhosted.org/packages/59/7c/e39aca596badaf1b78e8f547c807b04dae603a433d3e7a7e04d67f2ef3e5/wcwidth-0.2.5-py2.py3-none-any.whl" - }, - { - "sha256": "1r55ffffaq4q3dpvha7iipgxlqwvjg5cklf9izr42xj5rr226r26", - "url": "https://files.pythonhosted.org/packages/87/61/2dfea88583d5454e3a64f9308a686071d58d59a55db638268a6413e1eb6d/prompt_toolkit-2.0.10-py3-none-any.whl" - }, - { - "sha256": "08v36wa0kckc892bk4nypl6sszbysarm8jhslviz1agp2sf1jp3f", - "url": "https://files.pythonhosted.org/packages/6a/36/b1b9bfdf28690ae01d9ca0aa5b0d07cb4448ac65fb91dc7e2d094e3d992f/decorator-5.0.9-py3-none-any.whl" - }, - { - "sha256": "0mnzcb714ynl1qlv9dwnh50rv75mmj18ywaxbl8xzm3l9m0syjcn", - "url": "https://files.pythonhosted.org/packages/9a/41/220f49aaea88bc6fa6cba8d05ecf24676326156c23b991e80b3f2fc24c77/pickleshare-0.7.5-py2.py3-none-any.whl" - }, - { - "sha256": "13iv73575lilrm01ffhr8y8sxn8kxhvfqsgwckbr919725280vnn", - "url": "https://files.pythonhosted.org/packages/a6/c9/be11fce9810793676017f79ffab3c6cb18575844a6c7b8d4ed92f95de604/Pygments-2.9.0-py3-none-any.whl" - }, - { - "sha256": "0i7ycyjad9kq6lgq5ih7j8xsm639z24250s6d17pp781v6hwdd3h", - "url": "https://files.pythonhosted.org/packages/ca/ab/872a23e29cec3cf2594af7e857f18b687ad21039c1f9b922fac5b9b142d5/traitlets-4.3.3-py2.py3-none-any.whl" - }, - { - "sha256": "0m02dsi8lvrjf4bi20ab6lm7rr6krz7pg6lzk3xjs2l9hqfjzfwa", - "url": "https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl" - }, - { - "sha256": "1f7sc4ydjj33gadcgfz8fcx02d1wm2frlqwzdik1krlr6wikgpbj", - "url": "https://files.pythonhosted.org/packages/fa/bc/9bd3b5c2b4774d5f33b2d544f1460be9df7df2fe42f352135381c347c69a/ipython_genutils-0.2.0-py2.py3-none-any.whl" - }, - { - "sha256": "1ibql99agjf2gj7y0svzd5m0h81hailf4p3sj3yl9i1i8ykdj6wm", - "url": "https://files.pythonhosted.org/packages/fc/56/9f67dcd4a4b9960373173a31be1b8c47fe351a1c9385677a7bdd82810e57/ipdb-0.13.9.tar.gz" - }, - { - "sha256": "1xqsihpqnfal29nb5kmw8z71nd4jbsnbz7p3lkr094xpb13wycw7", - "url": "https://files.pythonhosted.org/packages/4c/76/1e41fbb365ad20b6efab2e61b0f4751518444c953b390f9b2d36cf97eea0/Cython-0.29.32.tar.gz" - } - ], - "version": "0.2.20230523-092610+f12b7eee", - "versionHash": "11350811807294821405" + "links": [], + "version": "0.2.20231113-145254+995db0d6", + "versionHash": "214505116687308775" } diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 84ddb35415d8e..068e9cca20aa6 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -10,9 +10,9 @@ in { } {}; sublime-merge-dev = common { - buildVersion = "2090"; - aarch64sha256 = "96nJn+7bVoLM6D14pFujlj3JOQL5PwdU1+SWzEjoYhU="; - x64sha256 = "bu51gsu0XxZBF8/HncPttcKiIRpC7qsKTgR9cktKOnI="; + buildVersion = "2092"; + aarch64sha256 = "3QMDynXMVB4QVtM8EPbZ8I4m+5sEjzs8XN+jEoMaktM="; + x64sha256 = "S9E+wRvO41Eq+PLA/J+sjBIAn6yz715Wg9bKRW2Eobg="; dev = true; } {}; } diff --git a/pkgs/applications/video/bilibili/default.nix b/pkgs/applications/video/bilibili/default.nix index a4fe957099284..9a507e93ab655 100644 --- a/pkgs/applications/video/bilibili/default.nix +++ b/pkgs/applications/video/bilibili/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { pname = "bilibili"; - version = "1.12.1-2"; + version = "1.12.3-1"; src = fetchurl { url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb"; - hash = "sha256-vYoVHVT/Deooxq/0WVzPebR68N9KBJfgLU30lJPB89M="; + hash = "sha256-F2y5daIdNJZGNjOctN9iA6kHSRVSMWK8s80X+kXxzb4="; }; unpackPhase = '' diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index 9e8e88ecfbf3b..954ea58b4554d 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -17,6 +17,7 @@ , gjs , gtk4 , gst_all_1 +, libGL , libadwaita , appstream-glib , libsoup @@ -55,6 +56,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gtk4 + libGL libadwaita libsoup wayland diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index 2c168912253f9..99694efda1d31 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -62,7 +62,7 @@ let SITEURL = "https://www.blackmagicdesign.com/api/register/us/download/${DOWNLOADID}"; USERAGENT = builtins.concatStringsSep " " [ - "User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.targetPlatform.linuxArch})" + "User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.hostPlatform.linuxArch})" "AppleWebKit/537.36 (KHTML, like Gecko)" "Chrome/77.0.3865.75" "Safari/537.36" diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index bb2c340835153..0f0008bd7a1c2 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -116,7 +116,7 @@ in stdenv.mkDerivation { # Remove with the next release: https://github.com/xbmc/xbmc/pull/23453 (fetchpatch { name = "Fix fmt10 compat"; - url = "https://github.com/xbmc/xbmc/pull/23453.patch"; + url = "https://github.com/xbmc/xbmc/compare/acca69baa2eae65123e78ee2f77249181725ef5d...26c164a28cfd18ceef7a1f2bbba5bf8a4a5a750c.patch"; hash = "sha256-zMUparbQ8gfgeXj8W3MDmPi5OgLNz/zGCJINU7H6Rx0="; }) ]; diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 8335e01e2db3c..38366782f3bef 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -31,6 +31,10 @@ stdenv.mkDerivation rec { postPatch = '' sed -i 's/{UNITTEST++_INCLUDE_DIR}/ENV{UNITTEST++_INCLUDE_DIR}/g' tests/CMakeLists.txt + '' + lib.optionalString stdenv.isDarwin '' + # Darwin requires both Magick++ and MagickCore or it will fail to link. + substituteInPlace src/CMakeLists.txt \ + --replace 'target_link_libraries(openshot PUBLIC ImageMagick::Magick++)' 'target_link_libraries(openshot PUBLIC ImageMagick::Magick++ ImageMagick::MagickCore)' ''; nativeBuildInputs = lib.optionals stdenv.isLinux [ diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index 5d7dc52409272..437c8d16cfd87 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "1.12.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-T+jmsHZA7poxwLSFi9N8ALa0te735HQer9ByH2Wub60="; + sha256 = "sha256-eE2cxqV/XpGyxneVzpP7f215IReH1nwGEkfCHbxUgVs="; rev = "v${version}"; }; diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index f5b90bb2c8844..925fa38a199aa 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -1,15 +1,27 @@ -{ lib, stdenv, electron_22, buildNpmPackage, fetchFromGitHub }: +{ lib, stdenv, electron, buildNpmPackage, fetchFromGitHub, fetchpatch }: buildNpmPackage { pname = "webtorrent-desktop"; - version = "0.25-pre"; + version = "0.25-pre-1eb612"; src = fetchFromGitHub { owner = "webtorrent"; repo = "webtorrent-desktop"; - rev = "fce078defefd575cb35a5c79d3d9f96affc8a08f"; - sha256 = "sha256-gXFiG36qqR0QHTqhaxgQKDO0UCHkJLnVwUTQB/Nct/c="; + rev = "1eb61201d6360698a2cc4ea72bf0fa7ee78b457c"; + sha256 = "sha256-DBEFOamncyidMXypvKNnUmDIPUq1LzYjDgox7fa4+Gg="; }; - npmDepsHash = "sha256-pEuvstrZ9oMdJ/iU6XwEQ1BYOyQp/ce6sYBTrMCjGMc="; + patches = [ + # electron 27 fix + (fetchpatch { + url = "https://github.com/webtorrent/webtorrent-desktop/pull/2388.patch"; + hash = "sha256-gam5oAZtsaiCNFwecA5ff0nhraySLx3SOHlb/js+cPM="; + }) + # startup fix + (fetchpatch { + url = "https://github.com/webtorrent/webtorrent-desktop/pull/2389.patch"; + hash = "sha256-hBJGLNNjcGRhYOFlLm/RL0po+70tEeJtR6Y/CfacPAI="; + }) + ]; + npmDepsHash = "sha256-tqhp3jDb1xtyV/n9kJtzkiznLQfqeYWeZiTnTVV0ibE="; makeCacheWritable = true; npmRebuildFlags = [ "--ignore-scripts" ]; installPhase = '' @@ -31,7 +43,7 @@ buildNpmPackage { cat > $out/bin/WebTorrent <<EOF #! ${stdenv.shell} set -eu - exec ${electron_22}/bin/electron --no-sandbox $out/lib/webtorrent-desktop "\$@" + exec ${electron}/bin/electron --no-sandbox $out/lib/webtorrent-desktop "\$@" EOF chmod +x $out/bin/WebTorrent cp -r static/linux/share/icons $out/share/ @@ -44,7 +56,7 @@ buildNpmPackage { description = "Streaming torrent app for Mac, Windows, and Linux"; homepage = "https://webtorrent.io/desktop"; license = licenses.mit; - maintainers = [ maintainers.flokli maintainers.bendlas ]; + maintainers = [ maintainers.bendlas ]; }; } diff --git a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix index ddb06a97f162e..67ea1e07b9088 100644 --- a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix +++ b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix @@ -1,14 +1,13 @@ { lib , fetchFromGitHub , hostPlatform -, targetPlatform , cargo , rustc , lld }: let - arch = targetPlatform.qemuArch; + arch = hostPlatform.qemuArch; target = ./. + "/${arch}-unknown-none.json"; diff --git a/pkgs/applications/window-managers/cosmic/settings/default.nix b/pkgs/applications/window-managers/cosmic/settings/default.nix index dcb454b3f82c3..0e3550037135a 100644 --- a/pkgs/applications/window-managers/cosmic/settings/default.nix +++ b/pkgs/applications/window-managers/cosmic/settings/default.nix @@ -62,7 +62,7 @@ rustPlatform.buildRustPackage rec { (placeholder "out") "--set" "bin-src" - "target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-settings" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-settings" ]; postInstall = '' diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix index 09577f37b2d63..402b358474465 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix @@ -10,6 +10,7 @@ , git , hyprland-protocols , jq +, libGL , libdrm , libexecinfo , libinput @@ -40,13 +41,13 @@ assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been renam assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland"; stdenv.mkDerivation (finalAttrs: { pname = "hyprland" + lib.optionalString debug "-debug"; - version = "0.32.0"; + version = "0.32.3"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-HrnlCdZBqqE37gFORapfSGEGcqhCyhX2aSMRnDEmR0k="; + hash = "sha256-8PP26+ybmScq5WpFd2JPqUDzG2VggYOvD6/rzY9/CJ4="; }; patches = [ @@ -88,6 +89,7 @@ stdenv.mkDerivation (finalAttrs: { cairo git hyprland-protocols + libGL libdrm libinput libxkbcommon diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix index 484cda3328d22..8191582dfb3a8 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix @@ -42,8 +42,8 @@ wlroots.overrideAttrs domain = "gitlab.freedesktop.org"; owner = "wlroots"; repo = "wlroots"; - rev = "47bf87ade2bd32395615a385ebde1fefbcdf79a2"; - hash = "sha256-jU0I6FoCKnj4zIBL4daosFWh81U1fM719Z6cae8PxSY="; + rev = "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1"; + hash = "sha256-HXu98PyBMKEWLqiTb8viuLDznud/SdkdJsx5A5CWx7I="; }; pname = diff --git a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix index 32c2a8085d13e..80308ee138f86 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , cmake , file +, libGL , libjpeg , mesa , pango @@ -31,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ file + libGL libjpeg mesa pango diff --git a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix index 1dab92609d047..a4a747fba3f99 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix @@ -6,6 +6,7 @@ , ninja , cairo , fribidi +, libGL , libdatrie , libjpeg , libselinux @@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo fribidi + libGL libdatrie libjpeg libselinux diff --git a/pkgs/applications/window-managers/i3/lock-blur.nix b/pkgs/applications/window-managers/i3/lock-blur.nix index 47875ec47c320..f9f6de9212706 100644 --- a/pkgs/applications/window-managers/i3/lock-blur.nix +++ b/pkgs/applications/window-managers/i3/lock-blur.nix @@ -1,4 +1,4 @@ -{ i3lock-color, lib, stdenv, fetchFromGitHub, fetchpatch }: +{ i3lock-color, lib, stdenv, fetchFromGitHub, fetchpatch, libGL }: i3lock-color.overrideAttrs (oldAttrs : rec { pname = "i3lock-blur"; @@ -21,6 +21,8 @@ i3lock-color.overrideAttrs (oldAttrs : rec { }) ]; + buildInputs = oldAttrs.buildInputs ++ [ libGL ]; + meta = with lib; { description = "An improved screenlocker based upon XCB and PAM with background blurring filter"; homepage = "https://github.com/karulont/i3lock-blur/"; diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 8656db60c4eea..596aa8ceea124 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libxcb, xcbutilkeysyms , xcbutilimage, pam, libX11, libev, cairo, libxkbcommon, - libxkbfile, libjpeg_turbo, xcbutilxrm + libxkbfile, libjpeg_turbo, xcbutilxrm, xorg }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libxcb xcbutilkeysyms xcbutilimage pam libX11 - libev cairo libxkbcommon libxkbfile libjpeg_turbo xcbutilxrm ]; + libev cairo libxkbcommon libxkbfile libjpeg_turbo xcbutilxrm xorg.xcbutil ]; makeFlags = [ "all" ]; preInstall = '' diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index b8dffa259d76f..b7cca2b66376b 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, libxcb, xcbutilkeysyms, xcbutilimage, - xcbutilxrm, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: + xcbutilxrm, pam, libX11, libev, cairo, libxkbcommon, libxkbfile, xorg }: stdenv.mkDerivation rec { pname = "i3lock"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ libxcb xcbutilkeysyms xcbutilimage xcbutilxrm - pam libX11 libev cairo libxkbcommon libxkbfile ]; + pam libX11 libev cairo libxkbcommon libxkbfile xorg.xcbutil ]; meta = with lib; { description = "A simple screen locker like slock"; diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index 1c06fc2ae28d2..43a1c13ee0e59 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, rustPlatform -, xorg, python3, pkg-config, cairo, libxkbcommon }: +, xorg, python3, pkg-config, cairo, expat, libxkbcommon }: rustPlatform.buildRustPackage rec { pname = "wmfocus"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-4eoV/viI7Q7I7mIqcHVAyPf/y2RWaWX0B+mLZWMEbcI="; nativeBuildInputs = [ python3 pkg-config ]; - buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ]; + buildInputs = [ cairo expat libxkbcommon xorg.xcbutilkeysyms ]; # For now, this is the only available featureset. This is also why the file is # in the i3 folder, even though it might be useful for more than just i3 diff --git a/pkgs/applications/window-managers/jay/default.nix b/pkgs/applications/window-managers/jay/default.nix index 0e233dd86ac4b..1b58fa0f2c89b 100644 --- a/pkgs/applications/window-managers/jay/default.nix +++ b/pkgs/applications/window-managers/jay/default.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, libGL , libinput , libxkbcommon , mesa @@ -22,6 +23,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-zSq6YBlm6gJXGlF9xZ8gWSTMewdNqrJzwP58a0x8QIU="; buildInputs = [ + libGL libxkbcommon mesa pango diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix index 8f553eb4b5540..0d8436dcb3ed2 100644 --- a/pkgs/applications/window-managers/lemonbar/default.nix +++ b/pkgs/applications/window-managers/lemonbar/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A lightweight xcb based bar"; homepage = "https://github.com/LemonBoy/bar"; - maintainers = with maintainers; [ meisternu fortuneteller2k ]; + maintainers = with maintainers; [ meisternu moni ]; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix index 54e7820ec4c29..8d009a3458b3c 100644 --- a/pkgs/applications/window-managers/lemonbar/xft.nix +++ b/pkgs/applications/window-managers/lemonbar/xft.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { homepage = "https://github.com/drscream/lemonbar-xft"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/applications/window-managers/neocomp/default.nix b/pkgs/applications/window-managers/neocomp/default.nix index e878f4f088e86..36e6322462da1 100644 --- a/pkgs/applications/window-managers/neocomp/default.nix +++ b/pkgs/applications/window-managers/neocomp/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/DelusionalLogic/NeoComp"; license = licenses.gpl3Only; - maintainers = with maintainers; [ twey fortuneteller2k ]; + maintainers = with maintainers; [ twey moni ]; platforms = platforms.linux; description = "A fork of Compton, a compositor for X11"; longDescription = '' diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index 453dcf14d82e1..e149bdd652186 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ adamcstephens - fortuneteller2k + moni rodrgz ]; mainProgram = "river"; diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 6e11d842fe926..38fa09e86f706 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, swaybg , meson, ninja, pkg-config, wayland-scanner, scdoc -, wayland, libxkbcommon, pcre2, json_c, libevdev +, libGL, wayland, libxkbcommon, pcre2, json_c, libevdev , pango, cairo, libinput, gdk-pixbuf, librsvg , wlroots, wayland-protocols, libdrm , nixosTests @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - wayland libxkbcommon pcre2 json_c libevdev + libGL wayland libxkbcommon pcre2 json_c libevdev pango cairo libinput gdk-pixbuf librsvg wayland-protocols libdrm (wlroots.override { inherit (finalAttrs) enableXWayland; }) diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index 21a7daa1fa34b..7510e1e9582b3 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -17,22 +17,22 @@ with lib; let sway = sway-unwrapped.overrideAttrs (oa: { inherit isNixOS enableXWayland; }); - baseWrapper = writeShellScriptBin "sway" '' + baseWrapper = writeShellScriptBin sway.meta.mainProgram '' set -o errexit if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then - export XDG_CURRENT_DESKTOP=sway + export XDG_CURRENT_DESKTOP=${sway.meta.mainProgram} ${extraSessionCommands} export _SWAY_WRAPPER_ALREADY_EXECUTED=1 fi if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then export DBUS_SESSION_BUS_ADDRESS - exec ${sway}/bin/sway "$@" + exec ${lib.getExe sway} "$@" else - exec ${lib.optionalString dbusSupport "${dbus}/bin/dbus-run-session"} ${sway}/bin/sway "$@" + exec ${lib.optionalString dbusSupport "${dbus}/bin/dbus-run-session"} ${lib.getExe sway} "$@" fi ''; in symlinkJoin { - name = "sway-${sway.version}"; + name = "${sway.meta.mainProgram}-${sway.version}"; paths = (optional withBaseWrapper baseWrapper) ++ [ sway ]; @@ -49,14 +49,14 @@ in symlinkJoin { postBuild = '' ${optionalString withGtkWrapper "gappsWrapperArgsHook"} - wrapProgram $out/bin/sway \ + wrapProgram $out/bin/${sway.meta.mainProgram} \ ${optionalString withGtkWrapper ''"''${gappsWrapperArgs[@]}"''} \ ${optionalString (extraOptions != []) "${concatMapStrings (x: " --add-flags " + x) extraOptions}"} ''; passthru = { inherit (sway.passthru) tests; - providedSessions = [ "sway" ]; + providedSessions = [ sway.meta.mainProgram ]; }; inherit (sway) meta; diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index 8311c3690afb5..c633b19abc709 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -8,6 +8,7 @@ , wf-config , cairo , doctest +, libGL , libdrm , libexecinfo , libevdev @@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ wf-config + libGL libdrm libexecinfo libevdev diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 467396a6d8ae8..3d2c720e137cb 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch2 , meson, ninja, pkg-config, python3, wayland-scanner -, cairo, libdrm, libevdev, libinput, libxkbcommon, mesa, seatd, wayland +, cairo, libGL, libdrm, libevdev, libinput, libxkbcommon, mesa, seatd, wayland , wayland-protocols, xcbutilcursor , demoSupport ? true @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ]; buildInputs = [ - cairo libdrm libevdev libinput libxkbcommon mesa seatd wayland + cairo libGL libdrm libevdev libinput libxkbcommon mesa seatd wayland wayland-protocols ] ++ lib.optional hdrSupport libdisplay-info ++ lib.optional jpegSupport libjpeg diff --git a/pkgs/build-support/binary-cache/default.nix b/pkgs/build-support/binary-cache/default.nix index 27f9ad9628998..8c610c512276e 100644 --- a/pkgs/build-support/binary-cache/default.nix +++ b/pkgs/build-support/binary-cache/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages }: +{ lib, stdenv, coreutils, jq, python3, nix, xz }: # This function is for creating a flat-file binary cache, i.e. the kind created by # nix copy --to file:///some/path and usable as a substituter (with the file:// prefix). @@ -19,15 +19,10 @@ stdenv.mkDerivation { preferLocalBuild = true; - PATH = lib.makeBinPath (with buildPackages; [ coreutils jq python3 nix xz ]); + nativeBuildInputs = [ coreutils jq python3 nix xz ]; - builder = builtins.toFile "builder" '' - . .attrs.sh - - export out=''${outputs[out]} - - mkdir $out - mkdir $out/nar + buildCommand = '' + mkdir -p $out/nar python ${./make-binary-cache.py} diff --git a/pkgs/build-support/binary-cache/make-binary-cache.py b/pkgs/build-support/binary-cache/make-binary-cache.py index 16dd8a7e96bcf..589d005562b1f 100644 --- a/pkgs/build-support/binary-cache/make-binary-cache.py +++ b/pkgs/build-support/binary-cache/make-binary-cache.py @@ -3,7 +3,7 @@ import json import os import subprocess -with open(".attrs.json", "r") as f: +with open(os.environ["NIX_ATTRS_JSON_FILE"], "r") as f: closures = json.load(f)["closure"] os.chdir(os.environ["out"]) diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index 8d02b4e5124d8..8cd63e4609518 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -10,6 +10,13 @@ for flag in ${NIX_HARDENING_ENABLE_@suffixSalt@-}; do hardeningEnableMap["$flag"]=1 done +# fortify3 implies fortify enablement - make explicit before +# we filter unsupported flags because unsupporting fortify3 +# doesn't mean we should unsupport fortify too +if [[ -n "${hardeningEnableMap[fortify3]-}" ]]; then + hardeningEnableMap["fortify"]=1 +fi + # Remove unsupported flags. for flag in @hardening_unsupported_flags@; do unset -v "hardeningEnableMap[$flag]" @@ -19,7 +26,7 @@ for flag in @hardening_unsupported_flags@; do fi done -# make fortify and fortify3 mutually exclusive +# now make fortify and fortify3 mutually exclusive if [[ -n "${hardeningEnableMap[fortify3]-}" ]]; then unset -v "hardeningEnableMap['fortify']" fi diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 6c43f8cbfa6d2..b8d170df01b73 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -246,7 +246,7 @@ 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 cc-params.XXXXXX) + responseFile=$(mktemp "${TMPDIR:-/tmp}/cc-params.XXXXXX") trap 'rm -f -- "$responseFile"' EXIT printf "%q\n" \ ${extraBefore+"${extraBefore[@]}"} \ diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix index 6b3ff6fd62b05..f2aa4964d9a1d 100644 --- a/pkgs/build-support/closure-info.nix +++ b/pkgs/build-support/closure-info.nix @@ -4,7 +4,7 @@ # "nix-store --load-db" and "nix-store --register-validity # --hash-given". -{ stdenv, buildPackages }: +{ stdenv, coreutils, jq }: { rootPaths }: @@ -19,18 +19,24 @@ stdenv.mkDerivation { preferLocalBuild = true; - PATH = "${buildPackages.coreutils}/bin:${buildPackages.jq}/bin"; + nativeBuildInputs = [ coreutils jq ]; - builder = builtins.toFile "builder" - '' - . .attrs.sh + empty = rootPaths == []; + buildCommand = + '' out=''${outputs[out]} mkdir $out - jq -r ".closure | map(.narSize) | add" < .attrs.json > $out/total-nar-size - jq -r '.closure | map([.path, .narHash, .narSize, "", (.references | length)] + .references) | add | map("\(.)\n") | add' < .attrs.json | head -n -1 > $out/registration - jq -r .closure[].path < .attrs.json > $out/store-paths + if [[ -n "$empty" ]]; then + echo 0 > $out/total-nar-size + touch $out/registration $out/store-paths + else + jq -r ".closure | map(.narSize) | add" < "$NIX_ATTRS_JSON_FILE" > $out/total-nar-size + jq -r '.closure | map([.path, .narHash, .narSize, "", (.references | length)] + .references) | add | map("\(.)\n") | add' < "$NIX_ATTRS_JSON_FILE" | head -n -1 > $out/registration + jq -r '.closure[].path' < "$NIX_ATTRS_JSON_FILE" > $out/store-paths + fi + ''; } diff --git a/pkgs/build-support/dart/build-dart-application/default.nix b/pkgs/build-support/dart/build-dart-application/default.nix index 76328e5645f6b..1a98f98fb8e61 100644 --- a/pkgs/build-support/dart/build-dart-application/default.nix +++ b/pkgs/build-support/dart/build-dart-application/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchDartDeps, runCommand, writeText, dartHooks, makeWrapper, dart, cacert, nodejs, darwin, jq }: +{ lib, stdenv, callPackage, fetchDartDeps, writeText, symlinkJoin, dartHooks, makeWrapper, dart, cacert, nodejs, darwin, jq }: { sdkSetupScript ? "" , pubGetScript ? "dart pub get" @@ -36,11 +36,15 @@ let dartDeps = (fetchDartDeps.override { - dart = runCommand "dart-fod" { nativeBuildInputs = [ makeWrapper ]; } '' - mkdir -p "$out/bin" - makeWrapper "${dart}/bin/dart" "$out/bin/dart" \ - --add-flags "--root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt" - ''; + dart = symlinkJoin { + name = "dart-fod"; + paths = [ dart ]; + nativeBuildInputs = [ makeWrapper ]; + postBuild = '' + wrapProgram "$out/bin/dart" \ + --add-flags "--root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt" + ''; + }; }) { buildDrvArgs = args; inherit sdkSetupScript pubGetScript vendorHash pubspecLockFile; diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 686d89f8c11cb..f8ed3a38890c3 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -158,6 +158,22 @@ stdenvNoCC.mkDerivation (args // { dotnet-sdk ]; + # Parse the version attr into a format acceptable for the Version msbuild property + # The actual version attr is saved in InformationalVersion, which accepts an arbitrary string + versionForDotnet = if !(lib.hasAttr "version" args) || args.version == null + then null else let + components = lib.pipe args.version [ + lib.splitVersion + (lib.filter (x: (lib.strings.match "[0-9]+" x) != null)) + (lib.filter (x: (lib.toInt x) < 65535)) # one version component in dotnet has to fit in 16 bits + ]; + in if (lib.length components) == 0 + then null + else lib.concatStringsSep "." ((lib.take 4 components) + ++ (if (lib.length components) < 4 + then lib.replicate (4 - (lib.length components)) "0" + else [ ])); + makeWrapperArgs = args.makeWrapperArgs or [ ] ++ [ "--prefix LD_LIBRARY_PATH : ${dotnet-sdk.icu}/lib" ]; @@ -172,7 +188,7 @@ stdenvNoCC.mkDerivation (args // { passthru = { inherit nuget-source; - } // lib.optionalAttrs (nugetDepsFile != null) { + } // lib.optionalAttrs (!lib.isDerivation nugetDeps) { fetch-deps = let flags = dotnetFlags ++ dotnetRestoreFlags; diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh index e9567b64cf2c9..0acfeced9b169 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh @@ -24,8 +24,13 @@ dotnetBuildHook() { dotnetBuildFlags+=("-p:UseAppHost=true") fi + local versionFlags=() if [ "${version-}" ]; then - local -r versionFlag="-p:Version=${version-}" + versionFlags+=("-p:InformationalVersion=${version-}") + fi + + if [ "${versionForDotnet-}" ]; then + versionFlags+=("-p:Version=${versionForDotnet-}") fi dotnetBuild() { @@ -43,7 +48,7 @@ dotnetBuildHook() { -p:Deterministic=true \ --configuration "@buildType@" \ --no-restore \ - ${versionFlag-} \ + ${versionFlags[@]} \ ${runtimeIdFlags[@]} \ ${dotnetBuildFlags[@]} \ ${dotnetFlags[@]} diff --git a/pkgs/build-support/fetchbzr/builder.sh b/pkgs/build-support/fetchbzr/builder.sh index 991864719a073..4515e0e82f497 100644 --- a/pkgs/build-support/fetchbzr/builder.sh +++ b/pkgs/build-support/fetchbzr/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source "$stdenv/setup" echo "exporting \`$url' (revision $rev) into \`$out'" diff --git a/pkgs/build-support/fetchcvs/builder.sh b/pkgs/build-support/fetchcvs/builder.sh index 4b49e9676ec02..7e4dde4a64c8b 100644 --- a/pkgs/build-support/fetchcvs/builder.sh +++ b/pkgs/build-support/fetchcvs/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup (echo "#!$SHELL"; \ diff --git a/pkgs/build-support/fetchdarcs/builder.sh b/pkgs/build-support/fetchdarcs/builder.sh index 75b9066dba6f4..39838db255a6e 100644 --- a/pkgs/build-support/fetchdarcs/builder.sh +++ b/pkgs/build-support/fetchdarcs/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup tagtext="" diff --git a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh index 4eb70f672d488..489914a2a8b43 100644 --- a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh +++ b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source "${stdenv}/setup" echo "exporting ${repository}/${imageName} (tag: ${tag}) into ${out}" mkdir -p "${out}" diff --git a/pkgs/build-support/fetchfossil/builder.sh b/pkgs/build-support/fetchfossil/builder.sh index 36b758ab574e4..fe828d0ada9d0 100644 --- a/pkgs/build-support/fetchfossil/builder.sh +++ b/pkgs/build-support/fetchfossil/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup echo "Cloning Fossil $url [$rev] into $out" diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index 77f6381b09ab2..95176beea8c13 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -3,7 +3,7 @@ # - revision specified and remote has a HEAD # - revision specified and remote without HEAD # -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup echo "exporting $url (rev $rev) into $out" diff --git a/pkgs/build-support/fetchhg/builder.sh b/pkgs/build-support/fetchhg/builder.sh index 1ce294757713c..20dfde4b10d44 100644 --- a/pkgs/build-support/fetchhg/builder.sh +++ b/pkgs/build-support/fetchhg/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup echo "getting $url${rev:+ ($rev)} into $out" diff --git a/pkgs/build-support/fetchipfs/builder.sh b/pkgs/build-support/fetchipfs/builder.sh index ca77962b53847..1ddd111b15182 100644 --- a/pkgs/build-support/fetchipfs/builder.sh +++ b/pkgs/build-support/fetchipfs/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup # Curl flags to handle redirects, not use EPSV, handle cookies for diff --git a/pkgs/build-support/fetchmtn/builder.sh b/pkgs/build-support/fetchmtn/builder.sh index 1aabd7949ee1d..de929fad55a92 100644 --- a/pkgs/build-support/fetchmtn/builder.sh +++ b/pkgs/build-support/fetchmtn/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup set -x diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh index aa4d049aba431..e187747f14e6a 100644 --- a/pkgs/build-support/fetchsvn/builder.sh +++ b/pkgs/build-support/fetchsvn/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup echo "exporting $url (r$rev) into $out" diff --git a/pkgs/build-support/fetchsvnssh/builder.sh b/pkgs/build-support/fetchsvnssh/builder.sh index 5782151524f7a..e553446346de3 100644 --- a/pkgs/build-support/fetchsvnssh/builder.sh +++ b/pkgs/build-support/fetchsvnssh/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup echo "exporting $url (r$rev) into $out" diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index e8eaba934858e..a82728ef1025c 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup source $mirrorsFile diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/build-support/node/build-npm-package/default.nix index 2aefab8ac7adf..eecea8b767584 100644 --- a/pkgs/build-support/node/build-npm-package/default.nix +++ b/pkgs/build-support/node/build-npm-package/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchNpmDeps, buildPackages, nodejs } @ topLevelArgs: +{ lib +, stdenv +, fetchNpmDeps +, buildPackages +, nodejs +, darwin +} @ topLevelArgs: { name ? "${args.pname}-${args.version}" , src ? null @@ -54,7 +60,9 @@ in stdenv.mkDerivation (args // { inherit npmDeps npmBuildScript; - nativeBuildInputs = nativeBuildInputs ++ [ nodejs npmConfigHook npmBuildHook npmInstallHook ]; + nativeBuildInputs = nativeBuildInputs + ++ [ nodejs npmConfigHook npmBuildHook npmInstallHook nodejs.python ] + ++ lib.optionals stdenv.isDarwin [ darwin.cctools ]; buildInputs = buildInputs ++ [ nodejs ]; strictDeps = true; diff --git a/pkgs/build-support/node/fetch-yarn-deps/fixup.js b/pkgs/build-support/node/fetch-yarn-deps/fixup.js index 8b91e7efa63fd..732e569aba7bd 100755 --- a/pkgs/build-support/node/fetch-yarn-deps/fixup.js +++ b/pkgs/build-support/node/fetch-yarn-deps/fixup.js @@ -21,6 +21,8 @@ const fixupYarnLock = async (lockContents, verbose) => { if (verbose) console.log(`Rewriting URL ${url} for dependency ${dep}`) pkg.resolved = urlToName(url) + if (hash) + pkg.resolved += `#${hash}` return [dep, pkg] }) diff --git a/pkgs/build-support/references-by-popularity/default.nix b/pkgs/build-support/references-by-popularity/default.nix index dfc25275f34c5..2171c622f000a 100644 --- a/pkgs/build-support/references-by-popularity/default.nix +++ b/pkgs/build-support/references-by-popularity/default.nix @@ -6,11 +6,8 @@ path: runCommand "closure-paths" exportReferencesGraph.graph = path; __structuredAttrs = true; preferLocalBuild = true; - PATH = "${coreutils}/bin:${python3}/bin"; - builder = builtins.toFile "builder" - '' - . .attrs.sh - python3 ${./closure-graph.py} .attrs.json graph > ''${outputs[out]} - ''; - } - "" + nativeBuildInputs = [ coreutils python3 ]; +} +'' + python3 ${./closure-graph.py} "$NIX_ATTRS_JSON_FILE" graph > ''${outputs[out]} +'' diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index 944434472b0b8..e842b6a3f501e 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -1,6 +1,5 @@ { lib, stdenv , mkRustcDepArgs, mkRustcFeatureArgs, needUnstableCLI -, rust }: { crateName, @@ -21,7 +20,7 @@ (mkRustcDepArgs dependencies crateRenames) (mkRustcFeatureArgs crateFeatures) ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--target" (rust.toRustTargetSpec stdenv.hostPlatform) + "--target" stdenv.hostPlatform.rust.rustcTargetSpec ] ++ lib.optionals (needUnstableCLI dependencies) [ "-Z" "unstable-options" ] ++ extraRustcOpts diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 60310f178747e..a6f2528a82bae 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rust, echo_colored, noisily, mkRustcDepArgs, mkRustcFeatureArgs }: +{ lib, stdenv, echo_colored, noisily, mkRustcDepArgs, mkRustcFeatureArgs }: { build , buildDependencies @@ -124,8 +124,8 @@ in '' export CARGO_PKG_AUTHORS="${authors}" export CARGO_PKG_DESCRIPTION="${crateDescription}" - export CARGO_CFG_TARGET_ARCH=${rust.toTargetArch stdenv.hostPlatform} - export CARGO_CFG_TARGET_OS=${rust.toTargetOs stdenv.hostPlatform} + export CARGO_CFG_TARGET_ARCH=${stdenv.hostPlatform.rust.platform.arch} + export CARGO_CFG_TARGET_OS=${stdenv.hostPlatform.rust.platform.os} export CARGO_CFG_TARGET_FAMILY="unix" export CARGO_CFG_UNIX=1 export CARGO_CFG_TARGET_ENV="gnu" @@ -136,8 +136,8 @@ in '' export CARGO_MANIFEST_DIR=$(pwd) export DEBUG="${toString (!release)}" export OPT_LEVEL="${toString optLevel}" - export TARGET="${rust.toRustTargetSpec stdenv.hostPlatform}" - export HOST="${rust.toRustTargetSpec stdenv.buildPlatform}" + export TARGET="${stdenv.hostPlatform.rust.rustcTargetSpec}" + export HOST="${stdenv.buildPlatform.rust.rustcTargetSpec}" export PROFILE=${if release then "release" else "debug"} export OUT_DIR=$(pwd)/target/build/${crateName}.out export CARGO_PKG_VERSION_MAJOR=${lib.elemAt version 0} diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index d977fb9f7c27e..d569142af66ad 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -10,7 +10,6 @@ , fetchCrate , pkgsBuildBuild , rustc -, rust , cargo , jq , libiconv @@ -71,18 +70,14 @@ let inherit (import ./log.nix { inherit lib; }) noisily echo_colored; configureCrate = import ./configure-crate.nix { - inherit lib stdenv rust echo_colored noisily mkRustcDepArgs mkRustcFeatureArgs; + inherit lib stdenv echo_colored noisily mkRustcDepArgs mkRustcFeatureArgs; }; buildCrate = import ./build-crate.nix { - inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs needUnstableCLI rust; + inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs needUnstableCLI; }; installCrate = import ./install-crate.nix { inherit stdenv; }; - - # Allow access to the rust attribute set from inside buildRustCrate, which - # has a parameter that shadows the name. - rustAttrs = rust; in /* The overridable pkgs.buildRustCrate function. @@ -310,7 +305,7 @@ crate_: lib.makeOverridable depsMetadata = lib.foldl' (str: dep: str + dep.metadata) "" (dependencies ++ buildDependencies); hashedMetadata = builtins.hashString "sha256" (crateName + "-" + crateVersion + "___" + toString (mkRustcFeatureArgs crateFeatures) + - "___" + depsMetadata + "___" + rustAttrs.toRustTarget stdenv.hostPlatform); + "___" + depsMetadata + "___" + stdenv.hostPlatform.rust.rustcTarget); in lib.substring 0 10 hashedMetadata; diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index 18d8ca56fd1fc..cf2ddbd084b8f 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -1,7 +1,6 @@ { lib , importCargoLock , fetchCargoTarball -, rust , stdenv , callPackage , cargoBuildHook @@ -78,13 +77,13 @@ let sha256 = args.cargoSha256; } // depsExtraArgs); - target = rust.toRustTargetSpec stdenv.hostPlatform; + target = stdenv.hostPlatform.rust.rustcTargetSpec; targetIsJSON = lib.hasSuffix ".json" target; useSysroot = targetIsJSON && !__internal_dontAddSysroot; sysroot = callPackage ./sysroot { } { inherit target; - shortTarget = rust.lib.toRustTargetSpecShort stdenv.hostPlatform; + shortTarget = stdenv.hostPlatform.rust.cargoShortTarget; RUSTFLAGS = args.RUSTFLAGS or ""; originalCargoToml = src + /Cargo.toml; # profile info is later extracted }; @@ -156,7 +155,8 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg # Platforms without host tools from # https://doc.rust-lang.org/nightly/rustc/platform-support.html "armv7a-darwin" - "armv5tel-linux" "armv7a-linux" "m68k-linux" "riscv32-linux" + "armv5tel-linux" "armv7a-linux" "m68k-linux" "mipsel-linux" + "mips64el-linux" "riscv32-linux" "armv6l-netbsd" "x86_64-redox" "wasm32-wasi" diff --git a/pkgs/build-support/rust/build-rust-package/sysroot/default.nix b/pkgs/build-support/rust/build-rust-package/sysroot/default.nix index a6d53056d9c7c..bb95b7bdc35cd 100644 --- a/pkgs/build-support/rust/build-rust-package/sysroot/default.nix +++ b/pkgs/build-support/rust/build-rust-package/sysroot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rust, rustPlatform, buildPackages }: +{ lib, stdenv, rustPlatform, buildPackages }: { shortTarget, originalCargoToml, target, RUSTFLAGS }: @@ -26,7 +26,7 @@ in rustPlatform.buildRustPackage { done export RUST_SYSROOT=$(rustc --print=sysroot) - host=${rust.toRustTarget stdenv.buildPlatform} + host=${stdenv.buildPlatform.rust.rustcTarget} cp -r $RUST_SYSROOT/lib/rustlib/$host $out ''; diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index 205d085d3507c..7703ff4abad49 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -13,7 +13,7 @@ # This confusingly-named parameter indicates the *subdirectory of # `target/` from which to copy the build artifacts. It is derived # from a stdenv platform (or a JSON file). -, target ? rust.lib.toRustTargetSpecShort stdenv.hostPlatform +, target ? stdenv.hostPlatform.rust.cargoShortTarget }: { @@ -65,10 +65,10 @@ diff = "${lib.getBin buildPackages.diffutils}/bin/diff"; cargoConfig = '' - [target."${rust.toRustTarget stdenv.buildPlatform}"] + [target."${stdenv.buildPlatform.rust.rustcTarget}"] "linker" = "${rust.envVars.ccForBuild}" ${lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' - [target."${rust.toRustTarget stdenv.hostPlatform}"] + [target."${stdenv.hostPlatform.rust.rustcTarget}"] "linker" = "${rust.envVars.ccForHost}" ''} "rustflags" = [ "-C", "target-feature=${if stdenv.hostPlatform.isStatic then "+" else "-"}crt-static" ] diff --git a/pkgs/build-support/rust/lib/default.nix b/pkgs/build-support/rust/lib/default.nix index ceca7323176cd..dad8ab5282357 100644 --- a/pkgs/build-support/rust/lib/default.nix +++ b/pkgs/build-support/rust/lib/default.nix @@ -5,89 +5,6 @@ }: rec { - # https://doc.rust-lang.org/reference/conditional-compilation.html#target_arch - toTargetArch = platform: - /**/ if platform ? rustc.platform then platform.rustc.platform.arch - else if platform.isAarch32 then "arm" - else if platform.isMips64 then "mips64" # never add "el" suffix - else if platform.isPower64 then "powerpc64" # never add "le" suffix - else platform.parsed.cpu.name; - - # https://doc.rust-lang.org/reference/conditional-compilation.html#target_os - toTargetOs = platform: - /**/ if platform ? rustc.platform then platform.rustc.platform.os or "none" - else if platform.isDarwin then "macos" - else platform.parsed.kernel.name; - - # https://doc.rust-lang.org/reference/conditional-compilation.html#target_family - toTargetFamily = platform: - if platform ? rustc.platform.target-family - then - ( - # Since https://github.com/rust-lang/rust/pull/84072 - # `target-family` is a list instead of single value. - let - f = platform.rustc.platform.target-family; - in - if builtins.isList f then f else [ f ] - ) - else lib.optional platform.isUnix "unix" - ++ lib.optional platform.isWindows "windows"; - - # https://doc.rust-lang.org/reference/conditional-compilation.html#target_vendor - toTargetVendor = platform: let - inherit (platform.parsed) vendor; - in platform.rustc.platform.vendor or { - "w64" = "pc"; - }.${vendor.name} or vendor.name; - - # Returns the name of the rust target, even if it is custom. Adjustments are - # because rust has slightly different naming conventions than we do. - toRustTarget = platform: let - inherit (platform.parsed) cpu kernel abi; - cpu_ = platform.rustc.platform.arch or { - "armv7a" = "armv7"; - "armv7l" = "armv7"; - "armv6l" = "arm"; - "armv5tel" = "armv5te"; - "riscv64" = "riscv64gc"; - }.${cpu.name} or cpu.name; - vendor_ = toTargetVendor platform; - in platform.rustc.config - or "${cpu_}-${vendor_}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; - - # Returns the name of the rust target if it is standard, or the json file - # containing the custom target spec. - toRustTargetSpec = platform: - if platform ? rustc.platform - then builtins.toFile (toRustTarget platform + ".json") (builtins.toJSON platform.rustc.platform) - else toRustTarget platform; - - # Returns the name of the rust target if it is standard, or the - # basename of the file containing the custom target spec, without - # the .json extension. - # - # This is the name used by Cargo for target subdirectories. - toRustTargetSpecShort = platform: - lib.removeSuffix ".json" - (baseNameOf "${toRustTargetSpec platform}"); - - # When used as part of an environment variable name, triples are - # uppercased and have all hyphens replaced by underscores: - # - # https://github.com/rust-lang/cargo/pull/9169 - # https://github.com/rust-lang/cargo/issues/8285#issuecomment-634202431 - # - toRustTargetForUseInEnvVars = platform: - lib.strings.replaceStrings ["-"] ["_"] - (lib.strings.toUpper - (toRustTargetSpecShort platform)); - - # Returns true if the target is no_std - # https://github.com/rust-lang/rust/blob/2e44c17c12cec45b6a682b1e53a04ac5b5fcc9d2/src/bootstrap/config.rs#L415-L421 - IsNoStdTarget = platform: let rustTarget = toRustTarget platform; in - builtins.any (t: lib.hasInfix t rustTarget) ["-none" "nvptx" "switch" "-uefi"]; - # These environment variables must be set when using `cargo-c` and # several other tools which do not deal well with cross # compilation. The symptom of the problem they fix is errors due @@ -107,12 +24,12 @@ rec { ccForTarget = "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc"; cxxForTarget = "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++"; - rustBuildPlatform = toRustTarget stdenv.buildPlatform; - rustBuildPlatformSpec = toRustTargetSpec stdenv.buildPlatform; - rustHostPlatform = toRustTarget stdenv.hostPlatform; - rustHostPlatformSpec = toRustTargetSpec stdenv.hostPlatform; - rustTargetPlatform = toRustTarget stdenv.targetPlatform; - rustTargetPlatformSpec = toRustTargetSpec stdenv.targetPlatform; + rustBuildPlatform = stdenv.buildPlatform.rust.rustcTarget; + rustBuildPlatformSpec = stdenv.buildPlatform.rust.rustcTargetSpec; + rustHostPlatform = stdenv.hostPlatform.rust.rustcTarget; + rustHostPlatformSpec = stdenv.hostPlatform.rust.rustcTargetSpec; + rustTargetPlatform = stdenv.targetPlatform.rust.rustcTarget; + rustTargetPlatformSpec = stdenv.targetPlatform.rust.rustcTargetSpec; in { inherit ccForBuild cxxForBuild rustBuildPlatform rustBuildPlatformSpec @@ -131,20 +48,34 @@ rec { # the following lines when rustTargetPlatform collides with # rustHostPlatform. + lib.optionalString (rustTargetPlatform != rustHostPlatform) '' - "CC_${toRustTargetForUseInEnvVars stdenv.targetPlatform}=${ccForTarget}" \ - "CXX_${toRustTargetForUseInEnvVars stdenv.targetPlatform}=${cxxForTarget}" \ - "CARGO_TARGET_${toRustTargetForUseInEnvVars stdenv.targetPlatform}_LINKER=${ccForTarget}" \ + "CC_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${ccForTarget}" \ + "CXX_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${cxxForTarget}" \ + "CARGO_TARGET_${stdenv.targetPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForTarget}" \ '' + '' - "CC_${toRustTargetForUseInEnvVars stdenv.hostPlatform}=${ccForHost}" \ - "CXX_${toRustTargetForUseInEnvVars stdenv.hostPlatform}=${cxxForHost}" \ - "CARGO_TARGET_${toRustTargetForUseInEnvVars stdenv.hostPlatform}_LINKER=${ccForHost}" \ + "CC_${stdenv.hostPlatform.rust.cargoEnvVarTarget}=${ccForHost}" \ + "CXX_${stdenv.hostPlatform.rust.cargoEnvVarTarget}=${cxxForHost}" \ + "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForHost}" \ '' + '' - "CC_${toRustTargetForUseInEnvVars stdenv.buildPlatform}=${ccForBuild}" \ - "CXX_${toRustTargetForUseInEnvVars stdenv.buildPlatform}=${cxxForBuild}" \ - "CARGO_TARGET_${toRustTargetForUseInEnvVars stdenv.buildPlatform}_LINKER=${ccForBuild}" \ + "CC_${stdenv.buildPlatform.rust.cargoEnvVarTarget}=${ccForBuild}" \ + "CXX_${stdenv.buildPlatform.rust.cargoEnvVarTarget}=${cxxForBuild}" \ + "CARGO_TARGET_${stdenv.buildPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForBuild}" \ "CARGO_BUILD_TARGET=${rustBuildPlatform}" \ "HOST_CC=${buildPackages.stdenv.cc}/bin/cc" \ "HOST_CXX=${buildPackages.stdenv.cc}/bin/c++" \ ''; }; +} // lib.mapAttrs (old: new: platform: + # TODO: enable warning after 23.05 is EOL. + # lib.warn "`rust.${old} platform` is deprecated. Use `platform.rust.${new}` instead." + lib.getAttrFromPath new platform.rust) +{ + toTargetArch = [ "platform" "arch" ]; + toTargetOs = [ "platform" "os" ]; + toTargetFamily = [ "platform" "target-family" ]; + toTargetVendor = [ "platform" "vendor" ]; + toRustTarget = [ "rustcTarget" ]; + toRustTargetSpec = [ "rustcTargetSpec" ]; + toRustTargetSpecShort = [ "cargoShortTarget" ]; + toRustTargetForUseInEnvVars = [ "cargoEnvVarTarget" ]; + IsNoStdTarget = [ "isNoStdTarget" ]; } diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.py b/pkgs/build-support/setup-hooks/auto-patchelf.py index 965384b876fcd..261f55854808e 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.py +++ b/pkgs/build-support/setup-hooks/auto-patchelf.py @@ -174,7 +174,7 @@ class Dependency: found: bool = False # Whether it was found somewhere -def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: List[Path] = []) -> list[Dependency]: +def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: List[Path] = [], extra_args: List[str] = []) -> list[Dependency]: try: with open_elf(path) as elf: @@ -213,7 +213,7 @@ def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: List if file_is_dynamic_executable: print("setting interpreter of", path) subprocess.run( - ["patchelf", "--set-interpreter", interpreter_path.as_posix(), path.as_posix()], + ["patchelf", "--set-interpreter", interpreter_path.as_posix(), path.as_posix()] + extra_args, check=True) rpath += runtime_deps @@ -250,7 +250,7 @@ def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: List if rpath: print("setting RPATH to:", rpath_str) subprocess.run( - ["patchelf", "--set-rpath", rpath_str, path.as_posix()], + ["patchelf", "--set-rpath", rpath_str, path.as_posix()] + extra_args, check=True) return dependencies @@ -262,7 +262,8 @@ def auto_patchelf( runtime_deps: List[Path], recursive: bool = True, ignore_missing: List[str] = [], - append_rpaths: List[Path] = []) -> None: + append_rpaths: List[Path] = [], + extra_args: List[str] = []) -> None: if not paths_to_patch: sys.exit("No paths to patch, stopping.") @@ -275,7 +276,7 @@ def auto_patchelf( dependencies = [] for path in chain.from_iterable(glob(p, '*', recursive) for p in paths_to_patch): if not path.is_symlink() and path.is_file(): - dependencies += auto_patchelf_file(path, runtime_deps, append_rpaths) + dependencies += auto_patchelf_file(path, runtime_deps, append_rpaths, extra_args) missing = [dep for dep in dependencies if not dep.found] @@ -333,6 +334,12 @@ def main() -> None: type=Path, help="Paths to append to all runtime paths unconditionally", ) + parser.add_argument( + "--extra-args", + nargs="*", + type=str, + help="Extra arguments to pass to patchelf" + ) print("automatically fixing dependencies for ELF files") args = parser.parse_args() @@ -344,7 +351,8 @@ def main() -> None: args.runtime_dependencies, args.recursive, args.ignore_missing, - append_rpaths=args.append_rpaths) + append_rpaths=args.append_rpaths, + extra_args=args.extra_args) interpreter_path: Path = None # type: ignore diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh index 0625565606f3c..371389df427bc 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -63,6 +63,7 @@ autoPatchelf() { local appendRunpathsArray=($appendRunpaths) local runtimeDependenciesArray=($runtimeDependencies) + local patchelfFlagsArray=($patchelfFlags) @pythonInterpreter@ @autoPatchelfScript@ \ ${norecurse:+--no-recurse} \ --ignore-missing "${ignoreMissingDepsArray[@]}" \ @@ -70,7 +71,8 @@ autoPatchelf() { --libs "${autoPatchelfLibs[@]}" \ "${extraAutoPatchelfLibs[@]}" \ --runtime-dependencies "${runtimeDependenciesArray[@]/%//lib}" \ - --append-rpaths "${appendRunpathsArray[@]}" + --append-rpaths "${appendRunpathsArray[@]}" \ + --extra-args "${patchelfFlagsArray[@]}" } # XXX: This should ultimately use fixupOutputHooks but we currently don't have diff --git a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh index 55e196e654dff..e103fe77d9be7 100644 --- a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh +++ b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh @@ -36,5 +36,5 @@ fixDarwinDylibNames() { fixDarwinDylibNamesIn() { local dir="$1" - fixDarwinDylibNames $(find "$dir" -name "*.dylib") + fixDarwinDylibNames $(find "$dir" -name "*.dylib" -o -name "*.so" -o -name "*.so.*") } diff --git a/pkgs/by-name/al/alsa-ucm-conf/package.nix b/pkgs/by-name/al/alsa-ucm-conf/package.nix index 75ec2932c8904..b7203a7376387 100644 --- a/pkgs/by-name/al/alsa-ucm-conf/package.nix +++ b/pkgs/by-name/al/alsa-ucm-conf/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-ucm-conf"; - version = "1.2.9"; + version = "1.2.10"; src = fetchurl { url = "mirror://alsa/lib/${pname}-${version}.tar.bz2"; - hash = "sha256-N09oM7/XfQpGdeSqK/t53v6FDlpGpdRUKkWWL0ueJyo="; + hash = "sha256-nCHj8B/wC6p1jfF+hnzTbiTrtBpr7ElzfpkQXhbyrpc="; }; dontBuild = true; diff --git a/pkgs/by-name/al/alsa-utils/package.nix b/pkgs/by-name/al/alsa-utils/package.nix index da559b5fcc1c5..401c66beb703f 100644 --- a/pkgs/by-name/al/alsa-utils/package.nix +++ b/pkgs/by-name/al/alsa-utils/package.nix @@ -1,5 +1,33 @@ -{lib, stdenv, fetchurl, fetchpatch, alsa-lib, gettext, makeWrapper, ncurses, libsamplerate, pciutils, which, fftw}: +{ lib +, stdenv +, fetchurl +, fetchpatch +, alsa-lib +, alsa-plugins +, gettext +, makeWrapper +, ncurses +, libsamplerate +, pciutils +, which +, fftw +, pipewire +, withPipewireLib ? true +, symlinkJoin +}: +let + plugin-packages = [ alsa-plugins ] ++ lib.optional withPipewireLib pipewire; + + # Create a directory containing symlinks of all ALSA plugins. + # This is necessary because ALSA_PLUGIN_DIR must reference only one directory. + plugin-dir = symlinkJoin { + name = "all-plugins"; + paths = map + (path: "${path}/lib/alsa-lib") + plugin-packages; + }; +in stdenv.mkDerivation rec { pname = "alsa-utils"; version = "1.2.10"; @@ -30,6 +58,7 @@ stdenv.mkDerivation rec { postFixup = '' mv $out/bin/alsa-info.sh $out/bin/alsa-info wrapProgram $out/bin/alsa-info --prefix PATH : "${lib.makeBinPath [ which pciutils ]}" + wrapProgram $out/bin/aplay --set-default ALSA_PLUGIN_DIR ${plugin-dir} ''; meta = with lib; { diff --git a/pkgs/by-name/ap/apache-users/optional-args.patch b/pkgs/by-name/ap/apache-users/optional-args.patch new file mode 100644 index 0000000000000..7b921a21ce0c4 --- /dev/null +++ b/pkgs/by-name/ap/apache-users/optional-args.patch @@ -0,0 +1,24 @@ +--- a/apache2.1.pl ++++ b/apache2.1.pl +@@ -63,10 +63,10 @@ getopt ("h: l: p: e: s: t:" ,\%opts); + use LWP; + + +-if (!(exists $opts{h})||!(exists $opts{p})||!(exists $opts{l})||!(exists $opts{e})){ &usage;} ++if (!(exists $opts{h})){ &usage;} + + sub usage{ +-print "\nUSAGE: apache.pl [-h 1.2.3.4] [-l names] [-p 80] [-s (SSL Support 1=true 0=false)] [-e 403 (http code)] [-t threads]\n\n "; ++print "\nUSAGE: apache-users -h 1.2.3.4 [-l names] [-p 80] [-s (SSL Support 1=true 0=false)] [-e 403 (http code)] [-t threads]\n\n "; + exit 1; + }; + +@@ -75,7 +75,7 @@ if (exists $opts{h}){ + } + if (exists $opts{l}){ + $list=$opts{l}; +-}else {$list="names";} ++}else {$list="@out@/share/apache-users/names";} + if (exists $opts{p}){ + $port=$opts{p}; + }else{$port=80;} diff --git a/pkgs/by-name/ap/apache-users/package.nix b/pkgs/by-name/ap/apache-users/package.nix new file mode 100644 index 0000000000000..8780a13a3f8a3 --- /dev/null +++ b/pkgs/by-name/ap/apache-users/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchurl +, perl +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "apache-users"; + version = "2.1"; + + src = fetchurl { + url = "https://labs.portcullis.co.uk/download/apache_users-${finalAttrs.version}.tar.gz"; + hash = "sha256-rylW4F8Si6KKYxaxEJlVFnbLqfqS6ytMPfHpc8MgriA="; + }; + + # Allow optional arguments where defaults are provided + patches = [ ./optional-args.patch ]; + + postPatch = '' + substituteAllInPlace apache${finalAttrs.version}.pl + ''; + + buildInputs = [ + (perl.withPackages (p: [ p.ParallelForkManager p.LWP ])) + ]; + + installPhase = '' + runHook preInstall + + install -D apache${finalAttrs.version}.pl $out/bin/apache-users + install -Dm444 names $out/share/apache-users/names + + runHook postInstall + ''; + + meta = with lib; { + description = "Username Enumeration through Apache UserDir"; + homepage = "https://labs.portcullis.co.uk/downloads/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ emilytrau ]; + mainProgram = "apache-users"; + }; +}) diff --git a/pkgs/by-name/ar/arrpc/package.nix b/pkgs/by-name/ar/arrpc/package.nix index 15ad34b39d7ff..eeb4dd4fef250 100644 --- a/pkgs/by-name/ar/arrpc/package.nix +++ b/pkgs/by-name/ar/arrpc/package.nix @@ -21,7 +21,8 @@ buildNpmPackage { # Remove after next release patches = [ (fetchpatch { - url = "https://github.com/OpenAsar/arrpc/pull/50.patch"; + # https://github.com/OpenAsar/arrpc/pull/50 + url = "https://github.com/OpenAsar/arrpc/commit/7fa6c90204450eb3952ce9cddfecb0a5ba5e4313.patch"; hash = "sha256-qFlrbe2a4x811wpmWUcGDe2CPlt9x3HI+/t0P2v4kPc="; }) ]; diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index 2626c45f0215e..1272e1d0173a0 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ thoughtpolice AndersonTorres ]; platforms = lib.platforms.unix; # ofborg: x86_64-linux builds the musl package, aarch64-linux doesn't - broken = stdenv.targetPlatform.isMusl && stdenv.buildPlatform.isAarch64; + broken = stdenv.hostPlatform.isMusl && stdenv.buildPlatform.isAarch64; }; }) # TODO: report the quirks and patches to bmake devteam (especially the Musl one) diff --git a/pkgs/by-name/ce/celluloid/package.nix b/pkgs/by-name/ce/celluloid/package.nix index c0ada66edc605..64ee44b1ad166 100644 --- a/pkgs/by-name/ce/celluloid/package.nix +++ b/pkgs/by-name/ce/celluloid/package.nix @@ -5,6 +5,7 @@ , desktop-file-utils , glib , gtk4 +, libGL , libepoxy , libadwaita , meson @@ -40,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glib gtk4 + libGL libadwaita libepoxy mpv diff --git a/pkgs/development/tools/build-managers/cmake/001-search-path.diff b/pkgs/by-name/cm/cmake/001-search-path.diff index 04ab0847a7074..04ab0847a7074 100644 --- a/pkgs/development/tools/build-managers/cmake/001-search-path.diff +++ b/pkgs/by-name/cm/cmake/001-search-path.diff diff --git a/pkgs/development/tools/build-managers/cmake/002-application-services.diff b/pkgs/by-name/cm/cmake/002-application-services.diff index 56f7cd266b7af..56f7cd266b7af 100644 --- a/pkgs/development/tools/build-managers/cmake/002-application-services.diff +++ b/pkgs/by-name/cm/cmake/002-application-services.diff diff --git a/pkgs/development/tools/build-managers/cmake/003-libuv-application-services.diff b/pkgs/by-name/cm/cmake/003-libuv-application-services.diff index 6607a9c6ed1f3..6607a9c6ed1f3 100644 --- a/pkgs/development/tools/build-managers/cmake/003-libuv-application-services.diff +++ b/pkgs/by-name/cm/cmake/003-libuv-application-services.diff diff --git a/pkgs/development/tools/build-managers/cmake/004-cygwin.diff b/pkgs/by-name/cm/cmake/004-cygwin.diff index 982aba17e874d..982aba17e874d 100644 --- a/pkgs/development/tools/build-managers/cmake/004-cygwin.diff +++ b/pkgs/by-name/cm/cmake/004-cygwin.diff diff --git a/pkgs/development/tools/build-managers/cmake/005-remove-systemconfiguration-dep.diff b/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff index 76aa91cff92c4..ffd3077d301e6 100644 --- a/pkgs/development/tools/build-managers/cmake/005-remove-systemconfiguration-dep.diff +++ b/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff @@ -1,6 +1,7 @@ ---- a/Utilities/cmcurl/CMakeLists.txt -+++ b/Utilities/cmcurl/CMakeLists.txt -@@ -391,13 +391,6 @@ if(ENABLE_IPV6 AND NOT WIN32) +diff -Naur cmake-3.27.7/Utilities/cmcurl/CMakeLists.txt cmake-3.27.7-new/Utilities/cmcurl/CMakeLists.txt +--- cmake-3.27.7/Utilities/cmcurl/CMakeLists.txt 2023-10-06 10:08:35.000000000 -0300 ++++ cmake-3.27.7-new/Utilities/cmcurl/CMakeLists.txt 2023-10-22 21:51:09.231609901 -0300 +@@ -414,13 +414,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT ENABLE_ARES) set(use_core_foundation ON) @@ -14,9 +15,10 @@ endif() endif() ---- a/Utilities/cmcurl/lib/curl_setup.h -+++ b/Utilities/cmcurl/lib/curl_setup.h -@@ -257,11 +257,7 @@ +diff -Naur cmake-3.27.7/Utilities/cmcurl/lib/curl_setup.h cmake-3.27.7-new/Utilities/cmcurl/lib/curl_setup.h +--- cmake-3.27.7/Utilities/cmcurl/lib/curl_setup.h 2023-10-06 10:08:35.000000000 -0300 ++++ cmake-3.27.7-new/Utilities/cmcurl/lib/curl_setup.h 2023-10-22 21:52:00.214748294 -0300 +@@ -260,11 +260,7 @@ * performing this task will result in a synthesized IPv6 address. */ #if defined(__APPLE__) && !defined(USE_ARES) @@ -28,9 +30,10 @@ #endif #ifdef USE_LWIPSOCK ---- a/Utilities/cmcurl/lib/hostip.c -+++ b/Utilities/cmcurl/lib/hostip.c -@@ -68,10 +68,6 @@ +diff -Naur cmake-3.27.7/Utilities/cmcurl/lib/hostip.c cmake-3.27.7-new/Utilities/cmcurl/lib/hostip.c +--- cmake-3.27.7/Utilities/cmcurl/lib/hostip.c 2023-10-06 10:08:35.000000000 -0300 ++++ cmake-3.27.7-new/Utilities/cmcurl/lib/hostip.c 2023-10-22 21:53:29.249989934 -0300 +@@ -67,10 +67,6 @@ #include "curl_memory.h" #include "memdebug.h" @@ -38,10 +41,10 @@ -#include <SystemConfiguration/SCDynamicStoreCopySpecific.h> -#endif - - #if defined(CURLRES_SYNCH) && \ - defined(HAVE_ALARM) && defined(SIGALRM) && defined(HAVE_SIGSETJMP) - /* alarm-based timeouts can only be used with all the dependencies satisfied */ -@@ -661,23 +657,6 @@ enum resolve_t Curl_resolv(struct Curl_easy *data, + #if defined(CURLRES_SYNCH) && \ + defined(HAVE_ALARM) && \ + defined(SIGALRM) && \ +@@ -743,23 +739,6 @@ return CURLRESOLV_ERROR; } diff --git a/pkgs/development/tools/build-managers/cmake/006-darwin-always-set-runtime-c-flag.diff b/pkgs/by-name/cm/cmake/006-darwin-always-set-runtime-c-flag.diff index dc10e6b342311..dc10e6b342311 100644 --- a/pkgs/development/tools/build-managers/cmake/006-darwin-always-set-runtime-c-flag.diff +++ b/pkgs/by-name/cm/cmake/006-darwin-always-set-runtime-c-flag.diff diff --git a/pkgs/development/tools/build-managers/cmake/check-pc-files-hook.sh b/pkgs/by-name/cm/cmake/check-pc-files-hook.sh index 94d1b7b53556e..94d1b7b53556e 100644 --- a/pkgs/development/tools/build-managers/cmake/check-pc-files-hook.sh +++ b/pkgs/by-name/cm/cmake/check-pc-files-hook.sh diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/by-name/cm/cmake/package.nix index 00715130a000d..a573147915012 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -16,11 +16,17 @@ , texinfo , xz , zlib -, isBootstrap ? false -, useOpenSSL ? !isBootstrap -, useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) +, isBootstrap ? null +, isMinimalBuild ? ( + if isBootstrap != null + then lib.warn + "isBootstrap argument is deprecated and will be removed; use isMinimalBuild instead" + isBootstrap + else false) +, useOpenSSL ? !isMinimalBuild +, useSharedLibraries ? (!isMinimalBuild && !stdenv.isCygwin) , uiToolkits ? [] # can contain "ncurses" and/or "qt5" -, buildDocs ? !(isBootstrap || (uiToolkits == [])) +, buildDocs ? !(isMinimalBuild || (uiToolkits == [])) , darwin , libsForQt5 }: @@ -34,17 +40,17 @@ in # Accepts only "ncurses" and "qt5" as possible uiToolkits assert lib.subtractLists [ "ncurses" "qt5" ] uiToolkits == []; # Minimal, bootstrap cmake does not have toolkits -assert isBootstrap -> (uiToolkits == []); +assert isMinimalBuild -> (uiToolkits == []); stdenv.mkDerivation (finalAttrs: { pname = "cmake" - + lib.optionalString isBootstrap "-boot" + + lib.optionalString isMinimalBuild "-minimal" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.26.4"; + version = "3.27.7"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-MTtogMKRvU/jHAqlHW5iZZKCpSHmlfMNXMDSWrvVwgg="; + hash = "sha256-CPcaEGA2vwUfaSdg75VYwFd8Qqw56Wugl+dmK9QVjY4="; }; patches = [ @@ -57,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional stdenv.isCygwin ./004-cygwin.diff # Derived from https://github.com/curl/curl/commit/31f631a142d855f069242f3e0c643beec25d1b51 - ++ lib.optional (stdenv.isDarwin && isBootstrap) ./005-remove-systemconfiguration-dep.diff + ++ lib.optional (stdenv.isDarwin && isMinimalBuild) ./005-remove-systemconfiguration-dep.diff # On Darwin, always set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG. ++ lib.optional stdenv.isDarwin ./006-darwin-always-set-runtime-c-flag.diff; @@ -90,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional useOpenSSL openssl ++ lib.optional cursesUI ncurses ++ lib.optional qt5UI qtbase - ++ lib.optional (stdenv.isDarwin && !isBootstrap) SystemConfiguration; + ++ lib.optional (stdenv.isDarwin && !isMinimalBuild) SystemConfiguration; propagatedBuildInputs = lib.optional stdenv.isDarwin ps; @@ -104,12 +110,23 @@ stdenv.mkDerivation (finalAttrs: { configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD $configureFlags" ''; + # The configuration script is not autoconf-based, although being similar; + # triples and other interesting info are passed via CMAKE_* environment + # variables and commandline switches + configurePlatforms = [ ]; + configureFlags = [ "CXXFLAGS=-Wno-elaborated-enum-base" "--docdir=share/doc/${finalAttrs.pname}-${finalAttrs.version}" ] ++ (if useSharedLibraries - then [ "--no-system-jsoncpp" "--system-libs" ] - else [ "--no-system-libs" ]) # FIXME: cleanup + then [ + "--no-system-cppdap" + "--no-system-jsoncpp" + "--system-libs" + ] + else [ + "--no-system-libs" + ]) # FIXME: cleanup ++ lib.optional qt5UI "--qt-gui" ++ lib.optionals buildDocs [ "--sphinx-build=${sphinx}/bin/sphinx-build" @@ -129,15 +146,17 @@ stdenv.mkDerivation (finalAttrs: { # Unfortunately cmake seems to expect absolute paths for ar, ranlib, and # strip. Otherwise they are taken to be relative to the source root of the # package being built. - "-DCMAKE_CXX_COMPILER=${stdenv.cc.targetPrefix}c++" - "-DCMAKE_C_COMPILER=${stdenv.cc.targetPrefix}cc" - "-DCMAKE_AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" - "-DCMAKE_RANLIB=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" - "-DCMAKE_STRIP=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip" - - "-DCMAKE_USE_OPENSSL=${if useOpenSSL then "ON" else "OFF"}" - # Avoid depending on frameworks. - "-DBUILD_CursesDialog=${if cursesUI then "ON" else "OFF"}" + (lib.cmakeFeature "CMAKE_CXX_COMPILER" "${stdenv.cc.targetPrefix}c++") + (lib.cmakeFeature "CMAKE_C_COMPILER" "${stdenv.cc.targetPrefix}cc") + (lib.cmakeFeature "CMAKE_AR" + "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar") + (lib.cmakeFeature "CMAKE_RANLIB" + "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib") + (lib.cmakeFeature "CMAKE_STRIP" + "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip") + + (lib.cmakeBool "CMAKE_USE_OPENSSL" useOpenSSL) + (lib.cmakeBool "BUILD_CursesDialog" cursesUI) ]; # make install attempts to use the just-built cmake @@ -148,10 +167,6 @@ stdenv.mkDerivation (finalAttrs: { dontUseCmakeConfigure = true; enableParallelBuilding = true; - # This isn't an autoconf configure script; triples are passed via - # CMAKE_SYSTEM_NAME, etc. - configurePlatforms = [ ]; - doCheck = false; # fails meta = { diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/by-name/cm/cmake/setup-hook.sh index b28ed42b6896b..b28ed42b6896b 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/by-name/cm/cmake/setup-hook.sh diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index 48bcff3f32a92..87858931d8064 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -45,13 +45,13 @@ in stdenv.mkDerivation rec { pname = "cockpit"; - version = "303"; + version = "305"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; rev = "refs/tags/${version}"; - hash = "sha256-1VPnmb4VDSwzdXtk2YZVHH4qFJSe2OPzsmzVD/NkbYg="; + hash = "sha256-fCVnggso/wAvci9sLRVvwEsvZ+CeEfLBDnPPcAy/wGo="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix index efb2529e9df25..b71f6d1996893 100644 --- a/pkgs/by-name/co/cosmic-applets/package.nix +++ b/pkgs/by-name/co/cosmic-applets/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, rust , rustPlatform , just , pkg-config @@ -52,11 +51,11 @@ rustPlatform.buildRustPackage { justFlags = [ "--set" "prefix" (placeholder "out") - "--set" "target" "${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release" + "--set" "target" "${stdenv.hostPlatform.rust.cargoShortTarget}/release" ]; # Force linking to libwayland-client, which is always dlopen()ed. - "CARGO_TARGET_${rust.toRustTargetForUseInEnvVars stdenv.hostPlatform}_RUSTFLAGS" = + "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = map (a: "-C link-arg=${a}") [ "-Wl,--push-state,--no-as-needed" "-lwayland-client" diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index 9177bcc7ef677..7c8c31f511d41 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -41,11 +41,11 @@ rustPlatform.buildRustPackage { justFlags = [ "--set" "prefix" (placeholder "out") - "--set" "bin-src" "target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-panel" + "--set" "bin-src" "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-panel" ]; # Force linking to libEGL, which is always dlopen()ed. - "CARGO_TARGET_${rust.toRustTargetForUseInEnvVars stdenv.hostPlatform}_RUSTFLAGS" = + "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = map (a: "-C link-arg=${a}") [ "-Wl,--push-state,--no-as-needed" "-lEGL" diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix index 3e32c22d2e418..bcb06b8ed208c 100644 --- a/pkgs/by-name/cy/cyme/package.nix +++ b/pkgs/by-name/cy/cyme/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cyme"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "tuna-f1sh"; repo = "cyme"; rev = "v${version}"; - hash = "sha256-UXh97pHJ9wa/xSslHLB7WVDwLKJYvLPgmPX8RvKrsTI="; + hash = "sha256-Y5TcRcbqarcKRDWCI36YhbLJFU+yrpAE3vRGArbfr0U="; }; - cargoHash = "sha256-hSd53K50Y4K/fYGfsT2fHUaipVSpeYN6/EOFlv4ocuE="; + cargoHash = "sha256-ycFNNTZ7AU4WRnf1+RJB7KxQKVdJbubB28tS/GyU0bI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fr/framework-tool/Cargo.lock b/pkgs/by-name/fr/framework-tool/Cargo.lock new file mode 100644 index 0000000000000..f887187a7c75c --- /dev/null +++ b/pkgs/by-name/fr/framework-tool/Cargo.lock @@ -0,0 +1,1312 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bit_field" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "built" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b9c056b9ed43aee5e064b683aa1ec783e19c6acec7559e3ae931b7490472fbe" +dependencies = [ + "cargo-lock", + "chrono", + "git2", +] + +[[package]] +name = "bumpalo" +version = "3.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" + +[[package]] +name = "cargo-lock" +version = "8.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "031718ddb8f78aa5def78a09e90defe30151d1f6c672f937af4dd916429ed996" +dependencies = [ + "semver", + "serde", + "toml", + "url", +] + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +dependencies = [ + "iana-time-zone", + "num-integer", + "num-traits", + "winapi", +] + +[[package]] +name = "clap" +version = "4.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39" +dependencies = [ + "bitflags", + "clap_derive", + "clap_lex", + "is-terminal", + "once_cell", + "strsim", + "termcolor", +] + +[[package]] +name = "clap-verbosity-flag" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1eef05769009513df2eb1c3b4613e7fad873a14c600ff025b08f250f59fee7de" +dependencies = [ + "clap", + "log", +] + +[[package]] +name = "clap_derive" +version = "4.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "clap_lex" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "core-foundation" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" +dependencies = [ + "core-foundation-sys 0.6.2", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "cxx" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn 2.0.13", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.13", +] + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.107", +] + +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "framework_lib" +version = "0.1.0" +dependencies = [ + "built", + "clap", + "clap-verbosity-flag", + "env_logger", + "guid_macros", + "hidapi", + "lazy_static", + "libc", + "log", + "nix", + "no-std-compat", + "num", + "num-derive", + "num-traits", + "plain", + "redox_hwio", + "regex", + "rusb", + "smbios-lib", + "spin 0.9.4", + "uefi", + "uefi-services", + "windows 0.42.0", +] + +[[package]] +name = "framework_tool" +version = "0.1.0" +dependencies = [ + "framework_lib", +] + +[[package]] +name = "framework_uefi" +version = "0.1.0" +dependencies = [ + "framework_lib", + "log", + "uefi", + "uefi-services", +] + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "git2" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1" +dependencies = [ + "bitflags", + "libc", + "libgit2-sys", + "log", + "url", +] + +[[package]] +name = "guid_macros" +version = "0.11.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.13", +] + +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hidapi" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a090a12b53564bcb2f6053b8be08d5f9e7b91f26953d6e8e08c9affd8aeb4ec9" +dependencies = [ + "cc", + "libc", + "pkg-config", + "winapi", +] + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "iana-time-zone" +version = "0.1.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +dependencies = [ + "android_system_properties", + "core-foundation-sys 0.8.4", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows 0.48.0", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "io-kit-sys" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f21dcc74995dd4cd090b147e79789f8d65959cbfb5f0b118002db869ea3bd0a0" +dependencies = [ + "core-foundation-sys 0.6.2", + "mach 0.2.3", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "is-terminal" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +dependencies = [ + "hermit-abi", + "io-lifetimes", + "rustix", + "windows-sys", +] + +[[package]] +name = "itoa" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" + +[[package]] +name = "jobserver" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "libgit2-sys" +version = "0.14.2+1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" +dependencies = [ + "cc", + "libc", + "libz-sys", + "pkg-config", +] + +[[package]] +name = "libusb1-sys" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d0e2afce4245f2c9a418511e5af8718bcaf2fa408aefb259504d1a9cb25f27" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libz-sys" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "link-cplusplus" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +dependencies = [ + "cc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "mach" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" +dependencies = [ + "libc", +] + +[[package]] +name = "mach" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +dependencies = [ + "libc", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "nix" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +dependencies = [ + "autocfg", + "bitflags", + "cfg-if", + "libc", + "memoffset", + "pin-utils", +] + +[[package]] +name = "no-std-compat" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" + +[[package]] +name = "num" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" +dependencies = [ + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" + +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + +[[package]] +name = "plain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.107", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "ptr_meta" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcada80daa06c42ed5f48c9a043865edea5dc44cbf9ac009fda3b89526e28607" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bca9224df2e20e7c5548aeb5f110a0f3b77ef05f8585139b7148b59056168ed2" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "quote" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_hwio" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eb516ad341a84372b5b15a5a35cf136ba901a639c8536f521b108253d7fce74" + +[[package]] +name = "regex" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "rusb" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703aa035c21c589b34fb5136b12e68fc8dcf7ea46486861381361dd8ebf5cee0" +dependencies = [ + "libc", + "libusb1-sys", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.36.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "ryu" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "scratch" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" + +[[package]] +name = "semver" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.151" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.151" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "serde_json" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "smbios-lib" +version = "0.9.1" +source = "git+https://github.com/FrameworkComputer/smbios-lib.git?branch=no-std#b3e2fff8a6f4b8c2d729467cbbf0c8c41974cd1c" +dependencies = [ + "core-foundation", + "core-foundation-sys 0.6.2", + "getopts", + "io-kit-sys", + "libc", + "mach 0.3.2", + "no-std-compat", + "serde", + "serde_json", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" +dependencies = [ + "lock_api", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "ucs2" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bad643914094137d475641b6bab89462505316ec2ce70907ad20102d28a79ab8" +dependencies = [ + "bit_field", +] + +[[package]] +name = "uefi" +version = "0.20.0" +source = "git+https://github.com/FrameworkComputer/uefi-rs?branch=merged#76130a0f1c1585012e598b8c514526bac09c68e0" +dependencies = [ + "bitflags", + "derive_more", + "log", + "ptr_meta", + "ucs2", + "uefi-macros", +] + +[[package]] +name = "uefi-macros" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0caeb0e7b31b9f1f347e541106be10aa8c66c76fa722a3298a4cd21433fabd4" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "uefi-services" +version = "0.17.0" +source = "git+https://github.com/FrameworkComputer/uefi-rs?branch=merged#76130a0f1c1585012e598b8c514526bac09c68e0" +dependencies = [ + "cfg-if", + "log", + "uefi", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasm-bindgen" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 1.0.107", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0286ba339aa753e70765d521bb0242cc48e1194562bfa2a2ad7ac8a6de28f5d5" +dependencies = [ + "windows_aarch64_gnullvm 0.42.0", + "windows_aarch64_msvc 0.42.0", + "windows_i686_gnu 0.42.0", + "windows_i686_msvc 0.42.0", + "windows_x86_64_gnu 0.42.0", + "windows_x86_64_gnullvm 0.42.0", + "windows_x86_64_msvc 0.42.0", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.0", + "windows_aarch64_msvc 0.42.0", + "windows_i686_gnu 0.42.0", + "windows_i686_msvc 0.42.0", + "windows_x86_64_gnu 0.42.0", + "windows_x86_64_gnullvm 0.42.0", + "windows_x86_64_msvc 0.42.0", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/pkgs/by-name/fr/framework-tool/package.nix b/pkgs/by-name/fr/framework-tool/package.nix new file mode 100644 index 0000000000000..d97b49fccf4b1 --- /dev/null +++ b/pkgs/by-name/fr/framework-tool/package.nix @@ -0,0 +1,37 @@ +{ lib, rustPlatform, fetchFromGitHub, pkg-config, udev }: + +rustPlatform.buildRustPackage rec { + pname = "framework-tool"; + + # Latest stable version 0.1.0 has an ssh:// git URL in Cargo.lock, + # so use unstable for now + version = "unstable-2023-11-14"; + + src = fetchFromGitHub { + owner = "FrameworkComputer"; + repo = "framework-system"; + rev = "491a587342a5d79366a25d803b7065169314279c"; + hash = "sha256-qDtW4DvY19enCfkOBRaako9ngAkmSreoNWlL4QE2FAk="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "smbios-lib-0.9.1" = + "sha256-3L8JaA75j9Aaqg1z9lVs61m6CvXDeQprEFRq+UDCHQo="; + "uefi-0.20.0" = "sha256-/3WNHuc27N89M7s+WT64SHyFOp7YRyzz6B+neh1vejY="; + }; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ udev ]; + + meta = with lib; { + description = "Swiss army knife for Framework laptops"; + homepage = "https://github.com/FrameworkComputer/framework-system"; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ nickcao ]; + mainProgram = "framework_tool"; + }; +} diff --git a/pkgs/by-name/ha/hachimarupop/package.nix b/pkgs/by-name/ha/hachimarupop/package.nix new file mode 100644 index 0000000000000..3ebf82409a1cc --- /dev/null +++ b/pkgs/by-name/ha/hachimarupop/package.nix @@ -0,0 +1,30 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation { + pname = "hachimarupop"; + version = "unstable-2022-07-11"; + + src = fetchFromGitHub { + owner = "noriokanisawa"; + repo = "HachiMaruPop"; + rev = "67d96c274032f5a2e1d33c1ec53498fde9110079"; + hash = "sha256-b1moyTVy0hHGu9/LrQ9k6Isd/LYTSxiuqz3BzrYVbXY="; + }; + + installPhase = '' + runHook preInstall + install -Dm444 fonts/ttf/*.ttf -t $out/share/fonts/truetype/ + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/noriokanisawa/HachiMaruPop"; + description = "A cute, Japanese font"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix index 3403edcaaccfc..d630bdf22b308 100644 --- a/pkgs/by-name/ju/justbuild/package.nix +++ b/pkgs/by-name/ju/justbuild/package.nix @@ -11,7 +11,7 @@ openssl, pkg-config, - protobuf3_23, + protobuf_23, grpc, pandoc, python3, @@ -87,14 +87,14 @@ stdenv.mkDerivation rec { # For future updates: The currently used version can be found in the file # etc/repos.json: https://github.com/just-buildsystem/justbuild/blob/master/etc/repos.json # under the key .repositories.protobuf - protobuf3_23 + protobuf_23 python3 ]; postPatch = '' sed -ie 's|\./bin/just-mr.py|${python3}/bin/python3 ./bin/just-mr.py|' bin/bootstrap.py sed -ie 's|#!/usr/bin/env python3|#!${python3}/bin/python3|' bin/parallel-bootstrap-traverser.py - jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf3_23}"' etc/repos.json > etc/repos.json.patched + jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf_23}"' etc/repos.json > etc/repos.json.patched mv etc/repos.json.patched etc/repos.json jq '.repositories.com_github_grpc_grpc.pkg_bootstrap.local_path = "${grpc}"' etc/repos.json > etc/repos.json.patched mv etc/repos.json.patched etc/repos.json diff --git a/pkgs/by-name/ki/kikit/default.nix b/pkgs/by-name/ki/kikit/default.nix new file mode 100644 index 0000000000000..45209545aa3d3 --- /dev/null +++ b/pkgs/by-name/ki/kikit/default.nix @@ -0,0 +1,87 @@ +{ bc +, zip +, lib +, fetchFromGitHub +, bats +, buildPythonApplication +, pythonOlder +, callPackage +, kicad +, numpy +, click +, markdown2 +, pytestCheckHook +, commentjson +, wxPython_4_2 +, pcbnew-transition +, pybars3 +, versioneer +}: +let + solidpython = callPackage ./solidpython { }; + + # https://github.com/yaqwsx/KiKit/issues/574 + # copy-pasted from nixpkgs#8d8e62e74f511160a599471549a98bc9e4f4818d + shapely = callPackage ./shapely { }; +in +buildPythonApplication rec { + pname = "kikit"; + version = "1.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "yaqwsx"; + repo = "KiKit"; + rev = "v${version}"; + hash = "sha256-kDTPk/R3eZtm4DjoUV4tSQzjGQ9k8MKQedX4oUXYzeo="; + }; + + propagatedBuildInputs = [ + kicad + numpy + click + markdown2 + commentjson + # https://github.com/yaqwsx/KiKit/issues/575 + wxPython_4_2 + pcbnew-transition + pybars3 + shapely + # https://github.com/yaqwsx/KiKit/issues/576 + solidpython + ]; + + nativeBuildInputs = [ + versioneer + bc + zip + ]; + + nativeCheckInputs = [ + pytestCheckHook + bats + ]; + + pythonImportsCheck = [ + "kikit" + ]; + + preCheck = '' + export PATH=$PATH:$out/bin + + make test-system + + # pytest needs to run in a subdir. See https://github.com/yaqwsx/KiKit/blob/v1.3.0/Makefile#L43 + cd test/units + ''; + + meta = with lib; { + description = "Automation for KiCAD boards"; + homepage = "https://github.com/yaqwsx/KiKit/"; + changelog = "https://github.com/yaqwsx/KiKit/releases/tag/v${version}"; + maintainers = with maintainers; [ jfly matusf ]; + license = licenses.mit; + }; +} diff --git a/pkgs/by-name/ki/kikit/package.nix b/pkgs/by-name/ki/kikit/package.nix new file mode 100644 index 0000000000000..5f1daa8aa5cd2 --- /dev/null +++ b/pkgs/by-name/ki/kikit/package.nix @@ -0,0 +1,2 @@ +{ python3 }: +(python3.pkgs.callPackage ./default.nix { }) diff --git a/pkgs/by-name/ki/kikit/shapely/default.nix b/pkgs/by-name/ki/kikit/shapely/default.nix new file mode 100644 index 0000000000000..7f136a1338ade --- /dev/null +++ b/pkgs/by-name/ki/kikit/shapely/default.nix @@ -0,0 +1,71 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, substituteAll +, pythonOlder +, geos +, pytestCheckHook +, cython +, numpy +}: + +buildPythonPackage rec { + pname = "Shapely"; + version = "1.8.4"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw="; + }; + + nativeBuildInputs = [ + geos # for geos-config + cython + ]; + + propagatedBuildInputs = [ + numpy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # Environment variable used in shapely/_buildcfg.py + GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; + + patches = [ + # Patch to search form GOES .so/.dylib files in a Nix-aware way + (substituteAll { + src = ./library-paths.patch; + libgeos_c = GEOS_LIBRARY_PATH; + libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; + }) + ]; + + preCheck = '' + rm -r shapely # prevent import of local shapely + ''; + + disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # FIXME(lf-): these logging tests are broken, which is definitely our + # fault. I've tried figuring out the cause and failed. + # + # It is apparently some sandbox or no-sandbox related thing on macOS only + # though. + "test_error_handler_exception" + "test_error_handler" + "test_info_handler" + ]; + + pythonImportsCheck = [ "shapely" ]; + + meta = with lib; { + description = "Geometric objects, predicates, and operations"; + homepage = "https://pypi.python.org/pypi/Shapely/"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ knedlsepp ]; + }; +} diff --git a/pkgs/by-name/ki/kikit/shapely/library-paths.patch b/pkgs/by-name/ki/kikit/shapely/library-paths.patch new file mode 100644 index 0000000000000..12f93e757f9aa --- /dev/null +++ b/pkgs/by-name/ki/kikit/shapely/library-paths.patch @@ -0,0 +1,31 @@ +diff --git a/shapely/geos.py b/shapely/geos.py +index 88c5f53..1ccd6e4 100644 +--- a/shapely/geos.py ++++ b/shapely/geos.py +@@ -96,6 +96,7 @@ if sys.platform.startswith('linux'): + alt_paths = [ + 'libgeos_c.so.1', + 'libgeos_c.so', ++ '@libgeos_c@', + ] + _lgeos = load_dll('geos_c', fallbacks=alt_paths) + +@@ -160,6 +161,7 @@ elif sys.platform == 'darwin': + "/usr/local/lib/libgeos_c.dylib", + # homebrew Apple Silicon + "/opt/homebrew/lib/libgeos_c.dylib", ++ "@libgeos_c@", + ] + _lgeos = load_dll('geos_c', fallbacks=alt_paths) + +diff --git a/tests/test_dlls.py b/tests/test_dlls.py +index c71da8e..c36262c 100644 +--- a/tests/test_dlls.py ++++ b/tests/test_dlls.py +@@ -18,4 +18,5 @@ class LoadingTestCase(unittest.TestCase): + '/opt/homebrew/lib/libgeos_c.dylib', # homebrew (macOS) + os.path.join(sys.prefix, "lib", "libgeos_c.so"), # anaconda (Linux) + 'libgeos_c.so.1', +- 'libgeos_c.so']) ++ 'libgeos_c.so', ++ '@libgeos_c@']) diff --git a/pkgs/by-name/ki/kikit/solidpython/default.nix b/pkgs/by-name/ki/kikit/solidpython/default.nix new file mode 100644 index 0000000000000..c03637907a362 --- /dev/null +++ b/pkgs/by-name/ki/kikit/solidpython/default.nix @@ -0,0 +1,66 @@ +# SolidPython is an unmaintained library with old dependencies. +{ buildPythonPackage +, callPackage +, fetchFromGitHub +, fetchFromGitLab +, fetchpatch +, lib +, pythonRelaxDepsHook + +, poetry-core +, prettytable +, pypng +, ply +, setuptools +, euclid3 +}: +buildPythonPackage rec { + pname = "solidpython"; + version = "1.1.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "SolidCode"; + repo = "SolidPython"; + rev = "d962740d600c5dfd69458c4559fc416b9beab575"; + hash = "sha256-3fJta2a5c8hV9FPwKn5pj01aBtsCGSRCz3vvxR/5n0Q="; + }; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + ply + setuptools + euclid3 + + prettytable + ]; + + pythonRelaxDeps = [ + # SolidPython has PrettyTable pinned to a hyper-specific version due to + # some ancient bug with Poetry. They aren't interested in unpinning because + # SolidPython v1 seems to be deprecated in favor of v2: + # https://github.com/SolidCode/SolidPython/issues/207 + "PrettyTable" + ]; + + pythonRemoveDeps = [ + # The pypng dependency is only used in an example script. + "pypng" + ]; + + pythonImportsCheck = [ + "solid" + ]; + + meta = with lib; { + description = "Python interface to the OpenSCAD declarative geometry language"; + homepage = "https://github.com/SolidCode/SolidPython"; + changelog = "https://github.com/SolidCode/SolidPython/releases/tag/v${version}"; + maintainers = with maintainers; [ jfly ]; + license = licenses.lgpl21Plus; + }; +} diff --git a/pkgs/by-name/lc/lcab/package.nix b/pkgs/by-name/lc/lcab/package.nix new file mode 100644 index 0000000000000..54f6159ab15db --- /dev/null +++ b/pkgs/by-name/lc/lcab/package.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lcab"; + version = "1.0b12"; + + src = fetchurl { + # Original site is no longer available + url = "http://deb.debian.org/debian/pool/main/l/lcab/lcab_${finalAttrs.version}.orig.tar.gz"; + hash = "sha256-Bl8sF5O2XyhHHA9xt88SCnBk8o0cRLB8q/SewOl/H8g="; + }; + + patches = [ + # Fix version number + (fetchurl { + url = "https://salsa.debian.org/debian/lcab/-/raw/f72d6db6504123bd124b1a4be21ead8cc1535c9e/debian/patches/20-version.patch"; + hash = "sha256-Yb6E8nQVdicmjcGnxR7HHdsd7D+ThXk02UHiaB+PLvE="; + }) + ]; + + meta = with lib; { + description = "Create cabinet (.cab) archives"; + homepage = "http://ohnopub.net/~ohnobinki/lcab"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ emilytrau ]; + platforms = platforms.unix; + mainProgram = "lcab"; + }; +}) diff --git a/pkgs/by-name/me/mermaid-cli/package.nix b/pkgs/by-name/me/mermaid-cli/package.nix index a42fe9754ff5f..a45930287a506 100644 --- a/pkgs/by-name/me/mermaid-cli/package.nix +++ b/pkgs/by-name/me/mermaid-cli/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { cp -r . "$out/lib/node_modules/@mermaid-js/mermaid-cli" makeWrapper "${nodejs}/bin/node" "$out/bin/mmdc" \ - '' + lib.optionalString (lib.meta.availableOn stdenv.targetPlatform chromium) '' + '' + lib.optionalString (lib.meta.availableOn stdenv.hostPlatform chromium) '' --set PUPPETEER_EXECUTABLE_PATH '${lib.getExe chromium}' \ '' + '' --add-flags "$out/lib/node_modules/@mermaid-js/mermaid-cli/src/cli.js" diff --git a/pkgs/development/tools/build-managers/meson/fix-rpath.patch b/pkgs/by-name/me/meson/001-fix-rpath.patch index 29bec7903ca98..29bec7903ca98 100644 --- a/pkgs/development/tools/build-managers/meson/fix-rpath.patch +++ b/pkgs/by-name/me/meson/001-fix-rpath.patch diff --git a/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch b/pkgs/by-name/me/meson/002-clear-old-rpath.patch index f1e3c76e8b53b..f1e3c76e8b53b 100644 --- a/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch +++ b/pkgs/by-name/me/meson/002-clear-old-rpath.patch diff --git a/pkgs/development/tools/build-managers/meson/more-env-vars.patch b/pkgs/by-name/me/meson/003-more-env-vars.patch index e4ad43550423d..e4ad43550423d 100644 --- a/pkgs/development/tools/build-managers/meson/more-env-vars.patch +++ b/pkgs/by-name/me/meson/003-more-env-vars.patch diff --git a/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch b/pkgs/by-name/me/meson/004-gir-fallback-path.patch index e6d7402652778..e6d7402652778 100644 --- a/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch +++ b/pkgs/by-name/me/meson/004-gir-fallback-path.patch diff --git a/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch b/pkgs/by-name/me/meson/005-boost-Do-not-add-system-paths-on-nix.patch index 0a2eda9de9ac6..0a2eda9de9ac6 100644 --- a/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch +++ b/pkgs/by-name/me/meson/005-boost-Do-not-add-system-paths-on-nix.patch diff --git a/pkgs/development/tools/build-managers/meson/disable-bitcode.patch b/pkgs/by-name/me/meson/006-disable-bitcode.patch index a72997c104399..a72997c104399 100644 --- a/pkgs/development/tools/build-managers/meson/disable-bitcode.patch +++ b/pkgs/by-name/me/meson/006-disable-bitcode.patch diff --git a/pkgs/development/tools/build-managers/meson/emulator-hook.sh b/pkgs/by-name/me/meson/emulator-hook.sh index 4f08087cf5f55..4f08087cf5f55 100644 --- a/pkgs/development/tools/build-managers/meson/emulator-hook.sh +++ b/pkgs/by-name/me/meson/emulator-hook.sh diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/by-name/me/meson/package.nix index 8758afea8211e..6239927848aa5 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -3,50 +3,38 @@ , fetchFromGitHub , fetchpatch , installShellFiles +, coreutils +, darwin +, libxcrypt , ninja , pkg-config , python3 -, zlib -, coreutils , substituteAll -, Foundation -, OpenGL -, AppKit -, Cocoa -, libxcrypt +, zlib }: +let + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation OpenGL; +in python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "1.2.1"; + version = "1.2.3"; src = fetchFromGitHub { owner = "mesonbuild"; repo = "meson"; rev = "refs/tags/${version}"; - hash = "sha256-x2VN/6Kg/n6BW5S4nLKfG67dYrSR/G+Aowf6d2Vbc+0="; + hash = "sha256-dgYYz3tQDG6Z4eE77WO2dXdardxVzzGaFLQ5znPcTlw="; }; patches = [ - # Meson is currently inspecting fewer variables than autoconf does, which - # makes it harder for us to use setup hooks, etc. Taken from - # https://github.com/mesonbuild/meson/pull/6827 - ./more-env-vars.patch - - # Unlike libtool, vanilla Meson does not pass any information - # about the path library will be installed to to g-ir-scanner, - # breaking the GIR when path other than ${!outputLib}/lib is used. - # We patch Meson to add a --fallback-library-path argument with - # library install_dir to g-ir-scanner. - ./gir-fallback-path.patch - - # In common distributions, RPATH is only needed for internal libraries so + # In typical distributions, RPATH is only needed for internal libraries so # meson removes everything else. With Nix, the locations of libraries # are not as predictable, therefore we need to keep them in the RPATH. # At the moment we are keeping the paths starting with /nix/store. # https://github.com/NixOS/nixpkgs/issues/31222#issuecomment-365811634 (substituteAll { - src = ./fix-rpath.patch; + src = ./001-fix-rpath.patch; inherit (builtins) storeDir; }) @@ -56,50 +44,89 @@ python3.pkgs.buildPythonApplication rec { # But this can cause much bigger problem for Nix as it can produce # cut-in-half-by-\0 store path references. # Let’s just clear the whole rpath and hope for the best. - ./clear-old-rpath.patch + ./002-clear-old-rpath.patch + + # Meson is currently inspecting fewer variables than autoconf does, which + # makes it harder for us to use setup hooks, etc. + # https://github.com/mesonbuild/meson/pull/6827 + ./003-more-env-vars.patch + + # Unlike libtool, vanilla Meson does not pass any information about the path + # library will be installed to to g-ir-scanner, breaking the GIR when path + # other than ${!outputLib}/lib is used. + # We patch Meson to add a --fallback-library-path argument with library + # install_dir to g-ir-scanner. + ./004-gir-fallback-path.patch # Patch out default boost search paths to avoid impure builds on # unsandboxed non-NixOS builds, see: # https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774 - ./boost-Do-not-add-system-paths-on-nix.patch + ./005-boost-Do-not-add-system-paths-on-nix.patch # Nixpkgs cctools does not have bitcode support. - ./disable-bitcode.patch + ./006-disable-bitcode.patch # Fix passing multiple --define-variable arguments to pkg-config. # https://github.com/mesonbuild/meson/pull/10670 (fetchpatch { url = "https://github.com/mesonbuild/meson/commit/d5252c5d4cf1c1931fef0c1c98dd66c000891d21.patch"; - sha256 = "GiUNVul1N5Fl8mfqM7vA/r1FdKqImiDYLXMVDt77gvw="; + hash = "sha256-GiUNVul1N5Fl8mfqM7vA/r1FdKqImiDYLXMVDt77gvw="; excludes = [ "docs/yaml/objects/dep.yaml" ]; }) ]; - setupHook = ./setup-hook.sh; + buildInputs = lib.optionals (python3.pythonOlder "3.9") [ + libxcrypt + ]; - nativeCheckInputs = [ ninja pkg-config ]; - checkInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ Foundation OpenGL AppKit Cocoa ]; - checkPhase = '' - runHook preCheck + nativeBuildInputs = [ installShellFiles ]; - patchShebangs 'test cases' - substituteInPlace 'test cases/native/8 external program shebang parsing/script.int.in' \ - --replace /usr/bin/env ${coreutils}/bin/env + nativeCheckInputs = [ + ninja + pkg-config + ]; + + checkInputs = [ + zlib + ] + ++ lib.optionals stdenv.isDarwin [ + AppKit + Cocoa + Foundation + OpenGL + ]; + + checkPhase = lib.concatStringsSep "\n" ([ + "runHook preCheck" + '' + patchShebangs 'test cases' + substituteInPlace \ + 'test cases/native/8 external program shebang parsing/script.int.in' \ + --replace /usr/bin/env ${coreutils}/bin/env + '' + ] + # Remove problematic tests + ++ (builtins.map (f: ''rm -vr "${f}";'') [ # requires git, creating cyclic dependency - rm -r 'test cases/common/66 vcstag' + ''test cases/common/66 vcstag'' # requires glib, creating cyclic dependency - rm -r 'test cases/linuxlike/6 subdir include order' - rm -r 'test cases/linuxlike/9 compiler checks with dependencies' + ''test cases/linuxlike/6 subdir include order'' + ''test cases/linuxlike/9 compiler checks with dependencies'' # requires static zlib, see #66461 - rm -r 'test cases/linuxlike/14 static dynamic linkage' + ''test cases/linuxlike/14 static dynamic linkage'' # Nixpkgs cctools does not have bitcode support. - rm -r 'test cases/osx/7 bitcode' - HOME="$TMPDIR" python ./run_project_tests.py + ''test cases/osx/7 bitcode'' + ]) + ++ [ + ''HOME="$TMPDIR" python ./run_project_tests.py'' + "runHook postCheck" + ]); - runHook postCheck + postInstall = '' + installShellCompletion --zsh data/shell-completions/zsh/_meson + installShellCompletion --bash data/shell-completions/bash/meson ''; postFixup = '' @@ -117,18 +144,9 @@ python3.pkgs.buildPythonApplication rec { --replace "python3 -c " "${python3.interpreter} -c " ''; - buildInputs = lib.optionals (python3.pythonOlder "3.9") [ - libxcrypt - ]; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - installShellCompletion --zsh data/shell-completions/zsh/_meson - installShellCompletion --bash data/shell-completions/bash/meson - ''; + setupHook = ./setup-hook.sh; - meta = with lib; { + meta = { homepage = "https://mesonbuild.com"; description = "An open source, fast and friendly build system made in Python"; longDescription = '' @@ -140,8 +158,8 @@ python3.pkgs.buildPythonApplication rec { second spent waiting for the build system to actually start compiling code. ''; - license = licenses.asl20; - maintainers = with maintainers; [ mbe AndersonTorres ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (python3.meta) platforms; }; } diff --git a/pkgs/by-name/me/meson/setup-hook.sh b/pkgs/by-name/me/meson/setup-hook.sh new file mode 100644 index 0000000000000..85849fbec734a --- /dev/null +++ b/pkgs/by-name/me/meson/setup-hook.sh @@ -0,0 +1,87 @@ +# shellcheck shell=bash disable=SC2206 + +mesonConfigurePhase() { + runHook preConfigure + + local flagsArray=() + + if [ -z "${dontAddPrefix-}" ]; then + flagsArray+=("--prefix=$prefix") + fi + + # See multiple-outputs.sh and meson’s coredata.py + flagsArray+=( + "--libdir=${!outputLib}/lib" + "--libexecdir=${!outputLib}/libexec" + "--bindir=${!outputBin}/bin" + "--sbindir=${!outputBin}/sbin" + "--includedir=${!outputInclude}/include" + "--mandir=${!outputMan}/share/man" + "--infodir=${!outputInfo}/share/info" + "--localedir=${!outputLib}/share/locale" + "-Dauto_features=${mesonAutoFeatures:-enabled}" + "-Dwrap_mode=${mesonWrapMode:-nodownload}" + ${crossMesonFlags} + "--buildtype=${mesonBuildType:-plain}" + ) + + flagsArray+=( + $mesonFlags + "${mesonFlagsArray[@]}" + ) + + echoCmd 'mesonConfigurePhase flags' "${flagsArray[@]}" + + meson setup build "${flagsArray[@]}" + cd build || { echoCmd 'mesonConfigurePhase' "could not cd to build"; exit 1; } + + if ! [[ -v enableParallelBuilding ]]; then + enableParallelBuilding=1 + echoCmd 'mesonConfigurePhase' "enabled parallel building" + fi + + if [[ ${checkPhase-ninjaCheckPhase} = ninjaCheckPhase && -z $dontUseMesonCheck ]]; then + checkPhase=mesonCheckPhase + fi + if [[ ${installPhase-ninjaInstallPhase} = ninjaInstallPhase && -z $dontUseMesonInstall ]]; then + installPhase=mesonInstallPhase + fi + + runHook postConfigure +} + +mesonCheckPhase() { + runHook preCheck + + local flagsArray=($mesonCheckFlags "${mesonCheckFlagsArray[@]}") + + echoCmd 'mesonCheckPhase flags' "${flagsArray[@]}" + meson test --no-rebuild "${flagsArray[@]}" + + runHook postCheck +} + +mesonInstallPhase() { + runHook preInstall + + local flagsArray=() + + if [[ -n "$mesonInstallTags" ]]; then + flagsArray+=("--tags" "${mesonInstallTags// /,}") + fi + flagsArray+=( + $mesonInstallFlags + "${mesonInstallFlagsArray[@]}" + ) + + echoCmd 'mesonInstallPhase flags' "${flagsArray[@]}" + meson install --no-rebuild "${flagsArray[@]}" + + runHook postInstall +} + +if [ -z "${dontUseMesonConfigure-}" ] && [ -z "${configurePhase-}" ]; then + # shellcheck disable=SC2034 + setOutputFlags= + configurePhase=mesonConfigurePhase +fi diff --git a/pkgs/by-name/ms/msolve/package.nix b/pkgs/by-name/ms/msolve/package.nix new file mode 100644 index 0000000000000..37d746f7c7be5 --- /dev/null +++ b/pkgs/by-name/ms/msolve/package.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, flint +, gmp +, mpfr +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "msolve"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "algebraic-solving"; + repo = "msolve"; + rev = "v${finalAttrs.version}"; + hash = "sha256-mcq98zMWQcmlTZt9eIJJg+IW5UBMcKR+8TzuabpOBwE="; + }; + + postPatch = '' + patchShebangs . + ''; + + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + flint + gmp + mpfr + ]; + + doCheck = true; + + meta = with lib; { + description = "Library for polynomial system solving through algebraic methods"; + homepage = "https://msolve.lip6.fr"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/by-name/ni/nickel/Cargo.lock b/pkgs/by-name/ni/nickel/Cargo.lock index 134dec047f28f..6890e1bf90f89 100644 --- a/pkgs/by-name/ni/nickel/Cargo.lock +++ b/pkgs/by-name/ni/nickel/Cargo.lock @@ -19,21 +19,22 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if", - "getrandom 0.2.10", + "getrandom", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -55,9 +56,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -69,15 +70,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -93,9 +94,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -189,9 +190,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "beef" @@ -231,19 +232,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - -[[package]] -name = "block-buffer" -version = "0.9.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "block-padding", - "generic-array", -] +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "block-buffer" @@ -255,16 +246,10 @@ dependencies = [ ] [[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - -[[package]] name = "bstr" -version = "1.6.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" dependencies = [ "memchr", "regex-automata", @@ -273,9 +258,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" @@ -345,9 +330,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.3" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" dependencies = [ "clap_builder", "clap_derive", @@ -355,36 +340,36 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" dependencies = [ "anstream", "anstyle", - "clap_lex 0.5.1", + "clap_lex 0.6.0", "strsim", "terminal_size", ] [[package]] name = "clap_complete" -version = "4.4.1" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4110a1e6af615a9e6d0a36f805d5c99099f8bab9b8042f5bc1fa220a4a89e36f" +checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae" dependencies = [ - "clap 4.4.3", + "clap 4.4.7", ] [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -398,9 +383,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clipboard-win" @@ -455,7 +440,7 @@ version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c5a805f31fb098b1611170028501077ceb8c9e78f5345530f4fdefae9b61119" dependencies = [ - "clap 4.4.3", + "clap 4.4.7", "entities", "memchr", "once_cell", @@ -506,9 +491,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -668,9 +653,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ "csv-core", "itoa", @@ -680,14 +665,58 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] [[package]] +name = "cxx" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7129e341034ecb940c9072817cd9007974ea696844fc4dd582dc1653a7fbe2e8" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a24f3f5f8eed71936f21e570436f024f5c2e25628f7496aa7ccd03b90109d5" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2 1.0.69", + "quote 1.0.33", + "scratch", + "syn 2.0.38", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06fdd177fc61050d63f67f5bd6351fac6ab5526694ea8e359cd9cd3b75857f44" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "587663dd5fb3d10932c8aecfe7c844db1bcf0aee93eeab08fac13dc1212c2e7f" +dependencies = [ + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", +] + +[[package]] name = "debugid" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -698,9 +727,12 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] [[package]] name = "derive_more" @@ -709,7 +741,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "rustc_version", "syn 1.0.109", @@ -717,9 +749,18 @@ dependencies = [ [[package]] name = "deunicode" -version = "0.4.4" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71dbf1bf89c23e9cd1baf5e654f622872655f195b36588dc9dc38f7eda30758c" +dependencies = [ + "deunicode 1.4.1", +] + +[[package]] +name = "deunicode" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95203a6a50906215a502507c0f879a0ce7ff205a6111e2db2a5ef8e4bb92e43" +checksum = "6a1abaf4d861455be59f64fd2b55606cb151fce304ede7165f410243ce96bde6" [[package]] name = "diff" @@ -735,20 +776,11 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.4", + "block-buffer", "crypto-common", ] @@ -812,7 +844,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af36f591236d9d822425cb6896595658fa558fcebf5ee8accac1d4b92c47166e" dependencies = [ "base64 0.13.1", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] @@ -865,26 +897,15 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", "windows-sys 0.48.0", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] name = "error-code" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -906,9 +927,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fd-lock" @@ -917,7 +938,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" dependencies = [ "cfg-if", - "rustix 0.38.13", + "rustix", "windows-sys 0.48.0", ] @@ -941,9 +962,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -966,9 +987,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -981,9 +1002,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -991,15 +1012,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -1008,38 +1029,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -1065,24 +1086,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -1108,7 +1118,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe69f1cbdb6e28af2bac214e943b99ce8a0a06b447d15d3e61161b0423139f3f" dependencies = [ "proc-macro-hack", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] @@ -1133,9 +1143,18 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" [[package]] name = "heck" @@ -1154,9 +1173,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "humantime" @@ -1187,12 +1206,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.2", ] [[package]] @@ -1203,18 +1222,18 @@ checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] name = "indoc" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] name = "inferno" -version = "0.11.16" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73c0fefcb6d409a6587c07515951495d482006f89a21daa0f2f783aa4fd5e027" +checksum = "c50453ec3a6555fad17b1cd1a80d16af5bc7cb35094f64e429fd46549018c6a3" dependencies = [ "ahash", - "indexmap 2.0.0", + "indexmap 2.0.2", "is-terminal", "itoa", "log", @@ -1227,9 +1246,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.31.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0770b0a3d4c70567f0d58331f3088b0e4c4f56c9b8d764efe654b4a5d46de3a" +checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" dependencies = [ "console", "lazy_static", @@ -1240,38 +1259,18 @@ dependencies = [ ] [[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.2", - "libc", - "windows-sys 0.48.0", -] - -[[package]] name = "is-terminal" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.2", - "rustix 0.38.13", + "hermit-abi 0.3.3", + "rustix", "windows-sys 0.48.0", ] [[package]] name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" @@ -1304,15 +1303,6 @@ dependencies = [ ] [[package]] -name = "keccak" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" -dependencies = [ - "cpufeatures", -] - -[[package]] name = "lalrpop" version = "0.19.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1351,9 +1341,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.148" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "line-wrap" @@ -1365,28 +1355,31 @@ dependencies = [ ] [[package]] -name = "linked-hash-map" -version = "0.5.6" +name = "link-cplusplus" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9" +dependencies = [ + "cc", +] [[package]] -name = "linux-raw-sys" -version = "0.3.8" +name = "linked-hash-map" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1415,7 +1408,7 @@ checksum = "a1d849148dbaf9661a6151d1ca82b13bb4c4c128146a88d05253b38d4e2f496c" dependencies = [ "beef", "fnv", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "regex-syntax 0.6.29", "syn 1.0.109", @@ -1465,10 +1458,19 @@ dependencies = [ ] [[package]] +name = "mach2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" +dependencies = [ + "libc", +] + +[[package]] name = "malachite" -version = "0.3.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6cf7f4730c30071ba374fac86ad35b1cb7a0716f774737768667ea3fa1828e3" +checksum = "220cb36c52aa6eff45559df497abe0e2a4c1209f92279a746a399f622d7b95c7" dependencies = [ "malachite-base", "malachite-nz", @@ -1477,36 +1479,33 @@ dependencies = [ [[package]] name = "malachite-base" -version = "0.3.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b06bfa98a4b4802af5a4263b4ad4660e28e51e8490f6354eb9336c70767e1c5" +checksum = "6538136c5daf04126d6be4899f7fe4879b7f8de896dd1b4210fe6de5b94f2555" dependencies = [ - "itertools 0.9.0", - "rand", - "rand_chacha", + "itertools 0.11.0", "ryu", - "sha3", ] [[package]] name = "malachite-nz" -version = "0.3.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89e21c64b7af5be3dc8cef16f786243faf59459fe4ba93b44efdeb264e5ade4" +checksum = "5f0b05577b7a3f09433106460b10304f97fc572f0baabf6640e6cb1e23f5fc52" dependencies = [ "embed-doc-image", - "itertools 0.9.0", + "itertools 0.11.0", "malachite-base", "serde", ] [[package]] name = "malachite-q" -version = "0.3.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3755e541d5134b5016594c9043094172c4dda9259b3ce824a7b8101941850360" +checksum = "a1cfdb4016292e6acd832eaee261175f3af8bbee62afeefe4420ebce4c440cb5" dependencies = [ - "itertools 0.9.0", + "itertools 0.11.0", "malachite-base", "malachite-nz", "serde", @@ -1514,18 +1513,19 @@ dependencies = [ [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ - "digest 0.10.7", + "cfg-if", + "digest", ] [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memmap2" @@ -1555,6 +1555,47 @@ dependencies = [ ] [[package]] +name = "metrics" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fde3af1a009ed76a778cb84fdef9e7dbbdf5775ae3e4cc1f434a6a307f6f76c5" +dependencies = [ + "ahash", + "metrics-macros", + "portable-atomic", +] + +[[package]] +name = "metrics-macros" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" +dependencies = [ + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", +] + +[[package]] +name = "metrics-util" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4de2ed6e491ed114b40b732e4d1659a9d53992ebd87490c44a6ffe23739d973e" +dependencies = [ + "aho-corasick", + "crossbeam-epoch", + "crossbeam-utils", + "hashbrown 0.13.1", + "indexmap 1.9.3", + "metrics", + "num_cpus", + "ordered-float", + "quanta", + "radix_trie", + "sketches-ddsketch", +] + +[[package]] name = "minimad" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1574,13 +1615,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] @@ -1601,13 +1642,15 @@ dependencies = [ [[package]] name = "nickel-lang-cli" -version = "1.2.2" +version = "1.3.0" dependencies = [ - "clap 4.4.3", + "clap 4.4.7", "clap_complete", "directories", "git-version", "insta", + "metrics", + "metrics-util", "nickel-lang-core", "nickel-lang-utils", "serde", @@ -1617,17 +1660,19 @@ dependencies = [ [[package]] name = "nickel-lang-core" -version = "0.2.0" +version = "0.3.0" dependencies = [ "ansi_term", "assert_matches", - "clap 4.4.3", + "clap 4.4.7", "codespan", "codespan-reporting", "comrak", "criterion", + "cxx", + "cxx-build", "indexmap 1.9.3", - "indoc 2.0.3", + "indoc 2.0.4", "js-sys", "lalrpop", "lalrpop-util", @@ -1635,8 +1680,10 @@ dependencies = [ "malachite", "malachite-q", "md-5", + "metrics", "nickel-lang-utils", "once_cell", + "pkg-config", "pprof", "pretty", "pretty_assertions", @@ -1653,10 +1700,12 @@ dependencies = [ "similar", "simple-counter", "strip-ansi-escapes", + "strsim", "termimad", "test-generator", "toml", "topiary", + "topiary-queries", "tree-sitter-nickel 0.1.0", "typed-arena", "unicode-segmentation", @@ -1666,18 +1715,20 @@ dependencies = [ [[package]] name = "nickel-lang-lsp" -version = "1.2.2" +version = "1.3.0" dependencies = [ "anyhow", "assert_cmd", "assert_matches", - "clap 4.4.3", + "clap 4.4.7", "codespan", "codespan-lsp", "codespan-reporting", + "criterion", "csv", "derive_more", "env_logger", + "glob", "insta", "lalrpop", "lalrpop-util", @@ -1709,7 +1760,7 @@ dependencies = [ [[package]] name = "nickel-wasm-repl" -version = "0.1.0" +version = "0.3.0" dependencies = [ "nickel-lang-core", ] @@ -1737,9 +1788,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -1750,7 +1801,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi 0.3.3", "libc", ] @@ -1798,16 +1849,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] -name = "opaque-debug" -version = "0.3.0" +name = "ordered-float" +version = "3.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" +dependencies = [ + "num-traits", +] [[package]] name = "os_str_bytes" -version = "6.5.1" +version = "6.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" [[package]] name = "pad" @@ -1830,13 +1884,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", "windows-targets 0.48.5", ] @@ -1854,7 +1908,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.0", + "indexmap 2.0.2", ] [[package]] @@ -1886,14 +1940,14 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plist" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" +checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "indexmap 1.9.3", "line-wrap", - "quick-xml 0.29.0", + "quick-xml 0.30.0", "serde", "time", ] @@ -1927,6 +1981,18 @@ dependencies = [ ] [[package]] +name = "portable-atomic" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b559898e0b4931ed2d3b959ab0c2da4d99cc644c4b0b1a35b4d344027f474023" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "pprof" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1949,12 +2015,6 @@ dependencies = [ ] [[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] name = "precomputed-hash" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1962,13 +2022,13 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "predicates" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" +checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" dependencies = [ "anstyle", "difflib", - "itertools 0.10.5", + "itertools 0.11.0", "predicates-core", ] @@ -2037,16 +2097,16 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "pyckel" -version = "1.2.2" +version = "1.3.0" dependencies = [ "codespan-reporting", "nickel-lang-core", @@ -2097,7 +2157,7 @@ version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "pyo3-macros-backend", "quote 1.0.33", "syn 1.0.109", @@ -2109,12 +2169,28 @@ version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] [[package]] +name = "quanta" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab" +dependencies = [ + "crossbeam-utils", + "libc", + "mach2", + "once_cell", + "raw-cpuid", + "wasi", + "web-sys", + "winapi", +] + +[[package]] name = "quick-xml" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2125,9 +2201,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" dependencies = [ "memchr", ] @@ -2147,7 +2223,7 @@ version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", ] [[package]] @@ -2161,51 +2237,19 @@ dependencies = [ ] [[package]] -name = "rand" -version = "0.7.3" +name = "raw-cpuid" +version = "10.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core", + "bitflags 1.3.2", ] [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -2213,14 +2257,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -2234,9 +2276,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] @@ -2247,32 +2289,32 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.10", + "getrandom", "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.9.5" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] @@ -2288,10 +2330,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] name = "rgb" -version = "0.8.36" +version = "0.8.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" dependencies = [ "bytemuck", ] @@ -2313,28 +2361,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.13" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.7", + "linux-raw-sys", "windows-sys 0.48.0", ] @@ -2373,7 +2407,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8218eaf5d960e3c478a1b0f129fa888dd3d8d22eb3de097e9af14c1ab4438024" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] @@ -2406,16 +2440,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] +name = "scratch" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152" + +[[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" dependencies = [ "serde_derive", ] @@ -2433,13 +2473,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -2459,27 +2499,27 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] [[package]] name = "serde_yaml" -version = "0.9.25" +version = "0.9.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "itoa", "ryu", "serde", @@ -2494,30 +2534,18 @@ checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha3" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "keccak", - "opaque-debug", + "digest", ] [[package]] @@ -2558,9 +2586,9 @@ dependencies = [ [[package]] name = "similar" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" +checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" [[package]] name = "simple-counter" @@ -2575,6 +2603,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] +name = "sketches-ddsketch" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a406c1882ed7f29cd5e248c9848a80e7cb6ae0fea82346d2746f2f941c07e1" + +[[package]] name = "slab" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2589,14 +2623,14 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3bc762e6a4b6c6fcaade73e77f9ebc6991b676f88bb2358bddb56560f073373" dependencies = [ - "deunicode", + "deunicode 0.4.5", ] [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "stable_deref_trait" @@ -2684,18 +2718,18 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.33" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "unicode-ident", ] @@ -2724,20 +2758,20 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", - "rustix 0.38.13", + "redox_syscall 0.4.1", + "rustix", "windows-sys 0.48.0", ] @@ -2754,9 +2788,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] @@ -2777,11 +2811,11 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.37.23", + "rustix", "windows-sys 0.48.0", ] @@ -2811,32 +2845,33 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] name = "time" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -2844,15 +2879,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -2893,9 +2928,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "pin-project-lite", @@ -2908,9 +2943,9 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -2927,9 +2962,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -2940,7 +2975,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "serde", "serde_spanned", "toml_datetime", @@ -2950,9 +2985,9 @@ dependencies = [ [[package]] name = "topiary" version = "0.2.3" -source = "git+https://github.com/tweag/topiary.git?rev=refs/heads/main#7e6cb4f8b505eacee57aaf3c1ab0f3cf539da159" +source = "git+https://github.com/tweag/topiary.git?rev=8299a04bf83c4a2774cbbff7a036c022efa939b3#8299a04bf83c4a2774cbbff7a036c022efa939b3" dependencies = [ - "clap 4.4.3", + "clap 4.4.7", "futures", "itertools 0.11.0", "log", @@ -2977,6 +3012,11 @@ dependencies = [ ] [[package]] +name = "topiary-queries" +version = "0.2.3" +source = "git+https://github.com/tweag/topiary.git?rev=8299a04bf83c4a2774cbbff7a036c022efa939b3#8299a04bf83c4a2774cbbff7a036c022efa939b3" + +[[package]] name = "tree-sitter" version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2988,8 +3028,8 @@ dependencies = [ [[package]] name = "tree-sitter-bash" -version = "0.20.3" -source = "git+https://github.com/tree-sitter/tree-sitter-bash#bdcd56c5a3896f7bbb7684e223c43d9f24380351" +version = "0.20.4" +source = "git+https://github.com/tree-sitter/tree-sitter-bash#7331995b19b8f8aba2d5e26deb51d2195c18bc94" dependencies = [ "cc", "tree-sitter", @@ -2998,7 +3038,7 @@ dependencies = [ [[package]] name = "tree-sitter-facade" version = "0.9.3" -source = "git+https://github.com/tweag/tree-sitter-facade#1b290e795e700a57d8bd303f98a9715ab1c4f598" +source = "git+https://github.com/tweag/tree-sitter-facade.git#1b290e795e700a57d8bd303f98a9715ab1c4f598" dependencies = [ "js-sys", "tree-sitter", @@ -3009,9 +3049,8 @@ dependencies = [ [[package]] name = "tree-sitter-json" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90b04c4e1a92139535eb9fca4ec8fa9666cc96b618005d3ae35f3c957fa92f92" +version = "0.20.1" +source = "git+https://github.com/tree-sitter/tree-sitter-json.git#3fef30de8aee74600f25ec2e319b62a1a870d51e" dependencies = [ "cc", "tree-sitter", @@ -3039,8 +3078,7 @@ dependencies = [ [[package]] name = "tree-sitter-ocaml" version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1163abc658cf8ae0ecffbd8f4bd3ee00a2b98729de74f3b08f0e24f3ac208a" +source = "git+https://github.com/tree-sitter/tree-sitter-ocaml.git#694c57718fd85d514f8b81176038e7a4cfabcaaf" dependencies = [ "cc", "tree-sitter", @@ -3049,8 +3087,7 @@ dependencies = [ [[package]] name = "tree-sitter-ocamllex" version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e774222086fd065999b6605fb231fbfc386bf782aa7dbad52503ff00b429a62" +source = "git+https://github.com/314eter/tree-sitter-ocamllex.git#4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2" dependencies = [ "cc", "tree-sitter", @@ -3068,8 +3105,7 @@ dependencies = [ [[package]] name = "tree-sitter-rust" version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0832309b0b2b6d33760ce5c0e818cb47e1d72b468516bfe4134408926fa7594" +source = "git+https://github.com/tree-sitter/tree-sitter-rust.git#48e053397b587de97790b055a1097b7c8a4ef846" dependencies = [ "cc", "tree-sitter", @@ -3077,9 +3113,8 @@ dependencies = [ [[package]] name = "tree-sitter-toml" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca517f578a98b23d20780247cc2688407fa81effad5b627a5a364ec3339b53e8" +version = "0.5.1" +source = "git+https://github.com/tree-sitter/tree-sitter-toml.git#342d9be207c2dba869b9967124c679b5e6fd0ebe" dependencies = [ "cc", "tree-sitter", @@ -3093,9 +3128,9 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unescape" @@ -3132,9 +3167,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -3186,9 +3221,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" [[package]] name = "version_check" @@ -3218,7 +3253,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", ] @@ -3243,12 +3278,6 @@ dependencies = [ [[package]] name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" @@ -3274,7 +3303,7 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", "wasm-bindgen-shared", @@ -3308,7 +3337,7 @@ version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", "wasm-bindgen-backend", @@ -3360,9 +3389,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -3507,9 +3536,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" dependencies = [ "memchr", ] @@ -3534,3 +3563,23 @@ name = "yansi" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] +name = "zerocopy" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ede7d7c7970ca2215b8c1ccf4d4f354c4733201dfaaba72d44ae5b37472e4901" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b27b1bb92570f989aac0ab7e9cbfbacdd65973f7ee920d9f0e71ebac878fd0b" +dependencies = [ + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", +] diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index 5e26c96a5017b..e509f735995d2 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -7,24 +7,30 @@ rustPlatform.buildRustPackage rec { pname = "nickel"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "tweag"; repo = "nickel"; rev = "refs/tags/${version}"; - hash = "sha256-g7pRTwa2sniIOmgdYCxfYxGRtxnQP8zaVWuPjzEZTSg="; + hash = "sha256-MBonps3yFEpw9l3EAJ6BXNNjY2fUGzWCP+7h0M8LEAY="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "topiary-0.2.3" = "sha256-DcmrQ8IuvUBDCBKKSt13k8rU8DJZWFC8MvxWB7dwiQM="; - "tree-sitter-bash-0.20.3" = "sha256-zkhCk19kd/KiqYTamFxui7KDE9d+P9pLjc1KVTvYPhI="; + "topiary-0.2.3" = "sha256-EgDFjJeGJb36je/be7DXvzvpBYDUaupOiQxtL7bN/+Q="; + "tree-sitter-bash-0.20.4" = "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM="; "tree-sitter-facade-0.9.3" = "sha256-M/npshnHJkU70pP3I4WMXp3onlCSWM5mMIqXP45zcUs="; "tree-sitter-nickel-0.0.1" = "sha256-aYsEx1Y5oDEqSPCUbf1G3J5Y45ULT9OkD+fn6stzrOU="; "tree-sitter-query-0.1.0" = "sha256-5N7FT0HTK3xzzhAlk3wBOB9xlEpKSNIfakgFnsxEi18="; + "tree-sitter-json-0.20.1" = "sha256-Msnct7JzPBIR9+PIBZCJTRdVMUzhaDTKkl3JaDUKAgo="; + "tree-sitter-ocaml-0.20.4" = "sha256-j3Hv2qOMxeBNOW+WIgIYzG3zMIFWPQpoHe94b2rT+A8="; + "tree-sitter-ocamllex-0.20.2" = "sha256-YhmEE7I7UF83qMuldHqc/fD/no/7YuZd6CaAIaZ1now="; + "tree-sitter-toml-0.5.1" = "sha256-5nLNBxFeOGE+gzbwpcrTVnuL1jLUA0ZLBVw2QrOLsDQ="; + "tree-sitter-rust-0.20.4" = "sha256-ht0l1a3esvBbVHNbUosItmqxwL7mDp+QyhIU6XTUiEk="; "web-tree-sitter-sys-1.3.0" = "sha256-9rKB0rt0y9TD/HLRoB9LjEP9nO4kSWR9ylbbOXo2+2M="; + }; }; diff --git a/pkgs/by-name/no/nofi/package.nix b/pkgs/by-name/no/nofi/package.nix new file mode 100644 index 0000000000000..d1b39b7896000 --- /dev/null +++ b/pkgs/by-name/no/nofi/package.nix @@ -0,0 +1,27 @@ +{ lib, rustPlatform, fetchFromGitHub, dbus, pkg-config}: + +rustPlatform.buildRustPackage rec { + pname = "nofi"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "ellsclytn"; + repo = pname; + rev = "v${version}"; + hash = "sha256-hQYIcyNCxb8qVpseNsmjyPxlwbMxDpXeZ+H1vpv62rQ="; + }; + + cargoHash = "sha256-0TYIycuy2LIhixVvH++U8CbmfQugc+0TF8DTiViWSbE="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dbus ]; + + meta = with lib; { + description = "An interruption-free notification system for Linux"; + homepage = "https://github.com/ellsclytn/nofi/"; + changelog = "https://github.com/ellsclytn/nofi/raw/v${version}/CHANGELOG.md"; + license = [ licenses.asl20 /* or */ licenses.mit ]; + mainProgram = pname; + maintainers = [ maintainers.magnetophon ]; + }; +} diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix new file mode 100644 index 0000000000000..fde0f3378c397 --- /dev/null +++ b/pkgs/by-name/no/nom/package.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: +buildGoModule rec { + pname = "nom"; + version = "2.0.5"; + + src = fetchFromGitHub { + owner = "guyfedwards"; + repo = "nom"; + rev = "v${version}"; + hash = "sha256-mYE8cu7qHRyG/pZSr4u6tMEF3ZM5Qz+CX+oLf/chwl4="; + }; + + vendorHash = "sha256-fP6yxfIQoVaBC9hYcrCyo3YP3ntEVDbDTwKMO9TdyDI="; + + meta = with lib; { + homepage = "https://github.com/guyfedwards/nom"; + description = "RSS reader for the terminal"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.gpl3Only; + maintainers = with maintainers; [ nadir-ishiguro ]; + mainProgram = "nom"; + }; +} diff --git a/pkgs/by-name/op/openrussian-cli/package.nix b/pkgs/by-name/op/openrussian-cli/package.nix new file mode 100644 index 0000000000000..e196507f67e34 --- /dev/null +++ b/pkgs/by-name/op/openrussian-cli/package.nix @@ -0,0 +1,86 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, pkg-config +, wget +, unzip +, mawk +, sqlite +, which +, lua5_3 +, installShellFiles +, makeWrapper +}: +let + luaEnv = lua5_3.withPackages (p: with p; [ luasql-sqlite3 luautf8 ]); +in +stdenv.mkDerivation rec { + pname = "openrussian-cli"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "rhaberkorn"; + repo = "openrussian-cli"; + rev = version; + hash = "sha256-lu13Dd3D4P/7Yol1ixt86BHk86y8DMsbFzfi244+KuY="; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/rhaberkorn/openrussian-cli/commit/984e555acbadbd1aed7df17ab53e2c586a2f8f68.patch"; + hash = "sha256-/z4YrEeuejtCtwiFXksFREwgQoWvtI0Kl9w75KDQfF8="; + }) + # Work around https://github.com/dumblob/mysql2sqlite/issues/75 + ./use-mawk.patch + ]; + + nativeBuildInputs = [ + pkg-config + wget + unzip + sqlite + which + installShellFiles + makeWrapper + mawk + ]; + + buildInputs = [ luaEnv ]; + + makeFlags = [ + "LUA=${luaEnv}/bin/lua" + "LUAC=${luaEnv}/bin/luac" + ]; + + dontConfigure = true; + + # Can't use "make install" here + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/openrussian + cp openrussian-sqlite3.db $out/share/openrussian + cp openrussian $out/bin + + wrapProgram $out/bin/openrussian \ + --prefix LUA_PATH ';' '${lua5_3.pkgs.luaLib.genLuaPathAbsStr luaEnv}' \ + --prefix LUA_CPATH ';' '${lua5_3.pkgs.luaLib.genLuaCPathAbsStr luaEnv}' + + runHook postInstall + ''; + + postInstall = '' + installShellCompletion --cmd openrussian --bash ./openrussian-completion.bash + installManPage ./openrussian.1 + ''; + + meta = with lib; { + description = "Offline Console Russian Dictionary (based on openrussian.org)"; + homepage = "https://github.com/rhaberkorn/openrussian-cli"; + license = with licenses; [ gpl3Only mit cc-by-sa-40 ]; + maintainers = with maintainers; [ zane ]; + mainProgram = "openrussian"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/op/openrussian-cli/use-mawk.patch b/pkgs/by-name/op/openrussian-cli/use-mawk.patch new file mode 100644 index 0000000000000..d0cfa814bae3c --- /dev/null +++ b/pkgs/by-name/op/openrussian-cli/use-mawk.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 8fe3880..281ce2d 100644 +--- a/Makefile ++++ b/Makefile +@@ -25,7 +25,7 @@ openrussian-sql.zip: + + openrussian-sqlite3.db : openrussian-sql.zip mysql2sqlite postprocess.sql + $(RM) $@ +- unzip -p $< openrussian.sql | awk -f ./mysql2sqlite - | sqlite3 $@ ++ unzip -p $< openrussian.sql | mawk -f ./mysql2sqlite - | sqlite3 $@ + sqlite3 $@ -batch <postprocess.sql + + # Try to generate all possible pages diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix index 67b05b8f4b674..ee649f396fa3f 100644 --- a/pkgs/by-name/po/polybar/package.nix +++ b/pkgs/by-name/po/polybar/package.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { having a black belt in shell scripting. ''; license = licenses.mit; - maintainers = with maintainers; [ afldcr Br1ght0ne fortuneteller2k ckie ]; + maintainers = with maintainers; [ afldcr Br1ght0ne moni ckie ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix index 5af31a41de88d..751dbbd61e05c 100644 --- a/pkgs/by-name/py/pyprland/package.nix +++ b/pkgs/by-name/py/pyprland/package.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "pyprland"; - version = "1.4.1"; + version = "1.5.3"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.10"; @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { owner = "hyprland-community"; repo = "pyprland"; rev = version; - hash = "sha256-x/Rar80jwBX64pW+uv0edhlC44OP1b1e2vnJLFGlIms="; + hash = "sha256-PmE52pbEhc4+SkuyEeVUZoMVcbgK6CYA8HNwYPpgaIw="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; @@ -26,7 +26,6 @@ python3Packages.buildPythonApplication rec { "pyprland.common" "pyprland.plugins" "pyprland.plugins.interface" - "pyprland.plugins.ironbar" ]; meta = with lib; { diff --git a/pkgs/by-name/tl/tlrc/package.nix b/pkgs/by-name/tl/tlrc/package.nix new file mode 100644 index 0000000000000..e74ea6e558af6 --- /dev/null +++ b/pkgs/by-name/tl/tlrc/package.nix @@ -0,0 +1,39 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, installShellFiles +}: + +rustPlatform.buildRustPackage rec { + pname = "tlrc"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "tldr-pages"; + repo = "tlrc"; + rev = "v${version}"; + hash = "sha256-Jdie9ESSbRV07SHjITfQPwDKTedHMbY01FdEMlNOr50="; + }; + + cargoHash = "sha256-2OXyPtgdRGIIc7jIES9zhRpFiaodcEnaK88k+rUVSJo="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage tldr.1 + + installShellCompletion \ + --name tldr --bash $releaseDir/build/tlrc-*/out/tldr.bash \ + --zsh $releaseDir/build/tlrc-*/out/_tldr \ + --fish $releaseDir/build/tlrc-*/out/tldr.fish + ''; + + meta = with lib; { + description = "Official tldr client written in Rust"; + homepage = "https://github.com/tldr-pages/tlrc"; + changelog = "https://github.com/tldr-pages/tlrc/releases/tag/v${version}"; + license = licenses.mit; + mainProgram = "tldr"; + maintainers = with maintainers; [ acuteenvy ]; + }; +} diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index 21862ae9a5f90..251a16c8b6383 100644 --- a/pkgs/by-name/ux/uxn/package.nix +++ b/pkgs/by-name/ux/uxn/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxn"; - version = "unstable-2023-10-23"; + version = "unstable-2023-11-12"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "798ebafdc8c27529217f159f8ff53edb0a8a328f"; - hash = "sha256-OVCnJEdc/DdJJCks6c2jP9wK31VSNP1NBOsJZ2SFY+0="; + rev = "86c46be310032bc6588bdc813fae1bc235fac60b"; + hash = "sha256-qyFIJORrjONwyasDvO3COUcE4VJAjZEa3QJDQ+rhwqY="; }; outputs = [ "out" "projects" ]; diff --git a/pkgs/by-name/va/valijson/package.nix b/pkgs/by-name/va/valijson/package.nix new file mode 100644 index 0000000000000..777e192aee4a0 --- /dev/null +++ b/pkgs/by-name/va/valijson/package.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "valijson"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "tristanpenman"; + repo = "valijson"; + rev = "v${version}"; + hash = "sha256-COVFBZtuTd1nyI/25feUYCurBwPlQV3qbxSSkn6aLl4="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + description = "Header-only C++ library for JSON Schema validation, with support for many popular parsers"; + homepage = "https://github.com/tristanpenman/valijson"; + license = licenses.bsd2; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 0992f6612e98f..0094284f814bc 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -16,48 +16,62 @@ , moreutils , nodePackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vesktop"; version = "0.4.3"; src = fetchFromGitHub { owner = "Vencord"; repo = "Vesktop"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-wGOyDGY0FpAVS5+MTiKrOpDyd13ng0RLGAENW5tXuR4="; }; - pnpm-deps = stdenvNoCC.mkDerivation { - pname = "${pname}-pnpm-deps"; - inherit src version patches ELECTRON_SKIP_BINARY_DOWNLOAD; - - nativeBuildInputs = [ - jq - moreutils - nodePackages.pnpm - ]; - - # https://github.com/NixOS/nixpkgs/blob/763e59ffedb5c25774387bf99bc725df5df82d10/pkgs/applications/misc/pot/default.nix#L56 - installPhase = '' - export HOME=$(mktemp -d) - - pnpm config set store-dir $out - pnpm install --frozen-lockfile --ignore-script - - rm -rf $out/v3/tmp - for f in $(find $out -name "*.json"); do - sed -i -E -e 's/"checkedAt":[0-9]+,//g' $f - jq --sort-keys . $f | sponge $f - done - ''; + # NOTE: This requires pnpm 8.10.0 or newer + # https://github.com/pnpm/pnpm/pull/7214 + pnpmDeps = + assert lib.versionAtLeast nodePackages.pnpm.version "8.10.0"; + stdenvNoCC.mkDerivation { + pname = "${finalAttrs.pname}-pnpm-deps"; + inherit (finalAttrs) src version patches ELECTRON_SKIP_BINARY_DOWNLOAD; + + nativeBuildInputs = [ + jq + moreutils + nodePackages.pnpm + ]; - dontFixup = true; - outputHashMode = "recursive"; - outputHash = { - "aarch64-linux" = "sha256-OcAQbUi+wpBAumncYxP3qtTzjyxiHL69kbQefwaeBfg="; - "x86_64-linux" = "sha256-R5/2MSH/jXHrj2x1Ap2OoOFLBLQp3Sq91o01uW8hWOw="; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; + pnpmPatch = builtins.toJSON { + pnpm.supportedArchitectures = { + os = [ "linux" ]; + cpu = [ "x64" "arm64" ]; + }; + }; + + postPatch = '' + mv package.json package.json.orig + jq --raw-output ". * $pnpmPatch" package.json.orig > package.json + ''; + + # https://github.com/NixOS/nixpkgs/blob/763e59ffedb5c25774387bf99bc725df5df82d10/pkgs/applications/misc/pot/default.nix#L56 + installPhase = '' + export HOME=$(mktemp -d) + + pnpm config set store-dir $out + pnpm install --frozen-lockfile --ignore-script + + rm -rf $out/v3/tmp + for f in $(find $out -name "*.json"); do + sed -i -E -e 's/"checkedAt":[0-9]+,//g' $f + jq --sort-keys . $f | sponge $f + done + ''; + + dontBuild = true; + dontFixup = true; + outputHashMode = "recursive"; + outputHash = "sha256-nNXe0vSQiQTkiRqgScKlpkpG/BJc2eIY2ueAd9sk36c="; + }; nativeBuildInputs = [ copyDesktopItems @@ -76,7 +90,7 @@ stdenv.mkDerivation rec { export HOME=$(mktemp -d) export STORE_PATH=$(mktemp -d) - cp -r ${pnpm-deps}/* "$STORE_PATH" + cp -Tr "$pnpmDeps" "$STORE_PATH" chmod -R +w "$STORE_PATH" pnpm config set store-dir "$STORE_PATH" @@ -137,6 +151,10 @@ stdenv.mkDerivation rec { }) ]; + passthru = { + inherit (finalAttrs) pnpmDeps; + }; + meta = with lib; { description = "An alternate client for Discord with Vencord built-in"; homepage = "https://github.com/Vencord/Vesktop"; @@ -145,4 +163,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "aarch64-linux" ]; mainProgram = "vencorddesktop"; }; -} +}) diff --git a/pkgs/common-updater/nix-update.nix b/pkgs/common-updater/nix-update.nix index 269e1b6e64553..342b1677c6de8 100644 --- a/pkgs/common-updater/nix-update.nix +++ b/pkgs/common-updater/nix-update.nix @@ -4,4 +4,4 @@ , extraArgs ? [ ] }: -[ "${nix-update}/bin/nix-update" ] ++ extraArgs ++ lib.optional (attrPath != null) attrPath +[ "${lib.getExe nix-update}" ] ++ extraArgs ++ lib.optional (attrPath != null) attrPath diff --git a/pkgs/data/fonts/curie/default.nix b/pkgs/data/fonts/curie/default.nix index 4f3ab7eb013a0..5e8195211b05c 100644 --- a/pkgs/data/fonts/curie/default.nix +++ b/pkgs/data/fonts/curie/default.nix @@ -25,6 +25,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/NerdyPepper/curie"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/data/fonts/edwin/default.nix b/pkgs/data/fonts/edwin/default.nix index 41926ac1b6795..2ccb44d45d2ea 100644 --- a/pkgs/data/fonts/edwin/default.nix +++ b/pkgs/data/fonts/edwin/default.nix @@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/MuseScoreFonts/Edwin"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/data/fonts/open-fonts/default.nix b/pkgs/data/fonts/open-fonts/default.nix index 6a628174f2e4f..3f76820979422 100644 --- a/pkgs/data/fonts/open-fonts/default.nix +++ b/pkgs/data/fonts/open-fonts/default.nix @@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/kiwi0fruit/open-fonts"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/data/fonts/scientifica/default.nix b/pkgs/data/fonts/scientifica/default.nix index 1f946ecb17af9..1b57c9f286d3d 100644 --- a/pkgs/data/fonts/scientifica/default.nix +++ b/pkgs/data/fonts/scientifica/default.nix @@ -26,6 +26,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/NerdyPepper/scientifica"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/data/fonts/sil-abyssinica/default.nix b/pkgs/data/fonts/sil-abyssinica/default.nix index f01c50b426088..d0571fae0bfda 100644 --- a/pkgs/data/fonts/sil-abyssinica/default.nix +++ b/pkgs/data/fonts/sil-abyssinica/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "sil-abyssinica"; - version = "2.200"; + version = "2.201"; src = fetchzip { url = "https://software.sil.org/downloads/r/abyssinica/AbyssinicaSIL-${version}.zip"; - hash = "sha256-IdWMZHm9VoLVDO0//ISujxlXUxe0O6+aEcdP63YRmPg="; + hash = "sha256-DJWp3T9uBLnztSq9r5YCSWaBjIK/0Aljg1IiU0FLrdE="; }; installPhase = '' diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index a8aba0c1fb232..7f2e9a1b158b4 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "unifont"; - version = "15.1.03"; + version = "15.1.04"; otf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.otf"; - hash = "sha256-DGRIxE0HDX/cx7mQMBmGgRrbbj7fzWDAOMlhZM1/EEw="; + hash = "sha256-J8g8ojXDq5nV013zXXi1rEAYQhpCh7G06mV7IpmZbTg="; }; pcf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; - hash = "sha256-/fogZ8mkOz/4YFZVxU3tTZfYwZw7zGizoQ3yQkF+aME="; + hash = "sha256-XHKP8xx+GvhFYBW03Sambpd2gclKvQUz1JAjIlb59OI="; }; nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 8147db6e10863..e7820a85842c2 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "unifont_upper"; - version = "15.1.03"; + version = "15.1.04"; src = fetchurl { url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.otf"; - hash = "sha256-IZM+21ipmDHoiHYfKQdoguLWN9KC9FlHsNbqOcXDBFQ="; + hash = "sha256-SUsG2xhrn47zrGpNzRn1g76qyt2vQyH/UBmYtzCD0UA="; }; dontUnpack = true; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index be53cafa434a5..1de1411cb754d 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -41,6 +41,6 @@ stdenvNoCC.mkDerivation rec { license = licenses.gpl3Only; # darwin gives hash mismatch in source, probably because of file names differing only in case platforms = platforms.linux; - maintainers = with maintainers; [ romildo fortuneteller2k ]; + maintainers = with maintainers; [ romildo moni ]; }; } diff --git a/pkgs/data/icons/phinger-cursors/default.nix b/pkgs/data/icons/phinger-cursors/default.nix index 5afd2fe228f6a..82742723806f5 100644 --- a/pkgs/data/icons/phinger-cursors/default.nix +++ b/pkgs/data/icons/phinger-cursors/default.nix @@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/phisch/phinger-cursors"; platforms = platforms.unix; license = licenses.cc-by-sa-40; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 197793db6c66f..8de13f2eaf368 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "shared-mime-info"; - version = "2.2"; + version = "2.3"; outputs = [ "out" "dev" ]; @@ -23,9 +23,15 @@ stdenv.mkDerivation rec { owner = "xdg"; repo = pname; rev = version; - sha256 = "sha256-QrRe/DcjpTMejHXDSOLbjpJywod8qIjP6/leTZ21rhE="; + sha256 = "sha256-cEfknRVtOJykEO9Iqlb0UoiayYtu+ugvmmZqAD5cGnE="; }; + patches = [ + # Submitted upstream at + # https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/211 + ./fix-clang-warnings.patch + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/data/misc/shared-mime-info/fix-clang-warnings.patch b/pkgs/data/misc/shared-mime-info/fix-clang-warnings.patch new file mode 100644 index 0000000000000..2d185549c4e6b --- /dev/null +++ b/pkgs/data/misc/shared-mime-info/fix-clang-warnings.patch @@ -0,0 +1,31 @@ +diff --git a/meson.build b/meson.build +index 1780c44..7998a51 100644 +--- a/meson.build ++++ b/meson.build +@@ -49,12 +49,7 @@ endif + ############################################################################### + # Dependencies + +-check_functions = [ +- 'fdatasync', +-] +-foreach function : check_functions +- config.set('HAVE_'+function.to_upper(), cc.has_function(function)) +-endforeach ++config.set('HAVE_FDATASYNC', cc.has_function('fdatasync', prefix: '#include <unistd.h>')) + + + if get_option('build-translations') +diff --git a/src/update-mime-database.cpp b/src/update-mime-database.cpp +index 733ba06..4ca6d06 100644 +--- a/src/update-mime-database.cpp ++++ b/src/update-mime-database.cpp +@@ -2158,7 +2158,7 @@ static void check_in_path_xdg_data(const char *mime_path) + + env = getenv("XDG_DATA_DIRS"); + if (!env) +- env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/"; ++ env = "/usr/local/share/" PATH_SEPARATOR "/usr/share/"; + dirs = g_strsplit(env, PATH_SEPARATOR, 0); + g_return_if_fail(dirs != NULL); + for (n = 0; dirs[n]; n++) diff --git a/pkgs/data/themes/onestepback/default.nix b/pkgs/data/themes/onestepback/default.nix index 9547e35438908..c18d55db5b448 100644 --- a/pkgs/data/themes/onestepback/default.nix +++ b/pkgs/data/themes/onestepback/default.nix @@ -2,20 +2,16 @@ stdenv.mkDerivation rec { pname = "onestepback"; - version = "0.991"; + version = "0.994"; srcs = [ (fetchurl { url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-v${version}.zip"; - sha256 = "1jfgcgzbb6ra9qs3zcp6ij0hfldzg3m0yjw6l6vf4kq1mdby1ghm"; + hash = "sha256-kjGiGo4bF1mWJPnaPv2lf7rGG/uAntHK61mH6lcJ6e4="; }) (fetchurl { - url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-grey-brown-green-blue-v${version}.zip"; - sha256 = "0i006h1asbpfdzajws0dvk9acplvcympzgxq5v3n8hmizd6yyh77"; - }) - (fetchurl { - url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-green-brown-v${version}.zip"; - sha256 = "16p002lak6425gcskny4hzws8x9dgsm6j3a1r08y11rsz7d2hnmy"; + url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-darker-v${version}.zip"; + hash = "sha256-AuurSa45uF5GbPqaMXKblWkv3YGkYL1z0VjWrbnsB/I="; }) ]; @@ -24,15 +20,17 @@ stdenv.mkDerivation rec { sourceRoot = "."; installPhase = '' + runHook preInstall mkdir -p $out/share/themes cp -a OneStepBack* $out/share/themes/ rm $out/share/themes/*/{LICENSE,README*} + runHook postInstall ''; meta = with lib; { description = "Gtk theme inspired by the NextStep look"; homepage = "http://www.vide.memoire.free.fr/perso/OneStepBack"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index 93802c6b88746..1490b5db79d72 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ubuntu/yaru"; license = with licenses; [ cc-by-sa-40 gpl3Plus lgpl21Only lgpl3Only ]; platforms = platforms.linux; - maintainers = with maintainers; [ fortuneteller2k amaxine ]; + maintainers = with maintainers; [ moni amaxine ]; }; } diff --git a/pkgs/desktops/arcan/arcan/default.nix b/pkgs/desktops/arcan/arcan/default.nix index 6a4fac1261567..1a46c693b0278 100644 --- a/pkgs/desktops/arcan/arcan/default.nix +++ b/pkgs/desktops/arcan/arcan/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchgit , SDL2 , cmake , espeak @@ -21,18 +20,16 @@ , libXfixes , libdrm , libffi +, libjpeg , libusb1 , libuvc , libvlc , libvncserver , libxcb , libxkbcommon -, lua5_1 -, luajit , makeWrapper , mesa , mupdf -, ninja , openal , openjpeg , pcre2 @@ -121,6 +118,7 @@ stdenv.mkDerivation (finalAttrs: { libXfixes libdrm libffi + libjpeg libusb1 libuvc libvlc @@ -128,9 +126,9 @@ stdenv.mkDerivation (finalAttrs: { libxcb libxkbcommon mesa - mupdf.dev + mupdf openal - openjpeg.dev + openjpeg pcre2 sqlite tesseract diff --git a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix index 274c81bfce96b..4fb99cfb80ae3 100644 --- a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix +++ b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix @@ -33,7 +33,7 @@ buildGoPackage rec { buildPhase = '' runHook preBuild addToSearchPath GOPATH "${go-lib}/share/gocode" - make ARCH=${stdenv.targetPlatform.linuxArch} -C go/src/${goPackagePath} + make ARCH=${stdenv.hostPlatform.linuxArch} -C go/src/${goPackagePath} runHook postBuild ''; diff --git a/pkgs/desktops/gnome/core/gnome-tour/default.nix b/pkgs/desktops/gnome/core/gnome-tour/default.nix index c471417d61650..bb658fcd4489f 100644 --- a/pkgs/desktops/gnome/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome/core/gnome-tour/default.nix @@ -17,8 +17,6 @@ , libadwaita , librsvg , rustc -, rust -, writeText , cargo }: @@ -60,16 +58,6 @@ stdenv.mkDerivation rec { librsvg ]; - mesonFlags = - let - # ERROR: 'rust' compiler binary not defined in cross or native file - crossFile = writeText "cross-file.conf" '' - [binaries] - rust = [ 'rustc', '--target', '${rust.toRustTargetSpec stdenv.hostPlatform}' ] - ''; - in - lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ]; - passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix index faf44e50e0fcf..500e31f0d36a5 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/desktops/gnustep/base/default.nix @@ -14,10 +14,10 @@ }: gsmakeDerivation rec { pname = "gnustep-base"; - version = "1.28.0"; + version = "1.29.0"; src = fetchzip { url = "ftp://ftp.gnustep.org/pub/gnustep/core/${pname}-${version}.tar.gz"; - sha256 = "05vjz19v1w7yb7hm8qrc41bqh6xd8in7sgg2p0h1vldyyaa5sh90"; + hash = "sha256-4fjdsLBsYEDxLOFrq17dKii2sLKvOaFCu0cw3qQtM5U="; }; outputs = [ "out" "dev" "lib" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/desktops/gnustep/make/builder.sh b/pkgs/desktops/gnustep/make/builder.sh index 736635ab50269..79ead3f7b7295 100644 --- a/pkgs/desktops/gnustep/make/builder.sh +++ b/pkgs/desktops/gnustep/make/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup providedPreConfigure="$preConfigure"; diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index f53c4ea05f8d1..ab23fc36da838 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -47,5 +47,6 @@ mkDerivation rec { license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = teams.lxqt.members; + mainProgram = "lxqt-openssh-askpass"; }; } diff --git a/pkgs/development/compilers/aspectj/builder.sh b/pkgs/development/compilers/aspectj/builder.sh index 7ea0a40d37484..31ec97942e524 100755 --- a/pkgs/development/compilers/aspectj/builder.sh +++ b/pkgs/development/compilers/aspectj/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup export JAVA_HOME=$jre diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 5a139fb290647..dcadf054bc30f 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "binaryen"; - version = "114"; + version = "116"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - hash = "sha256-bzHNIQy0AN8mIFGG+638p/MBSqlkWuaOzKGSsMDAPH4="; + hash = "sha256-gMwbWiP+YDCVafQMBWhTuJGWmkYtnhEdn/oofKaUT08="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix index f33e594b7e250..29cf5b115b300 100644 --- a/pkgs/development/compilers/chicken/4/chicken.nix +++ b/pkgs/development/compilers/chicken/4/chicken.nix @@ -20,6 +20,13 @@ stdenv.mkDerivation { sha256 = "0hvckhi5gfny3mlva6d7y9pmx7cbwvq0r7mk11k3sdiik9hlkmdd"; }; + postPatch = lib.optionalString stdenv.isDarwin '' + # There is not enough space in the load command to accomodate a full path to the store, + # so use `@executable_path` to specify a relative path to chicken’s lib folder. + sed -e '/POSTINSTALL_PROGRAM_FLAGS = /{s|$(LIBDIR)|@executable_path/../lib|}' \ + -i Makefile.macosx + ''; + setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh; # -fno-strict-overflow is not a supported argument in clang on darwin @@ -31,7 +38,7 @@ stdenv.mkDerivation { ] ++ (lib.optionals stdenv.isDarwin [ "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "C_COMPILER=$(CC)" - "POSTINSTALL_PROGRAM=install_name_tool" + "POSTINSTALL_PROGRAM=${stdenv.cc.targetPrefix}install_name_tool" ]); # We need a bootstrap-chicken to regenerate the c-files after diff --git a/pkgs/development/compilers/chicken/4/fetchegg/builder.sh b/pkgs/development/compilers/chicken/4/fetchegg/builder.sh index cb56eabc5d781..78535382a7ca5 100644 --- a/pkgs/development/compilers/chicken/4/fetchegg/builder.sh +++ b/pkgs/development/compilers/chicken/4/fetchegg/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup echo "exporting egg ${eggName} (version $version) into $out" diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 37ccb5f1a02bb..436fda2a05217 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "emscripten"; - version = "3.1.45"; + version = "3.1.47"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { name = "emscripten-node-modules-${version}"; inherit pname version src; - npmDepsHash = "sha256-kcWAio1fKuwqFCFlupX9KevjWPbv9W/Z/5EPrihQ6ms="; + npmDepsHash = "sha256-Qft+//za5ed6Oquxtcdpv7g5oOc2WmWuRJ/CDe+FEiI="; dontBuild = true; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - hash = "sha256-yf0Yb/UjaBQpIEPZzzjaUmR+JzKPSJHMkrYLHxDXwOg="; + hash = "sha256-cRNkQ+7vUqJLNlf5dieeDcyT1jlBUeVxO8avoUvOPHI="; rev = version; }; @@ -85,6 +85,9 @@ stdenv.mkDerivation rec { cp -r . $appdir chmod -R +w $appdir + mkdir -p $appdir/node_modules + cp -r ${nodeModules}/* $appdir/node_modules + mkdir -p $out/bin for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emmake emranlib emrun emscons emsize; do makeWrapper $appdir/$b $out/bin/$b \ diff --git a/pkgs/development/compilers/erg/default.nix b/pkgs/development/compilers/erg/default.nix index 27e32df06312d..6d052179ebd85 100644 --- a/pkgs/development/compilers/erg/default.nix +++ b/pkgs/development/compilers/erg/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "erg"; - version = "0.6.24"; + version = "0.6.25"; src = fetchFromGitHub { owner = "erg-lang"; repo = "erg"; rev = "v${version}"; - hash = "sha256-J8Zw79TXYpDfnsx6UgB4sqY1vdwVHildqtCcXlBvUxQ="; + hash = "sha256-z3481/vWmR5QlULfJZtLdGhwsJKBbLcvyC87SCngMVg="; }; - cargoHash = "sha256-4FhD9MvAhP88WGqVIUG2JHxd/gbDYf++bdlS6lVW0xs="; + cargoHash = "sha256-+jN+6At8tLHA/ilSBxugHIS79Cw8bGhE0RUNU4sSGeM="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/compilers/fpc/binary-builder-darwin.sh b/pkgs/development/compilers/fpc/binary-builder-darwin.sh index 39db0518281da..8a8600f1f639f 100755 --- a/pkgs/development/compilers/fpc/binary-builder-darwin.sh +++ b/pkgs/development/compilers/fpc/binary-builder-darwin.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup pkgdir=$(pwd)/pkg diff --git a/pkgs/development/compilers/fpc/binary-builder.sh b/pkgs/development/compilers/fpc/binary-builder.sh index c471378c275f5..568c3094107a3 100755 --- a/pkgs/development/compilers/fpc/binary-builder.sh +++ b/pkgs/development/compilers/fpc/binary-builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup tar xf $src diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 0fe23000cc900..01f1725130803 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -108,8 +108,8 @@ let inherit version; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.isMinGW; - stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final"; - crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + stageNameAddon = optionalString withoutTargetLibc "-nolibc"; + crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}${stageNameAddon}-"; javaAwtGtk = langJava && x11Support; xlibs = [ diff --git a/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch b/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch new file mode 100644 index 0000000000000..d938d67a2d068 --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch @@ -0,0 +1,85 @@ +From b10785c1be469319a09b10bc69db21159b0599ee Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <siarheit@google.com> +Date: Fri, 22 Sep 2023 22:41:49 +0100 +Subject: [PATCH] gcc/file-prefix-map.cc: always mangle __FILE__ into invalid + store path + +Without the change `__FILE__` used in static inline functions in headers +embed paths to header files into executable images. For local headers +it's not a problem, but for headers in `/nix/store` this causes `-dev` +inputs to be retained in runtime closure. + +Typical examples are `nix` -> `nlohmann_json` and `pipewire` -> +`lttng-ust.dev`. + +Ideally we would like to use `-fmacro-prefix-map=` feature of `gcc` as: + + -fmacro-prefix-map=/nix/store/$hash1-nlohmann-json-ver=/nix/store/eeee.eee-nlohmann-json-ver + -fmacro-prefix-map=/nix/... + +In practice it quickly exhausts argument lengtth limit due to `gcc` +deficiency: https://gcc.gnu.org/PR111527 + +Until it;s fixed let's hardcode header mangling if $NIX_STORE variable +is present in the environment. + +Tested as: + + $ printf "# 0 \"/nix/store/01234567890123456789012345678901-pppppp-vvvvvvv\" \nconst char * f(void) { return __FILE__; }" | NIX_STORE=/nix/store ./gcc/xgcc -Bgcc -x c - -S -o - + ... + .string "/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-pppppp-vvvvvvv" + ... + +Mangled successfully. +--- a/gcc/file-prefix-map.cc ++++ b/gcc/file-prefix-map.cc +@@ -60,6 +60,9 @@ add_prefix_map (file_prefix_map *&maps, const char *arg, const char *opt) + maps = map; + } + ++/* Forward declaration for a $NIX_STORE remap hack below. */ ++static file_prefix_map *macro_prefix_maps; /* -fmacro-prefix-map */ ++ + /* Perform user-specified mapping of filename prefixes. Return the + GC-allocated new name corresponding to FILENAME or FILENAME if no + remapping was performed. */ +@@ -76,7 +79,30 @@ remap_filename (file_prefix_map *maps, const char *filename) + if (filename_ncmp (filename, map->old_prefix, map->old_len) == 0) + break; + if (!map) +- return filename; ++ { ++ if (maps == macro_prefix_maps) ++ { ++ /* Remap all fo $NIX_STORE/.{32} paths to ++ * equivalent $NIX_STORE/e{32}. ++ * ++ * That way we avoid argument parameters explosion ++ * and still avoid embedding headers into runtime closure: ++ * https://gcc.gnu.org/PR111527 ++ */ ++ char * nix_store = getenv("NIX_STORE"); ++ size_t nix_store_len = nix_store ? strlen(nix_store) : 0; ++ const char * name = filename; ++ size_t name_len = strlen(name); ++ if (nix_store && name_len >= nix_store_len + 1 + 32 && memcmp(name, nix_store, nix_store_len) == 0) ++ { ++ s = (char *) ggc_alloc_atomic (name_len + 1); ++ memcpy(s, name, name_len + 1); ++ memset(s + nix_store_len + 1, 'e', 32); ++ return s; ++ } ++ } ++ return filename; ++ } + name = filename + map->old_len; + name_len = strlen (name) + 1; + +@@ -90,7 +116,6 @@ remap_filename (file_prefix_map *maps, const char *filename) + ignore it in DW_AT_producer (dwarf2out.cc). */ + + /* Linked lists of file_prefix_map structures. */ +-static file_prefix_map *macro_prefix_maps; /* -fmacro-prefix-map */ + static file_prefix_map *debug_prefix_maps; /* -fdebug-prefix-map */ + static file_prefix_map *profile_prefix_maps; /* -fprofile-prefix-map */ + diff --git a/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch b/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch new file mode 100644 index 0000000000000..57ae2111f020a --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch @@ -0,0 +1,84 @@ +From b10785c1be469319a09b10bc69db21159b0599ee Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <siarheit@google.com> +Date: Fri, 22 Sep 2023 22:41:49 +0100 +Subject: [PATCH] gcc/file-prefix-map.cc: always mangle __FILE__ into invalid + store path + +Without the change `__FILE__` used in static inline functions in headers +embed paths to header files into executable images. For local headers +it's not a problem, but for headers in `/nix/store` this causes `-dev` +inputs to be retained in runtime closure. + +Typical examples are `nix` -> `nlohmann_json` and `pipewire` -> +`lttng-ust.dev`. + +Ideally we would like to use `-fmacro-prefix-map=` feature of `gcc` as: + + -fmacro-prefix-map=/nix/store/$hash1-nlohmann-json-ver=/nix/store/eeee.eee-nlohmann-json-ver + -fmacro-prefix-map=/nix/... + +In practice it quickly exhausts argument lengtth limit due to `gcc` +deficiency: https://gcc.gnu.org/PR111527 + +Until it;s fixed let's hardcode header mangling if $NIX_STORE variable +is present in the environment. + +Tested as: + + $ printf "# 0 \"/nix/store/01234567890123456789012345678901-pppppp-vvvvvvv\" \nconst char * f(void) { return __FILE__; }" | NIX_STORE=/nix/store ./gcc/xgcc -Bgcc -x c - -S -o - + ... + .string "/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-pppppp-vvvvvvv" + ... + +Mangled successfully. +--- a/gcc/file-prefix-map.cc ++++ b/gcc/file-prefix-map.cc +@@ -69,6 +69,9 @@ add_prefix_map (file_prefix_map *&maps, const char *arg, const char *opt) + maps = map; + } + ++/* Forward declaration for a $NIX_STORE remap hack below. */ ++static file_prefix_map *macro_prefix_maps; /* -fmacro-prefix-map */ ++ + /* Perform user-specified mapping of filename prefixes. Return the + GC-allocated new name corresponding to FILENAME or FILENAME if no + remapping was performed. */ +@@ -102,6 +105,29 @@ remap_filename (file_prefix_map *maps, const char *filename) + break; + if (!map) + { ++ if (maps == macro_prefix_maps) ++ { ++ /* Remap all fo $NIX_STORE/.{32} paths to ++ * equivalent $NIX_STORE/e{32}. ++ * ++ * That way we avoid argument parameters explosion ++ * and still avoid embedding headers into runtime closure: ++ * https://gcc.gnu.org/PR111527 ++ */ ++ char * nix_store = getenv("NIX_STORE"); ++ size_t nix_store_len = nix_store ? strlen(nix_store) : 0; ++ const char * name = realname ? realname : filename; ++ size_t name_len = strlen(name); ++ if (nix_store && name_len >= nix_store_len + 1 + 32 && memcmp(name, nix_store, nix_store_len) == 0) ++ { ++ s = (char *) ggc_alloc_atomic (name_len + 1); ++ memcpy(s, name, name_len + 1); ++ memset(s + nix_store_len + 1, 'e', 32); ++ if (realname != filename) ++ free (const_cast <char *> (realname)); ++ return s; ++ } ++ } + if (realname != filename) + free (const_cast <char *> (realname)); + return filename; +@@ -124,7 +150,6 @@ remap_filename (file_prefix_map *maps, const char *filename) + ignore it in DW_AT_producer (gen_command_line_string in opts.cc). */ + + /* Linked lists of file_prefix_map structures. */ +-static file_prefix_map *macro_prefix_maps; /* -fmacro-prefix-map */ + static file_prefix_map *debug_prefix_maps; /* -fdebug-prefix-map */ + static file_prefix_map *profile_prefix_maps; /* -fprofile-prefix-map */ + + diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 15880913bde1a..c4b0dbf91b665 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -63,8 +63,8 @@ in ++ optionals (noSysDirs) ( [(if atLeast12 then ./gcc-12-no-sys-dirs.patch else ./no-sys-dirs.patch)] ++ ({ - "13" = [ ./13/no-sys-dirs-riscv.patch ]; - "12" = [ ./no-sys-dirs-riscv.patch ]; + "13" = [ ./13/no-sys-dirs-riscv.patch ./13/mangle-NIX_STORE-in-__FILE__.patch ]; + "12" = [ ./no-sys-dirs-riscv.patch ./12/mangle-NIX_STORE-in-__FILE__.patch ]; "11" = [ ./no-sys-dirs-riscv.patch ]; "10" = [ ./no-sys-dirs-riscv.patch ]; "9" = [ ./no-sys-dirs-riscv-gcc9.patch ]; diff --git a/pkgs/development/compilers/ghc/9.0.2.nix b/pkgs/development/compilers/ghc/9.0.2.nix index f5f0c93171476..6be098972ee40 100644 --- a/pkgs/development/compilers/ghc/9.0.2.nix +++ b/pkgs/development/compilers/ghc/9.0.2.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/pkgs/development/compilers/ghc/9.2.4.nix b/pkgs/development/compilers/ghc/9.2.4.nix index 6aa87a152015e..3ed263a433253 100644 --- a/pkgs/development/compilers/ghc/9.2.4.nix +++ b/pkgs/development/compilers/ghc/9.2.4.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/pkgs/development/compilers/ghc/9.2.5.nix b/pkgs/development/compilers/ghc/9.2.5.nix index c5aa5897761e9..6246630f5495f 100644 --- a/pkgs/development/compilers/ghc/9.2.5.nix +++ b/pkgs/development/compilers/ghc/9.2.5.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/pkgs/development/compilers/ghc/9.2.6.nix b/pkgs/development/compilers/ghc/9.2.6.nix index 651ff1e7d44b9..124303c0c81a5 100644 --- a/pkgs/development/compilers/ghc/9.2.6.nix +++ b/pkgs/development/compilers/ghc/9.2.6.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/pkgs/development/compilers/ghc/9.2.7.nix b/pkgs/development/compilers/ghc/9.2.7.nix index 74c0088473b85..a627f74179bb6 100644 --- a/pkgs/development/compilers/ghc/9.2.7.nix +++ b/pkgs/development/compilers/ghc/9.2.7.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/pkgs/development/compilers/ghc/9.2.8.nix b/pkgs/development/compilers/ghc/9.2.8.nix index 973e62f955396..a0451f57c6ec9 100644 --- a/pkgs/development/compilers/ghc/9.2.8.nix +++ b/pkgs/development/compilers/ghc/9.2.8.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/pkgs/development/compilers/ghc/9.4.2.nix b/pkgs/development/compilers/ghc/9.4.2.nix index 3c51fb981afdc..7b921ecc441fb 100644 --- a/pkgs/development/compilers/ghc/9.4.2.nix +++ b/pkgs/development/compilers/ghc/9.4.2.nix @@ -205,6 +205,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. diff --git a/pkgs/development/compilers/ghc/9.4.3.nix b/pkgs/development/compilers/ghc/9.4.3.nix index 87ce19f66054b..2bddbea7bc7d8 100644 --- a/pkgs/development/compilers/ghc/9.4.3.nix +++ b/pkgs/development/compilers/ghc/9.4.3.nix @@ -205,6 +205,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. diff --git a/pkgs/development/compilers/ghc/9.4.4.nix b/pkgs/development/compilers/ghc/9.4.4.nix index fa184a6fe1716..e7465a950042f 100644 --- a/pkgs/development/compilers/ghc/9.4.4.nix +++ b/pkgs/development/compilers/ghc/9.4.4.nix @@ -205,6 +205,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. diff --git a/pkgs/development/compilers/ghc/9.4.5.nix b/pkgs/development/compilers/ghc/9.4.5.nix index 91032cb03d6ec..9442f2bf19b42 100644 --- a/pkgs/development/compilers/ghc/9.4.5.nix +++ b/pkgs/development/compilers/ghc/9.4.5.nix @@ -205,6 +205,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. diff --git a/pkgs/development/compilers/ghc/9.4.6.nix b/pkgs/development/compilers/ghc/9.4.6.nix index 3b0bef212a068..b64b3ba5ec6c9 100644 --- a/pkgs/development/compilers/ghc/9.4.6.nix +++ b/pkgs/development/compilers/ghc/9.4.6.nix @@ -197,6 +197,7 @@ stdenv.mkDerivation (rec { extraPrefix = "libraries/Cabal/"; sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; }) + ./docs-sphinx-7.patch # Work around a type not being defined when including Rts.h in bytestring's cbits # due to missing feature macros. See https://gitlab.haskell.org/ghc/ghc/-/issues/23810. diff --git a/pkgs/development/compilers/ghc/9.4.7.nix b/pkgs/development/compilers/ghc/9.4.7.nix index 48cec53e3b18c..7ee135a13b443 100644 --- a/pkgs/development/compilers/ghc/9.4.7.nix +++ b/pkgs/development/compilers/ghc/9.4.7.nix @@ -197,6 +197,7 @@ stdenv.mkDerivation (rec { extraPrefix = "libraries/Cabal/"; sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; }) + ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index d2d6dade497ed..5687555d5d95a 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -266,6 +266,11 @@ stdenv.mkDerivation ({ enableParallelBuilding = true; + patches = [ + (if lib.versionAtLeast version "9.8" + then ./docs-sphinx-7-ghc98.patch + else ./docs-sphinx-7.patch ) + ]; postPatch = '' patchShebangs --build . ''; diff --git a/pkgs/development/compilers/ghc/docs-sphinx-7-ghc98.patch b/pkgs/development/compilers/ghc/docs-sphinx-7-ghc98.patch new file mode 100644 index 0000000000000..3fc1a0f21561d --- /dev/null +++ b/pkgs/development/compilers/ghc/docs-sphinx-7-ghc98.patch @@ -0,0 +1,8 @@ +Fix build of docs after sphinx update. +https://github.com/sphinx-doc/sphinx/pull/11381 +https://gitlab.haskell.org/ghc/ghc/-/issues/24129 +--- a/docs/users_guide/rtd-theme/layout.html ++++ b/docs/users_guide/rtd-theme/layout.html +@@ -28 +28 @@ +- <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" /> ++ <link rel="stylesheet" href="{{ pathto('_static/' + styles[-1], 1) }}" type="text/css" /> diff --git a/pkgs/development/compilers/ghc/docs-sphinx-7.patch b/pkgs/development/compilers/ghc/docs-sphinx-7.patch new file mode 100644 index 0000000000000..49fa45d1b9a23 --- /dev/null +++ b/pkgs/development/compilers/ghc/docs-sphinx-7.patch @@ -0,0 +1,8 @@ +Fix build of docs after sphinx update. +https://github.com/sphinx-doc/sphinx/pull/11381 +https://gitlab.haskell.org/ghc/ghc/-/issues/24129 +--- a/docs/users_guide/rtd-theme/layout.html ++++ b/docs/users_guide/rtd-theme/layout.html +@@ -67 +67 @@ +- <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" /> ++ <link rel="stylesheet" href="{{ pathto('_static/' + styles[-1], 1) }}" type="text/css" /> diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index 9753a1077a639..ff55201ebd03f 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "12.3.1"; + version = "13.1.1"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = version; - hash = "sha256-NP5ph598YSPbpzJJUR2r+EkqFmuItxgvOSDgDaN+Swg="; + hash = "sha256-fuzNsVYdnThMzd4tLN/sTbCBXg6qXKLDJRziOKyOBGg="; }; # These get set at all-packages, keep onto them for child drvs diff --git a/pkgs/development/compilers/go/1.21.nix b/pkgs/development/compilers/go/1.21.nix index 7806cf0744380..c12af4db34c56 100644 --- a/pkgs/development/compilers/go/1.21.nix +++ b/pkgs/development/compilers/go/1.21.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.21.3"; + version = "1.21.4"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-GG8rb4yLcE5paCGwmrIEGlwe4T3LwxVqE63PdZMe5Ig="; + hash = "sha256-R7Jqg9K2WjwcG8rOJztpvuSaentRaKdgTe09JqN714c="; }; strictDeps = true; diff --git a/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh b/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh index 47459664af0a5..4eef8acb06934 100644 --- a/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh +++ b/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh @@ -1,5 +1,5 @@ # -*- shell-script -*- -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup function extract diff --git a/pkgs/development/compilers/llvm/10/llvm/default.nix b/pkgs/development/compilers/llvm/10/llvm/default.nix index c4e6f2827e82b..c09ec676e9ea7 100644 --- a/pkgs/development/compilers/llvm/10/llvm/default.nix +++ b/pkgs/development/compilers/llvm/10/llvm/default.nix @@ -133,7 +133,17 @@ in stdenv.mkDerivation (rec { hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs="; stripLen = 1; }) - ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; + ] ++ lib.optionals enablePolly [ + ./gnu-install-dirs-polly.patch + # Add missing isl header includess required to build LLVM 10 + Polly with clang 16. + (fetchpatch { + name = "polly-ppcg-isl-headers.patch"; + url = "https://repo.or.cz/ppcg.git/patch/098ba285306114dc71497f7b51c357f69c9b4472"; + hash = "sha256-c9L30rDROYAMbUSuaK9U/ixyFMlH/Sa1n+VgLODzSCQ="; + extraPrefix = "tools/polly/lib/External/ppcg/"; + stripLen = 1; + }) + ]; postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix index 863d31874ec8c..6a3b8cbabab7d 100644 --- a/pkgs/development/compilers/llvm/15/default.nix +++ b/pkgs/development/compilers/llvm/15/default.nix @@ -266,11 +266,13 @@ in let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - "-nostdlib++" - ]; + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + "-nostdlib++" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; clangNoLibc = wrapCCWith rec { @@ -281,10 +283,12 @@ in let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ]; + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; clangNoCompilerRt = wrapCCWith rec { @@ -293,16 +297,22 @@ in let bintools = bintoolsNoLibc'; extraPackages = [ ]; extraBuildCommands = mkExtraBuildCommands0 cc; - nixSupport.cc-cflags = [ "-nostartfiles" ]; + nixSupport.cc-cflags = + [ + "-nostartfiles" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; - clangNoCompilerRtWithLibc = wrapCCWith rec { + clangNoCompilerRtWithLibc = wrapCCWith (rec { cc = tools.clang-unwrapped; libcxx = null; bintools = bintools'; extraPackages = [ ]; extraBuildCommands = mkExtraBuildCommands0 cc; - }; + } // lib.optionalAttrs stdenv.targetPlatform.isWasm { + nixSupport.cc-cflags = [ "-fno-exceptions" ]; + }); }); diff --git a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix b/pkgs/development/compilers/llvm/16/compiler-rt/default.nix index fc0d7533c9949..9b6ab0a77c2a8 100644 --- a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/16/compiler-rt/default.nix @@ -119,9 +119,9 @@ stdenv.mkDerivation { ''; # Hack around weird upsream RPATH bug - postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin) '' ln -s "$out/lib"/*/* "$out/lib" - '' + lib.optionalString (useLLVM) '' + '' + lib.optionalString (useLLVM && stdenv.hostPlatform.isLinux) '' ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o # Note the history of crt{begin,end}S in previous versions of llvm in nixpkg: diff --git a/pkgs/development/compilers/llvm/16/default.nix b/pkgs/development/compilers/llvm/16/default.nix index 24dd31ea9fef8..541db8c400dea 100644 --- a/pkgs/development/compilers/llvm/16/default.nix +++ b/pkgs/development/compilers/llvm/16/default.nix @@ -271,11 +271,13 @@ in let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - "-nostdlib++" - ]; + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + "-nostdlib++" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; clangNoLibc = wrapCCWith rec { @@ -286,10 +288,12 @@ in let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ]; + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; clangNoCompilerRt = wrapCCWith rec { @@ -298,17 +302,29 @@ in let bintools = bintoolsNoLibc'; extraPackages = [ ]; extraBuildCommands = mkExtraBuildCommands0 cc; - nixSupport.cc-cflags = [ "-nostartfiles" ]; + nixSupport.cc-cflags = + [ + "-nostartfiles" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; - clangNoCompilerRtWithLibc = wrapCCWith rec { + clangNoCompilerRtWithLibc = wrapCCWith (rec { cc = tools.clang-unwrapped; libcxx = null; bintools = bintools'; extraPackages = [ ]; extraBuildCommands = mkExtraBuildCommands0 cc; - }; + } // lib.optionalAttrs stdenv.targetPlatform.isWasm { + nixSupport.cc-cflags = [ "-fno-exceptions" ]; + }); + # Has to be in tools despite mostly being a library, + # because we use a native helper executable from a + # non-cross build in cross builds. + libclc = callPackage ./libclc { + inherit buildLlvmTools; + }; }); libraries = lib.makeExtensible (libraries: let diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/compilers/llvm/16/libclc/default.nix index 9148deeee6f40..6fa0751f906be 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/compilers/llvm/16/libclc/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, buildPackages, ninja, cmake, python3, llvm_14 }: +{ lib, stdenv, version, runCommand, monorepoSrc, llvm, buildPackages, buildLlvmTools, ninja, cmake, python3 }: stdenv.mkDerivation rec { pname = "libclc"; - version = "16.0.3"; + inherit version; - src = fetchFromGitHub { - owner = "llvm"; - repo = "llvm-project"; - rev = "llvmorg-${version}"; - hash = "sha256-paWwnoU3XMqreRgh9JbT1tDMTwq/ZL0ss3SJTteEGL0="; - }; - sourceRoot = "${src.name}/libclc"; + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; outputs = [ "out" "dev" ]; @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace CMakeLists.txt \ --replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_CLANG clang PATHS "${buildPackages.clang_14.cc}/bin" NO_DEFAULT_PATH )' \ + 'find_program( LLVM_CLANG clang PATHS "${buildLlvmTools.clang.cc}/bin" NO_DEFAULT_PATH )' \ --replace 'find_program( LLVM_AS llvm-as PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_AS llvm-as PATHS "${buildPackages.llvm_14}/bin" NO_DEFAULT_PATH )' \ + 'find_program( LLVM_AS llvm-as PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ --replace 'find_program( LLVM_LINK llvm-link PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_LINK llvm-link PATHS "${buildPackages.llvm_14}/bin" NO_DEFAULT_PATH )' \ + 'find_program( LLVM_LINK llvm-link PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ --replace 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_OPT opt PATHS "${buildPackages.llvm_14}/bin" NO_DEFAULT_PATH )' \ + 'find_program( LLVM_OPT opt PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ --replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ 'find_program( LLVM_SPIRV llvm-spirv PATHS "${buildPackages.spirv-llvm-translator}/bin" NO_DEFAULT_PATH )' '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ninja python3 ]; - buildInputs = [ llvm_14 ]; + buildInputs = [ llvm ]; strictDeps = true; postInstall = '' diff --git a/pkgs/development/libraries/libclc/libclc-gnu-install-dirs.patch b/pkgs/development/compilers/llvm/16/libclc/libclc-gnu-install-dirs.patch index 1e5108a27c38f..1e5108a27c38f 100644 --- a/pkgs/development/libraries/libclc/libclc-gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/16/libclc/libclc-gnu-install-dirs.patch diff --git a/pkgs/development/compilers/llvm/16/libcxx/default.nix b/pkgs/development/compilers/llvm/16/libcxx/default.nix index c387764b4f650..78cd632024cda 100644 --- a/pkgs/development/compilers/llvm/16/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/16/libcxx/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals (!headersOnly) [ cxxabi ] - ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ libunwind ]; + ++ lib.optionals (stdenv.hostPlatform.useLLVM or false && !stdenv.hostPlatform.isWasm) [ libunwind ]; cmakeFlags = let # See: https://libcxx.llvm.org/BuildingLibcxx.html#cmdoption-arg-libcxx-cxx-abi-string @@ -87,6 +87,7 @@ stdenv.mkDerivation rec { "-DLIBCXX_ENABLE_THREADS=OFF" "-DLIBCXX_ENABLE_FILESYSTEM=OFF" "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" + "-DUNIX=ON" # Required otherwise libc++ fails to detect the correct linker ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF" # If we're only building the headers we don't actually *need* a functioning # C/C++ compiler: diff --git a/pkgs/development/compilers/llvm/16/libcxxabi/default.nix b/pkgs/development/compilers/llvm/16/libcxxabi/default.nix index 04bfee14aa186..90c57dc52a2d5 100644 --- a/pkgs/development/compilers/llvm/16/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/16/libcxxabi/default.nix @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { postUnpack = lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin - '' + lib.optionalString stdenv.hostPlatform.isWasm '' - patch -p1 -d llvm -i ${../../common/libcxxabi/wasm.patch} ''; prePatch = '' @@ -65,7 +63,7 @@ stdenv.mkDerivation rec { # CMake however checks for this anyways; this flag tells it not to. See: # https://github.com/llvm/llvm-project/blob/4bd3f3759259548e159aeba5c76efb9a0864e6fa/llvm/runtimes/CMakeLists.txt#L243 "-DCMAKE_CXX_COMPILER_WORKS=ON" - ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false && !stdenv.hostPlatform.isWasm) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, @@ -74,8 +72,11 @@ stdenv.mkDerivation rec { "-DCMAKE_EXE_LINKER_FLAGS=-nostdlib" "-DCMAKE_SHARED_LINKER_FLAGS=-nostdlib" ] ++ lib.optionals stdenv.hostPlatform.isWasm [ + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DLIBCXXABI_ENABLE_THREADS=OFF" "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" + "-DUNIX=ON" # Required otherwise libc++ fails to detect the correct linker ] ++ lib.optionals (!enableShared) [ "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; diff --git a/pkgs/development/compilers/llvm/16/lld/add-table-base.patch b/pkgs/development/compilers/llvm/16/lld/add-table-base.patch new file mode 100644 index 0000000000000..15fc903a5e3f3 --- /dev/null +++ b/pkgs/development/compilers/llvm/16/lld/add-table-base.patch @@ -0,0 +1,190 @@ +From 93adcb770b99351b18553089c164fe3ef2119699 Mon Sep 17 00:00:00 2001 +From: Sam Clegg <sbc@chromium.org> +Date: Fri, 25 Aug 2023 13:56:16 -0700 +Subject: [PATCH] [lld][WebAssembly] Add `--table-base` setting + +This is similar to `--global-base` but determines where to place the +table segments rather than that data segments. + +See https://github.com/emscripten-core/emscripten/issues/20097 + +Differential Revision: https://reviews.llvm.org/D158892 +--- + test/wasm/table-base.s | 72 ++++++++++++++++++++++++++++++++++++++ + wasm/Driver.cpp | 19 ++++++++-- + wasm/Options.td | 5 ++- + wasm/Writer.cpp | 8 ----- + 4 files changed, 93 insertions(+), 11 deletions(-) + create mode 100644 test/wasm/table-base.s + +diff --git a/test/wasm/table-base.s b/test/wasm/table-base.s +new file mode 100644 +index 000000000000000..56fff414fd31d96 +--- /dev/null ++++ b/test/wasm/table-base.s +@@ -0,0 +1,72 @@ ++# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-unknown %s -o %t.o ++ ++# RUN: wasm-ld --export=__table_base -o %t.wasm %t.o ++# RUN: obj2yaml %t.wasm | FileCheck %s -check-prefix=CHECK-DEFAULT ++ ++# RUN: wasm-ld --table-base=100 --export=__table_base -o %t.wasm %t.o ++# RUN: obj2yaml %t.wasm | FileCheck %s -check-prefix=CHECK-100 ++ ++.globl _start ++_start: ++ .functype _start () -> () ++ i32.const _start ++ drop ++ end_function ++ ++# CHECK-DEFAULT: - Type: TABLE ++# CHECK-DEFAULT-NEXT: Tables: ++# CHECK-DEFAULT-NEXT: - Index: 0 ++# CHECK-DEFAULT-NEXT: ElemType: FUNCREF ++# CHECK-DEFAULT-NEXT: Limits: ++# CHECK-DEFAULT-NEXT: Flags: [ HAS_MAX ] ++# CHECK-DEFAULT-NEXT: Minimum: 0x2 ++# CHECK-DEFAULT-NEXT: Maximum: 0x2 ++ ++# CHECK-DEFAULT: - Type: GLOBAL ++# CHECK-DEFAULT-NEXT: Globals: ++# CHECK-DEFAULT-NEXT: - Index: 0 ++# CHECK-DEFAULT-NEXT: Type: I32 ++# CHECK-DEFAULT-NEXT: Mutable: true ++# CHECK-DEFAULT-NEXT: InitExpr: ++# CHECK-DEFAULT-NEXT: Opcode: I32_CONST ++# CHECK-DEFAULT-NEXT: Value: 66560 ++# CHECK-DEFAULT-NEXT: - Index: 1 ++# CHECK-DEFAULT-NEXT: Type: I32 ++# CHECK-DEFAULT-NEXT: Mutable: false ++# CHECK-DEFAULT-NEXT: InitExpr: ++# CHECK-DEFAULT-NEXT: Opcode: I32_CONST ++# CHECK-DEFAULT-NEXT: Value: 1 ++ ++# CHECK-DEFAULT: - Type: EXPORT ++# CHECK-DEFAULT: - Name: __table_base ++# CHECK-DEFAULT-NEXT: Kind: GLOBAL ++# CHECK-DEFAULT-NEXT: Index: 1 ++ ++# CHECK-100: - Type: TABLE ++# CHECK-100-NEXT: Tables: ++# CHECK-100-NEXT: - Index: 0 ++# CHECK-100-NEXT: ElemType: FUNCREF ++# CHECK-100-NEXT: Limits: ++# CHECK-100-NEXT: Flags: [ HAS_MAX ] ++# CHECK-100-NEXT: Minimum: 0x65 ++# CHECK-100-NEXT: Maximum: 0x65 ++ ++# CHECK-100: - Type: GLOBAL ++# CHECK-100-NEXT: Globals: ++# CHECK-100-NEXT: - Index: 0 ++# CHECK-100-NEXT: Type: I32 ++# CHECK-100-NEXT: Mutable: true ++# CHECK-100-NEXT: InitExpr: ++# CHECK-100-NEXT: Opcode: I32_CONST ++# CHECK-100-NEXT: Value: 66560 ++# CHECK-100-NEXT: - Index: 1 ++# CHECK-100-NEXT: Type: I32 ++# CHECK-100-NEXT: Mutable: false ++# CHECK-100-NEXT: InitExpr: ++# CHECK-100-NEXT: Opcode: I32_CONST ++# CHECK-100-NEXT: Value: 100 ++ ++# CHECK-100: - Type: EXPORT ++# CHECK-100: - Name: __table_base ++# CHECK-100-NEXT: Kind: GLOBAL ++# CHECK-100-NEXT: Index: 1 +diff --git a/wasm/Driver.cpp b/wasm/Driver.cpp +index 84304881f5ca34e..c2f5f0185781f36 100644 +--- a/wasm/Driver.cpp ++++ b/wasm/Driver.cpp +@@ -502,6 +502,7 @@ static void readConfigs(opt::InputArgList &args) { + + config->initialMemory = args::getInteger(args, OPT_initial_memory, 0); + config->globalBase = args::getInteger(args, OPT_global_base, 0); ++ config->tableBase = args::getInteger(args, OPT_table_base, 0); + config->maxMemory = args::getInteger(args, OPT_max_memory, 0); + config->zStackSize = + args::getZOptionValue(args, OPT_z, "stack-size", WasmPageSize); +@@ -573,6 +574,17 @@ static void setConfigs() { + if (config->exportTable) + error("-shared/-pie is incompatible with --export-table"); + config->importTable = true; ++ } else { ++ // Default table base. Defaults to 1, reserving 0 for the NULL function ++ // pointer. ++ if (!config->tableBase) ++ config->tableBase = 1; ++ // The default offset for static/global data, for when --global-base is ++ // not specified on the command line. The precise value of 1024 is ++ // somewhat arbitrary, and pre-dates wasm-ld (Its the value that ++ // emscripten used prior to wasm-ld). ++ if (!config->globalBase && !config->relocatable && !config->stackFirst) ++ config->globalBase = 1024; + } + + if (config->relocatable) { +@@ -666,8 +678,11 @@ static void checkOptions(opt::InputArgList &args) { + warn("-Bsymbolic is only meaningful when combined with -shared"); + } + +- if (config->globalBase && config->isPic) { +- error("--global-base may not be used with -shared/-pie"); ++ if (config->isPic) { ++ if (config->globalBase) ++ error("--global-base may not be used with -shared/-pie"); ++ if (config->tableBase) ++ error("--table-base may not be used with -shared/-pie"); + } + } + +diff --git a/wasm/Options.td b/wasm/Options.td +index 50417d2928e0a34..bb764396bf4df14 100644 +--- a/wasm/Options.td ++++ b/wasm/Options.td +@@ -191,7 +191,7 @@ def growable_table: FF<"growable-table">, + HelpText<"Remove maximum size from function table, allowing table to grow">; + + def global_base: JJ<"global-base=">, +- HelpText<"Where to start to place global data">; ++ HelpText<"Memory offset at which to place global data (Defaults to 1024)">; + + def import_memory: FF<"import-memory">, + HelpText<"Import the module's memory from the default module of \"env\" with the name \"memory\".">; +@@ -224,6 +224,9 @@ def no_entry: FF<"no-entry">, + def stack_first: FF<"stack-first">, + HelpText<"Place stack at start of linear memory rather than after data">; + ++def table_base: JJ<"table-base=">, ++ HelpText<"Table offset at which to place address taken functions (Defaults to 1)">; ++ + defm whole_archive: B<"whole-archive", + "Force load of all members in a static library", + "Do not force load of all members in a static library (default)">; +diff --git a/wasm/Writer.cpp b/wasm/Writer.cpp +index f25d358dc5bae6f..0576bf2907e49c4 100644 +--- a/wasm/Writer.cpp ++++ b/wasm/Writer.cpp +@@ -358,13 +358,6 @@ void Writer::layoutMemory() { + memoryPtr = config->globalBase; + } + } else { +- if (!config->globalBase && !config->relocatable && !config->isPic) { +- // The default offset for static/global data, for when --global-base is +- // not specified on the command line. The precise value of 1024 is +- // somewhat arbitrary, and pre-dates wasm-ld (Its the value that +- // emscripten used prior to wasm-ld). +- config->globalBase = 1024; +- } + memoryPtr = config->globalBase; + } + +@@ -1685,7 +1678,6 @@ void Writer::run() { + // For PIC code the table base is assigned dynamically by the loader. + // For non-PIC, we start at 1 so that accessing table index 0 always traps. + if (!config->isPic) { +- config->tableBase = 1; + if (WasmSym::definedTableBase) + WasmSym::definedTableBase->setVA(config->tableBase); + if (WasmSym::definedTableBase32) diff --git a/pkgs/development/compilers/llvm/16/lld/default.nix b/pkgs/development/compilers/llvm/16/lld/default.nix index cc18aee76a448..84943e8effce1 100644 --- a/pkgs/development/compilers/llvm/16/lld/default.nix +++ b/pkgs/development/compilers/llvm/16/lld/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { patches = [ ./gnu-install-dirs.patch + ./add-table-base.patch ]; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/compilers/llvm/5/clang/LLVMgold-path.patch b/pkgs/development/compilers/llvm/5/clang/LLVMgold-path.patch deleted file mode 100644 index 6a09c91b5132b..0000000000000 --- a/pkgs/development/compilers/llvm/5/clang/LLVMgold-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp -index 00bd60bc24bb..17416b0bd3c0 100644 ---- a/lib/Driver/ToolChains/CommonArgs.cpp -+++ b/lib/Driver/ToolChains/CommonArgs.cpp -@@ -376,8 +376,7 @@ void tools::AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args, - // as gold requires -plugin to come before any -plugin-opt that -Wl might - // forward. - CmdArgs.push_back("-plugin"); -- std::string Plugin = -- ToolChain.getDriver().Dir + "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold.so"; -+ std::string Plugin = "@libllvmLibdir@" "/LLVMgold.so"; - CmdArgs.push_back(Args.MakeArgString(Plugin)); - - // Try to pass driver level flags relevant to LTO code generation down to diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix deleted file mode 100644 index 70ffb3e0dd19e..0000000000000 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 -, buildLlvmTools -, fixDarwinDylibNames -, enableManpages ? false -}: - -let - self = stdenv.mkDerivation ({ - pname = "clang"; - inherit version; - - src = fetch "cfe" "0018520c4qxf5hgjdqgpz2dgl3faf4gsz87fdlb8zdmx99rfk77s"; - - unpackPhase = '' - unpackFile $src - mv cfe-${version}* clang - sourceRoot=$PWD/clang - unpackFile ${clang-tools-extra_src} - mv clang-tools-extra-* $sourceRoot/tools/extra - ''; - - nativeBuildInputs = [ cmake python3 ] - ++ lib.optional enableManpages python3.pkgs.sphinx - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - - buildInputs = [ libxml2 libllvm ]; - - cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" - "-DLLVM_ENABLE_RTTI=ON" - "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" - ] ++ lib.optionals enableManpages [ - "-DCLANG_INCLUDE_DOCS=ON" - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" - "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" - ]; - - patches = [ - ../../common/clang/5-8-purity.patch - ./gnu-install-dirs.patch - (substituteAll { - src = ./LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; - }) - ]; - - postPatch = '' - sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ - -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ - lib/Driver/ToolChains/*.cpp - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp - ''; - - outputs = [ "out" "lib" "dev" "python" ]; - - postInstall = '' - ln -sv $out/bin/clang $out/bin/cpp - - # Move libclang to 'lib' output - moveToOutput "lib/libclang.*" "$lib" - substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ - --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." - - mkdir -p $python/bin $python/share/{clang,scan-view} - mv $out/bin/{git-clang-format,scan-view} $python/bin - if [ -e $out/bin/set-xcode-analyzer ]; then - mv $out/bin/set-xcode-analyzer $python/bin - fi - mv $out/share/clang/*.py $python/share/clang - mv $out/share/scan-view/*.py $python/share/scan-view - rm $out/bin/c-index-test - patchShebangs $python/bin - - mkdir -p $dev/bin - cp bin/clang-tblgen $dev/bin - ''; - - passthru = { - inherit libllvm; - isClang = true; - hardeningUnsupportedFlags = [ "fortify3" ]; - }; - - meta = llvm_meta // { - homepage = "https://clang.llvm.org/"; - description = "A C language family frontend for LLVM"; - longDescription = '' - The Clang project provides a language front-end and tooling - infrastructure for languages in the C language family (C, C++, Objective - C/C++, OpenCL, CUDA, and RenderScript) for the LLVM project. - It aims to deliver amazingly fast compiles, extremely useful error and - warning messages and to provide a platform for building great source - level tools. The Clang Static Analyzer and clang-tidy are tools that - automatically find bugs in your code, and are great examples of the sort - of tools that can be built using the Clang frontend as a library to - parse C/C++ code. - ''; - mainProgram = "clang"; - }; - } // lib.optionalAttrs enableManpages { - pname = "clang-manpages"; - - buildPhase = '' - make docs-clang-man - ''; - - installPhase = '' - mkdir -p $out/share/man/man1 - # Manually install clang manpage - cp docs/man/*.1 $out/share/man/man1/ - ''; - - outputs = [ "out" ]; - - doCheck = false; - - meta = llvm_meta // { - description = "man page for Clang ${version}"; - }; - }); -in self diff --git a/pkgs/development/compilers/llvm/5/clang/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/5/clang/gnu-install-dirs.patch deleted file mode 100644 index 7e6903222f45b..0000000000000 --- a/pkgs/development/compilers/llvm/5/clang/gnu-install-dirs.patch +++ /dev/null @@ -1,242 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2667b1d6892e..87c5ad58738f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.4.3) - if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) - project(Clang) - -+ include(GNUInstallDirs) -+ - # Rely on llvm-config. - set(CONFIG_OUTPUT) - find_program(LLVM_CONFIG "llvm-config") -@@ -344,7 +346,7 @@ include_directories(BEFORE - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/clang include/clang-c -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.def" - PATTERN "*.h" -@@ -353,7 +355,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - ) - - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "CMakeFiles" EXCLUDE - PATTERN "*.inc" -@@ -361,7 +363,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - ) - - install(PROGRAMS utils/bash-autocomplete.sh -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - ) - endif() - -diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake -index e657059744a4..19da44638fe6 100644 ---- a/cmake/modules/AddClang.cmake -+++ b/cmake/modules/AddClang.cmake -@@ -99,9 +99,9 @@ macro(add_clang_library name) - install(TARGETS ${name} - COMPONENT ${name} - ${export_to_clangtargets} -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- RUNTIME DESTINATION bin) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) - add_custom_target(install-${name} -@@ -143,7 +143,7 @@ macro(add_clang_tool name) - - install(TARGETS ${name} - ${export_to_clangtargets} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT ${name}) - - if(NOT CMAKE_CONFIGURATION_TYPES) -@@ -160,5 +160,5 @@ endmacro() - macro(add_clang_symlink name dest) - add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) - # Always generate install targets -- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) -+ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) - endmacro() -diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt -index a621c02644e3..e140efc9c83c 100644 ---- a/lib/Headers/CMakeLists.txt -+++ b/lib/Headers/CMakeLists.txt -@@ -129,13 +129,13 @@ install( - FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h - COMPONENT clang-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) - - install( - FILES ${cuda_wrapper_files} - COMPONENT clang-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) - - if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDE's. - add_custom_target(install-clang-headers -diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt -index ad990e010eef..92e52d05afb9 100644 ---- a/tools/c-index-test/CMakeLists.txt -+++ b/tools/c-index-test/CMakeLists.txt -@@ -48,7 +48,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH - "@executable_path/../../lib") - else() -- set(INSTALL_DESTINATION bin) -+ set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - - install(TARGETS c-index-test -diff --git a/tools/clang-check/CMakeLists.txt b/tools/clang-check/CMakeLists.txt -index 04151a8e0331..13918d91c4ba 100644 ---- a/tools/clang-check/CMakeLists.txt -+++ b/tools/clang-check/CMakeLists.txt -@@ -19,4 +19,4 @@ target_link_libraries(clang-check - ) - - install(TARGETS clang-check -- RUNTIME DESTINATION bin) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt -index a13633eaefc4..9b0094783690 100644 ---- a/tools/clang-format/CMakeLists.txt -+++ b/tools/clang-format/CMakeLists.txt -@@ -20,20 +20,20 @@ if( LLVM_USE_SANITIZE_COVERAGE ) - endif() - - install(PROGRAMS clang-format-bbedit.applescript -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format-diff.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format-sublime.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format.el -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS git-clang-format -- DESTINATION bin -+ DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT clang-format) -diff --git a/tools/clang-offload-bundler/CMakeLists.txt b/tools/clang-offload-bundler/CMakeLists.txt -index 6161d08ae587..a003292d1676 100644 ---- a/tools/clang-offload-bundler/CMakeLists.txt -+++ b/tools/clang-offload-bundler/CMakeLists.txt -@@ -21,4 +21,4 @@ target_link_libraries(clang-offload-bundler - ${CLANG_OFFLOAD_BUNDLER_LIB_DEPS} - ) - --install(TARGETS clang-offload-bundler RUNTIME DESTINATION bin) -+install(TARGETS clang-offload-bundler RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/tools/clang-rename/CMakeLists.txt b/tools/clang-rename/CMakeLists.txt -index 771e3bdea6f0..d1396e62b28f 100644 ---- a/tools/clang-rename/CMakeLists.txt -+++ b/tools/clang-rename/CMakeLists.txt -@@ -14,11 +14,11 @@ target_link_libraries(clang-rename - clangToolingRefactor - ) - --install(TARGETS clang-rename RUNTIME DESTINATION bin) -+install(TARGETS clang-rename RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - install(PROGRAMS clang-rename.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-rename) - install(PROGRAMS clang-rename.el -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-rename) -diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt -index 2dd670307636..1fe576f77ddb 100644 ---- a/tools/libclang/CMakeLists.txt -+++ b/tools/libclang/CMakeLists.txt -@@ -121,7 +121,7 @@ endif() - if(INTERNAL_INSTALL_PREFIX) - set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include") - else() -- set(LIBCLANG_HEADERS_INSTALL_DESTINATION include) -+ set(LIBCLANG_HEADERS_INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - endif() - - install(DIRECTORY ../../include/clang-c -diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt -index 380379300b09..adfd58ed5f7d 100644 ---- a/tools/scan-build/CMakeLists.txt -+++ b/tools/scan-build/CMakeLists.txt -@@ -41,7 +41,7 @@ if(CLANG_INSTALL_SCANBUILD) - ${CMAKE_BINARY_DIR}/bin/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) -- install(PROGRAMS bin/${BinFile} DESTINATION bin) -+ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endforeach() - - foreach(LibexecFile ${LibexecFiles}) -@@ -53,7 +53,7 @@ if(CLANG_INSTALL_SCANBUILD) - ${CMAKE_BINARY_DIR}/libexec/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) -- install(PROGRAMS libexec/${LibexecFile} DESTINATION libexec) -+ install(PROGRAMS libexec/${LibexecFile} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) - endforeach() - - foreach(ManPage ${ManPages}) -@@ -77,7 +77,7 @@ if(CLANG_INSTALL_SCANBUILD) - ${CMAKE_BINARY_DIR}/share/scan-build/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile}) -- install(FILES share/scan-build/${ShareFile} DESTINATION share/scan-build) -+ install(FILES share/scan-build/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build) - endforeach() - - add_custom_target(scan-build ALL DEPENDS ${Depends}) -diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt -index b305ca562a72..554bcb379061 100644 ---- a/tools/scan-view/CMakeLists.txt -+++ b/tools/scan-view/CMakeLists.txt -@@ -21,7 +21,7 @@ if(CLANG_INSTALL_SCANVIEW) - ${CMAKE_BINARY_DIR}/bin/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) -- install(PROGRAMS bin/${BinFile} DESTINATION bin) -+ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endforeach() - - foreach(ShareFile ${ShareFiles}) -@@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW) - ${CMAKE_BINARY_DIR}/share/scan-view/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) -- install(FILES share/${ShareFile} DESTINATION share/scan-view) -+ install(FILES share/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view) - endforeach() - - add_custom_target(scan-view ALL DEPENDS ${Depends}) diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/armv7l.patch b/pkgs/development/compilers/llvm/5/compiler-rt/armv7l.patch deleted file mode 100644 index 77bf2640c4774..0000000000000 --- a/pkgs/development/compilers/llvm/5/compiler-rt/armv7l.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ur compiler-rt-5.0.2.src/cmake/builtin-config-ix.cmake compiler-rt-5.0.2.src-patched/cmake/builtin-config-ix.cmake ---- compiler-rt-5.0.2.src/cmake/builtin-config-ix.cmake 2017-05-25 00:53:24.000000000 +0900 -+++ compiler-rt-5.0.2.src-patched/cmake/builtin-config-ix.cmake 2020-05-10 03:24:24.937433155 +0900 -@@ -24,7 +24,7 @@ - - - set(ARM64 aarch64) --set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) -+set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) - set(X86 i386 i686) - set(X86_64 x86_64) - set(MIPS32 mips mipsel) -diff -ur compiler-rt-5.0.2.src/lib/builtins/CMakeLists.txt compiler-rt-5.0.2.src-patched/lib/builtins/CMakeLists.txt ---- compiler-rt-5.0.2.src/lib/builtins/CMakeLists.txt 2017-07-13 04:33:30.000000000 +0900 -+++ compiler-rt-5.0.2.src-patched/lib/builtins/CMakeLists.txt 2020-05-10 03:24:45.945075423 +0900 -@@ -444,6 +444,7 @@ - set(armv7_SOURCES ${arm_SOURCES}) - set(armv7s_SOURCES ${arm_SOURCES}) - set(armv7k_SOURCES ${arm_SOURCES}) -+set(armv7l_SOURCES ${arm_SOURCES}) - set(arm64_SOURCES ${aarch64_SOURCES}) - - # macho_embedded archs diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/codesign.patch b/pkgs/development/compilers/llvm/5/compiler-rt/codesign.patch deleted file mode 100644 index 8f4c76bca1eba..0000000000000 --- a/pkgs/development/compilers/llvm/5/compiler-rt/codesign.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001 -From: Will Dietz <w@wdtz.org> -Date: Tue, 19 Sep 2017 13:13:06 -0500 -Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that - needs it - ---- - cmake/Modules/AddCompilerRT.cmake | 8 ------ - test/asan/CMakeLists.txt | 52 --------------------------------------- - test/tsan/CMakeLists.txt | 47 ----------------------------------- - 3 files changed, 107 deletions(-) - -diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake -index bc5fb9ff7..b64eb4246 100644 ---- a/cmake/Modules/AddCompilerRT.cmake -+++ b/cmake/Modules/AddCompilerRT.cmake -@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type) - set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "") - set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib") - endif() -- if(APPLE) -- # Ad-hoc sign the dylibs -- add_custom_command(TARGET ${libname} -- POST_BUILD -- COMMAND codesign --sign - $<TARGET_FILE:${libname}> -- WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR} -- ) -- endif() - endif() - install(TARGETS ${libname} - ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR} -diff --git a/test/asan/CMakeLists.txt b/test/asan/CMakeLists.txt -index 8bfc15b5c..f23d0f71a 100644 ---- a/test/asan/CMakeLists.txt -+++ b/test/asan/CMakeLists.txt -@@ -83,58 +83,6 @@ foreach(arch ${ASAN_TEST_ARCH}) - endif() - endforeach() - --# iOS and iOS simulator test suites --# These are not added into "check-all", in order to run these tests, use --# "check-asan-iossim-x86_64" and similar. They also require that an extra env --# variable to select which iOS device or simulator to use, e.g.: --# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6" --if(APPLE) -- set(EXCLUDE_FROM_ALL ON) -- -- set(ASAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER}) -- set(ASAN_TEST_IOS "1") -- pythonize_bool(ASAN_TEST_IOS) -- set(ASAN_TEST_DYNAMIC True) -- -- foreach(arch ${DARWIN_iossim_ARCHS}) -- set(ASAN_TEST_IOSSIM "1") -- pythonize_bool(ASAN_TEST_IOSSIM) -- set(ASAN_TEST_TARGET_ARCH ${arch}) -- set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") -- set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-iossim") -- get_bits_for_arch(${arch} ASAN_TEST_BITS) -- string(TOUPPER ${arch} ARCH_UPPER_CASE) -- set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config") -- configure_lit_site_cfg( -- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg -- ) -- add_lit_testsuite(check-asan-iossim-${arch} "AddressSanitizer iOS Simulator ${arch} tests" -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ -- DEPENDS ${ASAN_TEST_DEPS}) -- endforeach() -- -- foreach (arch ${DARWIN_ios_ARCHS}) -- set(ASAN_TEST_IOSSIM "0") -- pythonize_bool(ASAN_TEST_IOSSIM) -- set(ASAN_TEST_TARGET_ARCH ${arch}) -- set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") -- set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-ios") -- get_bits_for_arch(${arch} ASAN_TEST_BITS) -- string(TOUPPER ${arch} ARCH_UPPER_CASE) -- set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config") -- configure_lit_site_cfg( -- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg -- ) -- add_lit_testsuite(check-asan-ios-${arch} "AddressSanitizer iOS ${arch} tests" -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ -- DEPENDS ${ASAN_TEST_DEPS}) -- endforeach() -- -- set(EXCLUDE_FROM_ALL OFF) --endif() -- - # Add unit tests. - if(COMPILER_RT_INCLUDE_TESTS) - set(ASAN_TEST_DYNAMIC False) -diff --git a/test/tsan/CMakeLists.txt b/test/tsan/CMakeLists.txt -index a68908612..cde0accb5 100644 ---- a/test/tsan/CMakeLists.txt -+++ b/test/tsan/CMakeLists.txt -@@ -42,53 +42,6 @@ foreach(arch ${TSAN_TEST_ARCH}) - list(APPEND TSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) - endforeach() - --# iOS and iOS simulator test suites --# These are not added into "check-all", in order to run these tests, use --# "check-tsan-iossim-x86_64" and similar. They also require an extra environment --# variable to select which iOS device or simulator to use, e.g.: --# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6" --if(APPLE) -- set(EXCLUDE_FROM_ALL ON) -- -- set(TSAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER}) -- set(TSAN_TEST_IOS "1") -- pythonize_bool(TSAN_TEST_IOS) -- -- set(arch "x86_64") -- set(TSAN_TEST_IOSSIM "1") -- pythonize_bool(TSAN_TEST_IOSSIM) -- set(TSAN_TEST_TARGET_ARCH ${arch}) -- set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") -- set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-iossim") -- string(TOUPPER ${arch} ARCH_UPPER_CASE) -- set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config") -- configure_lit_site_cfg( -- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg -- ) -- add_lit_testsuite(check-tsan-iossim-${arch} "ThreadSanitizer iOS Simulator ${arch} tests" -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ -- DEPENDS ${TSAN_TEST_DEPS}) -- -- set(arch "arm64") -- set(TSAN_TEST_IOSSIM "0") -- pythonize_bool(TSAN_TEST_IOSSIM) -- set(TSAN_TEST_TARGET_ARCH ${arch}) -- set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") -- set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-ios") -- string(TOUPPER ${arch} ARCH_UPPER_CASE) -- set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config") -- configure_lit_site_cfg( -- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg -- ) -- add_lit_testsuite(check-tsan-ios-${arch} "ThreadSanitizer iOS Simulator ${arch} tests" -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ -- DEPENDS ${TSAN_TEST_DEPS}) -- -- set(EXCLUDE_FROM_ALL OFF) --endif() -- - if(COMPILER_RT_INCLUDE_TESTS) - configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in --- -2.14.1 - diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/compiler-rt-5-cstddef.patch b/pkgs/development/compilers/llvm/5/compiler-rt/compiler-rt-5-cstddef.patch deleted file mode 100644 index e7abf9735b908..0000000000000 --- a/pkgs/development/compilers/llvm/5/compiler-rt/compiler-rt-5-cstddef.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/lib/xray/xray_buffer_queue.h -+++ b/lib/xray/xray_buffer_queue.h -@@ -17,6 +17,7 @@ - - #include "sanitizer_common/sanitizer_atomic.h" - #include "sanitizer_common/sanitizer_mutex.h" -+#include <cstddef> - #include <deque> - #include <unordered_set> - #include <utility> diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/default.nix b/pkgs/development/compilers/llvm/5/compiler-rt/default.nix deleted file mode 100644 index fede3347e42b2..0000000000000 --- a/pkgs/development/compilers/llvm/5/compiler-rt/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, libllvm, libcxxabi -, doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD -}: - -let - - useLLVM = stdenv.hostPlatform.useLLVM or false; - bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; - inherit (stdenv.hostPlatform) isMusl; - -in - -stdenv.mkDerivation { - pname = "compiler-rt"; - inherit version; - src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy"; - - nativeBuildInputs = [ cmake python3 libllvm.dev ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; - - env.NIX_CFLAGS_COMPILE = toString [ - "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" - ]; - - cmakeFlags = [ - "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" - "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" - "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" - ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ - "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" - "-DCOMPILER_RT_BUILD_XRAY=OFF" - "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" - ] ++ lib.optionals (useLLVM || bareMetal) [ - "-DCOMPILER_RT_BUILD_PROFILE=OFF" - ] ++ lib.optionals (useLLVM || bareMetal) [ - "-DCMAKE_C_COMPILER_WORKS=ON" - "-DCMAKE_CXX_COMPILER_WORKS=ON" - "-DCOMPILER_RT_BAREMETAL_BUILD=ON" - "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" - ] ++ lib.optionals (useLLVM) [ - "-DCOMPILER_RT_BUILD_BUILTINS=ON" - "-DCMAKE_C_FLAGS=-nodefaultlibs" - #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program - "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" - ] ++ lib.optionals (bareMetal) [ - "-DCOMPILER_RT_OS_DIR=baremetal" - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ - # The compiler-rt build infrastructure sniffs supported platforms on Darwin - # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails - # when it tries to use libc++ and libc++api for i386. - "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" - ]; - - outputs = [ "out" "dev" ]; - - patches = [ - ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory - # https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce - ../../common/compiler-rt/glibc.patch - ./gnu-install-dirs.patch - - ./sys-ustat.patch - ../../common/compiler-rt/libsanitizer-no-cyclades-9.patch - ./compiler-rt-5-cstddef.patch - ] ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; - - # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks - # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra - # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd - # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by - # a flag and turn the flag off during the stdenv build. - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace cmake/config-ix.cmake \ - --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' - '' + lib.optionalString (useLLVM) '' - substituteInPlace lib/builtins/int_util.c \ - --replace "#include <stdlib.h>" "" - substituteInPlace lib/builtins/clear_cache.c \ - --replace "#include <assert.h>" "" - substituteInPlace lib/builtins/cpu_model.c \ - --replace "#include <assert.h>" "" - ''; - - # Hack around weird upsream RPATH bug - postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' - ln -s "$out/lib"/*/* "$out/lib" - '' + lib.optionalString (useLLVM) '' - ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o - ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/linux/crtend.o - ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o - ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/linux/crtendS.o - '' + lib.optionalString doFakeLibgcc '' - ln -s $out/lib/freebsd/libclang_rt.builtins-*.a $out/lib/freebsd/libgcc.a - ''; - - meta = llvm_meta // { - homepage = "https://compiler-rt.llvm.org/"; - description = "Compiler runtime libraries"; - longDescription = '' - The compiler-rt project provides highly tuned implementations of the - low-level code generator support routines like "__fixunsdfdi" and other - calls generated when a target doesn't have a short sequence of native - instructions to implement a core IR operation. It also provides - implementations of run-time libraries for dynamic testing tools such as - AddressSanitizer, ThreadSanitizer, MemorySanitizer, and DataFlowSanitizer. - ''; - # "All of the code in the compiler-rt project is dual licensed under the MIT - # license and the UIUC License (a BSD-like license)": - license = with lib.licenses; [ mit ncsa ]; - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; - }; -} diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/5/compiler-rt/gnu-install-dirs.patch deleted file mode 100644 index 618e597e96d4b..0000000000000 --- a/pkgs/development/compilers/llvm/5/compiler-rt/gnu-install-dirs.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f997c53410c1..ac079d89b57b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -12,6 +12,7 @@ cmake_minimum_required(VERSION 3.4.3) - # Check if compiler-rt is built as a standalone project. - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) - project(CompilerRT C CXX ASM) -+ include(GNUInstallDirs) - set(COMPILER_RT_STANDALONE_BUILD TRUE) - endif() - -diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake -index bc5fb9ff722b..91fb79d1980c 100644 ---- a/cmake/Modules/AddCompilerRT.cmake -+++ b/cmake/Modules/AddCompilerRT.cmake -@@ -344,7 +344,7 @@ macro(add_compiler_rt_resource_file target_name file_name component) - add_custom_target(${target_name} DEPENDS ${dst_file}) - # Install in Clang resource directory. - install(FILES ${file_name} -- DESTINATION ${COMPILER_RT_INSTALL_PATH} -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_PREFIX} - COMPONENT ${component}) - add_dependencies(${component} ${target_name}) - -@@ -361,7 +361,7 @@ macro(add_compiler_rt_script name) - add_custom_target(${name} DEPENDS ${dst}) - install(FILES ${dst} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/bin) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_BINDIR}) - endmacro(add_compiler_rt_script src name) - - # Builds custom version of libc++ and installs it in <prefix>. -diff --git a/cmake/Modules/CompilerRTDarwinUtils.cmake b/cmake/Modules/CompilerRTDarwinUtils.cmake -index f646975475bb..75885bf305b8 100644 ---- a/cmake/Modules/CompilerRTDarwinUtils.cmake -+++ b/cmake/Modules/CompilerRTDarwinUtils.cmake -@@ -391,7 +391,7 @@ macro(darwin_add_embedded_builtin_libraries) - set(DARWIN_macho_embedded_LIBRARY_OUTPUT_DIR - ${COMPILER_RT_OUTPUT_DIR}/lib/macho_embedded) - set(DARWIN_macho_embedded_LIBRARY_INSTALL_DIR -- ${COMPILER_RT_INSTALL_PATH}/lib/macho_embedded) -+ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/macho_embedded) - - set(CFLAGS_armv7 "-target thumbv7-apple-darwin-eabi") - set(CFLAGS_i386 "-march=pentium") -diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake -index b38c6ca96fac..a4580414cbc8 100644 ---- a/cmake/base-config-ix.cmake -+++ b/cmake/base-config-ix.cmake -@@ -43,11 +43,11 @@ if (LLVM_TREE_AVAILABLE) - else() - # Take output dir and install path from the user. - set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH -- "Path where built compiler-rt libraries should be stored.") -+ "Path where built compiler-rt build artifacts should be stored.") - set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH - "Path where built compiler-rt executables should be stored.") -- set(COMPILER_RT_INSTALL_PATH ${CMAKE_INSTALL_PREFIX} CACHE PATH -- "Path where built compiler-rt libraries should be installed.") -+ set(COMPILER_RT_INSTALL_PATH "" CACHE PATH -+ "Prefix where built compiler-rt artifacts should be installed, comes before CMAKE_INSTALL_PREFIX.") - option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." OFF) - option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" OFF) - # Use a host compiler to compile/link tests. -@@ -67,9 +67,9 @@ if(NOT DEFINED COMPILER_RT_OS_DIR) - string(TOLOWER ${CMAKE_SYSTEM_NAME} COMPILER_RT_OS_DIR) - endif() - set(COMPILER_RT_LIBRARY_OUTPUT_DIR -- ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) -+ ${COMPILER_RT_OUTPUT_DIR}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR}) - set(COMPILER_RT_LIBRARY_INSTALL_DIR -- ${COMPILER_RT_INSTALL_PATH}/lib/${COMPILER_RT_OS_DIR}) -+ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR}) - - if(APPLE) - # On Darwin if /usr/include doesn't exist, the user probably has Xcode but not -diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt -index ec3bf40b95e6..af119f10ee2b 100644 ---- a/include/CMakeLists.txt -+++ b/include/CMakeLists.txt -@@ -44,8 +44,8 @@ set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc") - # Install sanitizer headers. - install(FILES ${SANITIZER_HEADERS} - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/sanitizer) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/sanitizer) - # Install xray headers. - install(FILES ${XRAY_HEADERS} - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/xray) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/xray) -diff --git a/lib/dfsan/CMakeLists.txt b/lib/dfsan/CMakeLists.txt -index 2c486bff821b..0ee715da95f8 100644 ---- a/lib/dfsan/CMakeLists.txt -+++ b/lib/dfsan/CMakeLists.txt -@@ -44,4 +44,4 @@ add_custom_command(OUTPUT ${dfsan_abilist_filename} - DEPENDS done_abilist.txt libc_ubuntu1404_abilist.txt) - add_dependencies(dfsan dfsan_abilist) - install(FILES ${dfsan_abilist_filename} -- DESTINATION ${COMPILER_RT_INSTALL_PATH}) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_PREFIX}) diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/sys-ustat.patch b/pkgs/development/compilers/llvm/5/compiler-rt/sys-ustat.patch deleted file mode 100644 index d9e9a10d86003..0000000000000 --- a/pkgs/development/compilers/llvm/5/compiler-rt/sys-ustat.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 521935db9de17ad08748fd050137ac83b7734835 Mon Sep 17 00:00:00 2001 -From: Craig Topper <craig.topper@intel.com> -Date: Thu, 24 May 2018 17:59:47 +0000 -Subject: [PATCH] sanitizer: Use pre-computed size of struct ustat for Linux - -<sys/ustat.h> has been removed from glibc 2.28 by: - -commit cf2478d53ad7071e84c724a986b56fe17f4f4ca7 -Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> -Date: Sun Mar 18 11:28:59 2018 +0800 - -Deprecate ustat syscall interface -This patch uses pre-computed size of struct ustat for Linux to fix - -https://bugs.llvm.org/show_bug.cgi?id=37418 - -Patch by H.J. Lu. - -Differential Revision: https://reviews.llvm.org/D47281 - -git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@333213 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - .../sanitizer_platform_limits_posix.cc | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -index 94b8f3f627..936d818673 100644 ---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -@@ -159,7 +159,6 @@ typedef struct user_fpregs elf_fpregset_t; - # include <sys/procfs.h> - #endif - #include <sys/user.h> --#include <sys/ustat.h> - #include <linux/cyclades.h> - #include <linux/if_eql.h> - #include <linux/if_plip.h> -@@ -253,7 +252,19 @@ namespace __sanitizer { - #endif // SANITIZER_LINUX || SANITIZER_FREEBSD - - #if SANITIZER_LINUX && !SANITIZER_ANDROID -- unsigned struct_ustat_sz = sizeof(struct ustat); -+ // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which -+ // has been removed from glibc 2.28. -+#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \ -+ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \ -+ || defined(__x86_64__) -+#define SIZEOF_STRUCT_USTAT 32 -+#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \ -+ || defined(__powerpc__) || defined(__s390__) -+#define SIZEOF_STRUCT_USTAT 20 -+#else -+#error Unknown size of struct ustat -+#endif -+ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT; - unsigned struct_rlimit64_sz = sizeof(struct rlimit64); - unsigned struct_statvfs64_sz = sizeof(struct statvfs64); - #endif // SANITIZER_LINUX && !SANITIZER_ANDROID diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix deleted file mode 100644 index 70f0d2e11bb67..0000000000000 --- a/pkgs/development/compilers/llvm/5/default.nix +++ /dev/null @@ -1,140 +0,0 @@ -{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs -, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -, targetLlvm -}: - -let - release_version = "5.0.2"; - version = release_version; # differentiating these is important for rc's - targetConfig = stdenv.targetPlatform.config; - - fetch = name: sha256: fetchurl { - url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz"; - inherit sha256; - }; - - clang-tools-extra_src = fetch "clang-tools-extra" "018b3fiwah8f8br5i26qmzh6sjvzchpn358sn8v079m49f2jldm3"; - - llvm_meta = { - license = lib.licenses.ncsa; - maintainers = lib.teams.llvm.members; - - # See llvm/cmake/config-ix.cmake. - platforms = - lib.platforms.aarch64 ++ - lib.platforms.arm ++ - lib.platforms.mips ++ - lib.platforms.power ++ - lib.platforms.s390x ++ - lib.platforms.wasi ++ - lib.platforms.x86; - }; - - tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; }); - mkExtraBuildCommands = cc: '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ''; - - in { - - libllvm = callPackage ./llvm { - inherit llvm_meta; - }; - - # `llvm` historically had the binaries. When choosing an output explicitly, - # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm; - - libllvm-polly = callPackage ./llvm { - inherit llvm_meta; - enablePolly = true; - }; - - llvm-polly = tools.libllvm-polly.lib // { outputSpecified = false; }; - - libclang = callPackage ./clang { - inherit clang-tools-extra_src llvm_meta; - }; - - clang-unwrapped = tools.libclang; - - llvm-manpages = lowPrio (tools.libllvm.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - clang-manpages = lowPrio (tools.libclang.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - # pick clang appropriate for package set we are targeting - clang = - /**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc - else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM - else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang - else tools.libcxxClang; - - libstdcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. - libcxx = null; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - libcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - extraPackages = [ - libcxx.cxxabi - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - lld = callPackage ./lld { - inherit llvm_meta; - }; - - lldb = callPackage ./lldb { - inherit llvm_meta; - }; - }); - - libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); - in { - - compiler-rt = callPackage ./compiler-rt { - inherit llvm_meta; - }; - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - libcxx = callPackage ./libcxx { - inherit llvm_meta; - }; - - libcxxabi = callPackage ./libcxxabi { - inherit llvm_meta; - }; - - openmp = callPackage ./openmp { - inherit llvm_meta targetLlvm; - }; - }); - noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; - -in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/5/libcxx/default.nix b/pkgs/development/compilers/llvm/5/libcxx/default.nix deleted file mode 100644 index 073787e92db66..0000000000000 --- a/pkgs/development/compilers/llvm/5/libcxx/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, python3, fixDarwinDylibNames, version -, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi -, libcxxabi, libcxxrt -}: - -assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; - -stdenv.mkDerivation { - pname = "libcxx"; - inherit version; - - src = fetch "libcxx" "1672aaf95fgy4xsfra8pw24f6r93zwzpan1033hkcm8p2glqipvf"; - - postUnpack = '' - unpackFile ${libcxxabi.src} - export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" - ''; - - outputs = [ "out" "dev" ]; - - patches = [ - ./gnu-install-dirs.patch - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - ../../libcxx-0001-musl-hacks.patch - ]; - - prePatch = '' - substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" - ''; - - preConfigure = '' - # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package - cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR") - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patchShebangs utils/cat_files.py - ''; - nativeBuildInputs = [ cmake ] - ++ lib.optional stdenv.hostPlatform.isMusl python3 - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - - buildInputs = [ cxxabi ]; - - cmakeFlags = [ - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=${cxxabi.pname}" - ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1" - ++ lib.optional (cxxabi.pname == "libcxxabi") "-DLIBCXX_LIBCXXABI_LIB_PATH=${cxxabi}/lib"; - - preInstall = lib.optionalString (stdenv.isDarwin) '' - for file in lib/*.dylib; do - if [ -L "$file" ]; then continue; fi - - baseName=$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1)) - installName="$out/lib/$baseName" - abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') - - for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do - ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file - done - done - ''; - - passthru = { - isLLVM = true; - inherit cxxabi; - }; - - meta = llvm_meta // { - homepage = "https://libcxx.llvm.org/"; - description = "C++ standard library"; - longDescription = '' - libc++ is an implementation of the C++ standard library, targeting C++11, - C++14 and above. - ''; - # "All of the code in libc++ is dual licensed under the MIT license and the - # UIUC License (a BSD-like license)": - license = with lib.licenses; [ mit ncsa ]; - }; -} diff --git a/pkgs/development/compilers/llvm/5/libcxx/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/5/libcxx/gnu-install-dirs.patch deleted file mode 100644 index d9ea0dc7dfd0e..0000000000000 --- a/pkgs/development/compilers/llvm/5/libcxx/gnu-install-dirs.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ca5afba86d19..ed69e4043c3d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,6 +22,8 @@ set(CMAKE_MODULE_PATH - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - project(libcxx CXX C) - -+ include(GNUInstallDirs) -+ - set(PACKAGE_NAME libcxx) - set(PACKAGE_VERSION 5.0.0) - set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake -index b1f6bee8f945..1b455fceed7f 100644 ---- a/cmake/Modules/HandleLibCXXABI.cmake -+++ b/cmake/Modules/HandleLibCXXABI.cmake -@@ -55,7 +55,7 @@ macro(setup_abi_lib abidefines abilib abifiles abidirs) - ) - if (LIBCXX_INSTALL_HEADERS) - install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" -- DESTINATION ${LIBCXX_INSTALL_PREFIX}include/c++/v1/${dstdir} -+ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir} - COMPONENT libcxx - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - ) -diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt -index 5a1b2ccdc426..106d3d6c1d3c 100644 ---- a/include/CMakeLists.txt -+++ b/include/CMakeLists.txt -@@ -20,7 +20,7 @@ endif() - - if (LIBCXX_INSTALL_HEADERS) - install(DIRECTORY . -- DESTINATION ${LIBCXX_INSTALL_PREFIX}include/c++/v1 -+ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1 - COMPONENT cxx-headers - FILES_MATCHING - ${LIBCXX_HEADER_PATTERN} -@@ -44,7 +44,7 @@ if (LIBCXX_INSTALL_HEADERS) - set(generated_config_deps generate_config_header) - # Install the generated header as __config. - install(FILES ${LIBCXX_BINARY_DIR}/__generated_config -- DESTINATION ${LIBCXX_INSTALL_PREFIX}include/c++/v1 -+ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1 - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - RENAME __config - COMPONENT cxx-headers) -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 578651423f3b..277befd631ac 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -355,8 +355,8 @@ if (LIBCXX_INSTALL_LIBRARY) - set(experimental_lib cxx_experimental) - endif() - install(TARGETS ${LIBCXX_TARGETS} ${experimental_lib} -- LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx -- ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx -+ LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx -+ ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx - ) - # NOTE: This install command must go after the cxx install command otherwise - # it will not be executed after the library symlinks are installed. -@@ -364,7 +364,7 @@ if (LIBCXX_INSTALL_LIBRARY) - # Replace the libc++ filename with $<TARGET_LINKER_FILE:cxx> - # after we required CMake 3.0. - install(FILES "${LIBCXX_LIBRARY_DIR}/libc++${CMAKE_SHARED_LIBRARY_SUFFIX}" -- DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} -+ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} - COMPONENT libcxx) - endif() - endif() diff --git a/pkgs/development/compilers/llvm/5/libcxxabi/default.nix b/pkgs/development/compilers/llvm/5/libcxxabi/default.nix deleted file mode 100644 index cc2ac1beaf0c2..0000000000000 --- a/pkgs/development/compilers/llvm/5/libcxxabi/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib, stdenv, llvm_meta, cmake, fetch, libcxx, libunwind, llvm, version }: - -stdenv.mkDerivation { - pname = "libcxxabi"; - inherit version; - - src = fetch "libcxxabi" "12lp799rskr4fc2xr64qn4jfkjnfd8b1aymvsxyn4k9ar7r9pgqv"; - - outputs = [ "out" "dev" ]; - - postUnpack = '' - unpackFile ${libcxx.src} - unpackFile ${llvm.src} - export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" - '' + lib.optionalString stdenv.isDarwin '' - export TRIPLE=x86_64-apple-darwin - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch} - ''; - - patches = [ - ./gnu-install-dirs.patch - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional (!stdenv.isDarwin) libunwind; - - preInstall = lib.optionalString stdenv.isDarwin '' - for file in lib/*.dylib; do - if [ -L "$file" ]; then continue; fi - - # Fix up the install name. Preserve the basename, just replace the path. - installName="$out/lib/$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1))" - - # this should be done in CMake, but having trouble figuring out - # the magic combination of necessary CMake variables - # if you fancy a try, take a look at - # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling - ${stdenv.cc.targetPrefix}install_name_tool -id $installName $file - - # cc-wrapper passes '-lc++abi' to all c++ link steps, but that causes - # libcxxabi to sometimes link against a different version of itself. - # Here we simply make that second reference point to ourselves. - for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do - ${stdenv.cc.targetPrefix}install_name_tool -change $other $installName $file - done - done - ''; - - postInstall = '' - mkdir -p "$dev/include" - install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" - ''; - - passthru = { - libName = "c++abi"; - }; - - meta = llvm_meta // { - homepage = "https://libcxxabi.llvm.org/"; - description = "Provides C++ standard library support"; - longDescription = '' - libc++abi is a new implementation of low level support for a standard C++ library. - ''; - # "All of the code in libc++abi is dual licensed under the MIT license and - # the UIUC License (a BSD-like license)": - license = with lib.licenses; [ mit ncsa ]; - maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ]; - }; -} diff --git a/pkgs/development/compilers/llvm/5/libcxxabi/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/5/libcxxabi/gnu-install-dirs.patch deleted file mode 100644 index 760d7194f7b9d..0000000000000 --- a/pkgs/development/compilers/llvm/5/libcxxabi/gnu-install-dirs.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4db3328deb9c..74b39acfe588 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,6 +20,8 @@ set(CMAKE_MODULE_PATH - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - project(libcxxabi CXX C) - -+ include(GNUInstallDirs) -+ - set(PACKAGE_NAME libcxxabi) - set(PACKAGE_VERSION 5.0.0) - set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index adcc412880c9..71758665af05 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -174,8 +174,8 @@ endif() - add_custom_target(cxxabi DEPENDS ${LIBCXXABI_TARGETS}) - - install(TARGETS ${LIBCXXABI_TARGETS} -- LIBRARY DESTINATION ${LIBCXXABI_INSTALL_PREFIX}lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi -- ARCHIVE DESTINATION ${LIBCXXABI_INSTALL_PREFIX}lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi -+ LIBRARY DESTINATION ${LIBCXXABI_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi -+ ARCHIVE DESTINATION ${LIBCXXABI_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi - ) - - if (NOT CMAKE_CONFIGURATION_TYPES) diff --git a/pkgs/development/compilers/llvm/5/lld/default.nix b/pkgs/development/compilers/llvm/5/lld/default.nix deleted file mode 100644 index d3cbede8433a8..0000000000000 --- a/pkgs/development/compilers/llvm/5/lld/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, llvm_meta -, buildLlvmTools -, fetch -, cmake -, libllvm -, version -}: - -stdenv.mkDerivation rec { - pname = "lld"; - inherit version; - - src = fetch "lld" "1ah75rjly6747jk1zbwca3z0svr9b09ylgxd4x9ns721xir6sia6"; - - patches = [ - ./gnu-install-dirs.patch - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libllvm ]; - - cmakeFlags = [ - "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" - ]; - - # Musl's default stack size is too small for lld to be able to link Firefox. - LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152"; - - outputs = [ "out" "lib" "dev" ]; - - meta = llvm_meta // { - broken = stdenv.isDarwin; - homepage = "https://lld.llvm.org/"; - description = "The LLVM linker (unwrapped)"; - longDescription = '' - LLD is a linker from the LLVM project that is a drop-in replacement for - system linkers and runs much faster than them. It also provides features - that are useful for toolchain developers. - The linker supports ELF (Unix), PE/COFF (Windows), and Mach-O (macOS) - in descending order of completeness. Internally, LLD consists - of several different linkers. - ''; - }; -} diff --git a/pkgs/development/compilers/llvm/5/lld/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/5/lld/gnu-install-dirs.patch deleted file mode 100644 index ed673870dec5b..0000000000000 --- a/pkgs/development/compilers/llvm/5/lld/gnu-install-dirs.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e2ab0e35f1ab..f68e23d2a70d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,6 +6,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(LLD_BUILT_STANDALONE TRUE) - -+ include(GNUInstallDirs) -+ - find_program(LLVM_CONFIG_PATH "llvm-config" DOC "Path to llvm-config binary") - if(NOT LLVM_CONFIG_PATH) - message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH") -@@ -203,7 +205,7 @@ include_directories(BEFORE - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/ -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".svn" EXCLUDE -diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake -index fd1d44199ca6..2ec1831ed8f6 100644 ---- a/cmake/modules/AddLLD.cmake -+++ b/cmake/modules/AddLLD.cmake -@@ -20,9 +20,9 @@ macro(add_lld_library name) - install(TARGETS ${name} - COMPONENT ${name} - ${export_to_lldtargets} -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- RUNTIME DESTINATION bin) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) - add_custom_target(install-${name} -@@ -56,7 +56,7 @@ macro(add_lld_tool name) - - install(TARGETS ${name} - ${export_to_lldtargets} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT ${name}) - - if(NOT CMAKE_CONFIGURATION_TYPES) -@@ -73,5 +73,5 @@ endmacro() - macro(add_lld_symlink name dest) - add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) - # Always generate install targets -- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) -+ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) - endmacro() -diff --git a/tools/lld/CMakeLists.txt b/tools/lld/CMakeLists.txt -index 2df10697ff66..94aa8d092220 100644 ---- a/tools/lld/CMakeLists.txt -+++ b/tools/lld/CMakeLists.txt -@@ -13,7 +13,7 @@ target_link_libraries(lld - ) - - install(TARGETS lld -- RUNTIME DESTINATION bin) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if(NOT LLD_SYMLINKS_TO_CREATE) - set(LLD_SYMLINKS_TO_CREATE lld-link ld.lld) diff --git a/pkgs/development/compilers/llvm/5/lldb/default.nix b/pkgs/development/compilers/llvm/5/lldb/default.nix deleted file mode 100644 index 6c60a44b3d651..0000000000000 --- a/pkgs/development/compilers/llvm/5/lldb/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ lib, stdenv, llvm_meta -, fetch -, fetchpatch -, cmake -, zlib -, ncurses -, swig -, which -, libedit -, libxml2 -, libllvm -, libclang -, python3 -, version -, darwin -}: - -stdenv.mkDerivation rec { - pname = "lldb"; - inherit version; - - src = fetch "lldb" "05j2a63yzln43852nng8a7y47spzlyr1cvdmgmbxgd29c8r0bfkq"; - - patches = [ - # Fix PythonString::GetString for >=python-3.7 - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/5457b426f5e15a29c0acc8af1a476132f8be2a36.patch"; - sha256 = "1zbx4m0m8kbg0wq6740jcw151vb2pb1p25p401wiq8diqqagkjps"; - stripLen = 1; - }) - ./gnu-install-dirs.patch - ]; - - postPatch = '' - # Fix up various paths that assume llvm and clang are installed in the same place - sed -i 's,".*ClangConfig.cmake","${libclang.dev}/lib/cmake/clang/ClangConfig.cmake",' \ - cmake/modules/LLDBStandalone.cmake - sed -i 's,".*tools/clang/include","${libclang.dev}/include",' \ - cmake/modules/LLDBStandalone.cmake - sed -i 's,"$.LLVM_LIBRARY_DIR.",${libllvm.lib}/lib ${libclang.lib}/lib,' \ - cmake/modules/LLDBStandalone.cmake - ''; - - outputs = [ "out" "lib" "dev" ]; - - nativeBuildInputs = [ - cmake python3 which swig - ]; - - buildInputs = [ - ncurses zlib libedit libxml2 libllvm - ] ++ lib.optionals stdenv.isDarwin [ - darwin.libobjc - darwin.apple_sdk.libs.xpc - darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa - ]; - - CXXFLAGS = "-fno-rtti"; - hardeningDisable = [ "format" ]; - - cmakeFlags = [ - "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" - "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic - ] ++ lib.optionals doCheck [ - "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" - "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" - ]; - - doCheck = false; - - postInstall = '' - mkdir -p $out/share/man/man1 - cp ../docs/lldb.1 $out/share/man/man1/ - ''; - - meta = llvm_meta // { - homepage = "https://lldb.llvm.org/"; - description = "A next-generation high-performance debugger"; - longDescription = '' - LLDB is a next generation, high-performance debugger. It is built as a set - of reusable components which highly leverage existing libraries in the - larger LLVM Project, such as the Clang expression parser and LLVM - disassembler. - ''; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; - }; -} diff --git a/pkgs/development/compilers/llvm/5/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/5/lldb/gnu-install-dirs.patch deleted file mode 100644 index 5c6193b028fa4..0000000000000 --- a/pkgs/development/compilers/llvm/5/lldb/gnu-install-dirs.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ada293811b3e..6c2149309f65 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,6 +7,8 @@ set(CMAKE_MODULE_PATH - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" - ) - -+include(GNUInstallDirs) -+ - include(LLDBStandalone) - include(LLDBConfig) - include(AddLLDB) -diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake -index 4c6f1efd673d..179a12b49cce 100644 ---- a/cmake/modules/AddLLDB.cmake -+++ b/cmake/modules/AddLLDB.cmake -@@ -54,14 +54,14 @@ function(add_lldb_library name) - endif() - install(TARGETS ${name} - COMPONENT ${name} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${out_dir} - ARCHIVE DESTINATION ${out_dir}) - else() - install(TARGETS ${name} - COMPONENT ${name} -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - endif() - if (NOT CMAKE_CONFIGURATION_TYPES) - add_custom_target(install-${name} -@@ -126,7 +126,7 @@ function(add_lldb_executable name) - if(ARG_GENERATE_INSTALL AND NOT (ARG_INCLUDE_IN_FRAMEWORK AND LLDB_BUILD_FRAMEWORK )) - install(TARGETS ${name} - COMPONENT ${name} -- RUNTIME DESTINATION bin) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - if (NOT CMAKE_CONFIGURATION_TYPES) - add_custom_target(install-${name} - DEPENDS ${name} -diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake -index 726552675f47..f1f769f34446 100644 ---- a/cmake/modules/LLDBConfig.cmake -+++ b/cmake/modules/LLDBConfig.cmake -@@ -276,7 +276,7 @@ include_directories(BEFORE - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/ - COMPONENT lldb_headers -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".svn" EXCLUDE -@@ -286,7 +286,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ - COMPONENT lldb_headers -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".svn" EXCLUDE -diff --git a/tools/intel-mpx/CMakeLists.txt b/tools/intel-mpx/CMakeLists.txt -index 29ba9a1cacec..30e2f9334b95 100644 ---- a/tools/intel-mpx/CMakeLists.txt -+++ b/tools/intel-mpx/CMakeLists.txt -@@ -12,4 +12,4 @@ target_link_libraries(lldb-intel-mpxtable - PUBLIC liblldb LLVMSupport) - - install(TARGETS lldb-intel-mpxtable -- LIBRARY DESTINATION bin) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/pkgs/development/compilers/llvm/5/llvm/default.nix b/pkgs/development/compilers/llvm/5/llvm/default.nix deleted file mode 100644 index 74523490244ff..0000000000000 --- a/pkgs/development/compilers/llvm/5/llvm/default.nix +++ /dev/null @@ -1,283 +0,0 @@ -{ lib, stdenv, llvm_meta -, pkgsBuildBuild -, fetch -, fetchpatch -, cmake -, python3 -, libffi -, enableGoldPlugin ? libbfd.hasPluginAPI -, libbfd -, libxml2 -, ncurses -, version -, release_version -, zlib -, buildLlvmTools -, debugVersion ? false -, enableManpages ? false -, enableSharedLibraries ? !enableManpages -, enablePolly ? false -}: - -let - inherit (lib) optional optionals optionalString; - - # Used when creating a versioned symlinks of libLLVM.dylib - versionSuffixes = with lib; - let parts = splitVersion release_version; in - imap (i: _: concatStringsSep "." (take i parts)) parts; -in - -stdenv.mkDerivation (rec { - pname = "llvm"; - inherit version; - - src = fetch "llvm" "0g1bbj2n6xv4p1n6hh17vj3vpvg56wacipc81dgwga9mg2lys8nm"; - polly_src = fetch "polly" "1f4i1qsw7ywx25v262p8syz339zcbvfkx295xz26hmqrn944xa6x"; - - unpackPhase = '' - unpackFile $src - mv llvm-${version}* llvm - sourceRoot=$PWD/llvm - '' + optionalString enablePolly '' - unpackFile $polly_src - mv polly-* $sourceRoot/tools/polly - ''; - - outputs = [ "out" "lib" "dev" "python" ]; - - nativeBuildInputs = [ cmake python3 ] - ++ optional enableManpages python3.pkgs.sphinx; - - buildInputs = [ libxml2 libffi ]; - - propagatedBuildInputs = [ ncurses zlib ]; - - patches = [ - (fetchpatch { - url = "https://bugzilla.redhat.com/attachment.cgi?id=1389687"; - name = "llvm-gcc8-type-mismatch.patch"; - sha256 = "0ga2123aclq3x9w72d0rm0az12m8c1i4r1106vh701hf4cghgbch"; - }) - ./fix-gcc9.patch - #(fetchpatch { - # name = "llvm-fix-gcc9.patch"; - # url = "https://reviews.llvm.org/file/data/zs3ck5ryvc5n672fd2kw/PHID-FILE-byoqefzwmkd7qnlip4v2/file"; - # sha256 = "0injj1hqgrbcbihhwp2nbal88jfykad30r54f2cdcx7gws2fcy8i"; - # stripLen = 1; - #}) - - # When cross-compiling we configure llvm-config-native with an approximation - # of the flags used for the normal LLVM build. To avoid the need for building - # a native libLLVM.so (which would fail) we force llvm-config to be linked - # statically against the necessary LLVM components always. - ../../llvm-config-link-static.patch - - ./gnu-install-dirs.patch - - # Fix invalid std::string(nullptr) for GCC 12 - (fetchpatch { - name = "nvptx-gcc-12.patch"; - url = "https://github.com/llvm/llvm-project/commit/99e64623ec9b31def9375753491cc6093c831809.patch"; - sha256 = "0zjfjgavqzi2ypqwqnlvy6flyvdz8hi1anwv0ybwnm2zqixg7za3"; - stripLen = 1; - }) - - ../../llvm-7-musl.patch - ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; - - postPatch = optionalString stdenv.isDarwin '' - substituteInPlace cmake/modules/AddLLVM.cmake \ - --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ - --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}" ''${extra_libdir})' "" - '' + '' - # FileSystem permissions tests fail with various special bits - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "Path.cpp" "" - rm unittests/Support/Path.cpp - - # llvm-5 does not support dwarf-5 style info, fails on gcc-11. - rm test/tools/llvm-symbolizer/print_context.c - '' + optionalString stdenv.isAarch64 '' - patch -p0 < ${../../aarch64.patch} - '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../../TLI-musl.patch} - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "add_subdirectory(DynamicLibrary)" "" - rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp - '' + '' - # Tweak tests to ignore namespace part of type to support - # gcc-12: https://gcc.gnu.org/PR103598. - # The change below mangles strings like: - # CHECK-NEXT: Starting llvm::Function pass manager run. - # to: - # CHECK-NEXT: Starting {{.*}}Function pass manager run. - for f in \ - test/Other/new-pass-manager.ll \ - test/Other/new-pm-defaults.ll \ - test/Other/new-pm-lto-defaults.ll \ - test/Other/new-pm-thinlto-defaults.ll \ - test/Other/pass-pipeline-parsing.ll \ - test/Transforms/Inline/cgscc-incremental-invalidate.ll \ - test/Transforms/Inline/clear-analyses.ll \ - ; do - echo "PATCH: $f" - substituteInPlace $f \ - --replace 'Starting llvm::' 'Starting {{.*}}' \ - --replace 'Finished llvm::' 'Finished {{.*}}' - done - ''; - - preConfigure = '' - # Workaround for configure flags that need to have spaces - cmakeFlagsArray+=( - -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' - ) - ''; - - # hacky fix: created binaries need to be run before installation - preBuild = '' - mkdir -p $out/ - ln -sv $PWD/lib $out - ''; - - cmakeBuildType = if debugVersion then "Debug" else "Release"; - - cmakeFlags = with stdenv; let - # These flags influence llvm-config's BuildVariables.inc in addition to the - # general build. We need to make sure these are also passed via - # CROSS_TOOLCHAIN_FLAGS_NATIVE when cross-compiling or llvm-config-native - # will return different results from the cross llvm-config. - # - # Some flags don't need to be repassed because LLVM already does so (like - # CMAKE_BUILD_TYPE), others are irrelevant to the result. - flagsForLlvmConfig = [ - "-DLLVM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake/llvm/" - "-DLLVM_ENABLE_RTTI=ON" - ] ++ optionals enableSharedLibraries [ - "-DLLVM_LINK_LLVM_DYLIB=ON" - ]; - in flagsForLlvmConfig ++ [ - "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc - "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" - "-DLLVM_ENABLE_FFI=ON" - - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" - ] - ++ lib.optionals enableManpages [ - "-DLLVM_BUILD_DOCS=ON" - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ lib.optionals (enableGoldPlugin) [ - "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ] ++ lib.optionals (isDarwin) [ - "-DLLVM_ENABLE_LIBCXX=ON" - "-DCAN_TARGET_i386=false" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" - ( - let - nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; - nativeBintools = nativeCC.bintools.bintools; - nativeToolchainFlags = [ - "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" - "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" - "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" - "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" - "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" - ]; - # We need to repass the custom GNUInstallDirs values, otherwise CMake - # will choose them for us, leading to wrong results in llvm-config-native - nativeInstallFlags = [ - "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" - "-DCMAKE_INSTALL_BINDIR=${placeholder "out"}/bin" - "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include" - "-DCMAKE_INSTALL_LIBDIR=${placeholder "lib"}/lib" - "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "lib"}/libexec" - ]; - in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=" - + lib.concatStringsSep ";" (lib.concatLists [ - flagsForLlvmConfig - nativeToolchainFlags - nativeInstallFlags - ]) - ) - ]; - - postBuild = '' - rm -fR $out - ''; - - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib - ''; - - postInstall = '' - mkdir -p $python/share - mv $out/share/opt-viewer $python/share/opt-viewer - moveToOutput "bin/llvm-config*" "$dev" - substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ - --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" - substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ - --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")' - '' - + optionalString (stdenv.isDarwin && enableSharedLibraries) '' - ${lib.concatMapStringsSep "\n" (v: '' - ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib - '') versionSuffixes} - '' - + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native - ''; - - doCheck = stdenv.isLinux && (!stdenv.isi686) - && (stdenv.hostPlatform == stdenv.buildPlatform); - - checkTarget = "check-all"; - - requiredSystemFeatures = [ "big-parallel" ]; - meta = llvm_meta // { - homepage = "https://llvm.org/"; - description = "A collection of modular and reusable compiler and toolchain technologies"; - longDescription = '' - The LLVM Project is a collection of modular and reusable compiler and - toolchain technologies. Despite its name, LLVM has little to do with - traditional virtual machines. The name "LLVM" itself is not an acronym; it - is the full name of the project. - LLVM began as a research project at the University of Illinois, with the - goal of providing a modern, SSA-based compilation strategy capable of - supporting both static and dynamic compilation of arbitrary programming - languages. Since then, LLVM has grown to be an umbrella project consisting - of a number of subprojects, many of which are being used in production by - a wide variety of commercial and open source projects as well as being - widely used in academic research. Code in the LLVM project is licensed - under the "Apache 2.0 License with LLVM exceptions". - ''; - }; -} // lib.optionalAttrs enableManpages { - pname = "llvm-manpages"; - - buildPhase = '' - make docs-llvm-man - ''; - - propagatedBuildInputs = []; - - installPhase = '' - make -C docs install - ''; - - outputs = [ "out" ]; - - doCheck = false; - - meta = llvm_meta // { - description = "man pages for LLVM ${version}"; - }; -}) diff --git a/pkgs/development/compilers/llvm/5/llvm/fix-gcc9.patch b/pkgs/development/compilers/llvm/5/llvm/fix-gcc9.patch deleted file mode 100644 index eaf71f1468def..0000000000000 --- a/pkgs/development/compilers/llvm/5/llvm/fix-gcc9.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/lib/Target/Mips/MipsFastISel.cpp b/lib/Target/Mips/MipsFastISel.cpp -index f79cb0e6..c6279046 100644 ---- a/lib/Target/Mips/MipsFastISel.cpp -+++ b/lib/Target/Mips/MipsFastISel.cpp -@@ -70,6 +70,7 @@ - #include <cassert> - #include <cstdint> - #include <new> -+#include <array> - - #define DEBUG_TYPE "mips-fastisel" - -@@ -1309,13 +1310,13 @@ bool MipsFastISel::fastLowerArguments() { - return false; - } - -- const ArrayRef<MCPhysReg> GPR32ArgRegs = {Mips::A0, Mips::A1, Mips::A2, -- Mips::A3}; -- const ArrayRef<MCPhysReg> FGR32ArgRegs = {Mips::F12, Mips::F14}; -- const ArrayRef<MCPhysReg> AFGR64ArgRegs = {Mips::D6, Mips::D7}; -- ArrayRef<MCPhysReg>::iterator NextGPR32 = GPR32ArgRegs.begin(); -- ArrayRef<MCPhysReg>::iterator NextFGR32 = FGR32ArgRegs.begin(); -- ArrayRef<MCPhysReg>::iterator NextAFGR64 = AFGR64ArgRegs.begin(); -+ std::array<MCPhysReg, 4> GPR32ArgRegs = {{Mips::A0, Mips::A1, Mips::A2, -+ Mips::A3}}; -+ std::array<MCPhysReg, 2> FGR32ArgRegs = {{Mips::F12, Mips::F14}}; -+ std::array<MCPhysReg, 2> AFGR64ArgRegs = {{Mips::D6, Mips::D7}}; -+ auto NextGPR32 = GPR32ArgRegs.begin(); -+ auto NextFGR32 = FGR32ArgRegs.begin(); -+ auto NextAFGR64 = AFGR64ArgRegs.begin(); - - struct AllocatedReg { - const TargetRegisterClass *RC; diff --git a/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs-polly.patch b/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs-polly.patch deleted file mode 100644 index 40f6fa06036cb..0000000000000 --- a/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs-polly.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff --git a/tools/polly/CMakeLists.txt b/tools/polly/CMakeLists.txt -index 9ddc0f7ff81d..7ca45f286d47 100644 ---- a/tools/polly/CMakeLists.txt -+++ b/tools/polly/CMakeLists.txt -@@ -2,7 +2,11 @@ - if (NOT DEFINED LLVM_MAIN_SRC_DIR) - project(Polly) - cmake_minimum_required(VERSION 3.4.3) -+endif() -+ -+include(GNUInstallDirs) - -+if (NOT DEFINED LLVM_MAIN_SRC_DIR) - # Where is LLVM installed? - find_package(LLVM CONFIG REQUIRED) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR}) -@@ -157,14 +161,14 @@ include_directories( - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/ -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".svn" EXCLUDE - ) - - install(DIRECTORY ${POLLY_BINARY_DIR}/include/ -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN "CMakeFiles" EXCLUDE -diff --git a/tools/polly/cmake/CMakeLists.txt b/tools/polly/cmake/CMakeLists.txt -index 969292cd6b00..d7aea77bdd20 100644 ---- a/tools/polly/cmake/CMakeLists.txt -+++ b/tools/polly/cmake/CMakeLists.txt -@@ -79,18 +79,18 @@ file(GENERATE - - # Generate PollyConfig.cmake for the install tree. - unset(POLLY_EXPORTS) --set(POLLY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") -+set(POLLY_INSTALL_PREFIX "") - set(POLLY_CONFIG_LLVM_CMAKE_DIR "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") --set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") --set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}") -+set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") -+set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") - if (POLLY_BUNDLED_ISL) - set(POLLY_CONFIG_INCLUDE_DIRS -- "${POLLY_INSTALL_PREFIX}/include" -- "${POLLY_INSTALL_PREFIX}/include/polly" -+ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}" -+ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}/polly" - ) - else() - set(POLLY_CONFIG_INCLUDE_DIRS -- "${POLLY_INSTALL_PREFIX}/include" -+ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_INCLUDEDIR}" - ${ISL_INCLUDE_DIRS} - ) - endif() -@@ -100,12 +100,12 @@ endif() - foreach(tgt IN LISTS POLLY_CONFIG_EXPORTED_TARGETS) - get_target_property(tgt_type ${tgt} TYPE) - if (tgt_type STREQUAL "EXECUTABLE") -- set(tgt_prefix "bin/") -+ set(tgt_prefix "${CMAKE_INSTALL_BINDIR}/") - else() -- set(tgt_prefix "lib/") -+ set(tgt_prefix "${CMAKE_INSTALL_LIBDIR}/") - endif() - -- set(tgt_path "${CMAKE_INSTALL_PREFIX}/${tgt_prefix}$<TARGET_FILE_NAME:${tgt}>") -+ set(tgt_path "${tgt_prefix}$<TARGET_FILE_NAME:${tgt}>") - file(RELATIVE_PATH tgt_path ${POLLY_CONFIG_CMAKE_DIR} ${tgt_path}) - - if (NOT tgt_type STREQUAL "INTERFACE_LIBRARY") -diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake -index 32bed50bb060..cca5bfff4970 100644 ---- a/tools/polly/cmake/polly_macros.cmake -+++ b/tools/polly/cmake/polly_macros.cmake -@@ -44,8 +44,8 @@ macro(add_polly_library name) - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly") - install(TARGETS ${name} - EXPORT LLVMExports -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - endif() - set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) - endmacro(add_polly_library) -diff --git a/tools/polly/lib/External/CMakeLists.txt b/tools/polly/lib/External/CMakeLists.txt -index 286c04fba287..07905e68f595 100644 ---- a/tools/polly/lib/External/CMakeLists.txt -+++ b/tools/polly/lib/External/CMakeLists.txt -@@ -268,7 +268,7 @@ if (POLLY_BUNDLED_ISL) - install(DIRECTORY - ${ISL_SOURCE_DIR}/include/ - ${ISL_BINARY_DIR}/include/ -- DESTINATION include/polly -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/polly - FILES_MATCHING - PATTERN "*.h" - PATTERN "CMakeFiles" EXCLUDE diff --git a/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs.patch deleted file mode 100644 index 3f6d6acb83f7c..0000000000000 --- a/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs.patch +++ /dev/null @@ -1,386 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c1e03aed4809..8b8bbb8c403e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -279,15 +279,21 @@ if (CMAKE_BUILD_TYPE AND - message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") - endif() - -+include(GNUInstallDirs) -+ - set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) - --set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')") -+set(LLVM_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING -+ "Path for binary subdirectory (defaults to 'bin')") - mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) - - set(LLVM_UTILS_INSTALL_DIR "bin" CACHE STRING - "Path to install LLVM utilities (enabled by LLVM_INSTALL_UTILS=ON) (defaults to LLVM_TOOLS_INSTALL_DIR)") - mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) - -+set(LLVM_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/cmake/llvm" CACHE STRING -+ "Path for CMake subdirectory (defaults to lib/cmake/llvm)" ) -+ - # They are used as destination of target generators. - set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) - set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) -@@ -512,9 +518,9 @@ option (LLVM_ENABLE_DOXYGEN "Use doxygen to generate llvm API documentation." OF - option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF) - option (LLVM_ENABLE_OCAMLDOC "Build OCaml bindings documentation." ON) - --set(LLVM_INSTALL_DOXYGEN_HTML_DIR "share/doc/llvm/doxygen-html" -+set(LLVM_INSTALL_DOXYGEN_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html" - CACHE STRING "Doxygen-generated HTML documentation install directory") --set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "share/doc/llvm/ocaml-html" -+set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html" - CACHE STRING "OCamldoc-generated HTML documentation install directory") - - option (LLVM_BUILD_EXTERNAL_COMPILER_RT -@@ -945,7 +951,7 @@ add_subdirectory(cmake/modules) - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/llvm include/llvm-c -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT llvm-headers - FILES_MATCHING - PATTERN "*.def" -@@ -957,7 +963,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - ) - - install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT llvm-headers - FILES_MATCHING - PATTERN "*.def" -diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake -index 1c922651b133..d555fd627a4f 100644 ---- a/cmake/modules/AddLLVM.cmake -+++ b/cmake/modules/AddLLVM.cmake -@@ -589,11 +589,11 @@ macro(add_llvm_library name) - else() - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LTO" OR - (LLVM_LINK_LLVM_DYLIB AND ${name} STREQUAL "LLVM")) -- set(install_dir lib${LLVM_LIBDIR_SUFFIX}) -+ set(install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - if(ARG_SHARED OR BUILD_SHARED_LIBS) - if(WIN32 OR CYGWIN OR MINGW) - set(install_type RUNTIME) -- set(install_dir bin) -+ set(install_dir ${CMAKE_INSTALL_BINDIR}) - else() - set(install_type LIBRARY) - endif() -@@ -637,9 +637,9 @@ macro(add_llvm_loadable_module name) - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - if(WIN32 OR CYGWIN) - # DLL platform -- set(dlldir "bin") -+ set(dlldir "${CMAKE_INSTALL_BINDIR}") - else() -- set(dlldir "lib${LLVM_LIBDIR_SUFFIX}") -+ set(dlldir "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") - endif() - - if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR -@@ -651,7 +651,7 @@ macro(add_llvm_loadable_module name) - install(TARGETS ${name} - ${export_to_llvmexports} - LIBRARY DESTINATION ${dlldir} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - endif() - set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) - endif() -@@ -864,7 +864,7 @@ macro(add_llvm_example name) - endif() - add_llvm_executable(${name} ${ARGN}) - if( LLVM_BUILD_EXAMPLES ) -- install(TARGETS ${name} RUNTIME DESTINATION examples) -+ install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) - endif() - set_target_properties(${name} PROPERTIES FOLDER "Examples") - endmacro(add_llvm_example name) -@@ -1275,7 +1275,7 @@ function(llvm_install_library_symlink name dest type) - set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX}) - set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}) - -- set(output_dir lib${LLVM_LIBDIR_SUFFIX}) -+ set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - if(WIN32 AND "${type}" STREQUAL "SHARED") - set(output_dir bin) - endif() -@@ -1293,7 +1293,7 @@ function(llvm_install_library_symlink name dest type) - endif() - endfunction() - --function(llvm_install_symlink name dest) -+function(llvm_install_symlink name dest output_dir) - cmake_parse_arguments(ARG "ALWAYS_GENERATE" "COMPONENT" "" ${ARGN}) - foreach(path ${CMAKE_MODULE_PATH}) - if(EXISTS ${path}/LLVMInstallSymlink.cmake) -@@ -1316,7 +1316,7 @@ function(llvm_install_symlink name dest) - set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX}) - - install(SCRIPT ${INSTALL_SYMLINK} -- CODE "install_symlink(${full_name} ${full_dest} ${LLVM_TOOLS_INSTALL_DIR})" -+ CODE "install_symlink(${full_name} ${full_dest} ${output_dir})" - COMPONENT ${component}) - - if (NOT CMAKE_CONFIGURATION_TYPES AND NOT ARG_ALWAYS_GENERATE) -@@ -1400,7 +1400,8 @@ function(add_llvm_tool_symlink link_name target) - endif() - - if ((TOOL_IS_TOOLCHAIN OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) AND LLVM_BUILD_TOOLS) -- llvm_install_symlink(${link_name} ${target}) -+ GNUInstallDirs_get_absolute_install_dir(output_dir LLVM_TOOLS_INSTALL_DIR) -+ llvm_install_symlink(${link_name} ${target} ${output_dir}) - endif() - endif() - endfunction() -@@ -1452,9 +1453,9 @@ function(llvm_setup_rpath name) - - if (APPLE) - set(_install_name_dir INSTALL_NAME_DIR "@rpath") -- set(_install_rpath "@loader_path/../lib" ${extra_libdir}) -+ set(_install_rpath "@loader_path/../${CMAKE_INSTALL_LIBDIR}" ${extra_libdir}) - elseif(UNIX) -- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) -+ set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) - if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") - set_property(TARGET ${name} APPEND_STRING PROPERTY - LINK_FLAGS " -Wl,-z,origin ") -diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake -index 1d8094cc505f..afdbe6e6d19c 100644 ---- a/cmake/modules/AddOCaml.cmake -+++ b/cmake/modules/AddOCaml.cmake -@@ -140,9 +140,9 @@ function(add_ocaml_library name) - endforeach() - - if( APPLE ) -- set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") -+ set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") - elseif( UNIX ) -- set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") -+ set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") - endif() - list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") - -diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake -index 4540c5c36c8e..4cefb17fbd55 100644 ---- a/cmake/modules/AddSphinxTarget.cmake -+++ b/cmake/modules/AddSphinxTarget.cmake -@@ -73,7 +73,7 @@ function (add_sphinx_target builder project) - - elseif (builder STREQUAL html) - string(TOUPPER "${project}" project_upper) -- set(${project_upper}_INSTALL_SPHINX_HTML_DIR "share/doc/${project}/html" -+ set(${project_upper}_INSTALL_SPHINX_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/html" - CACHE STRING "HTML documentation install directory for ${project}") - - # '/.' indicates: copy the contents of the directory directly into -diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt -index ac4b0b7c0304..21a6a3da8667 100644 ---- a/cmake/modules/CMakeLists.txt -+++ b/cmake/modules/CMakeLists.txt -@@ -1,4 +1,4 @@ --set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) -+set(LLVM_INSTALL_PACKAGE_DIR ${LLVM_INSTALL_CMAKE_DIR} CACHE STRING "Path for CMake subdirectory (defaults to 'cmake/llvm')") - set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") - - # First for users who use an installed LLVM, create the LLVMExports.cmake file. -@@ -84,11 +84,11 @@ foreach(p ${_count}) - set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE} - get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)") - endforeach(p) --set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include") --set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}") -+set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") -+set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") - set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}") - set(LLVM_CONFIG_BINARY_DIR "\${LLVM_INSTALL_PREFIX}") --set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin") -+set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") - set(LLVM_CONFIG_EXPORTS_FILE "\${LLVM_CMAKE_DIR}/LLVMExports.cmake") - set(LLVM_CONFIG_EXPORTS "${LLVM_EXPORTS}") - configure_file( -diff --git a/cmake/modules/LLVMInstallSymlink.cmake b/cmake/modules/LLVMInstallSymlink.cmake -index 482697b06baf..af2ac1e6c979 100644 ---- a/cmake/modules/LLVMInstallSymlink.cmake -+++ b/cmake/modules/LLVMInstallSymlink.cmake -@@ -10,7 +10,7 @@ function(install_symlink name target outdir) - set(LINK_OR_COPY copy) - endif() - -- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}/") -+ set(bindir "${DESTDIR}${outdir}/") - - message("Creating ${name}") - -diff --git a/docs/CMake.rst b/docs/CMake.rst -index b6ebf37adc92..34c73d2869e0 100644 ---- a/docs/CMake.rst -+++ b/docs/CMake.rst -@@ -196,7 +196,7 @@ CMake manual, or execute ``cmake --help-variable VARIABLE_NAME``. - **LLVM_LIBDIR_SUFFIX**:STRING - Extra suffix to append to the directory where libraries are to be - installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64`` -- to install libraries to ``/usr/lib64``. -+ to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``. - - **CMAKE_C_FLAGS**:STRING - Extra flags to use when compiling C source files. -@@ -461,8 +461,8 @@ LLVM-specific variables - - **LLVM_INSTALL_DOXYGEN_HTML_DIR**:STRING - The path to install Doxygen-generated HTML documentation to. This path can -- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to -- `share/doc/llvm/doxygen-html`. -+ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to -+ `${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html`. - - **LLVM_ENABLE_SPHINX**:BOOL - If specified, CMake will search for the ``sphinx-build`` executable and will make -@@ -493,13 +493,33 @@ LLVM-specific variables - - **LLVM_INSTALL_SPHINX_HTML_DIR**:STRING - The path to install Sphinx-generated HTML documentation to. This path can -- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to -- `share/doc/llvm/html`. -+ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to -+ `${CMAKE_INSTALL_DOCDIR}/${project}/html`. - - **LLVM_INSTALL_OCAMLDOC_HTML_DIR**:STRING - The path to install OCamldoc-generated HTML documentation to. This path can -- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to -- `share/doc/llvm/ocaml-html`. -+ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to -+ `${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html`. -+ -+**CMAKE_INSTALL_BINDIR**:STRING -+ The path to install binary tools, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `bin`. -+ -+**CMAKE_INSTALL_LIBDIR**:STRING -+ The path to install libraries, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `lib`. -+ -+**CMAKE_INSTALL_INCLUDEDIR**:STRING -+ The path to install header files, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `include`. -+ -+**CMAKE_INSTALL_DOCDIR**:STRING -+ The path to install documentation, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `share/doc`. -+ -+**CMAKE_INSTALL_MANDIR**:STRING -+ The path to install manpage files, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `share/man`. - - **LLVM_CREATE_XCODE_TOOLCHAIN**:BOOL - OS X Only: If enabled CMake will generate a target named -@@ -651,9 +671,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). - - This file is available in two different locations. - --* ``<INSTALL_PREFIX>/lib/cmake/llvm/LLVMConfig.cmake`` where -- ``<INSTALL_PREFIX>`` is the install prefix of an installed version of LLVM. -- On Linux typically this is ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. -+* ``<LLVM_INSTALL_PACKAGE_DIR>LLVMConfig.cmake`` where -+ ``<LLVM_INSTALL_PACKAGE_DIR>`` is the location where LLVM CMake modules are -+ installed as part of an installed version of LLVM. This is typically -+ ``cmake/llvm/`` within the lib directory. On Linux, this is typically -+ ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. - - * ``<LLVM_BUILD_ROOT>/lib/cmake/llvm/LLVMConfig.cmake`` where - ``<LLVM_BUILD_ROOT>`` is the root of the LLVM build tree. **Note: this is only -diff --git a/include/llvm/CMakeLists.txt b/include/llvm/CMakeLists.txt -index 1d5ca3ba92b0..026f5453c1da 100644 ---- a/include/llvm/CMakeLists.txt -+++ b/include/llvm/CMakeLists.txt -@@ -4,5 +4,5 @@ add_subdirectory(Support) - # If we're doing an out-of-tree build, copy a module map for generated - # header files into the build area. - if (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") -- configure_file(module.modulemap.build module.modulemap COPYONLY) -+ configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY) - endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") -diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in -index f201e1f7bff0..4582ed556a02 100644 ---- a/tools/llvm-config/BuildVariables.inc.in -+++ b/tools/llvm-config/BuildVariables.inc.in -@@ -24,6 +24,10 @@ - #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" - #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" - #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" -+#define LLVM_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@" -+#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" -+#define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" -+#define LLVM_INSTALL_CMAKEDIR "@LLVM_INSTALL_CMAKE_DIR@" - #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" - #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" - #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 08b096afb052..2deae0dcfacc 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -332,12 +332,26 @@ int main(int argc, char **argv) { - ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include"); - } else { - ActivePrefix = CurrentExecPrefix; -- ActiveIncludeDir = ActivePrefix + "/include"; -- SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR)); -- sys::fs::make_absolute(ActivePrefix, path); -- ActiveBinDir = path.str(); -- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; -- ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_INCLUDEDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveIncludeDir = std::string(path.str()); -+ } -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_BINDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveBinDir = std::string(path.str()); -+ } -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveLibDir = std::string(path.str()); -+ } -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_CMAKEDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveCMakeDir = std::string(path.str()); -+ } - ActiveIncludeOption = "-I" + ActiveIncludeDir; - } - -diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt -index 6e913519a809..85641eef721f 100644 ---- a/tools/lto/CMakeLists.txt -+++ b/tools/lto/CMakeLists.txt -@@ -19,7 +19,7 @@ set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/lto.exports) - add_llvm_library(LTO SHARED ${SOURCES} DEPENDS intrinsics_gen) - - install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h -- DESTINATION include/llvm-c -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c - COMPONENT LTO) - - if (APPLE) -diff --git a/tools/opt-viewer/CMakeLists.txt b/tools/opt-viewer/CMakeLists.txt -index 19b606933082..27b9f71b3d79 100644 ---- a/tools/opt-viewer/CMakeLists.txt -+++ b/tools/opt-viewer/CMakeLists.txt -@@ -8,6 +8,6 @@ set (files - - foreach (file ${files}) - install(PROGRAMS ${file} -- DESTINATION share/opt-viewer -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/opt-viewer - COMPONENT opt-viewer) - endforeach (file) diff --git a/pkgs/development/compilers/llvm/5/openmp/default.nix b/pkgs/development/compilers/llvm/5/openmp/default.nix deleted file mode 100644 index 900e920173fb6..0000000000000 --- a/pkgs/development/compilers/llvm/5/openmp/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, stdenv -, llvm_meta -, fetch -, cmake -, llvm -, targetLlvm -, perl -, version -}: - -stdenv.mkDerivation { - pname = "openmp"; - inherit version; - - src = fetch "openmp" "0p2n52676wlq6y9q99n5pivq6pvvda1p994r69fxj206ahn59jir"; - - nativeBuildInputs = [ cmake perl ]; - buildInputs = [ - (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) - ]; - - meta = llvm_meta // { - homepage = "https://openmp.llvm.org/"; - description = "Support for the OpenMP language"; - longDescription = '' - The OpenMP subproject of LLVM contains the components required to build an - executable OpenMP program that are outside the compiler itself. - Contains the code for the runtime library against which code compiled by - "clang -fopenmp" must be linked before it can run and the library that - supports offload to target devices. - ''; - # "All of the code is dual licensed under the MIT license and the UIUC - # License (a BSD-like license)": - license = with lib.licenses; [ mit ncsa ]; - }; -} diff --git a/pkgs/development/compilers/lunarml/default.nix b/pkgs/development/compilers/lunarml/default.nix index 35ebea77782f3..1fa448fe9d8e9 100644 --- a/pkgs/development/compilers/lunarml/default.nix +++ b/pkgs/development/compilers/lunarml/default.nix @@ -6,7 +6,7 @@ }: let - version = "0.0.20230924"; + version = "0.0.20231113"; in stdenvNoCC.mkDerivation { inherit version; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation { owner = "minoki"; repo = "LunarML"; rev = "refs/tags/v${version}"; - sha256 = "QN5iJEpJJZZuUfY/z57bpOQHDU31ecmJPWQtkXsLmDg="; + hash = "sha256-LmS+pkdCraY8sor+lsq/vCODFyVneKkZqjZqbJ1trb4="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/development/compilers/mcpp/default.nix index 0f556f85daa37..e8eb62a15f130 100644 --- a/pkgs/development/compilers/mcpp/default.nix +++ b/pkgs/development/compilers/mcpp/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation (finalAttrs: { hash= "sha256-T4feegblOeG+NU+c+PAobf8HT8KDSfcINkRAa1hNpkY="; }; + patches = [ + ./readlink.patch + ]; + configureFlags = [ "--enable-mcpplib" ]; meta = with lib; { diff --git a/pkgs/development/compilers/mcpp/readlink.patch b/pkgs/development/compilers/mcpp/readlink.patch new file mode 100644 index 0000000000000..0f5fc6d7e963d --- /dev/null +++ b/pkgs/development/compilers/mcpp/readlink.patch @@ -0,0 +1,24 @@ +From 1c4b0f26614bff331eb8a9f2b514309af6f31fd0 Mon Sep 17 00:00:00 2001 +From: Jose <pepone@users.noreply.github.com> +Date: Mon, 26 Jun 2023 16:43:43 +0200 +Subject: [PATCH] Add 'unistd' header for readlink (#8) + +--- + src/system.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/system.c b/src/system.c +index a3501f9..646caf6 100644 +--- a/src/system.c ++++ b/src/system.c +@@ -37,6 +37,11 @@ + * 2. append the system-dependent routines in this file. + */ ++ ++#ifndef _MSC_VER ++# include <unistd.h> // For readlink() ++#endif ++ + #if PREPROCESSED + #include "mcpp.H" + #else diff --git a/pkgs/development/compilers/mrustc/bootstrap.nix b/pkgs/development/compilers/mrustc/bootstrap.nix index a8bf26bacdfd9..0996702ec6253 100644 --- a/pkgs/development/compilers/mrustc/bootstrap.nix +++ b/pkgs/development/compilers/mrustc/bootstrap.nix @@ -2,7 +2,6 @@ , fetchurl , mrustc , mrustc-minicargo -, rust , llvm_12 , llvmPackages_12 , libffi @@ -74,7 +73,7 @@ stdenv.mkDerivation rec { "MRUSTC=${mrustc}/bin/mrustc" #"MINICARGO=${mrustc-minicargo}/bin/minicargo" # FIXME: we need to rebuild minicargo locally so --manifest-overrides is applied "LLVM_CONFIG=${llvm_12.dev}/bin/llvm-config" - "RUSTC_TARGET=${rust.toRustTarget stdenv.targetPlatform}" + "RUSTC_TARGET=${stdenv.targetPlatform.rust.rustcTarget}" ]; buildPhase = '' @@ -129,7 +128,7 @@ stdenv.mkDerivation rec { cp run_rustc/${outputDir}/prefix/bin/rustc_binary $out/bin/rustc cp -r run_rustc/${outputDir}/prefix/lib/* $out/lib/ - cp $out/lib/rustlib/${rust.toRustTarget stdenv.targetPlatform}/lib/*.so $out/lib/ + cp $out/lib/rustlib/${stdenv.targetPlatform.rust.rustcTarget}/lib/*.so $out/lib/ runHook postInstall ''; @@ -146,4 +145,3 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; }; } - diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 40e39d411d694..fff5762a38d72 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -29,6 +29,9 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security pkgs.darwin.apple_sdk.frameworks.Carbon]; cmakeFlags = [ "-DRUN_LDCONFIG=OFF" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; installCheckPhase = '' bin/neko bin/test.n diff --git a/pkgs/development/compilers/ocaml/builder.sh b/pkgs/development/compilers/ocaml/builder.sh index 88acc0654cf2b..85b26848f4e45 100644 --- a/pkgs/development/compilers/ocaml/builder.sh +++ b/pkgs/development/compilers/ocaml/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup configureFlags="-prefix $out $configureFlags" diff --git a/pkgs/development/compilers/rust/1_72.nix b/pkgs/development/compilers/rust/1_73.nix index f540c229c6ff6..37e75e0a7a4f1 100644 --- a/pkgs/development/compilers/rust/1_72.nix +++ b/pkgs/development/compilers/rust/1_73.nix @@ -20,8 +20,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.72.1"; - rustcSha256 = "sha256-f0iEX2pSzbtdY/sFKP1fUg60QydbVfmOMoFZ+GVo+JU="; + rustcVersion = "1.73.0"; + rustcSha256 = "sha256-ltYubR8tId96yKyzuYgkEfnnxwNhc/fy7enh8faxuzo="; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; @@ -35,25 +35,24 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.71.1"; + bootstrapVersion = "1.72.1"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "ea544e213cdf65194d9650df9d521dd2ed63251e2abe89c8123e336dfe580b21"; - x86_64-unknown-linux-gnu = "34778d1cda674990dfc0537bc600066046ae9cb5d65a07809f7e7da31d4689c4"; - x86_64-unknown-linux-musl = "67acc1744293e52f4b49231f3c503e8ad187c477e7b567e27925ec792d946a01"; - arm-unknown-linux-gnueabihf = "4c88b32849132504fce5b93bebf06dd0fa17988340c7fe97afa661e038dfa258"; - armv7-unknown-linux-gnueabihf = "8f8556dbd8b0350364c7dc8fda57549934bf3c26c65498dda5842087f5c90d60"; - aarch64-unknown-linux-gnu = "c7cf230c740a62ea1ca6a4304d955c286aea44e3c6fc960b986a8c2eeea4ec3f"; - aarch64-unknown-linux-musl = "da87f4ca2534886f1006b2e8abb0dda8db231ce82cc67b4857233ad48a21c87c"; - x86_64-apple-darwin = "916056603da88336aba68bbeab49711cc8fdb9cfb46a49b04850c0c09761f58c"; - aarch64-apple-darwin = "f4061b65b31ac75b9b5384c1f518e555f3da23f93bcf64dce252461ee65e9351"; - powerpc64le-unknown-linux-gnu = "bac57066882366e4628d1ed2bbe4ab19c0b373aaf45582c2da9f639f2f6ea537"; - riscv64gc-unknown-linux-gnu = "fcb67647b764669f3b4e61235fbdc0eca287229adf9aed8c41ce20ffaad4a3ea"; - mips64el-unknown-linux-gnuabi64 = "6523efea9cd48c0375bd621460d890c65457a5534fafb2d8b69a37ee1e2a39ed"; + i686-unknown-linux-gnu = "a2a849a701dfd6643aaaa27e1ed5ac56aea00f7dee26c00d81c520808efd8911"; + x86_64-unknown-linux-gnu = "4fbd8df2000cf73c632d67a219a7fc153537ceffa2e6474491e3db71fdd5a410"; + x86_64-unknown-linux-musl = "94eddc044868a944a887d0b0375e393cb3acc6ebc034e3eac2ef2890ec7c0eac"; + arm-unknown-linux-gnueabihf = "a4d90538882181722d3e7cb8d7f021770e29e6b6d28375452e31a98049600110"; + armv7-unknown-linux-gnueabihf = "4c8e6b3c705a84d17894d3a1cfe744fb6083dd57c61868e67aac8b8512640ecb"; + aarch64-unknown-linux-gnu = "190d0473cbe619f163d33a6c4e2ef982abdd4178f73abc3194631cd2d5c8ed8b"; + aarch64-unknown-linux-musl = "c83778d1a95f6604bc3610a9070e8a8435c60a8bca5117aad71ffab36dea020f"; + x86_64-apple-darwin = "d01e7e9a7482f88a51b4fd888f06234274b49f51b5476c2d14fd46fd6e99ba9e"; + aarch64-apple-darwin = "42b0aaf269b6d9c60db13a64a920336d6064ab11d0c7043c9deeb9d4f67b3983"; + powerpc64le-unknown-linux-gnu = "9310df247efc072f2ca27354a875c4989cf3c29c9e545255a7472895d830163c"; + riscv64gc-unknown-linux-gnu = "1e08cd3ecd29d5bf247e3f7f4bc97318b439f0443dd9c99c36edcfa717d55101"; }; - selectRustPackage = pkgs: pkgs.rust_1_72; + selectRustPackage = pkgs: pkgs.rust_1_73; rustcPatches = [ ]; } diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 7c0b46d55931f..97ac69270252d 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, rust, callPackage, version, hashes }: +{ stdenv, fetchurl, callPackage, version, hashes }: let - platform = rust.toRustTarget stdenv.hostPlatform; + platform = stdenv.hostPlatform.rust.rustcTarget; src = fetchurl { url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz"; diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 46e238ff47971..8eb628aa536b7 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,6 +1,6 @@ { lib, stdenv, pkgsBuildHost, pkgsHostHost , file, curl, pkg-config, python3, openssl, cmake, zlib -, installShellFiles, makeWrapper, rustPlatform, rust, rustc +, installShellFiles, makeWrapper, rustPlatform, rustc , CoreFoundation, Security , auditable ? !cargo-auditable.meta.broken , cargo-auditable @@ -116,6 +116,6 @@ rustPlatform.buildRustPackage.override { broken = stdenv.hostPlatform.isx86 && stdenv.buildPlatform != stdenv.hostPlatform; }; } -// lib.optionalAttrs (rust.toRustTarget stdenv.buildPlatform != rust.toRustTarget stdenv.hostPlatform) { +// lib.optionalAttrs (stdenv.buildPlatform.rust.rustcTarget != stdenv.hostPlatform.rust.rustcTarget) { HOST_PKG_CONFIG_PATH="${pkgsBuildBuild.pkg-config}/bin/pkg-config"; }) diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh index dd2c116a341b9..ebf8d900bb3b5 100755 --- a/pkgs/development/compilers/rust/print-hashes.sh +++ b/pkgs/development/compilers/rust/print-hashes.sh @@ -19,7 +19,6 @@ PLATFORMS=( aarch64-apple-darwin powerpc64le-unknown-linux-gnu riscv64gc-unknown-linux-gnu - mips64el-unknown-linux-gnuabi64 ) BASEURL=https://static.rust-lang.org/dist VERSION=${1:-} diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 1550887c3567f..1758abb6bea51 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,7 +1,7 @@ { lib, stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, targetPackages , llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget, llvmPackages , fetchurl, file, python3 -, darwin, cargo, cmake, rust, rustc, rustfmt +, darwin, cargo, cmake, rustc, rustfmt , pkg-config, openssl, xz , libiconv , which, libffi @@ -53,7 +53,7 @@ in stdenv.mkDerivation (finalAttrs: { # but it does support checking these idiosyncratic PKG_CONFIG_${TRIPLE} # environment variables. # [1]: https://github.com/rust-lang/pkg-config-rs/issues/53 - "PKG_CONFIG_${builtins.replaceStrings ["-"] ["_"] (rust.toRustTarget stdenv.buildPlatform)}" = + "PKG_CONFIG_${builtins.replaceStrings ["-"] ["_"] stdenv.buildPlatform.rust.rustcTarget}" = "${pkgsBuildHost.stdenv.cc.targetPrefix}pkg-config"; NIX_LDFLAGS = toString ( @@ -68,15 +68,18 @@ in stdenv.mkDerivation (finalAttrs: { # We need rust to build rust. If we don't provide it, configure will try to download it. # Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py configureFlags = let - setBuild = "--set=target.${rust.toRustTarget stdenv.buildPlatform}"; - setHost = "--set=target.${rust.toRustTarget stdenv.hostPlatform}"; - setTarget = "--set=target.${rust.toRustTarget stdenv.targetPlatform}"; - ccForBuild = "${pkgsBuildBuild.targetPackages.stdenv.cc}/bin/${pkgsBuildBuild.targetPackages.stdenv.cc.targetPrefix}cc"; - cxxForBuild = "${pkgsBuildBuild.targetPackages.stdenv.cc}/bin/${pkgsBuildBuild.targetPackages.stdenv.cc.targetPrefix}c++"; - ccForHost = "${pkgsBuildHost.targetPackages.stdenv.cc}/bin/${pkgsBuildHost.targetPackages.stdenv.cc.targetPrefix}cc"; - cxxForHost = "${pkgsBuildHost.targetPackages.stdenv.cc}/bin/${pkgsBuildHost.targetPackages.stdenv.cc.targetPrefix}c++"; - ccForTarget = "${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}cc"; - cxxForTarget = "${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}c++"; + prefixForStdenv = stdenv: "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}"; + ccPrefixForStdenv = stdenv: "${prefixForStdenv stdenv}${if (stdenv.cc.isClang or false) then "clang" else "cc"}"; + cxxPrefixForStdenv = stdenv: "${prefixForStdenv stdenv}${if (stdenv.cc.isClang or false) then "clang++" else "c++"}"; + setBuild = "--set=target.${stdenv.buildPlatform.rust.rustcTarget}"; + setHost = "--set=target.${stdenv.hostPlatform.rust.rustcTarget}"; + setTarget = "--set=target.${stdenv.targetPlatform.rust.rustcTarget}"; + ccForBuild = ccPrefixForStdenv pkgsBuildBuild.targetPackages.stdenv; + cxxForBuild = cxxPrefixForStdenv pkgsBuildBuild.targetPackages.stdenv; + ccForHost = ccPrefixForStdenv pkgsBuildHost.targetPackages.stdenv; + cxxForHost = cxxPrefixForStdenv pkgsBuildHost.targetPackages.stdenv; + ccForTarget = ccPrefixForStdenv pkgsBuildTarget.targetPackages.stdenv; + cxxForTarget = cxxPrefixForStdenv pkgsBuildTarget.targetPackages.stdenv; in [ "--release-channel=stable" "--set=build.rustc=${rustc}/bin/rustc" @@ -90,23 +93,23 @@ in stdenv.mkDerivation (finalAttrs: { "--tools=rustc,rust-analyzer-proc-macro-srv" "--enable-rpath" "--enable-vendor" - "--build=${rust.toRustTargetSpec stdenv.buildPlatform}" - "--host=${rust.toRustTargetSpec stdenv.hostPlatform}" + "--build=${stdenv.buildPlatform.rust.rustcTargetSpec}" + "--host=${stdenv.hostPlatform.rust.rustcTargetSpec}" # std is built for all platforms in --target. "--target=${concatStringsSep "," ([ - (rust.toRustTargetSpec stdenv.targetPlatform) + stdenv.targetPlatform.rust.rustcTargetSpec # (build!=target): When cross-building a compiler we need to add # the build platform as well so rustc can compile build.rs # scripts. ] ++ optionals (stdenv.buildPlatform != stdenv.targetPlatform && !fastCross) [ - (rust.toRustTargetSpec stdenv.buildPlatform) + stdenv.buildPlatform.rust.rustcTargetSpec # (host!=target): When building a cross-targeting compiler we # need to add the host platform as well so rustc can compile # build.rs scripts. ] ++ optionals (stdenv.hostPlatform != stdenv.targetPlatform && !fastCross) [ - (rust.toRustTargetSpec stdenv.hostPlatform) + stdenv.hostPlatform.rust.rustcTargetSpec ])}" "${setBuild}.cc=${ccForBuild}" @@ -137,7 +140,7 @@ in stdenv.mkDerivation (finalAttrs: { "${setHost}.musl-root=${pkgsBuildHost.targetPackages.stdenv.cc.libc}" ] ++ optionals stdenv.targetPlatform.isMusl [ "${setTarget}.musl-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}" - ] ++ optionals (rust.IsNoStdTarget stdenv.targetPlatform) [ + ] ++ optionals stdenv.targetPlatform.rust.isNoStdTarget [ "--disable-docs" ] ++ optionals (stdenv.isDarwin && stdenv.isx86_64) [ # https://github.com/rust-lang/rust/issues/92173 @@ -149,12 +152,12 @@ in stdenv.mkDerivation (finalAttrs: { buildPhase = if fastCross then " runHook preBuild - mkdir -p build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-{std,rustc}/${rust.toRustTargetSpec stdenv.hostPlatform}/release/ - ln -s ${rustc}/lib/rustlib/${rust.toRustTargetSpec stdenv.hostPlatform}/libstd-*.so build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-std/${rust.toRustTargetSpec stdenv.hostPlatform}/release/libstd.so - ln -s ${rustc}/lib/rustlib/${rust.toRustTargetSpec stdenv.hostPlatform}/librustc_driver-*.so build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-rustc/${rust.toRustTargetSpec stdenv.hostPlatform}/release/librustc.so - ln -s ${rustc}/bin/rustc build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-rustc/${rust.toRustTargetSpec stdenv.hostPlatform}/release/rustc-main - touch build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-std/${rust.toRustTargetSpec stdenv.hostPlatform}/release/.libstd.stamp - touch build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-rustc/${rust.toRustTargetSpec stdenv.hostPlatform}/release/.librustc.stamp + mkdir -p build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-{std,rustc}/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/ + ln -s ${rustc}/lib/rustlib/${stdenv.hostPlatform.rust.rustcTargetSpec}/libstd-*.so build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-std/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/libstd.so + ln -s ${rustc}/lib/rustlib/${stdenv.hostPlatform.rust.rustcTargetSpec}/librustc_driver-*.so build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/librustc.so + ln -s ${rustc}/bin/rustc build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/rustc-main + touch build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-std/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/.libstd.stamp + touch build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/.librustc.stamp python ./x.py --keep-stage=0 --stage=1 build library/std runHook postBuild @@ -167,8 +170,8 @@ in stdenv.mkDerivation (finalAttrs: { mkdir -v $out/bin $doc $man makeWrapper ${rustc}/bin/rustc $out/bin/rustc --add-flags "--sysroot $out" makeWrapper ${rustc}/bin/rustdoc $out/bin/rustdoc --add-flags "--sysroot $out" - ln -s ${rustc}/lib/rustlib/{manifest-rust-std-,}${rust.toRustTargetSpec stdenv.hostPlatform} $out/lib/rustlib/ - echo rust-std-${rust.toRustTargetSpec stdenv.hostPlatform} >> $out/lib/rustlib/components + ln -s ${rustc}/lib/rustlib/{manifest-rust-std-,}${stdenv.hostPlatform.rust.rustcTargetSpec} $out/lib/rustlib/ + echo rust-std-${stdenv.hostPlatform.rust.rustcTargetSpec} >> $out/lib/rustlib/components lndir ${rustc.doc} $doc lndir ${rustc.man} $man @@ -288,9 +291,8 @@ in stdenv.mkDerivation (finalAttrs: { "i686-freebsd13" "x86_64-freebsd13" "x86_64-solaris" "aarch64-linux" "armv6l-linux" "armv7l-linux" "i686-linux" - "loongarch64-linux" "mipsel-linux" "mips64el-linux" - "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" - "s390x-linux" "x86_64-linux" + "loongarch64-linux" "powerpc64-linux" "powerpc64le-linux" + "riscv64-linux" "s390x-linux" "x86_64-linux" "aarch64-netbsd" "armv7l-netbsd" "i686-netbsd" "powerpc-netbsd" "x86_64-netbsd" "i686-openbsd" "x86_64-openbsd" diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 6a06213e95994..68ceb1a7d7f64 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "souffle"; - version = "2.4"; + version = "2.4.1"; src = fetchFromGitHub { owner = "souffle-lang"; repo = "souffle"; rev = version; - sha256 = "sha256-5g2Ikbfm5nQrsgGntZZ/VbjqSDOj0AP/mnH1nW2b4co="; + sha256 = "sha256-U3/1iNOLFzuXiBsVDAc5AXnK4F982Uifp18jjFNUv2o="; }; patches = [ @@ -34,6 +34,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSOUFFLE_GIT=OFF" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; + }; + postInstall = '' wrapProgram "$out/bin/souffle" --prefix PATH : "${toolsPath}" ''; diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index c6c743ce1e595..f19501a6d7d82 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -55,10 +55,10 @@ stdenv.mkDerivation { }) ]; - nativeBuildInputs = [ pkg-config cmake spirv-tools ] + nativeBuildInputs = [ pkg-config cmake ] ++ (if isROCm then [ llvm ] else [ llvm.dev ]); - buildInputs = [ spirv-headers ] + buildInputs = [ spirv-headers spirv-tools ] ++ lib.optionals (!isROCm) [ llvm ]; nativeCheckInputs = [ lit ]; diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index 818ad22fae74c..79627eba7c839 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, fetchurl, fetchzip , autoconf, automake, autoreconfHook, clang, dos2unix, file, perl , pkg-config -, alsa-lib, coreutils, freetype, glib, glibc, gnugrep, libpulseaudio, libtool -, libuuid, openssl, pango, xorg +, alsa-lib, coreutils, freetype, glib, glibc, gnugrep, libGL, libpulseaudio +, libtool, libuuid, openssl, pango, xorg , squeakImageHash ? null, squeakSourcesHash ? null, squeakSourcesVersion ? null , squeakVersion ? null, squeakVmCommitHash ? null, squeakVmCommitHashHash ? null , squeakVmVersion ? null @@ -88,6 +88,7 @@ in stdenv.mkDerivation { glib glibc gnugrep + libGL libpulseaudio libtool libuuid diff --git a/pkgs/development/coq-modules/ITree/default.nix b/pkgs/development/coq-modules/ITree/default.nix index df41ab6e16180..aee24225021c2 100644 --- a/pkgs/development/coq-modules/ITree/default.nix +++ b/pkgs/development/coq-modules/ITree/default.nix @@ -5,9 +5,10 @@ mkCoqDerivation rec { owner = "DeepSpec"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.13" "8.17"; out = "5.1.1"; } + { case = range "8.13" "8.18"; out = "5.1.2"; } { case = range "8.10" "8.16"; out = "4.0.0"; } ] null; + release."5.1.2".sha256 = "sha256-uKJIjNXGWl0YS0WH52Rnr9Jz98Eo2k0X0qWB9hUYJMk="; release."5.1.1".sha256 = "sha256-VlmPNwaGkdWrH7Z6DGXRosGtjuuQ+FBiGcadN2Hg5pY="; release."5.1.0".sha256 = "sha256-ny7Mi1KgWADiFznkNJiRgD7Djc5SUclNgKOmWRxK+eo="; release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm"; diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index af2f56475fd7e..9420d69cb4b08 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -6,13 +6,14 @@ mkCoqDerivation { owner = "thery"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.14" "8.18"; out = "8.17"; } + { case = range "8.14" "8.18"; out = "8.18"; } { case = range "8.12" "8.16"; out = "8.15"; } { case = range "8.10" "8.11"; out = "8.10"; } { case = range "8.8" "8.9"; out = "8.8"; } { case = "8.7"; out = "8.7.2"; } ] null; + release."8.18".sha256 = "sha256-KObBEYerWhIStmq90G3vs9K5LUEOfB2SPxirwLiWQ6E="; release."8.17".sha256 = "sha256-D878t/PijVCopRKHYqfwdNvt3arGlI8yxbK/vI6qZUY="; release."8.15".sha256 = "sha256:1zr2q52r08na8265019pj9spcz982ivixk6cnzk6l1srn2g328gv"; release."8.14.1".sha256= "sha256:0dqf87xkzcpg7gglbxjyx68ad84w1w73icxgy3s7d3w563glc2p7"; diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index 49333b4169718..dac3fb2b74dff 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -8,6 +8,7 @@ mkCoqDerivation { repo = "coq-dpdgraph"; inherit version; defaultVersion = lib.switch coq.coq-version [ + { case = "8.18"; out = "1.0+8.18"; } { case = "8.17"; out = "1.0+8.17"; } { case = "8.16"; out = "1.0+8.16"; } { case = "8.15"; out = "1.0+8.15"; } @@ -19,10 +20,9 @@ mkCoqDerivation { { case = "8.9"; out = "0.6.5"; } { case = "8.8"; out = "0.6.3"; } { case = "8.7"; out = "0.6.2"; } - { case = "8.6"; out = "0.6.1"; } - { case = "8.5"; out = "0.6"; } ] null; + release."1.0+8.18".sha256 = "sha256-z14MI1VSYzPqmF1PqDXzymXWRMYoTlQAfR/P3Pdf7fI="; release."1.0+8.17".sha256 = "sha256-gcvL3vseLKEF9xinT0579jXBBaA5E3rJ5KaU8RfKtm4="; release."1.0+8.16".sha256 = "sha256-xy4xcVHaD1OHBdGUzUy3SeZnHtOf1+UIh6YjUYFINm0="; release."1.0+8.15".sha256 = "sha256:1pxr0gakcz297y8hhrnssv5j07ccd58pv7rh7qv5g7855pfqrkg7"; diff --git a/pkgs/development/embedded/blisp/default.nix b/pkgs/development/embedded/blisp/default.nix index 093e0ef195ca0..027ca82324f8a 100644 --- a/pkgs/development/embedded/blisp/default.nix +++ b/pkgs/development/embedded/blisp/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation (finalAttrs: { "-DBLISP_USE_SYSTEM_LIBRARIES=ON" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=implicit-function-declaration"; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; version = "v${finalAttrs.version}"; @@ -42,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mit; mainProgram = "blisp"; homepage = "https://github.com/pine64/blisp"; + platforms = platforms.unix; maintainers = [ maintainers.bdd ]; }; }) diff --git a/pkgs/development/embedded/elf2uf2-rs/default.nix b/pkgs/development/embedded/elf2uf2-rs/default.nix index d26c0072265c9..493381842109c 100644 --- a/pkgs/development/embedded/elf2uf2-rs/default.nix +++ b/pkgs/development/embedded/elf2uf2-rs/default.nix @@ -27,6 +27,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/JoNil/elf2uf2-rs"; license = with licenses; [ bsd0 ]; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ polygon fortuneteller2k ]; + maintainers = with maintainers; [ polygon moni ]; }; } diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix index edc6d73fffccd..fcb6e8c7a8a5d 100644 --- a/pkgs/development/guile-modules/guile-reader/default.nix +++ b/pkgs/development/guile-modules/guile-reader/default.nix @@ -27,7 +27,11 @@ stdenv.mkDerivation rec { libffi ]; - env.GUILE_SITE = "${guile-lib}/${guile.siteDir}"; + env = { + GUILE_SITE = "${guile-lib}/${guile.siteDir}"; + } // lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; configureFlags = [ "--with-guilemoduledir=$(out)/${guile.siteDir}" ]; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 24e722a9913eb..91213b0274d3b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -249,7 +249,9 @@ self: super: { # Fix ghc-9.6.x build errors. libmpd = appendPatch - (pkgs.fetchpatch { url = "https://github.com/vimus/libmpd-haskell/pull/138.patch"; + # https://github.com/vimus/libmpd-haskell/pull/138 + (pkgs.fetchpatch { url = "https://github.com/vimus/libmpd-haskell/compare/95d3b3bab5858d6d1f0e079d0ab7c2d182336acb...5737096a339edc265a663f51ad9d29baee262694.patch"; + name = "vimus-libmpd-haskell-pull-138.patch"; sha256 = "sha256-CvvylXyRmoCoRJP2MzRwL0SBbrEzDGqAjXS+4LsLutQ="; }) super.libmpd; @@ -259,8 +261,9 @@ self: super: { editedCabalFile = null; buildDepends = drv.buildDepends or [] ++ [ self.HUnit ]; patches = [(pkgs.fetchpatch { + # https://github.com/jgoerzen/configfile/pull/12 name = "ConfigFile-pr-12.patch"; - url = "https://github.com/jgoerzen/configfile/pull/12.patch"; + url = "https://github.com/jgoerzen/configfile/compare/d0a2e654be0b73eadbf2a50661d00574ad7b6f87...83ee30b43f74d2b6781269072cf5ed0f0e00012f.patch"; sha256 = "sha256-b7u9GiIAd2xpOrM0MfILHNb6Nt7070lNRIadn2l3DfQ="; })]; }) super.ConfigFile; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 5723167b408d0..2f5d72a0c50bb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1029,7 +1029,6 @@ broken-packages: - cut-the-crap # failure in job https://hydra.nixos.org/build/233238478 at 2023-09-02 - CV # failure in job https://hydra.nixos.org/build/233223571 at 2023-09-02 - d3js # failure in job https://hydra.nixos.org/build/233251474 at 2023-09-02 - - daemons # failure in job https://hydra.nixos.org/build/237233422 at 2023-10-21 - dag # failure in job https://hydra.nixos.org/build/233220719 at 2023-09-02 - DAG-Tournament # failure in job https://hydra.nixos.org/build/233218747 at 2023-09-02 - dahdit # failure in job https://hydra.nixos.org/build/233245113 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 b500247fd090d..e79dd7e72fe44 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -60,6 +60,9 @@ default-package-overrides: # hls-floskell-plugin 2.4 does not yet support floskell 0.11 - floskell < 0.11 + # Newer daemons requires GHC 9.6 + - daemons == 0.3.0 + extra-packages: - Cabal-syntax == 3.6.* # Dummy package that ensures packages depending on Cabal-syntax can work for Cabal < 3.8 - Cabal == 3.2.* # Used for packages needing newer Cabal on ghc 8.6 and 8.8 diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 7001e4220bae8..1819b29da460c 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -811,5 +811,18 @@ stdenv.mkDerivation ({ // optionalAttrs (args ? dontStrip) { inherit dontStrip; } // optionalAttrs (postPhases != []) { inherit postPhases; } // optionalAttrs (stdenv.buildPlatform.libc == "glibc"){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } + +# Implicit pointer to integer conversions are errors by default since clang 15. +# Works around https://gitlab.haskell.org/ghc/ghc/-/issues/23456. +// lib.optionalAttrs (stdenv.hasCC && stdenv.cc.isClang) { + NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion"; +} + +# Ensure libc++abi is linked even when clang is invoked as just `clang` or `cc`. +# Works around https://github.com/NixOS/nixpkgs/issues/166205. +# This can be dropped once a fix has been committed to cc-wrapper. +// lib.optionalAttrs (stdenv.hasCC && stdenv.cc.isClang && stdenv.cc.libcxx != null) { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; +} ) ) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7377db003b191..5138bf2965706 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -78840,6 +78840,34 @@ self: { }: mkDerivation { pname = "daemons"; + version = "0.3.0"; + sha256 = "05h03qk31lank60cd0ig9h4rf8zl6p4li5smba919lgpm89lyvy3"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring cereal data-default directory filepath ghc-prim + network pipes transformers unix + ]; + executableHaskellDepends = [ + base bytestring cereal containers data-default ghc-prim network + pipes transformers + ]; + testHaskellDepends = [ + base data-default directory ghc-prim HUnit test-framework + test-framework-hunit unix + ]; + description = "Daemons in Haskell made fun and easy"; + license = lib.licenses.gpl3Only; + }) {}; + + "daemons_0_4_0" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, data-default + , directory, filepath, ghc-prim, HUnit, network, pipes + , test-framework, test-framework-hunit, transformers, unix + }: + mkDerivation { + pname = "daemons"; version = "0.4.0"; sha256 = "10fcxk749q90mlwgknqn6l5mff8b09acmikxzh5jkk5sr6bj86hz"; isLibrary = true; @@ -78860,7 +78888,6 @@ self: { description = "Daemons in Haskell made fun and easy"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dag" = callPackage diff --git a/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix b/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix index c31e0dbe67f73..e59d2ed7c176a 100644 --- a/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix +++ b/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { # that as the version number, I guess. version = "2017"; - libname = pname + stdenv.targetPlatform.extensions.sharedLibrary; + libname = pname + stdenv.hostPlatform.extensions.sharedLibrary; src = fetchurl { url = "https://baldur.iti.kit.edu/sat-competition-2017/solvers/incremental/glucose-ipasir.zip"; diff --git a/pkgs/development/interpreters/guile/2.2.nix b/pkgs/development/interpreters/guile/2.2.nix index 617658e748b98..918735517ea34 100644 --- a/pkgs/development/interpreters/guile/2.2.nix +++ b/pkgs/development/interpreters/guile/2.2.nix @@ -34,9 +34,9 @@ builder rec { outputs = [ "out" "dev" "info" ]; setOutputFlags = false; # $dev gets into the library otherwise - depsBuildBuild = if stdenv.buildPlatform.isDarwin - then [ buildPackages.darwin.apple_sdk_11_0.stdenv.cc ] - else [ buildPackages.stdenv.cc ] + depsBuildBuild = [ + buildPackages.stdenv.cc + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_2_2; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index 2fe786271a782..a09afadf52712 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -36,10 +36,9 @@ builder rec { outputs = [ "out" "dev" "info" ]; setOutputFlags = false; # $dev gets into the library otherwise - depsBuildBuild = if stdenv.buildPlatform.isDarwin - then [ buildPackages.darwin.apple_sdk_11_0.stdenv.cc ] - else [ buildPackages.stdenv.cc ] - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + depsBuildBuild = [ + buildPackages.stdenv.cc + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_3_0; nativeBuildInputs = [ makeWrapper @@ -129,6 +128,9 @@ builder rec { doCheck = false; doInstallCheck = doCheck; + # In procedure bytevector-u8-ref: Argument 2 out of range + dontStrip = stdenv.isDarwin; + setupHook = ./setup-hook-3.0.sh; passthru = rec { diff --git a/pkgs/development/interpreters/nelua/default.nix b/pkgs/development/interpreters/nelua/default.nix index 8030980b77886..fe4448c2f8d61 100644 --- a/pkgs/development/interpreters/nelua/default.nix +++ b/pkgs/development/interpreters/nelua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "nelua"; - version = "unstable-2023-01-21"; + version = "unstable-2023-09-16"; src = fetchFromGitHub { owner = "edubart"; repo = "nelua-lang"; - rev = "d10cc61bc54050b07874a8597f8df20534885105"; - hash = "sha256-HyNYqhPCQVBJqEcAUUXfvycXE8tWIMIUJJMTIV48ne8="; + rev = "596fcca5c77932da8a07c249de59a9dff3099495"; + hash = "sha256-gXTlAxW7s3VBiC1fGU0aUlGspHlvyY7FC5KLeU2FyGQ="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py b/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py index bb82900c65a92..d5c99e64751c7 100644 --- a/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py +++ b/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py @@ -1,30 +1,34 @@ -import pkg_resources +from importlib.metadata import PathDistribution +from pathlib import Path import collections import sys + do_abort = False packages = collections.defaultdict(list) -for f in sys.path: - for req in pkg_resources.find_distributions(f): - if req not in packages[req.project_name]: - # some exceptions inside buildPythonPackage - if req.project_name in ['setuptools', 'pip', 'wheel']: - continue - packages[req.project_name].append(req) + +for path in sys.path: + for dist_info in Path(path).glob("*.dist-info"): + dist = PathDistribution(dist_info) + + packages[dist._normalized_name].append( + f"{dist._normalized_name} {dist.version} ({dist._path})" + ) for name, duplicates in packages.items(): if len(duplicates) > 1: do_abort = True print("Found duplicated packages in closure for dependency '{}': ".format(name)) - for dup in duplicates: - print(" " + repr(dup)) + for duplicate in duplicates: + print(f"\t{duplicate}") if do_abort: print("") print( - 'Package duplicates found in closure, see above. Usually this ' - 'happens if two packages depend on different version ' - 'of the same dependency.') + "Package duplicates found in closure, see above. Usually this " + "happens if two packages depend on different version " + "of the same dependency." + ) sys.exit(1) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index b336caf6a0ada..5cdd307e70fe6 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -133,6 +133,11 @@ let ] ++ lib.optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch + + ] ++ lib.optionals stdenv.isDarwin [ + # Fix darwin build https://bugs.python.org/issue34027 + ../3.7/darwin-libutil.patch + ] ++ lib.optionals stdenv.isLinux [ # Disable the use of ldconfig in ctypes.util.find_library (since diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 2d293bb29a0e5..8f775699f4829 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -30,10 +30,10 @@ sourceVersion = { major = "3"; minor = "11"; - patch = "5"; + patch = "6"; suffix = ""; }; - hash = "sha256-hc0S6c8dbVpF8X96/hzr5+5ijTKCKBxJLoat9jbe+j8="; + hash = "sha256-D6t4+n8TP084IQxiYNkNfA1ccZhEZBnOBX7HrC5vXzg="; }; }; diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 5aee357dd91b7..f7cc10274ae36 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -107,7 +107,7 @@ in { makePythonHook { name = "python-catch-conflicts-hook"; substitutions = { - inherit pythonInterpreter pythonSitePackages setuptools; + inherit pythonInterpreter pythonSitePackages; catchConflicts=../catch_conflicts/catch_conflicts.py; }; } ./python-catch-conflicts-hook.sh) {}; @@ -183,16 +183,14 @@ in { }; } ./setuptools-check-hook.sh) {}; - setuptoolsRustBuildHook = callPackage ({ makePythonHook, setuptools-rust, rust }: + setuptoolsRustBuildHook = callPackage ({ makePythonHook, setuptools-rust }: makePythonHook { name = "setuptools-rust-setup-hook"; propagatedBuildInputs = [ setuptools-rust ]; substitutions = { pyLibDir = "${python}/lib/${python.libPrefix}"; - cargoBuildTarget = rust.toRustTargetSpec stdenv.hostPlatform; - cargoLinkerVar = lib.toUpper ( - builtins.replaceStrings ["-"] ["_"] ( - rust.toRustTarget stdenv.hostPlatform)); + cargoBuildTarget = stdenv.hostPlatform.rust.rustcTargetSpec; + cargoLinkerVar = stdenv.hostPlatform.rust.cargoEnvVarTarget; targetLinker = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; }; } ./setuptools-rust-hook.sh) {}; @@ -228,5 +226,8 @@ in { makePythonHook { name = "python${python.pythonVersion}-sphinx-hook"; propagatedBuildInputs = [ pythonOnBuildForHost.pkgs.sphinx installShellFiles ]; + substitutions = { + sphinxBuild = "${pythonOnBuildForHost.pkgs.sphinx}/bin/sphinx-build"; + }; } ./sphinx-hook.sh) {}; } diff --git a/pkgs/development/interpreters/python/hooks/sphinx-hook.sh b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh index ca67fa9beabf3..0307e83d94799 100644 --- a/pkgs/development/interpreters/python/hooks/sphinx-hook.sh +++ b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh @@ -38,7 +38,7 @@ buildSphinxPhase() { for __builder in "${__sphinxBuilders[@]}"; do echo "Executing sphinx-build with ${__builder} builder" - sphinx-build -M "${__builder}" "${__sphinxRoot}" ".sphinx/${__builder}" -v + @sphinxBuild@ -M "${__builder}" "${__sphinxRoot}" ".sphinx/${__builder}" -v done runHook postBuildSphinx diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 060b840ce227b..c14c6bc096fd3 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -102,13 +102,14 @@ , disabledTestPaths ? [] +# Allow passing in a custom stdenv to buildPython* +, stdenv ? python.stdenv + , ... } @ attrs: assert (pyproject != null) -> (format == null); let - inherit (python) stdenv; - format' = if pyproject != null then if pyproject then @@ -194,7 +195,7 @@ let # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ "disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "pyproject" "format" - "disabledTestPaths" "outputs" + "disabledTestPaths" "outputs" "stdenv" ]) // { name = namePrefix + name_; diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix index 1a6f9c784cf67..6d51b51b215d4 100644 --- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix @@ -57,7 +57,8 @@ # Raise an error if two packages are installed with the same name # TODO: For cross we probably need a different PYTHONPATH, or not # add the runtime deps until after buildPhase. -, catchConflicts ? (python.stdenv.hostPlatform == python.stdenv.buildPlatform) +# FIXME: disabled for Python 2 because broken +, catchConflicts ? false # Additional arguments to pass to the makeWrapper function, which wraps # generated binaries. diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 903a101aa4903..3ccbe1e855a3a 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -15,13 +15,6 @@ let config = import ./config.nix { inherit fetchFromSavannah; }; rubygems = import ./rubygems { inherit stdenv lib fetchurl; }; - openssl3Gem = fetchFromGitHub { - owner = "ruby"; - repo = "openssl"; - rev = "v3.0.2"; - hash = "sha256-KhuKRP1JkMJv7CagGRQ0KKGOd5Oh0FP0fbj0VZ4utGo="; - }; - # Contains the ruby version heuristics rubyVersion = import ./ruby-version.nix { inherit lib; }; @@ -156,12 +149,6 @@ let rm -rf $sourceRoot/{lib,test}/rubygems* cp -r ${rubygems}/lib/rubygems* $sourceRoot/lib cp -r ${rubygems}/test/rubygems $sourceRoot/test - '' + opString (ver.majMin == "3.0" && opensslSupport) '' - # Replace the Gem by a OpenSSL3-compatible one. - echo "Hotpatching the OpenSSL gem with a 3.x series for OpenSSL 3 support..." - cp -vr ${openssl3Gem}/ext/openssl $sourceRoot/ext/ - cp -vr ${openssl3Gem}/lib/ $sourceRoot/ext/openssl/ - cp -vr ${openssl3Gem}/{History.md,openssl.gemspec} $sourceRoot/ext/openssl/ ''; postPatch = '' @@ -334,11 +321,6 @@ in { sha256 = "sha256-wtq2PLyPKgVSYQitQZ76Y6Z+1AdNu8+fwrHKZky0W6A="; }; - ruby_3_0 = generic { - version = rubyVersion "3" "0" "6" ""; - sha256 = "sha256-bmy9SQAw15EMD/IO3vq0KU380QRvD49H94tZeYesaD4="; - }; - ruby_3_1 = generic { version = rubyVersion "3" "1" "4" ""; sha256 = "sha256-o9VYeaDfqx1xQf3xDSKgfb+OXNxEFdob3gYSfVzDx7Y="; diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index e40ccb5908db6..8e9e35dae59a4 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rubygems"; - version = "3.4.20"; + version = "3.4.22"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - hash = "sha256-9jKKef7KPnSYgKb3zf1LaulFBJuDpY6pWOJHSpG6Hzs="; + hash = "sha256-gD+nd3bRHT0btWOCZhbIERJEJeAzGtH9mDxBRARqYVY="; }; patches = [ @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/rubygems/rubygems/blob/v${version}/CHANGELOG.md"; homepage = "https://rubygems.org/"; license = with licenses; [ mit /* or */ ruby ]; + mainProgram = "gem"; maintainers = with maintainers; [ zimbatm ]; }; } diff --git a/pkgs/development/interpreters/scheme48/default.nix b/pkgs/development/interpreters/scheme48/default.nix index 7a4178d82b15d..82bd58469bd32 100644 --- a/pkgs/development/interpreters/scheme48/default.nix +++ b/pkgs/development/interpreters/scheme48/default.nix @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { substituteInPlace build/build-usual-image --replace '"(made by $USER on $date)"' '""' ''; + # Silence warnings related to use of implicitly declared library functions and implicit ints. + # TODO: Remove and/or fix with patches the next time this package is updated. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=implicit-int" + ]; + }; + meta = with lib; { homepage = "https://s48.org/"; description = "Scheme 48 interpreter for R5RS"; diff --git a/pkgs/development/interpreters/shen-sbcl/default.nix b/pkgs/development/interpreters/shen-sbcl/default.nix index 194c67eba98f2..538f5e7f13565 100644 --- a/pkgs/development/interpreters/shen-sbcl/default.nix +++ b/pkgs/development/interpreters/shen-sbcl/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Shen-Language/shen-cl/raw/v${version}/CHANGELOG.md"; platforms = sbcl.meta.platforms; maintainers = with maintainers; [ bsima ]; + broken = true; license = licenses.bsd3; }; } diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/pkgs/development/interpreters/tinyscheme/default.nix index 1b298af4ac492..fef3f5daceeb0 100644 --- a/pkgs/development/interpreters/tinyscheme/default.nix +++ b/pkgs/development/interpreters/tinyscheme/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # We want to have the makefile pick up $CC, etc. so that we don't have # to unnecessarily tie this package to the GCC stdenv. ./02-use-toolchain-env-vars.patch - ] ++ lib.optionals stdenv.targetPlatform.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # On macOS the library suffix is .dylib: ./03-macOS-SOsuf.patch ]; diff --git a/pkgs/development/libraries/NSPlist/default.nix b/pkgs/development/libraries/NSPlist/default.nix index 680e86dd64ef7..0ad160673973f 100644 --- a/pkgs/development/libraries/NSPlist/default.nix +++ b/pkgs/development/libraries/NSPlist/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, flex, cmake }: stdenv.mkDerivation { pname = "NSPlist"; @@ -11,7 +11,12 @@ stdenv.mkDerivation { sha256 = "0v4yfiwfd08hmh2ydgy6pnmlzjbd96k78dsla9pfd56ka89aw74r"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ flex cmake ]; + + preConfigure = '' + # Regenerate the lexer for improved compatibility with clang 16. + flex -o src/NSPlistLexer.cpp <(tail --lines=+17 src/NSPlistLexer.l) + ''; meta = with lib; { maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index d74ab371bb147..dea308d59a2e4 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -9,7 +9,7 @@ , libGL , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid , alsa-lib -, x11Support ? !stdenv.targetPlatform.isWindows && !stdenv.hostPlatform.isAndroid +, x11Support ? !stdenv.hostPlatform.isWindows && !stdenv.hostPlatform.isAndroid , libX11 , xorgproto , libICE @@ -58,13 +58,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL2"; - version = "2.28.3"; + version = "2.28.4"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; rev = "release-${finalAttrs.version}"; - hash = "sha256-/kQ2IyvAfmZ+zIUt1WuEIeX0nYPGXDlAQk2qDsQnFFs="; + hash = "sha256-1+1m0s3pBCTu924J/4aIu4IHk/N88x2djWDEsDpAJn4="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ "out" "dev" ]; @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { "--disable-oss" ] ++ lib.optional (!x11Support) "--without-x" ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib" - ++ lib.optional stdenv.targetPlatform.isWindows "--disable-video-opengles" + ++ lib.optional stdenv.hostPlatform.isWindows "--disable-video-opengles" ++ lib.optional stdenv.isDarwin "--disable-sdltest"; # We remove libtool .la files when static libs are requested, diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index 91e9f0a3edf0b..12b50cd476ba9 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchurl, fetchpatch , SDL, libogg, libvorbis, smpeg, libmikmod , fluidsynth, pkg-config , enableNativeMidi ? false @@ -13,6 +13,44 @@ stdenv.mkDerivation rec { sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n"; }; + patches = [ + # Fixes implicit declaration of `Mix_QuitFluidSynth`, which causes build failures with clang. + # https://github.com/libsdl-org/SDL_mixer/issues/287 + (fetchpatch { + name = "fluidsynth-fix-implicit-declaration.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/05b12a3c22c0746c29dc5478f5b7fbd8a51a1303.patch"; + hash = "sha256-MDuViLD1w1tAVLoX2yFeJ865v21S2roi0x7Yi7GYRVU="; + }) + # Backport of 2.0 fixes for incompatible function pointer conversions, fixing builds with clang. + (fetchpatch { + name = "fluidsynth-fix-function-pointer-conversions.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/0c504159d212b710a47cb25c669b21730fc78edd.patch"; + hash = "sha256-FSj7JLE2MbGVYCspoq3trXP5Ho+lAtnro2IUOHkto/U"; + }) + # Backport of MikMod fixes, which includes incompatible function pointer conversions. + (fetchpatch { + name = "mikmod-fixes.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/a3e5ff8142cf3530cddcb27b58f871f387796ab6.patch"; + hash = "sha256-dqD8hxx6U2HaelUx0WsGPiWuso++LjwasaAeTTGqdbk"; + }) + # More incompatible function pointer conversion fixes (this time in Vorbis-decoding code). + (fetchpatch { + name = "vorbis-fix-function-pointer-conversion.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/9e6d7b67a00656a68ea0c2eace75c587871549b9.patch"; + hash = "sha256-rZI3bFb/KxnduTkA/9CISccKHUgrX22KXg69sl/uXvU="; + }) + (fetchpatch { + name = "vorbis-fix-function-pointer-conversion-header-part.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/03bd4ca6aa38c1a382c892cef86296cd621ecc1d.patch"; + hash = "sha256-7HrSHYFYVgpamP7Q9znrFZMZ72jvz5wYpJEPqWev/I4="; + }) + (fetchpatch { + name = "vorbis-fix-function-pointer-signature.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/d28cbc34d63dd20b256103c3fe506ecf3d34d379.patch"; + hash = "sha256-sGbtF+Tcjf+6a28nJgawefeeKXnhcwu7G55e94oS9AU="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL libogg libvorbis fluidsynth smpeg libmikmod ]; diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index f358a59ad62d1..f90be3a751e34 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "Xaw3d"; - version = "1.6.3"; + version = "1.6.5"; src = fetchurl { - url = "https://www.x.org/releases/individual/lib/libXaw3d-${version}.tar.bz2"; - sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; + url = "https://www.x.org/releases/individual/lib/libXaw3d-${version}.tar.xz"; + sha256 = "sha256-NIHuS2dTuI4YhW6iZcuE8rAznujDu+yWaxVrOLWEGDM="; }; dontUseImakeConfigure = true; nativeBuildInputs = [ pkg-config bison flex imake gccmakedep ]; diff --git a/pkgs/development/libraries/aalib/clang.patch b/pkgs/development/libraries/aalib/clang.patch new file mode 100644 index 0000000000000..5f8fa80f387df --- /dev/null +++ b/pkgs/development/libraries/aalib/clang.patch @@ -0,0 +1,74 @@ +diff -ur a/configure b/configure +--- a/configure 2001-04-26 10:44:54.000000000 -0400 ++++ b/configure 2023-10-21 23:19:52.941161475 -0400 +@@ -1005,7 +1005,7 @@ + #line 1006 "configure" + #include "confdefs.h" + +-main(){return(0);} ++int main(){return(0);} + EOF + if { (eval echo configure:1011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes +diff -ur a/src/aafire.c b/src/aafire.c +--- a/src/aafire.c 2001-04-26 11:30:03.000000000 -0400 ++++ b/src/aafire.c 2023-10-21 23:46:54.478750904 -0400 +@@ -1,3 +1,4 @@ ++#include <stdlib.h> + #include <stdio.h> + #include "aalib.h" + +diff -ur a/src/aainfo.c b/src/aainfo.c +--- a/src/aainfo.c 2001-04-26 10:37:31.000000000 -0400 ++++ b/src/aainfo.c 2023-10-21 23:31:54.141133353 -0400 +@@ -1,4 +1,4 @@ +- ++#include <stdlib.h> + #include "aalib.h" + #include "aaint.h" + int main(int argc, char **argv) +diff -ur a/src/aakbdreg.c b/src/aakbdreg.c +--- a/src/aakbdreg.c 2023-10-21 23:19:00.787207960 -0400 ++++ b/src/aakbdreg.c 2023-10-21 23:23:49.667253541 -0400 +@@ -1,4 +1,5 @@ + #include <malloc.h> ++#include <string.h> + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff -ur a/src/aamoureg.c b/src/aamoureg.c +--- a/src/aamoureg.c 2023-10-21 23:19:00.787725591 -0400 ++++ b/src/aamoureg.c 2023-10-21 23:26:51.821477807 -0400 +@@ -1,4 +1,5 @@ + #include <malloc.h> ++#include <string.h> + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff -ur a/src/aaregist.c b/src/aaregist.c +--- a/src/aaregist.c 2023-10-21 23:19:00.788130179 -0400 ++++ b/src/aaregist.c 2023-10-21 23:19:38.929729034 -0400 +@@ -1,4 +1,5 @@ + #include <malloc.h> ++#include <string.h> + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff -ur a/src/aasavefont.c b/src/aasavefont.c +--- a/src/aasavefont.c 2001-04-26 10:37:31.000000000 -0400 ++++ b/src/aasavefont.c 2023-10-21 23:51:09.216521714 -0400 +@@ -1,3 +1,5 @@ ++#include <stdlib.h> ++#include <stdio.h> + #include "aalib.h" + int main(int argc, char **argv) + { +diff -ur a/src/aatest.c b/src/aatest.c +--- a/src/aatest.c 2001-04-26 10:37:31.000000000 -0400 ++++ b/src/aatest.c 2023-10-21 23:43:16.758422704 -0400 +@@ -1,3 +1,5 @@ ++#include <stdlib.h> ++#include <string.h> + #include "aalib.h" + int main(int argc, char **argv) + { diff --git a/pkgs/development/libraries/aalib/darwin.patch b/pkgs/development/libraries/aalib/darwin.patch index 44559d06210c5..94b548b35c167 100644 --- a/pkgs/development/libraries/aalib/darwin.patch +++ b/pkgs/development/libraries/aalib/darwin.patch @@ -18,9 +18,9 @@ index def65fe..f4f8efb 100644 @@ -1,4 +1,4 @@ -#include <malloc.h> +#include <stdlib.h> + #include <string.h> #include "config.h" #include "aalib.h" - #include "aaint.h" diff --git a/src/aalib.c b/src/aalib.c index 11fecc8..e3063b4 100644 --- a/src/aalib.c @@ -40,9 +40,9 @@ index 0380828..bb55fe3 100644 @@ -1,4 +1,4 @@ -#include <malloc.h> +#include <stdlib.h> + #include <string.h> #include "config.h" #include "aalib.h" - #include "aaint.h" diff --git a/src/aarec.c b/src/aarec.c index 70f4ebc..ee43e8a 100644 --- a/src/aarec.c @@ -61,9 +61,9 @@ index 54abec0..765155e 100644 @@ -1,4 +1,4 @@ -#include <malloc.h> +#include <stdlib.h> + #include <string.h> #include "config.h" #include "aalib.h" - #include "aaint.h" diff --git a/src/aax.c b/src/aax.c index adcbd82..36e3294 100644 --- a/src/aax.c diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index af0fa61740150..903364ea27f61 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "info" ]; setOutputFlags = false; # Doesn't support all the flags - patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ]; + patches = [ ./clang.patch ] # Fix implicit `int` on `main` error with newer versions of clang + ++ lib.optionals stdenv.isDarwin [ ./darwin.patch ]; # The fuloong2f is not supported by aalib still preConfigure = '' diff --git a/pkgs/development/libraries/abseil-cpp/202103.nix b/pkgs/development/libraries/abseil-cpp/202103.nix index 712f89e383fff..59294496f80ae 100644 --- a/pkgs/development/libraries/abseil-cpp/202103.nix +++ b/pkgs/development/libraries/abseil-cpp/202103.nix @@ -39,6 +39,10 @@ stdenv.mkDerivation rec { url = "https://github.com/abseil/abseil-cpp/commit/808bc202fc13e85a7948db0d7fb58f0f051200b1.patch"; sha256 = "sha256-ayY/aV/xWOdEyFSDqV7B5WDGvZ0ASr/aeBeYwP5RZVc="; }) + ] ++ lib.optionals stdenv.isDarwin [ + # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages + # that require a different SDK other than the default one. + ./cmake-core-foundation.patch ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/abseil-cpp/202111.nix b/pkgs/development/libraries/abseil-cpp/202111.nix index d40ca0bd4ab23..0c1a173eca44b 100644 --- a/pkgs/development/libraries/abseil-cpp/202111.nix +++ b/pkgs/development/libraries/abseil-cpp/202111.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-sSXT6D4JSrk3dA7kVaxfKkzOMBpqXQb0WbMYWG+nGwk="; }; + patches = lib.optionals stdenv.isDarwin [ + # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages + # that require a different SDK other than the default one. + ./cmake-core-foundation.patch + ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ] ++ lib.optionals (cxxStandard != null) [ diff --git a/pkgs/development/libraries/abseil-cpp/202206.nix b/pkgs/development/libraries/abseil-cpp/202206.nix index 7ca25f4140405..a605be3c05edf 100644 --- a/pkgs/development/libraries/abseil-cpp/202206.nix +++ b/pkgs/development/libraries/abseil-cpp/202206.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { hash = "sha256-Od1FZOOWEXVQsnZBwGjDIExi6LdYtomyL0STR44SsG8="; }; + patches = lib.optionals stdenv.isDarwin [ + # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages + # that require a different SDK other than the default one. + ./cmake-core-foundation.patch + ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ] ++ lib.optionals (cxxStandard != null) [ diff --git a/pkgs/development/libraries/abseil-cpp/202301.nix b/pkgs/development/libraries/abseil-cpp/202301.nix index da5f1fc029e16..4676264c26d74 100644 --- a/pkgs/development/libraries/abseil-cpp/202301.nix +++ b/pkgs/development/libraries/abseil-cpp/202301.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-PLoI7ix+reUqkZ947kWzls8lujYqWXk9A9a55UcfahI="; }; + patches = lib.optionals stdenv.isDarwin [ + # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages + # that require a different SDK other than the default one. + ./cmake-core-foundation.patch + ]; + cmakeFlags = [ "-DABSL_BUILD_TEST_HELPERS=ON" "-DABSL_USE_EXTERNAL_GOOGLETEST=ON" diff --git a/pkgs/development/libraries/abseil-cpp/cmake-core-foundation.patch b/pkgs/development/libraries/abseil-cpp/cmake-core-foundation.patch new file mode 100644 index 0000000000000..61b57456b3fca --- /dev/null +++ b/pkgs/development/libraries/abseil-cpp/cmake-core-foundation.patch @@ -0,0 +1,12 @@ +diff -ur a/absl/time/CMakeLists.txt b/absl/time/CMakeLists.txt +--- a/absl/time/CMakeLists.txt 1969-12-31 19:00:01.000000000 -0500 ++++ b/absl/time/CMakeLists.txt 2023-10-30 21:50:32.639061785 -0400 +@@ -55,7 +55,7 @@ + ) + + if(APPLE) +- find_library(CoreFoundation CoreFoundation) ++ set(CoreFoundation "-framework CoreFoundation") + endif() + + absl_cc_library( diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index b3346be1bb70f..487b0dfde0d62 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -1,10 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11 -, libXpm, libXt, libXcursor, alsa-lib, cmake, zlib, libpng, libvorbis -, libXxf86dga, libXxf86misc -, libXxf86vm, openal, libGLU, libGL, libjpeg, flac -, libXi, libXfixes, freetype, libopus, libtheora -, physfs, enet, pkg-config, gtk3, pcre, libpulseaudio, libpthreadstubs +{ lib +, alsa-lib +, cmake +, enet +, fetchFromGitHub +, fetchpatch +, flac +, freetype +, gtk3 +, libGL +, libGLU +, libjpeg +, libopus +, libpng +, libpthreadstubs +, libpulseaudio +, libtheora +, libvorbis +, libwebp +, libX11 +, libXcursor , libXdmcp +, libXext +, libXfixes +, libXi +, libXpm +, libXt +, libXxf86dga +, libXxf86misc +, libXxf86vm +, openal +, pcre +, physfs +, pkg-config +, stdenv +, texinfo +, xorgproto +, zlib }: stdenv.mkDerivation rec { @@ -18,15 +49,45 @@ stdenv.mkDerivation rec { sha256 = "sha256-uNcaeTelFNfg+YjPYc7nK4TrFDxJsEuPhsF8x1cvIYQ="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ - texinfo zlib libpng libvorbis openal libGLU libGL - libjpeg flac enet libtheora freetype physfs libopus - gtk3 pcre + enet + flac + freetype + gtk3 + libGL + libGLU + libjpeg + libopus + libpng + libtheora + libvorbis + libwebp + openal + pcre + physfs + texinfo + zlib ] ++ lib.optionals stdenv.isLinux [ - libXext xorgproto libX11 libXpm libXt libXcursor alsa-lib - libXxf86dga libXxf86misc libXxf86vm libXi libXfixes - libXdmcp libpulseaudio libpthreadstubs + alsa-lib + libpthreadstubs + libpulseaudio + libX11 + libXcursor + libXdmcp + libXext + libXfixes + libXi + libXpm + libXt + libXxf86dga + libXxf86misc + libXxf86vm + xorgproto ]; postPatch = '' diff --git a/pkgs/development/libraries/apr-util/clang-bdb.patch b/pkgs/development/libraries/apr-util/clang-bdb.patch new file mode 100644 index 0000000000000..02e9c8378c636 --- /dev/null +++ b/pkgs/development/libraries/apr-util/clang-bdb.patch @@ -0,0 +1,12 @@ +diff -ur a/build/dbm.m4 b/build/dbm.m4 +--- a/build/dbm.m4 2013-11-23 13:00:53.000000000 -0500 ++++ b/build/dbm.m4 2023-10-22 20:16:37.764571446 -0400 +@@ -235,7 +235,7 @@ + #include <stdlib.h> + #include <stdio.h> + #include <$apu_try_berkeley_db_header> +-main () ++int main () + { + int major, minor, patch; + diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index b44b410d30eb9..a1cbbc5e66423 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -19,15 +19,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-pBB243EHRjJsOUUEKZStmk/KwM4Cd92P6gdv7DyXcrU="; }; - patches = [ ./fix-libxcrypt-build.patch ] - ++ lib.optional stdenv.isFreeBSD ./include-static-dependencies.patch; + patches = [ + ./fix-libxcrypt-build.patch + # Fix incorrect Berkeley DB detection with newer versions of clang due to implicit `int` on main errors. + ./clang-bdb.patch + ] ++ lib.optional stdenv.isFreeBSD ./include-static-dependencies.patch; NIX_CFLAGS_LINK = [ "-lcrypt" ]; outputs = [ "out" "dev" ]; outputBin = "dev"; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isFreeBSD autoreconfHook; + nativeBuildInputs = [ makeWrapper autoreconfHook ]; configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ] ++ lib.optional (!stdenv.isCygwin) "--with-crypto" diff --git a/pkgs/development/libraries/audio/game-music-emu/default.nix b/pkgs/development/libraries/audio/game-music-emu/default.nix index a10aace767be3..0f420745baef6 100644 --- a/pkgs/development/libraries/audio/game-music-emu/default.nix +++ b/pkgs/development/libraries/audio/game-music-emu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, removeReferencesTo }: +{ lib, stdenv, fetchurl, cmake, removeReferencesTo, zlib }: stdenv.mkDerivation rec { version = "0.6.3"; @@ -8,8 +8,9 @@ stdenv.mkDerivation rec { url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.xz"; sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb"; }; - cmakeFlags = lib.optionals (stdenv.isDarwin || stdenv.hostPlatform.isMusl) [ "-DENABLE_UBSAN=OFF" ]; + cmakeFlags = [ "-DENABLE_UBSAN=OFF" ]; nativeBuildInputs = [ cmake removeReferencesTo ]; + buildInputs = [ zlib ]; # It used to reference it, in the past, but thanks to the postFixup hook, now # it doesn't. diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index a5ecbdcfccce9..8955c8876adcf 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmysofa"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "hoene"; repo = "libmysofa"; rev = "v${version}"; - sha256 = "sha256-QEfkeofsVxB9gyISL/P7bvnbcBuG7Q3A4UoAyQAXxgE="; + hash = "sha256-eXMGwa6lOtKoUCcHR9BM2S3NWAZkGyZzF3FAjYaWTvg="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/development/libraries/audio/libopenmpt/default.nix index bb5a4e0dd53b9..b8b89abc8ea7f 100644 --- a/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.7.2"; + version = "0.7.3"; outputs = [ "out" "dev" "bin" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - hash = "sha256-UJFD5aTzsT3Zjq4om/7BtWTt3XG7x8p4ZLgoNeMTMOE="; + hash = "sha256-LPg2m3kWsJJk8/FLn7bO81pum+4DKN7E9J2YIRzP1yI="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 14b0d4c5e46fa..a0869edf4fbdd 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -1,4 +1,16 @@ -{ lib, stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, wafHook +{ lib +, stdenv +, fetchurl +, lv2 +, meson +, ninja +, pkg-config +, python3 +, libsndfile +, serd +, sord +, sratom +, gitUpdater # test derivations , pipewire @@ -6,24 +18,29 @@ stdenv.mkDerivation rec { pname = "lilv"; - version = "0.24.12"; + version = "0.24.20"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "man" ]; src = fetchurl { - url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "sha256-JqN3kIkMnB+DggO0f1sjIDNP6SwCpNJuu+Jmnb12kGE="; + url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; + hash = "sha256-T7CCubiyhuqSu7cb3mt1Ykzsq23wzGOe51oqCWIS7rw="; }; - patches = [ ./lilv-pkgconfig.patch ]; - - nativeBuildInputs = [ pkg-config python3 wafHook ]; - buildInputs = [ serd sord sratom ]; + nativeBuildInputs = [ meson ninja pkg-config python3 ]; + buildInputs = [ libsndfile serd sord sratom ]; propagatedBuildInputs = [ lv2 ]; - dontAddWafCrossFlags = true; - passthru.tests = { - inherit pipewire; + mesonFlags = [ "-Ddocs=disabled" ]; + + passthru = { + tests = { + inherit pipewire; + }; + updateScript = gitUpdater { + url = "https://gitlab.com/lv2/lilv.git"; + rev-prefix = "v"; + }; }; meta = with lib; { diff --git a/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch b/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch deleted file mode 100644 index a5a8c6007e439..0000000000000 --- a/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- a/lilv.pc.in -+++ b/lilv.pc.in -@@ -9 +9,2 @@ Description: Simple C library for hosting LV2 plugins --Requires: @LILV_PKG_DEPS@ -+Requires: lv2 -+Requires.private: @LILV_PKG_DEPS@ diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix index 075ce33ef9e2e..70054134767ae 100644 --- a/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cd source substituteInPlace Makefile \ --replace 'ldconfig' "" - '' + lib.optionalString (!stdenv.targetPlatform.isx86_64) '' + '' + lib.optionalString (!stdenv.hostPlatform.isx86_64) '' substituteInPlace Makefile \ --replace '-DENABLE_SSE2' "" ''; diff --git a/pkgs/development/libraries/audio/zix/default.nix b/pkgs/development/libraries/audio/zix/default.nix index 7d1bac57472c4..9f5d8867a150e 100644 --- a/pkgs/development/libraries/audio/zix/default.nix +++ b/pkgs/development/libraries/audio/zix/default.nix @@ -28,6 +28,13 @@ stdenv.mkDerivation rec { "-Ddocs=disabled" ]; + env = lib.optionalAttrs stdenv.isDarwin { + # Do not fail the build on clang-16/darwin. + # TODO: drop the workaround when upstream fixes it in: + # https://gitlab.com/drobilla/zix/-/issues/3 + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = with lib; { description = "A lightweight C99 portability and data structure library"; homepage = "https://gitlab.com/drobilla/zix"; diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index c6d656388d458..f9974e2ca2538 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; + # std::unary_function has been removed in c++17 + makeFlags = [ "CXXFLAGS=-std=c++11" ]; + # Even when statically linking, libstdc++.la is put in dependency_libs here, # and hence libstdc++.so passed to the linker, just pass -lstdc++ and let the # compiler do what it does best. (libaudiofile.la is a generated file, so we diff --git a/pkgs/development/libraries/blst/default.nix b/pkgs/development/libraries/blst/default.nix index ef174d1118a9e..48865cf83564d 100644 --- a/pkgs/development/libraries/blst/default.nix +++ b/pkgs/development/libraries/blst/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation ( finalAttrs: { buildPhase = '' runHook preBuild - ./build.sh ${lib.optionalString stdenv.targetPlatform.isWindows "flavour=mingw64"} - ./build.sh -shared ${lib.optionalString stdenv.targetPlatform.isWindows "flavour=mingw64"} + ./build.sh ${lib.optionalString stdenv.hostPlatform.isWindows "flavour=mingw64"} + ./build.sh -shared ${lib.optionalString stdenv.hostPlatform.isWindows "flavour=mingw64"} runHook postBuild ''; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 69a8978ae6289..017b4cf46a79c 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,12 +1,8 @@ -{ config, lib, stdenv, fetchurl, fetchpatch, pkg-config, libiconv -, libintl, expat, zlib, libpng, pixman, fontconfig, freetype -, x11Support? !stdenv.isDarwin, libXext, libXrender +{ lib, stdenv, fetchurl, fetchpatch, gtk-doc, meson, ninja, pkg-config, python3 +, docbook_xsl, fontconfig, freetype, libpng, pixman, zlib +, x11Support? !stdenv.isDarwin || true, libXext, libXrender , gobjectSupport ? true, glib -, xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12 -, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, glSupport ? x11Support && config.cairo.gl or (libGLSupported && stdenv.isLinux) -, libGL # libGLU libGL is no longer a big dependency -, pdfSupport ? true +, xcbSupport ? x11Support, libxcb , darwin , testers }: @@ -17,82 +13,27 @@ in stdenv.mkDerivation (finalAttrs: let inherit (finalAttrs) pname version; in { pname = "cairo"; - version = "1.16.0"; + version = "1.18.0"; src = fetchurl { url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz"; - sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"; + hash = "sha256-JDoHNrl4oz3uKfnMp1IXM7eKZbVBggb+970cPUzxC2Q="; }; - patches = [ - # Fixes CVE-2018-19876; see Nixpkgs issue #55384 - # CVE information: https://nvd.nist.gov/vuln/detail/CVE-2018-19876 - # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/merge_requests/5 - # - # This patch is the merged commit from the above PR. - (fetchpatch { - name = "CVE-2018-19876.patch"; - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/6edf572ebb27b00d3c371ba5ae267e39d27d5b6d.patch"; - hash = "sha256-wZ51BZWlXByFY3/CTn7el2A9aYkwL1FygJ2zqnN+UIQ="; - }) - - # Fix PDF output. - # https://gitlab.freedesktop.org/cairo/cairo/issues/342 - (fetchpatch { - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/5e34c5a9640e49dcc29e6b954c4187cfc838dbd1.patch"; - hash = "sha256-yCwsDUY7efVvOZkA6a0bPS+RrVc8Yk9bfPwWHeOjq5o="; - }) - - # Fixes CVE-2020-35492; see https://github.com/NixOS/nixpkgs/issues/120364. - # CVE information: https://nvd.nist.gov/vuln/detail/CVE-2020-35492 - # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/merge_requests/85 - (fetchpatch { - name = "CVE-2020-35492.patch"; - includes = [ "src/cairo-image-compositor.c" ]; - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/78266cc8c0f7a595cfe8f3b694bfb9bcc3700b38.patch"; - hash = "sha256-cXKzLMENx4/BHXLZg3Kfkx3esCnaNaB7WvjNfL77FhE="; - }) - - # Workaround https://gitlab.freedesktop.org/cairo/cairo/-/issues/121 - ./skip-configure-stderr-check.patch - - # Fixes cairo crash on macOS Big Sur - # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/-/issues/420 - (fetchpatch { - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/e22d7212acb454daccc088619ee147af03883974.diff"; - hash = "sha256-8G98nsPz3MLEWPDX9F0jKgXC4hC4NNdFQLSpmW3ay2s="; - }) - - # Fix clang build failures on newer LLVM versions - # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/119 - (fetchpatch { - name = "fix-types.patch"; - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/38e486b34d435130f2fb38c429e6016c3c82cd53.patch"; - hash = "sha256-vmluOJSuTRiQHmbBBVCxOIkZ0O0ZEo0J4mgrUPn0SIo="; - }) - - # Fix unexpected color addition on grayscale images (usually text). - # Upstream fix: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/114 - # Can be removed after 1.18 release - (fetchpatch { - name = "fix-grayscale-anialias.patch"; - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/4f4d89506f58a64b4829b1bb239bab9e46d63727.diff"; - hash = "sha256-mbTg67e7APfdELsuMAgXdY3xokWbGtHF7VDD5UyYqKM="; - }) - - ]; - outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; # very small separateDebugInfo = true; nativeBuildInputs = [ + gtk-doc + meson + ninja pkg-config + python3 ]; buildInputs = [ - libiconv - libintl + docbook_xsl ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreGraphics CoreText @@ -100,49 +41,53 @@ in { Carbon ]); - propagatedBuildInputs = [ fontconfig expat freetype pixman zlib libpng ] + propagatedBuildInputs = [ fontconfig freetype pixman libpng zlib ] ++ optionals x11Support [ libXext libXrender ] - ++ optionals xcbSupport [ libxcb xcbutil ] + ++ optionals xcbSupport [ libxcb ] ++ optional gobjectSupport glib - ++ optional glSupport libGL ; # TODO: maybe liblzo but what would it be for here? - configureFlags = [ - "--enable-tee" - ] ++ (if stdenv.isDarwin then [ - "--disable-dependency-tracking" - "--enable-quartz" - "--enable-quartz-font" - "--enable-quartz-image" - "--enable-ft" - ] else (optional xcbSupport "--enable-xcb" - ++ optional glSupport "--enable-gl" - ++ optional pdfSupport "--enable-pdf" - )) ++ optional (!x11Support) "--disable-xlib"; - - preConfigure = - # On FreeBSD, `-ldl' doesn't exist. - lib.optionalString stdenv.isFreeBSD - '' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in - do - cat "$i" | sed -es/-ldl//g > t - mv t "$i" - done - '' - + - '' - # Work around broken `Requires.private' that prevents Freetype - # `-I' flags to be propagated. - sed -i "src/cairo.pc.in" \ - -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype.dev}/include/freetype2 -I${freetype.dev}/include|g' - substituteInPlace configure --replace strings $STRINGS - ''; + mesonFlags = [ + "-Dgtk_doc=true" + + # error: #error config.h must be included before this header + "-Dsymbol-lookup=disabled" + + # Only used in tests, causes a dependency cycle + "-Dspectre=disabled" + + (lib.mesonEnable "glib" gobjectSupport) + (lib.mesonEnable "tests" finalAttrs.doCheck) + (lib.mesonEnable "xlib" x11Support) + (lib.mesonEnable "xcb" xcbSupport) + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "--cross-file=${builtins.toFile "cross-file.conf" '' + [properties] + ipc_rmid_deferred_release = ${ + { + linux = "true"; + freebsd = "true"; + netbsd = "false"; + }.${stdenv.hostPlatform.parsed.kernel.name} or + (throw "Unknown value for ipc_rmid_deferred_release") + } + ''}" + ]; + + preConfigure = '' + patchShebangs version.py + ''; enableParallelBuilding = true; doCheck = false; # fails - postInstall = lib.optionalString stdenv.isDarwin glib.flattenInclude; + postInstall = '' + # Work around broken `Requires.private' that prevents Freetype + # `-I' flags to be propagated. + sed -i "$out/lib/pkgconfig/cairo.pc" \ + -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype.dev}/include/freetype2 -I${freetype.dev}/include|g' + '' + lib.optionalString stdenv.isDarwin glib.flattenInclude; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -151,9 +96,8 @@ in { longDescription = '' Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X - Window System, Quartz, Win32, image buffers, PostScript, PDF, - and SVG file output. Experimental backends include OpenGL - (through glitz), XCB, BeOS, OS/2, and DirectFB. + Window System, XCB, Quartz, Win32, image buffers, PostScript, + PDF, and SVG file output. Cairo is designed to produce consistent output on all output media while taking advantage of display hardware acceleration @@ -162,10 +106,10 @@ in { homepage = "http://cairographics.org/"; license = with licenses; [ lgpl2Plus mpl10 ]; pkgConfigModules = [ + "cairo-pdf" "cairo-ps" "cairo-svg" - ] ++ lib.optional gobjectSupport "cairo-gobject" - ++ lib.optional pdfSupport "cairo-pdf"; + ] ++ lib.optional gobjectSupport "cairo-gobject"; platforms = platforms.all; }; }) diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix index f1c1a272b5f91..0b945c8c5990a 100644 --- a/pkgs/development/libraries/cctz/default.nix +++ b/pkgs/development/libraries/cctz/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { buildInputs = lib.optional stdenv.isDarwin Foundation; installTargets = [ "install_hdrs" ] - ++ lib.optional (!stdenv.targetPlatform.isStatic) "install_shared_lib" - ++ lib.optional stdenv.targetPlatform.isStatic "install_lib"; + ++ lib.optional (!stdenv.hostPlatform.isStatic) "install_shared_lib" + ++ lib.optional stdenv.hostPlatform.isStatic "install_lib"; postInstall = lib.optionalString stdenv.isDarwin '' install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 8add9c623470d..14b4e549264b0 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { sha256 = "02m25y9m46pb6n46s51av62kpd936lkfv3b13kfpckgvmh5lxpm8"; }; + # fortify breaks the libcompat vsnprintf implementation + hardeningDisable = lib.optionals (stdenv.hostPlatform.isMusl && (stdenv.hostPlatform != stdenv.buildPlatform)) [ "fortify" ]; + # Test can randomly fail: https://hydra.nixos.org/build/7243912 doCheck = false; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 80c4187c951c5..804aa13ed91a9 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -68,6 +68,10 @@ stdenv.mkDerivation rec { "--enable-quartz-backend=yes" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + #doCheck = true; # no tests possible without a display passthru = { diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 41aa3045841f4..987d90e269955 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -53,6 +53,9 @@ stdenv.mkDerivation rec { "--enable-wayland-egl-server" "--enable-gles1" "--enable-gles2" + # Force linking against libGL. + # Otherwise, it tries to load it from the runtime library path. + "LIBS=-lGL" ] ++ lib.optionals stdenv.isDarwin [ "--disable-glx" "--without-x" @@ -82,11 +85,15 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals pangoSupport [ pango cairo harfbuzz ] ++ lib.optionals stdenv.isDarwin [ OpenGL ]; - COGL_PANGO_DEP_CFLAGS = toString (lib.optionals (stdenv.isDarwin && pangoSupport) [ - "-I${pango.dev}/include/pango-1.0" - "-I${cairo.dev}/include/cairo" - "-I${harfbuzz.dev}/include/harfbuzz" - ]); + env = { + COGL_PANGO_DEP_CFLAGS = toString (lib.optionals (stdenv.isDarwin && pangoSupport) [ + "-I${pango.dev}/include/pango-1.0" + "-I${cairo.dev}/include/cairo" + "-I${harfbuzz.dev}/include/harfbuzz" + ]); + } // lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; #doCheck = true; # all tests fail (no idea why) diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index 1b31cef96550f..d4ab53f37bcd3 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , aspell , groff , pkg-config @@ -22,6 +23,14 @@ stdenv.mkDerivation rec { hash = "sha256-ZoanKOVudg+N7gmiLw+1O0bunb59ZM+eW7NaZYv/fh0="; }; + patches = [ + # fix build with clang 16 + (fetchpatch { + url = "https://github.com/AbiWord/enchant/commit/f71eb22e4af7f9917011807a41cf295d3ce0ccbc.patch"; + hash = "sha256-9WWvpU3HKzPlxNBYQAKPppW6G3kOIC2A+MqX5eheBDA="; + }) + ]; + nativeBuildInputs = [ groff pkg-config diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index cd02c6bba15c2..e713ca1413fb3 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -43,7 +43,7 @@ , withFreetype ? withHeadlessDeps # Needed for drawtext filter , withFrei0r ? withFullDeps # frei0r video filtering , withFribidi ? withFullDeps # Needed for drawtext filter -, withGlslang ? withFullDeps && !stdenv.isDarwin +, withGlslang ? withFullDeps && !stdenv.isDarwin && lib.versionAtLeast version "5.0" , withGme ? withFullDeps # Game Music Emulator , withGnutls ? withHeadlessDeps , withGsm ? withFullDeps # GSM de/encoder @@ -52,7 +52,7 @@ , withLadspa ? withFullDeps # LADSPA audio filtering , withLibplacebo ? withFullDeps && !stdenv.isDarwin # libplacebo video processing library , withLzma ? withHeadlessDeps # xz-utils -, withMfx ? withFullDeps && (with stdenv.targetPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx +, withMfx ? withFullDeps && (with stdenv.hostPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx , withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support , withMp3lame ? withHeadlessDeps # LAME MP3 encoder , withMysofa ? withFullDeps # HRTF support via SOFAlizer @@ -386,8 +386,8 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withHardcodedTables "hardcoded-tables") (enableFeature withSafeBitstreamReader "safe-bitstream-reader") - (enableFeature (withMultithread && stdenv.targetPlatform.isUnix) "pthreads") - (enableFeature (withMultithread && stdenv.targetPlatform.isWindows) "w32threads") + (enableFeature (withMultithread && stdenv.hostPlatform.isUnix) "pthreads") + (enableFeature (withMultithread && stdenv.hostPlatform.isWindows) "w32threads") "--disable-os2threads" # We don't support OS/2 (enableFeature withNetwork "network") diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index ec1715b005ffb..eeac7d14568eb 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -43,6 +43,12 @@ stdenv.mkDerivation rec { url = "https://github.com/flann-lib/flann/commit/25eb56ec78472bd419a121c6905095a793cf8992.patch"; sha256 = "qt8h576Gn8uR7+T9u9bEBIRz6e6AoTKpa1JfdZVvW9s="; }) + ] ++ lib.optionals stdenv.cc.isClang [ + # Fix build with Clang 16. + (fetchpatch { + url = "https://github.com/flann-lib/flann/commit/be80cefa69b314a3d9e1ab971715e84145863ebb.patch"; + hash = "sha256-4SUKzQCm0Sx8N43Z6ShuMbgbbe7q8b2Ibk3WgkB0qa4="; + }) ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index c186ffb4a1353..3298be5cc3cc3 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -9,7 +9,7 @@ , libiconv , enablePython ? false , python ? null -, swig +, swig4 , expat , libuuid , openjpeg @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ApplicationServices Cocoa libiconv - ] ++ lib.optionals enablePython [ swig python ]; + ] ++ lib.optionals enablePython [ swig4 python ]; disabledTests = [ # require networking: diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/development/libraries/gecode/3.nix index 36c7120ac609a..1d6f158b52f2b 100644 --- a/pkgs/development/libraries/gecode/3.nix +++ b/pkgs/development/libraries/gecode/3.nix @@ -18,10 +18,17 @@ stdenv.mkDerivation rec { (import ./fix-const-weights-clang-patch.nix fetchpatch) ]; + postPatch = '' + substituteInPlace gecode/flatzinc/lexer.yy.cpp \ + --replace "register " "" + ''; + nativeBuildInputs = [ perl ]; preConfigure = "patchShebangs configure"; + env.CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++14"; + meta = with lib; { license = licenses.mit; homepage = "https://www.gecode.org"; diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix index 70d06c107fd55..1b45be6112812 100644 --- a/pkgs/development/libraries/gf2x/default.nix +++ b/pkgs/development/libraries/gf2x/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitLab +, fetchpatch , autoreconfHook , buildPackages , optimize ? false # impure hardware optimizations @@ -17,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "04g5jg0i4vz46b4w2dvbmahwzi3k6b8g515mfw7im1inc78s14id"; }; + patches = [ + (fetchpatch { + name = "gf2x-1.3.0-configure-clang16.patch"; + url = "https://gitlab.inria.fr/gf2x/gf2x/-/commit/a2f0fd388c12ca0b9f4525c6cfbc515418dcbaf8.diff"; + hash = "sha256-Aj2KzWZMR24S04IbPOBPwacCU4rEiB+FFWxtRuF50LA="; + }) + ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/glibc/0001-aarch64-math-vector.h-add-NVCC-include-guard.patch b/pkgs/development/libraries/glibc/0001-aarch64-math-vector.h-add-NVCC-include-guard.patch new file mode 100644 index 0000000000000..234bc1943c9af --- /dev/null +++ b/pkgs/development/libraries/glibc/0001-aarch64-math-vector.h-add-NVCC-include-guard.patch @@ -0,0 +1,37 @@ +From 44d0a3a9bd8c6fe59f6ccb44206a50a900bfcf4a Mon Sep 17 00:00:00 2001 +From: Connor Baker <connor.baker@tweag.io> +Date: Tue, 31 Oct 2023 14:30:24 +0000 +Subject: [PATCH] aarch64/math-vector.h: add NVCC include guard + +--- + sysdeps/aarch64/fpu/bits/math-vector.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sysdeps/aarch64/fpu/bits/math-vector.h b/sysdeps/aarch64/fpu/bits/math-vector.h +index 7c200599c1..583a426494 100644 +--- a/sysdeps/aarch64/fpu/bits/math-vector.h ++++ b/sysdeps/aarch64/fpu/bits/math-vector.h +@@ -25,17 +25,17 @@ + /* Get default empty definitions for simd declarations. */ + #include <bits/libm-simd-decl-stubs.h> + +-#if __GNUC_PREREQ(9, 0) ++#if __GNUC_PREREQ(9, 0) && !defined(__CUDACC__) + # define __ADVSIMD_VEC_MATH_SUPPORTED + typedef __Float32x4_t __f32x4_t; + typedef __Float64x2_t __f64x2_t; +-#elif __glibc_clang_prereq(8, 0) ++#elif __glibc_clang_prereq(8, 0) && !defined(__CUDACC__) + # define __ADVSIMD_VEC_MATH_SUPPORTED + typedef __attribute__ ((__neon_vector_type__ (4))) float __f32x4_t; + typedef __attribute__ ((__neon_vector_type__ (2))) double __f64x2_t; + #endif + +-#if __GNUC_PREREQ(10, 0) || __glibc_clang_prereq(11, 0) ++#if (__GNUC_PREREQ(10, 0) || __glibc_clang_prereq(11, 0)) && !defined(__CUDACC__) + # define __SVE_VEC_MATH_SUPPORTED + typedef __SVFloat32_t __sv_f32_t; + typedef __SVFloat64_t __sv_f64_t; +-- +2.42.0 + diff --git a/pkgs/development/libraries/glibc/2.38-master.patch.gz b/pkgs/development/libraries/glibc/2.38-master.patch.gz index 4eb3c7b2cdb32..6414956807f44 100644 --- a/pkgs/development/libraries/glibc/2.38-master.patch.gz +++ b/pkgs/development/libraries/glibc/2.38-master.patch.gz Binary files differdiff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 51d8a4dbe05c0..3e17817c0babe 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -44,7 +44,7 @@ let version = "2.38"; - patchSuffix = "-23"; + patchSuffix = "-27"; sha256 = "sha256-+4KZiZiyspllRnvBtp0VLpwwfSzzAcnq+0VVt3DvP9I="; in @@ -60,7 +60,7 @@ stdenv.mkDerivation ({ [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. $ git fetch --all -p && git checkout origin/release/2.38/master && git describe - glibc-2.38-23-g0e1ef6779a + glibc-2.38-27-g750a45a783 $ git show --minimal --reverse glibc-2.38.. | gzip -9n --rsyncable - > 2.38-master.patch.gz To compare the archive contents zdiff can be used. @@ -97,6 +97,18 @@ stdenv.mkDerivation ({ */ ./reenable_DT_HASH.patch ] + /* NVCC does not support ARM intrinsics. Since <math.h> is pulled in by almost + every HPC piece of software, without this patch CUDA compilation on ARM + is effectively broken. See + https://forums.developer.nvidia.com/t/nvcc-fails-to-build-with-arm-neon-instructions-cpp-vs-cu/248355/2. + */ + ++ ( + let + isAarch64 = stdenv.buildPlatform.isAarch64 || stdenv.hostPlatform.isAarch64; + isLinux = stdenv.buildPlatform.isLinux || stdenv.hostPlatform.isLinux; + in + lib.optional (isAarch64 && isLinux) ./0001-aarch64-math-vector.h-add-NVCC-include-guard.patch + ) ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch; @@ -276,7 +288,7 @@ stdenv.mkDerivation ({ license = licenses.lgpl2Plus; - maintainers = with maintainers; [ eelco ma27 ]; + maintainers = with maintainers; [ eelco ma27 connorbaker ]; platforms = platforms.linux; } // (args.meta or {}); }) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 11676560e80b1..be3bee081e73e 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -154,7 +154,7 @@ in ln -sf $out/lib/libpthread.so.0 $out/lib/libpthread.so ln -sf $out/lib/librt.so.1 $out/lib/librt.so ln -sf $out/lib/libdl.so.2 $out/lib/libdl.so - ln -sf $out/lib/libutil.so.1 $out/lib/libutil.so + test -f $out/lib/libutil.so.1 && ln -sf $out/lib/libutil.so.1 $out/lib/libutil.so touch $out/lib/libpthread.a # Put libraries for static linking in a separate output. Note @@ -163,6 +163,8 @@ in mkdir -p $static/lib mv $out/lib/*.a $static/lib mv $static/lib/lib*_nonshared.a $out/lib + # If libutil.so.1 is missing, libutil.a is required. + test -f $out/lib/libutil.so.1 || mv $static/lib/libutil.a $out/lib # Some of *.a files are linker scripts where moving broke the paths. sed "/^GROUP/s|$out/lib/lib|$static/lib/lib|g" \ -i "$static"/lib/*.a diff --git a/pkgs/development/libraries/glibc/locales-builder.sh b/pkgs/development/libraries/glibc/locales-builder.sh index d91f936c937b1..27894b09b91ce 100644 --- a/pkgs/development/libraries/glibc/locales-builder.sh +++ b/pkgs/development/libraries/glibc/locales-builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi # Glibc cannot have itself in its RPATH. export NIX_NO_SELF_RPATH=1 diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index 8af09dcd6f6e9..417d70d621b69 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -16,13 +16,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-F//+3L5Ozrw6s7t4LrcUmO7sN30ZSESdrPAYX57zgr8="; }; - # https://github.com/g-truc/glm/pull/1055 - # Fix more implicit-int-float-conversion warnings # (https://github.com/g-truc/glm/pull/986 wasn't enough, and -Werror is used) - patches = [(fetchpatch { - url = "https://github.com/kraj/glm/commit/bd9b5060bc3b9581090d44f15b4e236566ea86a6.patch"; - sha256 = "sha256-QO4o/wV564kJimBcEyr9TWzREEnRJ1n0j0HPojN4pkI="; - })]; + # (https://github.com/g-truc/glm/pull/1055 neither) + patches = [ + (fetchpatch { + name = "glm-0.9.9.8-clang.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/glm/files/glm-0.9.9.8-clang.patch?id=79476d4b145a4a6b0cbc0e73a6cefb5d584bf8fa"; + hash = "sha256-D8O+qofnGUEaH5nQGdNddwHyr5FhPQa/lOup4z4SFgY="; + }) + ]; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix index 2b088eb459ad5..0315f39c60592 100644 --- a/pkgs/development/libraries/gnu-config/default.nix +++ b/pkgs/development/libraries/gnu-config/default.nix @@ -6,22 +6,22 @@ # files. let - rev = "d4e37b5868ef910e3e52744c34408084bb13051c"; + rev = "28ea239c53a2d5d8800c472bc2452eaa16e37af2"; # Don't use fetchgit as this is needed during Aarch64 bootstrapping configGuess = fetchurl { name = "config.guess-${builtins.substring 0 7 rev}"; url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}"; - sha256 = "191czpnbc1nxrygg8fd3839y1f4m9x43rp57vgrsas6p07zzh3c1"; + hash = "sha256-7CV3YUJSMm+InfHel7mkV8A6mpSBEEhWPCEaRElti6M="; }; configSub = fetchurl { name = "config.sub-${builtins.substring 0 7 rev}"; url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}"; - sha256 = "0148p54gw10p6sk2rn3gi9vvqm89rk8kcvl9335ckayhanx31381"; + hash = "sha256-Rlxf5nx9NrcugIgScWRF1NONS5RzTKjTaoY50SMjh4s="; }; in stdenv.mkDerivation { pname = "gnu-config"; - version = "2023-07-31"; + version = "2023-09-19"; unpackPhase = '' runHook preUnpack diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 0cfe4c7945895..4dec79e0e2da1 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -26,11 +26,11 @@ let in stdenv.mkDerivation rec { pname = "gpgme"; - version = "1.22.0"; + version = "1.23.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2"; - hash = "sha256-lVHjcIGtO96BAYoNJPJFw/ggaZBUlZj7Mal6aDgKe3E="; + hash = "sha256-BD4u/hi0rSK5bUNN3nY/vtMs+NbCINxp3w0P+53Gb8Y="; }; patches = [ diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 84c3abd575ce7..daf3bad132d3d 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "grpc"; - version = "1.57.0"; # N.B: if you change this, please update: + version = "1.59.1"; # N.B: if you change this, please update: # pythonPackages.grpcio-tools # pythonPackages.grpcio-status @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-ZPhPi4ODAAohCySVKeypaDID4ZUXvnfidOGK5EMXvh4="; + hash = "sha256-4bou7oFQOgyxjFqJdmiFT8xEMCsOap9v34W6SPrT4WQ="; fetchSubmodules = true; }; @@ -37,14 +37,8 @@ stdenv.mkDerivation rec { (fetchpatch { # armv6l support, https://github.com/grpc/grpc/pull/21341 name = "grpc-link-libatomic.patch"; - url = "https://github.com/lopsided98/grpc/commit/164f55260262c816e19cd2c41b564486097d62fe.patch"; - hash = "sha256-d6kMyjL5ZnEnEz4XZfRgXJBH53gp1r7q1tlwh+HM6+Y="; - }) - # Fix generated CMake config file - # FIXME: remove when merged - (fetchpatch { - url = "https://github.com/grpc/grpc/pull/33361/commits/117dc80eb43021dd5619023ef6d02d0d6ec7ae7a.patch"; - hash = "sha256-VBk3ZD5h9uOQVN0st+quUQK/wXqvfFNk8G8AN4f2MQo="; + url = "https://github.com/lopsided98/grpc/commit/a9b917666234f5665c347123d699055d8c2537b2.patch"; + hash = "sha256-Lm0GQsz/UjBbXXEE14lT0dcRzVmCKycrlrdBJj+KLu8="; }) ]; @@ -95,13 +89,12 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ''; - env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " ( - lib.optionals stdenv.cc.isClang [ - "-Wno-error=unknown-warning-option" - ] ++ lib.optionals stdenv.isAarch64 [ - "-Wno-error=format-security" - ] - ); + env.NIX_CFLAGS_COMPILE = toString ([ + "-Wno-error" + ] ++ lib.optionals stdenv.isDarwin [ + # Workaround for https://github.com/llvm/llvm-project/issues/48757 + "-Wno-elaborated-enum-base" + ]); enableParallelBuilds = true; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 9599da0fdf529..8ff8220aa75df 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -10,6 +10,7 @@ , orc , bzip2 , gettext +, libGL , libv4l , libdv , libavc1394 @@ -129,6 +130,7 @@ stdenv.mkDerivation rec { ]) ++ lib.optionals stdenv.isDarwin [ Cocoa ] ++ lib.optionals stdenv.isLinux [ + libGL libv4l libpulseaudio libavc1394 diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix index e0d324936dd07..ee467f965c817 100644 --- a/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/pkgs/development/libraries/gstreamer/rs/default.nix @@ -2,13 +2,11 @@ , stdenv , fetchFromGitLab , fetchpatch -, writeText , rustPlatform , meson , ninja , python3 , pkg-config -, rust , rustc , cargo , cargo-c @@ -205,14 +203,7 @@ stdenv.mkDerivation rec { ) ++ [ (lib.mesonOption "sodium-source" "system") (lib.mesonEnable "doc" enableDocumentation) - ] ++ (let - crossFile = writeText "cross-file.conf" '' - [binaries] - rust = [ 'rustc', '--target', '${rust.toRustTargetSpec stdenv.hostPlatform}' ] - ''; - in lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "--cross-file=${crossFile}" - ]); + ]; # turn off all auto plugins since we use a list of plugins we generate mesonAutoFeatures = "disabled"; diff --git a/pkgs/development/libraries/gtk-sharp/builder.sh b/pkgs/development/libraries/gtk-sharp/builder.sh index 73914495d6d41..45e640e2a708a 100644 --- a/pkgs/development/libraries/gtk-sharp/builder.sh +++ b/pkgs/development/libraries/gtk-sharp/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup genericBuild diff --git a/pkgs/development/libraries/hpp-fcl/default.nix b/pkgs/development/libraries/hpp-fcl/default.nix index 7bf7132068676..53bd7f067b291 100644 --- a/pkgs/development/libraries/hpp-fcl/default.nix +++ b/pkgs/development/libraries/hpp-fcl/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "hpp-fcl"; - version = "2.3.6"; + version = "2.3.7"; src = fetchFromGitHub { owner = "humanoid-path-planner"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-Y6ATYXsV8hH22XiXyvacuUhHTuNCzObPlxNX2vZGghM="; + hash = "sha256-Bytm5uaHYsfMeZ+JKs75003iHNObRBGDpV7Rz9yW7jQ="; }; strictDeps = true; diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index f85ec4d96b396..ab237d9dca000 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -22,6 +22,8 @@ , enlightenment , xorg , testers + +, gitUpdater }: let @@ -29,11 +31,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "imlib2"; - version = "1.12.0"; + version = "1.12.1"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-lf9dTMF92fk0wuetFRw2DzCIgKCnhJpspDt8e5pLshY="; + hash = "sha256-jCTS0YnE1a5gLb8vwPuxF6qSPqtsiDBB8P7spOjGd04="; }; buildInputs = [ @@ -59,19 +61,25 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "bin" "out" "dev" ]; - passthru.tests = { - inherit - libcaca - diffoscopeMinimal - feh - icewm - openbox - fluxbox - enlightenment; + passthru = { + tests = { + inherit + libcaca + diffoscopeMinimal + feh + icewm + openbox + fluxbox + enlightenment; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://git.enlightenment.org/old/legacy-imlib2.git"; + rev-prefix = "v"; + }; }; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = with lib; { description = "Image manipulation library"; diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index a00399497e222..f89152820698d 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -1,19 +1,23 @@ -{ lib, stdenv, fetchurl, python3, autoreconfHook }: +{ lib, stdenv, fetchurl, python3, autoconf, automake, libtool }: stdenv.mkDerivation rec { pname = "jbig2dec"; - version = "0.19"; + version = "0.20"; src = fetchurl { - url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9533/${pname}-${version}.tar.gz"; - sha256 = "0dwa24kjqyg9hmm40fh048sdxfpnasz43l2rm8wlkw1qbdlpd517"; + url = "https://github.com/ArtifexSoftware/jbig2dec/archive/${version}/jbig2dec-${version}.tar.gz"; + hash = "sha256-qXBTaaZjOrpTJpNFDsgCxWI5fhuCRmLegJ7ekvZ6/yE="; }; postPatch = '' patchShebangs test_jbig2dec.py ''; - nativeBuildInputs = [ autoreconfHook ]; + preConfigure = '' + ./autogen.sh + ''; + + nativeBuildInputs = [ autoconf automake libtool ]; nativeCheckInputs = [ python3 ]; doCheck = true; diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/development/libraries/jxrlib/default.nix index e6768dc0fa501..517746aa9b531 100644 --- a/pkgs/development/libraries/jxrlib/default.nix +++ b/pkgs/development/libraries/jxrlib/default.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { strictDeps = true; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = with lib; { description = "Implementation of the JPEG XR image codec standard"; homepage = "https://jxrlib.codeplex.com"; diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix index 3543fef66337e..2a264d47c24c9 100644 --- a/pkgs/development/libraries/kde-frameworks/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks/baloo.nix @@ -25,21 +25,6 @@ mkDerivation { outputs = [ "out" "dev" ]; propagatedBuildInputs = [ kcoreaddons kfilemetadata qtbase ]; - # baloo suffers from issues when running on btrfs as well as with certain LVM/dm-crypt setups - # where the device id will change on reboot causing baloo to reindex all the files and then having - # duplicate files. A patch has been proposed that addresses this, which has not been accepted yet. - # However, without this patch, people tend to disable baloo rather than dealing with the constant - # reindexing. - # - # https://bugs.kde.org/show_bug.cgi?id=402154 - patches = [ - (fetchpatch { - url = "https://bugsfiles.kde.org/attachment.cgi?id=159031"; - hash = "sha256-hCtNXUpRhIP94f7gpwTGWWh1h/7JRRJaRASIwHWQjnY="; - name = "use_fsid.patch"; - }) - ]; - # kde-baloo.service uses `ExecCondition=@KDE_INSTALL_FULL_BINDIR@/kde-systemd-start-condition ...` # which comes from the "plasma-workspace" derivation, but KDE_INSTALL_* all point at the "baloo" one # (`${lib.getBin pkgs.plasma-workspace}` would cause infinite recursion) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index c72caa6d585d4..f53e0d6c16bff 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.110/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.112/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index 03e233c28799c..8815683aef65d 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -29,12 +29,6 @@ mkDerivation { separateDebugInfo = true; patches = [ ./0001-Remove-impure-smbd-search-path.patch - - # Fix a crash when saving files. - (fetchpatch { - url = "https://invent.kde.org/frameworks/kio/-/commit/48322f44323a1fc09305d66d9093fe6c3780709e.patch"; - hash = "sha256-4NxI2mD/TdthvrzgatCAlM6VN3N38i3IJUHh0Bs8Fjk="; - }) ]; meta = { homepage = "https://api.kde.org/frameworks/kio/html/"; diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix index a9d4baebf1c1a..04256007ef24a 100644 --- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix @@ -2,25 +2,11 @@ mkDerivation, lib, extra-cmake-modules, networkmanager, qtbase, - fetchpatch }: mkDerivation { pname = "networkmanager-qt"; - # backport patches for NetworkManager 1.44 compatibility - # FIXME: remove in 5.112 - patches = [ - (fetchpatch { - url = "https://invent.kde.org/frameworks/networkmanager-qt/-/commit/d9a938ddbfb5800503935926301ff2865ab77a6d.patch"; - hash = "sha256-EjFBcU0YJQocp8skDZUTxCQhfrtQP5Fdo8q1BC9lLnQ="; - }) - (fetchpatch { - url = "https://invent.kde.org/frameworks/networkmanager-qt/-/commit/d35c6cb97443424d228dfd8eee8282af6632b5f5.patch"; - hash = "sha256-KmRcCjdHGGk+5PY5JKNbk0BHCtdwibns+Hw4aNRaoZI="; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ networkmanager qtbase ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 1fd8a2ba15a0e..f6909957ba445 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/attica-5.110.0.tar.xz"; - sha256 = "1lp7y0r3npv93kcw1fkgl8c2njbs6y4m8cg32b60pyjahfqspxd6"; - name = "attica-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/attica-5.112.0.tar.xz"; + sha256 = "0syg508bjfq5ycr246p3f4q37ihvqk5j7n66vkn7h7dvgwspjff5"; + name = "attica-5.112.0.tar.xz"; }; }; baloo = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/baloo-5.110.0.tar.xz"; - sha256 = "0bg2nyp7zp1mka7ng8bwcd0hrbglrdiz7xw43r9q8wycr9qmva1n"; - name = "baloo-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/baloo-5.112.0.tar.xz"; + sha256 = "17h83s5r70hg8qjv9vli43zv854jll40cmmh2pjcg7nlfi1ypcbz"; + name = "baloo-5.112.0.tar.xz"; }; }; bluez-qt = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/bluez-qt-5.110.0.tar.xz"; - sha256 = "1xvr85i0lkdpca64dzd7wqasc7acpzvh2kawl9nrfkrn96vrm0cz"; - name = "bluez-qt-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/bluez-qt-5.112.0.tar.xz"; + sha256 = "03kzvklzj9h4sl1850c1lh4b3z9lis7d6l9fb9cfnffh3wjpjagb"; + name = "bluez-qt-5.112.0.tar.xz"; }; }; breeze-icons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/breeze-icons-5.110.0.tar.xz"; - sha256 = "1m5z8g7rvilvwfn65yazci51i83ixv7fc5sh2v5vgxrlmhbysg0s"; - name = "breeze-icons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/breeze-icons-5.112.0.tar.xz"; + sha256 = "0n3xdja42hzn3hssj0a8d97kkb790kinp2xmslfl7w8izsz53p39"; + name = "breeze-icons-5.112.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/extra-cmake-modules-5.110.0.tar.xz"; - sha256 = "0f347y8q3ckgfq4skh2q69n67v3w9k680db0br4f43i37vdzaikp"; - name = "extra-cmake-modules-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/extra-cmake-modules-5.112.0.tar.xz"; + sha256 = "1qn2shanzsv06q34zwhkjhb88j7crdp83qp265gpxmc049vq845c"; + name = "extra-cmake-modules-5.112.0.tar.xz"; }; }; frameworkintegration = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/frameworkintegration-5.110.0.tar.xz"; - sha256 = "0ghl5p01g3jdj75wzyjwq4b0l0p98r0vkkf6zj6d3lbax207z0sq"; - name = "frameworkintegration-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/frameworkintegration-5.112.0.tar.xz"; + sha256 = "1kiy4vcr8lj82mhpgn99yw4w6lwr26yjmsfdv3n6ha667gqv2gn6"; + name = "frameworkintegration-5.112.0.tar.xz"; }; }; kactivities = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kactivities-5.110.0.tar.xz"; - sha256 = "1c1456jc3s7cl2l3kmkgprgngip0j9c7ssd0b0fvjd41dwhzhra5"; - name = "kactivities-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kactivities-5.112.0.tar.xz"; + sha256 = "0nzbvby11f14h5w2q5wa5kij7bpx01ffqsi8mmjk71imhq5mzkfz"; + name = "kactivities-5.112.0.tar.xz"; }; }; kactivities-stats = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kactivities-stats-5.110.0.tar.xz"; - sha256 = "1agqsdgbmglrzpg9w4df9qdg4hf8g1nnnkq7adp6cxsj3x8c8zx4"; - name = "kactivities-stats-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kactivities-stats-5.112.0.tar.xz"; + sha256 = "0czic2s147nhjphdkfymnakrw73bzi0pbmb8s3frrxsf4yp7gvzy"; + name = "kactivities-stats-5.112.0.tar.xz"; }; }; kapidox = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kapidox-5.110.0.tar.xz"; - sha256 = "1qi2mcslw0gsxc6p5q78lhg3if01j8dhxf0ypwb8njsfjcr45d24"; - name = "kapidox-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kapidox-5.112.0.tar.xz"; + sha256 = "0fa80ncx4h5izhw6vjjglmxcs9h4rvf2q1bcm0m4zcpky5h8bdqi"; + name = "kapidox-5.112.0.tar.xz"; }; }; karchive = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/karchive-5.110.0.tar.xz"; - sha256 = "1pqc0j4xkhwc6gdgg1q7pl3hjnrscwz8vbdz8jbvpaz51cy5iipw"; - name = "karchive-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/karchive-5.112.0.tar.xz"; + sha256 = "0rzxxgp5hcs63yfqisvf1m2m0qyrj2ri9966h5hc25jh5ajrgmi7"; + name = "karchive-5.112.0.tar.xz"; }; }; kauth = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kauth-5.110.0.tar.xz"; - sha256 = "1yymmyvhqgrwdpy5c2narh6d0ac41mw9ifrhckcyr22kdyrmgcz1"; - name = "kauth-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kauth-5.112.0.tar.xz"; + sha256 = "1xq5jhnp3dyykx84p5ijhi6kj0x2iz8k665bkkz4zcv9l8gf9jv7"; + name = "kauth-5.112.0.tar.xz"; }; }; kbookmarks = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kbookmarks-5.110.0.tar.xz"; - sha256 = "1k04mcfciv3gq4qw5gkpq7189wfxxlr427h4827m3hs3ysbgc4vh"; - name = "kbookmarks-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kbookmarks-5.112.0.tar.xz"; + sha256 = "12m8wx8sv12mwj2xprbr3ywr66mq3415byjfsz8f5yx4lhywkcfi"; + name = "kbookmarks-5.112.0.tar.xz"; }; }; kcalendarcore = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcalendarcore-5.110.0.tar.xz"; - sha256 = "19zb1g4lbiqy4vcay6hbjx9ak5r00frfn1hahpc544q9l0dznl52"; - name = "kcalendarcore-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcalendarcore-5.112.0.tar.xz"; + sha256 = "0najg934lylb5m64lmkpv3v7ri2g3ncsg8ycg7gkm8r93nypa60r"; + name = "kcalendarcore-5.112.0.tar.xz"; }; }; kcmutils = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcmutils-5.110.0.tar.xz"; - sha256 = "0ccgrd757ww890nvajw1s9yvq6iikp316q123rfminrc0mlrpzaq"; - name = "kcmutils-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcmutils-5.112.0.tar.xz"; + sha256 = "0b4l5hf90jrbj4bbrkmyz1va6znwd8dpp2w0i5h002xbpf6vwp2y"; + name = "kcmutils-5.112.0.tar.xz"; }; }; kcodecs = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcodecs-5.110.0.tar.xz"; - sha256 = "1i15q8kg1dn72sxg9djvg9h4mhqh9rgvnsf3bz0pjd5jbwqqyv1v"; - name = "kcodecs-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcodecs-5.112.0.tar.xz"; + sha256 = "0pnmqq5asj361x9fk1vapwssafbb2zxjr0nh8lp8666f675wg2yx"; + name = "kcodecs-5.112.0.tar.xz"; }; }; kcompletion = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcompletion-5.110.0.tar.xz"; - sha256 = "0a9l6p9kfg074wxz0r9dn43baibrbzbh80x60rds2jaf3yjg212g"; - name = "kcompletion-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcompletion-5.112.0.tar.xz"; + sha256 = "1k09ahwgz1fipdc1l2k13r97hgyvwjsr5dlvhkbrd384sip84q8j"; + name = "kcompletion-5.112.0.tar.xz"; }; }; kconfig = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kconfig-5.110.0.tar.xz"; - sha256 = "1i9idh0rh8ryry5gf22wwgzd15y14jymxjdxbkgx13kqpfyqhaxd"; - name = "kconfig-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kconfig-5.112.0.tar.xz"; + sha256 = "080qv53727ijdz9325kzl81nxchds3cpy6siv1h5s4scbb92dpl6"; + name = "kconfig-5.112.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kconfigwidgets-5.110.0.tar.xz"; - sha256 = "04mlw41xdps7qgnmmccqgs7jc5iipx2vqp9bd91l3sz4p90wj3sg"; - name = "kconfigwidgets-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kconfigwidgets-5.112.0.tar.xz"; + sha256 = "0yk84f9pwb600pligwa2022r9srz4fd7kkf90r7q7vmf5r3hl3r9"; + name = "kconfigwidgets-5.112.0.tar.xz"; }; }; kcontacts = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcontacts-5.110.0.tar.xz"; - sha256 = "0gib8nlis59kbhydqvf6alwxvy4db94r2p3vpbcdy48gc4i06344"; - name = "kcontacts-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcontacts-5.112.0.tar.xz"; + sha256 = "0q20xnj43ysq1wdymvl8j8zyvycsqs4hm2x72gz42hd9dlbp77s5"; + name = "kcontacts-5.112.0.tar.xz"; }; }; kcoreaddons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcoreaddons-5.110.0.tar.xz"; - sha256 = "0xcd2ph62a7kbm8camp1vnsxlaq1kmqm9hw9gyphcdh0rh6fi3bf"; - name = "kcoreaddons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcoreaddons-5.112.0.tar.xz"; + sha256 = "032n4fl4d8lhgmd08f7nfa18izrccggxhdbgk33vnf1lw7c6yamp"; + name = "kcoreaddons-5.112.0.tar.xz"; }; }; kcrash = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcrash-5.110.0.tar.xz"; - sha256 = "15j70r6afc0lyg41047r27l089gkq8fh39w9iyvhv0h8hfxxah6g"; - name = "kcrash-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcrash-5.112.0.tar.xz"; + sha256 = "1sarh8ncibl8bz7pkd5xs4dd5vciyj82pckazxx4f482irdzyxzx"; + name = "kcrash-5.112.0.tar.xz"; }; }; kdav = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdav-5.110.0.tar.xz"; - sha256 = "0qz5iq9fi1vk1z7w4wdh7kxrc06vnyrvs7n0llyrjaprzjn8yx6a"; - name = "kdav-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdav-5.112.0.tar.xz"; + sha256 = "1m6basdd6p0yaij9jdsc35sj198gsackk3dx4kci3a8zlvvag32g"; + name = "kdav-5.112.0.tar.xz"; }; }; kdbusaddons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdbusaddons-5.110.0.tar.xz"; - sha256 = "0ilzk67h5cxrjf78hw505pvbqvd2lkjk3m0g188pcw0sdg10xb8h"; - name = "kdbusaddons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdbusaddons-5.112.0.tar.xz"; + sha256 = "0n04z0srf3xzd0m9sa9f3q7hrzbjrg1hbajzm89p71hfr7dmcgjq"; + name = "kdbusaddons-5.112.0.tar.xz"; }; }; kdeclarative = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdeclarative-5.110.0.tar.xz"; - sha256 = "1vcqdi4lji97wm5vil2p1g7wi6rwrz0g6aiqf1nzi026fpsc8njj"; - name = "kdeclarative-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdeclarative-5.112.0.tar.xz"; + sha256 = "1wzhqp5mzbk9lz7ks4ggzb1k6c3fkxwwyzdapwfgn79k5qrhqvjk"; + name = "kdeclarative-5.112.0.tar.xz"; }; }; kded = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kded-5.110.0.tar.xz"; - sha256 = "1n8hzkwhqrx4mb7ahqnkga01zslcp82ya22hppfapldy83bfrgyl"; - name = "kded-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kded-5.112.0.tar.xz"; + sha256 = "16qiybj9q1v6j5csyx2f7pdpxih60psszyyvq9yj4ycdzjhjzmmn"; + name = "kded-5.112.0.tar.xz"; }; }; kdelibs4support = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kdelibs4support-5.110.0.tar.xz"; - sha256 = "119hhc0f862kzr5flrlpg9b8xlcl1qxa5xkccad0hpba76pk2af4"; - name = "kdelibs4support-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kdelibs4support-5.112.0.tar.xz"; + sha256 = "0rrzqyawck0mmh8xfs73jx6jghv5bm1346h3xkhgw6ydfzdv3kcv"; + name = "kdelibs4support-5.112.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kdesignerplugin-5.110.0.tar.xz"; - sha256 = "146i8n9rrajh03x180z48qi8dn31dywsz052bhbn4yw61ag4w4nc"; - name = "kdesignerplugin-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kdesignerplugin-5.112.0.tar.xz"; + sha256 = "0rrk7d06m1ywxf6n1crf510imidhfkpfb58qpaby2fzwb1ifmlyj"; + name = "kdesignerplugin-5.112.0.tar.xz"; }; }; kdesu = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdesu-5.110.0.tar.xz"; - sha256 = "0ll5k4lpn1v4bc365w2ky0qszikfz2r589ni8iyk109qdqciyrr9"; - name = "kdesu-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdesu-5.112.0.tar.xz"; + sha256 = "1yn16q3yrycrh6xsfh7faa5n9cr0lafiwh9dwr5p8rm62nmas83g"; + name = "kdesu-5.112.0.tar.xz"; }; }; kdewebkit = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kdewebkit-5.110.0.tar.xz"; - sha256 = "0p09lby7csx3j513lm91k247iwxby423cz7da51n20qncan8g65v"; - name = "kdewebkit-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kdewebkit-5.112.0.tar.xz"; + sha256 = "11za35zxaa3mlvmrkp4rx47sl6ihbc1xgcaf18r6a0cyn4zhx2fz"; + name = "kdewebkit-5.112.0.tar.xz"; }; }; kdnssd = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdnssd-5.110.0.tar.xz"; - sha256 = "0xmahgn572ah8ji4d4afalcl7r2krn971ix5jwcqgrj57m5haj45"; - name = "kdnssd-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdnssd-5.112.0.tar.xz"; + sha256 = "0cd1dm44f12n29d8idh29djhfd2z6lj4hc4l42hxx2nasi009p2s"; + name = "kdnssd-5.112.0.tar.xz"; }; }; kdoctools = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdoctools-5.110.0.tar.xz"; - sha256 = "1g05gppc6qzkag1x18anymbwdswpg32w6jh12x9jfj79vcp7wg4j"; - name = "kdoctools-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdoctools-5.112.0.tar.xz"; + sha256 = "1cinjrbg31pilzlir9vmigf86ypgpxr9mmyqpjfvq6yxvxfnq7li"; + name = "kdoctools-5.112.0.tar.xz"; }; }; kemoticons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kemoticons-5.110.0.tar.xz"; - sha256 = "1r1d3kw6wzw63kq9wy4ic2b9hcnmm4rs7v9f1z9jhq9m1jp0zy12"; - name = "kemoticons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kemoticons-5.112.0.tar.xz"; + sha256 = "037xj9i1x81npm7fyqizkyi7k4slakx1c5x9drp0py5133a0k6z8"; + name = "kemoticons-5.112.0.tar.xz"; }; }; kfilemetadata = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kfilemetadata-5.110.0.tar.xz"; - sha256 = "07ma48iq5vpnj391shm3s9an3rqhxskfziw6pksmzxxnga0whbl9"; - name = "kfilemetadata-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kfilemetadata-5.112.0.tar.xz"; + sha256 = "1yvz3439jmg8m0ry9z0930ya679fahphb6s7mci23xf5zjpczgy4"; + name = "kfilemetadata-5.112.0.tar.xz"; }; }; kglobalaccel = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kglobalaccel-5.110.0.tar.xz"; - sha256 = "1iw22vyrk07pzcsh41cvfp8i8589jm1yqn1cx1ad5rmryzsjalzp"; - name = "kglobalaccel-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kglobalaccel-5.112.0.tar.xz"; + sha256 = "0flb0rkw5bh1xb706pgzsjq41slma4xwg3ghmvrdr622qf87w9hh"; + name = "kglobalaccel-5.112.0.tar.xz"; }; }; kguiaddons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kguiaddons-5.110.0.tar.xz"; - sha256 = "0ajmxj8nhis6f4hwd64s9qfw3hbip80xrdy3d1wksykbq7g5b89c"; - name = "kguiaddons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kguiaddons-5.112.0.tar.xz"; + sha256 = "0yw4ikb14f2q1z0hr64bxnxvg770jjllqfvhbnl5hn3m7l61psmb"; + name = "kguiaddons-5.112.0.tar.xz"; }; }; kholidays = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kholidays-5.110.0.tar.xz"; - sha256 = "0zikajmic93wqgy9865pf61sdlnsyzzf2jal7bj25is7a1mk8mjc"; - name = "kholidays-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kholidays-5.112.0.tar.xz"; + sha256 = "1b5jdss17wvm66gwzh6qb0caz9b3fnr6cd902bvqa7dr1aby4j52"; + name = "kholidays-5.112.0.tar.xz"; }; }; khtml = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/khtml-5.110.0.tar.xz"; - sha256 = "17d87vjim32mn0s1d9zl9342aamqg4xmi6xh6d8ghrgms3vqc7in"; - name = "khtml-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/khtml-5.112.0.tar.xz"; + sha256 = "0rw6286w971q61gahm1qzic0gsfmfz8x449jw6zy38d9k17h7s2n"; + name = "khtml-5.112.0.tar.xz"; }; }; ki18n = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/ki18n-5.110.0.tar.xz"; - sha256 = "03qks9kncvazq2wz3myrjgz5m0gjxm80m1ayv9vjndyyc74a9smw"; - name = "ki18n-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/ki18n-5.112.0.tar.xz"; + sha256 = "06wng9mpr2ln9dd1ayvwglc6071iqg5285jisg95vgf2c3kl5m9k"; + name = "ki18n-5.112.0.tar.xz"; }; }; kiconthemes = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kiconthemes-5.110.0.tar.xz"; - sha256 = "0bb6r7jaknjyhyjhdrlji320qgb7cgxshcgab0209zk8dl8a510d"; - name = "kiconthemes-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kiconthemes-5.112.0.tar.xz"; + sha256 = "04nqw9a2c7bba5y7y741wqwm95jfpbva71q1fj43grd6hcqlff53"; + name = "kiconthemes-5.112.0.tar.xz"; }; }; kidletime = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kidletime-5.110.0.tar.xz"; - sha256 = "0hc30778d1k0vm4qsp58cf3d5bnws328qxazm8d5a6kxdc7izz44"; - name = "kidletime-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kidletime-5.112.0.tar.xz"; + sha256 = "0pch2baf9867w6llk98mxag2y3sjz6irqci88rrsnwn4s1vcs356"; + name = "kidletime-5.112.0.tar.xz"; }; }; kimageformats = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kimageformats-5.110.0.tar.xz"; - sha256 = "0ivks2c2kgd26pr0n0b4x3hb7dmmq52vlp7f6ny14qpvm3cgnscd"; - name = "kimageformats-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kimageformats-5.112.0.tar.xz"; + sha256 = "1lw9vvmb032ymy0a1443q3p9nwn8shc9kbaz05jw4jwa74wp7i65"; + name = "kimageformats-5.112.0.tar.xz"; }; }; kinit = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kinit-5.110.0.tar.xz"; - sha256 = "0ps2299hf02yvgs971cb4bljbmdbcvcmm2xqz6q0h8asjkpkilv5"; - name = "kinit-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kinit-5.112.0.tar.xz"; + sha256 = "1mij6nw1w0zyv724096pfbb0r95300yqb884bx3wlm5nibawwpz7"; + name = "kinit-5.112.0.tar.xz"; }; }; kio = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kio-5.110.0.tar.xz"; - sha256 = "0sy91zlk60q5jligxp870srfc6fhd3fyk5yamkg266yfvyy9m3r2"; - name = "kio-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kio-5.112.0.tar.xz"; + sha256 = "16gv0f8l4jn19mrwc52c6gw2n8hb28n6v7x6kx7qbs3z0wf57f44"; + name = "kio-5.112.0.tar.xz"; }; }; kirigami2 = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kirigami2-5.110.0.tar.xz"; - sha256 = "13j9z0nha3wq97apgkj43bayqijpgy6a2l7f9iryww054aqdjggx"; - name = "kirigami2-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kirigami2-5.112.0.tar.xz"; + sha256 = "048f3sji3dx7q415fkmkj0xmnl0dxacdr9d08d5rqkxz2d94hzk3"; + name = "kirigami2-5.112.0.tar.xz"; }; }; kitemmodels = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kitemmodels-5.110.0.tar.xz"; - sha256 = "06gym33644npci4crhykyfyp2v74pya72kdzmqh4lkzp252pyfhj"; - name = "kitemmodels-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kitemmodels-5.112.0.tar.xz"; + sha256 = "130avvp4lq8f8pag39mna0p3rjyvhbq6akng9d4l01nf8287zv2s"; + name = "kitemmodels-5.112.0.tar.xz"; }; }; kitemviews = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kitemviews-5.110.0.tar.xz"; - sha256 = "1nqbypn0crbaqa8x19z0fh8mqbr8wbf8nc8wg0irzp32js9vcqyp"; - name = "kitemviews-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kitemviews-5.112.0.tar.xz"; + sha256 = "1xpk5xfrp38bjgsyvc3wmcq7vj1sa2wxz0wld2bby3nsixbrdq68"; + name = "kitemviews-5.112.0.tar.xz"; }; }; kjobwidgets = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kjobwidgets-5.110.0.tar.xz"; - sha256 = "1bl7igakmh1ipiamigs5s8fj6fy905b3j1dqgq9hxdxk59k1r1h2"; - name = "kjobwidgets-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kjobwidgets-5.112.0.tar.xz"; + sha256 = "1x1ip1c1v7mydvrz620gaajx6c1p88vlbi3i66fdfnxvhkcrqzqv"; + name = "kjobwidgets-5.112.0.tar.xz"; }; }; kjs = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kjs-5.110.0.tar.xz"; - sha256 = "0xlkdi7qs75ipf87h8m7bvjn4l28y5qy20hvag1gc370fxz54v15"; - name = "kjs-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kjs-5.112.0.tar.xz"; + sha256 = "00nr7darrijxm7czvjwvs4jrw8yd8ypz49l4xym19fvslcb5d0x9"; + name = "kjs-5.112.0.tar.xz"; }; }; kjsembed = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kjsembed-5.110.0.tar.xz"; - sha256 = "1ynmj8ac9g9amjz0ljz3wf7sjsrwmz1kfi26r36rpqlf9mmkzfqm"; - name = "kjsembed-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kjsembed-5.112.0.tar.xz"; + sha256 = "0hs6ka5qj1w3kha6rssvvpw6dh4pw001wfpfjzn8klawjwndjv1r"; + name = "kjsembed-5.112.0.tar.xz"; }; }; kmediaplayer = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kmediaplayer-5.110.0.tar.xz"; - sha256 = "1jhh3gsbibi2hrhswg1nz1mdxn2wir5p9cvqpcqv7k8vm6rb82z3"; - name = "kmediaplayer-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kmediaplayer-5.112.0.tar.xz"; + sha256 = "1bdanmrbzyh6hbpkflq7gwrjm03647pbbiv670li0cmyfmnz904r"; + name = "kmediaplayer-5.112.0.tar.xz"; }; }; knewstuff = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/knewstuff-5.110.0.tar.xz"; - sha256 = "0qld8ijy7z60qdlwa9vaq905xgzyvh5zw6ymngs00axl33m9bbbl"; - name = "knewstuff-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/knewstuff-5.112.0.tar.xz"; + sha256 = "1l417xsqpwxv73wm0fdgjpfnvs19casm1x2xsl299pj66kcm1y7l"; + name = "knewstuff-5.112.0.tar.xz"; }; }; knotifications = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/knotifications-5.110.0.tar.xz"; - sha256 = "0zm3d36v9dgqb3pdwpj962wpngfhq08q9x9rj99f88g9dlnmy6gm"; - name = "knotifications-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/knotifications-5.112.0.tar.xz"; + sha256 = "1xlx91rn826gw3mqddvfs884mx95rhksf70wc1m5jd49cdcgw1mz"; + name = "knotifications-5.112.0.tar.xz"; }; }; knotifyconfig = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/knotifyconfig-5.110.0.tar.xz"; - sha256 = "1651rh0av8lqp8rmb3djizsb8ypihkabprgppla3af2xf446n7wp"; - name = "knotifyconfig-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/knotifyconfig-5.112.0.tar.xz"; + sha256 = "18qikgc5lp5xjmar823j0cgwqpgc8b5sr8rq1x2p23pbb9ywfpqj"; + name = "knotifyconfig-5.112.0.tar.xz"; }; }; kpackage = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kpackage-5.110.0.tar.xz"; - sha256 = "1jd85m7pxzah9d6b3zi2nswvsinx85brkiq142vic5l0rm6l89id"; - name = "kpackage-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kpackage-5.112.0.tar.xz"; + sha256 = "0g84q54yhm9a1h48pim371rjbl208ka56a6xx23zqis20wqjs0kp"; + name = "kpackage-5.112.0.tar.xz"; }; }; kparts = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kparts-5.110.0.tar.xz"; - sha256 = "13av8v2kggbvyv8nxganjb88q38g3gbykbkwrigywc3767p838r3"; - name = "kparts-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kparts-5.112.0.tar.xz"; + sha256 = "0mr45zk4i7jfazkawi7i2ry88y9a17wsny4ck0zln3ggb6wra32c"; + name = "kparts-5.112.0.tar.xz"; }; }; kpeople = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kpeople-5.110.0.tar.xz"; - sha256 = "10drcfjcw00qhdlsficxb07hnnsd93smcig8argznpgwd61f807p"; - name = "kpeople-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kpeople-5.112.0.tar.xz"; + sha256 = "0xfczzy2pwdszzzmyj8ldr1178d93za26j0rqbj3wnqsnji9yn6n"; + name = "kpeople-5.112.0.tar.xz"; }; }; kplotting = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kplotting-5.110.0.tar.xz"; - sha256 = "1fbzy9k0gx1468qsdd1c8fqaml3c01yy0m6n205y3ymkca78hdbk"; - name = "kplotting-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kplotting-5.112.0.tar.xz"; + sha256 = "0a18ly62ilsmaihm398q1jvj10ccw00di3rywq0wq45n0ghnx7zx"; + name = "kplotting-5.112.0.tar.xz"; }; }; kpty = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kpty-5.110.0.tar.xz"; - sha256 = "1cx9wszi9zlay0vb9wz9hgbmbq006xgssnzzrmby4q4s6bhb92ps"; - name = "kpty-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kpty-5.112.0.tar.xz"; + sha256 = "1p6rm94hvq6w54h84vhcqbbnj2gmypipj05vx7c9bnijy0d4nfxf"; + name = "kpty-5.112.0.tar.xz"; }; }; kquickcharts = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kquickcharts-5.110.0.tar.xz"; - sha256 = "0s8xnsmhx2m6wn7fmmddzwnwc2yr3kvy85vd65m3avfw073rgj5v"; - name = "kquickcharts-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kquickcharts-5.112.0.tar.xz"; + sha256 = "1c634jda7lqmv009jg2jdarkd08q1hf4fb3wnj35hilj37c57b5a"; + name = "kquickcharts-5.112.0.tar.xz"; }; }; kross = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kross-5.110.0.tar.xz"; - sha256 = "169zsxrmbdv5xn6s0wmf1l2a3qghn88hgl714i0cnymq5ixy25x5"; - name = "kross-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kross-5.112.0.tar.xz"; + sha256 = "1b887bx4d3nr55305mk91wnm6bfhbgnqjmbc3a9jkv65c78j9hsa"; + name = "kross-5.112.0.tar.xz"; }; }; krunner = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/krunner-5.110.0.tar.xz"; - sha256 = "0q3jhq2cswnqj5rdkxhizlv06rsxsm38ipxhcsw6p8zqabi1i351"; - name = "krunner-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/krunner-5.112.0.tar.xz"; + sha256 = "00bfszbpr2w21nz3vhih8hp0f9gzn1906axvib3jm1w3kjmy2avn"; + name = "krunner-5.112.0.tar.xz"; }; }; kservice = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kservice-5.110.0.tar.xz"; - sha256 = "0rin6v96mcmw53dzw8sw56g7188623d1k4vs18bv44l86gixdhgg"; - name = "kservice-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kservice-5.112.0.tar.xz"; + sha256 = "01aj0yrlxlwr5sm1z0pq6caa4ijj3nsgqhza1zr4mzrx2ybf753z"; + name = "kservice-5.112.0.tar.xz"; }; }; ktexteditor = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/ktexteditor-5.110.0.tar.xz"; - sha256 = "0iwzw51km3mr8kdva14mxz9bvcfcf09v5igah2axkjaxazxyigla"; - name = "ktexteditor-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/ktexteditor-5.112.0.tar.xz"; + sha256 = "0d0cw9qd7mmnhdqayx4lcpd60hp1al5zwy565rsvxmjly564l3i9"; + name = "ktexteditor-5.112.0.tar.xz"; }; }; ktextwidgets = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/ktextwidgets-5.110.0.tar.xz"; - sha256 = "0cr7n58mak928dysyqhsr1pj0w90amikx9jav4gs4lzb4m4rjp7q"; - name = "ktextwidgets-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/ktextwidgets-5.112.0.tar.xz"; + sha256 = "0x83f0ih3c25yggmvyibyfaiikk4zc0k5gf6yr87c62ihgv7gniz"; + name = "ktextwidgets-5.112.0.tar.xz"; }; }; kunitconversion = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kunitconversion-5.110.0.tar.xz"; - sha256 = "083w0gz157j2g8qzm03yq3qwq58wafcq26qcc2ly2fksyyxkzzda"; - name = "kunitconversion-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kunitconversion-5.112.0.tar.xz"; + sha256 = "1zi47yd3aydy2mcmgfgwp4g12w7681lyc1niq5p13670mxhlkrwc"; + name = "kunitconversion-5.112.0.tar.xz"; }; }; kwallet = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kwallet-5.110.0.tar.xz"; - sha256 = "0mg5y8cvzvs7w3yy5xnpsps2b6m476l5ilw5kvarrjjpq7ybnkqz"; - name = "kwallet-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kwallet-5.112.0.tar.xz"; + sha256 = "1v38wyz9hhhvzwrpxsjkd8yqyy4yv9hii1413ffcm9x971nliq2s"; + name = "kwallet-5.112.0.tar.xz"; }; }; kwayland = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kwayland-5.110.0.tar.xz"; - sha256 = "0ggxvywvqfhhhb5370n90dyw0mjwkp3i7rgv58nyqsmby0g08r85"; - name = "kwayland-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kwayland-5.112.0.tar.xz"; + sha256 = "0nzpg4x9hg9jd1kg6sq0lh658kz3cz25z5kji7hpq2h0svmxx709"; + name = "kwayland-5.112.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kwidgetsaddons-5.110.0.tar.xz"; - sha256 = "1cyphs0r5j2v93pwi9mbn6xd928lnhb0zmyfj5pywdx9n7lv0x6a"; - name = "kwidgetsaddons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kwidgetsaddons-5.112.0.tar.xz"; + sha256 = "0x5mz04dwlpl0h75v0c5w04qjpcb3fbpjk7hbslwgfwr7gviqyib"; + name = "kwidgetsaddons-5.112.0.tar.xz"; }; }; kwindowsystem = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kwindowsystem-5.110.0.tar.xz"; - sha256 = "0l3aknr3zqz9zwqlyhnr8n53bcfb22rm38vdiv0l5vpwjbjn0270"; - name = "kwindowsystem-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kwindowsystem-5.112.0.tar.xz"; + sha256 = "08ihg6zq979h4v6c157n80pi3cfsg9w9qiyqaw3h79365zji73j1"; + name = "kwindowsystem-5.112.0.tar.xz"; }; }; kxmlgui = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kxmlgui-5.110.0.tar.xz"; - sha256 = "1j8v52ix9sv7q76cvl2gnpjs602ri57kgfh21bvqd88gf2xnwxjq"; - name = "kxmlgui-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kxmlgui-5.112.0.tar.xz"; + sha256 = "17jsqzxn5wgwsm3lrfgdygyzvqibzv9vfgg11s2gc5bq9x4s0j8g"; + name = "kxmlgui-5.112.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kxmlrpcclient-5.110.0.tar.xz"; - sha256 = "0fzd9amj2j4bw54q8fbgczqf785s6siqr1a8wbqf56wyyhki5psx"; - name = "kxmlrpcclient-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kxmlrpcclient-5.112.0.tar.xz"; + sha256 = "09zwgrh336bk5cfab2zcdzcfdzjvlqa47ljfrciyh4h8m5f7y12h"; + name = "kxmlrpcclient-5.112.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/modemmanager-qt-5.110.0.tar.xz"; - sha256 = "08q43arx9q81rqwhczzcn4cyl5glalwzjncb120a2cihida2m71v"; - name = "modemmanager-qt-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/modemmanager-qt-5.112.0.tar.xz"; + sha256 = "0323zp03wj4ignfc94qg89h3j4qmh3mkdac5snr1axjaaf6sk6w8"; + name = "modemmanager-qt-5.112.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/networkmanager-qt-5.110.0.tar.xz"; - sha256 = "1bnlvpfhw6l64rgaxx9zkxd5wmwvyal5xmv31vxzf92ig6sgjdqq"; - name = "networkmanager-qt-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/networkmanager-qt-5.112.0.tar.xz"; + sha256 = "1larg78j7rlbbscv04imc1k6f1srapr2yrbyxif38d4iipfg04f9"; + name = "networkmanager-qt-5.112.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/oxygen-icons5-5.110.0.tar.xz"; - sha256 = "1dmig458gbl0ypb99kj514nwl5gbjpfvixw9lipgc2wwnn1nkia2"; - name = "oxygen-icons5-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/oxygen-icons5-5.112.0.tar.xz"; + sha256 = "0yw2mixy5p8pw9866rfr0wcjhvilznakd0h6934svv0dk3lv054a"; + name = "oxygen-icons5-5.112.0.tar.xz"; }; }; plasma-framework = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/plasma-framework-5.110.0.tar.xz"; - sha256 = "0jfln8lrzmcnkqhl8pij5w6mdj6g25rwc332f07g9465y9ap07cf"; - name = "plasma-framework-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/plasma-framework-5.112.0.tar.xz"; + sha256 = "0nq8dzqk1hxzm8yngzgm9zqw8155fy38zq6k3613af5mgj7jmdhj"; + name = "plasma-framework-5.112.0.tar.xz"; }; }; prison = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/prison-5.110.0.tar.xz"; - sha256 = "019a3z18gq7nb3ahf5dd3b5fixzyfklg60dk2w4win2w19s70wb7"; - name = "prison-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/prison-5.112.0.tar.xz"; + sha256 = "1blgs0k4kz3smsf0qb9y6krzbssyv1hbqvjc7qvk4qwk81qhyfvq"; + name = "prison-5.112.0.tar.xz"; }; }; purpose = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/purpose-5.110.0.tar.xz"; - sha256 = "0nl6qh7j5c3ijnq0qw1a5jmj1x5nb9hlssjjn8fdvfr7q6z67rsc"; - name = "purpose-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/purpose-5.112.0.tar.xz"; + sha256 = "1cqcmhbb26xypllmk3z4r0z8sw79idzz6nz72ahwa4ha0pqbl8p3"; + name = "purpose-5.112.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/qqc2-desktop-style-5.110.0.tar.xz"; - sha256 = "04pyhlr89azw0kyjxfpx6phxljck8yiflcszd4xkgiw3n9rjyg3g"; - name = "qqc2-desktop-style-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/qqc2-desktop-style-5.112.0.tar.xz"; + sha256 = "1k74vwj07xf3fjfj8ff9zx5ndzq5m3bdnj4zgymkxm1gk3r6gl5y"; + name = "qqc2-desktop-style-5.112.0.tar.xz"; }; }; solid = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/solid-5.110.0.tar.xz"; - sha256 = "1k64cqlws7nxki21cwg197avfnxsxpw3isry5p7bqyfmq45ydcvd"; - name = "solid-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/solid-5.112.0.tar.xz"; + sha256 = "0hpm5akhk24fzbg27p6ql598s5mxa6n8h359ajf45afabimhjx0y"; + name = "solid-5.112.0.tar.xz"; }; }; sonnet = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/sonnet-5.110.0.tar.xz"; - sha256 = "16qk63yy1y03z4rlc08qzr7mmds1yz0k9x1ws2nzp47khkza250i"; - name = "sonnet-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/sonnet-5.112.0.tar.xz"; + sha256 = "026iivz27d7v4kpwkl6qwbcqnd71kvg77szy91fch37iki7z6361"; + name = "sonnet-5.112.0.tar.xz"; }; }; syndication = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/syndication-5.110.0.tar.xz"; - sha256 = "0dsd05ckfv9fdnrbgprriba7lbbfs2z9qv869pcr4n7pn7x778sd"; - name = "syndication-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/syndication-5.112.0.tar.xz"; + sha256 = "03if949klq28kaf3xzcva917fqv7cn6pzjwsgymya3nc730kfsc8"; + name = "syndication-5.112.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/syntax-highlighting-5.110.0.tar.xz"; - sha256 = "0gbmgan0cy4xhjcf10g0lffhwvkhhpcgbnk190xlzl4chnmpq9w5"; - name = "syntax-highlighting-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/syntax-highlighting-5.112.0.tar.xz"; + sha256 = "1m88nfmf4kxliqkgm78f95yvsjv76xm2rmg92v9mg00r9d00y95h"; + name = "syntax-highlighting-5.112.0.tar.xz"; }; }; threadweaver = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/threadweaver-5.110.0.tar.xz"; - sha256 = "085y4m7z0rybsvpqzl2sjwnf8yjm4lnc3n49idj2c0psm8v5ksm0"; - name = "threadweaver-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/threadweaver-5.112.0.tar.xz"; + sha256 = "1i3qj6qf0sv5pf8d5wx6gy11dqyp4x4b4759gwbhlrizkm4fa7f9"; + name = "threadweaver-5.112.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/libAfterImage/default.nix b/pkgs/development/libraries/libAfterImage/default.nix index a569b59621e0e..828a6891e293c 100644 --- a/pkgs/development/libraries/libAfterImage/default.nix +++ b/pkgs/development/libraries/libAfterImage/default.nix @@ -84,6 +84,10 @@ stdenv.mkDerivation { "--${if withX then "with" else "without"}-x" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = with lib; { homepage = "http://www.afterstep.org/afterimage/"; description = "A generic image manipulation library"; diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 6be0370a17736..c5e40babfd672 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchzip, yasm, perl, cmake, pkg-config, python3 , enableButteraugli ? true, libjxl , enableVmaf ? true, libvmaf +, gitUpdater }: let @@ -8,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "libaom"; - version = "3.6.1"; + version = "3.7.0"; src = fetchzip { url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"; - sha256 = "sha256-U7hmKdpjTtqStM4UIjCvgJ2swpZ1x0Px1Q9+gSHbaeQ="; + hash = "sha256-Zf0g/CMI73O9Dkn9o7aIvwZ/8wh3lCmVY8nZaPwBp68="; stripRoot = false; }; @@ -64,6 +65,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "bin" "dev" "static" ]; + passthru = { + updateScript = gitUpdater { + url = "https://aomedia.googlesource.com/aom"; + rev-prefix = "v"; + ignoredVersions = "(alpha|beta|rc).*"; + }; + }; + meta = with lib; { description = "Alliance for Open Media AV1 codec library"; longDescription = '' diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix index 38f16fa5bb1fb..3b24089e53c63 100644 --- a/pkgs/development/libraries/libb64/default.nix +++ b/pkgs/development/libraries/libb64/default.nix @@ -30,6 +30,13 @@ stdenv.mkDerivation rec { url = "https://github.com/libb64/libb64/commit/b5edeafc89853c48fa41a4c16393a1fdc8638ab6.patch"; hash = "sha256-+bqfOOlT/t0FLQEMHuxW1BxJcx9rk0yYM3wD43mcymo"; }) + # Fix build with Clang 16. + # https://github.com/libb64/libb64/pull/10 + (fetchpatch { + name = "use-proper-function-prototype-for-main.patch"; + url = "https://github.com/libb64/libb64/commit/98eaf510f40e384b32c01ad4bd5c3a697fdd8560.patch"; + hash = "sha256-CGslJUw0og/bBBirLm0J5Q7cf2WW/vniVAkXHlb6lbQ="; + }) ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) (fetchpatch { name = "0001-example-Do-not-run-the-tests.patch"; url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch?id=484e0de1e4ee107f21ae2a5c5f976ed987978baf"; diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 937937ae82602..ce570b76bc082 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -35,6 +35,10 @@ stdenv.mkDerivation rec { "-DBLADERF_GROUP=bladerf" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; + }; + hardeningDisable = [ "fortify" ]; meta = with lib; { diff --git a/pkgs/development/libraries/libcamera/default.nix b/pkgs/development/libraries/libcamera/default.nix index a502bc0d79620..076eccb1c26ef 100644 --- a/pkgs/development/libraries/libcamera/default.nix +++ b/pkgs/development/libraries/libcamera/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchgit +, fetchpatch , lib , meson , ninja @@ -31,6 +32,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; + patches = [ + (fetchpatch { + # https://git.libcamera.org/libcamera/libcamera.git/commit/?id=6cb92b523bd60bd7718df134cc5b1eff51cf42e5 + name = "libcamera-sphinx7.0-compat.patch"; + url = "https://git.libcamera.org/libcamera/libcamera.git/patch/?id=6cb92b523bd60bd7718df134cc5b1eff51cf42e5"; + hash = "sha256-gs0EiT3gWlmRjDim+o2C0VmnoWqEouP5pNTD4XbNSdE="; + }) + ]; + postPatch = '' patchShebangs utils/ ''; diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index fff5f705d7ce5..efb17eeaf3158 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , cmocka @@ -22,6 +23,19 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-ZTa+wG1g9KsVoqJG/yqxo2fJ7OhPnaI9QcfOmpOT3pg="; }; + outputs = [ "out" "dev" ]; + + patches = [ + # Pull fix pending upstream inclusion to support + # `CMAKE_INSTALL_INCLUDEDIR`: + # https://github.com/PJK/libcbor/pull/297 + (fetchpatch { + name = "includedir.patch"; + url = "https://github.com/PJK/libcbor/commit/d00a63e6d6858a2ed6be9b431b42799ed2c99ad8.patch"; + hash = "sha256-kBCSbAHOCGOs/4Yu6Vh0jcmzA/jYPkkPXPGPrptRfyk="; + }) + ]; + strictDeps = true; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 5daca729bc738..2fb83097c02af 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -69,7 +69,7 @@ let platforms."aarch64-linux".sha256 = "12sp58nxa3nv800badv62vpvc30hyb0ykywdaxgv9y8pswp9lq0z"; platforms."x86_64-linux".sha256 = "0vzzwq1k6bv9d209yg3samvfnfwj7s58y9r3p3pd98wxa9iyzf4j"; - platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; + platformInfo = builtins.getAttr stdenv.hostPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix index 6494f16a876cb..3bbf449d89aaf 100644 --- a/pkgs/development/libraries/libdeflate/default.nix +++ b/pkgs/development/libraries/libdeflate/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "libdeflate"; - version = "1.18"; + version = "1.19"; src = fetchFromGitHub { owner = "ebiggers"; repo = "libdeflate"; rev = "v${version}"; - sha256 = "sha256-dWSDAYn36GDtkghmouGhHzxpa6EVwCslIPqejlLMZNM="; + sha256 = "sha256-HgZ2an1PCPhiLsd3ZA7tgZ1wVTOdHzDr8FHrqJhEbQw="; }; cmakeFlags = lib.optionals stdenv.hostPlatform.isStatic [ "-DLIBDEFLATE_BUILD_SHARED_LIB=OFF" ]; diff --git a/pkgs/development/libraries/libdovi/default.nix b/pkgs/development/libraries/libdovi/default.nix index cf1a9a561f375..c70a217f6fce3 100644 --- a/pkgs/development/libraries/libdovi/default.nix +++ b/pkgs/development/libraries/libdovi/default.nix @@ -5,9 +5,7 @@ , rust , stdenv }: -let - rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; -in + rustPlatform.buildRustPackage rec { pname = "libdovi"; version = "3.1.2"; @@ -28,19 +26,19 @@ rustPlatform.buildRustPackage rec { buildPhase = '' runHook preBuild - ${rust.envVars.setEnv} cargo cbuild -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cbuild -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postBuild ''; installPhase = '' runHook preInstall - ${rust.envVars.setEnv} cargo cinstall -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cinstall -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postInstall ''; checkPhase = '' runHook preCheck - ${rust.envVars.setEnv} cargo ctest -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo ctest -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postCheck ''; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 31b284861d1b9..63a8522bd073c 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,15 +1,16 @@ { stdenv, lib, fetchurl, pkg-config, meson, ninja, docutils , libpthreadstubs, libpciaccess , withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light, valgrind-light +, gitUpdater }: stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.116"; + version = "2.4.117"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-RsU/QHNeo9JtYUKX8VX2ExpRBiSiQnT2VPZGnKkFM5o="; + hash = "sha256-ooiNaePrHIp3rcCKdaYPuuAfDSCNJvA00aEuNiNhJCs="; }; outputs = [ "out" "dev" "bin" ]; @@ -29,6 +30,16 @@ stdenv.mkDerivation rec { "-Detnaviv=disabled" ]; + passthru = { + updateScript = gitUpdater { + url = "https://gitlab.freedesktop.org/mesa/drm.git"; + rev-prefix = "libdrm-"; + # Skip versions like libdrm-2_0_2 that happen to go last when + # sorted. + ignoredVersions = "_"; + }; + }; + meta = with lib; { homepage = "https://gitlab.freedesktop.org/mesa/drm"; downloadPage = "https://dri.freedesktop.org/libdrm/"; diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index 6c7b559142967..cd98e2229fe23 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -31,6 +31,15 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isDarwin '' substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1" + '' + # cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?) + + lib.optionalString stdenv.isDarwin '' + substituteInPlace test/meson.build \ + --replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," "" + '' + + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + substituteInPlace test/meson.build \ + --replace "[ 'cgl_core', [ 'cgl_core.c' ] ]," "" ''; outputs = [ "out" "dev" ]; @@ -55,15 +64,6 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = lib.optionalString (x11Support && !stdenv.isDarwin) ''-DLIBGL_PATH="${lib.getLib libGL}/lib"''; - # cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?) - preCheck = lib.optionalString stdenv.isDarwin '' - substituteInPlace ../test/meson.build \ - --replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," "" - '' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' - substituteInPlace ../test/meson.build \ - --replace "[ 'cgl_core', [ 'cgl_core.c' ] ]," "" - ''; - doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 681f9cbfb2297..5bfa335314fe8 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -34,12 +34,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc-arch=generic" # no detection of -march= or -mtune= "--enable-pax_emutramp" - - # Causes issues in downstream packages which misuse ffi_closure_alloc - # Reenable once these issues are fixed and merged: - # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6155 - # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/283 - "--disable-exec-static-tramp" ]; preCheck = '' diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index fa9562947f815..b7ccb7085fb20 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "libglvnd"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "glvnd"; repo = "libglvnd"; rev = "v${version}"; - sha256 = "sha256-p/vLxagN9nCYw1JpUmZetgctQbrp3Wo33OVFrtvmnjQ="; + sha256 = "sha256-2U9JtpGyP4lbxtVJeP5GUgh5XthloPvFIw28+nldYx8="; }; nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ]; @@ -69,6 +69,8 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.freedesktop.org/glvnd/libglvnd/-/tags/v${version}"; license = with licenses; [ mit bsd1 bsd3 gpl3Only asl20 ]; platforms = platforms.unix; + # https://gitlab.freedesktop.org/glvnd/libglvnd/-/issues/212 + badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 35ffc46ec618d..243c26af8e58d 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libical"; - version = "3.0.16"; + version = "3.0.17"; outputs = [ "out" "dev" ]; # "devdoc" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "sha256-3D/0leI3LLKDFOXkKSrmMamLoaXdi/2Z4iPUXqgwtg8="; + sha256 = "sha256-GqPCjI40kkqNv9zTnLdJgZVBxS4eZRHl+k/BN9vGnDo="; }; strictDeps = true; @@ -105,6 +105,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/libical/libical"; description = "An Open Source implementation of the iCalendar protocols"; + changelog = "https://github.com/libical/libical/raw/v${version}/ReleaseNotes.txt"; license = licenses.mpl20; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libimagequant/Cargo.lock b/pkgs/development/libraries/libimagequant/Cargo.lock index 8823a070b81bd..fdad112994ac6 100644 --- a/pkgs/development/libraries/libimagequant/Cargo.lock +++ b/pkgs/development/libraries/libimagequant/Cargo.lock @@ -76,16 +76,6 @@ dependencies = [ ] [[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] name = "crossbeam-deque" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -135,9 +125,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -153,18 +143,11 @@ dependencies = [ ] [[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] name = "imagequant" -version = "4.2.1" +version = "4.2.2" dependencies = [ "arrayvec", "lodepng", - "num_cpus", "once_cell", "rayon", "rgb", @@ -173,7 +156,7 @@ dependencies = [ [[package]] name = "imagequant-sys" -version = "4.0.2" +version = "4.0.3" dependencies = [ "bitflags", "imagequant", @@ -182,15 +165,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "lodepng" -version = "3.7.2" +version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ad39f75bbaa4b10bb6f2316543632a8046a5bcf9c785488d79720b21f044f8" +checksum = "a3cdccd0cf57a5d456f0656ebcff72c2e19503287e1afbf3b84382812adc0606" dependencies = [ "crc32fast", "fallible_collections", @@ -218,16 +201,6 @@ dependencies = [ ] [[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] name = "once_cell" version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -235,9 +208,9 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -245,14 +218,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index 5792170b9f094..f60a1c7cab7a6 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -1,17 +1,14 @@ { lib, stdenv, fetchFromGitHub, fetchurl, rust, rustPlatform, cargo-c, python3 }: -let - rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; -in rustPlatform.buildRustPackage rec { pname = "libimagequant"; - version = "4.2.1"; + version = "4.2.2"; src = fetchFromGitHub { owner = "ImageOptim"; repo = pname; rev = version; - hash = "sha256-a5TztgNFRV9BVERpHI33ZEYwfOR46F9FzmbquzwGq3k="; + hash = "sha256-cZgnJOmj+xJDcewsxH2Jp5AAnFZKVuYxKPtoGeN03g4="; }; cargoLock = { @@ -26,13 +23,13 @@ rustPlatform.buildRustPackage rec { postBuild = '' pushd imagequant-sys - ${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} popd ''; postInstall = '' pushd imagequant-sys - ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} popd ''; diff --git a/pkgs/development/libraries/libiscsi/default.nix b/pkgs/development/libraries/libiscsi/default.nix index 806a9729c574c..826593b9d66c6 100644 --- a/pkgs/development/libraries/libiscsi/default.nix +++ b/pkgs/development/libraries/libiscsi/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0ajrkkg5awmi8m4b3mha7h07ylg18k252qprvk1sgq0qbyd66zy7"; }; + postPatch = '' + substituteInPlace lib/socket.c \ + --replace "void iscsi_decrement_iface_rr() {" "void iscsi_decrement_iface_rr(void) {" + ''; + nativeBuildInputs = [ autoreconfHook ]; # This problem is gone on libiscsi master. diff --git a/pkgs/development/libraries/libnsl/default.nix b/pkgs/development/libraries/libnsl/default.nix index 4f9d7d09caaad..59e16071ce714 100644 --- a/pkgs/development/libraries/libnsl/default.nix +++ b/pkgs/development/libraries/libnsl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libnsl"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "thkukuk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f9kNzzR8baf5mLgrh+bKO/rBRZA5ZYc1tJdyLE7Bi1w="; + sha256 = "sha256-bCToqXVE4RZcoZ2eTNZcVHyzKlWyIpSAssQCOZcfmEA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index 8618986195e82..0598fd6451ef5 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -1,16 +1,30 @@ -{ lib, stdenv, fetchurl +{ lib +, stdenv +, fetchurl , enableShared ? !stdenv.hostPlatform.isStatic +, windows }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation (finalAttrs: { version = "4.13.0"; pname = "libpfm"; src = fetchurl { - url = "mirror://sourceforge/perfmon2/libpfm4/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/perfmon2/libpfm4/libpfm-${finalAttrs.version}.tar.gz"; sha256 = "sha256-0YuXdkx1VSjBBR03bjNUXQ62DG6/hWgENoE/pbBMw9E="; }; + # Don't install libpfm.so on windows as it doesn't exist + # This target is created only if `ifeq ($(SYS),Linux)` passes + patches = [ ./fix-windows.patch ]; + + # Upstream uses "WINDOWS" instead of "Windows" which is incorrect + # See: https://github.com/NixOS/nixpkgs/pull/252982#discussion_r1314346216 + postPatch = '' + substituteInPlace config.mk examples/Makefile \ + --replace '($(SYS),WINDOWS)' '($(SYS),Windows)' + ''; + makeFlags = [ "PREFIX=${placeholder "out"}" "LDCONFIG=true" @@ -19,6 +33,9 @@ stdenv.mkDerivation (rec { ]; env.NIX_CFLAGS_COMPILE = "-Wno-error"; + env.CONFIG_PFMLIB_SHARED = if enableShared then "y" else "n"; + + buildInputs = lib.optional stdenv.hostPlatform.isWindows windows.libgnurx; meta = with lib; { description = "Helper library to program the performance monitoring events"; @@ -29,11 +46,7 @@ stdenv.mkDerivation (rec { (PMU) of modern processors. ''; license = licenses.gpl2; - maintainers = [ maintainers.pierron ]; - platforms = platforms.linux; + maintainers = with maintainers; [ pierron t4ccer ]; + platforms = platforms.linux ++ platforms.windows; }; -} // lib.optionalAttrs ( ! enableShared ) -{ - CONFIG_PFMLIB_SHARED = "n"; -} -) +}) diff --git a/pkgs/development/libraries/libpfm/fix-windows.patch b/pkgs/development/libraries/libpfm/fix-windows.patch new file mode 100644 index 0000000000000..584b9ba6eb816 --- /dev/null +++ b/pkgs/development/libraries/libpfm/fix-windows.patch @@ -0,0 +1,18 @@ +diff --git a/lib/Makefile b/lib/Makefile +index 5ca71e3..cd0717f 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -428,11 +428,13 @@ install: + -mkdir -p $(DESTDIR)$(LIBDIR) + $(INSTALL) -m 644 $(ALIBPFM) $(DESTDIR)$(LIBDIR) + ifeq ($(CONFIG_PFMLIB_SHARED),y) ++ifeq ($(SYS),Linux) + $(INSTALL) $(SLIBPFM) $(DESTDIR)$(LIBDIR) + cd $(DESTDIR)$(LIBDIR); $(LN) $(SLIBPFM) $(VLIBPFM) + cd $(DESTDIR)$(LIBDIR); $(LN) $(SLIBPFM) libpfm.$(SOLIBEXT) + -$(LDCONFIG) + endif ++endif + + tags: + $(CTAGS) -o $(TOPDIR)/tags --tag-relative=yes $(SRCS) $(INCDEP) diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index 4a17bd951aa84..afae47c96d3d7 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -4,7 +4,6 @@ , extra-cmake-modules , qtbase , qtmultimedia -, qtquick1 , qttools , libGL , libX11 @@ -25,7 +24,6 @@ mkDerivation rec { buildInputs = [ qtbase qtmultimedia - qtquick1 libGL libX11 libass diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index a0843d4b2ef7a..7ba6f1963e717 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -15,7 +15,6 @@ , libobjc , rustPlatform , rustc -, rust , cargo-auditable-cargo-wrapper , gi-docgen , python3Packages @@ -106,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-always-build-tests" ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic" - ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "RUST_TARGET=${rust.toRustTarget stdenv.hostPlatform}"; + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "RUST_TARGET=${stdenv.hostPlatform.rust.rustcTarget}"; doCheck = false; # all tests fail on libtool-generated rsvg-convert not being able to find coreutils diff --git a/pkgs/development/libraries/librttopo/default.nix b/pkgs/development/libraries/librttopo/default.nix index 690417c3e730b..5d768db366df0 100644 --- a/pkgs/development/libraries/librttopo/default.nix +++ b/pkgs/development/libraries/librttopo/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "RT Topology Library"; homepage = "https://git.osgeo.org/gitea/rttopo/librttopo"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; teams.geospatial.members ++ [ dotlambda ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index 75fc2afbf1877..e9547cc2af930 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config +{ lib, stdenv, fetchurl, fetchpatch, pkg-config , libvorbis, libtheora, speex }: # need pkg-config so that libshout installs ${out}/lib/pkgconfig/shout.pc @@ -12,6 +12,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-OcvU8O/f3cl1XYghfkf48tcQj6dn+dWKK6JqFtj3yRA="; }; + patches = [ + # Fixes building libshout with clang. Can be dropped once the following MR is merged: + # https://gitlab.xiph.org/xiph/icecast-libshout/-/merge_requests/4. + (fetchpatch { + url = "https://gitlab.xiph.org/xiph/icecast-libshout/-/commit/600fa105a799986efcccddfedfdfd3e9a1988cd0.patch"; + hash = "sha256-XjogfcQJBPZX9MPAbNJyXaFZNekL1pabvtTT7N+cz+s="; + }) + (fetchpatch { + url = "https://gitlab.xiph.org/xiph/icecast-libshout/-/commit/8ab2de318d55c9d0987ffae7d9b94b365af732c1.patch"; + hash = "sha256-0+Wp2Xu59ESCJfoDcwAJHuAJyzMsaBe7f8Js3/ren2g="; + }) + ]; + outputs = [ "out" "dev" "doc" ]; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index b4eeed32d5967..b3a00d89a5d53 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; - patches = lib.optional stdenv.targetPlatform.isMinGW ./mingw-no-fortify.patch; + patches = lib.optional stdenv.hostPlatform.isMinGW ./mingw-no-fortify.patch; - nativeBuildInputs = lib.optional stdenv.targetPlatform.isMinGW autoreconfHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isMinGW autoreconfHook; separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; enableParallelBuilding = true; - hardeningDisable = lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isx86_32) "stackprotector"; + hardeningDisable = lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_32) "stackprotector"; # FIXME: the hardeingDisable attr above does not seems effective, so # the need to disable stackprotector via configureFlags - configureFlags = lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isx86_32) "--disable-ssp"; + configureFlags = lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_32) "--disable-ssp"; doCheck = true; diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index 372f0c479c81c..b8d1fe45e44ee 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { # They allow any of these license = with licenses; [ gpl2Plus lgpl21Plus mpl11 ]; platforms = platforms.unix; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; teams.geospatial.members ++ [ dotlambda ]; }; } diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 4fc6449230dcf..8055704b0890c 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "libtiff"; - version = "4.5.1"; + version = "4.6.0"; src = fetchFromGitLab { owner = "libtiff"; repo = "libtiff"; rev = "v${version}"; - hash = "sha256-qQEthy6YhNAQmdDMyoCIvK8f3Tx25MgqhJZW74CB93E="; + hash = "sha256-qCg5qjsPPynCHIg0JsPJldwVdcYkI68zYmyNAKUCoyw="; }; patches = [ diff --git a/pkgs/development/libraries/libtiff/headers.patch b/pkgs/development/libraries/libtiff/headers.patch index e0ef9f3478a6e..933e06f32326e 100644 --- a/pkgs/development/libraries/libtiff/headers.patch +++ b/pkgs/development/libraries/libtiff/headers.patch @@ -1,9 +1,8 @@ -diff --git i/libtiff/Makefile.am w/libtiff/Makefile.am -index 44522b62..d66e5948 100644 +export private headers for freeimage --- i/libtiff/Makefile.am +++ w/libtiff/Makefile.am @@ -36,8 +36,12 @@ EXTRA_DIST = \ - tiffconf.h.cmake.in + tif_win32_versioninfo.rc libtiffinclude_HEADERS = \ + tif_config.h \ diff --git a/pkgs/development/libraries/libtiff/rename-version.patch b/pkgs/development/libraries/libtiff/rename-version.patch index ddd33ad490454..04fa1bfc88c72 100644 --- a/pkgs/development/libraries/libtiff/rename-version.patch +++ b/pkgs/development/libraries/libtiff/rename-version.patch @@ -1,3 +1,4 @@ +fix case-insensitive build --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,7 @@ docfiles = \ @@ -6,15 +7,15 @@ TODO \ - VERSION + VERSION.txt - + EXTRA_DIST = \ - cmake \ -@@ -61,7 +61,7 @@ SUBDIRS = port libtiff tools build contrib test doc - + placeholder.h \ +@@ -68,7 +68,7 @@ NEW_LIBTIFF_RELEASE_DATE=$(shell date +"%Y%m%d") release: - (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) + @(echo --- Setting release date to $(NEW_LIBTIFF_RELEASE_DATE) and release version to $(LIBTIFF_VERSION) ---) + (rm -f $(top_srcdir)/RELEASE-DATE && echo $(NEW_LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) - (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION) -+ (rm -f $(top_srcdir)/VERSION.txt && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) - (rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h) - ++ (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) + (rm -f $(top_builddir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(NEW_LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_builddir)/libtiff/tiffvers.h && sed -i 's,@,,g' $(top_builddir)/libtiff/tiffvers.h) + pkgconfigdir = $(libdir)/pkgconfig diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index 5779389dda1bb..a42aab3d59e8c 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -1,25 +1,15 @@ -{ lib, stdenv, fetchgit, fetchpatch }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation rec { pname = "liburing"; - version = "2.4"; + version = "2.5"; src = fetchgit { url = "http://git.kernel.dk/${pname}"; rev = "liburing-${version}"; - sha256 = "sha256-vbe9uh9AqXyPkzwD6zHoHH3JMeAJEl2FSGzny1T7diM="; + sha256 = "sha256-hPyEZ0P1rfos53OCNd2OYFiqmv6TgpWaj5/xPLccCvM="; }; - patches = [ - # Pull upstream fix for parallel build failures: - # https://github.com/axboe/liburing/pull/891 - (fetchpatch { - name = "parallel.patch"; - url = "https://github.com/axboe/liburing/commit/c34dca74854cb6e7f2b09affa2a4ab0145e62371.patch"; - hash = "sha256-RZSgHdQy5d7mXtMvkMyr+/kMhp1w+S5v9cqk5NSii5o="; - }) - ]; - separateDebugInfo = true; enableParallelBuilding = true; # Upstream's configure script is not autoconf generated, but a hand written one. diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 326ee30281582..1f768a2cb261f 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -4,7 +4,7 @@ , fetchpatch , autoreconfHook , pkg-config -, enableUdev ? stdenv.isLinux && !stdenv.targetPlatform.isStatic +, enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isStatic , udev , libobjc , IOKit diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 250b09ecee5d0..d8b7cbdab5219 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , autoconf , automake , libtool @@ -33,6 +34,15 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-Lrsyh4qd3OkTw1cSPfahzfSGNt6+pRN1X21iiv1SsFo="; }; + patches = [ + # Disable io_uring close on selected kernels. Remove on next release + # https://github.com/libuv/libuv/pull/4141 + (fetchpatch { + url = "https://github.com/libuv/libuv/commit/c811169f91b2101f7302e96de3d2dc366ade3a25.patch"; + hash = "sha256-7vk6XGXwJcwYUQPqIJ3JPd/fPIGrjE5WRDSJCMQfKeU="; + }) + ]; + outputs = [ "out" "dev" ]; postPatch = let @@ -115,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A multi-platform support library with a focus on asynchronous I/O"; homepage = "https://libuv.org/"; changelog = "https://github.com/libuv/libuv/blob/v${finalAttrs.version}/ChangeLog"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ marsam ]; platforms = platforms.all; license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; }; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 7796ec251582b..43fe69af2b0e2 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libva" + lib.optionalString minimal "-minimal"; - version = "2.19.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = version; - sha256 = "sha256-M6mAHvGl4d9EqdkDBSxSbpZUCUcrkpnf+hfo16L3eHs="; + sha256 = "sha256-ENAsytjqvS8xHZyZLPih3bzBgQ1f/j+s3dWZs1GTWHs="; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix index 27ce41d20f623..0e92d28046aa3 100644 --- a/pkgs/development/libraries/libvterm-neovim/default.nix +++ b/pkgs/development/libraries/libvterm-neovim/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libvterm-neovim"; # Releases are not tagged, look at commit history to find latest release - version = "0.3.2"; + version = "0.3.3"; src = fetchurl { - url = "https://www.leonerd.org.uk/code/libvterm/libvterm-${version}.tar.gz"; - sha256 = "sha256-ketQiAafTm7atp4UxCEvbaAZLmVpWVbcBIAWoNq4vPY="; + url = "https://launchpad.net/libvterm/trunk/v${lib.versions.majorMinor version}/+download/libvterm-${version}.tar.gz"; + hash = "sha256-CRVvQ90hKL00fL7r5Q2aVx0yxk4M8Y0hEZeUav9yJuA="; }; nativeBuildInputs = [ perl libtool ]; diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index c03dd99a125b6..254769349b15d 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "2.7.0"; + version = "2.8.0"; outputs = [ "out" "dev" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-NNfhZMshM5U/EfJHuNgkDe5NEkEGKtJ56vSpXyGf/xw="; + hash = "sha256-VjFZBlOIG1L4dXPJ8DWxrbfVqdQC+X7zVXFryo43FFc="; }; postPatch = '' diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index ea0059e34b612..173cc2016e5db 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchurl, fetchpatch +{ stdenv, lib, fetchurl, fetchpatch, buildPackages , meson, pkg-config, ninja , intltool, bison, flex, file, python3Packages, wayland-scanner , expat, libdrm, xorg, wayland, wayland-protocols, openssl -, llvmPackages_15, libffi, libomxil-bellagio, libva-minimal +, llvmPackages_16, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau , libglvnd, libunwind, lm_sensors , vulkan-loader, glslang @@ -64,10 +64,8 @@ , enableOSMesa ? stdenv.isLinux , enableOpenCL ? stdenv.isLinux && stdenv.isx86_64 , enablePatentEncumberedCodecs ? true -, libclc , jdupes , rustc -, rust-bindgen , spirv-llvm-translator , zstd , directx-headers @@ -95,13 +93,13 @@ let withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm; - llvmPackages = llvmPackages_15; + llvmPackages = llvmPackages_16; # Align all the Mesa versions used. Required to prevent explosions when # two different LLVMs are loaded in the same process. # FIXME: these should really go into some sort of versioned LLVM package set - rust-bindgen' = rust-bindgen.override { - rust-bindgen-unwrapped = rust-bindgen.unwrapped.override { - clang = llvmPackages.clang; + rust-bindgen' = buildPackages.rust-bindgen.override { + rust-bindgen-unwrapped = buildPackages.rust-bindgen.unwrapped.override { + clang = buildPackages.llvmPackages_15.clang; }; }; spirv-llvm-translator' = spirv-llvm-translator.override { @@ -202,7 +200,8 @@ self = stdenv.mkDerivation { "-Dglvnd=true" # Enable RT for Intel hardware - "-Dintel-clc=enabled" + # https://gitlab.freedesktop.org/mesa/mesa/-/issues/9080 + (lib.mesonEnable "intel-clc" (stdenv.buildPlatform == stdenv.hostPlatform)) ] ++ lib.optionals enableOpenCL [ # Clover, old OpenCL frontend "-Dgallium-opencl=icd" @@ -218,26 +217,29 @@ self = stdenv.mkDerivation { ++ lib.optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}"; buildInputs = with xorg; [ - expat llvmPackages.libllvm libglvnd xorgproto + expat glslang llvmPackages.libllvm libglvnd xorgproto libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr libffi libvdpau libelf libXvMC libpthreadstubs openssl /*or another sha1 provider*/ zstd libunwind + python3Packages.python # for shebang ] ++ lib.optionals haveWayland [ wayland wayland-protocols ] ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal udev lm_sensors ] - ++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped rustc rust-bindgen' spirv-llvm-translator' ] + ++ lib.optionals enableOpenCL [ llvmPackages.libclc llvmPackages.clang llvmPackages.clang-unwrapped spirv-llvm-translator' ] ++ lib.optional withValgrind valgrind-light ++ lib.optional haveZink vulkan-loader ++ lib.optional haveDozen directx-headers; - depsBuildBuild = [ pkg-config ]; + depsBuildBuild = [ pkg-config ] + ++ lib.optional enableOpenCL buildPackages.stdenv.cc; nativeBuildInputs = [ meson pkg-config ninja intltool bison flex file python3Packages.python python3Packages.mako python3Packages.ply jdupes glslang - ] ++ lib.optional haveWayland wayland-scanner; + ] ++ lib.optionals enableOpenCL [ rust-bindgen' rustc ] + ++ lib.optional haveWayland wayland-scanner; propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm @@ -320,6 +322,9 @@ self = stdenv.mkDerivation { fi done + # Don't depend on build python + patchShebangs --host --update $out/bin/* + # NAR doesn't support hard links, so convert them to symlinks to save space. jdupes --hard-links --link-soft --recurse "$drivers" diff --git a/pkgs/development/libraries/microsoft-gsl/default.nix b/pkgs/development/libraries/microsoft-gsl/default.nix index f0bd76ab4fba9..298aec48db753 100644 --- a/pkgs/development/libraries/microsoft-gsl/default.nix +++ b/pkgs/development/libraries/microsoft-gsl/default.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ gtest ]; + # error: unsafe buffer access + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unsafe-buffer-usage"; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix index 5619fe7039e6f..74493a06b526c 100644 --- a/pkgs/development/libraries/minizip/default.nix +++ b/pkgs/development/libraries/minizip/default.nix @@ -1,9 +1,19 @@ -{ lib, stdenv, zlib, autoreconfHook }: +{ lib, stdenv, zlib, autoreconfHook, fetchpatch }: stdenv.mkDerivation { pname = "minizip"; inherit (zlib) src version; + patches = [ + (fetchpatch { + name = "CVE-2023-45853.patch"; + url = "https://github.com/madler/zlib/commit/73331a6a0481067628f065ffe87bb1d8f787d10c.patch"; + hash = "sha256-yayfe1g9HsvgMN28WF/MYkH7dGMX4PsK53FcnfL3InM="; + }) + ]; + + patchFlags = [ "-p3" ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib ]; diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index dcba45f41c3dd..13816faefce9a 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; # Should be fixable if a higher clang version is used, see: # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 - broken = stdenv.targetPlatform.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/libraries/multipart-parser-c/default.nix b/pkgs/development/libraries/multipart-parser-c/default.nix index 45b0abdee71b9..89665f2efc9af 100644 --- a/pkgs/development/libraries/multipart-parser-c/default.nix +++ b/pkgs/development/libraries/multipart-parser-c/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/lib - mv lib*${stdenv.targetPlatform.extensions.sharedLibrary} $out/lib/ + mv lib*${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ mkdir -p $out/include mv *.h $out/include/ diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index cb8333704ff12..9c1c8b422a98a 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , buildPackages +, ncurses , pkg-config , abiVersion ? "6" , enableStatic ? stdenv.hostPlatform.isStatic @@ -48,20 +49,20 @@ stdenv.mkDerivation (finalAttrs: { "/usr/share/terminfo" # upstream default, probably all FHS-based distros "/run/current-system/sw/share/terminfo" # NixOS ]}" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "--with-build-cc=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" ]; # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; strictDeps = true; - depsBuildBuild = [ - buildPackages.stdenv.cc - ]; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - buildPackages.ncurses + # for `tic`, build already depends on for build `cc` so it's weird the build doesn't just build `tic`. + ncurses ]; buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm; diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index 9335bec35ce87..8fa37141628cc 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { "TUNE=${ if tune then "auto" - else if stdenv.targetPlatform.isx86 then + else if stdenv.hostPlatform.isx86 then "x86" # "chooses options that should be well suited for most x86 platforms" else "generic" # "chooses options that should be OK for most platforms" diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index 3062c3cb4e11c..a1a9dc8757353 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "oniguruma"; - version = "6.9.8"; + version = "6.9.9"; # Note: do not use fetchpatch or fetchFromGitHub to keep this package available in __bootPackages src = fetchurl { url = "https://github.com/kkos/oniguruma/releases/download/v${version}/onig-${version}.tar.gz"; - sha256 = "sha256-KM1iwUZGI8eRBWX7HMqqAQSy/osSvNZG6B9ztHU1IT4="; + sha256 = "sha256-YBYr07n8b0iG1MegeSX/03QWdzL1Xc6MSRv9nNgYps8="; }; outputs = [ "dev" "lib" "out" ]; diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 4a9ee61f5614c..7a8b8570f62c7 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -17,7 +17,7 @@ , microsoft-gsl , iconv , gtest -, protobuf3_21 +, protobuf_21 , pythonSupport ? true }: @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { cmake pkg-config python3Packages.python - protobuf3_21 + protobuf_21 ] ++ lib.optionals pythonSupport (with python3Packages; [ setuptools wheel @@ -154,6 +154,13 @@ stdenv.mkDerivation rec { "-Donnxruntime_ENABLE_PYTHON=ON" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=deprecated-declarations" + "-Wno-error=unused-but-set-variable" + ]; + }; + doCheck = true; postPatch = '' @@ -177,7 +184,7 @@ stdenv.mkDerivation rec { ''; passthru = { - protobuf = protobuf3_21; + protobuf = protobuf_21; tests = lib.optionalAttrs pythonSupport { python = python3Packages.onnxruntime; }; diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/development/libraries/opencore-amr/default.nix index 26b2715658bb9..38a50b75027bc 100644 --- a/pkgs/development/libraries/opencore-amr/default.nix +++ b/pkgs/development/libraries/opencore-amr/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "opencore-amr"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; - sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c"; + url = "mirror://sourceforge/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; + hash = "sha256-SD60BhCI4rNLNY5HVAtdSVqWzUaONhBQ+uYVsYCdxKE="; }; meta = { diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index e65f7ce01da99..e3f458d0d7339 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -3,7 +3,7 @@ , fetchpatch , callPackage , cmake, pkg-config, unzip, zlib, pcre, hdf5 -, glog, boost, gflags, protobuf3_21 +, glog, boost, gflags, protobuf_21 , config , enableJPEG ? true, libjpeg @@ -186,7 +186,7 @@ stdenv.mkDerivation { buildInputs = [ zlib pcre hdf5 glog boost gflags ] - ++ lib.optional useSystemProtobuf protobuf3_21 + ++ lib.optional useSystemProtobuf protobuf_21 ++ lib.optional enablePython pythonPackages.python ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 01e96e8f5b4d1..06360449c1ba9 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -11,7 +11,7 @@ , hdf5 , boost , gflags -, protobuf3_21 +, protobuf_21 , config , ocl-icd , buildPackages @@ -298,7 +298,7 @@ effectiveStdenv.mkDerivation { echo '"(build info elided)"' > modules/core/version_string.inc ''; - buildInputs = [ zlib pcre boost gflags protobuf3_21 ] + buildInputs = [ zlib pcre boost gflags protobuf_21 ] ++ lib.optional enablePython pythonPackages.python ++ lib.optional (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) hdf5 ++ lib.optional enableGtk2 gtk2 @@ -362,7 +362,7 @@ effectiveStdenv.mkDerivation { "-DOPENCV_GENERATE_PKGCONFIG=ON" "-DWITH_OPENMP=ON" "-DBUILD_PROTOBUF=OFF" - "-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf3_21}" + "-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf_21}" "-DPROTOBUF_UPDATE_FILES=ON" "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}" "-DBUILD_TESTS=${printEnabled runAccuracyTests}" diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix index a5ce27e270e4f..826c7b2c854f3 100644 --- a/pkgs/development/libraries/openexr/3.nix +++ b/pkgs/development/libraries/openexr/3.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "openexr"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "openexr"; rev = "v${version}"; - hash = "sha256-cV+qgx3WzdotypgpZhVFxzdKAU2rNVw0KWSdkeN0gLk="; + hash = "sha256-ycn2RbHM/vIDUGGGnfNZ0Zm0qjjKRRNhkMD11PkpGF0="; }; outputs = [ "bin" "dev" "out" "doc" ]; diff --git a/pkgs/development/libraries/openfec/default.nix b/pkgs/development/libraries/openfec/default.nix index a908b4980dadb..dd6b0ce10c0b0 100644 --- a/pkgs/development/libraries/openfec/default.nix +++ b/pkgs/development/libraries/openfec/default.nix @@ -1,12 +1,17 @@ -{ stdenv, lib, fetchzip, cmake }: +{ stdenv +, lib +, fetchzip +, cmake +, gitUpdater +}: stdenv.mkDerivation rec { pname = "openfec"; - version = "1.4.2"; + version = "1.4.2.9"; src = fetchzip { - url = "http://openfec.org/files/openfec_v1_4_2.tgz"; - sha256 = "sha256:0c2lg8afr7lqpzrsi0g44a6h6s7nq4vz7yc9vm2k57ph2y6r86la"; + url = "https://github.com/roc-streaming/openfec/archive/refs/tags/v${version}.tar.gz"; + hash = "sha256-A/U9Nh8tspRoT3bYePJLUrNa9jxiL0r2Xaf64wWbmVA="; }; outputs = [ "out" "dev" ]; @@ -33,6 +38,11 @@ stdenv.mkDerivation rec { ln -s libopenfec${so} $out/lib/libopenfec${so}.1 ''; + passthru.updateScript = gitUpdater { + url = "https://github.com/roc-streaming/openfec.git"; + rev-prefix = "v"; + }; + meta = with lib; { description = "Application-level Forward Erasure Correction codes"; homepage = "https://github.com/roc-streaming/openfec"; diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 50098de03ddf1..d528e2fc0302d 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -25,8 +25,10 @@ stdenv.mkDerivation rec { patches = [ # modernise cmake files, also fixes them for multiple outputs + # https://github.com/uclouvain/openjpeg/pull/1424 (fetchpatch { - url = "https://github.com/uclouvain/openjpeg/pull/1424.patch"; + name = "uclouvain-openjpeg-pull-1424.patch"; + url = "https://github.com/uclouvain/openjpeg/compare/52927287402a9f7353de8854c88f931051211e2f...9d4f70cfe99626f82f9c8dcbf45f07709e3511b2.patch"; sha256 = "sha256-CxVRt1u4HVOMUjWiZ2plmZC29t/zshCpSY+N4Wlrlvg="; }) # fix cmake files cross compilation diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 2b0d778ef3d72..3aeafccb1edb2 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -18,14 +18,14 @@ # files. let - common = { version, sha256, patches ? [], withDocs ? false, extraMeta ? {} }: + common = { version, hash, patches ? [], withDocs ? false, extraMeta ? {} }: stdenv.mkDerivation (finalAttrs: { pname = "openssl"; inherit version; src = fetchurl { url = "https://www.openssl.org/source/${finalAttrs.pname}-${version}.tar.gz"; - inherit sha256; + inherit hash; }; inherit patches; @@ -219,9 +219,11 @@ let meta = with lib; { homepage = "https://www.openssl.org/"; + changelog = "https://github.com/openssl/openssl/blob/openssl-${version}/CHANGES.md"; description = "A cryptographic library that implements the SSL and TLS protocols"; license = licenses.openssl; mainProgram = "openssl"; + maintainers = with maintainers; [ thillux ]; pkgConfigModules = [ "libcrypto" "libssl" @@ -238,7 +240,7 @@ in { # and backport this to stable release (23.05). openssl_1_1 = common { version = "1.1.1w"; - sha256 = "sha256-zzCYlQy02FOtlcCEHx+cbT3BAtzPys1SHZOSUgi3asg="; + hash = "sha256-zzCYlQy02FOtlcCEHx+cbT3BAtzPys1SHZOSUgi3asg="; patches = [ ./1.1/nix-ssl-cert-file.patch @@ -255,8 +257,32 @@ in { }; openssl_3 = common { - version = "3.0.11"; - sha256 = "sha256-s0JdO7SiIY0Gl+tB9/wM3t4BbtGcpJ0Wi3jo2UeIf1U="; + version = "3.0.12"; + hash = "sha256-+Tyejt3l6RZhGd4xdV/Ie0qjSGNmL2fd/LoU0La2m2E="; + + patches = [ + ./3.0/nix-ssl-cert-file.patch + + # openssl will only compile in KTLS if the current kernel supports it. + # This patch disables build-time detection. + ./3.0/openssl-disable-kernel-detection.patch + + (if stdenv.hostPlatform.isDarwin + then ./use-etc-ssl-certs-darwin.patch + else ./use-etc-ssl-certs.patch) + ]; + + withDocs = true; + + extraMeta = with lib; { + license = licenses.asl20; + }; + }; + + openssl_3_1 = common { + version = "3.1.4"; + hash = "sha256-hAr1Nmq5tSK95SWCa+PvD7Cvgcap69hMqmAP6hcx7uM="; + patches = [ ./3.0/nix-ssl-cert-file.patch diff --git a/pkgs/development/libraries/piper-phonemize/default.nix b/pkgs/development/libraries/piper-phonemize/default.nix index 2016f7234e5a3..b08495cae74c3 100644 --- a/pkgs/development/libraries/piper-phonemize/default.nix +++ b/pkgs/development/libraries/piper-phonemize/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch # build , cmake @@ -22,19 +23,23 @@ let }; patches = [ + (fetchpatch { + url = "https://github.com/espeak-ng/espeak-ng/commit/497c6217d696c1190c3e8b992ff7b9110eb3bedd.patch"; + hash = "sha256-KfzqnRyQfz6nuMKnsHoUzb9rn9h/Pg54mupW1Cr+Zx0="; + }) ./espeak-mbrola.patch ]; }); in stdenv.mkDerivation rec { pname = "piper-phonemize"; - version = "2023.11.6-1"; + version = "2023.11.14-4"; src = fetchFromGitHub { owner = "rhasspy"; repo = "piper-phonemize"; rev = "refs/tags/${version}"; - hash = "sha256-IRvuA03Z6r8Re/ocq2G/r28uwI9RU3xmmNI7S2G40rc="; + hash = "sha256-pj1DZUhy3XWGn+wNtxKKDWET9gsfofEB0NZ+EEQz9q0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch b/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch deleted file mode 100644 index fab89c4ffd937..0000000000000 --- a/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index 99a4b2d1..d4a4cda7 100644 ---- a/meson.build -+++ b/meson.build -@@ -55,7 +55,7 @@ endif - - spa_plugindir = pipewire_libdir / spa_name - --alsadatadir = pipewire_datadir / 'alsa-card-profile' / 'mixer' -+alsadatadir = pipewire_libdir / '..' / 'share' / 'alsa-card-profile' / 'mixer' - - pipewire_headers_dir = pipewire_name / 'pipewire' - diff --git a/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch b/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch deleted file mode 100644 index 230f1b30394a5..0000000000000 --- a/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/meson_options.txt b/meson_options.txt -index 961ae2a76..692b84dfd 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -179,6 +179,9 @@ option('udev', - option('udevrulesdir', - type : 'string', - description : 'Directory for udev rules (defaults to /lib/udev/rules.d)') -+option('pipewire_pulse_prefix', -+ type : 'string', -+ description: 'Install directory for the pipewire-pulse daemon') - option('systemd-system-unit-dir', - type : 'string', - description : 'Directory for system systemd units (defaults to /usr/lib/systemd/system)') -diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build -index d17f3794f..34afe4f1a 100644 ---- a/src/daemon/systemd/user/meson.build -+++ b/src/daemon/systemd/user/meson.build -@@ -9,7 +9,7 @@ install_data( - - systemd_config = configuration_data() - systemd_config.set('PW_BINARY', pipewire_bindir / 'pipewire') --systemd_config.set('PW_PULSE_BINARY', pipewire_bindir / 'pipewire-pulse') -+systemd_config.set('PW_PULSE_BINARY', get_option('pipewire_pulse_prefix') / 'bin/pipewire-pulse') - - configure_file(input : 'pipewire.service.in', - output : 'pipewire.service', diff --git a/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch b/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch deleted file mode 100644 index b8d8fcb0f9053..0000000000000 --- a/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/meson.build b/meson.build -index b6b4553b..f21c29d8 100644 ---- a/meson.build -+++ b/meson.build -@@ -37,7 +37,10 @@ pipewire_localedir = prefix / get_option('localedir') - pipewire_sysconfdir = prefix / get_option('sysconfdir') - - pipewire_configdir = pipewire_sysconfdir / 'pipewire' --pipewire_confdatadir = pipewire_datadir / 'pipewire' -+pipewire_confdatadir = get_option('pipewire_confdata_dir') -+if pipewire_confdatadir == '' -+ pipewire_confdatadir = pipewire_datadir / 'pipewire' -+endif - modules_install_dir = pipewire_libdir / pipewire_name - - if host_machine.system() == 'linux' -diff --git a/meson_options.txt b/meson_options.txt -index 9bc33fcd..e4bd2dc1 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -61,6 +61,9 @@ option('jack-devel', - option('libjack-path', - description: 'Where to install the libjack.so library', - type: 'string') -+option('pipewire_confdata_dir', -+ type: 'string', -+ description: 'Directory for pipewire default configuration (defaults to /usr/share/pipewire)') - option('spa-plugins', - description: 'Enable spa plugins integration', - type: 'feature', diff --git a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch b/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch deleted file mode 100644 index ca7d351257bf9..0000000000000 --- a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/src/daemon/minimal.conf.in b/src/daemon/minimal.conf.in -index 9c885a38f..c474eb45d 100644 ---- a/src/daemon/minimal.conf.in -+++ b/src/daemon/minimal.conf.in -@@ -111,7 +111,7 @@ context.modules = [ - # access.allowed to list an array of paths of allowed - # apps. - #access.allowed = [ -- # @session_manager_path@ -+ # <session_manager_path> - #] - - # An array of rejected paths. -@@ -359,5 +359,5 @@ context.exec = [ - # It can be interesting to start another daemon here that listens - # on another address with the -a option (eg. -a tcp:4713). - # -- #@pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } -+ #@pulse_comment@{ path = "<pipewire_path>" args = "-c pipewire-pulse.conf" } - ] -diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in -index 697bf094d..3a7b54ddd 100644 ---- a/src/daemon/pipewire.conf.in -+++ b/src/daemon/pipewire.conf.in -@@ -142,7 +142,7 @@ context.modules = [ - # access.allowed to list an array of paths of allowed - # apps. - #access.allowed = [ -- # @session_manager_path@ -+ # <session_manager_path> - #] - - # An array of rejected paths. -@@ -294,7 +294,7 @@ context.exec = [ - # but it is better to start it as a systemd service. - # Run the session manager with -h for options. - # -- @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" -+ @sm_comment@{ path = "<session_manager_path>" args = "@session_manager_args@" - @sm_comment@ condition = [ { exec.session-manager = null } { exec.session-manager = true } ] } - # - # You can optionally start the pulseaudio-server here as well -@@ -302,6 +302,6 @@ context.exec = [ - # It can be interesting to start another daemon here that listens - # on another address with the -a option (eg. -a tcp:4713). - # -- @pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" -+ @pulse_comment@{ path = "<pipewire_path>" args = "-c pipewire-pulse.conf" - @pulse_comment@ condition = [ { exec.pipewire-pulse = null } { exec.pipewire-pulse = true } ] } - ] diff --git a/pkgs/development/libraries/pipewire/0095-spa-data-dir.patch b/pkgs/development/libraries/pipewire/0095-spa-data-dir.patch deleted file mode 100644 index d8241a809f65d..0000000000000 --- a/pkgs/development/libraries/pipewire/0095-spa-data-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/meson.build b/meson.build -index 56599ebd1..3bed2d3e3 100644 ---- a/meson.build -+++ b/meson.build -@@ -54,7 +54,7 @@ else - endif - - spa_plugindir = pipewire_libdir / spa_name --spa_datadir = pipewire_datadir / spa_name -+spa_datadir = pipewire_libdir / spa_name - - alsadatadir = pipewire_datadir / 'alsa-card-profile' / 'mixer' diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 1e66d1573fc56..3876a5c892a0e 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -70,6 +70,7 @@ , tinycompress , ffadoSupport ? stdenv.buildPlatform.canExecute stdenv.hostPlatform , ffado +, libselinux }: # Bluetooth codec only makes sense if general bluetooth enabled @@ -80,12 +81,10 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.80"; + version = "0.3.84"; outputs = [ "out" - "lib" - "pulse" "jack" "dev" "doc" @@ -98,30 +97,14 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-6Ka83Bqd/nsfp8rv0GTBerpGP226MeZvC5u/j62FzP0="; + sha256 = "sha256-9W9y+wtS/CYUaPRrCRmRDeyvuS1XllMBNQLy6GAMqBM="; }; patches = [ - # Break up a dependency cycle between outputs. - ./0040-alsa-profiles-use-libdir.patch - # Change the path of the pipewire-pulse binary in the service definition. - ./0050-pipewire-pulse-path.patch # Load libjack from a known location ./0060-libjack-path.patch # Move installed tests into their own output. ./0070-installed-tests-path.patch - # Add option for changing the config install directory - ./0080-pipewire-config-dir.patch - # Remove output paths from the comments in the config templates to break dependency cycles - ./0090-pipewire-config-template-paths.patch - # Place SPA data files in lib output to avoid dependency cycles - ./0095-spa-data-dir.patch - - # backport fix for building with webrtc-audio-processing 0.3 on platforms where we don't have 1.x - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1f1c308c9766312e684f0b53fc2d1422c7414d31.patch"; - hash = "sha256-ECM7/84G99yzXsg5A2DkFnXFGJSV9lz3vD0IRSzR8vU="; - }) ]; strictDeps = true; @@ -142,6 +125,7 @@ let glib libjack2 libusb1 + libselinux libsndfile lilv ncurses @@ -174,9 +158,7 @@ let "-Dudevrulesdir=lib/udev/rules.d" "-Dinstalled_tests=enabled" "-Dinstalled_test_prefix=${placeholder "installedTests"}" - "-Dpipewire_pulse_prefix=${placeholder "pulse"}" "-Dlibjack-path=${placeholder "jack"}/lib" - "-Dlibv4l2-path=${placeholder "out"}/lib" "-Dlibcamera=${mesonEnableFeature libcameraSupport}" "-Dlibffado=${mesonEnableFeature ffadoSupport}" "-Droc=${mesonEnableFeature rocSupport}" @@ -185,7 +167,6 @@ let "-Dgstreamer=${mesonEnableFeature gstreamerSupport}" "-Dsystemd-system-service=${mesonEnableFeature enableSystemd}" "-Dudev=${mesonEnableFeature (!enableSystemd)}" - "-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d" "-Dffmpeg=${mesonEnableFeature ffmpegSupport}" "-Dbluez5=${mesonEnableFeature bluezSupport}" "-Dbluez5-backend-hsp-native=${mesonEnableFeature nativeHspSupport}" @@ -198,7 +179,6 @@ let "-Dbluez5-codec-lc3=${mesonEnableFeature bluezSupport}" "-Dbluez5-codec-ldac=${mesonEnableFeature ldacbtSupport}" "-Dsysconfdir=/etc" - "-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire" "-Draop=${mesonEnableFeature raopSupport}" "-Dsession-managers=" "-Dvulkan=enabled" @@ -222,15 +202,6 @@ let ''; postInstall = '' - ${lib.optionalString enableSystemd '' - moveToOutput "share/systemd/user/pipewire-pulse.*" "$pulse" - moveToOutput "lib/systemd/user/pipewire-pulse.*" "$pulse" - ''} - - rm $out/bin/pipewire-pulse - mkdir -p $pulse/bin - ln -sf $out/bin/pipewire $pulse/bin/pipewire-pulse - moveToOutput "bin/pw-jack" "$jack" ''; diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index c9b456ba831ea..d49f3e6bd5382 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -17,6 +17,13 @@ stdenv.mkDerivation { sha256 = "1zj90hm25pkgvk4jlkfzh18ak9b98217gbidl3731fdccbw6hr87"; })]; + postPatch = lib.optionalString stdenv.cc.isClang '' + substituteInPlace src/PIP_Tree.cc \ + --replace "std::auto_ptr" "std::unique_ptr" + substituteInPlace src/Powerset_inlines.hh src/Pointset_Powerset_inlines.hh \ + --replace "std::mem_fun_ref" "std::mem_fn" + ''; + nativeBuildInputs = [ perl gnum4 ]; propagatedBuildInputs = [ gmpxx ]; diff --git a/pkgs/development/libraries/protobuf/21.nix b/pkgs/development/libraries/protobuf/21.nix new file mode 100644 index 0000000000000..09a8c81b3d134 --- /dev/null +++ b/pkgs/development/libraries/protobuf/21.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix ({ + version = "21.12"; + hash = "sha256-VZQEFHq17UsTH5CZZOcJBKiScGV2xPJ/e6gkkVliRCU="; +} // args) diff --git a/pkgs/development/libraries/protobuf/23.nix b/pkgs/development/libraries/protobuf/23.nix new file mode 100644 index 0000000000000..abb2cc2f4460a --- /dev/null +++ b/pkgs/development/libraries/protobuf/23.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix ({ + version = "23.4"; + hash = "sha256-eI+mrsZAOLEsdyTC3B+K+GjD3r16CmPx1KJ2KhCwFdg="; +} // args) diff --git a/pkgs/development/libraries/protobuf/24.nix b/pkgs/development/libraries/protobuf/24.nix new file mode 100644 index 0000000000000..6741b8afe52e3 --- /dev/null +++ b/pkgs/development/libraries/protobuf/24.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix ({ + version = "24.4"; + hash = "sha256-I+Xtq4GOs++f/RlVff9MZuolXrMLmrZ2z6mkBayqQ2s="; +} // args) diff --git a/pkgs/development/libraries/protobuf/3.21.nix b/pkgs/development/libraries/protobuf/3.21.nix deleted file mode 100644 index fe85be8cf022f..0000000000000 --- a/pkgs/development/libraries/protobuf/3.21.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic-v3-cmake.nix ({ - version = "3.21.12"; - sha256 = "sha256-VZQEFHq17UsTH5CZZOcJBKiScGV2xPJ/e6gkkVliRCU="; -} // args) diff --git a/pkgs/development/libraries/protobuf/3.23.nix b/pkgs/development/libraries/protobuf/3.23.nix deleted file mode 100644 index 2d658d57419ba..0000000000000 --- a/pkgs/development/libraries/protobuf/3.23.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic-v3-cmake.nix ({ - version = "3.23.4"; - sha256 = "sha256-eI+mrsZAOLEsdyTC3B+K+GjD3r16CmPx1KJ2KhCwFdg="; -} // args) diff --git a/pkgs/development/libraries/protobuf/3.24.nix b/pkgs/development/libraries/protobuf/3.24.nix deleted file mode 100644 index 60ad747194df8..0000000000000 --- a/pkgs/development/libraries/protobuf/3.24.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic-v3-cmake.nix ({ - version = "3.24.3"; - sha256 = "sha256-wXGQW/o674DeLXX2IlyZskl5OrBcSRptOMoJqLQGm94="; -} // args) diff --git a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix b/pkgs/development/libraries/protobuf/generic.nix index dd31aba434cee..cf00d1d50bebb 100644 --- a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -11,7 +11,7 @@ , gtest , zlib , version -, sha256 +, hash # downstream dependencies , python3 @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "protocolbuffers"; repo = "protobuf"; rev = "v${version}"; - inherit sha256; + inherit hash; }; postPatch = lib.optionalString stdenv.isDarwin '' @@ -37,28 +37,24 @@ stdenv.mkDerivation (finalAttrs: { --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; - patches = lib.optionals (lib.versionOlder version "3.22") [ + patches = lib.optionals (lib.versionOlder version "22") [ # fix protobuf-targets.cmake installation paths, and allow for CMAKE_INSTALL_LIBDIR to be absolute # https://github.com/protocolbuffers/protobuf/pull/10090 (fetchpatch { url = "https://github.com/protocolbuffers/protobuf/commit/a7324f88e92bc16b57f3683403b6c993bf68070b.patch"; - sha256 = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ="; + hash = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ="; }) ] ++ lib.optionals stdenv.hostPlatform.isStatic [ ./static-executables-have-no-rpath.patch ]; - nativeBuildInputs = - let - protobufVersion = "${lib.versions.major version}_${lib.versions.minor version}"; - in - [ - cmake - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # protoc of the same version must be available for build. For non-cross builds, it's able to - # re-use the executable generated as part of the build - buildPackages."protobuf${protobufVersion}" - ]; + nativeBuildInputs = [ + cmake + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # protoc of the same version must be available for build. For non-cross builds, it's able to + # re-use the executable generated as part of the build + buildPackages."protobuf_${lib.versions.major version}" + ]; buildInputs = [ gtest @@ -71,23 +67,25 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - cmakeDir = if lib.versionOlder version "3.22" then "../cmake" else null; + cmakeDir = if lib.versionOlder version "22" then "../cmake" else null; cmakeFlags = [ "-Dprotobuf_USE_EXTERNAL_GTEST=ON" "-Dprotobuf_ABSL_PROVIDER=package" ] ++ lib.optionals enableShared [ "-Dprotobuf_BUILD_SHARED_LIBS=ON" ] - # Tests fail to build on 32-bit platforms; fixed in 3.22 + # Tests fail to build on 32-bit platforms; fixed in 22.x # https://github.com/protocolbuffers/protobuf/issues/10418 - ++ lib.optionals (stdenv.targetPlatform.is32bit && lib.versionOlder version "3.22") [ + ++ lib.optionals (stdenv.hostPlatform.is32bit && lib.versionOlder version "22") [ "-Dprotobuf_BUILD_TESTS=OFF" ]; - # FIXME: investigate. 3.24 and 3.23 have different errors. + # FIXME: investigate. 24.x and 23.x have different errors. # At least some of it is not reproduced on some other machine; example: # https://hydra.nixos.org/build/235677717/nixlog/4/tail - doCheck = !(stdenv.isDarwin && lib.versionAtLeast version "3.23"); + # Also AnyTest.TestPackFromSerializationExceedsSizeLimit fails on 32-bit platforms + # https://github.com/protocolbuffers/protobuf/issues/8460 + doCheck = !(stdenv.isDarwin && lib.versionAtLeast version "23") && !stdenv.hostPlatform.is32bit; passthru = { tests = { diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index a8aec285a98e5..8c98fdbdd6f10 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -4,7 +4,6 @@ , fetchpatch , qmake , qtbase -, qtquick1 , qtmultimedia , utmp }: @@ -26,7 +25,6 @@ stdenv.mkDerivation { buildInputs = [ qtbase - qtquick1 qtmultimedia ] ++ lib.optional stdenv.isDarwin utmp; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index df60188800ab8..a2b38046c5a83 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -11,6 +11,7 @@ Check for any minor version changes. , lib, stdenv, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper , bison, cups ? null, harfbuzz, libGL, perl, python3 , gstreamer, gst-plugins-base, gtk3, dconf +, llvmPackages_15, overrideSDK, overrideLibcxx , darwin # options @@ -45,13 +46,29 @@ let ./qtbase.patch.d/0009-qtbase-qtpluginpath.patch ./qtbase.patch.d/0010-qtbase-assert.patch ./qtbase.patch.d/0011-fix-header_module.patch - ./qtbase.patch.d/9999-backport-dbus-crash.patch ]; qtdeclarative = [ ./qtdeclarative.patch # prevent headaches from stale qmlcache data ./qtdeclarative-default-disable-qmlcache.patch ]; + qtlocation = lib.optionals stdenv.cc.isClang [ + # Fix build with Clang 16 + (fetchpatch { + url = "https://github.com/boostorg/numeric_conversion/commit/50a1eae942effb0a9b90724323ef8f2a67e7984a.patch"; + stripLen = 1; + extraPrefix = "src/3rdparty/mapbox-gl-native/deps/boost/1.65.1/"; + hash = "sha256-UEvIXzn387f9BAeBdhheStD/4M7en+rmqX8C6gstl6k="; + }) + ]; + qtmultimedia = lib.optionals stdenv.isDarwin [ + # build patch for qtmultimedia with xcode 15 + (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3f509180/qt5/qt5-qtmultimedia-xcode15.patch"; + stripLen = 1; + hash = "sha256-HrEqfmm8WbapWgLM0L4AKW8168pwT2zYI8HOJruEPSs="; + }) + ]; qtpim = [ ## Upstream patches after the Qt6 transition that apply without problems & fix bugs @@ -272,6 +289,18 @@ let qtwayland = callPackage ../modules/qtwayland.nix {}; qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; qtwebengine = callPackage ../modules/qtwebengine.nix { + # The version of Chromium used by Qt WebEngine 5.15.x does not build with clang 16 due + # to the following errors: + # * -Wenum-constexpr-conversion: This is a downgradable error in clang 16, but it is planned + # to be made into a hard error in a future version of clang. Patches are not available for + # the version of v8 used by Chromium in Qt WebEngine, and fixing the code is non-trivial. + # * -Wincompatible-function-pointer-types: This is also a downgradable error generated + # starting with clang 16. Patches are available upstream that can be backported. + # Because the first error is non-trivial to fix and suppressing it risks future breakage, + # clang is pinned to clang 15. That also makes fixing the second set of errors unnecessary. + stdenv = + let stdenv' = if stdenv.cc.isClang then overrideLibcxx llvmPackages_15.stdenv else stdenv; + in if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv'; inherit (srcs.qtwebengine) version; python = python3; postPatch = '' @@ -306,7 +335,7 @@ let qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations - qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets + qtvirtualkeyboard qtwebchannel qtwebengine qtwebsockets qtwebview qtx11extras qtxmlpatterns qtlottie qtdatavis3d ] ++ lib.optional (!stdenv.isDarwin) qtwayland ++ lib.optional (stdenv.isDarwin) qtmacextras); diff --git a/pkgs/development/libraries/qt-5/5.15/modules b/pkgs/development/libraries/qt-5/5.15/modules index d6ce8822d541d..ccc7dbcb8151a 100644 --- a/pkgs/development/libraries/qt-5/5.15/modules +++ b/pkgs/development/libraries/qt-5/5.15/modules @@ -21,7 +21,6 @@ qtquickcontrols qtquickcontrols2 qtquicktimeline qtremoteobjects -qtscript qtscxml qtsensors qtserialbus diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch deleted file mode 100644 index e1aa0119aa2f2..0000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch +++ /dev/null @@ -1,79 +0,0 @@ -commit eb0c6846a5d05d686f0686f0f1ddddcad762ad26 (HEAD -> kde/5.15) -Author: K900 <me@0upti.me> -Date: Mon Aug 14 22:44:02 2023 +0300 - - QLibraryPrivate: Actually merge load hints - - Or old and new load hints in mergeLoadHints() instead of just storing - new ones. Andjust QLibraryPrivate::setLoadHints() to handle objects - with no file name differently and just set load hints directly. - - Mention that load hints are merged once the file name is set - in the documentation for QLibrary::setLoadHints(). - - Add a regression test into tst_qfactoryloader. - - Update and extend tst_QPluginLoader::loadHints() to take into account - load hints merging. - - Fixes: QTBUG-114480 - Change-Id: I3b9afaec7acde1f5ff992d913f8d7217392c7e00 - Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> - Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> - -diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp -index 5d2f024267..45b5a3fe27 100644 ---- a/src/corelib/plugin/qlibrary.cpp -+++ b/src/corelib/plugin/qlibrary.cpp -@@ -526,7 +526,7 @@ void QLibraryPrivate::mergeLoadHints(QLibrary::LoadHints lh) - if (pHnd.loadRelaxed()) - return; - -- loadHintsInt.storeRelaxed(lh); -+ loadHintsInt.fetchAndOrRelaxed(lh); - } - - QFunctionPointer QLibraryPrivate::resolve(const char *symbol) -@@ -538,6 +538,13 @@ QFunctionPointer QLibraryPrivate::resolve(const char *symbol) - - void QLibraryPrivate::setLoadHints(QLibrary::LoadHints lh) - { -+ // Set the load hints directly for a dummy if this object is not associated -+ // with a file. Such object is not shared between multiple instances. -+ if (fileName.isEmpty()) { -+ loadHintsInt.storeRelaxed(lh); -+ return; -+ } -+ - // this locks a global mutex - QMutexLocker lock(&qt_library_mutex); - mergeLoadHints(lh); -@@ -1166,6 +1173,10 @@ QString QLibrary::errorString() const - lazy symbol resolution, and will not export external symbols for resolution - in other dynamically-loaded libraries. - -+ \note Hints can only be cleared when this object is not associated with a -+ file. Hints can only be added once the file name is set (\a hints will -+ be or'ed with the old hints). -+ - \note Setting this property after the library has been loaded has no effect - and loadHints() will not reflect those changes. - -diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp -index 0a63b93762..ceee5d6385 100644 ---- a/src/corelib/plugin/qpluginloader.cpp -+++ b/src/corelib/plugin/qpluginloader.cpp -@@ -414,10 +414,11 @@ QString QPluginLoader::errorString() const - void QPluginLoader::setLoadHints(QLibrary::LoadHints loadHints) - { - if (!d) { -- d = QLibraryPrivate::findOrCreate(QString()); // ugly, but we need a d-ptr -+ d = QLibraryPrivate::findOrCreate({}, {}, loadHints); // ugly, but we need a d-ptr - d->errorString.clear(); -+ } else { -+ d->setLoadHints(loadHints); - } -- d->setLoadHints(loadHints); - } - - QLibrary::LoadHints QPluginLoader::loadHints() const diff --git a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json index f67f9d66da7ce..8171293497181 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -1,207 +1,202 @@ { "qt3d": { "url": "https://invent.kde.org/qt/qt/qt3d.git", - "rev": "01aa0a9cb22ce5ed2b7ead03ed9cbeb5f978e897", - "sha256": "0r1bicsjn4addsf0cw2vkf26kxlf8z1fh65w19gnqmcwkrr8hnja" + "rev": "c1f8fa2578d99e07f5e581f26bd532695b9534f9", + "sha256": "19wsf9capc8i5157hfp8g735scpcms329ylp0fg86j9qalg7ccwg" }, "qtactiveqt": { "url": "https://invent.kde.org/qt/qt/qtactiveqt.git", - "rev": "7a04a93e97390de2d91e89dc907e8240dd5a0c4f", - "sha256": "1bqy5cmimnlmgd02zpv0ipf74nx350fk0d4pm2j4pqipq1spq3bh" + "rev": "2ed4be9e852d2533b982493a26bf061b245dc106", + "sha256": "0v6fwykibl4d20sdh10inaavpzwp5ijpyw8k31078shw3hsgkqxf" }, "qtandroidextras": { "url": "https://invent.kde.org/qt/qt/qtandroidextras.git", - "rev": "1170e17043ff51590ccee30447bef1e43a999b0d", - "sha256": "0qhlhz7ng35mb5pmva9ivpxq1ib30dz8f1p93yil78cyl9mwqbbi" + "rev": "3d30862e761afd5fe8451857bb531b6fb8f63dc3", + "sha256": "0sq4dgk88n96wja1wp6j5swxhz8wksf1v4sibywvg7v431nfy82p" }, "qtbase": { "url": "https://invent.kde.org/qt/qt/qtbase.git", - "rev": "e24dc54b2b4054413650904288aa7a363eee23a7", - "sha256": "0gpg0avl06jbamgk5f9034cfqwyifgv4nyqx49rp0r9wm2m1cgxb" + "rev": "ea7a183732c17005f08ca14fd70cdd305c90396d", + "sha256": "0lblir4zcnxc2ix9frcsygkhfs5qx7xibpflapmi6d978jjfxjmx" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", - "rev": "7ce22b0633eb9d1eb59854fee4f2f545e1b842e0", - "sha256": "0q173ql5xyacwb5lwyrzhgch1bbjq4mmsfwhyssm3a9phqcj083m" + "rev": "e17308d5ce83a8b66aeeaaaf16ce16d4ee6b2826", + "sha256": "1igna3qdwpaf67lhj0m743cj127hyg73ynjhadhjk3gz34h12r09" }, "qtconnectivity": { "url": "https://invent.kde.org/qt/qt/qtconnectivity.git", - "rev": "eeaf42bccd49e8161fbae82d110026d25a5a9a7f", - "sha256": "0daa72yizb6v28bci72fw1w8y8al0mhb9k7kxn7vg22fbb3iyksf" + "rev": "e33b82889625b6a72e0be91c5023a30d53136a80", + "sha256": "17yxmj1xd2q0a2in6aygp88bsg1vivklmzjwi97llbmvcxxvzhfn" }, "qtdatavis3d": { "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git", - "rev": "d366b0aad8454355acac79eddbab445c1108b1e9", - "sha256": "15ad1cbfdwnl6lnafgd4chdsl9wnwfcqqnd2m0dwj10n2lsa3nmw" + "rev": "d7af24d26b9fbb83bf57b2b7245d280eb78e8b22", + "sha256": "1h85cn4qabva8fcr69b35cmy9c7vbk2fz8licw5ca42bq141k4kw" }, "qtdeclarative": { "url": "https://invent.kde.org/qt/qt/qtdeclarative.git", - "rev": "3e98cdb2780d052fce3d7a3694596a690cd76aca", - "sha256": "15fn0zjfz7jnjgc7m368sna2mvhcp33r85r2kwc9hy7zkp1is6a1" + "rev": "1b0e366092bcfae0392592c3b7891f0e47af1018", + "sha256": "0fif6gbin3clvy7rfvrs5qdjqvi3ql9yciiwdbm7z0by2kzz1qsg" }, "qtdoc": { "url": "https://invent.kde.org/qt/qt/qtdoc.git", - "rev": "9dfbbfb9971db22d51eb40d6636583df5913be01", - "sha256": "1l192k1w5mjw14zq3h3pjb3m0zl56fhgxdjfxhmbncjx0ym98wzr" + "rev": "c8af0c56f1765302f8bdf874dfacb11c4e0bf4e3", + "sha256": "161wm1pq732nnbx8jbmiv1g1ziqzjwy48dpasy3zgj4i83qyvdas" }, "qtgamepad": { "url": "https://invent.kde.org/qt/qt/qtgamepad.git", - "rev": "f90bd729eb70d4a0770efed3f9bb1b6dbe67d37c", - "sha256": "1vbfmyb51lv3ms0iyizi05jiba688scjwxwvyrr8qnmg4qrjqjd5" + "rev": "4b52913503e3713200265cd6bc19b301792dbf96", + "sha256": "1n5pafxarhb4rsvr18al4hyc6xmm5nhjkknrnhdldy9vz7w50bgs" }, "qtgraphicaleffects": { "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git", - "rev": "500ae59f809877e0ada9a68601564882f2733145", - "sha256": "0p8vxp5l7iihd1xww94asnb9xv2v94p9whqbljzn6gwr56wvys5l" + "rev": "cce7d784237cd2dd4af1abe2757d048e34e02685", + "sha256": "1yvxpkfxd44z9z44mfv77lfsbgjlmxz1rilblpp8h276zc5w6l5z" }, "qtimageformats": { "url": "https://invent.kde.org/qt/qt/qtimageformats.git", - "rev": "5aa33ec870977863c400103db94da452edbaf414", - "sha256": "02i3ns2ijiiy0jfad3lxrvvlr38bgarl8246ka0y8aa8by1ih35b" + "rev": "b22bf4d0d77c7dafe8b4622f8bb45ac0b9cc9bdd", + "sha256": "0gz1par4gkcwwbxh0g1n1lrzyjjmi53gqfmbb222gkf5k8kf0r2i" }, "qtlocation": { "url": "https://invent.kde.org/qt/qt/qtlocation.git", - "rev": "664701dc3acfca37500bc84ba03eed4953b684e9", - "sha256": "0nlzjksfzkjhla89warkj7c5h8z2h5ivnhnq1sw2385gfd4q5d8w" + "rev": "48a17e88fc1df5b6ae82a9787466226c830bcbf2", + "sha256": "0gn4zsf01xr0g8divixk2zpq97dnqs1cdc3q577ijczd2rcs6z4f" }, "qtlottie": { "url": "https://invent.kde.org/qt/qt/qtlottie.git", - "rev": "f65b6a268832fc86e1263a6597f2e369aefecd19", - "sha256": "157in9bvnd9q2jigrrl955y7d2gpj308g8mg7k19r1vaz6h4zlm7" + "rev": "909b79f4810b8ac62baa3544837793cfb132593b", + "sha256": "1bh5418nshzlgc3xf8yg1c0n70xcazr3ya9fdfn1xs3yhxdxcd8h" }, "qtmacextras": { "url": "https://invent.kde.org/qt/qt/qtmacextras.git", - "rev": "ca5e5fdca44e8e56dafaac2a5bd886cad2a5c0f5", - "sha256": "1yrk7kj5dvfcha8w0abvh8xfjn6nbl4njm1r2h2776l3sf46xd4c" + "rev": "cc717d0093d796e6bafb65892e6825f146c1d3cd", + "sha256": "1cdal8yfjwgl30fh2s5s45hy1mw70n8bfdsbx8q6j4g062dr16zd" }, "qtmultimedia": { "url": "https://invent.kde.org/qt/qt/qtmultimedia.git", - "rev": "78d05cfcec57a9e890cb5ddbea604f194e04315d", - "sha256": "1vf0gmf6bh3hadrrk0922dbagmvxi1il3pjiyhmz087bm80km1md" + "rev": "f587b18db4abd68cb6d4d77fbcec1b94c38d2a51", + "sha256": "16b3yaq7i0cs9sw8q5f98g9kzphy3kwy0nw6hzznnzpkmg0pgkv1" }, "qtnetworkauth": { "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git", - "rev": "a0f23c6a1f11bd7c6a8e4fd34f10bdb0a35789fa", - "sha256": "0sy2s7xnq2xmqm3lcp439wn6zk6znzja489gh531mmkaj13kiqa9" + "rev": "1e3f2196bd45a5ee272b08b1d82cef29aaa89b61", + "sha256": "1jshzvsa2nnckakiybh6q7f0wdl5p04b6mymxvjzzphr0q32qn75" }, "qtpurchasing": { "url": "https://invent.kde.org/qt/qt/qtpurchasing.git", - "rev": "a3e675872e4b323f89b94b90b66caa945b576b2e", - "sha256": "0b6da91fja6w3mphsfydp0plcwmk8nywhd5v8irgc98v1hw114dg" + "rev": "736144c5827385000e391e9a55a0f0162b7e8112", + "sha256": "1djvj4glxc360my597g81aqjmrhk46447x5s2jj81yiflppvkbny" }, "qtquick3d": { "url": "https://invent.kde.org/qt/qt/qtquick3d.git", - "rev": "353f50a9851518eb637181c00302cd354e0ae98b", - "sha256": "1y269yamhlf46rwcvwzhdqhajyqj41xxf9x0l1nrcr4n07l4mbr8" + "rev": "f3c3c2041f4800a7fc1904771f5c6af036167dc9", + "sha256": "1xsxhx20spj50jmsqd5f2qa7kmr9rn08c22zkckhrgic73188dpg" }, "qtquickcontrols": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git", - "rev": "0ea7cfdfbfa72d467fe542cc48ab3206c177a387", - "sha256": "1bvg32cz4x00j9333yas7cmfzx8rlhika4a9vwdikrr5a64awsl9" + "rev": "dcc90558d9c0cba41eec7df290943994289b0e87", + "sha256": "0xccglsr1c519lyfg58hj6aa34zfyxc4zff360kd84yxmp8r4y9i" }, "qtquickcontrols2": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git", - "rev": "0472a07a8f39587052216d85a7ed235c531eba2c", - "sha256": "1psal4kldwbhfgg0b234dhgm30s5q83g2krcik1p4sifrzgrry3r" + "rev": "a2d56960dd76c94a5115b5415be5ee174d377718", + "sha256": "03wikwwf329wzml59hw0mqqzqjqfp95k8bvifi21zgrnjfl8rsrr" }, "qtquicktimeline": { "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git", - "rev": "4956b556ccb021e4691f314ab907ea2ebb1ca8a6", - "sha256": "0d6w36pvnk616ps7k1ykpk2ahcvn746svwmv3dxvf4capfij96rj" + "rev": "b1b4b882dabaa036c3fb73c4a879ba8efbb02ded", + "sha256": "07zaziin88y5cq9xy4dsfw2y7njs92qq00mg42350g1s6zqrlbv2" }, "qtremoteobjects": { "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git", - "rev": "d10e7673218fa2b00191a82ad20cd3304a711fa6", - "sha256": "0z5dzgdr92yw3y5vx6l9r9kz81r0vvwi264la9r7j20jqb75i2a5" - }, - "qtscript": { - "url": "https://invent.kde.org/qt/qt/qtscript.git", - "rev": "4f8c35a528586541ea55bb8b3361eaa6749e52b1", - "sha256": "01jddzy51ks899mszz35lcdgmpl5czcgh5g9fb84pxdnpgaxrx9b" + "rev": "bdc316aca82769b43cb7821c10d80a1ca02b846e", + "sha256": "136izb42sdy42lr5amh343f97s59fwf3mv44dg5n8jwg0mg7s67b" }, "qtscxml": { "url": "https://invent.kde.org/qt/qt/qtscxml.git", - "rev": "7f276be586be79d41213a8dd05ef31144313d440", - "sha256": "0yiryqzs44nx5lg54gbs7gf5n2d5chybya71kcv0iwn48dbzy33n" + "rev": "e8727aabe55526956295407d27317ec15e12b283", + "sha256": "1gyas1prkvnmxlvb90s9qzpy1frk8c4b7n0wnjn0vkfp0cmv3w52" }, "qtsensors": { "url": "https://invent.kde.org/qt/qt/qtsensors.git", - "rev": "45c04582b15a9bb4be01ae99aa7fda1bbba7d0df", - "sha256": "0wp9ddna0zidl18707nrqsg8sybaggam0hmm9yxyyfnsr39wms4m" + "rev": "a41492b23cde20d1e00427d31e4637d06aea3638", + "sha256": "1p9w444bzgixw6a8qarznnr15ayn22k2limsi5mzqanf3j3bd3ml" }, "qtserialbus": { "url": "https://invent.kde.org/qt/qt/qtserialbus.git", - "rev": "b3081c36baee48b43b6285b4811dc6da451e2390", - "sha256": "167bmp5wrp9mflvzhgc2am9nnyw1vb58skdxjn7ag8jq88fhv0zz" + "rev": "c41785c9f36560722b917d373ee97eed8cc4089a", + "sha256": "05nvzh9lbkbsghpdb3q26nbxgdq5007xak8zxwd3cz9mhqy8xnyc" }, "qtserialport": { "url": "https://invent.kde.org/qt/qt/qtserialport.git", - "rev": "af58a4c62415fbfd997c43422acf93e2e6ab5155", - "sha256": "1ihjj7gqjy75ccf4qniilddyiknjklc88mxns6sy8wz3ymr58vfh" + "rev": "3380465d5d4977326616c5e57789a81681be650e", + "sha256": "06dzraplqhidkngl3sjb3sppqpvc8v8ahrjz06dnsh1dwj8hizh7" }, "qtspeech": { "url": "https://invent.kde.org/qt/qt/qtspeech.git", - "rev": "75142c77cda8ef3a5c1cae69863e963797c667b5", - "sha256": "0iaw13vx80yfcchkmrmp6n79i0i6b9rv7k69xxp3wb3l5d3n0ng0" + "rev": "3b163bfd46d96bc9ee848dcee49e9cabe6699287", + "sha256": "03d4qvxfzwcfgbjdrpq0hvnhbz8bj6diphwiywdp16kvfmp13g9f" }, "qtsvg": { "url": "https://invent.kde.org/qt/qt/qtsvg.git", - "rev": "37b2c764fb599c96fc415049208e871c729217c8", - "sha256": "11h0n9k6l4r97x6h1m09nzsblwmmkkj46nl80dnvjimb395d71ri" + "rev": "7d6e373c7db9c05ef586db0eb50c87cd894229ad", + "sha256": "1aw9xxfjhm14raj7nivrr1ljnqcmibbbjyrx4bawp58mqbq4as4x" }, "qttools": { "url": "https://invent.kde.org/qt/qt/qttools.git", - "rev": "9f7af2d08eea7c2a2a2bfe7e6a9b73d1b99f5123", - "sha256": "1vb6s9zy8nw6gd0kmk77bjvxwpnfbhaifrznp019zccckibzffsg" + "rev": "38ae810be3fb4984f75b55a16d3413e35d701af1", + "sha256": "0hc65pidlp6lnb3srr2hg3dnas3hdj9cxkp7azcndj3wi36mclwf" }, "qttranslations": { "url": "https://invent.kde.org/qt/qt/qttranslations.git", - "rev": "a680686754d84b91d4cc4252a2fb8af0c58f5f49", - "sha256": "1i92mk6f2ldwq12qa4wnlz52zya4nlpjm3r2vy95vkj69xi2bfk3" + "rev": "56065158ffc4cd0fd78f9edf4b21b77b969f8dbb", + "sha256": "1lyh8hryi6hgw50gz9l6qxjfb72k4a7cg10vw18iffi7yv262g0z" }, "qtvirtualkeyboard": { "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git", - "rev": "72373522141dd3206183eb5fa56ae1c36a6d4c2b", - "sha256": "1ndgy8jxn9f7dwg9kydhlbll20qdivfbvdlcxk8qpzilpccd2l3z" + "rev": "817378aa10176fd26eed36542bc657e48d9dd42e", + "sha256": "0ihgm8y19zlkp3677rp9hnzm56y74djsnpr78yk0mrbcbxv1hpwb" }, "qtwayland": { "url": "https://invent.kde.org/qt/qt/qtwayland.git", - "rev": "d4f650b6c29c621c58bc7b7e7c9ddcbbbc72e3b4", - "sha256": "11xqpj36mfyfhcip89i82dyclbkvs77byffax2kscv1kdj3x7w2l" + "rev": "4de268cbaf6ff3b633429577f06d3d746a3b202a", + "sha256": "1ris6yxd4igrjvjv7bnxkdr402lk1k0djalkbk5s4z8l4qpavn3y" }, "qtwebchannel": { "url": "https://invent.kde.org/qt/qt/qtwebchannel.git", - "rev": "74c0625337c8a8de0a465878c7e7d238e8d979ed", - "sha256": "0yz2sg8k3l88ngsgyfb6cljh8x5sicww59m447xk7yngxgyaj75m" + "rev": "f84887c1aee4ab04af375e639ae965c9ea2186a5", + "sha256": "0pn4ly4lyf0db9pfb80q45zssifjg3466hnw7ryxnm4331izvbja" }, "qtwebglplugin": { "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git", - "rev": "13202e8a8c0c6d39026344b5a19a0148592160bc", - "sha256": "0gki7hc3684qhqbq7i4wa3w7szy3j6af0yfd50q2mxb1lbxjsdrx" + "rev": "ddcff45e8f2ca9f229017b3ded62327d2fb50af2", + "sha256": "1ybc94jidzqhrkm0v2daqq0nm34ydqpcgd8q4qhz9abi0ccj17s4" }, "qtwebsockets": { "url": "https://invent.kde.org/qt/qt/qtwebsockets.git", - "rev": "89fbe461e7091ae6a4689b7791293a06c9167776", - "sha256": "15vkh80rma5l9mrmg41vhxvqxlzqjzl8x20k33xm11lw2kjsszm5" + "rev": "d41bb9f4f7ab9d5ff184ef94cf2f6ff7cf01de00", + "sha256": "0pc14sd1dzrw599kdjg1309l9hf9ylp0pnyv7i6s2pyfqqq0x85r" }, "qtwebview": { "url": "https://invent.kde.org/qt/qt/qtwebview.git", - "rev": "7e941648610ff4033ae8f9709077edd0595364f0", - "sha256": "082w4r674fq7ks5jbh3pj3xb3sqlhn4giy7fy0h3vw170lmcqz0m" + "rev": "f078642eb9a440f6aa88f2beaf10f445de1e29bb", + "sha256": "0qak3y3qaxs6lf34y8rcp922sqd08nvag0lvl7znxm8d5b7qmnn6" }, "qtwinextras": { "url": "https://invent.kde.org/qt/qt/qtwinextras.git", - "rev": "5afc77f5347113b607ca0262505f3406e1be5bf4", - "sha256": "1a7dm0dxqq817pib1y6m0f09sc2cqd1qkfb9anznsgpmzynvfp6r" + "rev": "1bf19cc6a7972d8543485786418b6631459d3469", + "sha256": "09a6xacb0zsp44w5zz15lkh6sypy7y1xg7m1fkxj2n26wbdc2p52" }, "qtx11extras": { "url": "https://invent.kde.org/qt/qt/qtx11extras.git", - "rev": "74f81f0bfe17e5aabcebafcb0cf36f739133554c", - "sha256": "1akp4mwvfspxdq5akpyphf6p3ay0z9pzaigiiy198w9q0yvrkgl7" + "rev": "5fb2e067a38d3583684310130f5d8aad064f512f", + "sha256": "1whfsdmyihnzzy3ijh5wcbsw9ppg3s5nx2insw5yrx36iz0y054d" }, "qtxmlpatterns": { "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git", - "rev": "0c1dcfe344c03d48d753aeb58f139bc990f2611c", - "sha256": "1cab7y9asivdg9ypwc951pczf4ddgni60l1ajlfsprk48rypr7w1" + "rev": "5a1948ddc05bf44017ac12bd5c2b9bc79fbcb9a2", + "sha256": "0613zb8lzd1i2g5kbn7h39warx7hn1z5qi28zk8l88ivpn84dx4q" } } diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix index 6729c7c31af3b..130fcd332ba4c 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -1,25 +1,18 @@ { lib, fetchgit, fetchFromGitHub }: let - version = "5.15.10"; - overrides = { - qtscript.version = "5.15.9"; - }; + version = "5.15.11"; mk = name: args: - let - override = overrides.${name} or {}; - in { - version = override.version or version; - src = override.src or - fetchgit { - inherit (args) url rev sha256; - fetchLFS = false; - fetchSubmodules = true; - deepClone = false; - leaveDotGit = false; - }; + inherit version; + src = fetchgit { + inherit (args) url rev sha256; + fetchLFS = false; + fetchSubmodules = true; + deepClone = false; + leaveDotGit = false; + }; }; in lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) @@ -76,15 +69,26 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) hash = "sha256-LPfBCEB5tJOljXpptsNk0sHGtJf/wIRL7fccN79Nh6o="; }; + qtscript = rec { + version = "5.15.15"; + + src = fetchFromGitHub { + owner = "qt"; + repo = "qtscript"; + rev = "v${version}-lts"; + hash = "sha256-o2YG1m3LuG9Kq9Bqi1wRa6ceHsivK+hJR7w08NE/kBo="; + }; + }; + qtwebengine = rec { - version = "5.15.14"; + version = "5.15.15"; - src = fetchFromGitHub { - owner = "qt"; - repo = "qtwebengine"; - rev = "v${version}-lts"; - hash = "sha256-jIoNwRdr0bZ2p0UMp/KDQuwgNjhzzGlb91UGjQgT60Y="; - fetchSubmodules = true; - }; + src = fetchFromGitHub { + owner = "qt"; + repo = "qtwebengine"; + rev = "v${version}-lts"; + hash = "sha256-AmW3u8D9Y8lXZu0aiuxYXNPzZ5GCXeBQGfAcgFuXAh4="; + fetchSubmodules = true; }; + }; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 58f90763a2452..3503067aca754 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -306,7 +306,6 @@ qtModule ({ isAarch64 (patternLogicalAnd isMips isLittleEndian) ]); - broken = stdenv.isDarwin && stdenv.isx86_64; # This build takes a long time; particularly on slow architectures timeout = 24 * 3600; diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 4a211e5cb915f..bef3f7ef62e86 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -9,6 +9,7 @@ , gst_all_1 , libglvnd , darwin +, overrideSDK , buildPackages , python3 @@ -141,13 +142,18 @@ let qtwebchannel = callPackage ./modules/qtwebchannel.nix { }; qtwebengine = callPackage ./modules/qtwebengine.nix { inherit (darwin) bootstrap_cmds cctools xnu; - inherit (darwin.apple_sdk_11_0) libpm libunwind llvmPackages_14; + inherit (darwin.apple_sdk_11_0) libpm libunwind; inherit (darwin.apple_sdk_11_0.libs) sandbox; inherit (darwin.apple_sdk_11_0.frameworks) AGL AVFoundation Accelerate Cocoa CoreLocation CoreML ForceFeedback GameController ImageCaptureCore LocalAuthentication MediaAccessibility MediaPlayer MetalKit Network OpenDirectory Quartz ReplayKit SecurityInterface Vision; + qtModule = qtModule.override { + stdenv = if stdenv.isDarwin + then overrideSDK stdenv { darwinMinVersion = "10.13"; darwinSdkVersion = "11.0"; } + else stdenv; + }; xcbuild = buildPackages.xcbuild.override { productBuildVer = "20A2408"; }; diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 8670fba6bb2a6..4b4172897e080 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -60,7 +60,6 @@ , mesa , enableProprietaryCodecs ? true # darwin -, llvmPackages_14 , bootstrap_cmds , cctools , xcbuild @@ -106,7 +105,6 @@ qtModule { gn nodejs ] ++ lib.optionals stdenv.isDarwin [ - llvmPackages_14.clang bootstrap_cmds cctools xcbuild diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index ec9669f3c7d92..2f4a2ee6b1d9c 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidfuzz-cpp"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "rapidfuzz-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-gLiITRCxX3nkzrlvU1/ZPxEo2v7q79/MwrnURUjrY28="; + hash = "sha256-OeGn3ks+vSHt4Kdzy6kqhpFOtjoHrbPZB1BrV6Ggzz4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index c5f74854f77ca..a1a22fb38e42a 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "re2"; - version = "2023-09-01"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = version; - hash = "sha256-dCEkwjIs8ITVUZ4N0+qeGoShGNqKkdvJ88teyGKN6pg="; + hash = "sha256-cKXe8r5MUag/z+seem4Zg/gmqIQjaCY7DBxiKlrnXPs="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/relibc/default.nix b/pkgs/development/libraries/relibc/default.nix index 28ed971a25e49..437da86e8c21e 100644 --- a/pkgs/development/libraries/relibc/default.nix +++ b/pkgs/development/libraries/relibc/default.nix @@ -63,8 +63,7 @@ redoxRustPlatform.buildRustPackage rec { DESTDIR=$out make install ''; - # TODO: should be hostPlatform - TARGET = buildPackages.rust.toRustTargetSpec stdenvNoCC.targetPlatform; + TARGET = stdenvNoCC.hostPlatform.rust.rustcTargetSpec; cargoLock = { lockFile = ./Cargo.lock; diff --git a/pkgs/development/libraries/rustc-demangle/default.nix b/pkgs/development/libraries/rustc-demangle/default.nix index 6dd6d46e30bb6..4e142c5845293 100644 --- a/pkgs/development/libraries/rustc-demangle/default.nix +++ b/pkgs/development/libraries/rustc-demangle/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, rust, lib, stdenv }: +{ rustPlatform, fetchFromGitHub, lib, stdenv }: rustPlatform.buildRustPackage rec { pname = "rustc-demangle"; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' mkdir -p $out/lib - cp target/${rust.toRustTargetSpec stdenv.hostPlatform}/release/librustc_demangle.so $out/lib + cp target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/librustc_demangle.so $out/lib cp -R crates/capi/include $out ''; diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index c1483f90c433e..73092a803d66c 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.50"; + version = "1.3.56"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-B+znuvQ7TTl2u4rw64ylPywfpr066Yf8Wg0qrdByGRE="; + hash = "sha256-VS/85qu0Dc3HSeD0DYm2f4ur+ZRPhb1Srf7BeK7Pdfk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/science/math/coin-utils/default.nix b/pkgs/development/libraries/science/math/coin-utils/default.nix index 22aa10fc6d1e7..60b9de0ab33a7 100644 --- a/pkgs/development/libraries/science/math/coin-utils/default.nix +++ b/pkgs/development/libraries/science/math/coin-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { version = "2.11.10"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { hash = "sha256-Rbm45HRbRKQ6Cdup+gvKJ1xkK1HKG3irR5AIjhLer7g="; }; + patches = [ + (fetchpatch { + url = "https://github.com/coin-or/CoinUtils/commit/1700ed92c2bc1562aabe65dee3b4885bd5c87fb9.patch"; + stripLen = 1; + extraPrefix = "CoinUtils/"; + hash = "sha256-8S6XteZvoJlL+5MWiOrW7HXsdcnzpuEFTyzX9qg7OUY="; + }) + ]; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix index a47d8260714ab..47a6249ebdc62 100644 --- a/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation { inherit version; pname = "libtorch"; - src = fetchzip srcs."${stdenv.targetPlatform.system}-${device}" or unavailable; + src = fetchzip srcs."${stdenv.hostPlatform.system}-${device}" or unavailable; nativeBuildInputs = if stdenv.isDarwin then [ fixDarwinDylibNames ] diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 950402315a9b5..3fc533e848db8 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -141,7 +141,7 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.21"; + version = "0.3.24"; outputs = [ "out" "dev" ]; @@ -149,18 +149,9 @@ stdenv.mkDerivation rec { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "sha256-F6cXPqQai4kA5zrsa8E0Q7dD9zZHlwZ+B16EOGNXoXs="; + sha256 = "sha256-IuXhrZRB3o7kbnivv/6En/aAeF2F18sQw9pKs1WEJc4="; }; - patches = lib.optionals stdenv.hostPlatform.isLoongArch64 [ - # https://github.com/xianyi/OpenBLAS/pull/3626 - (fetchpatch { - name = "openblas-0.3.21-fix-loong.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/openblas/files/openblas-0.3.21-fix-loong.patch?id=37ee4c70278eb41181f69e175575b0152b941655"; - hash = "sha256-iWy11l3wEvzNV08LbhOjnSPj1SjPH8RMnb3ORz7V+gc"; - }) - ]; - postPatch = '' # cc1: error: invalid feature modifier 'sve2' in '-march=armv8.5-a+sve+sve2+bf16' substituteInPlace Makefile.arm64 --replace "+sve2+bf16" "" diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index 67dfef186e7d8..dd2eb9478f7f6 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -60,6 +60,12 @@ stdenv.mkDerivation rec { ] ; + env = lib.optionalAttrs stdenv.isDarwin { + # Ensure that there is enough space for the `fixDarwinDylibNames` hook to + # update the install names of the output dylibs. + NIX_LDFLAGS = "-headerpad_max_install_names"; + }; + buildFlags = [ # Build individual shared libraries, not demos "library" diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/development/libraries/science/math/superlu/default.nix index 26dd00d960694..f99e86ffe478c 100644 --- a/pkgs/development/libraries/science/math/superlu/default.nix +++ b/pkgs/development/libraries/science/math/superlu/default.nix @@ -21,6 +21,13 @@ stdenv.mkDerivation rec { "-DUSE_XSDK_DEFAULTS=true" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=implicit-int" + ]; + }; + patches = [ ./add-superlu-lib-as-dependency-for-the-unit-tests.patch ]; diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix index 13344db9ebc34..bdaf6e6284ef1 100644 --- a/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # name of library file ("libzn_poly.so") libbasename = "libzn_poly"; - libext = stdenv.targetPlatform.extensions.sharedLibrary; + libext = stdenv.hostPlatform.extensions.sharedLibrary; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index be5db122d244a..c3ecd3a9866fe 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -37,6 +37,10 @@ stdenv.mkDerivation rec { extraPrefix = ""; sha256 = "sha256-9dNawJaYtkugR+2NvhQOhgsf6w9ZXHkBgsDRh8yAJc0="; }) + (fetchpatch { + url = "https://github.com/SFML/SFML/commit/bf92efe9a4035fee0258386173d53556aa196e49.patch"; + hash = "sha256-1htwPfpn7Z6s/3b+/i1tQ+btjr/tWv5m6IyDVMBNqQA="; + }) ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix index f0afda7a90011..fe17da91e5817 100644 --- a/pkgs/development/libraries/shapelib/default.nix +++ b/pkgs/development/libraries/shapelib/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { description = "C Library for reading, writing and updating ESRI Shapefiles"; homepage = "http://shapelib.maptools.org/"; license = licenses.gpl2; - maintainers = [ maintainers.ehmry ]; + maintainers = with maintainers; teams.geospatial.members ++ [ ehmry ]; }; } diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index f25ac14df8646..099a3d838bbbc 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }: stdenv.mkDerivation rec { pname = "smpeg"; @@ -16,8 +16,24 @@ stdenv.mkDerivation rec { ./gcc6.patch ./libx11.patch ./gtk.patch + # These patches remove use of the `register` storage class specifier, + # allowing smpeg to build with clang 16, which defaults to C++17. + (fetchpatch { + url = "https://github.com/icculus/smpeg/commit/cc114ba0dd8644c0d6205bbce2384781daeff44b.patch"; + hash = "sha256-GxSD82j05pw0r2SxmPYAe/BXX4iUc+iHWhB9Ap4GzfA="; + }) + (fetchpatch { + url = "https://github.com/icculus/smpeg/commit/b369feca5bf99d6cff50d8eb316395ef48acf24f.patch"; + hash = "sha256-U+a6dbc5cm249KlUcf4vi79yUiT4hgEvMv522K4PqUc="; + }) ]; + postPatch = '' + substituteInPlace video/gdith.cpp \ + --replace 'register int' 'int' \ + --replace 'register Uint16' 'Uint16' + ''; + enableParallelBuilding = true; nativeBuildInputs = [ autoconf automake libtool m4 pkg-config makeWrapper ]; diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index 44ad21d6a141a..3e18424d6b74e 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.261.0"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "sdk-${version}"; - hash = "sha256-P/ZD53Xa4Fk9+N/bW5HhsfA+LjUnCbBsQDHvXesKu5M="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-uOnSTih14bUPtrJgp7vVb3/UfdKsF6jFQqjlFeJ81AI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index f51ce3a500053..ec4cc458c4b51 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.43.1"; + version = "3.43.2"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2023/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-ORFslOdmMPItVM2Cw86jCFZfFxX3FtGyUn8cnJabpNk="; + hash = "sha256-bUIrb2LE3iyoDWGGDjo/tpNVTS91uxqsp0PMxNb2CfA="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 31207ad9edf9c..6028c638a7ec2 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.43.1"; + version = "3.43.2"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2023/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-IunC70n+b4otvJPE09zgnG1qT1Y95SsKgXGtSajHKRc="; + hash = "sha256-62ZRUj9XpccPJC/Ba8QWuB7QLVkmOb+34JnyAeL5otM="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index c1c5819ad4219..bf84345be2d11 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; }; - configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.targetPlatform) [ + configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "lf_cv_sane_realloc=yes" ]; diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index 845e815be5902..e848b4330955b 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libiconv ]; + # Silence warnings related to use of implicitly declared library functions and implicit ints. + # TODO: Remove and/or fix with patches the next time this package is updated. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=implicit-int" + ]; + }; + preBuild = '' sed -i s/gcc/cc/g Makefile sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index ff6a3343837be..b6cc969b9f783 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { # Fix build with modern gcc # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]', NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=stringop-overflow" ] ++ + # error: variable 'val' set but not used + lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ] ++ # Workaround for gcc-12 ICE when using -O3 # https://gcc.gnu.org/PR108854 lib.optionals (stdenv.cc.isGNU && stdenv.isx86_32) [ "-O2" ]; diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index 7163f24815c52..4c6ec8e01691c 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { --replace "stripprog=" "stripprog=\$STRIP # " ''; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = { description = "Command-line editing library"; homepage = "https://www.astro.caltech.edu/~mcs/tecla/"; diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 0e67ce8adea82..c12178d833de4 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libtirpc"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { - url = "http://git.linux-nfs.org/?p=steved/libtirpc.git;a=snapshot;h=0fb94eef5062d2657d75eee686fa47238fafa312;sf=tgz"; - sha256 = "sha256-3P3xYKeAmLbBI4TdsG1VZBO7py9ktiwhXNtGsnryGNI="; + url = "http://git.linux-nfs.org/?p=steved/libtirpc.git;a=snapshot;h=refs/tags/libtirpc-${lib.replaceStrings ["."] ["-"] version};sf=tgz"; + sha256 = "sha256-fmZxpdyl98z+QBHpEccGB8A+YktuWONw6k0p06AImDw="; name = "${pname}-${version}.tar.gz"; }; @@ -15,11 +15,14 @@ stdenv.mkDerivation rec { KRB5_CONFIG = "${libkrb5.dev}/bin/krb5-config"; nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ libkrb5 ]; + strictDeps = true; preConfigure = '' sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i doc/Makefile.in tirpc/netconfig.h ''; + enableParallelBuilding = true; + preInstall = '' mkdir -p $out/etc ''; diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index 21c63f71221e2..ea41b8156f7f8 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -65,6 +65,9 @@ stdenv.mkDerivation rec { postPatch = '' mkdir -p build/externals/src/ep_catch ln -sf ${catch2}/include/catch2 build/externals/src/ep_catch/single_include + + sed -i '38i list(APPEND OPENSSL_PATHS "${openssl.dev}" "${openssl.out}")' \ + cmake/Modules/FindOpenSSL_EP.cmake ''; doCheck = true; diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index ab973c957aed4..57a9b617d950d 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -22,7 +22,7 @@ tcl.mkTclDerivation { substituteInPlace $file --replace "exec wish" "exec $out/bin/wish" done '' - + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinMinVersion "11") '' + + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") '' substituteInPlace unix/configure* \ --replace " -framework UniformTypeIdentifiers" "" ''; diff --git a/pkgs/development/libraries/usrsctp/clang-fix-build.patch b/pkgs/development/libraries/usrsctp/clang-fix-build.patch new file mode 100644 index 0000000000000..eb136e8be30ab --- /dev/null +++ b/pkgs/development/libraries/usrsctp/clang-fix-build.patch @@ -0,0 +1,183 @@ +diff --git a/usrsctplib/netinet/sctp_cc_functions.c b/usrsctplib/netinet/sctp_cc_functions.c +index 57bcdaa..70cf8b7 100755 +--- a/usrsctplib/netinet/sctp_cc_functions.c ++++ b/usrsctplib/netinet/sctp_cc_functions.c +@@ -764,7 +764,7 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, + #if defined(__FreeBSD__) && !defined(__Userspace__) + int old_cwnd; + #endif +- uint32_t t_ssthresh, t_cwnd, incr; ++ uint32_t t_ssthresh, incr; + uint64_t t_ucwnd_sbw; + uint64_t t_path_mptcp; + uint64_t mptcp_like_alpha; +@@ -773,7 +773,6 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, + + /* MT FIXME: Don't compute this over and over again */ + t_ssthresh = 0; +- t_cwnd = 0; + t_ucwnd_sbw = 0; + t_path_mptcp = 0; + mptcp_like_alpha = 1; +@@ -783,7 +782,6 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, + max_path = 0; + TAILQ_FOREACH(net, &stcb->asoc.nets, sctp_next) { + t_ssthresh += net->ssthresh; +- t_cwnd += net->cwnd; + /* lastsa>>3; we don't need to devide ...*/ + srtt = net->lastsa; + if (srtt > 0) { +diff --git a/usrsctplib/netinet/sctp_indata.c b/usrsctplib/netinet/sctp_indata.c +index 3bce9e9..42ce111 100755 +--- a/usrsctplib/netinet/sctp_indata.c ++++ b/usrsctplib/netinet/sctp_indata.c +@@ -3320,7 +3320,6 @@ sctp_strike_gap_ack_chunks(struct sctp_tcb *stcb, struct sctp_association *asoc, + struct sctp_tmit_chunk *tp1; + int strike_flag = 0; + struct timeval now; +- int tot_retrans = 0; + uint32_t sending_seq; + struct sctp_nets *net; + int num_dests_sacked = 0; +@@ -3691,7 +3690,6 @@ sctp_strike_gap_ack_chunks(struct sctp_tcb *stcb, struct sctp_association *asoc, + } + + tp1->rec.data.doing_fast_retransmit = 1; +- tot_retrans++; + /* mark the sending seq for possible subsequent FR's */ + /* + * SCTP_PRINTF("Marking TSN for FR new value %x\n", +diff --git a/usrsctplib/netinet/sctp_output.c b/usrsctplib/netinet/sctp_output.c +index 6a7dff9..a914b3b 100755 +--- a/usrsctplib/netinet/sctp_output.c ++++ b/usrsctplib/netinet/sctp_output.c +@@ -9970,7 +9970,7 @@ sctp_chunk_retransmission(struct sctp_inpcb *inp, + struct mbuf *m, *endofchain; + struct sctp_nets *net = NULL; + uint32_t tsns_sent = 0; +- int no_fragmentflg, bundle_at, cnt_thru; ++ int no_fragmentflg, bundle_at; + unsigned int mtu; + int error, i, one_chunk, fwd_tsn, ctl_cnt, tmr_started; + struct sctp_auth_chunk *auth = NULL; +@@ -10046,7 +10046,6 @@ sctp_chunk_retransmission(struct sctp_inpcb *inp, + } + } + one_chunk = 0; +- cnt_thru = 0; + /* do we have control chunks to retransmit? */ + if (m != NULL) { + /* Start a timer no matter if we succeed or fail */ +@@ -10368,7 +10367,6 @@ sctp_chunk_retransmission(struct sctp_inpcb *inp, + /* (void)SCTP_GETTIME_TIMEVAL(&net->last_sent_time); */ + + /* For auto-close */ +- cnt_thru++; + if (*now_filled == 0) { + (void)SCTP_GETTIME_TIMEVAL(&asoc->time_last_sent); + *now = asoc->time_last_sent; +@@ -13416,7 +13414,7 @@ sctp_lower_sosend(struct socket *so, + struct epoch_tracker et; + #endif + ssize_t sndlen = 0, max_len, local_add_more; +- int error, len; ++ int error; + struct mbuf *top = NULL; + int queue_only = 0, queue_only_for_init = 0; + int free_cnt_applied = 0; +@@ -14035,7 +14033,6 @@ sctp_lower_sosend(struct socket *so, + */ + local_add_more = sndlen; + } +- len = 0; + if (non_blocking) { + goto skip_preblock; + } +@@ -14265,7 +14262,6 @@ skip_preblock: + } + sctp_snd_sb_alloc(stcb, sndout); + atomic_add_int(&sp->length, sndout); +- len += sndout; + if (sinfo_flags & SCTP_SACK_IMMEDIATELY) { + sp->sinfo_flags |= SCTP_SACK_IMMEDIATELY; + } +diff --git a/usrsctplib/netinet/sctp_pcb.c b/usrsctplib/netinet/sctp_pcb.c +index 89a66bc..a952921 100755 +--- a/usrsctplib/netinet/sctp_pcb.c ++++ b/usrsctplib/netinet/sctp_pcb.c +@@ -7943,7 +7943,7 @@ sctp_drain_mbufs(struct sctp_tcb *stcb) + } + + void +-sctp_drain() ++sctp_drain(void) + { + /* + * We must walk the PCB lists for ALL associations here. The system +diff --git a/usrsctplib/netinet/sctp_sysctl.c b/usrsctplib/netinet/sctp_sysctl.c +index bb49e17..8b77f7e 100755 +--- a/usrsctplib/netinet/sctp_sysctl.c ++++ b/usrsctplib/netinet/sctp_sysctl.c +@@ -61,7 +61,7 @@ FEATURE(sctp, "Stream Control Transmission Protocol"); + */ + + void +-sctp_init_sysctls() ++sctp_init_sysctls(void) + { + SCTP_BASE_SYSCTL(sctp_sendspace) = SCTPCTL_MAXDGRAM_DEFAULT; + SCTP_BASE_SYSCTL(sctp_recvspace) = SCTPCTL_RECVSPACE_DEFAULT; +diff --git a/usrsctplib/user_socket.c b/usrsctplib/user_socket.c +index 513a5a9..89e9eb2 100755 +--- a/usrsctplib/user_socket.c ++++ b/usrsctplib/user_socket.c +@@ -2857,7 +2857,6 @@ sctp_userspace_ip_output(int *result, struct mbuf *o_pak, + struct mbuf *m_orig; + int iovcnt; + int len; +- int send_count; + struct ip *ip; + struct udphdr *udp; + struct sockaddr_in dst; +@@ -2930,16 +2929,13 @@ sctp_userspace_ip_output(int *result, struct mbuf *o_pak, + m_adj(m, sizeof(struct ip) + sizeof(struct udphdr)); + } + +- send_count = 0; + for (iovcnt = 0; m != NULL && iovcnt < MAXLEN_MBUF_CHAIN; m = m->m_next, iovcnt++) { + #if !defined(_WIN32) + send_iovec[iovcnt].iov_base = (caddr_t)m->m_data; + send_iovec[iovcnt].iov_len = SCTP_BUF_LEN(m); +- send_count += send_iovec[iovcnt].iov_len; + #else + send_iovec[iovcnt].buf = (caddr_t)m->m_data; + send_iovec[iovcnt].len = SCTP_BUF_LEN(m); +- send_count += send_iovec[iovcnt].len; + #endif + } + +@@ -3002,7 +2998,6 @@ void sctp_userspace_ip6_output(int *result, struct mbuf *o_pak, + struct mbuf *m_orig; + int iovcnt; + int len; +- int send_count; + struct ip6_hdr *ip6; + struct udphdr *udp; + struct sockaddr_in6 dst; +@@ -3076,16 +3071,13 @@ void sctp_userspace_ip6_output(int *result, struct mbuf *o_pak, + m_adj(m, sizeof(struct ip6_hdr)); + } + +- send_count = 0; + for (iovcnt = 0; m != NULL && iovcnt < MAXLEN_MBUF_CHAIN; m = m->m_next, iovcnt++) { + #if !defined(_WIN32) + send_iovec[iovcnt].iov_base = (caddr_t)m->m_data; + send_iovec[iovcnt].iov_len = SCTP_BUF_LEN(m); +- send_count += send_iovec[iovcnt].iov_len; + #else + send_iovec[iovcnt].buf = (caddr_t)m->m_data; + send_iovec[iovcnt].len = SCTP_BUF_LEN(m); +- send_count += send_iovec[iovcnt].len; + #endif + } + if (m != NULL) { diff --git a/pkgs/development/libraries/usrsctp/default.nix b/pkgs/development/libraries/usrsctp/default.nix index af8979c79d13f..9723f887b82b9 100644 --- a/pkgs/development/libraries/usrsctp/default.nix +++ b/pkgs/development/libraries/usrsctp/default.nix @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "10ndzkip8blgkw572n3dicl6mgjaa7kygwn3vls80liq92vf1sa9"; }; + patches = [ + # usrsctp fails to build with clang 15+ due to set but unused variable and missing prototype + # errors. These issues are fixed in the master branch, but a new release with them has not + # been made. The following patch can be dropped once a release has been made. + ./clang-fix-build.patch + ]; + nativeBuildInputs = [ cmake ]; # https://github.com/sctplab/usrsctp/issues/662 diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index a9891a9d328c6..7edf2cdf7c46b 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin ''use_lld=false''; env.NIX_CFLAGS_COMPILE = "-O2"; - FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12"; + FORCE_MAC_SDK_MIN = stdenv.hostPlatform.sdkVer or "10.12"; nativeBuildInputs = [ myGn diff --git a/pkgs/development/libraries/vapoursynth/plugin-interface.nix b/pkgs/development/libraries/vapoursynth/plugin-interface.nix index 064893a3dbcd9..f962634b131e7 100644 --- a/pkgs/development/libraries/vapoursynth/plugin-interface.nix +++ b/pkgs/development/libraries/vapoursynth/plugin-interface.nix @@ -36,7 +36,7 @@ plugins: let $CC -shared -fPIC ${source} -o "$out/lib/libvapoursynth-nix-plugins${ext}" ''; - ext = stdenv.targetPlatform.extensions.sharedLibrary; + ext = stdenv.hostPlatform.extensions.sharedLibrary; in runCommand "${vapoursynth.name}-with-plugins" { nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index c171731929254..02309b275bdcb 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -83,6 +83,10 @@ in stdenv.mkDerivation { "-DVTK_PYTHON_VERSION:STRING=${pythonMajor}" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; + }; + postPatch = optionalString stdenv.isDarwin '' sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 48e036ad030d0..f6c9dcb953e39 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.261"; + version = "1.3.268.0"; nativeBuildInputs = [ cmake ]; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Headers"; - rev = "v${version}"; - hash = "sha256-zKHew7SGUq1C3XGp/HrCle6KyqB4cziPcTYVqAr814s="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-CDjWTXXnUgj9QaLDNuSVy+wf8If5LehwOZ0t0Fuh2Ro="; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/development/libraries/vulkan-headers/update.sh b/pkgs/development/libraries/vulkan-headers/update.sh index 7f6292ed23b74..da4e42ded84a2 100755 --- a/pkgs/development/libraries/vulkan-headers/update.sh +++ b/pkgs/development/libraries/vulkan-headers/update.sh @@ -3,7 +3,7 @@ set -euf -o pipefail -V_PACKAGES=( +SDK_PACKAGES=( "vulkan-headers" "vulkan-loader" "vulkan-validation-layers" @@ -11,9 +11,6 @@ V_PACKAGES=( "vulkan-tools-lunarg" "vulkan-extension-layer" "vulkan-utility-libraries" -) - -SDK_PACKAGES=( "spirv-headers" "spirv-cross" "spirv-tools" @@ -21,10 +18,6 @@ SDK_PACKAGES=( nix-update glslang --version-regex '(\d+\.\d+\.\d+)' --commit -for P in "${V_PACKAGES[@]}"; do - nix-update "$P" --version-regex "(?:v)(.*)" --commit -done - for P in "${SDK_PACKAGES[@]}"; do - nix-update "$P" --version-regex "(?:sdk-)(.*)" --commit + nix-update "$P" --version-regex "(?:vulkan-sdk-)(.*)" --commit done diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 6e994eaa78c62..163cea7565c09 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.3.261"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; - rev = "v${version}"; - hash = "sha256-5QCVHfvjE98EnL2Dr7g9fdrJAg+np1Q6hgqcuZCWReQ="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-TDn8eVz1fhGfvUiGcxqOk2BN9tuIF5+ssIXtOo3weS0="; }; patches = [ ./fix-pkgconfig.patch ]; diff --git a/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch b/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch index 42295a67d4667..b9c5e8ad45362 100644 --- a/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch +++ b/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch @@ -5,8 +5,8 @@ index 153815577..584b15273 100644 @@ -1,7 +1,5 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=${prefix} --libdir=${exec_prefix}/@CMAKE_INSTALL_REL_LIBDIR_PC@ --includedir=${prefix}/@CMAKE_INSTALL_REL_INCLUDEDIR_PC@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR_PC@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR_PC@ +libdir=@CMAKE_INSTALL_LIBDIR@ +includedir=@CMAKE_INSTALL_INCLUDEDIR@ diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix index 0dce309ef5c7c..4c49788464d46 100644 --- a/pkgs/development/libraries/wasilibc/default.nix +++ b/pkgs/development/libraries/wasilibc/default.nix @@ -8,7 +8,7 @@ let pname = "wasilibc"; - version = "19"; + version = "20"; in stdenv.mkDerivation { inherit pname version; @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "WebAssembly"; repo = "wasi-libc"; rev = "refs/tags/wasi-sdk-${version}"; - hash = "sha256-yQSKoSil/C/1lIHwEO9eQKC/ye3PJIFGYjHyNDn61y4="; + hash = "sha256-H92PDrH1FL7S3eMCK1+wqclryjhwghl21bOlRCAr1U4="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index dc53bbb54d2a7..0fadb103ce33d 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "1.32"; # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48 - doCheck = stdenv.hostPlatform == stdenv.buildPlatform && stdenv.targetPlatform.linker == "bfd" && wayland.withLibraries; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.linker == "bfd" && wayland.withLibraries; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index b0f9ce53e72e6..ad2b12de8910b 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { hash = "sha256-8CDt4kMt2Owzyv22dqWIcFuHeg4Y3FxB405cLw3FZ+g="; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/wtk/builder.sh b/pkgs/development/libraries/wtk/builder.sh index c3ad173b09338..ca5157c6d71ab 100644 --- a/pkgs/development/libraries/wtk/builder.sh +++ b/pkgs/development/libraries/wtk/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup mkdir unzipped diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index 7b018c89f50db..5e9b9f2fcb720 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , cairo +, expat , ffmpeg , libexif , pango @@ -28,6 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo + expat ffmpeg libexif pango diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 2fb4f995fe4cb..7e62812df8904 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -26,26 +26,6 @@ let mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF"; isCross = stdenv.buildPlatform != stdenv.hostPlatform; - - cmakeCommonFlags = [ - "-Wno-dev" - (mkFlag custatsSupport "DETAILED_CU_STATS") - (mkFlag debugSupport "CHECKED_BUILD") - (mkFlag ppaSupport "ENABLE_PPA") - (mkFlag vtuneSupport "ENABLE_VTUNE") - (mkFlag werrorSupport "WARNINGS_AS_ERRORS") - # Potentially riscv cross could be fixed by providing the correct CMAKE_SYSTEM_PROCESSOR flag - ] ++ lib.optional (isCross && stdenv.hostPlatform.isRiscV) "-DENABLE_ASSEMBLY=OFF"; - - cmakeStaticLibFlags = [ - "-DHIGH_BIT_DEPTH=ON" - "-DENABLE_CLI=OFF" - "-DENABLE_SHARED=OFF" - "-DEXPORT_C_API=OFF" - ] ++ lib.optionals stdenv.hostPlatform.isPower [ - "-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le - ]; - in stdenv.mkDerivation rec { @@ -96,32 +76,54 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake nasm ] ++ lib.optionals (numaSupport) [ numactl ]; + cmakeFlags = [ + "-Wno-dev" + (mkFlag custatsSupport "DETAILED_CU_STATS") + (mkFlag debugSupport "CHECKED_BUILD") + (mkFlag ppaSupport "ENABLE_PPA") + (mkFlag vtuneSupport "ENABLE_VTUNE") + (mkFlag werrorSupport "WARNINGS_AS_ERRORS") + ]; + + cmakeStaticLibFlags = [ + "-DHIGH_BIT_DEPTH=ON" + "-DENABLE_CLI=OFF" + "-DENABLE_SHARED=OFF" + "-DEXPORT_C_API=OFF" + ] ++ lib.optionals stdenv.hostPlatform.isPower [ + "-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le + ]; + + preConfigure = lib.optionalString multibitdepthSupport '' + cmake -B build-10bits $cmakeFlags "''${cmakeFlagsArray[@]}" $cmakeStaticLibFlags + cmake -B build-12bits $cmakeFlags "''${cmakeFlagsArray[@]}" $cmakeStaticLibFlags -DMAIN12=ON + cmakeFlagsArray+=( + -DEXTRA_LIB="x265-10.a;x265-12.a" + -DEXTRA_LINK_FLAGS=-L. + -DLINKED_10BIT=ON + -DLINKED_12BIT=ON + ) + '' + '' + cmakeFlagsArray+=( + -DGIT_ARCHETYPE=1 # https://bugs.gentoo.org/814116 + ${mkFlag (!stdenv.hostPlatform.isStatic) "ENABLE_SHARED"} + -DHIGH_BIT_DEPTH=OFF + -DENABLE_HDR10_PLUS=ON + ${mkFlag (isCross && stdenv.hostPlatform.isAarch) "CROSS_COMPILE_ARM"} + ${mkFlag cliSupport "ENABLE_CLI"} + ${mkFlag unittestsSupport "ENABLE_TESTS"} + ) + ''; + # Builds 10bits and 12bits static libs on the side if multi bit-depth is wanted # (we are in x265_<version>/source/build) - preBuild = lib.optionalString (multibitdepthSupport) '' - cmake -S ../ -B ../build-10bits ${toString cmakeCommonFlags} ${toString cmakeStaticLibFlags} + preBuild = lib.optionalString multibitdepthSupport '' make -C ../build-10bits -j $NIX_BUILD_CORES - cmake -S ../ -B ../build-12bits ${toString cmakeCommonFlags} ${toString cmakeStaticLibFlags} -DMAIN12=ON make -C ../build-12bits -j $NIX_BUILD_CORES ln -s ../build-10bits/libx265.a ./libx265-10.a ln -s ../build-12bits/libx265.a ./libx265-12.a ''; - cmakeFlags = cmakeCommonFlags ++ [ - "-DGIT_ARCHETYPE=1" # https://bugs.gentoo.org/814116 - "-DENABLE_SHARED=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - "-DHIGH_BIT_DEPTH=OFF" - "-DENABLE_HDR10_PLUS=ON" - (mkFlag (isCross && stdenv.hostPlatform.isAarch) "CROSS_COMPILE_ARM") - (mkFlag cliSupport "ENABLE_CLI") - (mkFlag unittestsSupport "ENABLE_TESTS") - ] ++ lib.optionals (multibitdepthSupport) [ - "-DEXTRA_LIB=x265-10.a;x265-12.a" - "-DEXTRA_LINK_FLAGS=-L." - "-DLINKED_10BIT=ON" - "-DLINKED_12BIT=ON" - ]; - doCheck = unittestsSupport; checkPhase = '' runHook preCheck diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index c70b5e195708e..73c3b1b571737 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -28,8 +28,6 @@ let doCheck = true; env.AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git - patches = lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ]; - # the configure script thinks that Darwin has ___exp10 # but it’s not available on my systems (or hydra apparently) postConfigure = lib.optionalString stdenv.isDarwin '' @@ -46,7 +44,7 @@ let homepage = "https://xapian.org/"; changelog = "https://xapian.org/docs/xapian-core-${version}/NEWS"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.unix; }; }; @@ -54,5 +52,5 @@ in { # Don't forget to change the hashes in xapian-omega and # python3Packages.xapian. They inherit the version from this package, and # should always be built with the equivalent xapian version. - xapian_1_4 = generic "1.4.22" "sha256-BYhK8AsGcCzkhgV9YqO/vmYGz5Za2g9epXCzKKL6Hqg="; + xapian_1_4 = generic "1.4.24" "sha256-7aWubc9rBVOoZ2r2Sx/TBOmYzSD3eQMcyq96uaNzUxo="; } diff --git a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch b/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch deleted file mode 100644 index d763a2a2b4344..0000000000000 --- a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur xapian-core.old/tests/api_db.cc xapian-core.new/tests/api_db.cc ---- xapian-core.old/tests/api_db.cc -+++ xapian-core.new/tests/api_db.cc -@@ -1020,6 +1020,7 @@ - - // test for keepalives - DEFINE_TESTCASE(keepalive1, remote) { -+ SKIP_TEST("Fails in darwin nix build environment"); - Xapian::Database db(get_remote_database("apitest_simpledata", 5000)); - - /* Test that keep-alives work */ -diff -Naur xapian-core.old/tests/api_scalability.cc xapian-core.new/tests/api_scalability.cc ---- xapian-core.old/tests/api_scalability.cc -+++ xapian-core.new/tests/api_scalability.cc -@@ -53,6 +53,7 @@ - } - - DEFINE_TESTCASE(bigoaddvalue1, writable) { -+ SKIP_TEST("Fails in darwin nix build environment"); - // O(n*n) is bad, but O(n*log(n)) is acceptable. - test_scalability(bigoaddvalue1_helper, 5000, O_N_LOG_N); - return true; -diff -Naur xapian-core.old/tests/api_serialise.cc xapian-core.new/tests/api_serialise.cc ---- xapian-core.old/tests/api_serialise.cc -+++ xapian-core.new/tests/api_serialise.cc -@@ -110,6 +110,7 @@ - - // Test for serialising a document obtained from a database. - DEFINE_TESTCASE(serialise_document2, writable) { -+ SKIP_TEST("Fails in darwin nix build environment"); - Xapian::Document origdoc; - origdoc.add_term("foo", 2); - origdoc.add_posting("foo", 10); diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index f5ae2ecfaa5a5..cba74b977de71 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; - hash = "sha256-Z0yXn7kPH0mQ64qQntq4jKSgCUF9/Vqwy6GeAsepVSg="; + hash = "sha256-0IdW5PM7GJFsyKJJPTEfHL647UNXvUD6XBdErcCA6/8="; }; buildInputs = [ xapian perl pcre2 zlib libmagic ]; diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 9fa429f9a4cac..6a0e173db3a90 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , asciidoc , pkg-config @@ -11,25 +10,15 @@ stdenv.mkDerivation rec { pname = "zeromq"; - version = "4.3.4"; + version = "4.3.5"; src = fetchFromGitHub { owner = "zeromq"; repo = "libzmq"; rev = "v${version}"; - sha256 = "sha256-epOEyHOswUGVwzz0FLxhow/zISmZHxsIgmpOV8C8bQM="; + sha256 = "sha256-q2h5y0Asad+fGB9haO4Vg7a1ffO2JSb7czzlhmT3VmI="; }; - patches = [ - # Backport gcc-13 fix: - # https://github.com/zeromq/libzmq/pull/4480 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/zeromq/libzmq/commit/438d5d88392baffa6c2c5e0737d9de19d6686f0d.patch"; - hash = "sha256-tSTYSrQzgnfbY/70QhPdOnpEXX05VAYwVYuW8P1LWf0="; - }) - ]; - nativeBuildInputs = [ cmake asciidoc pkg-config ]; buildInputs = [ libsodium ]; @@ -41,7 +30,7 @@ stdenv.mkDerivation rec { branch = "4"; homepage = "http://www.zeromq.org"; description = "The Intelligent Transport Layer"; - license = licenses.lgpl3Plus; + license = licenses.mpl20; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; }; diff --git a/pkgs/development/lua-modules/aliases.nix b/pkgs/development/lua-modules/aliases.nix index 47a097fd7f79f..8f4ed9799c2ce 100644 --- a/pkgs/development/lua-modules/aliases.nix +++ b/pkgs/development/lua-modules/aliases.nix @@ -39,5 +39,6 @@ let in mapAliases { - "lpty" = throw "lpy was removed because broken and unmaintained "; # added 2023-10-14 + lpty = throw "lpy was removed because broken and unmaintained "; # added 2023-10-14 + cyrussasl = throw "cyrussasl was removed because broken and unmaintained "; # added 2023-10-18 } diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index f05933bdde38f..fcde2f41ddceb 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -5,10 +5,10 @@ nixpkgs$ ./maintainers/scripts/update-luarocks-packages You can customize the generated packages in pkgs/development/lua-modules/overrides.nix */ -{ stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args: +{ stdenv, lib, fetchurl, fetchgit, callPackage, ... }: final: prev: { -alt-getopt = callPackage({ luaAtLeast, lua, luaOlder, fetchgit, buildLuarocksPackage }: +alt-getopt = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "alt-getopt"; version = "0.8.0-1"; @@ -22,12 +22,13 @@ buildLuarocksPackage { "date": "2017-01-06T13:50:55+03:00", "path": "/nix/store/z72v77cw9188408ynsppwhlzii2dr740-lua-alt-getopt", "sha256": "1kq7r5668045diavsqd1j6i9hxdpsk99w8q4zr8cby9y3ws4q6rv", + "hash": "sha256-OxtMNB8++cVQ/gQjntLUt3WYopGhYb1VbIUAZEzJB88=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -40,23 +41,18 @@ buildLuarocksPackage { }; }) {}; -argparse = callPackage({ luaOlder, buildLuarocksPackage, luaAtLeast, lua, fetchgit }: +argparse = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "argparse"; - version = "scm-2"; - - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/luarocks/argparse.git", - "rev": "27967d7b52295ea7885671af734332038c132837", - "date": "2020-07-08T11:17:50+10:00", - "path": "/nix/store/vjm6c826hgvj7h7vqlbgkfpvijsd8yaf-argparse", - "sha256": "0idg79d0dfis4qhbkbjlmddq87np75hb2vj41i6prjpvqacvg5v1", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path"]) ; + version = "0.7.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/argparse-0.7.1-1.rockspec"; + sha256 = "116iaczq6glzzin6qqa2zn7i22hdyzzsq6mzjiqnz6x1qmi0hig8"; + }).outPath; + src = fetchzip { + url = "https://github.com/luarocks/argparse/archive/0.7.1.zip"; + sha256 = "0idg79d0dfis4qhbkbjlmddq87np75hb2vj41i6prjpvqacvg5v1"; + }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; @@ -68,15 +64,17 @@ buildLuarocksPackage { }; }) {}; -basexx = callPackage({ buildLuarocksPackage, lua, fetchurl, luaOlder }: +basexx = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "basexx"; - version = "scm-0"; - rockspecDir = "dist"; - + version = "0.4.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/basexx-0.4.1-1.rockspec"; + sha256 = "0kmydxm2wywl18cgj303apsx7hnfd68a9hx9yhq10fj7yfcxzv5f"; + }).outPath; src = fetchurl { - url = "https://github.com/aiq/basexx/archive/master.tar.gz"; - sha256 = "1x0d24aaj4zld4ifr7mi8zwrym5shsfphmwx5jzw2zg22r6xzlz1"; + url = "https://github.com/aiq/basexx/archive/v0.4.1.tar.gz"; + sha256 = "1rnz6xixxqwy0q6y2hi14rfid4w47h69gfi0rnlq24fz8q2b0qpz"; }; disabled = (luaOlder "5.1"); @@ -89,11 +87,14 @@ buildLuarocksPackage { }; }) {}; -binaryheap = callPackage({ buildLuarocksPackage, lua, fetchurl, luaOlder }: +binaryheap = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "binaryheap"; version = "0.4-1"; - + knownRockspec = (fetchurl { + url = "mirror://luarocks/binaryheap-0.4-1.rockspec"; + sha256 = "1ah37lhskmrb26by5ygs7jblx7qnf6mphgw8kwhw0yacvmkcbql4"; + }).outPath; src = fetchurl { url = "https://github.com/Tieske/binaryheap.lua/archive/version_0v4.tar.gz"; sha256 = "0f5l4nb5s7dycbkgh3rrl7pf0npcf9k6m2gr2bsn09fjyb3bdc8h"; @@ -110,7 +111,7 @@ buildLuarocksPackage { }; }) {}; -bit32 = callPackage({ fetchgit, buildLuarocksPackage, lua, luaOlder }: +bit32 = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "bit32"; version = "5.3.0-1"; @@ -124,12 +125,13 @@ buildLuarocksPackage { "date": "2015-02-17T10:44:04+01:00", "path": "/nix/store/9kz7kgjmq0w9plrpha866bmwsgp4rfhn-lua-compat-5.2", "sha256": "1ipqlbvb5w394qwhm2f3w6pdrgy8v4q8sps5hh3pqz14dcqwakhj", + "hash": "sha256-Ek7FMWskfHwHhEVfjTDZyL/cruHDiQo5Jmnwsvai+MY=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -142,26 +144,27 @@ buildLuarocksPackage { }; }) {}; -busted = callPackage({ buildLuarocksPackage, luafilesystem, luasystem, fetchgit, luaOlder, lua-term, say, mediator_lua, penlight, luassert, lua_cliargs, lua, dkjson }: +busted = callPackage({ buildLuarocksPackage, dkjson, fetchgit, fetchurl, lua, lua-term, luaOlder, lua_cliargs, luafilesystem, luassert, luasystem, mediator_lua, penlight, say }: buildLuarocksPackage { pname = "busted"; - version = "2.1.1-1"; + version = "2.1.2-3"; knownRockspec = (fetchurl { - url = "mirror://luarocks/busted-2.1.1-1.rockspec"; - sha256 = "0f9iz3pa2gmb2vccvygp6zdiji7l8bap0vlgqgrcg331qsrkf70h"; + url = "mirror://luarocks/busted-2.1.2-3.rockspec"; + sha256 = "0ll8jzbpp6a9zdbbjglmq30jmx2zvr0rs83jgsjxmlfzzylkry8p"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/busted.git", - "rev": "e3ed48759b625f2e37bf02ccc057b2b98108f108", - "date": "2022-08-24T17:34:58+03:00", - "path": "/nix/store/7g9rxkyhabgx0acwmzl4r4xfh193avpw-busted", - "sha256": "0nab0s5lhk0nhh58c4jspv5sj4g7839gb5q145hrlgbsxqncp8wy", + "rev": "673cb6bad2ee3876d45e004fcac1c2f8a816344f", + "date": "2023-03-20T10:00:33+01:00", + "path": "/nix/store/k7xnpg0s36gxk5mb59wx1dj8ikiz92ja-busted", + "sha256": "1wsiiiw26yqglqkkailksinzcb9gaffcldrcfhga3zawf2518h8y", + "hash": "sha256-HkEUinBc/aEedCw3ypxTLy32bdSTRjUnpg97I3iMUfM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ dkjson lua lua-term lua_cliargs luafilesystem luassert luasystem mediator_lua penlight say ]; @@ -173,7 +176,7 @@ buildLuarocksPackage { }; }) {}; -cassowary = callPackage({ buildLuarocksPackage, fetchgit, penlight, luaOlder, lua }: +cassowary = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, penlight }: buildLuarocksPackage { pname = "cassowary"; version = "2.3.2-1"; @@ -187,12 +190,13 @@ buildLuarocksPackage { "date": "2022-04-22T11:23:46+03:00", "path": "/nix/store/51mb376xh9pnh2krk08ljmy01zhr9y3z-cassowary.lua", "sha256": "1lvl40dhzmbqqjrqpjgqlg2kl993fpdy1mpc6d1610zpa9znx1f0", + "hash": "sha256-wIVuf1L3g2BCM+zW4Nt1IyU6xaP4yYuzxHjVDxsgdNM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua penlight ]; @@ -205,7 +209,7 @@ buildLuarocksPackage { }; }) {}; -cldr = callPackage({ penlight, luaOlder, lua, fetchgit, buildLuarocksPackage }: +cldr = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, penlight }: buildLuarocksPackage { pname = "cldr"; version = "0.3.0-0"; @@ -219,12 +223,13 @@ buildLuarocksPackage { "date": "2022-12-06T12:36:06+03:00", "path": "/nix/store/3xgwqd2pica8301sbfrw4bmv0xm2wzx5-cldr-lua", "sha256": "0hlfb115qhamczzskvckxczf9dpp8cv8h6vz7zgdl2n025ik9dp4", + "hash": "sha256-5LY0YxHACtreP38biDZD97bkPuuT7an/Z1VBXEJYjkI=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua penlight ]; @@ -237,7 +242,7 @@ buildLuarocksPackage { }; }) {}; -compat53 = callPackage({ lua, luaAtLeast, fetchzip, luaOlder, buildLuarocksPackage }: +compat53 = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "compat53"; version = "0.7-1"; @@ -261,7 +266,7 @@ buildLuarocksPackage { }; }) {}; -cosmo = callPackage({ buildLuarocksPackage, fetchgit, lpeg }: +cosmo = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lpeg }: buildLuarocksPackage { pname = "cosmo"; version = "16.06.04-1"; @@ -275,12 +280,13 @@ buildLuarocksPackage { "date": "2016-06-17T05:39:58-07:00", "path": "/nix/store/k3p4xc4cfihp4h8aj6vacr25rpcsjd96-cosmo", "sha256": "03b5gwsgxd777970d2h6rx86p7ivqx7bry8xmx2r396g3w85qy2p", + "hash": "sha256-V3hcEB/PpJFFrx35vE7HO55rUM8GigZOOue0/jR/ZQ0=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ lpeg ]; @@ -292,7 +298,7 @@ buildLuarocksPackage { }; }) {}; -coxpcall = callPackage({ buildLuarocksPackage, fetchgit }: +coxpcall = callPackage({ buildLuarocksPackage, fetchgit, fetchurl }: buildLuarocksPackage { pname = "coxpcall"; version = "1.17.0-1"; @@ -306,12 +312,13 @@ buildLuarocksPackage { "date": "2018-02-26T19:53:11-03:00", "path": "/nix/store/1q4p5qvr6rlwisyarlgnmk4dx6vp8xdl-coxpcall", "sha256": "1k3q1rr2kavkscf99b5njxhibhp6iwhclrjk6nnnp233iwc2jvqi", + "hash": "sha256-EW8pGI9jiGutNVNmyiCP5sIVYZe2rJQc03OrKXIOeMw=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; meta = { @@ -321,7 +328,7 @@ buildLuarocksPackage { }; }) {}; -cqueues = callPackage({ fetchurl, buildLuarocksPackage, lua }: +cqueues = callPackage({ buildLuarocksPackage, fetchurl, lua }: buildLuarocksPackage { pname = "cqueues"; version = "20200726.52-0"; @@ -345,7 +352,7 @@ buildLuarocksPackage { }; }) {}; -cyan = callPackage({ argparse, buildLuarocksPackage, tl, fetchgit, luafilesystem }: +cyan = callPackage({ argparse, buildLuarocksPackage, fetchgit, fetchurl, luafilesystem, tl }: buildLuarocksPackage { pname = "cyan"; version = "0.3.0-1"; @@ -359,12 +366,13 @@ buildLuarocksPackage { "date": "2023-02-19T18:58:20-06:00", "path": "/nix/store/smpj81z2a2blb3qfpjwx9n52d50rp39w-cyan", "sha256": "0pskargvjn2phgz481b08ndhp3z23s7lqfs8qlwailr7a4f2fc7h", + "hash": "sha256-8DAnHFEn06g4xUg7TI8e4o8Lm0VgBUT+g1dYuV9WU18=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ argparse luafilesystem tl ]; @@ -375,51 +383,24 @@ buildLuarocksPackage { }; }) {}; -cyrussasl = callPackage({ lua, luaOlder, buildLuarocksPackage, fetchgit }: -buildLuarocksPackage { - pname = "cyrussasl"; - version = "1.1.0-1"; - - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/JorjBauer/lua-cyrussasl", - "rev": "78ceec610da76d745d0eff4e21a4fb24832aa72d", - "date": "2015-08-21T18:24:54-04:00", - "path": "/nix/store/s7n7f80pz8k6lvfav55a5rwy5l45vs4l-lua-cyrussasl", - "sha256": "14kzm3vk96k2i1m9f5zvpvq4pnzaf7s91h5g4h4x2bq1mynzw2s1", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path"]) ; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "http://github.com/JorjBauer/lua-cyrussasl"; - description = "Cyrus SASL library for Lua 5.1+"; - license.fullName = "BSD"; - }; -}) {}; - -digestif = callPackage({ luafilesystem, fetchgit, lpeg, lua, buildLuarocksPackage, luaOlder }: +digestif = callPackage({ buildLuarocksPackage, fetchgit, lpeg, lua, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "digestif"; version = "dev-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/astoff/digestif", - "rev": "8f8448fa3f27611b32fe6398fe22ef24b8602ec9", - "date": "2023-02-24T22:38:11+01:00", - "path": "/nix/store/s7wxqcj3k8pgb3m86d8rs2ggpl63jxwn-digestif", - "sha256": "0k3srmilrz3ajj76kklksmifkgqrm0y7gr25h0vrrldrf1xp4pk0", + "rev": "c0199f9cd86021c0a89662002d7a3411d12fb168", + "date": "2023-03-10T15:04:26+01:00", + "path": "/nix/store/3s849fwc80lf7pvgsiavqmvc5538cwwd-digestif", + "sha256": "0xccrrfwvcj03nnrzs3iwig7y2ahl706h413hkywcplyd5407dv9", + "hash": "sha256-abcDSGmeXsb9hCMQaMChUAl/XuRx6J+tHUCyzV3OjHU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.3"); propagatedBuildInputs = [ lpeg lua luafilesystem ]; @@ -431,7 +412,7 @@ buildLuarocksPackage { }; }) {}; -dkjson = callPackage({ buildLuarocksPackage, lua, luaAtLeast, luaOlder, fetchurl }: +dkjson = callPackage({ buildLuarocksPackage, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "dkjson"; version = "2.6-1"; @@ -454,17 +435,17 @@ buildLuarocksPackage { }; }) {}; -fennel = callPackage({ luaOlder, buildLuarocksPackage, fetchurl, lua }: +fennel = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "fennel"; - version = "1.3.0-1"; + version = "1.3.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fennel-1.3.0-1.rockspec"; - sha256 = "1by78423n8k8i5sz7ji6w5igm8jkmyvd5x1y519hzmknphjqa263"; + url = "mirror://luarocks/fennel-1.3.1-1.rockspec"; + sha256 = "1dsavrsvngwx8vf1l2sj44arvip3bqkhsfh2sdkwa6r9mnw9zx87"; }).outPath; src = fetchurl { - url = "https://fennel-lang.org/downloads/fennel-1.3.0.tar.gz"; - sha256 = "0m754c74pj10c1qmc4zl89ifjiqcwafn8qagzfpfmcqv6r46pr23"; + url = "https://fennel-lang.org/downloads/fennel-1.3.1.tar.gz"; + sha256 = "1c7iwyc9f3a9k34fjq77zjk0minl3bl3f7wqlj8i1n2x7598nzgx"; }; disabled = (luaOlder "5.1"); @@ -478,7 +459,7 @@ buildLuarocksPackage { }; }) {}; -fifo = callPackage({ fetchzip, lua, buildLuarocksPackage }: +fifo = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua }: buildLuarocksPackage { pname = "fifo"; version = "0.2-0"; @@ -500,7 +481,7 @@ buildLuarocksPackage { }; }) {}; -fluent = callPackage({ lua, luaepnf, fetchgit, cldr, buildLuarocksPackage, penlight, luaOlder }: +fluent = callPackage({ buildLuarocksPackage, cldr, fetchgit, fetchurl, lua, luaOlder, luaepnf, penlight }: buildLuarocksPackage { pname = "fluent"; version = "0.2.0-0"; @@ -514,12 +495,13 @@ buildLuarocksPackage { "date": "2022-04-16T23:08:20+03:00", "path": "/nix/store/flxlnrzg6rx75qikiggmy494npx59p0b-fluent-lua", "sha256": "12js8l4hcxhziza0sry0f01kfm8f8m6kx843dmcky36z1y2mccmq", + "hash": "sha256-uDJWhQ/fDD9ZbYOgPk1FDlU3A3DAZw3Ujx92BglFWoo=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ cldr lua luaepnf penlight ]; @@ -532,23 +514,24 @@ buildLuarocksPackage { }; }) {}; -gitsigns-nvim = callPackage({ lua, fetchgit, buildLuarocksPackage }: +gitsigns-nvim = callPackage({ buildLuarocksPackage, fetchgit, lua }: buildLuarocksPackage { pname = "gitsigns.nvim"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lewis6991/gitsigns.nvim", - "rev": "f388995990aba04cfdc7c3ab870c33e280601109", - "date": "2023-02-16T11:22:47+00:00", - "path": "/nix/store/i4acpc5h3sv909gyppm1qv2vqjq84xs1-gitsigns.nvim", - "sha256": "1nm1f1d8c632nfnkiak4j7ynyin379bmhag5qp2p912cd9cjvsgx", + "rev": "ff01d34daaed72f271a8ffa088a7e839a60c640f", + "date": "2023-10-06T09:04:46+01:00", + "path": "/nix/store/2m4fyzkkg6bdbfb4kpjrqgbawvs3khqg-gitsigns.nvim", + "sha256": "0clyngmmz0qilnjykqc8n7c5kidspywazwy3axsikgh4x8wzdn17", + "hash": "sha256-J9j2OeoEvhl1V8Pzr7i/usVZ2LGI4emlpRGDX+uznjI=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (lua.luaversion != "5.1"); propagatedBuildInputs = [ lua ]; @@ -560,17 +543,17 @@ buildLuarocksPackage { }; }) {}; -haskell-tools-nvim = callPackage({ plenary-nvim, fetchzip, lua, luaOlder, buildLuarocksPackage }: +haskell-tools-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, plenary-nvim }: buildLuarocksPackage { pname = "haskell-tools.nvim"; - version = "2.3.0-1"; + version = "2.4.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/haskell-tools.nvim-2.3.0-1.rockspec"; - sha256 = "0jcmb0hzyhq14b2xcwdhwr9a9wbmfaw27vzfzkv52is24mwfr0p0"; + url = "mirror://luarocks/haskell-tools.nvim-2.4.0-1.rockspec"; + sha256 = "1sapapkz3ay9yrljmc1lwxjglv27f1zbh6m014r2z59px4ir61dz"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/2.3.0.zip"; - sha256 = "0lg8g2j9fbikgmhimvz9d0yb63csn85racc09qyszba2kviipr24"; + url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/2.4.0.zip"; + sha256 = "054vfqsccq1qmqmglnppi2n7ksckldx8b5p62y35y0cbcdyh7wz3"; }; disabled = (luaOlder "5.1"); @@ -583,7 +566,7 @@ buildLuarocksPackage { }; }) {}; -http = callPackage({ luaossl, lpeg_patterns, lpeg, binaryheap, compat53, cqueues, bit32, basexx, fetchzip, lua, fifo, luaOlder, buildLuarocksPackage }: +http = callPackage({ basexx, binaryheap, bit32, buildLuarocksPackage, compat53, cqueues, fetchurl, fetchzip, fifo, lpeg, lpeg_patterns, lua, luaOlder, luaossl }: buildLuarocksPackage { pname = "http"; version = "0.3-0"; @@ -607,7 +590,7 @@ buildLuarocksPackage { }; }) {}; -inspect = callPackage({ fetchurl, buildLuarocksPackage, lua, luaOlder }: +inspect = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "inspect"; version = "3.1.3-0"; @@ -630,7 +613,7 @@ buildLuarocksPackage { }; }) {}; -jsregexp = callPackage({ buildLuarocksPackage, lua, luaOlder, fetchgit }: +jsregexp = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "jsregexp"; version = "0.0.6-1"; @@ -644,12 +627,13 @@ buildLuarocksPackage { "date": "2023-02-12T14:19:03+01:00", "path": "/nix/store/aj42wy1yp53w406id33dyxpv1ws23g4b-jsregexp", "sha256": "0l7hn5f2jl4n2bpikb72szfzgc192jy3ig5pxx9061j44amyq89m", + "hash": "sha256-NSHsqyJEBgNS77e8OLwUKbD33dfirBnvEpZQKVyx8FA=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -661,7 +645,7 @@ buildLuarocksPackage { }; }) {}; -ldbus = callPackage({ luaOlder, fetchgit, lua, luaAtLeast, buildLuarocksPackage }: +ldbus = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "ldbus"; version = "scm-0"; @@ -675,12 +659,13 @@ buildLuarocksPackage { "date": "2021-11-10T23:58:54+11:00", "path": "/nix/store/j830jk2hkanz7abkdsbvg2warsyr0a2c-ldbus", "sha256": "18q98b98mfvjzbyssf18bpnlx4hsx4s9lwcwia4z9dxiaiw7b77j", + "hash": "sha256-8px1eFSxt/SJipxxmjTpGpJO7V0oOK39+nK7itJCCaM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; @@ -692,34 +677,35 @@ buildLuarocksPackage { }; }) {}; -ldoc = callPackage({ fetchgit, buildLuarocksPackage, markdown, penlight }: +ldoc = callPackage({ buildLuarocksPackage, fetchgit, markdown, penlight }: buildLuarocksPackage { pname = "ldoc"; - version = "scm-3"; + version = "dev-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/stevedonovan/LDoc.git", - "rev": "01d648f4ad50c3d14f2acadee6acb26beda56990", - "date": "2022-11-18T00:01:45+01:00", - "path": "/nix/store/m7vvl2b5k69jrb88d0y60f2y4ryazkp9-LDoc", - "sha256": "1kl0ba9mnd7nksakzb3vwr0hkkkgyk92v93r2w9xnrq879dhy5mm", + "url": "https://github.com/lunarmodules/ldoc.git", + "rev": "e4940daf748affb86489b0782ed8abab2e88bebc", + "date": "2023-05-13T08:12:31+03:00", + "path": "/nix/store/sqhilwlh0glw1dxcx6w98wjkp65amvil-ldoc", + "sha256": "0an92jxvhbw2lvg269x6z3874x3wqmbmx52j4gsgxf9ldpizssgd", + "hash": "sha256-7Wn94200uf70I1KUXlfFfHRy0PimJyPepoIvuLsUySo=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ markdown penlight ]; meta = { - homepage = "https://github.com/lunarmodules/LDoc"; + homepage = "http://lunarmodules.github.io/ldoc"; description = "A Lua Documentation Tool"; - license.fullName = "MIT/X11"; + license.fullName = "MIT <http://opensource.org/licenses/MIT>"; }; }) {}; -lgi = callPackage({ luaOlder, fetchgit, buildLuarocksPackage, lua }: +lgi = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lgi"; version = "0.9.2-1"; @@ -733,12 +719,13 @@ buildLuarocksPackage { "date": "2017-10-09T20:55:55+02:00", "path": "/nix/store/vh82n8pc8dy5c8nph0vssk99vv7q4qg2-lgi", "sha256": "03rbydnj411xpjvwsyvhwy4plm96481d7jax544mvk7apd8sd5jj", + "hash": "sha256-UpamUbvqzF0JKV3J0wIiJlV6iedwe823vD0EIm3zKw8=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -750,7 +737,7 @@ buildLuarocksPackage { }; }) {}; -linenoise = callPackage({ buildLuarocksPackage, lua, fetchurl, luaOlder }: +linenoise = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "linenoise"; version = "0.9-1"; @@ -770,7 +757,7 @@ buildLuarocksPackage { }; }) {}; -ljsyscall = callPackage({ lua, fetchurl, buildLuarocksPackage }: +ljsyscall = callPackage({ buildLuarocksPackage, fetchurl, lua }: buildLuarocksPackage { pname = "ljsyscall"; version = "0.12-1"; @@ -794,7 +781,7 @@ buildLuarocksPackage { }; }) {}; -lmathx = callPackage({ fetchurl, buildLuarocksPackage, lua }: +lmathx = callPackage({ buildLuarocksPackage, fetchurl, lua }: buildLuarocksPackage { pname = "lmathx"; version = "20150624-1"; @@ -817,7 +804,7 @@ buildLuarocksPackage { }; }) {}; -lmpfrlib = callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, lua, luaOlder }: +lmpfrlib = callPackage({ buildLuarocksPackage, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lmpfrlib"; version = "20170112-2"; @@ -827,7 +814,7 @@ buildLuarocksPackage { }).outPath; src = fetchurl { url = "http://www.circuitwizard.de/lmpfrlib/lmpfrlib.c"; - sha256 = "00d32cwvk298k3vyrjkdmfjgc69x1fwyks3hs7dqr2514zdhgssm"; + sha256 = "1bkfwdacj1drzqsfxf352fjppqqwi5d4j084jr9vj9dvjb31rbc1"; }; disabled = (luaOlder "5.3") || (luaAtLeast "5.5"); @@ -841,7 +828,7 @@ buildLuarocksPackage { }; }) {}; -loadkit = callPackage({ luaOlder, lua, buildLuarocksPackage, fetchgit }: +loadkit = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "loadkit"; version = "1.1.0-1"; @@ -851,16 +838,17 @@ buildLuarocksPackage { }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/leafo/loadkit.git", - "rev": "c6c712dab45f6c568821f9ed7b49c790a44d12e7", - "date": "2021-01-07T14:41:10-08:00", - "path": "/nix/store/xvwq7b2za8ciww1gjw7vnspg9183xmfa-loadkit", - "sha256": "15znriijs7izf9f6vmhr6dnvw3pzr0yr0mh6ah41fmdwjqi7jzcz", + "rev": "95b13a36442f59b41ab52df96d52233c4a725dfd", + "date": "2023-08-17T11:36:25-07:00", + "path": "/nix/store/9xcy2p5pxiq0p17szv8p2lagb6xzb8c8-loadkit", + "sha256": "0hivmn5r1scxv3nckm4hqfplq33wiab3ypjwsfdkmp3bdri0dhxs", + "hash": "sha256-usMGYm5r3Dqb01xeP5aKfAxMr8OQ1Mns2J3pkIutO0I=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -873,17 +861,17 @@ buildLuarocksPackage { }; }) {}; -lpeg = callPackage({ luaOlder, buildLuarocksPackage, fetchurl, lua }: +lpeg = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lpeg"; - version = "1.0.2-1"; + version = "1.1.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lpeg-1.0.2-1.rockspec"; - sha256 = "08a8p5cwlwpjawk8sczb7bq2whdsng4mmhphahyklf1bkvl2li89"; + url = "mirror://luarocks/lpeg-1.1.0-1.rockspec"; + sha256 = "03af1p00madfhfxjzrsxb0jm0n49ixwadnkdp0vbgs77d2v985jn"; }).outPath; src = fetchurl { - url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz"; - sha256 = "1zjzl7acvcdavmcg5l7wi12jd4rh95q9pl5aiww7hv0v0mv6bmj8"; + url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.1.0.tar.gz"; + sha256 = "0aimsjpcpkh3kk65f0pg1z2bp6d83rn4dg6pgbx1yv14s9kms5ab"; }; disabled = (luaOlder "5.1"); @@ -897,7 +885,7 @@ buildLuarocksPackage { }; }) {}; -lpeg_patterns = callPackage({ lpeg, fetchzip, buildLuarocksPackage, lua }: +lpeg_patterns = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lpeg, lua }: buildLuarocksPackage { pname = "lpeg_patterns"; version = "0.5-0"; @@ -919,7 +907,7 @@ buildLuarocksPackage { }; }) {}; -lpeglabel = callPackage({ fetchurl, lua, luaOlder, buildLuarocksPackage }: +lpeglabel = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lpeglabel"; version = "1.6.0-1"; @@ -942,7 +930,7 @@ buildLuarocksPackage { }; }) {}; -lrexlib-gnu = callPackage({ buildLuarocksPackage, luaOlder, lua, fetchgit }: +lrexlib-gnu = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lrexlib-gnu"; version = "2.9.1-1"; @@ -956,12 +944,13 @@ buildLuarocksPackage { "date": "2020-08-07T12:10:29+03:00", "path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib", "sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j", + "hash": "sha256-8vDI1Lx4QBny+YHjKCIqNlkiBKtI/SRjBiQNMwDuupU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -973,7 +962,7 @@ buildLuarocksPackage { }; }) {}; -lrexlib-pcre = callPackage({ lua, luaOlder, buildLuarocksPackage, fetchgit }: +lrexlib-pcre = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lrexlib-pcre"; version = "2.9.1-1"; @@ -987,12 +976,13 @@ buildLuarocksPackage { "date": "2020-08-07T12:10:29+03:00", "path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib", "sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j", + "hash": "sha256-8vDI1Lx4QBny+YHjKCIqNlkiBKtI/SRjBiQNMwDuupU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1005,7 +995,7 @@ buildLuarocksPackage { }; }) {}; -lrexlib-posix = callPackage({ lua, luaOlder, buildLuarocksPackage, fetchgit }: +lrexlib-posix = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lrexlib-posix"; version = "2.9.1-1"; @@ -1019,12 +1009,13 @@ buildLuarocksPackage { "date": "2020-08-07T12:10:29+03:00", "path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib", "sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j", + "hash": "sha256-8vDI1Lx4QBny+YHjKCIqNlkiBKtI/SRjBiQNMwDuupU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1036,7 +1027,7 @@ buildLuarocksPackage { }; }) {}; -lua-cjson = callPackage({ luaOlder, fetchgit, lua, buildLuarocksPackage }: +lua-cjson = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-cjson"; version = "2.1.0.10-1"; @@ -1050,12 +1041,13 @@ buildLuarocksPackage { "date": "2021-12-10T20:19:58+08:00", "path": "/nix/store/1ac8lz6smfa8zqfipqfsg749l9rw4ly9-lua-cjson", "sha256": "03hdsv7d77mggis58k8fmlpbh1d544m0lfqyl9rpjcqkiqs1qvza", + "hash": "sha256-6m8cNI4TM3lzoh47CiohpQW4Lq0OTVR0fK+e087WDQ4=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1067,7 +1059,7 @@ buildLuarocksPackage { }; }) {}; -lua-cmsgpack = callPackage({ luaOlder, fetchgit, lua, buildLuarocksPackage }: +lua-cmsgpack = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-cmsgpack"; version = "0.4.0-0"; @@ -1081,12 +1073,13 @@ buildLuarocksPackage { "date": "2015-06-03T08:39:04+02:00", "path": "/nix/store/ksqvl7hbd5s7nb6hjffyic1shldac4z2-lua-cmsgpack", "sha256": "0j0ahc9rprgl6dqxybaxggjam2r5i2wqqsd6764n0d7fdpj9fqm0", + "hash": "sha256-oGKX5G3uNGCJOaZpjLmIJYuq5HtdLd9xM/TlmxODCkg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1098,7 +1091,7 @@ buildLuarocksPackage { }; }) {}; -lua-curl = callPackage({ lua, buildLuarocksPackage, fetchzip, luaOlder, luaAtLeast }: +lua-curl = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lua-curl"; version = "0.3.13-1"; @@ -1121,30 +1114,61 @@ buildLuarocksPackage { }; }) {}; -lua-iconv = callPackage({ fetchurl, lua, buildLuarocksPackage, luaOlder }: +lua-ffi-zlib = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: +buildLuarocksPackage { + pname = "lua-ffi-zlib"; + version = "0.6-0"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/lua-ffi-zlib-0.6-0.rockspec"; + sha256 = "060sac715f1ris13fjv6gwqm0lk6by0a2zhldxd8hdrc0jss8p34"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/hamishforbes/lua-ffi-zlib", + "rev": "61e95cb434e4047c8bc65a180c293a05bf754416", + "date": "2023-08-11T09:28:16+12:00", + "path": "/nix/store/gfyr81q84mgpgwyh28xpzlf34ndjkfwc-lua-ffi-zlib", + "sha256": "0r6vima495h0d4f8ibf3fv9b6k7rqnavgvsy78dybslrm7lwsz4p", + "hash": "sha256-l3zN6amZ6uUbOl7vt5XF+Uyz0nbDrYgcaQCWRFSN22Q=", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path" "sha256"]) ; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/hamishforbes/lua-ffi-zlib"; + description = "A Lua module using LuaJIT's FFI feature to access zlib."; + }; +}) {}; + +lua-iconv = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-iconv"; - version = "7-3"; + version = "7.0.0-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-iconv-7-3.rockspec"; - sha256 = "0qh5vsaxd7s31p7a8rl08lwd6zv90wnvp15nll4fcz452kffpp72"; + url = "mirror://luarocks/lua-iconv-7.0.0-2.rockspec"; + sha256 = "1bj512kqcj2cxna7si4648fci51fs4bqvdn592i9cahscsc0kk9g"; }).outPath; src = fetchurl { - url = "https://github.com/downloads/ittner/lua-iconv/lua-iconv-7.tar.gz"; - sha256 = "02dg5x79fg5mwsycr0fj6w04zykdpiki9xjswkkwzdalqwaikny1"; + url = "https://github.com/lunarmodules/lua-iconv/archive/v7.0.0/lua-iconv-7.0.0.tar.gz"; + sha256 = "0arp0h342hpp4kfdxc69yxspziky4v7c13jbf12yrs8f1lnjzr0x"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://ittner.github.com/lua-iconv/"; + homepage = "https://github.com/lunarmodules/lua-iconv/"; description = "Lua binding to the iconv"; license.fullName = "MIT/X11"; }; }) {}; -lua-lsp = callPackage({ fetchgit, inspect, lua, lpeglabel, dkjson, luaAtLeast, luaOlder, buildLuarocksPackage }: +lua-lsp = callPackage({ buildLuarocksPackage, dkjson, fetchgit, fetchurl, inspect, lpeglabel, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lua-lsp"; version = "0.1.0-2"; @@ -1158,12 +1182,13 @@ buildLuarocksPackage { "date": "2020-10-17T15:07:11-04:00", "path": "/nix/store/qn9syhm875k1qardhhsp025cm3dbnqvm-lua-lsp", "sha256": "17k3jq61jz6j9bz4vc3hmsfx1s26cfgq1acja8fqyixljklmsbqp", + "hash": "sha256-Fy9d6ZS0R48dUpKpgJ9jRujQna5wsE3+StJ8GQyWY54=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ dkjson inspect lpeglabel lua ]; @@ -1175,17 +1200,17 @@ buildLuarocksPackage { }; }) {}; -lua-messagepack = callPackage({ buildLuarocksPackage, lua, fetchurl, luaOlder }: +lua-messagepack = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-messagepack"; - version = "0.5.2-1"; + version = "0.5.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-messagepack-0.5.2-1.rockspec"; - sha256 = "15liz6v8hsqgb3xrcd74a71nnjcz79gpc3ak351hk6k4gyjq2rfc"; + url = "mirror://luarocks/lua-messagepack-0.5.3-1.rockspec"; + sha256 = "0sc11ckizivijgdnqvb0xnagrak6d2caxc5j8jz8ad1b2plp50pq"; }).outPath; src = fetchurl { - url = "https://framagit.org/fperrad/lua-MessagePack/raw/releases/lua-messagepack-0.5.2.tar.gz"; - sha256 = "1jgi944d0vx4zs9lrphys9pw0wrsibip93sh141qjwymrjyjg1nc"; + url = "https://framagit.org/fperrad/lua-MessagePack/raw/releases/lua-messagepack-0.5.3.tar.gz"; + sha256 = "17qdigs2pzi38rfqgs63xh44n1vylb6bcmmbz3sby68f0n9p8kq6"; }; disabled = (luaOlder "5.1"); @@ -1198,26 +1223,27 @@ buildLuarocksPackage { }; }) {}; -lua-protobuf = callPackage({ luaOlder, buildLuarocksPackage, lua, fetchgit }: +lua-protobuf = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-protobuf"; - version = "0.4.1-1"; + version = "0.5.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-protobuf-0.4.1-1.rockspec"; - sha256 = "0b395lhby26drb8dzf2gn2avlwvxmnaqmqx5m4g3ik7dmmn7p09i"; + url = "mirror://luarocks/lua-protobuf-0.5.0-1.rockspec"; + sha256 = "08z73rsqi7ysdyjcwfqyr8z6i5r43kx5fd8l32wlzv6cx6yvlqc9"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/starwing/lua-protobuf.git", - "rev": "2a2b0b95117642ad9470bfe0add7dd6ce82f3869", - "date": "2022-11-29T21:34:24+08:00", - "path": "/nix/store/8yjzfj6gy8nkz1dxf0bmy8afwiv8gsjr-lua-protobuf", - "sha256": "0c1vjji0nj9lznsxw5gbnhab0ibs69298yrsn5yky0hhz8mmx5nr", + "rev": "a256c34e12cad643d6ad189bddcbc314da9b0658", + "date": "2023-04-30T02:11:27+08:00", + "path": "/nix/store/n7ihjh36kp2f80016f9y8xydia2pclzq-lua-protobuf", + "sha256": "1kbanbgvmzcfnxq30f8hmirgc1d768lacpjihis9961pc7w96l9n", + "hash": "sha256-NlGT+GE3mJR0hFFepigypwX2cqwQOTBwt479ut+yas0=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1230,26 +1256,27 @@ buildLuarocksPackage { }; }) {}; -lua-resty-http = callPackage({ lua, fetchgit, luaOlder, buildLuarocksPackage }: +lua-resty-http = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-resty-http"; - version = "0.17.0.beta.1-0"; + version = "0.17.1-0"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-http-0.17.0.beta.1-0.rockspec"; - sha256 = "1cjl007k43cyrwvj0p58hvp00q4lnd9rq3v3pcvwi5an2pvxnv80"; + url = "mirror://luarocks/lua-resty-http-0.17.1-0.rockspec"; + sha256 = "05gid7c5i459clw707z1jic42s52ap4z66dbr9ims5znaq5s3wdk"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/ledgetech/lua-resty-http", - "rev": "8cb73c4cc2118f0c62d9132e3b3b14aa36192e34", - "date": "2022-02-11T16:44:50+00:00", - "path": "/nix/store/29kr6whllphz0nla5nh1f8q30dgp9vnz-lua-resty-http", - "sha256": "0y253dnnx59a5c1nbkcv1p5kq7kdsd5i094i7wzpg5ar6xwvqhjb", + "rev": "4ab4269cf442ba52507aa2c718f606054452fcad", + "date": "2023-03-22T09:48:56+00:00", + "path": "/nix/store/ykd1d5fa56i1c286k58jm233lqvdv2mi-lua-resty-http", + "sha256": "0xdhygjqjpfkq1bq8b09fichww57q1z694lz16i3hcc3g4sr4hxg", + "hash": "sha256-r0OSNXmDMTiiCZ+SZH7Ap3AOWXQJLIRXwNNdieXzsHU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1261,7 +1288,7 @@ buildLuarocksPackage { }; }) {}; -lua-resty-jwt = callPackage({ luaOlder, lua-resty-openssl, fetchgit, lua, buildLuarocksPackage }: +lua-resty-jwt = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, lua-resty-openssl, luaOlder }: buildLuarocksPackage { pname = "lua-resty-jwt"; version = "0.2.3-0"; @@ -1275,12 +1302,13 @@ buildLuarocksPackage { "date": "2021-01-20T16:53:57-05:00", "path": "/nix/store/z4a8ffxj2i3gbjp0f8r377cdp88lkzl4-lua-resty-jwt", "sha256": "07w8r8gqbby06x493qzislig7a3giw0anqr4ivp3g2ms8v9fnng6", + "hash": "sha256-5lnr0ka6ijfujiRjqwCPb6jzItXx45FIN8CvhR/KiB8=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua lua-resty-openssl ]; @@ -1292,7 +1320,7 @@ buildLuarocksPackage { }; }) {}; -lua-resty-openidc = callPackage({ lua-resty-http, buildLuarocksPackage, fetchgit, lua-resty-session, luaOlder, lua, lua-resty-jwt }: +lua-resty-openidc = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, lua-resty-http, lua-resty-jwt, lua-resty-session, luaOlder }: buildLuarocksPackage { pname = "lua-resty-openidc"; version = "1.7.6-3"; @@ -1306,12 +1334,13 @@ buildLuarocksPackage { "date": "2023-01-30T19:06:51+01:00", "path": "/nix/store/nyd2jqhlq8gx4chapqyxk2q4dsxgm8hz-lua-resty-openidc", "sha256": "15dh9z7y84n840x02xsn2m9h9hdakbbv4p1z7dfz85v5w5i6c86p", + "hash": "sha256-1yBmYuFlF/RdOz9csteaqsEEUxVWdwE6IMgS5M9PsJU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua lua-resty-http lua-resty-jwt lua-resty-session ]; @@ -1323,26 +1352,27 @@ buildLuarocksPackage { }; }) {}; -lua-resty-openssl = callPackage({ fetchgit, buildLuarocksPackage }: +lua-resty-openssl = callPackage({ buildLuarocksPackage, fetchgit, fetchurl }: buildLuarocksPackage { pname = "lua-resty-openssl"; - version = "0.8.17-1"; + version = "0.8.25-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-openssl-0.8.17-1.rockspec"; - sha256 = "1b4dv9mdb90n0f6982pnjb05rgb12nkn1j66a1ywcs5fqcmj4sb5"; + url = "mirror://luarocks/lua-resty-openssl-0.8.25-1.rockspec"; + sha256 = "0wy0fjb50kpcyk6mkjj364p4lrfxl0b34xnv2n0wib1brk536s1l"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/fffonion/lua-resty-openssl.git", - "rev": "dc17f6b2ff3adaa3bcb586f1d09073a4f4f4ec9d", - "date": "2023-01-20T01:36:57+08:00", - "path": "/nix/store/hh9i8ndb861iplkf9mz6vs2akkyibazn-lua-resty-openssl", - "sha256": "14xmxskbw3clqr97y69d311rs6i97vl7dg8pzixsqf4ypgllzvig", + "rev": "f9a153288238e9b7e3d5d40144610410a06a83cd", + "date": "2023-09-05T15:19:20+08:00", + "path": "/nix/store/jnvr2pzvxl2psd5w030m4qnv5dsm8spb-lua-resty-openssl", + "sha256": "08fqgdfi0dr3n2lqrbgwa94dd2f6crn1kb0cfpccphknaypaw7dp", + "hash": "sha256-tx2urld2wsvYdQysGWxmxonWSFL8rYypsCM3EF172CE=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; meta = { @@ -1352,35 +1382,35 @@ buildLuarocksPackage { }; }) {}; -lua-resty-session = callPackage({ buildLuarocksPackage, fetchgit, luaOlder, lua, lua-resty-openssl /*, lua_pack, lua-ffi-zlib */ }: +lua-resty-session = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, lua-ffi-zlib, lua-resty-openssl, luaOlder }: buildLuarocksPackage { pname = "lua-resty-session"; - version = "4.0.3-1"; + version = "4.0.5-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-session-4.0.3-1.rockspec"; - sha256 = "17q8gf0zjdbfgphvjsnlzw1d6158v4ppiqxap6hjqr0prqa5yyfq"; + url = "mirror://luarocks/lua-resty-session-4.0.5-1.rockspec"; + sha256 = "0h0kqwna46mrraq310qjb7yigxwv13n4czk24xnqr21czxsskzkg"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/bungle/lua-resty-session.git", - "rev": "3373d8138930b6d1e255bb80d9127503019301d7", - "date": "2023-02-21T20:52:32+02:00", - "path": "/nix/store/pdwd03w7505wkv4fw79a3mdlfijk9ngd-lua-resty-session", - "sha256": "1d105785jzn9x3by4r0baaffr5xmc2ilgd7z7izcwq9z29pnfv02", + "rev": "5f2aed616d16fa7ca04dc40e23d6941740cd634d", + "date": "2023-08-16T18:24:43+03:00", + "path": "/nix/store/s6i1idv9lx52x7lcl0kc2c9sm9pic4kq-lua-resty-session", + "sha256": "08pih1baqhlvsqvcr1zzympmn8v7gskmis6ffhigll37hbzvljcz", + "hash": "sha256-n0m6/4JnUPoidM7oWKd+ZyNbb/X/h8w21ptCrFaA8SI=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua lua-resty-openssl /* lua_pack lua-ffi-zlib */ ]; + propagatedBuildInputs = [ lua lua-ffi-zlib lua-resty-openssl ]; meta = { homepage = "https://github.com/bungle/lua-resty-session"; description = "Session Library for OpenResty - Flexible and Secure"; license.fullName = "BSD"; - broken = true; # lua_pack and lua-ffi-zlib are unpackaged, causing this package to not evaluate }; }) {}; @@ -1413,7 +1443,7 @@ buildLuarocksPackage { }; }) {}; -lua-subprocess = callPackage({ lua, buildLuarocksPackage, fetchgit, luaOlder }: +lua-subprocess = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder }: buildLuarocksPackage { pname = "subprocess"; version = "scm-1"; @@ -1424,12 +1454,13 @@ buildLuarocksPackage { "date": "2021-01-09T22:31:54+01:00", "path": "/nix/store/3lr7n1k85kbf718wxr51xd40i8dfs5qd-lua-subprocess", "sha256": "0p91hda0b0hpgdbff5drcyygaizq086gw8vnvzn0y0fg3mc9if70", + "hash": "sha256-4LiYWB3PAQ/s33Yj/gwC+Ef1vGe5FedWexeCBVSDIV0=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1442,7 +1473,7 @@ buildLuarocksPackage { }; }) {}; -lua-term = callPackage({ fetchurl, buildLuarocksPackage }: +lua-term = callPackage({ buildLuarocksPackage, fetchurl }: buildLuarocksPackage { pname = "lua-term"; version = "0.7-1"; @@ -1463,7 +1494,7 @@ buildLuarocksPackage { }; }) {}; -lua-toml = callPackage({ fetchgit, buildLuarocksPackage, luaOlder, lua }: +lua-toml = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-toml"; version = "2.0-1"; @@ -1477,12 +1508,13 @@ buildLuarocksPackage { "date": "2017-12-08T16:30:50-08:00", "path": "/nix/store/cnpflpyj441c65jhb68hjr2bcvnj9han-lua-toml", "sha256": "0lklhgs4n7gbgva5frs39240da1y4nwlx6yxaj3ix6r5lp9sh07b", + "hash": "sha256-6wCo06Ulmx6HVN2bTrklPqgGiEhDZ1fUfusdS/SDdFI=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1494,7 +1526,7 @@ buildLuarocksPackage { }; }) {}; -lua-yajl = callPackage({ luaOlder, buildLuarocksPackage, lua, fetchgit }: +lua-yajl = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-yajl"; version = "2.0-1"; @@ -1508,12 +1540,13 @@ buildLuarocksPackage { "date": "2020-11-12T06:22:23-08:00", "path": "/nix/store/9acgxpqk52kwn03m5xasn4f6mmsby2r9-lua-yajl", "sha256": "1frry90y7vqnw1rd1dfnksilynh0n24gfhkmjd6wwba73prrg0pf", + "hash": "sha256-7oKX8x1HLc5Nk3VC94iwAFpPo57WtdBy4Bbv40HyObs=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1526,7 +1559,7 @@ buildLuarocksPackage { }; }) {}; -lua-zlib = callPackage({ fetchgit, buildLuarocksPackage, luaOlder, lua }: +lua-zlib = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-zlib"; version = "1.2-2"; @@ -1540,12 +1573,13 @@ buildLuarocksPackage { "date": "2017-10-07T08:26:37-07:00", "path": "/nix/store/6hjfczd3xkilkdxidgqzdrwmaiwnlf05-lua-zlib", "sha256": "1cv12s5c5lihmf3hb0rz05qf13yihy1bjpb7448v8mkiss6y1s5c", + "hash": "sha256-rOjgjdZxVrQRIWdduYKH0Y/gcAE/gwWHqzDSwooWYbM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1558,7 +1592,7 @@ buildLuarocksPackage { }; }) {}; -lua_cliargs = callPackage({ lua, luaOlder, buildLuarocksPackage, fetchurl }: +lua_cliargs = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua_cliargs"; version = "3.0-2"; @@ -1578,7 +1612,7 @@ buildLuarocksPackage { }; }) {}; -luabitop = callPackage({ luaAtLeast, lua, fetchgit, buildLuarocksPackage, luaOlder }: +luabitop = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luabitop"; version = "1.0.2-3"; @@ -1589,12 +1623,13 @@ buildLuarocksPackage { "date": "2021-08-30T10:14:03+02:00", "path": "/nix/store/sdnza0zpmlkz9jppnysasbvqy29f4zia-luabitop", "sha256": "1b57f99lrjbwsi4m23cq5kpj0dbpxh3xwr0mxs2rzykr2ijpgwrw", + "hash": "sha256-PPN3ZRR5+p+F7hVk3gfsdzUg7yyYDVFJ1HzJTFNyp6w=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.3"); propagatedBuildInputs = [ lua ]; @@ -1606,26 +1641,27 @@ buildLuarocksPackage { }; }) {}; -luacheck = callPackage({ argparse, luafilesystem, lua, luaOlder, fetchgit, buildLuarocksPackage }: +luacheck = callPackage({ argparse, buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "luacheck"; - version = "1.1.0-1"; + version = "1.1.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luacheck-1.1.0-1.rockspec"; - sha256 = "1r8d02x0hw28rd5p2gr7sf503lczjxv6qk1q66b375ibx6smpyza"; + url = "mirror://luarocks/luacheck-1.1.1-1.rockspec"; + sha256 = "11nrryqff2yis5s7jscbyv221p21i9sh924x7g9l3d6ijns8zmba"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/luacheck.git", - "rev": "fcbdeacad00e643e0d78c56b9ba6d8b3c7fa584f", - "date": "2022-12-19T20:51:56+03:00", - "path": "/nix/store/srzi8dfrbb9gby9lc7r4sndzzrpzd7nm-luacheck", - "sha256": "0bkbcxadlf0j59lyvadp7hs7l107blkci15i0hrbi72bx18hj99h", + "rev": "ababb6d403d634eb74d2c541035e9ede966e710d", + "date": "2023-06-10T11:27:25+03:00", + "path": "/nix/store/wkrhda7nww45g1waxdv9ghm35mwbvlfq-luacheck", + "sha256": "0abd5rfxv667n8d8v3g9cnkyghiwzhj3yk498gr2agd3mfcni7d7", + "hash": "sha256-p51omaujPSXyQ4lMPyT8PMLnp2XpjY0asseY3V0ubSk=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ argparse lua luafilesystem ]; @@ -1637,7 +1673,7 @@ buildLuarocksPackage { }; }) {}; -luacov = callPackage({ luaAtLeast, buildLuarocksPackage, luaOlder, lua, fetchgit }: +luacov = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luacov"; version = "0.15.0-1"; @@ -1651,12 +1687,13 @@ buildLuarocksPackage { "date": "2021-02-15T18:47:58-03:00", "path": "/nix/store/9vm38il9knzx2m66m250qj1fzdfzqg0y-luacov", "sha256": "08550nna6qcb5jn6ds1hjm6010y8973wx4qbf9vrvrcn1k2yr6ki", + "hash": "sha256-cZrsxQyW5Z13cguTzsdJyIMATJUw6GasLItho6wFpSA=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; @@ -1668,7 +1705,7 @@ buildLuarocksPackage { }; }) {}; -luadbi = callPackage({ buildLuarocksPackage, lua, luaOlder, fetchgit, luaAtLeast }: +luadbi = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luadbi"; version = "0.7.2-1"; @@ -1682,12 +1719,13 @@ buildLuarocksPackage { "date": "2019-01-14T09:39:17+00:00", "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "hash": "sha256-UG78J3crCy1dyyfeB4ICcRvpWG98/Pv7QunCzyrf8Zg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -1699,7 +1737,7 @@ buildLuarocksPackage { }; }) {}; -luadbi-mysql = callPackage({ luaOlder, lua, buildLuarocksPackage, fetchgit, luadbi, luaAtLeast }: +luadbi-mysql = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder, luadbi }: buildLuarocksPackage { pname = "luadbi-mysql"; version = "0.7.2-1"; @@ -1713,12 +1751,13 @@ buildLuarocksPackage { "date": "2019-01-14T09:39:17+00:00", "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "hash": "sha256-UG78J3crCy1dyyfeB4ICcRvpWG98/Pv7QunCzyrf8Zg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; @@ -1730,7 +1769,7 @@ buildLuarocksPackage { }; }) {}; -luadbi-postgresql = callPackage({ lua, fetchgit, buildLuarocksPackage, luaOlder, luaAtLeast, luadbi }: +luadbi-postgresql = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder, luadbi }: buildLuarocksPackage { pname = "luadbi-postgresql"; version = "0.7.2-1"; @@ -1744,12 +1783,13 @@ buildLuarocksPackage { "date": "2019-01-14T09:39:17+00:00", "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "hash": "sha256-UG78J3crCy1dyyfeB4ICcRvpWG98/Pv7QunCzyrf8Zg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; @@ -1761,7 +1801,7 @@ buildLuarocksPackage { }; }) {}; -luadbi-sqlite3 = callPackage({ luaAtLeast, lua, luaOlder, buildLuarocksPackage, fetchgit, luadbi }: +luadbi-sqlite3 = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder, luadbi }: buildLuarocksPackage { pname = "luadbi-sqlite3"; version = "0.7.2-1"; @@ -1775,12 +1815,13 @@ buildLuarocksPackage { "date": "2019-01-14T09:39:17+00:00", "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "hash": "sha256-UG78J3crCy1dyyfeB4ICcRvpWG98/Pv7QunCzyrf8Zg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; @@ -1792,7 +1833,7 @@ buildLuarocksPackage { }; }) {}; -luaepnf = callPackage({ luaOlder, buildLuarocksPackage, lpeg, luaAtLeast, lua, fetchgit }: +luaepnf = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lpeg, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luaepnf"; version = "0.3-2"; @@ -1806,12 +1847,13 @@ buildLuarocksPackage { "date": "2015-01-15T16:54:10+01:00", "path": "/nix/store/n7gb0z26sl7dzdyy3bx1y3cz3npsna7d-lua-luaepnf", "sha256": "1lvsi3fklhvz671jgg0iqn0xbkzn9qjcbf2ks41xxjz3lapjr6c9", + "hash": "sha256-iZksr6Ljy94D0VO4xSRO9s/VgcURvCfDMX9DOt2IetM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lpeg lua ]; @@ -1823,7 +1865,7 @@ buildLuarocksPackage { }; }) {}; -luaevent = callPackage({ lua, fetchurl, luaOlder, buildLuarocksPackage }: +luaevent = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luaevent"; version = "0.4.6-1"; @@ -1846,7 +1888,7 @@ buildLuarocksPackage { }; }) {}; -luaexpat = callPackage({ buildLuarocksPackage, fetchgit, luaOlder, lua }: +luaexpat = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luaexpat"; version = "1.4.1-1"; @@ -1860,12 +1902,13 @@ buildLuarocksPackage { "date": "2022-10-04T16:36:23+02:00", "path": "/nix/store/dgrdkalikpqdap642qhppha1ajdnsvx0-luaexpat", "sha256": "1b4ck23p01ks3hgayan9n33f2kb6jvv63v4ww2mqczc09rqi0q46", + "hash": "sha256-hmAQcU6AfYar4JzsYfaWZk3hxrDJKq8eHHoGcIeYjKw=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1878,7 +1921,7 @@ buildLuarocksPackage { }; }) {}; -luaffi = callPackage({ fetchgit, buildLuarocksPackage, lua, luaOlder }: +luaffi = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luaffi"; version = "scm-1"; @@ -1892,12 +1935,13 @@ buildLuarocksPackage { "date": "2021-03-01T11:46:30-05:00", "path": "/nix/store/6dwfn64p3clcsxkq41b307q8izi0fvji-luaffifb", "sha256": "0nj76fw3yi57vfn35yvbdmpdbg9gmn5j1gw84ajs9w1j86sc0661", + "hash": "sha256-wRjAtEEy8KSlIoi/IIutL73Vbm1r+zKs26dEP7gzR1o=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1909,7 +1953,7 @@ buildLuarocksPackage { }; }) {}; -luafilesystem = callPackage({ luaOlder, lua, fetchgit, buildLuarocksPackage }: +luafilesystem = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luafilesystem"; version = "1.8.0-1"; @@ -1923,44 +1967,46 @@ buildLuarocksPackage { "date": "2020-04-22T22:16:42-03:00", "path": "/nix/store/qzjav1cmn4zwclpfs0xzykpbv835d84z-luafilesystem", "sha256": "16hpwhj6zgkjns3zilcg3lxfijm3cl71v39y9n5lbjk4b9kkwh54", + "hash": "sha256-pEA+Z1pkykWLTT6NHQ5lo8roOh2P0fiHtnK+byTkF5o=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "git://github.com/keplerproject/luafilesystem"; + homepage = "https://github.com/keplerproject/luafilesystem"; description = "File System Library for the Lua Programming Language"; maintainers = with lib.maintainers; [ flosse ]; license.fullName = "MIT/X11"; }; }) {}; -lualdap = callPackage({ fetchgit, lua, luaOlder, buildLuarocksPackage }: +lualdap = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lualdap"; - version = "1.3.0-1"; + version = "1.3.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lualdap-1.3.0-1.rockspec"; - sha256 = "0b51sm0fz4kiim20w538v31k9g20wq3msxdkh17drkr60ab25sc8"; + url = "mirror://luarocks/lualdap-1.3.1-1.rockspec"; + sha256 = "0c0j9dmrphg0dil4yhahcqzzyxhrv525g65jsz0q6iqwyx10bqbp"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lualdap/lualdap", - "rev": "be380f5d98f779c813a4fb4ae1400262366fc8d4", - "date": "2021-06-05T15:49:42+02:00", - "path": "/nix/store/99sy73yz6sidqhkl0kwdsd7r853aw38n-lualdap", - "sha256": "133d8br5f24z03ni38m0czrqfz0mr0ksdrc1g73rawpmiqarpps8", + "rev": "5c21b3e0d97a07b103f63edc7e649018e0453427", + "date": "2023-03-15T09:02:07+01:00", + "path": "/nix/store/ah7y5wpp3l0v5bk0gwzdvgzfpczb691k-lualdap", + "sha256": "1y3ap9si894xjlbrwx3c6bcfg60y80av802rscldg9scvm984jrg", + "hash": "sha256-L0uCUt1Mp9co01kAtBVAHpjn2DJsdJ4XlZ0kFHW6avg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1973,7 +2019,7 @@ buildLuarocksPackage { }; }) {}; -lualogging = callPackage({ luasocket, buildLuarocksPackage, fetchgit }: +lualogging = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, luasocket }: buildLuarocksPackage { pname = "lualogging"; version = "1.8.2-1"; @@ -1987,12 +2033,13 @@ buildLuarocksPackage { "date": "2023-01-27T20:29:41+01:00", "path": "/nix/store/pvb3yq11xgqhq6559sjd8rkf1x991rrz-lualogging", "sha256": "1mz5iiv9pfikkm4ay7j0q6mk3bmcxylnlg9piwda47xxc1zyb1j4", + "hash": "sha256-RIblf2C9H6Iajzc9aqnvrK4xq8FAHq9InTO6m3aM5dc=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ luasocket ]; @@ -2003,7 +2050,7 @@ buildLuarocksPackage { }; }) {}; -luaossl = callPackage({ buildLuarocksPackage, lua, fetchzip }: +luaossl = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua }: buildLuarocksPackage { pname = "luaossl"; version = "20220711-0"; @@ -2025,7 +2072,7 @@ buildLuarocksPackage { }; }) {}; -luaposix = callPackage({ bit32, lua, luaOlder, fetchzip, luaAtLeast, buildLuarocksPackage }: +luaposix = callPackage({ bit32, buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luaposix"; version = "34.1.1-1"; @@ -2049,7 +2096,7 @@ buildLuarocksPackage { }; }) {}; -luarepl = callPackage({ buildLuarocksPackage, fetchurl, luaOlder, lua }: +luarepl = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luarepl"; version = "0.10-1"; @@ -2072,7 +2119,7 @@ buildLuarocksPackage { }; }) {}; -luarocks-build-rust-mlua = callPackage({ fetchgit, buildLuarocksPackage }: +luarocks-build-rust-mlua = callPackage({ buildLuarocksPackage, fetchgit, fetchurl }: buildLuarocksPackage { pname = "luarocks-build-rust-mlua"; version = "0.1.2-1"; @@ -2086,41 +2133,44 @@ buildLuarocksPackage { "date": "2023-06-29T16:47:41+01:00", "path": "/nix/store/n7id28r1m11xd550hayv99xhz96vpdjq-luarocks-build-rust-mlua", "sha256": "1zh1p5k7xpczi5db3k0fw0ljw9w0xxk1qjjcfg5rcznqjf48i3x7", + "hash": "sha256-p4+IiJPYfpbLc0xKHGbvgCcuKeAOzLFaiZ/dfma5Af4=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; meta = { homepage = "https://github.com/khvzak/luarocks-build-rust-mlua"; description = "A LuaRocks build backend for Lua modules written in Rust using mlua"; + maintainers = with lib.maintainers; [ mrcjkb ]; license.fullName = "MIT"; }; }) {}; -luasec = callPackage({ fetchgit, luaOlder, luasocket, buildLuarocksPackage, lua }: +luasec = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, luasocket }: buildLuarocksPackage { pname = "luasec"; - version = "1.2.0-1"; + version = "1.3.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luasec-1.2.0-1.rockspec"; - sha256 = "0zavdkwd701j8zqyzrpn1n5xd242vziq2l79amjdn5mcw81nrsdf"; + url = "mirror://luarocks/luasec-1.3.2-1.rockspec"; + sha256 = "09nqs60cmbq1bi70cdh7v5xjnlsm2mrxv9pmbbvczijvz184jh33"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/brunoos/luasec", - "rev": "d9215ee00f6694a228daad50ee85827a4cd13583", - "date": "2022-07-30T08:42:53-03:00", - "path": "/nix/store/77m3g768a230h77nxiw23ay73aryq1zh-luasec", - "sha256": "1rz2lhf243lrsjsyjwxhijhqr88l8l8sndzzv9w4x1j0zpa9sblb", + "rev": "4c06287052d68fdbe7429b8f967cdc8ee94aa44a", + "date": "2023-08-31T17:09:53-03:00", + "path": "/nix/store/wnl78b5l3dxw52slphmi4rmr1cd8bd3r-luasec", + "sha256": "0rrdfbnkd8pgqwh3f0iyd5cxy7g1h0568a88m3sq1z7715js4yx3", + "hash": "sha256-o3uiZQnn/ID1qAgpZAqA4R3fWWk+Ajcgx++iNu1yLWc=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua luasocket ]; @@ -2133,7 +2183,7 @@ buildLuarocksPackage { }; }) {}; -luasocket = callPackage({ fetchgit, lua, luaOlder, buildLuarocksPackage }: +luasocket = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luasocket"; version = "3.1.0-1"; @@ -2147,12 +2197,13 @@ buildLuarocksPackage { "date": "2022-07-27T10:07:00+03:00", "path": "/nix/store/r5pqxqjkdwl80nmjkv400mbls7cfymjc-luasocket", "sha256": "13hyf9cvny0kxwyg08929kkl31w74j66fj6zg1myyjr9nh5b795h", + "hash": "sha256-sKSzCrQpS+9reN9IZ4wkh4dB50wiIfA87xN4u1lyHo4=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -2164,26 +2215,27 @@ buildLuarocksPackage { }; }) {}; -luasql-sqlite3 = callPackage({ lua, buildLuarocksPackage, fetchgit, luaOlder }: +luasql-sqlite3 = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luasql-sqlite3"; - version = "2.6.0-1"; + version = "2.6.0-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luasql-sqlite3-2.6.0-1.rockspec"; - sha256 = "0w32znsfcaklcja6avqx7daaxbf0hr2v8g8bmz0fysb3401lmp02"; + url = "mirror://luarocks/luasql-sqlite3-2.6.0-2.rockspec"; + sha256 = "1xpbcpl4qhnzpyyszhdsrxhx2qc1dmndh926lv91xwphw7inwdwg"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/keplerproject/luasql.git", - "rev": "e2660cbaeb13cb33d8346bb816c6a526241b3c2d", - "date": "2022-10-03T18:44:40-03:00", - "path": "/nix/store/mxzq779w3l19bgb424aa4cqdzxczmwr3-luasql", - "sha256": "052hc174am05plidilzf36vr736sp8vyydfb12qa8xr6mk74f6d1", + "rev": "25bf4ffce9323d28cb6f382f7ec9e8951e3084f9", + "date": "2023-07-19T14:20:27-03:00", + "path": "/nix/store/949886jxp7sx3yx910lc6d1yf3ym9mx5-luasql", + "sha256": "00q73j2nzqsm0vmxjkv83qh1dncmr5dgmkrkyxnb5ggygvcbh7w5", + "hash": "sha256-hR+42H7+vbJs9zPP+lrJldkWIB5oT9nrBlXjb4UcBwM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -2196,7 +2248,7 @@ buildLuarocksPackage { }; }) {}; -luassert = callPackage({ luaOlder, fetchgit, buildLuarocksPackage, lua, say }: +luassert = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, say }: buildLuarocksPackage { pname = "luassert"; version = "1.9.0-1"; @@ -2210,12 +2262,13 @@ buildLuarocksPackage { "date": "2022-08-24T00:00:45+03:00", "path": "/nix/store/vfcl25wxps5kvh5prjkkjlj1ga3kgw63-luassert", "sha256": "0wlp6qdm9dkwzs8lvnj7zvmid4y12v717ywlhxn2brkbjpvl2dwf", + "hash": "sha256-jjdB95Vr5iVsh5T7E84WwZMW6/5H2k2R/ny2VBs2l3I=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua say ]; @@ -2227,7 +2280,7 @@ buildLuarocksPackage { }; }) {}; -luasystem = callPackage({ buildLuarocksPackage, luaOlder, lua, fetchurl }: +luasystem = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luasystem"; version = "0.2.1-0"; @@ -2250,7 +2303,7 @@ buildLuarocksPackage { }; }) {}; -luaunbound = callPackage({ fetchurl, lua, buildLuarocksPackage, luaOlder, luaAtLeast }: +luaunbound = callPackage({ buildLuarocksPackage, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luaunbound"; version = "1.0.0-1"; @@ -2273,7 +2326,7 @@ buildLuarocksPackage { }; }) {}; -luaunit = callPackage({ buildLuarocksPackage, fetchzip, lua, luaAtLeast, luaOlder }: +luaunit = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luaunit"; version = "3.4-1"; @@ -2297,7 +2350,7 @@ buildLuarocksPackage { }; }) {}; -luautf8 = callPackage({ fetchurl, buildLuarocksPackage, lua, luaOlder }: +luautf8 = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luautf8"; version = "0.1.5-2"; @@ -2321,7 +2374,7 @@ buildLuarocksPackage { }; }) {}; -luazip = callPackage({ luaOlder, luaAtLeast, buildLuarocksPackage, lua, fetchgit }: +luazip = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luazip"; version = "1.2.7-1"; @@ -2335,12 +2388,13 @@ buildLuarocksPackage { "date": "2017-09-05T14:02:52+03:00", "path": "/nix/store/idllj442c0iwnx1cpkrifx2afb7vh821-luazip", "sha256": "1jlqzqlds3aa3hnp737fm2awcx0hzmwyd87klv0cv13ny5v9f2x4", + "hash": "sha256-pAuXdvF2hM3ApvOg5nn9EHTGlajujHMtHEoN3Sj+mMo=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -2352,23 +2406,24 @@ buildLuarocksPackage { }; }) {}; -lush-nvim = callPackage({ buildLuarocksPackage, fetchgit, luaAtLeast, luaOlder, lua }: +lush-nvim = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lush.nvim"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/rktjmp/lush.nvim", - "rev": "b1e8eb1da3fee95ef31515a73c9eff9bf251088d", - "date": "2023-01-03T10:45:29+11:00", - "path": "/nix/store/wpnvi5bjlp7sl8g2li21qkcd7m1f3d3w-lush.nvim", - "sha256": "0q3prq4fm9rpczl7b1lgqnhs0z5jgvpdy0cp45jfpw4bvcy6vkpq", + "rev": "966aad1accd47fa11fbe2539234f81f678fef2de", + "date": "2023-09-23T12:10:39+10:00", + "path": "/nix/store/67046ilc92czfvwc5zdkkxg7iw2xjj45-lush.nvim", + "sha256": "0g1xib2k42py9qqccjz11qk52ri0drgdk5rb0ls7wzx4v636k15h", + "hash": "sha256-sIRphtmkf340BSuX2V5uIGZRJg7hS8YwTv4KMsWKPTw=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -2381,7 +2436,7 @@ buildLuarocksPackage { }; }) {}; -luuid = callPackage({ luaOlder, luaAtLeast, buildLuarocksPackage, fetchurl, lua }: +luuid = callPackage({ buildLuarocksPackage, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luuid"; version = "20120509-2"; @@ -2404,7 +2459,7 @@ buildLuarocksPackage { }; }) {}; -luv = callPackage({ luaOlder, buildLuarocksPackage, fetchurl, lua }: +luv = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luv"; version = "1.44.2-1"; @@ -2427,7 +2482,7 @@ buildLuarocksPackage { }; }) {}; -lyaml = callPackage({ buildLuarocksPackage, fetchzip, lua, luaOlder, luaAtLeast }: +lyaml = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lyaml"; version = "6.2.8-1"; @@ -2451,7 +2506,7 @@ buildLuarocksPackage { }; }) {}; -magick = callPackage({ fetchgit, buildLuarocksPackage, lua }: +magick = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua }: buildLuarocksPackage { pname = "magick"; version = "1.6.0-1"; @@ -2465,24 +2520,26 @@ buildLuarocksPackage { "date": "2022-03-10T20:02:11-08:00", "path": "/nix/store/fpl99q09zg3qnk4kagxk1djabl1dm47l-magick", "sha256": "01b9qsz27f929rz5z7vapqhazxak74sichdwkjwb219nlhrwfncm", + "hash": "sha256-lVnHM6Q2BbG4nLxBFjU5U/WvIL5qn19+TiK5I77GaQU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (lua.luaversion != "5.1"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "git://github.com/leafo/magick.git"; + homepage = "https://github.com/leafo/magick.git"; description = "Lua bindings to ImageMagick & GraphicsMagick for LuaJIT using FFI"; + maintainers = with lib.maintainers; [ donovanglover ]; license.fullName = "MIT"; }; }) {}; -markdown = callPackage({ buildLuarocksPackage, luaAtLeast, fetchgit, luaOlder, lua }: +markdown = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "markdown"; version = "0.33-1"; @@ -2496,12 +2553,13 @@ buildLuarocksPackage { "date": "2015-09-27T17:49:28+03:00", "path": "/nix/store/akl80hh077hm20bdqj1lksy0fn2285b5-markdown", "sha256": "019bk2qprszqncnm8zy6ns6709iq1nwkf7i86nr38f035j4lc11y", + "hash": "sha256-PgRGiSwDODSyNSgeN7kNOCZwjLbGf1Qts/jrfLGYKwU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -2513,7 +2571,7 @@ buildLuarocksPackage { }; }) {}; -mediator_lua = callPackage({ luaOlder, lua, fetchurl, buildLuarocksPackage }: +mediator_lua = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "mediator_lua"; version = "1.1.2-0"; @@ -2536,7 +2594,7 @@ buildLuarocksPackage { }; }) {}; -middleclass = callPackage({ luaOlder, buildLuarocksPackage, fetchurl, lua }: +middleclass = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "middleclass"; version = "4.1.1-0"; @@ -2559,23 +2617,24 @@ buildLuarocksPackage { }; }) {}; -moonscript = callPackage({ lpeg, luaOlder, fetchgit, lua, buildLuarocksPackage, argparse, luafilesystem }: +moonscript = callPackage({ argparse, buildLuarocksPackage, fetchgit, lpeg, lua, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "moonscript"; version = "dev-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/leafo/moonscript.git", - "rev": "a0108328373d5f3f1aefb98341aa895dd75a1b2a", - "date": "2022-11-04T13:38:05-07:00", - "path": "/nix/store/js597jw44cdfq154a7bpqba99ninzsqh-moonscript", - "sha256": "02ig93c1dzrbs64mz40bkzz3p93fdxm6m0i7gfqwiickybr9wd97", + "rev": "fbd8ad48737651114a3d3a672b9f8f8b3a7022b7", + "date": "2023-06-23T09:33:37-07:00", + "path": "/nix/store/sy1dkcfp3rg7lvazba36sivpk0bs12r5-moonscript", + "sha256": "02w6lp5kid73dcd5x71666my7413l05ak0xvva6hp8ixbn6qraqn", + "hash": "sha256-FquMjV09oguN2ruDqQqgI5DjqzEmnF4aa+O0OMulhgs=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ argparse lpeg lua luafilesystem ]; @@ -2591,14 +2650,14 @@ buildLuarocksPackage { mpack = callPackage({ buildLuarocksPackage, fetchurl }: buildLuarocksPackage { pname = "mpack"; - version = "1.0.9-0"; + version = "1.0.11-0"; knownRockspec = (fetchurl { - url = "mirror://luarocks/mpack-1.0.9-0.rockspec"; - sha256 = "1v10kmw3qw559bbm142z40ib26bwvcyi64qjrk0vf8v6n1mx8wcn"; + url = "mirror://luarocks/mpack-1.0.11-0.rockspec"; + sha256 = "0alydkccamxldij7ki42imd37630d9qnqg22pndcgkawfclfqzqa"; }).outPath; src = fetchurl { - url = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.9/libmpack-lua-1.0.9.tar.gz"; - sha256 = "17lyjmnbychacwahqgs128nb00xky777g7zw5wf20vrzkiq7xl0g"; + url = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.11/libmpack-lua-1.0.11.tar.gz"; + sha256 = "15np7603rijavycvrjgjp12y64zs36390lg2hsnr5av790cfrnd2"; }; @@ -2609,7 +2668,7 @@ buildLuarocksPackage { }; }) {}; -nui-nvim = callPackage( { fetchgit, buildLuarocksPackage }: +nui-nvim = callPackage({ buildLuarocksPackage, fetchgit, fetchurl }: buildLuarocksPackage { pname = "nui.nvim"; version = "0.2.0-1"; @@ -2623,12 +2682,13 @@ buildLuarocksPackage { "date": "2023-07-20T10:45:09+06:00", "path": "/nix/store/8zdhjgipjjhi9b1y40r2yk5np4lp39as-nui.nvim", "sha256": "14a73dwl56kah9h36b40ir6iylvfs261ysz17qvi9vhp63vjq9cx", + "hash": "sha256-nSUs9zAX7hQ3PuFrH4zQblMfTY6ALDNggmqaQnkbR5E=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; meta = { @@ -2639,7 +2699,7 @@ buildLuarocksPackage { }; }) {}; -nvim-client = callPackage({ coxpcall, fetchurl, mpack, lua, luaOlder, luv, buildLuarocksPackage }: +nvim-client = callPackage({ buildLuarocksPackage, coxpcall, fetchurl, lua, luaOlder, luv, mpack }: buildLuarocksPackage { pname = "nvim-client"; version = "0.2.4-1"; @@ -2659,23 +2719,24 @@ buildLuarocksPackage { }; }) {}; -nvim-cmp = callPackage({ luaAtLeast, lua, fetchgit, buildLuarocksPackage, luaOlder }: +nvim-cmp = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "nvim-cmp"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/hrsh7th/nvim-cmp", - "rev": "7a3b1e76f74934b12fda82158237c6ad8bfd3d40", - "date": "2023-02-24T12:23:36+09:00", - "path": "/nix/store/s1qark9y2zkbwyl2mzg60z9r0h4hajf4-nvim-cmp", - "sha256": "0cy93aj02nkspr83sqsrix12jcnhkl5s2mbpjr5ffhpcrk19vlmx", + "rev": "5dce1b778b85c717f6614e3f4da45e9f19f54435", + "date": "2023-08-26T15:31:42+00:00", + "path": "/nix/store/lvpzc5q7mv66knxh1igvzkrcwkpg8l8q-nvim-cmp", + "sha256": "1yl5b680p6vhk1741riiwjnw7a4wn0nimjvcab0ij6mx3kf28rsq", + "hash": "sha256-WGck3By9GhnBUmzLGi2wnKjDreQx5kBOmHCbC5BZhfo=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -2687,23 +2748,24 @@ buildLuarocksPackage { }; }) {}; -penlight = callPackage({ luafilesystem, luaOlder, fetchgit, buildLuarocksPackage, lua }: +penlight = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "penlight"; version = "dev-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/penlight.git", - "rev": "7e67bcb1c4d95e7ca817356533419b4a72049b96", - "date": "2022-12-28T23:34:46+01:00", - "path": "/nix/store/14kax7nswd7in005cgb0f0r8194s9nsd-penlight", - "sha256": "17gcfi8hqpdp8m0f1nr9n5p1mzxxpq2qwf8zkqvjkb7qv1zqabj1", + "rev": "dc6d19c5c1e1b4ac55b14df17b7645af6b410140", + "date": "2023-09-21T10:51:09+02:00", + "path": "/nix/store/vbi0d32mbaqcra3jligv8ajq17m1wxa4-penlight", + "sha256": "12ppgby8ldh4zxwcr7cknacbdvk30fi92sgyzh1zbgvym4l44g0c", + "hash": "sha256-DDxCKKl+v/UD/P5pkaIDY+62mLKTncx4/wQ2ivx694o=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua luafilesystem ]; @@ -2716,23 +2778,24 @@ buildLuarocksPackage { }; }) {}; -plenary-nvim = callPackage({ lua, fetchgit, luaOlder, luaAtLeast, luassert, buildLuarocksPackage }: +plenary-nvim = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder, luassert }: buildLuarocksPackage { pname = "plenary.nvim"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/nvim-lua/plenary.nvim", - "rev": "253d34830709d690f013daf2853a9d21ad7accab", - "date": "2023-02-19T10:05:49+01:00", - "path": "/nix/store/dnzlin3gqpvd35a8c5g5hwg3fl28vxgs-plenary.nvim", - "sha256": "17vvl06jc5vrfrv7gljflkqykshhg84wnhbl9br4pm050ywlg4ng", + "rev": "50012918b2fc8357b87cff2a7f7f0446e47da174", + "date": "2023-10-11T15:43:47+02:00", + "path": "/nix/store/jsgaq274w8pbl4pnmpii3izxafpl346g-plenary.nvim", + "sha256": "1sn7vpsbwpyndsjyxb4af8fvz4sfhlbavvw6jjsv3h18sdvkh7nd", + "hash": "sha256-zR44d9MowLG1lIbvrRaFTpO/HXKKrO6lbtZfvvTdx+o=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luassert ]; @@ -2744,7 +2807,7 @@ buildLuarocksPackage { }; }) {}; -rapidjson = callPackage({ lua, buildLuarocksPackage, luaOlder, fetchgit }: +rapidjson = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder }: buildLuarocksPackage { pname = "rapidjson"; version = "0.7.1-1"; @@ -2755,12 +2818,13 @@ buildLuarocksPackage { "date": "2021-04-09T19:59:20+08:00", "path": "/nix/store/65l71ph27pmipgrq8j4whg6n8h2avvs4-lua-rapidjson", "sha256": "1a6srvximxlh6gjkaj5y86d1kf06pc4gby2r6wpdw2pdac8k7xyb", + "hash": "sha256-y/czEVPtCt4uN1n49Qi7BrgZmkG+SDXlM5D2GvvO2qg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -2772,44 +2836,21 @@ buildLuarocksPackage { }; }) {}; -readline = callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, luaOlder, lua, luaposix }: -buildLuarocksPackage { - pname = "readline"; - version = "3.2-0"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/readline-3.2-0.rockspec"; - sha256 = "1r0sgisxm4xd1r6i053iibxh30j7j3rcj4wwkd8rzkj8nln20z24"; - }).outPath; - src = fetchurl { - url = "http://www.pjb.com.au/comp/lua/readline-3.2.tar.gz"; - sha256 = "1mk9algpsvyqwhnq7jlw4cgmfzj30l7n2r6ak4qxgdxgc39f48k4"; - }; - - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua luaposix ]; - - meta = { - homepage = "http://pjb.com.au/comp/lua/readline.html"; - description = "Interface to the readline library"; - license.fullName = "MIT/X11"; - }; -}) {}; - -rest-nvim = callPackage({ lua, luaAtLeast, buildLuarocksPackage, luaOlder, fetchzip, plenary-nvim }: +rest-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }: buildLuarocksPackage { pname = "rest.nvim"; - version = "0.1-2"; + version = "0.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rest.nvim-0.1-2.rockspec"; - sha256 = "0l8k91483nz75ijgnyfb8r7mynsaps7ikvjkziimf62bv7aks3qh"; + url = "mirror://luarocks/rest.nvim-0.2-1.rockspec"; + sha256 = "1yq8gx585c10j8kybp20swyv9q0i3lm5k0rrv4bgsbwz3ychn0k1"; }).outPath; src = fetchzip { - url = "http://github.com/rest-nvim/rest.nvim/archive/0.1.zip"; - sha256 = "0yf1a1cjrrzw0wmjgg48g3qn9kfxn7hv38yx88l1sc1r1nsfijrq"; + url = "https://github.com/rest-nvim/rest.nvim/archive/0.2.zip"; + sha256 = "0ycjrrl37z465p71bdkas3q2ky1jmgr2cjnirnskdc6wz14wl09g"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ lua plenary-nvim ]; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; meta = { homepage = "https://github.com/rest-nvim/rest.nvim"; @@ -2843,23 +2884,24 @@ buildLuarocksPackage { }; }) {}; -say = callPackage({ luaOlder, fetchgit, lua, buildLuarocksPackage }: +say = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder }: buildLuarocksPackage { pname = "say"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/say.git", - "rev": "45a3057e68c52b34ab59ef167efeb2340e356661", - "date": "2022-08-27T11:00:01+03:00", - "path": "/nix/store/324ryi5hlaisnyp4wpd1hvzcfv508i4s-say", - "sha256": "178pdsswwnja2f106701xmdxsdijjl5smm28dhhdcmjyb4mn8cr2", + "rev": "3e1f783d0aa496eb21d16e85b2235335cb9332df", + "date": "2023-08-13T02:37:27+03:00", + "path": "/nix/store/5biavac0k8z0xg4rr3bm8z3kdi8mm8c0-say", + "sha256": "04dkf0av6n71vmz0h86i5brklvaf9p91lkldn1xldpdr0qqs0x63", + "hash": "sha256-w3SgMQa53UZ7sI1OGtJNTm068yrRIAh+3eFYsxVwsxE=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -2871,7 +2913,7 @@ buildLuarocksPackage { }; }) {}; -serpent = callPackage({ fetchgit, luaAtLeast, lua, buildLuarocksPackage, luaOlder }: +serpent = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "serpent"; version = "0.30-2"; @@ -2885,12 +2927,13 @@ buildLuarocksPackage { "date": "2017-09-01T21:35:14-07:00", "path": "/nix/store/z6df44n3p07n4bia7s514vgngbkbpnap-serpent", "sha256": "0q80yfrgqgr01qprf0hrp284ngb7fbcq1v9rbzmdkhbm9lpgy8v8", + "hash": "sha256-aCP/Lk11wdnqXzntgNlyZz1LkLgZApcvDiA//LLzAGE=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; @@ -2903,7 +2946,7 @@ buildLuarocksPackage { }; }) {}; -sqlite = callPackage({ fetchgit, buildLuarocksPackage, luv }: +sqlite = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, luv }: buildLuarocksPackage { pname = "sqlite"; version = "v1.2.2-0"; @@ -2917,12 +2960,13 @@ buildLuarocksPackage { "date": "2022-06-17T15:57:13+03:00", "path": "/nix/store/637s46bsvsxfnzmy6ygig3y0vqmf3r8p-sqlite.lua", "sha256": "0ckifx6xxrannn9szacgiiqjsp4rswghxscdl3s411dhas8djj1m", + "hash": "sha256-NUjZkFawhUD0oI3pDh/XmVwtcYyPqa+TtVbl3k13cTI=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ luv ]; @@ -2933,7 +2977,7 @@ buildLuarocksPackage { }; }) {}; -std-_debug = callPackage({ buildLuarocksPackage, lua, luaOlder, fetchgit, luaAtLeast }: +std-_debug = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "std._debug"; version = "git-1"; @@ -2944,12 +2988,13 @@ buildLuarocksPackage { "date": "2023-01-31T16:39:35-07:00", "path": "/nix/store/i24iz2hvnjp18iz9z8kljsy9iv17m2zl-_debug", "sha256": "07z5lz3gy8wzzks79r3v68vckj42i3sybhfmqx7h2s58ld2kn5fd", + "hash": "sha256-zRU7RaOoaAFPx9XB5fWIgsjJNjJ75HT0/J8j/8an5R8=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; @@ -2961,23 +3006,18 @@ buildLuarocksPackage { }; }) {}; -std-normalize = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, std-_debug, luaOlder }: +std-normalize = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder, std-_debug }: buildLuarocksPackage { pname = "std.normalize"; - version = "git-1"; - - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/lua-stdlib/normalize.git", - "rev": "ccc697998af22d9d7f675e73f4b27c7a52151b5c", - "date": "2022-01-02T16:33:35-08:00", - "path": "/nix/store/nvyy1ibp43pzaldj6ark02ypqr45wmy1-normalize", - "sha256": "1m6x4lp7xzghvagbqjljyqfcpilh76j25b71da6jd304xc9r0ngy", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path"]) ; + version = "2.0.3-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/std.normalize-2.0.3-1.rockspec"; + sha256 = "1l83ikiaw4dch2r69cxpl93b9d4wf54vbjb6fcggnkxxgm0amj3a"; + }).outPath; + src = fetchzip { + url = "http://github.com/lua-stdlib/normalize/archive/v2.0.3.zip"; + sha256 = "1gyywglxd2y7ck3hk8ap73w0x7hf9irpg6vgs8yc6k9k4c5g3fgi"; + }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua std-_debug ]; @@ -2989,7 +3029,7 @@ buildLuarocksPackage { }; }) {}; -stdlib = callPackage({ buildLuarocksPackage, luaAtLeast, fetchzip, lua, luaOlder }: +stdlib = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "stdlib"; version = "41.2.2-1"; @@ -3013,7 +3053,7 @@ buildLuarocksPackage { }; }) {}; -teal-language-server = callPackage({ luafilesystem, buildLuarocksPackage, dkjson, cyan, fetchgit }: +teal-language-server = callPackage({ buildLuarocksPackage, cyan, dkjson, fetchgit, fetchurl, luafilesystem }: buildLuarocksPackage { pname = "teal-language-server"; version = "dev-1"; @@ -3027,12 +3067,13 @@ buildLuarocksPackage { "date": "2022-12-21T20:33:53-06:00", "path": "/nix/store/qyaz38njm8qgyfxca6m6f8i4lkfcfdb0-teal-language-server", "sha256": "12nqarykmdvxxci9l6gq2yhn4pjzzqlxyrl2c8svb97hka68wjvx", + "hash": "sha256-fUuOjJrwpLU1YoJm3yn+X15ioRf4GZoi6323On1W2Io=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ cyan dkjson luafilesystem ]; @@ -3043,17 +3084,17 @@ buildLuarocksPackage { }; }) {}; -telescope-manix = callPackage({ telescope-nvim, buildLuarocksPackage, lua, fetchzip, luaOlder }: +telescope-manix = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, telescope-nvim }: buildLuarocksPackage { pname = "telescope-manix"; - version = "0.4.0-1"; + version = "0.5.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/telescope-manix-0.4.0-1.rockspec"; - sha256 = "1kh3dn4aixydxrq01sbl40v7if8bmpsvv30qf7vig7dvl21aqkrp"; + url = "mirror://luarocks/telescope-manix-0.5.0-1.rockspec"; + sha256 = "0i5q9sr0vn0w6yqg530jx2fx52k9jr7rss4ibl49f1x3wv6sckv1"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/telescope-manix/archive/0.4.0.zip"; - sha256 = "153fqnk8iymyq309kpfiz3xmlqryj02rji3z7air23bgyjkx0gr8"; + url = "https://github.com/mrcjkb/telescope-manix/archive/0.5.0.zip"; + sha256 = "093vkh822ycnc1pri3zmzzqnz235xxam3z1l67zyyqlc1apbarax"; }; disabled = (luaOlder "5.1"); @@ -3066,7 +3107,7 @@ buildLuarocksPackage { }; }) {}; -telescope-nvim = callPackage({ plenary-nvim, buildLuarocksPackage, lua, fetchgit }: +telescope-nvim = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, plenary-nvim }: buildLuarocksPackage { pname = "telescope.nvim"; version = "scm-1"; @@ -3076,16 +3117,17 @@ buildLuarocksPackage { }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/nvim-telescope/telescope.nvim", - "rev": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2", - "date": "2023-02-26T13:26:12+01:00", - "path": "/nix/store/qyzs7im9nqn04h9w9nii4nv12ysgk1fk-telescope.nvim", - "sha256": "136pik53kwl2avjdakwfls10d85jqybl7yd0mbzxc5nry8krav22", + "rev": "74ce793a60759e3db0d265174f137fb627430355", + "date": "2023-10-11T12:29:23+02:00", + "path": "/nix/store/7k50qqgamc2ldxdf54jqs8sy8m8vcfzr-telescope.nvim", + "sha256": "1m4v097y8ypjm572k1qqii3z56w4x1dsjxd6gp0z24xqyvd4kpa4", + "hash": "sha256-RN1J2va4E/HBfaZ1qVvohJvyR4wYhylOqfJ65E8Cm9Q=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (lua.luaversion != "5.1"); propagatedBuildInputs = [ lua plenary-nvim ]; @@ -3097,26 +3139,27 @@ buildLuarocksPackage { }; }) {}; -tl = callPackage({ compat53, luafilesystem, argparse, buildLuarocksPackage, fetchgit }: +tl = callPackage({ argparse, buildLuarocksPackage, compat53, fetchgit, fetchurl, luafilesystem }: buildLuarocksPackage { pname = "tl"; - version = "0.15.1-1"; + version = "0.15.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/tl-0.15.1-1.rockspec"; - sha256 = "0f9wr91pxcvx43jp9ma4yb6f0r9yrc2fm437nx7xm0dyh7kac9p6"; + url = "mirror://luarocks/tl-0.15.2-1.rockspec"; + sha256 = "1qisdflgikry0jdqvnzdcqib2svbafp10n0gfwm3fcrzqsdxy0xr"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/teal-language/tl", - "rev": "a10fb2c69827c1b0f8e1b8a5c848a06d6da5d3be", - "date": "2023-01-23T18:14:26-03:00", - "path": "/nix/store/x5p9v443g53sz2c8rvxa465gzfiv47wb-tl", - "sha256": "0hql1274wxji54cadalv4j3k82vd9xasvi119cdnm16mh85ir70s", + "rev": "d2fc36b5ff9a52d7265e63eb74cce70fd1cdbcb2", + "date": "2023-04-27T11:28:21-03:00", + "path": "/nix/store/ramhj3a29lrn0bblbgyxn4712a7caq8k-tl", + "sha256": "1dgldi9pgg23iz3xis4i43bnvkwirh7kkycmr5xp75s2cc85zhg0", + "hash": "sha256-4MFfEGNCl3N7yZX5OQ/Mkc9t1yCR6NjHj0O8d1Ns9LU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ argparse compat53 luafilesystem ]; @@ -3128,7 +3171,7 @@ buildLuarocksPackage { }; }) {}; -toml = callPackage({ lua, fetchgit, luaOlder, buildLuarocksPackage }: +toml = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "toml"; version = "0.3.0-0"; @@ -3142,12 +3185,13 @@ buildLuarocksPackage { "date": "2023-02-19T23:00:49-05:00", "path": "/nix/store/p6a98sqp9a4jwsw6ghqcwpn9lxmhvkdg-toml.lua", "sha256": "05p33bq0ajl41vbsw9bx73shpf0p11n5gb6yy8asvp93zh2m51hq", + "hash": "sha256-GIZSBfwj3a0V8t6sV2wIF7gL9Th9Ja7XDoRKBfAa4xY=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -3160,7 +3204,7 @@ buildLuarocksPackage { }; }) {}; -toml-edit = callPackage({ luaOlder, luarocks-build-rust-mlua, buildLuarocksPackage, lua, fetchgit }: +toml-edit = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, luarocks-build-rust-mlua }: buildLuarocksPackage { pname = "toml-edit"; version = "0.1.4-1"; @@ -3174,12 +3218,13 @@ buildLuarocksPackage { "date": "2023-10-02T16:54:10+02:00", "path": "/nix/store/p1368agmqg4jwb1qvf2iff3fdrq9vkdj-toml-edit.lua", "sha256": "1aa8znjnmm84392gnl7w0hm069xfv7niym3i8my7kyk0vdgxja06", + "hash": "sha256-BijZX9tg+nl8RXFUH+3ZricDKgT8UPtEGgTVaqX9SKk=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua luarocks-build-rust-mlua ]; @@ -3192,7 +3237,7 @@ buildLuarocksPackage { }; }) {}; -vstruct = callPackage({ fetchgit, lua, buildLuarocksPackage, luaOlder }: +vstruct = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder }: buildLuarocksPackage { pname = "vstruct"; version = "2.1.1-1"; @@ -3203,12 +3248,13 @@ buildLuarocksPackage { "date": "2020-05-06T23:13:06-04:00", "path": "/nix/store/a4i9k5hx9xiz38bij4hb505dg088jkss-vstruct", "sha256": "0sl9v874mckhh6jbxsan48s5xajzx193k4qlphw69sdbf8kr3p57", + "hash": "sha256-p9yRJ3Kr6WQ4vBSTOVLoX6peNCJW6b6kgXCySg7aiWo=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -3219,26 +3265,27 @@ buildLuarocksPackage { }; }) {}; -vusted = callPackage({ buildLuarocksPackage, fetchgit, busted }: +vusted = callPackage({ buildLuarocksPackage, busted, fetchgit, fetchurl }: buildLuarocksPackage { pname = "vusted"; - version = "2.2.0-1"; + version = "2.3.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/vusted-2.2.0-1.rockspec"; - sha256 = "1ri96pdwhck1sbdnkqj9ksv9hs86pv8v2f6vl25696v9snp9jkzs"; + url = "mirror://luarocks/vusted-2.3.1-1.rockspec"; + sha256 = "03h7l12xk43rql9vxb5nzfimx9srwaazx2r3j2zm1ba2qz06h0qc"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/notomo/vusted.git", - "rev": "f142170d3b802f6cedfcff67b945a260087ecf65", - "date": "2023-01-03T11:23:56+09:00", - "path": "/nix/store/la7h2a39wnjkdg1fzhkgw3hbrhs4c5kf-vusted", - "sha256": "17pdwaqjfkv2b7a801k5fdg2s0s75miiilfdjgmsyv7phighvkvw", + "rev": "2bc6818a756e47240d9284f1dfac21b011ca84ea", + "date": "2023-10-09T11:47:28+09:00", + "path": "/nix/store/jq2yl4adpnyilp3yyw161j1a29bwahqi-vusted", + "sha256": "04lxc78n3h1qhby6b4k9x8hb1c3sgqdid71fsvyg4y6j7rb55a8z", + "hash": "sha256-H6lSVj7SePL81i6cFht+erCwIOppkmX8gjjAYdFhnRI=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ busted ]; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index ba36225a13b75..e62b32ce6b60e 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -117,12 +117,6 @@ with prev; ''; }); - cyrussasl = prev.cyrussasl.overrideAttrs (drv: { - externalDeps = [ - { name = "LIBSASL"; dep = cyrus_sasl; } - ]; - }); - fennel = prev.fennel.overrideAttrs(oa: { nativeBuildInputs = oa.nativeBuildInputs ++ [ installShellFiles @@ -322,7 +316,7 @@ with prev; externalDeps = [ { name = "EVENT"; dep = libevent; } ]; - disabled = luaOlder "5.1" || luaAtLeast "5.4"; + meta.broken = luaOlder "5.1" || luaAtLeast "5.4"; }); luaexpat = prev.luaexpat.overrideAttrs (_: { @@ -386,6 +380,11 @@ with prev; ]; }); + # lua-resty-session = prev.lua-resty-session.overrideAttrs (oa: { + # # lua_pack and lua-ffi-zlib are unpackaged, causing this package to not evaluate + # meta.broken = true; + # }); + lua-yajl = prev.lua-yajl.overrideAttrs (oa: { buildInputs = oa.buildInputs ++ [ yajl @@ -525,8 +524,21 @@ with prev; ''; }); - readline = prev.readline.overrideAttrs (oa: { - propagatedBuildInputs = oa.propagatedBuildInputs ++ [ readline.out ]; + readline = final.callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, luaOlder, lua, luaposix }: + buildLuarocksPackage ({ + pname = "readline"; + version = "3.2-0"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/readline-3.2-0.rockspec"; + sha256 = "1r0sgisxm4xd1r6i053iibxh30j7j3rcj4wwkd8rzkj8nln20z24"; + }).outPath; + src = fetchurl { + # the rockspec url doesn't work because 'www.' is not covered by the certificate so + # I manually removed the 'www' prefix here + url = "http://pjb.com.au/comp/lua/readline-3.2.tar.gz"; + sha256 = "1mk9algpsvyqwhnq7jlw4cgmfzj30l7n2r6ak4qxgdxgc39f48k4"; + }; + extraVariables = rec { READLINE_INCDIR = "${readline.dev}/include"; HISTORY_INCDIR = READLINE_INCDIR; @@ -535,9 +547,19 @@ with prev; unzip "$curSrc" tar xf *.tar.gz ''; - # Without this, source root is wrongly set to ./readline-2.6/doc - sourceRoot = "readline-${lib.versions.majorMinor oa.version}"; - }); + + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + propagatedBuildInputs = [ lua luaposix + readline.out + ]; + + meta = { + homepage = "http://pjb.com.au/comp/lua/readline.html"; + description = "Interface to the readline library"; + license.fullName = "MIT/X11"; + }; + })) {}; + sqlite = prev.sqlite.overrideAttrs (drv: { diff --git a/pkgs/development/misc/juce/default.nix b/pkgs/development/misc/juce/default.nix index 113cabc0440f6..6c409a18e7aad 100644 --- a/pkgs/development/misc/juce/default.nix +++ b/pkgs/development/misc/juce/default.nix @@ -53,9 +53,9 @@ stdenv.mkDerivation (finalAttrs: { libglvnd # libGL.so webkitgtk # webkit2gtk-4.0 ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Cocoa - darwin.apple_sdk_11_0.frameworks.MetalKit - darwin.apple_sdk_11_0.frameworks.WebKit + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.MetalKit + darwin.apple_sdk.frameworks.WebKit ]; meta = with lib; { diff --git a/pkgs/development/misc/resholve/0014-clang_incompatible_function_pointer_conversions.patch b/pkgs/development/misc/resholve/0014-clang_incompatible_function_pointer_conversions.patch new file mode 100644 index 0000000000000..52d5e6adfe74e --- /dev/null +++ b/pkgs/development/misc/resholve/0014-clang_incompatible_function_pointer_conversions.patch @@ -0,0 +1,42 @@ +diff -ur a/decoder.c b/decoder.c +--- a/decoder.c 1980-01-02 00:00:00.000000000 -0500 ++++ b/decoder.c 2023-11-08 17:42:43.981838074 -0500 +@@ -94,7 +94,7 @@ + return PlaceObject(ctx, PyBool_FromLong((long)(value))); + } + +-static int handle_number(void *ctx, const char *value, unsigned int length) ++static int handle_number(void *ctx, const char *value, size_t length) + { + //fprintf(stderr, "handle_number: "); + //fwrite(value, length, 1, stderr); +@@ -127,7 +127,7 @@ + return status; + } + +-static int handle_string(void *ctx, const unsigned char *value, unsigned int length) ++static int handle_string(void *ctx, const unsigned char *value, size_t length) + { + return PlaceObject(ctx, PyString_FromStringAndSize((char *)value, length)); + } +@@ -142,7 +142,7 @@ + return success; + } + +-static int handle_dict_key(void *ctx, const unsigned char *value, unsigned int length) ++static int handle_dict_key(void *ctx, const unsigned char *value, size_t length) + { + PyObject *object = PyString_FromStringAndSize((const char *) value, length); + +diff -ur a/yajl.c b/yajl.c +--- a/yajl.c 1980-01-02 00:00:00.000000000 -0500 ++++ b/yajl.c 2023-11-08 17:41:18.781350335 -0500 +@@ -161,7 +161,7 @@ + } + + static struct PyMethodDef yajl_methods[] = { +- {"dumps", (PyCFunctionWithKeywords)(py_dumps), METH_VARARGS | METH_KEYWORDS, ++ {"dumps", (PyCFunction)(py_dumps), METH_VARARGS | METH_KEYWORDS, + "yajl.dumps(obj [, indent=None])\n\n\ + Returns an encoded JSON string of the specified `obj`\n\ + \n\ diff --git a/pkgs/development/misc/resholve/oildev.nix b/pkgs/development/misc/resholve/oildev.nix index 3e7dbc8e0108c..2459c492ebc04 100644 --- a/pkgs/development/misc/resholve/oildev.nix +++ b/pkgs/development/misc/resholve/oildev.nix @@ -42,6 +42,10 @@ rec { hash = "sha256-H3GKN0Pq1VFD5+SWxm8CXUVO7zAyj/ngKVmDaG/aRT4="; fetchSubmodules = true; }; + patches = [ + # Fixes several incompatible function pointer conversions, which are errors in clang 16. + ./0014-clang_incompatible_function_pointer_conversions.patch + ]; # just for submodule IIRC nativeBuildInputs = [ git ]; }; diff --git a/pkgs/development/ocaml-modules/cooltt/default.nix b/pkgs/development/ocaml-modules/cooltt/default.nix index c9e25045426cc..7cf63e5c0b115 100644 --- a/pkgs/development/ocaml-modules/cooltt/default.nix +++ b/pkgs/development/ocaml-modules/cooltt/default.nix @@ -106,6 +106,6 @@ buildDunePackage { homepage = "https://github.com/RedPRL/cooltt"; description = "A cool implementation of normalization by evaluation (nbe) & elaboration for Cartesian cubical type theory"; license = licenses.asl20; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/development/ocaml-modules/cry/default.nix b/pkgs/development/ocaml-modules/cry/default.nix index 60ecb885d8069..8e475a7987ccf 100644 --- a/pkgs/development/ocaml-modules/cry/default.nix +++ b/pkgs/development/ocaml-modules/cry/default.nix @@ -2,19 +2,21 @@ buildDunePackage rec { pname = "cry"; - version = "0.6.7"; + version = "1.0.1"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-cry"; rev = "v${version}"; - sha256 = "sha256-1Omp3LBKGTPVwEBd530H0Djn3xiEjOHLqso6S8yIJSQ="; + sha256 = "sha256-wn9hLqbydzFTdYsJ1e76dmDLtwcZ7CGjbzFe5o9veYQ="; }; postPatch = '' substituteInPlace src/dune --replace bytes "" ''; + minimalOCamlVersion = "4.12"; + meta = with lib; { homepage = "https://github.com/savonet/ocaml-cry"; description = "OCaml client for the various icecast & shoutcast source protocols"; diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix index 594053491300e..e8bb6128db62f 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/base.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix @@ -1,15 +1,13 @@ { lib, fetchFromGitHub }: rec { - version = "1.1.7"; - - duneVersion = "3"; + version = "1.1.8"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-0QDy0ZUAtojYIuNliiDV2uywBnWxtKUhZ/LPqkfSOZ4="; + sha256 = "sha256-XqZATaxpW0lEdrRTXVTc0laQAx437+eoa/zOzZV1kHk="; }; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/ffmpeg/default.nix b/pkgs/development/ocaml-modules/ffmpeg/default.nix index f3364cb548a60..10e837dcd62c2 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/default.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/default.nix @@ -14,7 +14,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; propagatedBuildInputs = [ ffmpeg-avutil diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix index 73b8ed0f6aecd..b902f72bc1ec0 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix @@ -11,7 +11,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix index 1ff5a89ee307f..bce592a8a2c83 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix @@ -11,7 +11,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix index b2537bd25be3e..3d27ab803153c 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix @@ -17,7 +17,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix index 32342860d13ea..524bc600093ef 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix @@ -13,7 +13,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix index a271b984d14cb..6cd71ebd58eb5 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix @@ -9,7 +9,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix index fb6fbda58d20c..a6012a44171d8 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix @@ -10,7 +10,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix index a085795831b96..773b10ee168c7 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix @@ -10,7 +10,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; diff --git a/pkgs/development/ocaml-modules/flac/default.nix b/pkgs/development/ocaml-modules/flac/default.nix index d79416b7053ae..c30236e0e2c1e 100644 --- a/pkgs/development/ocaml-modules/flac/default.nix +++ b/pkgs/development/ocaml-modules/flac/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "flac"; - version = "0.3.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-flac"; rev = "v${version}"; - sha256 = "sha256-oMmxZtphEX/OPfyTumjkWQJidAjSRqriygaTjVJTCG0="; + sha256 = "sha256-HRRQd//e6Eh2HuyO+U00ILu5FoBT9jf/nRJzDOie70A="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/ocaml-modules/metadata/default.nix b/pkgs/development/ocaml-modules/metadata/default.nix new file mode 100644 index 0000000000000..789825175e409 --- /dev/null +++ b/pkgs/development/ocaml-modules/metadata/default.nix @@ -0,0 +1,22 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, ogg, flac }: + +buildDunePackage rec { + pname = "metadata"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-metadata"; + rev = "v${version}"; + sha256 = "sha256-sSekkyJ8D6mCCmxIyd+pBk/khaehA3BcpUQl2Gln+Ic="; + }; + + minimalOCamlVersion = "4.14"; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-metadata"; + description = "Library to read metadata from files in various formats. "; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/mldoc/default.nix b/pkgs/development/ocaml-modules/mldoc/default.nix index 7a7e83d3c6568..b55faf222cffe 100644 --- a/pkgs/development/ocaml-modules/mldoc/default.nix +++ b/pkgs/development/ocaml-modules/mldoc/default.nix @@ -29,7 +29,7 @@ let in buildDunePackage rec { pname = "mldoc"; - version = "1.5.6"; + version = "1.5.8"; minimalOCamlVersion = "4.10"; @@ -38,8 +38,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "logseq"; repo = "mldoc"; - rev = "2a700b2e4797e47505f423fd47dc07372bd7b04e"; # version not tagged - hash = "sha256-OS06fb/Nz8grztFEVwWiqsQQt2PQjqcgQFxQuAEYC54="; + rev = "v${version}"; + hash = "sha256-7uuNUFMSQEgakTKfpYixp43gnfpQSW++snBzgr0Ni0Y="; }; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/riot/default.nix b/pkgs/development/ocaml-modules/riot/default.nix new file mode 100644 index 0000000000000..e03ac2c209eda --- /dev/null +++ b/pkgs/development/ocaml-modules/riot/default.nix @@ -0,0 +1,37 @@ +{ lib +, bigstringaf +, buildDunePackage +, fetchurl +, iomux +, ptime +, uri +}: + +buildDunePackage rec { + pname = "riot"; + version = "0.0.2"; + + minimalOCamlVersion = "5.1"; + + src = fetchurl { + url = "https://github.com/leostera/riot/releases/download/${version}/riot-${version}.tbz"; + hash = "sha256-ck/tr5o0nKF4WNgjPODHg1/tlaKv1JtuYgqYfIIZ78Q="; + }; + + propagatedBuildInputs = [ + bigstringaf + iomux + ptime + uri + ]; + + doCheck = true; + + meta = { + description = "An actor-model multi-core scheduler for OCaml 5"; + homepage = "https://github.com/leostera/riot"; + changelog = "https://github.com/leostera/riot/blob/${version}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ marsam ]; + }; +} diff --git a/pkgs/development/ocaml-modules/yaml/default.nix b/pkgs/development/ocaml-modules/yaml/default.nix index 416438dafbd38..99b6fb245a264 100644 --- a/pkgs/development/ocaml-modules/yaml/default.nix +++ b/pkgs/development/ocaml-modules/yaml/default.nix @@ -6,15 +6,14 @@ buildDunePackage rec { pname = "yaml"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { url = "https://github.com/avsm/ocaml-yaml/releases/download/v${version}/yaml-${version}.tbz"; - hash = "sha256-0KngriGEpp5tcgK/43B9EEOdMacSQYYCNLGfAgRS7Mc="; + hash = "sha256-xQ0qyii5+WZ5K3HhYDNR5dJO2k39PkRT+9UDZqOggic="; }; minimalOCamlVersion = "4.13"; - duneVersion = "3"; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ bos ctypes ]; diff --git a/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix b/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix index aa8566ea60875..e0cc9fac177d7 100644 --- a/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix +++ b/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix @@ -1,14 +1,17 @@ -{ lib, fetchurl, buildDunePackage, yaml, dune-configurator, ppx_sexp_conv, sexplib }: +{ lib, fetchurl, buildDunePackage, yaml, dune-configurator, ppx_sexp_conv, sexplib +, junit_alcotest +}: buildDunePackage rec { pname = "yaml-sexp"; inherit (yaml) version src; - duneVersion = "3"; - propagatedBuildInputs = [ yaml ppx_sexp_conv sexplib ]; + doCheck = true; + checkInputs = [ junit_alcotest ]; + meta = yaml.meta // { description = "ocaml-yaml with sexp support"; }; diff --git a/pkgs/development/perl-modules/Gtk2-fix-incompatible-pointer-conversion.patch b/pkgs/development/perl-modules/Gtk2-fix-incompatible-pointer-conversion.patch new file mode 100644 index 0000000000000..1ac68ee19d01c --- /dev/null +++ b/pkgs/development/perl-modules/Gtk2-fix-incompatible-pointer-conversion.patch @@ -0,0 +1,86 @@ +diff -ur a/gdk.typemap b/gdk.typemap +--- a/gdk.typemap 2017-05-21 15:02:54.000000000 -0400 ++++ b/gdk.typemap 2023-11-03 13:17:43.717890172 -0400 +@@ -23,6 +23,7 @@ + TYPEMAP + + # can be either a pointer or an integer, this handles both cases ++uintptr_t T_UV + GdkNativeWindow T_UV + + # GdkBitmap doesn't get its own type id, but needs to be treated separately. +diff -ur a/xs/GdkDnd.xs b/xs/GdkDnd.xs +--- a/xs/GdkDnd.xs 2017-05-21 15:02:54.000000000 -0400 ++++ b/xs/GdkDnd.xs 2023-11-03 13:23:22.478329089 -0400 +@@ -142,12 +142,12 @@ + void + gdk_drag_get_protocol_for_display (class, display, xid) + GdkDisplay *display +- guint32 xid ++ uintptr_t xid + PREINIT: + GdkDragProtocol protocol; +- guint32 ret; ++ uintptr_t ret; + PPCODE: +- ret = gdk_drag_get_protocol_for_display (display, xid, &protocol); ++ ret = (uintptr_t)gdk_drag_get_protocol_for_display (display, INT2PTR(GdkNativeWindow, xid), &protocol); + XPUSHs (sv_2mortal (newSVuv (ret))); + XPUSHs (sv_2mortal (ret + ? newSVGdkDragProtocol (protocol) +@@ -184,12 +184,12 @@ + =cut + void + gdk_drag_get_protocol (class, xid) +- guint32 xid ++ uintptr_t xid + PREINIT: + GdkDragProtocol protocol; +- guint32 ret; ++ uintptr_t ret; + PPCODE: +- ret = gdk_drag_get_protocol (xid, &protocol); ++ ret = (uintptr_t)gdk_drag_get_protocol (INT2PTR(GdkNativeWindow, xid), &protocol); + XPUSHs (sv_2mortal (newSVuv (ret))); + XPUSHs (sv_2mortal (newSVGdkDragProtocol (protocol))); + +diff -ur a/xs/GdkSelection.xs b/xs/GdkSelection.xs +--- a/xs/GdkSelection.xs 2017-05-21 15:02:54.000000000 -0400 ++++ b/xs/GdkSelection.xs 2023-11-03 13:26:58.976888906 -0400 +@@ -147,7 +147,7 @@ + ## void gdk_selection_send_notify (guint32 requestor, GdkAtom selection, GdkAtom target, GdkAtom property, guint32 time_) + void + gdk_selection_send_notify (class, requestor, selection, target, property, time_) +- guint32 requestor ++ GdkNativeWindow requestor + GdkAtom selection + GdkAtom target + GdkAtom property +@@ -161,7 +161,7 @@ + void + gdk_selection_send_notify_for_display (class, display, requestor, selection, target, property, time_) + GdkDisplay *display +- guint32 requestor ++ GdkNativeWindow requestor + GdkAtom selection + GdkAtom target + GdkAtom property +diff -ur a/xs/GtkWindow.xs b/xs/GtkWindow.xs +--- a/xs/GtkWindow.xs 2017-05-21 15:02:54.000000000 -0400 ++++ b/xs/GtkWindow.xs 2023-11-03 13:32:53.673168678 -0400 +@@ -581,13 +581,13 @@ + void + gtk_window_remove_embedded_xid (window, xid) + GtkWindow * window +- guint xid ++ GdkNativeWindow xid + + ## void gtk_window_add_embedded_xid (GtkWindow *window, guint xid) + void + gtk_window_add_embedded_xid (window, xid) + GtkWindow * window +- guint xid ++ GdkNativeWindow xid + + ##void gtk_window_reshow_with_initial_size (GtkWindow *window) + void diff --git a/pkgs/development/perl-modules/IO-Tty-fix-makefile.patch b/pkgs/development/perl-modules/IO-Tty-fix-makefile.patch new file mode 100644 index 0000000000000..65c6d238bdb32 --- /dev/null +++ b/pkgs/development/perl-modules/IO-Tty-fix-makefile.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.PL b/Makefile.PL +index eaf47e0..32766d7 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -146,7 +146,7 @@ extern "C" + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char $f (); +-char (*f) (); ++char f; + + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus diff --git a/pkgs/development/perl-modules/MouseX-Getopt-gld-tests.patch b/pkgs/development/perl-modules/MouseX-Getopt-gld-tests.patch new file mode 100644 index 0000000000000..6ca6e83094621 --- /dev/null +++ b/pkgs/development/perl-modules/MouseX-Getopt-gld-tests.patch @@ -0,0 +1,143 @@ +From c1d1eed00099af8d858536b659864b7ccea41974 Mon Sep 17 00:00:00 2001 +From: Paul Howarth <paul@city-fan.org> +Date: Sat, 13 Mar 2021 17:46:57 +0000 +Subject: [PATCH 1/2] Update for Getopt-Long-Descriptive 0.106 + +GLD is now outputting text with wrapping depending on the terminal +width. This update is enough to get the tests to pass when running +within "expect", which provides a PTY. It's almost certainly not +enough for general use. +--- + t/104_override_usage.t | 8 ++++++++ + t/107_no_auto_help.t | 2 +- + t/109_help_flag.t | 2 +- + t/110_sort_usage_by_attr_order.t | 12 ++++++++++++ + 4 files changed, 22 insertions(+), 2 deletions(-) + +diff --git a/t/104_override_usage.t b/t/104_override_usage.t +index bc45029..6641540 100644 +--- a/t/104_override_usage.t ++++ b/t/104_override_usage.t +@@ -61,9 +61,17 @@ use Test::Exception; + \t--foo INT A foo + } + : ++ $Getopt::Long::Descriptive::VERSION < 0.106 ? + qq{usage: 104_override_usage.t [-?] [long options...] + \t-? --[no-]usage --[no-]help Prints this usage information. + \t--foo INT A foo ++} ++ : ++ qq{usage: 104_override_usage.t [-?] [long options...] ++\t--[no-]help (or -?) Prints ++\t this usage information. ++\t aka --usage ++\t--foo INT A foo + } + + ]; +diff --git a/t/107_no_auto_help.t b/t/107_no_auto_help.t +index 27f87f5..103df43 100644 +--- a/t/107_no_auto_help.t ++++ b/t/107_no_auto_help.t +@@ -60,7 +60,7 @@ END { + warning_like { + throws_ok { Class->new_with_options } + #usage: 107_no_auto_help.t [-?] [long options...] +- qr/^usage: [\d\w]+\Q.t [-?] [long options...]\E.\s+\Q-? --\E(\[no-\])?usage --(\[no-\])?\Qhelp\E\s+\QPrints this usage information.\E.\s+--configfile/ms, ++ qr/^usage: [\d\w]+\Q.t [-?] [long options...]\E.\s+(\Q-? --\E(\[no-\])?usage )?--(\[no-\])?\Qhelp\E(\Q (or -?)\E)?\s+\QPrints this usage information.\E.(\s+\Qaka --usage\E.)?\s+--configfile/ms, + 'usage information looks good'; + } + qr/^Specified configfile \'this_value_unimportant\' does not exist, is empty, or is not readable$/, +diff --git a/t/109_help_flag.t b/t/109_help_flag.t +index 8c658e2..58dbca6 100644 +--- a/t/109_help_flag.t ++++ b/t/109_help_flag.t +@@ -40,7 +40,7 @@ foreach my $args ( ['--help'], ['--usage'], ['--?'], ['-?'] ) + local @ARGV = @$args; + + throws_ok { MyClass->new_with_options() } +- qr/^usage: (?:[\d\w]+)\Q.t [-?] [long options...]\E.^\t\Q-? --\E(\[no-\])?usage --(\[no-\])?help\s+\QPrints this usage information.\E$/ms, ++ qr/^usage: (?:[\d\w]+)\Q.t [-?] [long options...]\E.^\s+(\Q-? --\E(\[no-\])?usage )?--(\[no-\])?help(\Q (or -?)\E)?\s+Prints ?(.\s+)?\Qthis usage information.\E.(\s+\Qaka --usage\E.)?$/ms, + 'Help request detected; usage information properly printed'; + } + +diff --git a/t/110_sort_usage_by_attr_order.t b/t/110_sort_usage_by_attr_order.t +index e7dd177..7ec0c99 100644 +--- a/t/110_sort_usage_by_attr_order.t ++++ b/t/110_sort_usage_by_attr_order.t +@@ -64,6 +64,18 @@ usage: 110_sort_usage_by_attr_order.t [-?] [long options...] + --baz STR Documentation for "baz" + USAGE + } ++if ( $Getopt::Long::Descriptive::VERSION >= 0.106 ) ++{ ++$expected = <<'USAGE'; ++usage: 110_sort_usage_by_attr_order.t [-?] [long options...] ++ --[no-]help (or -?) Prints ++ this usage information. ++ aka --usage ++ --foo STR Documentation for "foo" ++ --bar STR Documentation for "bar" ++ --baz STR Documentation for "baz" ++USAGE ++} + $expected =~ s/^[ ]{4}/\t/xmsg; + is($obj->usage->text, $expected, 'Usage text has nicely sorted options'); + + +From 45ae6aaabc5413e985860fbfcc8da3bdc929a054 Mon Sep 17 00:00:00 2001 +From: Paul Howarth <paul@city-fan.org> +Date: Mon, 15 Mar 2021 10:43:14 +0000 +Subject: [PATCH 2/2] Update for Getopt-Long-Descriptive 0.107 + +GLD's use of Term::ReadKey has been reverted, so this update should now +work reliably. Use with GLD 0.106 is not supported. +--- + t/104_override_usage.t | 6 +++--- + t/110_sort_usage_by_attr_order.t | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/t/104_override_usage.t b/t/104_override_usage.t +index 6641540..f7c6a31 100644 +--- a/t/104_override_usage.t ++++ b/t/104_override_usage.t +@@ -61,15 +61,15 @@ use Test::Exception; + \t--foo INT A foo + } + : +- $Getopt::Long::Descriptive::VERSION < 0.106 ? ++ # Note: Getopt::Long::Descriptive 0.106 not supported ++ $Getopt::Long::Descriptive::VERSION < 0.107 ? + qq{usage: 104_override_usage.t [-?] [long options...] + \t-? --[no-]usage --[no-]help Prints this usage information. + \t--foo INT A foo + } + : + qq{usage: 104_override_usage.t [-?] [long options...] +-\t--[no-]help (or -?) Prints +-\t this usage information. ++\t--[no-]help (or -?) Prints this usage information. + \t aka --usage + \t--foo INT A foo + } +diff --git a/t/110_sort_usage_by_attr_order.t b/t/110_sort_usage_by_attr_order.t +index 7ec0c99..16cdaa1 100644 +--- a/t/110_sort_usage_by_attr_order.t ++++ b/t/110_sort_usage_by_attr_order.t +@@ -64,12 +64,12 @@ usage: 110_sort_usage_by_attr_order.t [-?] [long options...] + --baz STR Documentation for "baz" + USAGE + } +-if ( $Getopt::Long::Descriptive::VERSION >= 0.106 ) ++# Note: Getopt::Long::Descriptive 0.106 not supported ++if ( $Getopt::Long::Descriptive::VERSION >= 0.107 ) + { + $expected = <<'USAGE'; + usage: 110_sort_usage_by_attr_order.t [-?] [long options...] +- --[no-]help (or -?) Prints +- this usage information. ++ --[no-]help (or -?) Prints this usage information. + aka --usage + --foo STR Documentation for "foo" + --bar STR Documentation for "bar" diff --git a/pkgs/development/perl-modules/Paranoid-blessed-path.patch b/pkgs/development/perl-modules/Paranoid-blessed-path.patch index 5e80025011000..99bd69730741a 100644 --- a/pkgs/development/perl-modules/Paranoid-blessed-path.patch +++ b/pkgs/development/perl-modules/Paranoid-blessed-path.patch @@ -1,23 +1,22 @@ -diff -ru Paranoid-2.05/lib/Paranoid.pm /tmp/Paranoid-2.05/lib/Paranoid.pm ---- Paranoid-2.05/lib/Paranoid.pm 2017-02-06 05:48:57.000000000 -0500 -+++ /tmp/Paranoid-2.05/lib/Paranoid.pm 2018-05-10 06:40:35.286313299 -0400 -@@ -61,7 +61,7 @@ +diff '--color=auto' -ur Paranoid-2.10/lib/Paranoid.pm Paranoid-2.10-patched/lib/Paranoid.pm +--- Paranoid-2.10/lib/Paranoid.pm 2022-03-08 10:01:04.000000000 +0100 ++++ Paranoid-2.10-patched/lib/Paranoid.pm 2023-10-20 16:57:54.025754755 +0200 +@@ -47,7 +47,7 @@ + %EXPORT_TAGS = ( all => [@EXPORT_OK], ); - my $path = shift; + use constant PTRUE_ZERO => '0 but true'; +-use constant DEFAULT_PATH => '/bin:/sbin:/usr/bin:/usr/sbin'; ++use constant DEFAULT_PATH => '__BLESSED_PATH__'; -- $path = '/bin:/usr/bin' unless defined $path; -+ $path = '__BLESSED_PATH__' unless defined $path; - - delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; - $ENV{PATH} = $path; -Binary files Paranoid-2.05/lib/.Paranoid.pm.swp and /tmp/Paranoid-2.05/lib/.Paranoid.pm.swp differ -diff -ru Paranoid-2.05/t/01_init_core.t /tmp/Paranoid-2.05/t/01_init_core.t ---- Paranoid-2.05/t/01_init_core.t 2016-07-12 04:49:33.000000000 -0400 -+++ /tmp/Paranoid-2.05/t/01_init_core.t 2018-05-10 06:43:41.323183381 -0400 -@@ -35,5 +35,5 @@ + ##################################################################### + # +diff '--color=auto' -ur Paranoid-2.10/t/01_init_core.t Paranoid-2.10-patched/t/01_init_core.t +--- Paranoid-2.10/t/01_init_core.t 2022-01-24 10:30:20.000000000 +0100 ++++ Paranoid-2.10-patched/t/01_init_core.t 2023-10-20 16:58:16.856288407 +0200 +@@ -35,5 +35,4 @@ ok( psecureEnv('/bin:/sbin'), 'psecureEnv 1' ); is( $ENV{PATH}, '/bin:/sbin', 'Validated PATH' ); ok( psecureEnv(), 'psecureEnv 2' ); --is( $ENV{PATH}, '/bin:/usr/bin', 'Validated PATH' ); +-is( $ENV{PATH}, '/bin:/sbin:/usr/bin:/usr/sbin', 'Validated PATH' ); +- +is( $ENV{PATH}, '__BLESSED_PATH__', 'Validated PATH' ); - diff --git a/pkgs/development/perl-modules/XML-LibXML-clang16.patch b/pkgs/development/perl-modules/XML-LibXML-clang16.patch new file mode 100644 index 0000000000000..9a19e32bc401f --- /dev/null +++ b/pkgs/development/perl-modules/XML-LibXML-clang16.patch @@ -0,0 +1,47 @@ +From 8751785951fbde48ffa16a476da3e4adb2bbcde5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 16 Jan 2023 18:50:10 -0800 +Subject: [PATCH] libxml-mm: Fix function prototypes in function pointers + +This is now detected with latest clang16+ + +Fixes +error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types] + xmlHashScan(r, PmmRegistryDumpHashScanner, NULL); + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + perl-libxml-mm.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/perl-libxml-mm.c b/perl-libxml-mm.c +index a3e78a2..ec2b5ea 100644 +--- a/perl-libxml-mm.c ++++ b/perl-libxml-mm.c +@@ -121,7 +121,7 @@ PmmFreeHashTable(xmlHashTablePtr table) + extern SV* PROXY_NODE_REGISTRY_MUTEX; + + /* Utility method used by PmmDumpRegistry */ +-void PmmRegistryDumpHashScanner(void * payload, void * data, xmlChar * name) ++void PmmRegistryDumpHashScanner(void * payload, void * data, const xmlChar * name) + { + LocalProxyNodePtr lp = (LocalProxyNodePtr) payload; + ProxyNodePtr node = (ProxyNodePtr) lp->proxy; +@@ -215,7 +215,7 @@ PmmRegisterProxyNode(ProxyNodePtr proxy) + /* PP: originally this was static inline void, but on AIX the compiler + did not chew it, so I'm removing the inline */ + static void +-PmmRegistryHashDeallocator(void *payload, xmlChar *name) ++PmmRegistryHashDeallocator(void *payload, const xmlChar *name) + { + Safefree((LocalProxyNodePtr) payload); + } +@@ -279,7 +279,7 @@ PmmRegistryREFCNT_dec(ProxyNodePtr proxy) + * internal, used by PmmCloneProxyNodes + */ + void * +-PmmRegistryHashCopier(void *payload, xmlChar *name) ++PmmRegistryHashCopier(void *payload, const xmlChar *name) + { + ProxyNodePtr proxy = ((LocalProxyNodePtr) payload)->proxy; + LocalProxyNodePtr lp; diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index 110094ad8a494..4da9f7a982128 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/perl5/site_perl" diff --git a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch index e9b501c29e265..3b6156d3a7c7d 100644 --- a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch +++ b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch @@ -1,31 +1,14 @@ -From 321401098f2c86a6f68e186cfc06e030b09484b6 Mon Sep 17 00:00:00 2001 -From: Tyson Whitehead <twhitehead@gmail.com> -Date: Fri, 29 Jun 2018 15:47:00 -0400 -Subject: [PATCH] Respect NIX_SSL_CERT_FILE and SSL_CERT_FILE (in that order) - ---- - lib/LWP/Protocol/https.pm | 8 ++++++++ - 1 file changed, 8 insertions(+) - diff --git a/lib/LWP/Protocol/https.pm b/lib/LWP/Protocol/https.pm -index f7230e2..c78b9ce 100644 +index 645e828..7098f64 100644 --- a/lib/LWP/Protocol/https.pm +++ b/lib/LWP/Protocol/https.pm -@@ -23,6 +23,14 @@ sub _extra_sock_opts - $ssl_opts{SSL_verify_mode} = 0; +@@ -29,6 +29,9 @@ sub _extra_sock_opts + } } if ($ssl_opts{SSL_verify_mode}) { -+ unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { -+ $ssl_opts{SSL_ca_file} = $ENV{'NIX_SSL_CERT_FILE'} -+ if !defined $ssl_opts{SSL_ca_file}; -+ $ssl_opts{SSL_ca_file} = $ENV{'SSL_CERT_FILE'} -+ if !defined $ssl_opts{SSL_ca_file}; -+ $ssl_opts{SSL_ca_file} = "/etc/ssl/certs/ca-certificates.crt" -+ if !defined $ssl_opts{SSL_ca_file} && -e "/etc/ssl/certs/ca-certificates.crt"; -+ } - unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { - eval { - require Mozilla::CA; --- -2.14.0 - ++ if ($ENV{NIX_SSL_CERT_FILE}) { ++ $ssl_opts{SSL_ca_file} //= $ENV{NIX_SSL_CERT_FILE}; ++ } + unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { + if ($Net::HTTPS::SSL_SOCKET_CLASS eq 'IO::Socket::SSL' + && defined &IO::Socket::SSL::default_ca diff --git a/pkgs/development/perl-modules/mhonarc.patch b/pkgs/development/perl-modules/mhonarc.patch deleted file mode 100644 index 12b8cc2931b6f..0000000000000 --- a/pkgs/development/perl-modules/mhonarc.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/lib/mhamain.pl b/lib/mhamain.pl -index 80980a2..c1259ce 100644 ---- a/lib/mhamain.pl -+++ b/lib/mhamain.pl -@@ -1562,7 +1562,7 @@ sub signal_catch { - ## - sub defineIndex2MsgId { - no warnings qw(deprecated); -- if (!defined(%Index2MsgId)) { -+ unless (%Index2MsgId) { - foreach (keys %MsgId) { - $Index2MsgId{$MsgId{$_}} = $_; - } -diff --git a/lib/mhopt.pl b/lib/mhopt.pl -index 02fb05e..939109b 100644 ---- a/lib/mhopt.pl -+++ b/lib/mhopt.pl -@@ -865,7 +865,7 @@ sub update_data_1_to_2 { - sub update_data_2_1_to_later { - no warnings qw(deprecated); - # we can preserve filter arguments -- if (defined(%main::MIMEFiltersArgs)) { -+ if (%main::MIMEFiltersArgs) { - warn qq/ preserving MIMEARGS...\n/; - %readmail::MIMEFiltersArgs = %main::MIMEFiltersArgs; - $IsDefault{'MIMEARGS'} = 0; diff --git a/pkgs/development/pharo/default.nix b/pkgs/development/pharo/default.nix index 2cf98d4936987..3c17b2bd79333 100644 --- a/pkgs/development/pharo/default.nix +++ b/pkgs/development/pharo/default.nix @@ -23,8 +23,8 @@ let pharo-sources = fetchurl { # It is necessary to download from there instead of from the repository because that archive # also contains artifacts necessary for the bootstrapping. - url = "https://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/source/PharoVM-10.0.5-2757766-Linux-x86_64-c-src.zip"; - hash = "sha256-i6WwhdVdyzmqGlx1Fn12mCq5+HnRORT65HEiJo0joCE="; + url = "https://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/source/PharoVM-10.0.8-b323c5f-Linux-x86_64-c-src.zip"; + hash = "sha256-5IHymk6yl3pMLG3FeM4nqos0yLYMa3B2+hYW08Yo1V0="; }; library_path = makeLibraryPath [ libgit2 @@ -35,7 +35,7 @@ let in stdenv.mkDerivation { pname = "pharo"; - version = "10.0.5"; + version = "10.0.8"; src = pharo-sources; buildInputs = [ @@ -64,6 +64,8 @@ stdenv.mkDerivation { cmakeFlags = [ # Necessary to perform the bootstrapping without already having Pharo available. "-DGENERATED_SOURCE_DIR=." + "-DALWAYS_INTERACTIVE=ON" + "-DBUILD_IS_RELEASE=ON" "-DGENERATE_SOURCES=OFF" # Prevents CMake from trying to download stuff. "-DBUILD_BUNDLE=OFF" diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix index a9b92d997559f..7e9d3164ccfe0 100644 --- a/pkgs/development/php-packages/datadog_trace/default.nix +++ b/pkgs/development/php-packages/datadog_trace/default.nix @@ -47,9 +47,8 @@ buildPecl rec { curl pcre2 ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.CoreFoundation - darwin.apple_sdk_11_0.frameworks.Security - darwin.apple_sdk_11_0.Libsystem + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Security libiconv ]; diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix index d38f67d8c4d78..174fd9c22376f 100644 --- a/pkgs/development/python-modules/acoustics/default.nix +++ b/pkgs/development/python-modules/acoustics/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , flit-core , matplotlib , numpy @@ -13,15 +13,17 @@ buildPythonPackage rec { pname = "acoustics"; - version = "0.2.6"; + version = "0.2.6-unstable-2023-08-20"; + pyproject = true; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-0CvMhCUc+i7dPiHH+IXdlj+OjFh/l1wvnU4dmxQrzFI="; + src = fetchFromGitHub { + owner = "python-acoustics"; + repo = "python-acoustics"; + rev = "99d79206159b822ea2f4e9d27c8b2fbfeb704d38"; + hash = "sha256-/4bVjlhj8ihpAFHEWPaZ/xBILi3rb8f0NmwAexJCg+o="; }; - format = "pyproject"; nativeBuildInputs = [ flit-core ]; @@ -47,11 +49,6 @@ buildPythonPackage rec { "-Wignore::DeprecationWarning" ]; - disabledTestPaths = [ - # ValueError: Unknown window type: "hanning" - "tests/standards/test_iso_1996_2_2007.py" - ]; - pythonImportsCheck = [ "acoustics" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index 4426f930b0d80..87e1ef293071f 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "acquire"; - version = "3.9"; + version = "3.10"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "acquire"; rev = "refs/tags/${version}"; - hash = "sha256-ppkfnPJEvCImTA0+NjYD8r6SHcx9eBN9GBvo0IZYcjY="; + hash = "sha256-8fvVK/mH+pgPaaxNKvKOw1qU0ElWAmNVP6YAqvBTwio="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/aggdraw/default.nix b/pkgs/development/python-modules/aggdraw/default.nix index 9d1e0ee96bab8..ef44979c4394c 100644 --- a/pkgs/development/python-modules/aggdraw/default.nix +++ b/pkgs/development/python-modules/aggdraw/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , buildPythonPackage , packaging , setuptools @@ -23,6 +24,14 @@ buildPythonPackage rec { hash = "sha256-2yajhuRyQ7BqghbSgPClW3inpw4TW2DhgQbomcRFx94="; }; + patches = [ + # Removes `register` storage class specifier, which is not allowed in C++17. + (fetchpatch { + url = "https://github.com/pytroll/aggdraw/commit/157ed49803567e8c3eeb7dfeff4c116db35747f7.patch"; + hash = "sha256-QSzpO90u5oSBWUzehRFbXgZ1ApEfLlfp11MUx6w11aI="; + }) + ]; + nativeBuildInputs = [ packaging setuptools diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 9de5593a25626..5f226d26018e5 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -5,6 +5,8 @@ , buildPythonPackage , dill , fetchFromGitHub +, flask +, flask-cors , moto , pytest-asyncio , pytestCheckHook @@ -41,6 +43,8 @@ buildPythonPackage rec { nativeCheckInputs = [ dill + flask + flask-cors moto pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index f01b17639e8b2..ebbcf6ea82a41 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -31,25 +31,23 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.8.5"; + version = "3.8.6"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-uVUuxSzBR9vxlErHrJivdgLlHqLc0HbtGUyjwNHH0Lw="; + hash = "sha256-sM8qRQG/+TMKilJItM6VGFHkFb3M6dwVjnbP1V4VCFw="; }; patches = [ (fetchpatch { # https://github.com/aio-libs/aiohttp/pull/7260 - # Merged upstream, should likely be dropped post-3.8.5 + # Merged upstream, should be dropped once updated to 3.9.0 url = "https://github.com/aio-libs/aiohttp/commit/7dcc235cafe0c4521bbbf92f76aecc82fee33e8b.patch"; hash = "sha256-ZzhlE50bmA+e2XX2RH1FuWQHZIAa6Dk/hZjxPoX5t4g="; }) - # https://github.com/aio-libs/aiohttp/pull/7454 but does not merge cleanly - ./setuptools-67.5.0-compatibility.diff ]; postPatch = '' diff --git a/pkgs/development/python-modules/aiohttp/setuptools-67.5.0-compatibility.diff b/pkgs/development/python-modules/aiohttp/setuptools-67.5.0-compatibility.diff deleted file mode 100644 index 2f75b6b4c1363..0000000000000 --- a/pkgs/development/python-modules/aiohttp/setuptools-67.5.0-compatibility.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/setup.cfg b/setup.cfg -index 6944b7e2..dfa65d69 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -128,6 +128,7 @@ filterwarnings = - ignore:Creating a LegacyVersion has been deprecated and will be removed in the next major release:DeprecationWarning:: - ignore:module 'sre_constants' is deprecated:DeprecationWarning:pkg_resources._vendor.pyparsing - ignore:path is deprecated. Use files.. instead. Refer to https.//importlib-resources.readthedocs.io/en/latest/using.html#migrating-from-legacy for migration advice.:DeprecationWarning:certifi.core -+ ignore:pkg_resources is deprecated as an API:DeprecationWarning - junit_suite_name = aiohttp_test_suite - norecursedirs = dist docs build .tox .eggs - minversion = 3.8.2 -diff --git a/tests/test_circular_imports.py b/tests/test_circular_imports.py -index 22e5ea47..a655fd1d 100644 ---- a/tests/test_circular_imports.py -+++ b/tests/test_circular_imports.py -@@ -113,6 +113,10 @@ def test_no_warnings(import_path: str) -> None: - "-W", - "ignore:Creating a LegacyVersion has been deprecated and will " - "be removed in the next major release:DeprecationWarning:", -+ # Deprecation warning emitted by setuptools v67.5.0+ triggered by importing -+ # `gunicorn.util`. -+ "-W", "ignore:pkg_resources is deprecated as an API:" -+ "DeprecationWarning", - "-c", f"import {import_path!s}", - # fmt: on - ) diff --git a/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix index c17bae7c80f13..a4904cdb5e922 100644 --- a/pkgs/development/python-modules/asyncua/default.nix +++ b/pkgs/development/python-modules/asyncua/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "asyncua"; - version = "1.0.4"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "FreeOpcUa"; repo = "opcua-asyncio"; rev = "refs/tags/v${version}"; - hash = "sha256-gAyvo+VJPdS/UpXN/h8LqbIRyx84fifSUsW2GUzLgfo="; + hash = "sha256-eDrnDDiijkr5377BVWVAc5QEQCCDBoFynuT4MncCx9g="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 5a7b1af3e8f17..32a8baa44864a 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -2,7 +2,6 @@ , boto3 , buildPythonPackage , fetchFromGitHub -, fetchpatch , jsonschema , parameterized , pydantic @@ -17,7 +16,7 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.74.0"; + version = "1.78.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,16 +25,9 @@ buildPythonPackage rec { owner = "aws"; repo = "serverless-application-model"; rev = "refs/tags/v${version}"; - hash = "sha256-uOfBR0bvLVyBcfSAkSqOx4KjmSYbfktpJlxKjipfj50="; + hash = "sha256-hSXJBEntj3k3Kml+Yuvn19X7YXL+Y1hXBkb8iZ7DxR4="; }; - patches = [ - (fetchpatch { - url = "https://github.com/aws/serverless-application-model/commit/e41b0f02204635a655100b68dd38220af32a2728.patch"; - hash = "sha256-V6KXdXQUr9fvLzxI6sUMrSRnGX5SrAaDygcaQ87FaQ8="; - }) - ]; - postPatch = '' substituteInPlace pytest.ini \ --replace " --cov samtranslator --cov-report term-missing --cov-fail-under 95" "" @@ -87,7 +79,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to transform SAM templates into AWS CloudFormation templates"; - homepage = "https://github.com/awslabs/serverless-application-model"; + homepage = "https://github.com/aws/serverless-application-model"; changelog = "https://github.com/aws/serverless-application-model/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/azure-monitor-ingestion/default.nix b/pkgs/development/python-modules/azure-monitor-ingestion/default.nix index dccdda1d27a90..7058a1bddbea2 100644 --- a/pkgs/development/python-modules/azure-monitor-ingestion/default.nix +++ b/pkgs/development/python-modules/azure-monitor-ingestion/default.nix @@ -10,16 +10,14 @@ buildPythonPackage rec { pname = "azure-monitor-ingestion"; - version = "1.0.2"; + version = "1.0.3"; + pyproject = true; disabled = pythonOlder "3.7"; - pyproject = true; - src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-xNpYsD1bMIM0Bxy8KtR4rYy4tzfddtoPnEzHfO44At8="; + hash = "sha256-idAEqP+HaZs/0fzyBaqO8enTTySg88w3TSIUceiYdDs="; }; nativeBuildInputs = [ @@ -40,11 +38,11 @@ buildPythonPackage rec { # requires checkout from mono-repo and a mock account doCheck = false; - meta = { + meta = with lib; { changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-monitor-ingestion_${version}/sdk/monitor/azure-monitor-ingestion/CHANGELOG.md"; description = "Send custom logs to Azure Monitor using the Logs Ingestion API"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/monitor/azure-monitor-ingestion"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dotlambda ]; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index aba7d2a29df4d..562340f93e4d6 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.11.3"; + version = "7.11.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lNZfL9yV56kSxT/qz4iH+w6QWGEmwBU+Ivrg+2UNH8o="; + hash = "sha256-970pd5G2pXfONqOeoKuxCqD4dba7DTFSLtntK7AojUw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 55f709c0e3dfc..e69b31b118f64 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.8.2"; + version = "2.8.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+QsvRLWyM2TV+63iw0ZS4Vsfz+gTxG+CjgCPaKcJFg8="; + hash = "sha256-4VWHsr3xjTLrO6JfX1pRvt0NwGsxEqTFPated1O8ZYg="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/bitstruct/default.nix b/pkgs/development/python-modules/bitstruct/default.nix index d83eb87baff1a..e16a6d7a38cde 100644 --- a/pkgs/development/python-modules/bitstruct/default.nix +++ b/pkgs/development/python-modules/bitstruct/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "bitstruct"; - version = "8.17.0"; + version = "8.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-65S0DkIYojqo+QQGuDap5u2D5IuNESzj+WQIRjvRuHQ="; + hash = "sha256-11up3e2FwX6IWiCaAOuOJI7kB2IUny8qeTYMqFdGfaw="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/bork/default.nix b/pkgs/development/python-modules/bork/default.nix index 5cd247cf28724..2b3b27108d1b6 100644 --- a/pkgs/development/python-modules/bork/default.nix +++ b/pkgs/development/python-modules/bork/default.nix @@ -1,11 +1,13 @@ { lib , buildPythonPackage , fetchFromGitHub +, pytestCheckHook , pythonOlder , build , coloredlogs , packaging +, pip , toml , twine , wheel @@ -13,21 +15,22 @@ buildPythonPackage rec { pname = "bork"; - version = "7.0.0"; + version = "7.0.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "duckinator"; repo = pname; - rev = "v${version}"; - hash = "sha256-frwkU2YesYK0RJNz9yqiXj1XeTZ8jg5oClri4hEYokg="; + rev = "refs/tags/v${version}"; + hash = "sha256-y/p2uuU+QKgJSdJmMt3oebm/zcuatYWTW8Jl79YxA3g="; }; propagatedBuildInputs = [ build coloredlogs packaging + pip toml twine wheel @@ -39,6 +42,13 @@ buildPythonPackage rec { "bork.cli" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + pytestFlagsArray = [ + "-m 'not network'" + ]; + meta = with lib; { description = "Python build and release management tool"; homepage = "https://github.com/duckinator/bork"; diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index e6ac07612c407..779871db10edb 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.28.9"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.28.57"; # N.B: if you change this, change botocore and awscli to a matching version format = "pyproject"; src = fetchFromGitHub { owner = "boto"; repo = pname; rev = version; - hash = "sha256-NkNHA20yn1Q7uoq/EL1Wn8F1fpi1waQujutGIKsnxlI="; + hash = "sha256-+kuILCUK10tvpfTEAHZGvKKmpw6Pgn+v2kQkwCkPMKg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 3dac327a48bef..ddb9d35d05fd8 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.31.48"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.31.57"; # N.B: if you change this, change boto3 and awscli to a matching version format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-btFvZqpu1gcP7SbWl2TLFMd1nkzAscGRKDzEiwXWXek="; + hash = "sha256-MBQ2F0Y1vsc5siW4QPw2XKAOXBpj5bKhnuZ50gTgG3g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 81068d4c07962..121777da32d8d 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , docutils , fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder , sphinx @@ -21,6 +22,15 @@ buildPythonPackage rec { hash = "sha256-LJXvtScyWRL8zfj877bJ4xuIbLV9IN3Sn9KPUTLMjMI="; }; + patches = [ + (fetchpatch { + # sphinx 7.2 support https://github.com/breathe-doc/breathe/pull/956 + name = "breathe-sphinx7.2-support.patch"; + url = "https://github.com/breathe-doc/breathe/commit/46abd77157a2a57e81586e4f8765ae8f1a09d167.patch"; + hash = "sha256-zGFO/Ndk/9Yv2dbo8fpEoB/vchZP5vRceoC1E3sUny8="; + }) + ]; + propagatedBuildInputs = [ docutils sphinx diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix index 3cb260dd8d1bb..f5ad88fb5b189 100644 --- a/pkgs/development/python-modules/cantools/default.nix +++ b/pkgs/development/python-modules/cantools/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools-scm +, setuptools , argparse-addons , bitstruct , can @@ -16,18 +16,18 @@ buildPythonPackage rec { pname = "cantools"; - version = "38.0.2"; - format = "setuptools"; + version = "39.3.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-k7/m9L1lLzaXY+qRYrAnpi9CSoQA8kI9QRN5GM5oxo4="; + hash = "sha256-LD0IGSJZG8FhHJ8f9S1sivHQMxT4xyTMEU2FbMVVzCg="; }; nativeBuildInputs = [ - setuptools-scm + setuptools ]; propagatedBuildInputs = [ @@ -50,8 +50,9 @@ buildPythonPackage rec { ]; meta = with lib; { + description = "Tools to work with CAN bus"; homepage = "https://github.com/cantools/cantools"; - description = "CAN bus tools."; + changelog = "https://github.com/cantools/cantools/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ gray-heron ]; }; diff --git a/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff b/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff index c48c8090dd461..fdbec4f6fe4ad 100644 --- a/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff +++ b/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff @@ -1,7 +1,8 @@ -diff -r bac92fcfe4d7 c/_cffi_backend.c ---- a/c/_cffi_backend.c Mon Jul 18 15:58:34 2022 +0200 -+++ b/c/_cffi_backend.c Sat Aug 20 12:38:31 2022 -0700 -@@ -96,7 +96,7 @@ +diff --git a/src/c/_cffi_backend.c b/src/c/_cffi_backend.c +index 537271f..9c3bf94 100644 +--- a/src/c/_cffi_backend.c ++++ b/src/c/_cffi_backend.c +@@ -103,7 +103,7 @@ # define CFFI_CHECK_FFI_PREP_CIF_VAR 0 # define CFFI_CHECK_FFI_PREP_CIF_VAR_MAYBE 0 @@ -10,7 +11,7 @@ diff -r bac92fcfe4d7 c/_cffi_backend.c # define CFFI_CHECK_FFI_CLOSURE_ALLOC __builtin_available(macos 10.15, ios 13, watchos 6, tvos 13, *) # define CFFI_CHECK_FFI_CLOSURE_ALLOC_MAYBE 1 -@@ -6413,7 +6413,7 @@ +@@ -6422,7 +6422,7 @@ static PyObject *b_callback(PyObject *self, PyObject *args) else #endif { diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 0d93941b974d5..7b2547afff1d1 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , isPyPy , fetchPypi -, fetchpatch +, setuptools , pytestCheckHook , libffi , pkg-config @@ -13,11 +13,12 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.15.1"; + version = "1.16.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-1AC/uaN7E1ElPLQCZxzqfom97MKU6AFqcH9tHYrJNPk="; + hash = "sha256-vLPvQ+WGZbvaL7GYaY/K5ndkg+DEpjGqVkeAbCXgLMA="; }; patches = [ @@ -32,38 +33,12 @@ if isPyPy then null else buildPythonPackage rec { # deemed safe to trust in cffi. # ./darwin-use-libffi-closures.diff - (fetchpatch { - # Drop py.code usage from tests, no longer depend on the deprecated py package - url = "https://foss.heptapod.net/pypy/cffi/-/commit/9c7d865e17ec16a847090a3e0d1498b698b99756.patch"; - excludes = [ - "README.md" - "requirements.txt" - ]; - hash = "sha256-HSuLLIYXXGGCPccMNLV7o1G3ppn2P0FGCrPjqDv2e7k="; - }) - (fetchpatch { - # Replace py.test usage with pytest - url = "https://foss.heptapod.net/pypy/cffi/-/commit/bd02e1b122612baa74a126e428bacebc7889e897.patch"; - excludes = [ - "README.md" - "requirements.txt" - ]; - hash = "sha256-+2daRTvxtyrCPimOEAmVbiVm1Bso9hxGbaAbd03E+ws="; - }) ] ++ lib.optionals (stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc) "13") [ # -Wnull-pointer-subtraction is enabled with -Wextra. Suppress it to allow the following tests # to run and pass when cffi is built with newer versions of clang: # - testing/cffi1/test_verify1.py::test_enum_usage # - testing/cffi1/test_verify1.py::test_named_pointer_as_argument ./clang-pointer-substraction-warning.diff - ] ++ lib.optionals (pythonAtLeast "3.11") [ - # Fix test that failed because python seems to have changed the exception format in the - # final release. This patch should be included in the next version and can be removed when - # it is released. - (fetchpatch { - url = "https://foss.heptapod.net/pypy/cffi/-/commit/8a3c2c816d789639b49d3ae867213393ed7abdff.diff"; - hash = "sha256-3wpZeBqN4D8IP+47QDGK7qh/9Z0Ag4lAe+H0R5xCb1E="; - }) ]; postPatch = lib.optionalString stdenv.isDarwin '' @@ -74,11 +49,18 @@ if isPyPy then null else buildPythonPackage rec { --replace '/usr/include/libffi' '${lib.getDev libffi}/include' ''; - buildInputs = [ libffi ]; + nativeBuildInputs = [ + pkg-config + setuptools + ]; - nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + libffi + ]; - propagatedBuildInputs = [ pycparser ]; + propagatedBuildInputs = [ + pycparser + ]; # The tests use -Werror but with python3.6 clang detects some unreachable code. env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang @@ -86,18 +68,16 @@ if isPyPy then null else buildPythonPackage rec { doCheck = !stdenv.hostPlatform.isMusl; - nativeCheckInputs = [ pytestCheckHook ]; - - disabledTests = lib.optionals stdenv.isDarwin [ - # AssertionError: cannot seem to get an int[10] not completely cleared - # https://foss.heptapod.net/pypy/cffi/-/issues/556 - "test_ffi_new_allocator_1" + nativeCheckInputs = [ + pytestCheckHook ]; meta = with lib; { - maintainers = with maintainers; [ domenkozar lnl7 ]; + changelog = "https://github.com/python-cffi/cffi/releases/tag/v${version}"; + description = "Foreign Function Interface for Python calling C code"; + downloadPage = "https://github.com/python-cffi/cffi"; homepage = "https://cffi.readthedocs.org/"; license = licenses.mit; - description = "Foreign Function Interface for Python calling C code"; + maintainers = teams.python.members; }; } diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index 91484fe6a7f75..f2d2cc7ca9766 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2023.10.30.13"; + version = "2023.11.13.14"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-Kb6iVLV///X0UKby/7/wfbSGUFLw6HQX3SUwPX79QD0="; + hash = "sha256-+hX1msvm4hRl3luhMWgXcmpV2DmGI1oCknSP4QEWtxM="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/colorzero/default.nix b/pkgs/development/python-modules/colorzero/default.nix index 01936cefd2c3f..e2383dddf4de9 100644 --- a/pkgs/development/python-modules/colorzero/default.nix +++ b/pkgs/development/python-modules/colorzero/default.nix @@ -2,8 +2,6 @@ , buildPythonPackage , fetchFromGitHub , pkginfo -, sphinxHook -, sphinx-rtd-theme , pytestCheckHook }: @@ -25,15 +23,8 @@ buildPythonPackage rec { --replace "--cov" "" ''; - outputs = [ - "out" - "doc" - ]; - nativeBuildInputs = [ pkginfo - sphinx-rtd-theme - sphinxHook ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/dasbus/default.nix b/pkgs/development/python-modules/dasbus/default.nix index a7e0b754273f3..dceb2e74ca86b 100644 --- a/pkgs/development/python-modules/dasbus/default.nix +++ b/pkgs/development/python-modules/dasbus/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { homepage = "https://github.com/rhinstaller/dasbus"; description = "DBus library in Python3"; license = licenses.lgpl21Only; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index fcf2e03ad5962..63a13d779913a 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -133,6 +133,10 @@ buildPythonPackage rec { "test_auto_blocksize_csv" # AttributeError: 'str' object has no attribute 'decode' "test_read_dir_nometa" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # concurrent.futures.process.BrokenProcessPool: A process in the process pool terminated abpruptly... + "test_foldby_tree_reduction" + "test_to_bag" ] ++ [ # https://github.com/dask/dask/issues/10347#issuecomment-1589683941 "test_concat_categorical" diff --git a/pkgs/development/python-modules/deal/default.nix b/pkgs/development/python-modules/deal/default.nix index 0333bb37ce3ba..13704b20939a8 100644 --- a/pkgs/development/python-modules/deal/default.nix +++ b/pkgs/development/python-modules/deal/default.nix @@ -77,13 +77,17 @@ buildPythonPackage rec { "test_scheme_contract_is_satisfied_when_setting_arg" "test_scheme_contract_is_satisfied_within_chain" "test_scheme_errors_rewrite_message" - # broken since pytest > 7.1.3 - "test_exception_hook" + # assert errors + "test_doctest" + "test_no_violations" ]; disabledTestPaths = [ # needs internet access "tests/test_runtime/test_offline.py" + # depends on typeguard <4.0.0 for tests, but >=4.0.0 seems fine for runtime + # https://github.com/life4/deal/blob/9be70fa1c5a0635880619b2cea83a9f6631eb236/pyproject.toml#L40 + "tests/test_testing.py" ]; pythonImportsCheck = [ "deal" ]; diff --git a/pkgs/development/python-modules/dissect-fat/default.nix b/pkgs/development/python-modules/dissect-fat/default.nix index 9fa9457b28484..0a22c7b8b7baf 100644 --- a/pkgs/development/python-modules/dissect-fat/default.nix +++ b/pkgs/development/python-modules/dissect-fat/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-fat"; - version = "3.6"; + version = "3.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.fat"; rev = "refs/tags/${version}"; - hash = "sha256-3Zyjo7yoSLtAnC5lOLzjWsqMRoJxsrw2LKjQ2Qy38sg="; + hash = "sha256-YfWshytfj4p2MqLpzE3b1/RtrL1/+Xd/5+RNbrH/Jfc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix index 55ce876fe2164..e7f17cb0286c2 100644 --- a/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dissect-hypervisor"; - version = "3.9"; + version = "3.10"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.hypervisor"; rev = "refs/tags/${version}"; - hash = "sha256-AcDlyLKrRyt1mhh7nb9Oln/cjVKw8s1g78J8sgE2p2g="; + hash = "sha256-Ml5U7yc4iqqilL6Y9qF3VU+pa0AXnYVQjVas90TpG30="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-regf/default.nix b/pkgs/development/python-modules/dissect-regf/default.nix index 9671bb33c8ab3..94881ca3ca42a 100644 --- a/pkgs/development/python-modules/dissect-regf/default.nix +++ b/pkgs/development/python-modules/dissect-regf/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-regf"; - version = "3.7"; + version = "3.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.regf"; rev = "refs/tags/${version}"; - hash = "sha256-WUrND1RnXTeN3WosR+m+yVJLe/imBTx7nmUZrSIc1E0="; + hash = "sha256-4tKu7oPkpNcWr2XJvZg94yZZcbTeeXBphPCLoZYzg6U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-sql/default.nix b/pkgs/development/python-modules/dissect-sql/default.nix index c7192854fcf8d..173170396f726 100644 --- a/pkgs/development/python-modules/dissect-sql/default.nix +++ b/pkgs/development/python-modules/dissect-sql/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-sql"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.sql"; rev = "refs/tags/${version}"; - hash = "sha256-CMUXMSkrutziAIYjUFbLEpsYpCZUiPmV16puXneGeHE="; + hash = "sha256-BHwm88IPtfg/bi5veFGnciQeH4s0asVnxiMVsIi8vV8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index ca91e77a6672c..cf31574e6fdbd 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { setuptools ]; - postFixup = lib.optionalString (!stdenv.targetPlatform.isWindows) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isWindows) '' find $out -name '*.exe' -delete ''; diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index 7796c31ebd0e1..077ea73bd8b9e 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "django"; - version = "3.2.22"; + version = "3.2.23"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Django"; inherit version; - hash = "sha256-g7bWawbkhIB9d4Jj/cf5GG1NwYYvz6ZQeDBEasawYLo="; + hash = "sha256-gpaPNkDinvSnc68sKESPX3oI0AHGrAWzLQKu7mUJUIs="; }; patches = [ diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 582a2fab79c25..69c438739f23f 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "Django"; - version = "4.2.6"; + version = "4.2.7"; format = "pyproject"; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-CPQfRotjM1rqDZBMVyngJQMA9qGQe/KTplSZSWzbxo8="; + hash = "sha256-jg8cLCeGtcDjn+GvziTJJgQPrUfI6orTCq8RiN8p/EE="; }; patches = [ diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 3d09f182bf7d6..8f1da6914af76 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "2.21.0"; + version = "2.21.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-q9wVPT8mUZyX0I4GdC6qtsCTFH80HsUrrtR2oAby8VE="; + hash = "sha256-2RLf2HBkb/vwbr9JecQQfO68ifVgcBIwmRQkXGJh0Fs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index ccaf67aadd276..2c8ea267210f0 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -55,14 +55,14 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.28.0"; + version = "3.30.0"; format = "pyproject"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-oCNszhLGNXNGiQtp91wT4GfuNzDhbZrVR55K41Ykhdg="; + hash = "sha256-ZAOuXK1snsDZETnpyyDZT65ZWu47Qxtv7l8Blqg2Qtw="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 406ccadea8940..628afaaac4ddc 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvclive"; - version = "3.2.0"; + version = "3.3.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Z1Nxdz4/45uSypufuwDGiCeUwl+izRGIDA2s9F+jT1Q="; + hash = "sha256-esvDCAsGoaB4t4hiTmoQa69Sgg5crqJyiom/iXxpZow="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/euclid3/default.nix b/pkgs/development/python-modules/euclid3/default.nix new file mode 100644 index 0000000000000..3d723eca56584 --- /dev/null +++ b/pkgs/development/python-modules/euclid3/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: +buildPythonPackage rec { + pname = "euclid3"; + version = "0.01"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-JbgnpXrb/Zo/qGJeQ6vD6Qf2HeYiND5+U4SC75tG/Qs="; + }; + + pythonImportsCheck = [ + "euclid3" + ]; + + meta = with lib; { + description = "2D and 3D vector, matrix, quaternion and geometry module."; + homepage = "http://code.google.com/p/pyeuclid/"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ jfly matusf ]; + }; +} diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 553f313bd0b64..428cf9f8d91d1 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -80,7 +80,8 @@ buildPythonPackage rec { python-jose trio sqlalchemy - ] ++ passthru.optional-dependencies.all; + ] ++ passthru.optional-dependencies.all + ++ python-jose.optional-dependencies.cryptography; pytestFlagsArray = [ # ignoring deprecation warnings to avoid test failure from diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix index 4ea6857cbd33e..abc90cdbb0e39 100644 --- a/pkgs/development/python-modules/flask-cors/default.nix +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -1,27 +1,42 @@ -{ lib, fetchPypi, buildPythonPackage -, nose, flask, six, packaging }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, flask +, packaging +, pytestCheckHook +, setuptools +}: buildPythonPackage rec { - pname = "Flask-Cors"; - version = "3.0.10"; + pname = "flask-cors"; + version = "4.0.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de"; + src = fetchFromGitHub { + owner = "corydolphin"; + repo = "flask-cors"; + rev = "refs/tags/${version}"; + hash = "sha256-o//ulROKKBv/CBJIGPBFP/+T0TpMHUVjr23Y5g1V05g="; }; - nativeCheckInputs = [ nose packaging ]; - propagatedBuildInputs = [ flask six ]; + nativeBuildInputs = [ + setuptools + ]; - # Exclude test_acl_uncaught_exception_500 test case because is not compatible - # with Flask>=1.1.0. See: https://github.com/corydolphin/flask-cors/issues/253 - checkPhase = '' - nosetests --exclude test_acl_uncaught_exception_500 - ''; + propagatedBuildInputs = [ + flask + ]; + + nativeCheckInputs = [ + pytestCheckHook + packaging + ]; meta = with lib; { description = "A Flask extension adding a decorator for CORS support"; homepage = "https://github.com/corydolphin/flask-cors"; + changelog = "https://github.com/corydolphin/flask-cors/releases/tag/v${version}"; license = with licenses; [ mit ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index 1562600a231f4..2c8de577dc279 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "flow-record"; - version = "3.12"; + version = "3.13"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "flow.record"; rev = "refs/tags/${version}"; - hash = "sha256-b9MCgs3Imo0DHtPyvQuRgYvsLWe8N2Y9TIWdU1E04L8="; + hash = "sha256-Yg42nA0dRjHormpmpbOuZYuvBpNz9XEpf84XI2iJpYY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index e176a614e8d65..e075700ce1f52 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "geopandas"; - version = "0.14.0"; + version = "0.14.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "geopandas"; repo = "geopandas"; rev = "refs/tags/v${version}"; - hash = "sha256-lhQXYSY2JrY3+GgMnfTJugnOD/g3VjG0tgw+cEgpIP8="; + hash = "sha256-mQ13fjhtFXvUnBok5bDz+zkbgfXEUmwiv77rBpYS5oo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix index b0f54b53dc620..fc8d2edac2be4 100644 --- a/pkgs/development/python-modules/glances-api/default.nix +++ b/pkgs/development/python-modules/glances-api/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "glances-api"; - version = "0.4.3"; - format = "pyproject"; + version = "0.5.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "home-assistant-ecosystem"; repo = "python-glances-api"; rev = "refs/tags/${version}"; - hash = "sha256-VfiAJuSmzFVgDTThtsTy7/caRmJKZuD5YwHjMspeB0A="; + hash = "sha256-DUTZLLWO4xUeUlxHGGVr/MD5uKqRxUf+p0crYsELgzw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 47289fff59667..f497821e07d63 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -56,6 +56,5 @@ buildPythonPackage rec { homepage = "https://github.com/globus/globus-sdk-python"; changelog = "https://github.com/globus/globus-sdk-python/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix index 59fbcd9002ce9..f778b745cb4c1 100644 --- a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix +++ b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "google-cloud-artifact-registry"; - version = "1.8.3"; + version = "1.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kgbSwGR5ObkMbup4p4ePXnxl7uRn0nYeGCOU1LMPZSE="; + hash = "sha256-NITSosBPrfpIC+FqVU0B5H5MT0taEjzTcl6GW03X8yU="; }; propagatedBuildInputs = [ @@ -24,7 +24,9 @@ buildPythonPackage rec { grpc-google-iam-v1 ] ++ google-api-core.optional-dependencies.grpc; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "google.cloud.artifactregistry" @@ -34,7 +36,8 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Artifact Registry API client library"; - homepage = "https://github.com/googleapis/google-cloud-python"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-artifact-registry"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-artifact-registry-v${version}/packages/google-cloud-artifact-registry/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ samuela ]; }; diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 3c5049a8a619c..8b885133cf2af 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -1,32 +1,56 @@ { lib , buildPythonPackage , fetchPypi -, isPyPy + +# build-system +, setuptools + +# tests , objgraph , psutil -, pytestCheckHook +, python +, unittestCheckHook }: - -buildPythonPackage rec { +let greenlet = buildPythonPackage rec { pname = "greenlet"; - version = "2.0.2"; - format = "setuptools"; + version = "3.0.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-58jcE699sJe+1koFHS3Unp8K9JXCaZXACp7oQmkNNMA="; + hash = "sha256-gWvZSIqUy6eNk+GrtYAA6CZvqcwqqczdbrBpasskAFs="; }; + nativeBuildInputs = [ + setuptools + ]; + + # tests in passthru, infinite recursion via objgraph/graphviz + doCheck = false; + nativeCheckInputs = [ objgraph psutil - pytestCheckHook + unittestCheckHook ]; - doCheck = false; # installed tests need to be executed, not sure how to accomplish that + preCheck = '' + pushd ${placeholder "out"}/${python.sitePackages} + ''; + + unittestFlagsArray = [ + "greenlet.tests" + ]; + + postCheck = '' + popd + ''; + + passthru.tests.pytest = greenlet.overridePythonAttrs (_: { doCheck = true; }); meta = with lib; { + changelog = "https://github.com/python-greenlet/greenlet/blob/${version}/CHANGES.rst"; homepage = "https://github.com/python-greenlet/greenlet"; description = "Module for lightweight in-process concurrent programming"; license = with licenses; [ @@ -34,4 +58,5 @@ buildPythonPackage rec { mit ]; }; -} +}; +in greenlet diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 314a2249cdbd1..63d985326efcf 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.36.9"; + version = "0.38.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5j6boIy2LnB3Y0ZzheTdflON8KaQkeQS5vkaPIsETGk="; + hash = "sha256-GhohFO5tHb9ByISPUf4U2MrDATE4WjuekcC9QZaP2Ls="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix index ce1a78f02cfd0..4c028e4ec71c1 100644 --- a/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-health-checking"; - version = "1.58.0"; + version = "1.59.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-B9WGI/J77PGGyGLLrn39elS9Y/SzdZTHfIuPyTPxHC8="; + hash = "sha256-4CIcpupsITlhQXmAi4+LMjA30LG977D8TN2agUmZVx4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index c03c1faa9d4f2..e7d6fd550958a 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.58.0"; + version = "1.59.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-C0LnDAQFpmqC2emGf6JV/lnmGJZKYJmyBWjDHdkJl2Y="; + hash = "sha256-+TucM+CiYWLvhDG/z/zD4fshfM2Ne1swYbbp+BPmmLU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index 904c0b24a0abb..bb3024d440767 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.58.0"; + version = "1.59.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ABZMp+VTsyf2HE50cnHf9wdCOeGlAqpbuMWlbsWE/qY="; + hash = "sha256-YiqbhlOsyoAT/uYNPbLQK5c2T8cYGEDXVkAPIzCaOQ4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 285f3477deaaf..cd0b0abcb1210 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.58.0"; + version = "1.59.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-b02AzrWR4xyk3O7HR9vlYTLhOSoKm7HI/gAdG1ysiYo="; + hash = "sha256-qkAY8thmKsTZgwRF09JToRs+CW6K/iCGVUcTeqEWDpM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 75d8a4a990cef..89f01e29d46d7 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -59,6 +59,5 @@ buildPythonPackage rec { description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; homepage = "https://github.com/scikit-learn-contrib/hdbscan"; license = licenses.bsd3; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/hledger-utils/default.nix b/pkgs/development/python-modules/hledger-utils/default.nix index 92966821d4bb4..cea6592b42b80 100644 --- a/pkgs/development/python-modules/hledger-utils/default.nix +++ b/pkgs/development/python-modules/hledger-utils/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hledger-utils"; - version = "1.13.2"; + version = "1.14.0"; format = "pyproject"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "nobodyinperson"; repo = "hledger-utils"; rev = "refs/tags/v${version}"; - hash = "sha256-E++gHvXspPodLW2hEESKjg+R5aV39UJpDP8JYQX9iBw="; + hash = "sha256-Qu4nUcAGTACmLhwc7fkLxITOyFnUHv85qMhtViFumVs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/iceportal/default.nix b/pkgs/development/python-modules/iceportal/default.nix index 251f13727895b..ffc0335761b37 100644 --- a/pkgs/development/python-modules/iceportal/default.nix +++ b/pkgs/development/python-modules/iceportal/default.nix @@ -11,8 +11,8 @@ buildPythonPackage rec { pname = "iceportal"; - version = "1.1.1"; - format = "pyproject"; + version = "1.1.2"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-iceportal"; rev = "refs/tags/${version}"; - hash = "sha256-edG4tF5nYaEOCcbunetYNL9moi9vA75IOkorDuLEx1c="; + hash = "sha256-s+jEpxKsa3eIV4a/Ltso51jqZC4jzsvPLTjDFMV9FIA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/icontract/default.nix b/pkgs/development/python-modules/icontract/default.nix index 77565311efbfe..76e1814dddddb 100644 --- a/pkgs/development/python-modules/icontract/default.nix +++ b/pkgs/development/python-modules/icontract/default.nix @@ -50,6 +50,13 @@ buildPythonPackage rec { # mypy decorator checks don't pass. For some reason mypy # doesn't check the python file provided in the test. "tests/test_mypy_decorators.py" + # those tests seems to simply re-run some typeguard tests + "tests/test_typeguard.py" + ]; + + pytestFlagsArray = [ + # RuntimeWarning: coroutine '*' was never awaited + "-W" "ignore::RuntimeWarning" ]; pythonImportsCheck = [ "icontract" ]; diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 083170fd438b7..7a5aaaf81e68e 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -3,48 +3,104 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch +, isPyPy , substituteAll -, imageio-ffmpeg + +# build-system +, setuptools + +# native dependencies +, libGL + +# dependencies , numpy , pillow + +# optional-dependencies +, astropy +, av +, imageio-ffmpeg +, pillow-heif , psutil -, pytestCheckHook , tifffile + +# tests +, pytestCheckHook , fsspec -, libGL }: buildPythonPackage rec { pname = "imageio"; - version = "2.31.3"; - format = "setuptools"; + version = "2.32.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dMaoMtgbetWoqAl23qWO4DPT4rmaVJkMvXibTLCzFGE="; + hash = "sha256-5CWtNsYFMI2eptk+2nsJh5JgWbi4YiDhQqWZp5dRKN0="; }; - patches = lib.optionals (!stdenv.isDarwin) [ + patches = [ + # pillow 10.1.0 compat + (fetchpatch { + name = "imageio-pillow-10.1.0-compat.patch"; + url = "https://github.com/imageio/imageio/commit/f58379c1ae7fbd1da8689937b39e499e2d225740.patch"; + hash = "sha256-jPSl/EUe69Dizkv8CqWpnm+TDPtF3VX2DkHOCEuYTLA="; + }) + ] ++ lib.optionals (!stdenv.isDarwin) [ (substituteAll { src = ./libgl-path.patch; libgl = "${libGL.out}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - imageio-ffmpeg numpy pillow ]; + passthru.optional-dependencies = { + bsdf = []; + dicom = []; + feisem = []; + ffmpeg = [ + imageio-ffmpeg + psutil + ]; + fits = lib.optionals (!isPyPy) [ + astropy + ]; + freeimage = []; + lytro = []; + numpy = []; + pillow = []; + simpleitk = []; + spe = []; + swf = []; + tifffile = [ + tifffile + ]; + pyav = [ + av + ]; + heif = [ + pillow-heif + ]; + }; + nativeCheckInputs = [ fsspec psutil pytestCheckHook - tifffile - ]; + ] + ++ fsspec.optional-dependencies.github + ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pytestFlagsArray = [ "-m 'not needs_internet'" diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index ae479120ed1ae..c70ab0ac2b327 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -136,8 +136,8 @@ let arch = # KeyError: ('Linux', 'arm64') - if stdenv.targetPlatform.isLinux && stdenv.targetPlatform.linuxArch == "arm64" then "aarch64" - else stdenv.targetPlatform.linuxArch; + if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.linuxArch == "arm64" then "aarch64" + else stdenv.hostPlatform.linuxArch; bazel-build = buildBazelPackage rec { name = "bazel-build-${pname}-${version}"; @@ -219,7 +219,7 @@ let build --python_path="${python}/bin/python" build --distinct_host_configuration=false build --define PROTOBUF_INCLUDE_PATH="${pkgs.protobuf}/include" - '' + lib.optionalString (stdenv.targetPlatform.avxSupport && stdenv.targetPlatform.isUnix) '' + '' + lib.optionalString (stdenv.hostPlatform.avxSupport && stdenv.hostPlatform.isUnix) '' build --config=avx_posix '' + lib.optionalString mklSupport '' build --config=mkl_open_source_only @@ -298,13 +298,13 @@ let inherit meta; }; platformTag = - if stdenv.targetPlatform.isLinux then + if stdenv.hostPlatform.isLinux then "manylinux2014_${arch}" else if stdenv.system == "x86_64-darwin" then "macosx_10_9_${arch}" else if stdenv.system == "aarch64-darwin" then "macosx_11_0_${arch}" - else throw "Unsupported target platform: ${stdenv.targetPlatform}"; + else throw "Unsupported target platform: ${stdenv.hostPlatform}"; in buildPythonPackage { diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 5f802767c83ad..eb90d3c907ed3 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -3,16 +3,22 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub + +# build-system +, setuptools + +# dependencies +, parso + +# tests , attrs -, django_3 , pytestCheckHook -, parso }: buildPythonPackage rec { pname = "jedi"; - version = "0.19.0"; - format = "setuptools"; + version = "0.19.1"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -20,15 +26,20 @@ buildPythonPackage rec { owner = "davidhalter"; repo = "jedi"; rev = "v${version}"; - hash = "sha256-Hw0+KQkB9ICWbBJDQQmHyKngzJlJ8e3wlpe4aSrlkvo="; + hash = "sha256-MD7lIKwAwULZp7yLE6jiao2PU6h6RIl0SQ/6b4Lq+9I="; fetchSubmodules = true; }; - propagatedBuildInputs = [ parso ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + parso + ]; nativeCheckInputs = [ attrs - django_3 pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix index 4d0831ff97958..7283eaed4434a 100644 --- a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix +++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix @@ -23,6 +23,5 @@ buildPythonPackage rec { description = "Simple LDAP Authenticator Plugin for JupyterHub"; homepage = "https://github.com/jupyterhub/ldapauthenticator"; license = licenses.bsd3; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 06f5cc6bbd9a4..6261303981217 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -205,7 +205,6 @@ buildPythonPackage rec { homepage = "https://jupyter.org/"; changelog = "https://github.com/jupyterhub/jupyterhub/blob/${version}/docs/source/reference/changelog.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ixxie ]; # darwin: E OSError: dlopen(/nix/store/43zml0mlr17r5jsagxr00xxx91hz9lky-openpam-20170430/lib/libpam.so, 6): image not found broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; }; diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index eb99c9b2b89d7..555cc9e4795e1 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -48,6 +48,5 @@ buildPythonPackage rec { description = "Python toolkit for working with and comparing the standardized codes for languages"; homepage = "https://github.com/LuminosoInsight/langcodes"; license = licenses.mit; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/libclang/default.nix b/pkgs/development/python-modules/libclang/default.nix new file mode 100644 index 0000000000000..24d0e287ea030 --- /dev/null +++ b/pkgs/development/python-modules/libclang/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, llvmPackages +, setuptools +, writeText +}: + +let + libclang = llvmPackages.libclang; + + pyproject_toml = writeText "pyproject.toml" '' + [build-system] + requires = ["setuptools>=42", "wheel"] + build-backend = "setuptools.build_meta" + ''; + + setup_cfg = writeText "setup.cfg" '' + [metadata] + name = clang + version = ${libclang.version} + + [options] + packages = clang + ''; +in buildPythonPackage { + pname = "libclang"; + format = "pyproject"; + + inherit (libclang) version src; + + buildInputs = [ setuptools ]; + + postUnpack = '' + # set source root to python bindings + if [ -e "$sourceRoot/clang/bindings/python" ]; then + # LLVM 13+ puts clang sources in subdirectory instead of plain tarball + sourceRoot="$sourceRoot/clang/bindings/python" + else + sourceRoot="$sourceRoot/bindings/python" + fi + ''; + + postPatch = '' + # link in our own build info to build as a python package + ln -s ${pyproject_toml} ./pyproject.toml + ln -s ${setup_cfg} ./setup.cfg + + # set passed libclang for runtime + echo 'Config.set_library_path("${lib.getLib libclang}/lib")' >>./clang/cindex.py + ''; + + meta = libclang.meta // { + description = "Python bindings for the C language family frontend for LLVM"; + maintainers = with lib.maintainers; [ lilyinstarlight ]; + }; +} diff --git a/pkgs/development/python-modules/llm/001-disable-install-uninstall-commands.patch b/pkgs/development/python-modules/llm/001-disable-install-uninstall-commands.patch new file mode 100644 index 0000000000000..cef7fba13343e --- /dev/null +++ b/pkgs/development/python-modules/llm/001-disable-install-uninstall-commands.patch @@ -0,0 +1,34 @@ +diff --git a/llm/cli.py b/llm/cli.py +index af37feb..18b078a 100644 +--- a/llm/cli.py ++++ b/llm/cli.py +@@ -1014,18 +1014,7 @@ def templates_path(): + ) + def install(packages, upgrade, editable, force_reinstall, no_cache_dir): + """Install packages from PyPI into the same environment as LLM""" +- args = ["pip", "install"] +- if upgrade: +- args += ["--upgrade"] +- if editable: +- args += ["--editable", editable] +- if force_reinstall: +- args += ["--force-reinstall"] +- if no_cache_dir: +- args += ["--no-cache-dir"] +- args += list(packages) +- sys.argv = args +- run_module("pip", run_name="__main__") ++ click.echo("Install command has been disabled for Nix. If you want to install extra llm plugins, use llm.withPlugins([]) expression.") + + + @cli.command() +@@ -1033,8 +1022,7 @@ def install(packages, upgrade, editable, force_reinstall, no_cache_dir): + @click.option("-y", "--yes", is_flag=True, help="Don't ask for confirmation") + def uninstall(packages, yes): + """Uninstall Python packages from the LLM environment""" +- sys.argv = ["pip", "uninstall"] + list(packages) + (["-y"] if yes else []) +- run_module("pip", run_name="__main__") ++ click.echo("Uninstall command has been disabled for Nix. If you want to uninstall extra llm plugins, just remove them from llm.withPlugins([]) list expression.") + + + @cli.command() diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix new file mode 100644 index 0000000000000..318f673533089 --- /dev/null +++ b/pkgs/development/python-modules/llm/default.nix @@ -0,0 +1,107 @@ +{ + buildPythonApplication, + buildPythonPackage, + fetchFromGitHub, + lib, + makeWrapper, + pytestCheckHook, + python3, + pythonOlder, + ruff, + setuptools, +}: let + llm = buildPythonPackage rec { + pname = "llm"; + version = "0.12"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "simonw"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-aCqdw2co/cXrBwVY/k/aSLl3C22nlH5LvU2yir1/NnQ="; + }; + + patches = [ + ./001-disable-install-uninstall-commands.patch + ]; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = with python3.pkgs; [ + click-default-group + numpy + openai + pluggy + pydantic + python-ulid + pyyaml + setuptools # for pkg_resources + sqlite-migrate + sqlite-utils + ]; + + nativeCheckInputs = with python3.pkgs; [ + cogapp + numpy + pytestCheckHook + requests-mock + ]; + + doCheck = true; + + pytestFlagsArray = [ + "-svv" + "tests/" + ]; + + pythonImportsCheck = [ + "llm" + ]; + + passthru = {inherit withPlugins;}; + + meta = with lib; { + homepage = "https://github.com/simonw/llm"; + description = "Access large language models from the command-line"; + changelog = "https://github.com/simonw/llm/releases/tag/${version}"; + license = licenses.asl20; + mainProgram = "llm"; + maintainers = with maintainers; [aldoborrero]; + }; + }; + + withPlugins = plugins: buildPythonApplication { + inherit (llm) pname version; + format = "other"; + + disabled = pythonOlder "3.8"; + + dontUnpack = true; + dontBuild = true; + doCheck = false; + + nativeBuildInputs = [ + makeWrapper + ]; + + installPhase = '' + makeWrapper ${llm}/bin/llm $out/bin/llm \ + --prefix PYTHONPATH : "${llm}/${python3.sitePackages}:$PYTHONPATH" + ln -sfv ${llm}/lib $out/lib + ''; + + propagatedBuildInputs = llm.propagatedBuildInputs ++ plugins; + + passthru = llm.passthru // { + withPlugins = morePlugins: withPlugins (morePlugins ++ plugins); + }; + + inherit (llm) meta; + }; +in + llm diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index fa711c1b4cc67..2f234cc635425 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -38,6 +38,11 @@ buildPythonPackage rec { --replace 'ctypes.CDLL(libname)' 'np.ctypeslib.load_library("libfreeimage", "${freeimage}/lib")' ''; + # mahotas/_morph.cpp:864:10: error: no member named 'random_shuffle' in namespace 'std' + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-std=c++14"; + }; + # tests must be run in the build directory preCheck = '' cd build/lib* diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix index 587dc99080a94..8b069fd235a39 100644 --- a/pkgs/development/python-modules/marisa-trie/default.nix +++ b/pkgs/development/python-modules/marisa-trie/default.nix @@ -66,6 +66,5 @@ buildPythonPackage rec { homepage = "https://github.com/kmike/marisa-trie"; changelog = "https://github.com/pytries/marisa-trie/blob/${version}/CHANGES.rst"; license = licenses.mit; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/markdown-macros/default.nix b/pkgs/development/python-modules/markdown-macros/default.nix index e95cbe3c4c101..e0e41bf3d0a0e 100644 --- a/pkgs/development/python-modules/markdown-macros/default.nix +++ b/pkgs/development/python-modules/markdown-macros/default.nix @@ -16,8 +16,10 @@ buildPythonPackage rec { patches = [ # Fixes a bug with markdown>2.4 + # https://github.com/wnielson/markdown-macros/pull/1 (fetchpatch { - url = "https://github.com/wnielson/markdown-macros/pull/1.patch"; + name = "wnielson-markdown-macros-pull-1.patch"; + url = "https://github.com/wnielson/markdown-macros/commit/e38cba9acb6789cc128f6fe9ca427ba71815a20f.patch"; sha256 = "17njbgq2srzkf03ar6yn92frnsbda3g45cdi529fdh0x8mmyxci0"; }) ]; diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index dc786ac6d7d68..a34f98cdae39f 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , envisage , fetchPypi +, fetchpatch , numpy , packaging , pyface @@ -26,6 +27,24 @@ buildPythonPackage rec { hash = "sha256-n0J+8spska542S02ibpr7KJMhGDicG2KHJuEKJrT/Z4="; }; + patches = [ + # Adds compatibility with Python 3.11. + # https://github.com/enthought/mayavi/pull/1199 + (fetchpatch { + name = "python311-compat.patch"; + url = "https://github.com/enthought/mayavi/commit/50c0cbfcf97560be69c84b7c924635a558ebf92f.patch"; + hash = "sha256-zZOT6on/f5cEjnDBrNGog/wPQh7rBkaFqrxkBYDUQu0="; + includes = [ "tvtk/src/*" ]; + }) + # Fixes an incompatible function pointer conversion error + # https://github.com/enthought/mayavi/pull/1266 + (fetchpatch { + name = "incompatible-pointer-conversion.patch"; + url = "https://github.com/enthought/mayavi/commit/887adc8fe2b076a368070f5b1d564745b03b1964.patch"; + hash = "sha256-88H1NNotd4pO0Zw1oLrYk5WNuuVrmTU01HJgsTRfKlo="; + }) + ]; + postPatch = '' # building the docs fails with the usual Qt xcb error, so skip: substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index 878f85600dd1d..e347aa107d7c7 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -40,6 +40,5 @@ buildPythonPackage rec { homepage = "https://github.com/SamuraiT/mecab-python3"; changelog = "https://github.com/SamuraiT/mecab-python3/releases/tag/v${version}"; license = with licenses; [ gpl2 lgpl21 bsd3 ]; # any of the three - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/mido/default.nix b/pkgs/development/python-modules/mido/default.nix index 65702b23c7ad9..84fe78a594750 100644 --- a/pkgs/development/python-modules/mido/default.nix +++ b/pkgs/development/python-modules/mido/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./libportmidi-cdll.patch; - libportmidi = "${portmidi.out}/lib/libportmidi${stdenv.targetPlatform.extensions.sharedLibrary}"; + libportmidi = "${portmidi.out}/lib/libportmidi${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 49125a286e90b..41789a796dd1f 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -1,37 +1,51 @@ { lib -, aiohttp -, asgiref , buildPythonPackage +, fetchPypi +, pythonOlder +, stdenv + +# build-system +, hatchling + +# dependencies , decorator +, httptools +, python-magic +, urllib3 + +# optional-dependencies +, xxhash +, pook + +# tests +, aiohttp +, asgiref , fastapi -, fetchPypi , gevent -, httptools , httpx -, isPy3k -, pook -, pytest-mock +, pytest-asyncio , pytestCheckHook -, python-magic -, pythonOlder , redis +, redis-server , requests , sure -, urllib3 + }: buildPythonPackage rec { pname = "mocket"; - version = "3.11.1"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "3.12.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-sEPLUN9nod4AKYcoCNQZ4FBblUCLCPV1dFOrNC6xDWo="; + hash = "sha256-brvBWwTWT2F/usVBRr7wz9L0kct4X1Fddl4mu5LUENA="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ decorator httptools @@ -43,52 +57,58 @@ buildPythonPackage rec { pook = [ pook ]; + speedups = [ + xxhash + ]; }; nativeCheckInputs = [ - aiohttp asgiref fastapi gevent httpx - pytest-mock + pytest-asyncio pytestCheckHook redis requests sure - ] ++ passthru.optional-dependencies.pook; + ] ++ lib.optionals (pythonOlder "3.12") [ + aiohttp + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - # Skip http tests - SKIP_TRUE_HTTP = true; + preCheck = lib.optionalString stdenv.isLinux '' + ${redis-server}/bin/redis-server & + REDIS_PID=$! + ''; - disabledTestPaths = [ - # Requires a live Redis instance - "tests/main/test_redis.py" - ]; + postCheck = lib.optionalString stdenv.isLinux '' + kill $REDIS_PID + ''; + + # Skip http tests, they require network access + env.SKIP_TRUE_HTTP = true; + + _darwinAllowLocalNetworking = true; disabledTests = [ # tests that require network access (like DNS lookups) - "test_truesendall" - "test_truesendall_with_chunk_recording" - "test_truesendall_with_gzip_recording" - "test_truesendall_with_recording" - "test_wrongpath_truesendall" "test_truesendall_with_dump_from_recording" - "test_truesendall_with_recording_https" - "test_truesendall_after_mocket_session" - "test_real_request_session" "test_asyncio_record_replay" "test_gethostbyname" ]; + disabledTestPaths = lib.optionals stdenv.isDarwin [ + "tests/main/test_redis.py" + ]; + pythonImportsCheck = [ "mocket" ]; meta = with lib; { + changelog = "https://github.com/mindflayer/python-mocket/releases/tag/${version}"; description = "A socket mock framework for all kinds of sockets including web-clients"; homepage = "https://github.com/mindflayer/python-mocket"; - changelog = "https://github.com/mindflayer/python-mocket/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 73e95a6e1eadd..2dc5bd55ee731 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -1,54 +1,55 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , pythonOlder -# build +# build-system , setuptools -# runtime -, aws-xray-sdk +# dependencies , boto3 , botocore -, cfn-lint , cryptography +, jinja2 +, python-dateutil +, requests +, responses +, werkzeug +, xmltodict + +# optional-dependencies +, aws-xray-sdk +, cfn-lint , docker +, ecdsa , flask , flask-cors , graphql-core -, idna -, jinja2 , jsondiff +, multipart , openapi-spec-validator +, py-partiql-parser , pyparsing -, python-dateutil , python-jose , pyyaml -, requests -, responses , sshpubkeys -, werkzeug -, xmltodict # tests , freezegun -, py-partiql-parser , pytestCheckHook , pytest-xdist -, sure }: buildPythonPackage rec { pname = "moto"; - version = "4.2.2"; - format = "pyproject"; + version = "4.2.6"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-7jTEw/U5ANlTGAlGkgyduhJ6SD4u1A5tv5PUri52Dnw="; + hash = "sha256-zgpV1+dWxZpaQ5LHCXqlylPgCqLdP3AACTNWvhXnrvk="; }; nativeBuildInputs = [ @@ -56,114 +57,91 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - aws-xray-sdk boto3 botocore - cfn-lint cryptography - docker - flask - flask-cors - graphql-core - idna - jinja2 - jsondiff - openapi-spec-validator - pyparsing - python-dateutil - python-jose - pyyaml requests - responses - sshpubkeys - werkzeug xmltodict + werkzeug + python-dateutil + responses + jinja2 ]; + passthru.optional-dependencies = { + # non-exhaustive list of extras, that was cobbled together for testing + all = [ + aws-xray-sdk + cfn-lint + docker + ecdsa + flask + flask-cors + graphql-core + jsondiff + multipart + openapi-spec-validator + py-partiql-parser + pyparsing + python-jose + pyyaml + setuptools + sshpubkeys + ] ++ python-jose.optional-dependencies.cryptography; + }; + __darwinAllowLocalNetworking = true; nativeCheckInputs = [ freezegun - py-partiql-parser pytestCheckHook - sure - ]; + pytest-xdist + ] ++ passthru.optional-dependencies.all; pytestFlagsArray = [ - # Disable tests that try to access the network - "--deselect=tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed" - "--deselect=tests/test_cloudformation/test_server.py::test_cloudformation_server_get" - "--deselect=tests/test_core/test_decorator_calls.py::test_context_manager" - "--deselect=tests/test_core/test_decorator_calls.py::test_decorator_start_and_stop" - "--deselect=tests/test_core/test_request_mocking.py::test_passthrough_requests" - "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination" - "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_http_destination" - "--deselect=tests/test_logs/test_integration.py::test_put_subscription_filter_with_lambda" - "--deselect=tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception" - "--deselect=tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception" - "--deselect=tests/test_stepfunctions/test_stepfunctions.py::test_state_machine_creation_fails_with_invalid_names" - "--deselect=tests/test_stepfunctions/test_stepfunctions.py::test_state_machine_list_executions_with_pagination" - "--deselect=tests/test_iotdata/test_iotdata.py::test_update" - "--deselect=tests/test_iotdata/test_iotdata.py::test_basic" - "--deselect=tests/test_iotdata/test_iotdata.py::test_delete_field_from_device_shadow" - "--deselect=tests/test_iotdata/test_iotdata.py::test_publish" - "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_s3_upload_data" - "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_s3_upload_file_using_requests" + "-m" "'not network and not requires_docker'" + + # Fails at local name resolution "--deselect=tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header" - "--deselect=tests/test_s3/test_s3.py::test_presigned_put_url_with_approved_headers" - "--deselect=tests/test_s3/test_s3.py::test_presigned_put_url_with_custom_headers" - "--deselect=tests/test_s3/test_s3.py::test_put_chunked_with_v4_signature_in_body" - "--deselect=tests/test_s3/test_s3.py::test_upload_from_file_to_presigned_url" - "--deselect=tests/test_s3/test_server.py::test_s3_server_bucket_versioning" "--deselect=tests/test_s3/test_server.py::test_s3_server_post_cors_multiple_origins" - # Disable tests that require docker daemon - "--deselect=tests/test_core/test_docker.py::test_docker_is_running_and_available" - "--deselect=tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda" - "--deselect=tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda" - "--deselect=tests/test_sqs/test_sqs_integration.py" - - # json.decoder.JSONDecodeError: Expecting value: line 1 column 1 (char 0) - "--deselect=tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function" + # Fails at resolving google.com + "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_http_destination" + "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination" - # AssertionError: CloudWatch log event was not found. - "--deselect=tests/test_logs/test_integration.py::test_subscription_filter_applies_to_new_streams" + # Download recordings returns faulty JSON + "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_ec2_instance_creation_recording_on" + "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_ec2_instance_creation__recording_off" - # KeyError: 'global' - "--deselect=tests/test_iotdata/test_server.py::test_iotdata_list" - "--deselect=tests/test_iotdata/test_server.py::test_publish" + # Connection Reset by Peer, when connecting to localhost:5678 + "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_replay" - # Blocks test execution - "--deselect=tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_load_data_from_inmemory_client" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - "--deselect=tests/test_utilities/test_threaded_server.py::test_threaded_moto_server__different_port" - "--deselect=tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_server_can_handle_multiple_services" - "--deselect=tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_server_is_reachable" + # Requires docker, but isn't marked + # https://github.com/getmoto/moto/pull/6938 + "--deselect=tests/test_awslambda/test_lambda_layers_invoked.py::test_invoke_local_lambda_layers" - # AssertionError: expected `{0}` to be greater than `{1}` + # Racy, expects two timestamp two differ + # https://github.com/getmoto/moto/issues/6946 "--deselect=tests/test_databrew/test_databrew_recipes.py::test_publish_recipe" ]; disabledTestPaths = [ - # xml.parsers.expat.ExpatError: out of memory: line 1, column 0 - "tests/test_sts/test_sts.py" + # Requires pytest-ordering, which is unmaintained + # https://github.com/getmoto/moto/issues/6937 # botocore.exceptions.NoCredentialsError: Unable to locate credentials + "tests/test_dynamodb/test_dynamodb_statements.py" + "tests/test_lakeformation/test_resource_tags_integration.py" "tests/test_redshiftdata/test_redshiftdata.py" + "tests/test_s3/test_s3_file_handles.py" + "tests/test_s3/test_s3.py" + "tests/test_s3/test_s3_select.py" + # Tries to access the network - "tests/test_appsync/test_appsync_schema.py" - "tests/test_awslambda/test_lambda_eventsourcemapping.py" - "tests/test_awslambda/test_lambda_invoke.py" "tests/test_batch/test_batch_jobs.py" - "tests/test_kinesis/test_kinesis.py" - "tests/test_kinesis/test_kinesis_stream_consumers.py" - ]; - disabledTests = [ - # only appears in aarch64 currently, but best to be safe - "test_state_machine_list_executions_with_filter" - # tests fail with 404 after Werkzeug 2.2 upgrade, see https://github.com/spulec/moto/issues/5341#issuecomment-1206995825 - "test_appsync_list_tags_for_resource" - "test_s3_server_post_to_bucket_redirect" + # Threading tests regularly blocks test execution + "tests/test_utilities/test_threaded_server.py" + "tests/test_s3/test_s3_bucket_policy.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mpv/default.nix b/pkgs/development/python-modules/mpv/default.nix index c956bb90aa8f8..3763e25660a53 100644 --- a/pkgs/development/python-modules/mpv/default.nix +++ b/pkgs/development/python-modules/mpv/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace mpv.py \ --replace "sofile = ctypes.util.find_library('mpv')" \ - 'sofile = "${mpv}/lib/libmpv${stdenv.targetPlatform.extensions.sharedLibrary}"' + 'sofile = "${mpv}/lib/libmpv${stdenv.hostPlatform.extensions.sharedLibrary}"' ''; # tests impure, will error if it can't load libmpv.so diff --git a/pkgs/development/python-modules/mwoauth/default.nix b/pkgs/development/python-modules/mwoauth/default.nix index 1fcd7123ea75f..2e92fade6d430 100644 --- a/pkgs/development/python-modules/mwoauth/default.nix +++ b/pkgs/development/python-modules/mwoauth/default.nix @@ -41,6 +41,5 @@ buildPythonPackage rec { description = "Python library to perform OAuth handshakes with a MediaWiki installation"; homepage = "https://github.com/mediawiki-utilities/python-mwoauth"; license = licenses.mit; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index ba963ff0d5ddb..575c438eb5514 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { patches = [ # mysql-connector overrides MACOSX_DEPLOYMENT_TARGET to 11. # This makes the installation with nixpkgs fail. I suspect, that's - # because stdenv.targetPlatform.darwinSdkVersion is (currently) set to + # because stdenv.hostPlatform.darwinSdkVersion is (currently) set to # 10.12. The patch reverts # https://github.com/mysql/mysql-connector-python/commit/d1e89fd3d7391084cdf35b0806cb5d2a4b413654 ./0001-Revert-Fix-MacOS-wheels-platform-tag.patch diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix index 0e6b2204ddbb5..e485b768a7507 100644 --- a/pkgs/development/python-modules/myst-parser/default.nix +++ b/pkgs/development/python-modules/myst-parser/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , flit-core , pythonOlder , docutils @@ -31,6 +32,14 @@ buildPythonPackage rec { hash = "sha256-1BW7Z+0rs5Up+VZ3vDygnhLzE9Y2BqEMnTnflboweu0="; }; + patches = [ + (fetchpatch { + name = "myst-parser-sphinx7.2-compat.patch"; + url = "https://github.com/executablebooks/MyST-Parser/commit/4f670fc04c438b57a9d4014be74e9a62cc0deba4.patch"; + hash = "sha256-FCvFSsD7qQwqWjSW7R4Gx+E2jaGkifSZqaRbAglt9Yw="; + }) + ]; + nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index 9f00a33fdf6bd..f181a7d4c4fed 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , isPyPy @@ -50,12 +51,16 @@ buildPythonPackage rec { NO_NET=1 NO_CDL=1 ${python.interpreter} run_all.py ''; - # Variables used to configure the build process - USE_NCCONFIG = "0"; - HDF5_DIR = lib.getDev hdf5; - NETCDF4_DIR = netcdf; - CURL_DIR = curl.dev; - JPEG_DIR = libjpeg.dev; + env = { + # Variables used to configure the build process + USE_NCCONFIG = "0"; + HDF5_DIR = lib.getDev hdf5; + NETCDF4_DIR = netcdf; + CURL_DIR = curl.dev; + JPEG_DIR = libjpeg.dev; + } // lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion"; + }; pythonImportsCheck = [ "netCDF4" ]; diff --git a/pkgs/development/python-modules/newversion/default.nix b/pkgs/development/python-modules/newversion/default.nix index e3283a4eb9e2f..769750163663d 100644 --- a/pkgs/development/python-modules/newversion/default.nix +++ b/pkgs/development/python-modules/newversion/default.nix @@ -1,45 +1,32 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , packaging , poetry-core , pytestCheckHook , pythonOlder -, typing-extensions }: buildPythonPackage rec { pname = "newversion"; - version = "1.8.2"; + version = "2.0.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "vemel"; - repo = pname; - rev = version; - hash = "sha256-27HWMzSzyAbiOW7OUhlupRWIVJG6DrpXObXmxlCsmxU="; + repo = "newversion"; + rev = "refs/tags/${version}"; + hash = "sha256-v9hfk2/hBkWtOobQdaYXNOZTTcEqnMV6JYqtjjoidOs="; }; - patches = [ - # https://github.com/vemel/newversion/pull/9 - (fetchpatch { - name = "remove-setuptools-dependency.patch"; - url = "https://github.com/vemel/newversion/commit/b50562671029dd6834bc7a8ad0dd3f9e0fbdfc1d.patch"; - hash = "sha256-6dXVQ9Hk0/EfSwPbW19ZV8MAFcSx+ZRO5G94kbh23GM="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ packaging - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions ]; nativeCheckInputs = [ @@ -53,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "PEP 440 version manager"; homepage = "https://github.com/vemel/newversion"; + changelog = "https://github.com/vemel/newversion/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/nose3/default.nix b/pkgs/development/python-modules/nose3/default.nix index 280f36cc2e693..f9966b246602d 100644 --- a/pkgs/development/python-modules/nose3/default.nix +++ b/pkgs/development/python-modules/nose3/default.nix @@ -5,6 +5,7 @@ , isPyPy , isPy311 , python +, pythonAtLeast , stdenv }: @@ -12,6 +13,9 @@ buildPythonPackage rec { pname = "nose3"; version = "1.3.8"; + # https://github.com/jayvdb/nose3/issues/5 + disabled = pythonAtLeast "3.12"; + src = fetchPypi { inherit pname version; hash = "sha256-diquIsrbiYsAudT0u7n46H+ODd5sSaiM0MVU9OWSW3Y="; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 51a043b8d7f31..cbf8fa40d78ca 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -28,9 +28,9 @@ let in buildPythonPackage rec { # Using an untagged version, with numpy 1.25 support, when it's released # also drop the versioneer patch in postPatch - version = "0.58.0rc2"; + version = "0.58.1"; pname = "numba"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; @@ -50,7 +50,7 @@ in buildPythonPackage rec { # use `forceFetchGit = true;`.` If in the future we'll observe the hash # changes too often, we can always use forceFetchGit, and inject the # relevant strings ourselves, using `sed` commands, in extraPostFetch. - hash = "sha256-ktFBjzd2vEahdr86lhVLVFEadCIhPP3hRF/EuZhHCC4="; + hash = "sha256-1Tj2GFoUwRRCWBFxhreF+0Mr+Tjyb7+X4peO+T0qGNs="; }; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index d2d85bddf3b6c..82ceee47d066d 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -2,17 +2,28 @@ , stdenv , fetchPypi , python +, pythonAtLeast +, pythonOlder , buildPythonPackage +, writeTextFile + +# build-system +, cython_3 , gfortran +, meson-python +, pkg-config +, xcbuild + +# native dependencies +, blas +, lapack + +# tests , hypothesis +, pytest-xdist , pytestCheckHook +, setuptools , typing-extensions -, blas -, lapack -, writeTextFile -, cython -, pythonAtLeast -, pythonOlder }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -41,14 +52,14 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.25.2"; - format = "setuptools"; - disabled = pythonOlder "3.9" || pythonAtLeast "3.12"; + version = "1.26.1"; + pyproject = true; + disabled = pythonOlder "3.9" || pythonAtLeast "3.13"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-/WCOGcjXxVAh3/1Dv+VJL6uMwQXMiYb4E/jDwEizh2A="; + hash = "sha256-yMbHLUqfgx8yjvsTEmQqHK+vqoiYHZq3Y2jVDQfZPL4="; }; patches = [ @@ -70,10 +81,23 @@ in buildPythonPackage rec { # error: option --single-version-externally-managed not recognized # TypeError: dist must be a Distribution instance rm numpy/core/tests/test_cython.py + + patchShebangs numpy/_build_utils/*.py ''; - nativeBuildInputs = [ gfortran cython ]; - buildInputs = [ blas lapack ]; + nativeBuildInputs = [ + cython_3 + gfortran + meson-python + pkg-config + ] ++ lib.optionals (stdenv.isDarwin) [ + xcbuild.xcrun + ]; + + buildInputs = [ + blas + lapack + ]; # Causes `error: argument unused during compilation: '-fno-strict-overflow'` due to `-Werror`. hardeningDisable = lib.optionals stdenv.cc.isClang [ "strictoverflow" ]; @@ -83,7 +107,6 @@ in buildPythonPackage rec { # see https://github.com/xianyi/OpenBLAS/issues/2993 preConfigure = '' sed -i 's/-faltivec//' numpy/distutils/system_info.py - export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 64 ? 64 : NIX_BUILD_CORES)) ''; @@ -94,8 +117,10 @@ in buildPythonPackage rec { enableParallelBuilding = true; nativeCheckInputs = [ + pytest-xdist pytestCheckHook hypothesis + setuptools typing-extensions ]; @@ -138,9 +163,10 @@ in buildPythonPackage rec { # Disable test # - test_large_file_support: takes a long time and can cause the machine to run out of disk space - NOSE_EXCLUDE="test_large_file_support"; + env.NOSE_EXCLUDE = "test_large_file_support"; meta = { + changelog = "https://github.com/numpy/numpy/releases/tag/v${version}"; description = "Scientific tools for Python"; homepage = "https://numpy.org/"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index b2a8329538eba..7b1a3c60d628a 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -67,6 +67,5 @@ buildPythonPackage rec { homepage = "https://github.com/jupyterhub/oauthenticator"; changelog = "https://github.com/jupyterhub/oauthenticator/blob/${version}/docs/source/reference/changelog.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index df15ebe77e449..d0866f6c0a83d 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -66,14 +66,10 @@ in buildPythonPackage rec { --replace 'include(googletest)' "" substituteInPlace cmake/unittest.cmake \ --replace 'googletest)' ')' - '' + lib.optionalString stdenv.isLinux '' + '' + '' # remove this override in 1.15 that will enable to set the CMAKE_CXX_STANDARD with cmakeFlags substituteInPlace CMakeLists.txt \ --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 17' - '' + lib.optionalString stdenv.isDarwin '' - # remove this override in 1.15 that will enable to set the CMAKE_CXX_STANDARD with cmakeFlags - substituteInPlace CMakeLists.txt \ - --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 14' ''; preConfigure = '' diff --git a/pkgs/development/python-modules/opensensemap-api/default.nix b/pkgs/development/python-modules/opensensemap-api/default.nix index 4cce64c43008d..326f7d2acedab 100644 --- a/pkgs/development/python-modules/opensensemap-api/default.nix +++ b/pkgs/development/python-modules/opensensemap-api/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "opensensemap-api"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-lz2G7vXUadhTFgfHpIq9kHfojf+iytjitFZZ7rgqeO8="; + hash = "sha256-UrgQjZYw7TlFvhnaI7wFUpuUYeVKO5hsnx8h1OKfV8w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 5297cb920d33f..fb81938bc0917 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.9.7"; + version = "3.9.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,13 +25,13 @@ buildPythonPackage rec { owner = "ijl"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-VkCwvksUtgvFLSMy2fHLxrpZjcWYhincSM4fX/Gwl0I="; + hash = "sha256-MkcuayNDt7/GcswXoFTvzuaZzhQEQV+V7OfKqgJwVIQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-IwWbd7LE/t1UEo/bdC0bXl2K8hYyvDPbyHLBIurfb/8="; + hash = "sha256-2eRV+oZQvsWWJ4AUTeuE0CHtTHC6jNZiX/y5uXuwvns="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index d902af2c26f70..5e5e5a07b9c51 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "owslib"; - version = "0.29.2"; + version = "0.29.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "geopython"; repo = "OWSLib"; rev = "refs/tags/${version}"; - hash = "sha256-dbL4VdnPszwiDO+UjluuyqeBRMKojTnZPEFKEYiIWS0="; + hash = "sha256-yAJXknSsGXcerzaOVSrFO4j5E6B/4/0JfoSxZ+Szmws="; }; postPatch = '' @@ -63,6 +63,8 @@ buildPythonPackage rec { "test_wmts_example_informatievlaanderen" "test_opensearch_creodias" ] ++ lib.optionals stdenv.isDarwin [ + "test_ogcapi_processes_pygeoapi" + "test_ogcapi_records_pycsw" "test_ogcapi_records_pygeoapi" "test_wms_getfeatureinfo_130" ]; @@ -70,7 +72,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client for Open Geospatial Consortium web service interface standards"; homepage = "https://www.osgeo.org/projects/owslib/"; - changelog = "https://github.com/geopython/OWSLib/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/geopython/OWSLib/releases/tag/${version}"; license = licenses.bsd3; maintainers = teams.geospatial.members; }; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index d044c76ae8d30..588dae7b7840d 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -65,27 +65,22 @@ buildPythonPackage rec { pname = "pandas"; - version = "2.1.0"; - format = "pyproject"; + version = "2.1.1"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "pandas-dev"; repo = "pandas"; rev = "refs/tags/v${version}"; - hash = "sha256-QwMW/qc1n51DaVhUnIaG0bdOvDitvvPh6ftoDawiYlc="; + hash = "sha256-6SgW4BtO7EFnS8P8LL4AGk5EdPwOQ0+is0wXgqsm9w0="; }; - patches = [ - # https://github.com/pandas-dev/pandas/issues/54888#issuecomment-1701186809 - ./installer-fix.patch - ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace "meson-python==0.13.1" "meson-python>=0.13.1" \ - --replace "meson==1.0.1" "meson>=1.0.1" + --replace "meson==1.2.1" "meson>=1.2.1" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pandas/installer-fix.patch b/pkgs/development/python-modules/pandas/installer-fix.patch deleted file mode 100644 index b1659c9dbb3d4..0000000000000 --- a/pkgs/development/python-modules/pandas/installer-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/pandas/_libs/meson.build b/pandas/_libs/meson.build -index f302c649bc..ddce9ea2d6 100644 ---- a/pandas/_libs/meson.build -+++ b/pandas/_libs/meson.build -@@ -113,8 +113,4 @@ foreach ext_name, ext_dict : libs_sources - ) - endforeach - --py.install_sources('__init__.py', -- pure: false, -- subdir: 'pandas/_libs') -- - subdir('window') -diff --git a/pandas/_libs/tslibs/meson.build b/pandas/_libs/tslibs/meson.build -index 14d2eef46d..a862345c3a 100644 ---- a/pandas/_libs/tslibs/meson.build -+++ b/pandas/_libs/tslibs/meson.build -@@ -30,7 +30,3 @@ foreach ext_name, ext_dict : tslibs_sources - install: true - ) - endforeach -- --py.install_sources('__init__.py', -- pure: false, -- subdir: 'pandas/_libs/tslibs') diff --git a/pkgs/development/python-modules/pcbnew-transition/default.nix b/pkgs/development/python-modules/pcbnew-transition/default.nix new file mode 100644 index 0000000000000..2ac478308cdab --- /dev/null +++ b/pkgs/development/python-modules/pcbnew-transition/default.nix @@ -0,0 +1,39 @@ +{ pythonOlder +, buildPythonPackage +, fetchPypi +, lib +, kicad +, versioneer +}: +buildPythonPackage rec { + pname = "pcbnewTransition"; + version = "0.3.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-3CJUG1kd63Lg0r9HpJRIvttHS5s2EuZRoxeXrqsJ/kQ="; + }; + + propagatedBuildInputs = [ + kicad + ]; + + nativeBuildInputs = [ + versioneer + ]; + + pythonImportsCheck = [ + "pcbnewTransition" + ]; + + meta = with lib; { + description = "Library that allows you to support both, KiCad 5, 6 and 7 in your plugins"; + homepage = "https://github.com/yaqwsx/pcbnewTransition"; + changelog = "https://github.com/yaqwsx/pcbnewTransition/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ jfly matusf ]; + }; +} diff --git a/pkgs/development/python-modules/pegen/default.nix b/pkgs/development/python-modules/pegen/default.nix index d002cda74d8f9..2a7a3062741fb 100644 --- a/pkgs/development/python-modules/pegen/default.nix +++ b/pkgs/development/python-modules/pegen/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pegen"; - version = "0.2.0"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "we-like-parsers"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5nxOMgkDAkHtVFSNXf0SPoag6/E7b97eVnFoAqyJE3g="; + hash = "sha256-P4zX8za9lBlXhNPkQe9p136ggZEJh6fHfBr+DQKvtTg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 01884677f26d9..0891ad28ec3f9 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "8.3.0"; + version = "8.4.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-d76s4iJFwhzWSySXTS53PQQuWfWIboIRecEyjzobsME="; + hash = "sha256-48tb5bhmBdKVjMld07303qIi5C16yaf+5TpRPVC6EQk="; }; patches = [ diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index 198e7ff2ff382..1d0505e22ed58 100644 --- a/pkgs/development/python-modules/pillow-heif/default.nix +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -35,6 +35,10 @@ buildPythonPackage rec { hash = "sha256-GbOW29rGpLMS7AfShuO6UCzcspdHtFS7hyNKori0otI="; }; + postPatch = '' + sed -i '/addopts/d' pyproject.toml + ''; + nativeBuildInputs = [ cmake nasm @@ -68,6 +72,15 @@ buildPythonPackage rec { # https://github.com/bigcat88/pillow_heif/issues/89 # not reproducible in nixpkgs "test_opencv_crash" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # RuntimeError: Encoder plugin generated an error: Unsupported bit depth: Bit depth not supported by x265 + "test_open_heif_compare_non_standard_modes_data" + "test_open_save_disable_16bit" + "test_save_bgr_16bit_to_10_12_bit" + "test_save_bgra_16bit_to_10_12_bit" + "test_premultiplied_alpha" + "test_hdr_save" + "test_I_color_modes_to_10_12_bit" ]; meta = { diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index ebfcdd8d55748..3b5dffb42cf07 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -12,7 +12,7 @@ import ./generic.nix (rec { pname = "pillow"; - version = "10.0.1"; + version = "10.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ import ./generic.nix (rec { src = fetchPypi { pname = "Pillow"; inherit version; - hash = "sha256-1ylnsGvpMA/tXPvItbr87sSL983H2rZrHSVJA1KHGR0="; + hash = "sha256-5r+N5sNu2WyG6jtuHVJzxT9G71GKBiRkzX713Sz5Ljg="; }; passthru.tests = { diff --git a/pkgs/development/python-modules/pixel-ring/default.nix b/pkgs/development/python-modules/pixel-ring/default.nix new file mode 100644 index 0000000000000..c88715270bd7b --- /dev/null +++ b/pkgs/development/python-modules/pixel-ring/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, pyusb +, spidev +}: + +buildPythonPackage rec { + pname = "pixel-ring"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "respeaker"; + repo = "pixel_ring"; + rev = version; + hash = "sha256-J9kScjD6Xon0YWGxFU881bIbjmDpY7cnWzJ8G0SOKaw="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + pyusb + spidev + ]; + + dontUsePythonImportsCheck = true; # requires SPI access + + doCheck = false; # no tests + + meta = with lib; { + description = "RGB LED library for ReSpeaker 4 Mic Array, ReSpeaker V2 & ReSpeaker USB 6+1 Mic Array"; + homepage = "https://github.com/respeaker/pixel_ring/tree/master"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix index b5fc0c4499c94..89fc2fd32f740 100644 --- a/pkgs/development/python-modules/pkgconfig/default.nix +++ b/pkgs/development/python-modules/pkgconfig/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder , poetry-core , pkg-config , pytestCheckHook @@ -37,6 +38,10 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core ]; + # ModuleNotFoundError: No module named 'distutils' + # https://github.com/matze/pkgconfig/issues/64 + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pkgconfig" ]; diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix index e6473e98a282d..1128d1c69eaf8 100644 --- a/pkgs/development/python-modules/pluggy/default.nix +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -9,24 +9,23 @@ buildPythonPackage rec { pname = "pluggy"; - version = "1.2.0"; + version = "1.3.0"; + + disabled = pythonOlder "3.8"; + format = "pyproject"; src = fetchFromGitHub { owner = "pytest-dev"; repo = "pluggy"; rev = "refs/tags/${version}"; - hash = "sha256-SzJu7ITdmUgusn8sz6fRBpxTMQncWIViP5NCAj4q4GM="; + hash = "sha256-jLasnqmATIOoheGu90Wo1+iTCwslYzNOKckqHIZDJec="; }; nativeBuildInputs = [ setuptools-scm ]; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]; - # To prevent infinite recursion with pytest doCheck = false; passthru.tests = { diff --git a/pkgs/development/python-modules/protobuf/3.nix b/pkgs/development/python-modules/protobuf/3.nix new file mode 100644 index 0000000000000..d9e3cce5f918e --- /dev/null +++ b/pkgs/development/python-modules/protobuf/3.nix @@ -0,0 +1,90 @@ +{ buildPackages +, buildPythonPackage +, fetchpatch +, isPyPy +, lib +, protobuf +, pytestCheckHook +, pythonAtLeast +, tzdata +}: + +assert lib.versionAtLeast protobuf.version "3.21" -> throw "Protobuf 3.20 or older required"; + +buildPythonPackage { + inherit (protobuf) pname src; + + version = protobuf.version; + + sourceRoot = "${protobuf.src.name}/python"; + + patches = lib.optionals (pythonAtLeast "3.11") [ + (fetchpatch { + name = "support-python311.patch"; + url = "https://github.com/protocolbuffers/protobuf/commit/2206b63c4649cf2e8a06b66c9191c8ef862ca519.diff"; + stripLen = 1; # because sourceRoot above + hash = "sha256-3GaoEyZIhS3QONq8LEvJCH5TdO9PKnOgcQF0GlEiwFo="; + }) + ]; + + prePatch = '' + if [[ "$(<../version.json)" != *'"python": "'"$version"'"'* ]]; then + echo "Python library version mismatch. Derivation version: $version, actual: $(<../version.json)" + exit 1 + fi + ''; + + # Remove the line in setup.py that forces compiling with C++14. Upstream's + # CMake build has been updated to support compiling with other versions of + # C++, but the Python build has not. Without this, we observe compile-time + # errors using GCC. + # + # Fedora appears to do the same, per this comment: + # + # https://github.com/protocolbuffers/protobuf/issues/12104#issuecomment-1542543967 + # + postPatch = '' + sed -i "/extra_compile_args.append('-std=c++14')/d" setup.py + ''; + + nativeBuildInputs = lib.optional isPyPy tzdata; + + buildInputs = [ protobuf ]; + + propagatedNativeBuildInputs = [ + # For protoc of the same version. + buildPackages."protobuf${lib.versions.major protobuf.version}_${lib.versions.minor protobuf.version}" + ]; + + setupPyGlobalFlags = [ "--cpp_implementation" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = lib.optionals isPyPy [ + # error message differs + "testInvalidTimestamp" + # requires tracemalloc which pypy does not implement + # https://foss.heptapod.net/pypy/pypy/-/issues/3048 + "testUnknownFieldsNoMemoryLeak" + # assertion is not raised for some reason + "testStrictUtf8Check" + ]; + + pythonImportsCheck = [ + "google.protobuf" + "google.protobuf.internal._api_implementation" # Verify that --cpp_implementation worked + ]; + + passthru = { + inherit protobuf; + }; + + meta = with lib; { + description = "Protocol Buffers are Google's data interchange format"; + homepage = "https://developers.google.com/protocol-buffers/"; + license = licenses.bsd3; + maintainers = with maintainers; [ knedlsepp ]; + }; +} diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 2676dc90d68ba..3a42754de7783 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -11,30 +11,28 @@ , tzdata }: +assert lib.versionOlder protobuf.version "21" -> throw "Protobuf 21 or newer required"; + let - versionMajor = lib.versions.major protobuf.version; - versionMinor = lib.versions.minor protobuf.version; - versionPatch = lib.versions.patch protobuf.version; + protobufVersionMajor = lib.versions.major protobuf.version; + protobufVersionMinor = lib.versions.minor protobuf.version; in buildPythonPackage { inherit (protobuf) pname src; - # protobuf 3.21 corresponds with its python library 4.21 - version = - if lib.versionAtLeast protobuf.version "3.21" - then "${toString (lib.toInt versionMajor + 1)}.${versionMinor}.${versionPatch}" - else protobuf.version; + # protobuf 21 corresponds with its python library 4.21 + version = "4.${protobufVersionMajor}.${protobufVersionMinor}"; sourceRoot = "${protobuf.src.name}/python"; - patches = lib.optionals (lib.versionAtLeast protobuf.version "3.22") [ + patches = lib.optionals (lib.versionAtLeast protobuf.version "22") [ # Replace the vendored abseil-cpp with nixpkgs' (substituteAll { src = ./use-nixpkgs-abseil-cpp.patch; abseil_cpp_include_path = "${lib.getDev protobuf.abseil-cpp}/include"; }) ] - ++ lib.optionals (pythonAtLeast "3.11" && lib.versionOlder protobuf.version "3.22") [ + ++ lib.optionals (pythonAtLeast "3.11" && lib.versionOlder protobuf.version "22") [ (fetchpatch { name = "support-python311.patch"; url = "https://github.com/protocolbuffers/protobuf/commit/2206b63c4649cf2e8a06b66c9191c8ef862ca519.diff"; @@ -69,14 +67,14 @@ buildPythonPackage { propagatedNativeBuildInputs = [ # For protoc of the same version. - buildPackages."protobuf${lib.versions.major protobuf.version}_${lib.versions.minor protobuf.version}" + buildPackages."protobuf_${protobufVersionMajor}" ]; setupPyGlobalFlags = [ "--cpp_implementation" ]; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.optionals (lib.versionAtLeast protobuf.version "3.22") [ + ] ++ lib.optionals (lib.versionAtLeast protobuf.version "22") [ numpy ]; @@ -90,7 +88,7 @@ buildPythonPackage { "testStrictUtf8Check" ]; - disabledTestPaths = lib.optionals (lib.versionAtLeast protobuf.version "3.23") [ + disabledTestPaths = lib.optionals (lib.versionAtLeast protobuf.version "23") [ # The following commit (I think) added some internal test logic for Google # that broke generator_test.py. There is a new proto file that setup.py is # not generating into a .py file. However, adding this breaks a bunch of diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 015e82de857e7..a08ff4c7a697f 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -11,14 +11,16 @@ buildPythonPackage rec { pname = "psutil"; - version = "5.9.5"; + version = "5.9.6"; format = "setuptools"; + inherit stdenv; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VBBjjk3znFTZV/xRzgMEis2ObWCrwPUQevUeX7Vm6zw="; + hash = "sha256-5Lkt3NfdTN0/kAGA6h4QSTLHvOI0+4iXbio7KWRBIlo="; }; buildInputs = diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index bfe33e1ec3ad9..43a06e5a9e4d4 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -8,6 +8,7 @@ , openssl , sphinxHook , sphinx-better-theme +, buildPackages }: buildPythonPackage rec { @@ -19,20 +20,29 @@ buildPythonPackage rec { # c.f. https://github.com/NixOS/nixpkgs/pull/104151#issuecomment-729750892 disabled = pythonOlder "3.6" || isPyPy; + outputs = [ "out" "doc" ]; + src = fetchPypi { inherit pname version; hash = "sha256-8AzDW9cRnx/tF7hb0QB4VRlN3iy9jeAauOuxdIdECtg="; }; - outputs = [ "out" "doc" ]; + postPatch = '' + # Preferably upstream would not depend on pg_config because config scripts are incompatible with cross-compilation, however postgresql's pc file is lacking information. + # some linker flags are added but the linker ignores them because they're incompatible + # https://github.com/psycopg/psycopg2/blob/89005ac5b849c6428c05660b23c5a266c96e677d/setup.py + substituteInPlace setup.py \ + --replace "self.pg_config_exe = self.build_ext.pg_config" 'self.pg_config_exe = "${lib.getExe' buildPackages.postgresql "pg_config"}"' + ''; nativeBuildInputs = [ - postgresql sphinxHook sphinx-better-theme ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = [ + postgresql + ] ++ lib.optionals stdenv.isDarwin [ openssl ]; @@ -45,6 +55,8 @@ buildPythonPackage rec { "psycopg2" ]; + disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ buildPackages.postgresql ]; + meta = with lib; { description = "PostgreSQL database adapter for the Python programming language"; homepage = "https://www.psycopg.org"; diff --git a/pkgs/development/python-modules/py-partiql-parser/default.nix b/pkgs/development/python-modules/py-partiql-parser/default.nix index 07855f6b32881..56036d21c1093 100644 --- a/pkgs/development/python-modules/py-partiql-parser/default.nix +++ b/pkgs/development/python-modules/py-partiql-parser/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "py-partiql-parser"; - version = "0.3.8"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "getmoto"; repo = "py-partiql-parser"; rev = "refs/tags/${version}"; - hash = "sha256-uIO06RRuUuE9qCEg/tTcn68i7vaFAAeFhxdxW9WAbuw="; + hash = "sha256-gxoBc7PjS4EQix38VNX6u9cwy4FCjENcUN1euOJJLCo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/py-stringmatching/default.nix b/pkgs/development/python-modules/py-stringmatching/default.nix index 9a1af7c13cf71..b5bdffca75909 100644 --- a/pkgs/development/python-modules/py-stringmatching/default.nix +++ b/pkgs/development/python-modules/py-stringmatching/default.nix @@ -47,6 +47,5 @@ buildPythonPackage rec { homepage = "https://github.com/anhaidgroup/py_stringmatching"; changelog = "https://github.com/anhaidgroup/py_stringmatching/blob/v${version}/CHANGES.txt"; license = licenses.bsd3; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/pybars3/default.nix b/pkgs/development/python-modules/pybars3/default.nix new file mode 100644 index 0000000000000..ad7294fd63582 --- /dev/null +++ b/pkgs/development/python-modules/pybars3/default.nix @@ -0,0 +1,38 @@ +{ python3 +, fetchPypi +, lib +, pymeta3 +, buildPythonPackage +}: +buildPythonPackage rec { + pname = "pybars3"; + version = "0.9.7"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ashH6QXlO5xbk2rxEskQR14nv3Z/efRSjBb5rx7A4lI="; + }; + + propagatedBuildInputs = [ + pymeta3 + ]; + + checkPhase = '' + runHook preCheck + ${python3.interpreter} tests.py + runHook postCheck + ''; + + pythonImportsCheck = [ + "pybars" + ]; + + meta = with lib; { + description = "Handlebars.js template support for Python 3 and 2"; + homepage = "https://github.com/wbond/pybars3"; + changelog = "https://github.com/wbond/pybars3/releases/tag/${version}"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ jfly matusf ]; + }; +} diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index e2b216d1724ba..186dca2c17d0a 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -12,6 +12,7 @@ , pytestCheckHook , libxcrypt , makeSetupHook +, darwin }: let setupHook = makeSetupHook { name = "pybind11-setup-hook"; @@ -22,6 +23,19 @@ pythonSitePackages = "${python}/${python.sitePackages}"; }; } ./setup-hook.sh; + + # clang 16 defaults to C++17, which results in the use of aligned allocations by pybind11. + # libc++ supports aligned allocations via `posix_memalign`, which is available since 10.6, + # but clang has a check hard-coded requiring 10.13 because that’s when Apple first shipped a + # support for C++17 aligned allocations on macOS. + # Tell clang we’re targeting 10.13 on x86_64-darwin while continuing to use the default SDK. + stdenv' = if stdenv.isDarwin && stdenv.isx86_64 + then python.stdenv.override (oldStdenv: { + buildPlatform = oldStdenv.buildPlatform // { darwinMinVersion = "10.13"; }; + targetPlatform = oldStdenv.targetPlatform // { darwinMinVersion = "10.13"; }; + hostPlatform = oldStdenv.hostPlatform // { darwinMinVersion = "10.13"; }; + }) + else python.stdenv; in buildPythonPackage rec { pname = "pybind11"; version = "2.11.1"; @@ -41,6 +55,8 @@ in buildPythonPackage rec { buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ]; propagatedBuildInputs = [ setupHook ]; + stdenv = stdenv'; + dontUseCmakeBuildDir = true; # Don't build tests if not needed, read the doInstallCheck value at runtime diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index 11114257714d2..ddb4482ef3e7d 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -36,6 +36,11 @@ buildPythonPackage { format = "setuptools"; + patches = [ + # backport of https://github.com/pydicom/pydicom/commit/2513a20cc41743a42bdb86f4cbb4873899b7823c + ./pillow-10.1.0-compat.patch + ]; + propagatedBuildInputs = [ numpy pillow diff --git a/pkgs/development/python-modules/pydicom/pillow-10.1.0-compat.patch b/pkgs/development/python-modules/pydicom/pillow-10.1.0-compat.patch new file mode 100644 index 0000000000000..2599f955f7ddc --- /dev/null +++ b/pkgs/development/python-modules/pydicom/pillow-10.1.0-compat.patch @@ -0,0 +1,29 @@ +diff --git a/pydicom/pixel_data_handlers/pillow_handler.py b/pydicom/pixel_data_handlers/pillow_handler.py +index ff781025d..a44eb9a41 100644 +--- a/pydicom/pixel_data_handlers/pillow_handler.py ++++ b/pydicom/pixel_data_handlers/pillow_handler.py +@@ -119,18 +119,12 @@ def _decompress_single_frame( + # space prior to compression, setting the value of "mode" to YCbCr + # signals Pillow to not apply any color transformation upon + # decompression. +- if (transfer_syntax in PillowJPEGTransferSyntaxes and +- photometric_interpretation == 'RGB'): +- if 'adobe_transform' not in image.info: +- color_mode = 'YCbCr' +- image.tile = [( +- 'jpeg', +- image.tile[0][1], +- image.tile[0][2], +- (color_mode, ''), +- )] +- image.mode = color_mode +- image.rawmode = color_mode ++ if ( ++ transfer_syntax in PillowJPEGTransferSyntaxes ++ and photometric_interpretation == 'RGB' ++ and "adobe_transform" not in image.info ++ ): ++ image.draft("YCbCr", image.size) + return image + + diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 5352ef65d7f31..ad506999d5958 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -60,6 +60,10 @@ buildPythonPackage rec { ${python.pythonOnBuildForHost.interpreter} buildconfig/config.py ''; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; + }; + checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index 5788618141404..d21fcddc42ee8 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -5,6 +5,7 @@ , configparser , distro , fetchFromGitHub +, fetchpatch , gevent , jinja2 , paramiko @@ -30,6 +31,15 @@ buildPythonPackage rec { hash = "sha256-BYd2UYQJD/HsmpnlQjZvjfg17ShPuA3j4rtv6fTQK/A="; }; + patches = [ + # https://github.com/Fizzadar/pyinfra/pull/1018 + (fetchpatch { + name = "bump-paramiko-major-version.patch"; + url = "https://github.com/Fizzadar/pyinfra/commit/62a8f081279779c4f1eed246139f615cf5fed642.patch"; + hash = "sha256-aT9SeSqXOD76LFzf6R/MWTtavcW6fZT7chkVg9aXiBg="; + }) + ]; + propagatedBuildInputs = [ click colorama diff --git a/pkgs/development/python-modules/pymeta3/default.nix b/pkgs/development/python-modules/pymeta3/default.nix new file mode 100644 index 0000000000000..f0350c4153b74 --- /dev/null +++ b/pkgs/development/python-modules/pymeta3/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage +, fetchPypi +, lib +}: +buildPythonPackage rec { + pname = "pymeta3"; + version = "0.5.1"; + format = "setuptools"; + + src = fetchPypi { + inherit version; + pname = "PyMeta3"; + hash = "sha256-GL2jJtmpu/WHv8DuC8loZJZNeLBnKIvPVdTZhoHQW8s="; + }; + + doCheck = false; # Tests do not support Python3 + + pythonImportsCheck = [ + "pymeta" + ]; + + meta = with lib; { + description = "Pattern-matching language based on OMeta for Python 3 and 2"; + homepage = "https://github.com/wbond/pymeta3"; + changelog = "https://github.com/wbond/pymeta3/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ jfly matusf ]; + }; +} diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix index 9b801e42c8a97..463de728aea29 100644 --- a/pkgs/development/python-modules/pympler/default.nix +++ b/pkgs/development/python-modules/pympler/default.nix @@ -19,9 +19,10 @@ buildPythonPackage rec { patches = [ # Fixes a TypeError on Python 3.11 # (see https://github.com/pympler/pympler/issues/148) + # https://github.com/pympler/pympler/pull/149 (fetchpatch { name = "${pname}-python-3.11-compat.patch"; - url = "https://github.com/pympler/pympler/pull/149.patch"; + url = "https://github.com/pympler/pympler/commit/0fd8ad8da39207bd0dcb28bdac0407e04744c965.patch"; hash = "sha256-6MK0AuhVhQkUzlk29HUh1+mSbfsVTBJ1YBtYNIFhh7U="; }) ]; diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index d7e69706e51f8..1c21e6b90c1a4 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -2,9 +2,10 @@ , stdenv , buildPythonPackage , pythonOlder -, fetchPypi +, fetchFromGitHub +, pytestCheckHook +, python , swig -, xcbuild , mupdf , freetype , harfbuzz @@ -13,33 +14,32 @@ , libjpeg_turbo , gumbo , memstreamHook +, fonttools }: -buildPythonPackage rec { +let + # PyMuPDF needs the C++ bindings generated + mupdf-cxx = mupdf.override { enableOcr = true; enableCxx = true; enablePython = true; python3 = python; }; +in buildPythonPackage rec { pname = "pymupdf"; - version = "1.23.3"; + version = "1.23.6"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "PyMuPDF"; - inherit version; - hash = "sha256-AhR4rmx26IWSQdu5cGEskIColX2L1pe7oLRTHcHPT4c="; + src = fetchFromGitHub { + owner = "pymupdf"; + repo = "PyMuPDF"; + rev = version; + hash = "sha256-60KT5+EGP+s7HD4UIeaf9x2QVNU9IUbC5WKEJbrIBCI="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace '/usr/include/mupdf' ${mupdf.dev}/include/mupdf - ''; nativeBuildInputs = [ + pytestCheckHook swig - ] ++ lib.optionals stdenv.isDarwin [ - xcbuild ]; buildInputs = [ - mupdf freetype harfbuzz openjpeg @@ -50,10 +50,40 @@ buildPythonPackage rec { memstreamHook ]; - doCheck = false; + propagatedBuildInputs = [ + mupdf-cxx + ]; + + env = { + # force using system MuPDF (must be defined in environment and empty) + PYMUPDF_SETUP_MUPDF_BUILD = ""; + # provide MuPDF paths + PYMUPDF_MUPDF_LIB = "${lib.getLib mupdf-cxx}/lib"; + PYMUPDF_MUPDF_INCLUDE = "${lib.getDev mupdf-cxx}/include"; + }; + + # TODO: manually add mupdf rpath until upstream fixes it + postInstall = lib.optionalString stdenv.isDarwin '' + for lib in */*.so $out/${python.sitePackages}/*/*.so; do + install_name_tool -add_rpath ${lib.getLib mupdf-cxx}/lib "$lib" + done + ''; + + checkInputs = [ + fonttools + ]; + + disabledTests = [ + # fails for indeterminate reasons + "test_color_count" + ] ++ lib.optionals stdenv.isDarwin [ + # darwin does not support OCR right now + "test_tesseract" + ]; pythonImportsCheck = [ "fitz" + "fitz_new" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix index 251c08f026087..bd3931e4f1dc3 100644 --- a/pkgs/development/python-modules/pyngrok/default.nix +++ b/pkgs/development/python-modules/pyngrok/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyngrok"; - version = "7.0.0"; + version = "7.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-YOE9t/W4LsZqBFMbJRbyB6oQqrqW02iecqQYR6yZfV8="; + hash = "sha256-wTK0DnsZBbB9nHMe8hUQjMl3sbv0RaFGiU4NSJshPrY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 4e67fd0783d52..bc841cc2fd4e0 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { postPatch = '' # remove cryptography pin - sed "/cryptography/ s/,<[0-9]*//g" setup.py + sed -i "/cryptography/ s/,<[0-9]*//g" setup.py ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 0d77ed937cf1f..576688accc075 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -100,11 +100,11 @@ buildPythonPackage rec { "pyproj.exceptions" ]; - meta = { + meta = with lib; { description = "Python interface to PROJ library"; homepage = "https://github.com/pyproj4/pyproj"; changelog = "https://github.com/pyproj4/pyproj/blob/${src.rev}/docs/history.rst"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ lsix dotlambda ]; + license = licenses.mit; + maintainers = with maintainers; teams.geospatial.members ++ [ lsix dotlambda ]; }; } diff --git a/pkgs/development/python-modules/pytest-datadir/default.nix b/pkgs/development/python-modules/pytest-datadir/default.nix index bca05a0010a5d..90b7e6f55e2b8 100644 --- a/pkgs/development/python-modules/pytest-datadir/default.nix +++ b/pkgs/development/python-modules/pytest-datadir/default.nix @@ -1,30 +1,41 @@ { lib , buildPythonPackage +, pythonOlder , fetchFromGitHub +, setuptools , setuptools-scm , pytestCheckHook }: buildPythonPackage rec { pname = "pytest-datadir"; - version = "1.4.1"; + version = "1.5.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "gabrielcnr"; repo = "pytest-datadir"; - rev = "refs/tags/${version}"; - hash = "sha256-HyJ0rU1nHqRv8SHFS8m3GZ5409+JZIkoDgIVjy4ol54="; + rev = "refs/tags/v${version}"; + hash = "sha256-sRLqL+8Jf5Kz+qscuG3hClUuPA+33PQa+ob1ht/7CJE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "pytest_datadir" ]; meta = with lib; { description = "Pytest plugin for manipulating test data directories and files"; homepage = "https://github.com/gabrielcnr/pytest-datadir"; + changelog = "https://github.com/gabrielcnr/pytest-datadir/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ kira-bruneau ]; }; diff --git a/pkgs/development/python-modules/pytest-tornado/default.nix b/pkgs/development/python-modules/pytest-tornado/default.nix index bd1ce2a597b17..b1e46802b450a 100644 --- a/pkgs/development/python-modules/pytest-tornado/default.nix +++ b/pkgs/development/python-modules/pytest-tornado/default.nix @@ -25,6 +25,5 @@ buildPythonPackage rec { description = "A py.test plugin providing fixtures and markers to simplify testing of asynchronous tornado applications."; homepage = "https://github.com/eugeniy/pytest-tornado"; license = licenses.asl20; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index d557bcf15e937..a00b59c425b7f 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -3,10 +3,10 @@ , callPackage , pythonOlder , fetchPypi -, isPyPy , writeText # build +, setuptools , setuptools-scm # propagates @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "7.4.2"; - format = "pyproject"; + version = "7.4.3"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-p2YlnPq1ZKKtUssarhuIGnXD6340yjd5aXwj7UfEcGk="; + hash = "sha256-2YnRNpgt5OOynavMg4rVgcZOjtUsEfvobd69naCBjNU="; }; outputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ + setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index 68150935da96a..6e3f406fe5a30 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -1,18 +1,28 @@ { lib , buildPythonPackage , fetchFromGitHub + +# build-system +, setuptools + +# dependencies , ecdsa , rsa -, pycrypto , pyasn1 -, pycryptodome + +# optional-dependencies , cryptography +, pycrypto +, pycryptodome + +# tests , pytestCheckHook }: buildPythonPackage rec { pname = "python-jose"; version = "3.3.0"; + pyproject = true; src = fetchFromGitHub { owner = "mpdavis"; @@ -21,27 +31,43 @@ buildPythonPackage rec { hash = "sha256-6VGC6M5oyGCOiXcYp6mpyhL+JlcYZKIqOQU9Sm/TkKM="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner",' "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - cryptography ecdsa pyasn1 - pycrypto - pycryptodome rsa ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + passthru.optional-dependencies = { + cryptography = [ + cryptography + ]; + pycrypto = [ + pycrypto + ]; + pycryptodome = [ + pycryptodome + ]; + }; - postPatch = '' - substituteInPlace setup.py \ - --replace '"pytest-runner",' "" - ''; + pythonImportsCheck = [ + "jose" + ]; - pythonImportsCheck = [ "jose" ]; + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); meta = with lib; { + changelog = "https://github.com/mpdavis/python-jose/releases/tag/${version}"; homepage = "https://github.com/mpdavis/python-jose"; description = "A JOSE implementation in Python"; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-oauth2/default.nix b/pkgs/development/python-modules/python-oauth2/default.nix index bc3c13478e61b..cd45cbe7d284b 100644 --- a/pkgs/development/python-modules/python-oauth2/default.nix +++ b/pkgs/development/python-modules/python-oauth2/default.nix @@ -18,6 +18,5 @@ buildPythonPackage rec { description = "Framework that aims at making it easy to provide authentication via OAuth 2.0 within an application stack"; homepage = "https://github.com/wndhydrnt/python-oauth2"; license = licenses.mit; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index 07af9047fe183..70272d54ac8d6 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -29,6 +29,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; + }; + nativeCheckInputs = [ pytestCheckHook ]; postPatch = '' diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index f640012d9a5ed..80094a1a350d7 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.3.1"; + version = "3.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-C+jQN0QXZzH0IKdC3O5uPNAEd+XSffi3nkwFSv2HqPY="; + hash = "sha256-JgTmhnKVzv9m8//GMQjvCFPNJQM/7dalCD5bk6fWBPc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rocket-errbot/default.nix b/pkgs/development/python-modules/rocket-errbot/default.nix index 29970e7fd281e..65b7c62b9e34c 100644 --- a/pkgs/development/python-modules/rocket-errbot/default.nix +++ b/pkgs/development/python-modules/rocket-errbot/default.nix @@ -11,7 +11,9 @@ buildPythonPackage rec { # remove with 1.2.6 patches = [ (fetchpatch { - url = "https://github.com/errbotio/rocket/pull/1.patch"; + # https://github.com/errbotio/rocket/pull/1 + name = "errbotio-rocket-pull-1.patch"; + url = "https://github.com/errbotio/rocket/compare/f1a52fe17164f83bccce5e6a1935fc5071c2265f...d69adcd49de5d78bd80f952a2ee31e6a0bac4e3d.patch"; sha256 = "1s668yv5b86b78vbqwhcl44k2l16c9bhk3199yy9hayf0vkxnwif"; }) ]; diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 3617648186057..748b6abecf452 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.6.2"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "boto"; repo = pname; rev = version; - hash = "sha256-hoHNblnCSZteHmI5sJN72WrX7tveNFZqmL1jFKQmdag="; + hash = "sha256-EvLqRvm9E1Taf+JvbhQbfJqIlbu2a+rB2MX0IO90x98="; }; propagatedBuildInputs = [ botocore ]; @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for managing Amazon S3 transfers"; homepage = "https://github.com/boto/s3transfer"; + changelog = "https://github.com/boto/s3transfer/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ nickcao ]; }; diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index fdb052a474991..086c53108976e 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -8,12 +8,15 @@ , trio , trio-websocket , urllib3 +, pytest-trio , nixosTests +, stdenv +, python }: buildPythonPackage rec { pname = "selenium"; - version = "4.12.0"; + version = "4.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,18 +26,30 @@ buildPythonPackage rec { repo = "selenium"; # check if there is a newer tag with or without -python suffix rev = "refs/tags/selenium-${version}"; - hash = "sha256-A2lI40bPSIri/0yp6C3aJZBX5p6ON1fWGfJTcul9/2o="; + hash = "sha256-cTMCKfFLUlJDbTUQA3Z/pKCE1RQQRMb4K8hKKn9HqvU="; }; - postPatch = '' - substituteInPlace py/selenium/webdriver/firefox/service.py \ - --replace 'DEFAULT_EXECUTABLE_PATH = "geckodriver"' 'DEFAULT_EXECUTABLE_PATH = "${geckodriver}/bin/geckodriver"' - ''; - preConfigure = '' cd py ''; + postInstall = '' + DST_PREFIX=$out/lib/${python.libPrefix}/site-packages/selenium/webdriver/ + DST_REMOTE=$DST_PREFIX/remote/ + DST_FF=$DST_PREFIX/firefox + cp ../rb/lib/selenium/webdriver/atoms/getAttribute.js $DST_REMOTE + cp ../rb/lib/selenium/webdriver/atoms/isDisplayed.js $DST_REMOTE + cp ../rb/lib/selenium/webdriver/atoms/findElements.js $DST_REMOTE + cp ../javascript/cdp-support/mutation-listener.js $DST_REMOTE + cp ../third_party/js/selenium/webdriver.json $DST_FF/webdriver_prefs.json + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $DST_PREFIX/common/macos + cp ../common/manager/macos/selenium-manager $DST_PREFIX/common/macos + '' + lib.optionalString stdenv.isLinux '' + mkdir -p $DST_PREFIX/common/linux/ + cp ../common/manager/linux/selenium-manager $DST_PREFIX/common/linux/ + ''; + propagatedBuildInputs = [ certifi trio @@ -44,6 +59,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-trio ]; passthru.tests = { diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index d138bcb2940cc..b389da6f1c994 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -24,6 +24,7 @@ , pyramid , pyrsistent , pyspark +, pysocks , pytest-forked , pytest-localserver , pytest-watch @@ -40,7 +41,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.33.1"; + version = "1.35.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +50,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-a73SZssiS1i3pfble0dMw6st5Hq4AIdJA+dnT617kXg="; + hash = "sha256-wV38DW5YfY+f5Qg/I7JPQ5R8TyqqdjwHKfr5XjT2vFA="; }; propagatedBuildInputs = [ @@ -120,6 +121,7 @@ buildPythonPackage rec { mock pure-eval pyrsistent + pysocks pytest-forked pytest-localserver pytest-watch diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 488e936abb82a..7f87ddf6befab 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "shapely"; - version = "2.0.1"; + version = "2.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Zqaxo+cuzpf8hVNqKBR2+bd5TeLmRsqKRRfi48FEaJM="; + hash = "sha256-FxPMBMFxuv/Fslm6hTHFiswqMBcHt/Ah2IoV7QkGSec="; }; nativeBuildInputs = [ @@ -44,8 +44,10 @@ buildPythonPackage rec { pytestCheckHook ]; + # Fix a ModuleNotFoundError. Investigated at: + # https://github.com/NixOS/nixpkgs/issues/255262 preCheck = '' - rm -r shapely # prevent import of local shapely + cd $out ''; disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index 4afa930cac0b4..593a7b7d82ead 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -5,7 +5,7 @@ , cmake , qt5 , libxcrypt -, llvmPackages +, llvmPackages_15 }: stdenv.mkDerivation { @@ -21,12 +21,12 @@ stdenv.mkDerivation { cd sources/shiboken2 ''; - CLANG_INSTALL_DIR = llvmPackages.libclang.out; + CLANG_INSTALL_DIR = llvmPackages_15.libclang.out; nativeBuildInputs = [ cmake ]; buildInputs = [ - llvmPackages.libclang + llvmPackages_15.libclang python python.pkgs.setuptools qt5.qtbase diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index f495e463864d2..b136d9e94dac6 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.19.1"; + version = "3.19.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LUD0Eoj7fDGiR0yhIZOto6kn7Ud0TXyDTO1UTbRMJiQ="; + hash = "sha256-+HHtU6sxxwISciLxiwa5m1zj7h/SLDmRxOZNqW5FQSY="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index 14530ec68abae..0c953e20c5fba 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -3,13 +3,14 @@ , fetchFromGitHub , buildPythonPackage , pythonOlder +, setuptools , regex }: buildPythonPackage rec { pname = "somajo"; - version = "2.3.0"; - format = "setuptools"; + version = "2.3.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,9 +18,13 @@ buildPythonPackage rec { owner = "tsproisl"; repo = "SoMaJo"; rev = "refs/tags/v${version}"; - hash = "sha256-CNGSol77Q3uAZPLeV43NhIffO31tnZoMYOsevkZh3pc="; + hash = "sha256-3A2et4pl92LsRtEx2Ki8Soz3n1nZEGQGPc3ZIBDojNM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ regex ]; diff --git a/pkgs/development/python-modules/sphinx-notfound-page/default.nix b/pkgs/development/python-modules/sphinx-notfound-page/default.nix index edc8e2ce6b058..e9f5d9c4519dc 100644 --- a/pkgs/development/python-modules/sphinx-notfound-page/default.nix +++ b/pkgs/development/python-modules/sphinx-notfound-page/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "sphinx-notfound-page"; - version = "0.8.3"; + version = "1.0.0"; format = "pyproject"; outputs = [ "out" "doc" ]; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "readthedocs"; repo = "sphinx-notfound-page"; rev = version; - hash = "sha256-9iP6X2dqtMC3+CIrNI3fGDLL8xyXVAWNhN90DlMa9JU="; + hash = "sha256-tG71UuYbdlWNgq6Y5xRH3aWc9/eTr/RlsRNWSUjrbBE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx-pytest/default.nix b/pkgs/development/python-modules/sphinx-pytest/default.nix index a034b2b3f01d7..7bc41418fe46a 100644 --- a/pkgs/development/python-modules/sphinx-pytest/default.nix +++ b/pkgs/development/python-modules/sphinx-pytest/default.nix @@ -9,18 +9,19 @@ buildPythonPackage rec { pname = "sphinx-pytest"; - version = "0.1.1"; + version = "0.2.0"; + pyproject = true; src = fetchFromGitHub { owner = "chrisjsewell"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-26cV6mfNos/1YLhz5aVQVb54qsiyHWdcHtvmmSzMurk="; + hash = "sha256-oSBBt+hSMs4mvGqibQHoYHXr2j/bpsGOnIMfwfTfWKQ="; }; - format = "pyproject"; - - nativeBuildInputs = [ flit-core ]; + nativeBuildInputs = [ + flit-core + ]; propagatedBuildInputs = [ sphinx @@ -30,13 +31,16 @@ buildPythonPackage rec { pytest ]; - pythonImportsCheck = [ "sphinx_pytest" ]; + pythonImportsCheck = [ + "sphinx_pytest" + ]; nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { + changelog = "https://github.com/sphinx-extensions2/sphinx-pytest/releases/tag/v${version}"; description = "Helpful pytest fixtures for Sphinx extensions"; homepage = "https://github.com/chrisjsewell/sphinx-pytest"; license = licenses.mit; diff --git a/pkgs/development/python-modules/sphinx-sitemap/default.nix b/pkgs/development/python-modules/sphinx-sitemap/default.nix index ecb477980c1d9..b14d669a10c9a 100644 --- a/pkgs/development/python-modules/sphinx-sitemap/default.nix +++ b/pkgs/development/python-modules/sphinx-sitemap/default.nix @@ -1,7 +1,10 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, setuptools , sphinx +, sphinx-pytest +, pytestCheckHook }: let pname = "sphinx-sitemap"; @@ -11,18 +14,25 @@ buildPythonPackage { inherit pname version; pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-mEvvBou9vCbPriCai2E5LpaBq8kZG0d80w2kBuOmDuU="; + src = fetchFromGitHub { + owner = "jdillard"; + repo = "sphinx-sitemap"; + rev = "refs/tags/v${version}"; + hash = "sha256-R8nAaEPd2vQs9Z0Fa5yvTP0KP3O+DnIJLPeISZ10Xtk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ sphinx ]; - # Latest tests do not pass on Sphinx5, although it is supported - # Ref: https://github.com/jdillard/sphinx-sitemap/blob/ce244e9e1e05f09c566432f6a89bcd6f6ebe83bf/tox.ini#L18C25-L18C25 - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + sphinx-pytest + ]; meta = with lib; { changelog = "https://github.com/jdillard/sphinx-sitemap/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch b/pkgs/development/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch deleted file mode 100644 index 805e724d0c8c1..0000000000000 --- a/pkgs/development/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 181617387841b695ee77b162babf9fb177002fcb Mon Sep 17 00:00:00 2001 -From: toonn <toonn@toonn.io> -Date: Mon, 20 Sep 2021 11:39:46 +0200 -Subject: [PATCH] test-images: Use normalization equivalent character -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -One of the test images used a combining character `ä` that can be -encoded multiple ways. This means the file's name can end up encoded -differently depending on whether/which normal form the filesystem uses. - -For Nix this causes a different hash for a FOD depending on the -filesystem where it is evaluated. This is problematic because hashes -fail to match up when evaluating the FOD across multiple platforms. ---- - tests/roots/test-images/index.rst | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/roots/test-images/index.rst b/tests/roots/test-images/index.rst -index 14a2987..219842e 100644 ---- a/tests/roots/test-images/index.rst -+++ b/tests/roots/test-images/index.rst -@@ -13,7 +13,7 @@ test-image - - The caption of img - --.. image:: testimäge.png -+.. image:: testimæge.png - - .. image:: rimg.png - :target: https://www.sphinx-doc.org/ --- -2.17.2 (Apple Git-113) - diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index eb559c4148600..6dac59106f5f2 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , pythonOlder , fetchFromGitHub @@ -30,29 +30,29 @@ # check phase , cython +, filelock , html5lib , pytestCheckHook -, typed-ast }: buildPythonPackage rec { pname = "sphinx"; - version = "5.3.0"; + version = "7.2.6"; format = "pyproject"; - - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "sphinx-doc"; - repo = pname; + repo = "sphinx"; rev = "refs/tags/v${version}"; - hash = "sha256-80bVg1rfBebgSOKbWkzP84vpm39iLgM8lWlVD64nSsQ="; postFetch = '' - cd $out - mv tests/roots/test-images/testimäge.png \ - tests/roots/test-images/testimæge.png - patch -p1 < ${./0001-test-images-Use-normalization-equivalent-character.patch} + # Change ä to æ in file names, since ä can be encoded multiple ways on different + # filesystems, leading to different hashes on different platforms. + cd "$out"; + mv tests/roots/test-images/{testimäge,testimæge}.png + sed -i 's/testimäge/testimæge/g' tests/{test_build*.py,roots/test-images/index.rst} ''; + hash = "sha256-IjpRGeGpGfzrEvwIKtuu2l1S74w8W+AbqDOGnWwtRck="; }; nativeBuildInputs = [ @@ -60,8 +60,8 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - babel alabaster + babel docutils imagesize jinja2 @@ -84,66 +84,22 @@ buildPythonPackage rec { importlib-metadata ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ cython + filelock html5lib pytestCheckHook - ] ++ lib.optionals (pythonOlder "3.8") [ - typed-ast ]; preCheck = '' - export HOME=$(mktemp -d) + export HOME=$TMPDIR ''; disabledTests = [ # requires network access - "test_anchors_ignored" - "test_defaults" - "test_defaults_json" "test_latex_images" - - # requires imagemagick (increases build closure size), doesn't - # test anything substantial - "test_ext_imgconverter" - - # fails with pygments 2.14 - # TODO remove for sphinx 6 - "test_viewcode" - "test_additional_targets_should_be_translated" - "test_additional_targets_should_not_be_translated" - - # sphinx.errors.VersionRequirementError: The alabaster extension - # used by this project needs at least Sphinx v1.6; it therefore - # cannot be built with this version. - "test_needs_sphinx" - - # Likely due to pygments 2.14 update - # AssertionError: assert '5:11:17\u202fAM' == '5:11:17 AM' - "test_format_date" - ] ++ lib.optionals stdenv.isDarwin [ - # Due to lack of network sandboxing can't guarantee port 7777 isn't bound - "test_inspect_main_url" - "test_auth_header_uses_first_match" - "test_linkcheck_allowed_redirects" - "test_linkcheck_request_headers" - "test_linkcheck_request_headers_no_slash" - "test_follows_redirects_on_HEAD" - "test_get_after_head_raises_connection_error" - "test_invalid_ssl" - "test_connect_to_selfsigned_with_tls_verify_false" - "test_connect_to_selfsigned_with_tls_cacerts" - "test_connect_to_selfsigned_with_requests_env_var" - "test_connect_to_selfsigned_nonexistent_cert_file" - "test_TooManyRedirects_on_HEAD" - "test_too_many_requests_retry_after_int_del" - "test_too_many_requests_retry_after_HTTP_date" - "test_too_many_requests_retry_after_without_header" - "test_too_many_requests_user_timeout" - "test_raises_for_invalid_status" - "test_auth_header_no_match" - "test_follows_redirects_on_GET" - "test_connect_to_selfsigned_fails" ] ++ lib.optionals isPyPy [ # PyPy has not __builtins__ which get asserted # https://doc.pypy.org/en/latest/cpython_differences.html#miscellaneous @@ -159,14 +115,39 @@ buildPythonPackage rec { "test_partialfunction" ]; - meta = with lib; { + meta = { description = "Python documentation generator"; longDescription = '' - A tool that makes it easy to create intelligent and beautiful - documentation for Python projects + Sphinx makes it easy to create intelligent and beautiful documentation. + + Here are some of Sphinx’s major features: + - Output formats: HTML (including Windows HTML Help), LaTeX (for printable + PDF versions), ePub, Texinfo, manual pages, plain text + - Extensive cross-references: semantic markup and automatic links for + functions, classes, citations, glossary terms and similar pieces of + information + - Hierarchical structure: easy definition of a document tree, with + automatic links to siblings, parents and children + - Automatic indices: general index as well as a language-specific module + indices + - Code handling: automatic highlighting using the Pygments highlighter + - Extensions: automatic testing of code snippets, inclusion of docstrings + from Python modules (API docs) via built-in extensions, and much more + functionality via third-party extensions. + - Themes: modify the look and feel of outputs via creating themes, and + re-use many third-party themes. + - Contributed extensions: dozens of extensions contributed by users; most + of them installable from PyPI. + + Sphinx uses the reStructuredText markup language by default, and can read + MyST markdown via third-party extensions. Both of these are powerful and + straightforward to use, and have functionality for complex documentation + and publishing workflows. They both build upon Docutils to parse and write + documents. ''; homepage = "https://www.sphinx-doc.org"; - license = licenses.bsd3; - maintainers = teams.sphinx.members; + changelog = "https://www.sphinx-doc.org/en/master/changes.html"; + license = lib.licenses.bsd3; + maintainers = lib.teams.sphinx.members; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix index 32470e98b4e0f..bfe5739b2a7b0 100644 --- a/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { "sphinxcontrib.actdiag" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx actdiag extension"; homepage = "https://github.com/blockdiag/sphinxcontrib-actdiag"; diff --git a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix index ad89521a5b59b..77fe8929b2faa 100644 --- a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix @@ -25,6 +25,8 @@ buildPythonPackage rec { # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension for running sphinx-apidoc on each build"; homepage = "https://github.com/sphinx-contrib/apidoc"; diff --git a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix index ef7a50382c6e2..3e8fe11d192fe 100644 --- a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix @@ -1,26 +1,36 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder +, flit-core }: buildPythonPackage rec { pname = "sphinxcontrib-applehelp"; - version = "1.0.2"; - disabled = isPy27; + version = "1.0.7"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - sha256 = "a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58"; + pname = "sphinxcontrib_applehelp"; + inherit version; + hash = "sha256-Of3I12LTOwGn2PAmo7fXFWPqO3J4fV8ArYRlvZ1t+/o="; }; + nativeBuildInputs = [ + flit-core + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books"; homepage = "https://github.com/sphinx-doc/sphinxcontrib-applehelp"; - license = licenses.bsd0; + license = licenses.bsd2; maintainers = teams.sphinx.members; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix b/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix index 2da9c2d92f6ab..597dac22a0158 100644 --- a/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix @@ -24,6 +24,8 @@ buildPythonPackage rec { "sphinxcontrib.asyncio" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension to add asyncio-specific markups"; homepage = "https://github.com/aio-libs/sphinxcontrib-asyncio"; diff --git a/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix b/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix index 8589689ec8d17..ca968f3f232c2 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "sphinxcontrib.bayesnet" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { homepage = "https://github.com/jluttine/sphinx-bayesnet"; description = "Bayesian networks and factor graphs in Sphinx using TikZ syntax"; diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 8c7cd9b966a90..2d8dca9912909 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -32,6 +32,8 @@ buildPythonPackage rec { "sphinxcontrib.bibtex" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "A Sphinx extension for BibTeX style citations"; homepage = "https://github.com/mcmtroffaes/sphinxcontrib-bibtex"; diff --git a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix index 8d22c5806764e..44c4de9570dd8 100644 --- a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix @@ -27,6 +27,8 @@ buildPythonPackage rec { unittestFlagsArray = [ "-s" "tests" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx blockdiag extension"; homepage = "https://github.com/blockdiag/sphinxcontrib-blockdiag"; diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix index 111db7922b49c..dc7798015cb75 100644 --- a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -37,6 +37,8 @@ buildPythonPackage rec { "sphinxcontrib.confluencebuilder" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Confluence builder for sphinx"; homepage = "https://github.com/sphinx-contrib/confluencebuilder"; diff --git a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix index 293f4c856ef53..b254d4b64327b 100644 --- a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix @@ -1,24 +1,36 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder +, flit-core }: buildPythonPackage rec { pname = "sphinxcontrib-devhelp"; - version = "1.0.2"; + version = "1.0.5"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - sha256 = "ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4"; + pname = "sphinxcontrib_devhelp"; + inherit version; + hash = "sha256-Y7QeDTggfKQOu+q89NjlH3bAPnjNYavhGM9ENcc9QhI="; }; + nativeBuildInputs = [ + flit-core + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document."; homepage = "https://github.com/sphinx-doc/sphinxcontrib-devhelp"; - license = licenses.bsd0; + license = licenses.bsd2; maintainers = teams.sphinx.members; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix b/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix index e48b24c3644f7..d7cea5a6418a5 100644 --- a/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { # No tests present upstream doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx excel-table extension"; homepage = "https://github.com/hackerain/sphinxcontrib-excel-table"; diff --git a/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix b/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix index 57535c6f137c7..79a326150073f 100644 --- a/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { # Ensure package importing works pythonImportsCheck = [ "sphinxcontrib.fulltoc" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Include a full table of contents in your Sphinx HTML sidebar"; homepage = "https://sphinxcontrib-fulltoc.readthedocs.org/"; diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 901132176ed9d..56fae964eca0c 100644 --- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -1,26 +1,36 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder +, flit-core }: buildPythonPackage rec { pname = "sphinxcontrib-htmlhelp"; - version = "2.0.0"; - disabled = isPy27; + version = "2.0.4"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - sha256 = "f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2"; + pname = "sphinxcontrib_htmlhelp"; + inherit version; + hash = "sha256-bCahGKBbdgAHOEKbckoFaNveW3I5GmiFd9oI8RiRCSo="; }; + nativeBuildInputs = [ + flit-core + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension which renders HTML help files"; homepage = "https://github.com/sphinx-doc/sphinxcontrib-htmlhelp"; - license = licenses.bsd0; + license = licenses.bsd2; maintainers = teams.sphinx.members; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix b/pkgs/development/python-modules/sphinxcontrib-httpdomain/default.nix index ae4a571f0bb53..96dad44be8bf2 100644 --- a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-httpdomain/default.nix @@ -19,6 +19,8 @@ buildPythonPackage rec { # https://bitbucket.org/pypa/setuptools/issue/137/typeerror-unorderable-types-str-nonetype doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Provides a Sphinx domain for describing RESTful HTTP APIs"; homepage = "https://bitbucket.org/birkenfeld/sphinx-contrib"; diff --git a/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix b/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix index 1905659b25f0b..16c57f5886b78 100644 --- a/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , flit-core , pytestCheckHook , sphinx @@ -8,16 +9,29 @@ buildPythonPackage rec { pname = "sphinxcontrib-jquery"; - version = "3.0.0"; + version = "4.1"; format = "pyproject"; src = fetchFromGitHub { owner = "sphinx-contrib"; repo = "jquery"; rev = "refs/tags/v${version}"; - hash = "sha256-argG+jMUqLiWo4lKWAmHmUxotHl+ddJuJZ/zcUl9u5Q="; + hash = "sha256-ZQGQcVmhWREFa2KyaOKdTz5W2AS2ur7pFp8qZ2IkxSE="; }; + patches = [ + (fetchpatch { + name = "fix-tests-with-sphinx7.1.patch"; + url = "https://github.com/sphinx-contrib/jquery/commit/ac97ce5202b05ddb6bf4e5b77151a8964b6bf632.patch"; + hash = "sha256-dc9bhr/af3NmrIfoVabM1lNpXbGVsJoj7jq0E1BAtHw="; + }) + (fetchpatch { + name = "fix-tests-with-sphinx7.2.patch"; + url = "https://github.com/sphinx-contrib/jquery/commit/03f1595b3793e087a407933fbcb757bdd3f558fc.patch"; + hash = "sha256-4gNG1DL/63N2FwXDy5fMApZpf/AGOGBruwPuVqgnVkc="; + }) + ]; + nativeBuildInputs = [ flit-core ]; @@ -31,6 +45,8 @@ buildPythonPackage rec { sphinx ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Extension to include jQuery on newer Sphinx releases"; longDescription = '' diff --git a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix index da630c6ee96dd..2b8c2cd75826e 100644 --- a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix @@ -17,6 +17,8 @@ buildPythonPackage rec { # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "sphinxcontrib-jsmath is a sphinx extension which renders display math in HTML via JavaScript."; homepage = "https://github.com/sphinx-doc/sphinxcontrib-jsmath"; diff --git a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix index 248030c241bfc..30c94a088fbff 100644 --- a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix @@ -28,6 +28,8 @@ buildPythonPackage rec { "sphinxcontrib.katex" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension using KaTeX to render math in HTML"; homepage = "https://github.com/hagenw/sphinxcontrib-katex"; diff --git a/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix b/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix index 867d5acc9bae9..2dfc743a60f97 100644 --- a/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix @@ -18,6 +18,8 @@ buildPythonPackage rec { doCheck = false; # no tests + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { homepage = "https://github.com/davidism/sphinxcontrib-log-cabinet"; description = "Sphinx extension to organize changelogs"; diff --git a/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix b/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix index 0a283dd81a4d5..7350b837a7f85 100644 --- a/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix @@ -30,6 +30,8 @@ buildPythonPackage rec { "sphinxcontrib.mscgen" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension using mscgen to render diagrams"; homepage = "https://github.com/sphinx-contrib/mscgen"; diff --git a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix b/pkgs/development/python-modules/sphinxcontrib-newsfeed/default.nix index a298025f8ba3b..ee9661d954e4f 100644 --- a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-newsfeed/default.nix @@ -1,23 +1,33 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , sphinx }: buildPythonPackage rec { pname = "sphinxcontrib-newsfeed"; version = "0.1.4"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "1d7gam3mn8v4in4p16yn3v10vps7nnaz6ilw99j4klij39dqd37p"; }; - propagatedBuildInputs = [ sphinx ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + sphinx + ]; + + pythonNamespaces = [ "sphinxcontrib" ]; meta = with lib; { description = "Extension for adding a simple Blog, News or Announcements section to a Sphinx website"; - homepage = "https://bitbucket.org/prometheus/sphinxcontrib-newsfeed"; + homepage = "https://github.com/prometheusresearch/sphinxcontrib-newsfeed"; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix index 47573ad609a8f..de4ebf723bf1e 100644 --- a/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { "sphinxcontrib.nwdiag" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx nwdiag extension"; homepage = "https://github.com/blockdiag/sphinxcontrib-nwdiag"; diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index 0ed95a19b98f4..6e3279b4de966 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -9,7 +9,7 @@ , picobox , pyyaml , sphinx-mdinclude -, sphinxcontrib_httpdomain +, sphinxcontrib-httpdomain }: buildPythonPackage rec { @@ -29,13 +29,15 @@ buildPythonPackage rec { picobox pyyaml sphinx-mdinclude - sphinxcontrib_httpdomain + sphinxcontrib-httpdomain ]; SETUPTOOLS_SCM_PRETEND_VERSION = version; doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { homepage = "https://github.com/ikalnytskyi/sphinxcontrib-openapi"; description = "OpenAPI (fka Swagger) spec renderer for Sphinx"; diff --git a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix index aabc1c49d0c28..d6c588c8d0222 100644 --- a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { # No tests included. doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Provides a Sphinx domain for embedding UML diagram with PlantUML"; homepage = "https://github.com/sphinx-contrib/plantuml/"; diff --git a/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix b/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix index 17f2d5dcbe645..67d7d9b587f90 100644 --- a/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix @@ -23,6 +23,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "sphinxcontrib.programoutput" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension to include program output"; homepage = "https://github.com/NextThought/sphinxcontrib-programoutput"; diff --git a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix index 4364fcb99dc6f..d526f8aad8ee6 100644 --- a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix @@ -1,26 +1,36 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder +, flit-core }: buildPythonPackage rec { pname = "sphinxcontrib-qthelp"; - version = "1.0.3"; - disabled = isPy27; + version = "1.0.6"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - sha256 = "4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72"; + pname = "sphinxcontrib_qthelp"; + inherit version; + hash = "sha256-YrnRoYarf17jNW2Qb2SMrLemvblNIB7nrfJttVCSmC0="; }; + nativeBuildInputs = [ + flit-core + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document."; homepage = "https://github.com/sphinx-doc/sphinxcontrib-qthelp"; - license = licenses.bsd0; + license = licenses.bsd2; maintainers = teams.sphinx.members; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix index cc3a96086e4e8..085cb57305480 100644 --- a/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { "sphinxcontrib.seqdiag" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx seqdiag extension"; homepage = "https://github.com/blockdiag/sphinxcontrib-seqdiag"; diff --git a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix index 85ed3cdc596db..4604eec5f1842 100644 --- a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix @@ -1,26 +1,36 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder +, flit-core }: buildPythonPackage rec { pname = "sphinxcontrib-serializinghtml"; - version = "1.1.5"; - disabled = isPy27; + version = "1.1.9"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - sha256 = "aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952"; + pname = "sphinxcontrib_serializinghtml"; + inherit version; + hash = "sha256-DGT/iYM54frCmr0r9fEQePPsQTz+nARtMSDXymVTC1Q="; }; + nativeBuildInputs = [ + flit-core + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)."; homepage = "https://github.com/sphinx-doc/sphinxcontrib-serializinghtml"; - license = licenses.bsd0; + license = licenses.bsd2; maintainers = teams.sphinx.members; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index 2a8085de7c236..b7a71f891c32c 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -42,6 +42,8 @@ buildPythonPackage rec { "sphinxcontrib.spelling" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx spelling extension"; homepage = "https://github.com/sphinx-contrib/spelling"; diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index 4e47298c80601..dd83acb3d2057 100644 --- a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -28,6 +28,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "sphinxcontrib.tikz" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "TikZ extension for Sphinx"; homepage = "https://bitbucket.org/philexander/tikz"; diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix index ad800984ee46e..bd9ae779c081a 100644 --- a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix @@ -28,6 +28,8 @@ buildPythonPackage rec { doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = { description = "Sphinx API for Web Apps"; homepage = "http://sphinx-doc.org/"; diff --git a/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix b/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix index 67249bd882835..ab48066dc6af2 100644 --- a/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-youtube"; - version = "1.3.0"; + version = "1.4.1"; format = "pyproject"; nativeBuildInputs = [ flit-core ]; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sphinx-contrib"; repo = "youtube"; rev = "refs/tags/v${version}"; - hash = "sha256-/mu/OGMc+iP7DV36fmE8pb5y6MMOQ0fmzT8R7RP/tjM="; + hash = "sha256-XuOfZ77tg9akmgTuMQN20OhgkFbn/6YzT46vpTsXxC8="; }; propagatedBuildInputs = [ sphinx requests ]; @@ -27,6 +27,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "sphinxcontrib.youtube" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Youtube extension for Sphinx"; homepage = "https://github.com/sphinx-contrib/youtube"; diff --git a/pkgs/development/python-modules/sqids/default.nix b/pkgs/development/python-modules/sqids/default.nix index dc6befc179919..a9d5fe3729532 100644 --- a/pkgs/development/python-modules/sqids/default.nix +++ b/pkgs/development/python-modules/sqids/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sqids"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-U9nVpRc9PIM1ZO+bcL3RGIfAdlUMf+uFw/SpPTAjdnA="; + hash = "sha256-/8P7/vY0kb7ouUCpgGU4g0Xb77BtSeQVt6nkdcogD50="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index ecfa57be2e302..c71172764af79 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -26,8 +26,9 @@ buildPythonPackage rec { patches = [ # See: https://review.openstack.org/#/c/608382/ + # https://github.com/openstack/sqlalchemy-migrate/pull/18 (fetchpatch { - url = "https://github.com/openstack/sqlalchemy-migrate/pull/18.patch"; + url = "https://github.com/openstack/sqlalchemy-migrate/commit/a5d69a17d9354ec1a792493280f96484740cf7ff.patch"; sha256 = "1qyfq2m7w7xqf0r9bc2x42qcra4r9k9l9g1jy5j0fvlb6bvvjj07"; }) ./python3.11-comp.diff diff --git a/pkgs/development/python-modules/testpath/default.nix b/pkgs/development/python-modules/testpath/default.nix index 5635a61561594..eb66bea56f573 100644 --- a/pkgs/development/python-modules/testpath/default.nix +++ b/pkgs/development/python-modules/testpath/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { # exe are only required when testpath is used on windows # https://github.com/jupyter/testpath/blob/de8ca59539eb23b9781e55848b7d2646c8c61df9/testpath/commands.py#L128 - preBuild = lib.optionalString (!stdenv.targetPlatform.isWindows) '' + preBuild = lib.optionalString (!stdenv.hostPlatform.isWindows) '' rm testpath/cli-32.exe testpath/cli-64.exe ''; diff --git a/pkgs/development/python-modules/textual-dev/default.nix b/pkgs/development/python-modules/textual-dev/default.nix new file mode 100644 index 0000000000000..16b77ffabc472 --- /dev/null +++ b/pkgs/development/python-modules/textual-dev/default.nix @@ -0,0 +1,59 @@ +{ lib +, aiohttp +, buildPythonPackage +, click +, fetchFromGitHub +, msgpack +, poetry-core +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +, textual +, time-machine +, typing-extensions +}: + +buildPythonPackage rec { + pname = "textual-dev"; + version = "1.2.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Textualize"; + repo = "textual-dev"; + # we use rev instead of tag since upstream doesn't use tags + rev = "6afa9013a42cb18e9105e49d6a56874097f7c812"; + hash = "sha256-ef35389ZMU/zih7Se3KkMGECf5o2i5y6up64/1AECas="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + click + msgpack + textual + typing-extensions + ]; + + nativeCheckInputs = [ + pytest-aiohttp + pytestCheckHook + time-machine + ]; + + pythonImportsCheck = [ + "textual_dev" + ]; + + meta = with lib; { + description = "Development tools for Textual"; + homepage = "https://github.com/Textualize/textual-dev"; + license = licenses.mit; + maintainers = with maintainers; [ yannip ]; + }; +} diff --git a/pkgs/development/python-modules/tokenizers/Cargo.lock b/pkgs/development/python-modules/tokenizers/Cargo.lock index 841e6b5e09573..ced7f15387348 100644 --- a/pkgs/development/python-modules/tokenizers/Cargo.lock +++ b/pkgs/development/python-modules/tokenizers/Cargo.lock @@ -4,20 +4,59 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" dependencies = [ "memchr", ] [[package]] -name = "aho-corasick" -version = "1.0.5" +name = "anstream" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ - "memchr", + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anstyle-parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", ] [[package]] @@ -46,12 +85,9 @@ checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfg-if" @@ -60,13 +96,62 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "crossbeam-channel" -version = "0.5.8" +name = "clap" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ - "cfg-if", - "crossbeam-utils", + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.25", +] + +[[package]] +name = "clap_lex" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "console" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.45.0", ] [[package]] @@ -170,9 +255,15 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "encode_unicode" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "env_logger" @@ -189,13 +280,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.3" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -210,15 +301,18 @@ dependencies = [ [[package]] name = "esaxx-rs" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f748b253ceca9fed5f42f8b5ceb3851e93102199bc25b64b65369f76e5c0a35" +checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" +dependencies = [ + "cc", +] [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fnv" @@ -238,6 +332,12 @@ dependencies = [ ] [[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] name = "hermit-abi" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -256,45 +356,58 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] +name = "indicatif" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] name = "indoc" version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] -name = "is-terminal" -version = "0.4.9" +name = "instant" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "hermit-abi", - "rustix", - "windows-sys", + "cfg-if", ] [[package]] -name = "itertools" -version = "0.8.2" +name = "is-terminal" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "either", + "hermit-abi", + "rustix", + "windows-sys 0.48.0", ] [[package]] name = "itertools" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" [[package]] name = "lazy_static" @@ -310,9 +423,9 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db" [[package]] name = "lock_api" @@ -326,15 +439,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "macro_rules_attribute" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf0c9b980bf4f3a37fd7b1c066941dd1b1d0152ce6ee6e8fe8c49b9f6810d862" +checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" dependencies = [ "macro_rules_attribute-proc_macro", "paste", @@ -342,18 +455,9 @@ dependencies = [ [[package]] name = "macro_rules_attribute-proc_macro" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58093314a45e00c77d5c508f76e77c3396afbbc0d01506e7fae47b018bac2b1d" - -[[package]] -name = "matrixmultiply" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "916806ba0031cd542105d916a97c8572e1fa6dd79c9c51e7eb43a09ec2dd84c1" -dependencies = [ - "rawpointer", -] +checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" [[package]] name = "matrixmultiply" @@ -367,9 +471,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" @@ -404,20 +508,7 @@ checksum = "371717c0a5543d6a800cac822eac735aa7d2d2fbb41002e9856a4089532dbdce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", -] - -[[package]] -name = "ndarray" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac06db03ec2f46ee0ecdca1a1c34a99c0d188a0d83439b84bf0cb4b386e4ab09" -dependencies = [ - "matrixmultiply 0.2.4", - "num-complex 0.2.4", - "num-integer", - "num-traits", - "rawpointer", + "syn 2.0.25", ] [[package]] @@ -426,8 +517,8 @@ version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" dependencies = [ - "matrixmultiply 0.3.7", - "num-complex 0.4.4", + "matrixmultiply", + "num-complex", "num-integer", "num-traits", "rawpointer", @@ -445,19 +536,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.2.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" dependencies = [ "num-traits", ] @@ -474,22 +555,18 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] [[package]] -name = "num_cpus" -version = "1.16.0" +name = "number_prefix" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "numpy" @@ -498,8 +575,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "437213adf41bbccf4aeae535fbfcdad0f6fed241e1ae182ebe97fa1f3ce19389" dependencies = [ "libc", - "ndarray 0.15.6", - "num-complex 0.4.4", + "ndarray", + "num-complex", "num-integer", "num-traits", "pyo3", @@ -554,7 +631,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.48.1", ] [[package]] @@ -570,6 +647,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] +name = "portable-atomic" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -577,9 +660,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" dependencies = [ "unicode-ident", ] @@ -646,9 +729,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ "proc-macro2", ] @@ -691,9 +774,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -701,25 +784,23 @@ dependencies = [ [[package]] name = "rayon-cond" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1259362c9065e5ea39a789ef40b1e3fd934c94beb7b5ab3ac6629d3b5e7cb7" +checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9" dependencies = [ "either", - "itertools 0.8.2", + "itertools", "rayon", ] [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -733,11 +814,11 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ - "aho-corasick 1.0.5", + "aho-corasick", "memchr", "regex-automata", "regex-syntax", @@ -745,20 +826,20 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" dependencies = [ - "aho-corasick 1.0.5", + "aho-corasick", "memchr", "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "rustc-hash" @@ -768,54 +849,54 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.11" +version = "0.38.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" dependencies = [ "bitflags 2.4.0", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" [[package]] name = "scopeguard" -version = "1.2.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.25", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "b5062a995d481b2308b6064e9af76011f2921c35f97b0468811ed9f6cd91dfed" dependencies = [ "itoa", "ryu", @@ -859,9 +940,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.31" +version = "2.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" +checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" dependencies = [ "proc-macro2", "quote", @@ -870,9 +951,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" [[package]] name = "tempfile" @@ -884,7 +965,7 @@ dependencies = [ "fastrand", "redox_syscall", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -898,33 +979,35 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.25", ] [[package]] name = "tokenizers" -version = "0.14.0" +version = "0.14.1" dependencies = [ - "aho-corasick 0.7.20", + "aho-corasick", + "clap", "derive_builder", "esaxx-rs", "getrandom", - "itertools 0.9.0", + "indicatif", + "itertools", "lazy_static", "log", "macro_rules_attribute", @@ -947,12 +1030,12 @@ dependencies = [ [[package]] name = "tokenizers-python" -version = "0.14.0" +version = "0.14.1" dependencies = [ "env_logger", - "itertools 0.9.0", + "itertools", "libc", - "ndarray 0.13.1", + "ndarray", "numpy", "onig", "pyo3", @@ -965,9 +1048,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" [[package]] name = "unicode-normalization-alignments" @@ -985,6 +1068,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] name = "unicode_categories" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -997,6 +1086,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" [[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1035,66 +1130,132 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.1", ] [[package]] name = "windows-targets" -version = "0.48.5" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] +name = "windows-targets" +version = "0.48.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] name = "windows_aarch64_gnullvm" -version = "0.48.5" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index 149f86a284fa8..d8a731825feb3 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -60,7 +60,7 @@ let in buildPythonPackage rec { pname = "tokenizers"; - version = "0.14.0"; + version = "0.14.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -69,7 +69,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "v${version}"; - hash = "sha256-zCpKNMzIdQ0lLWdn4cENtBEMTA7+fg+N6wQGvio9llE="; + hash = "sha256-cq7dQLttNkV5UUhXujxKKMuzhD7hz+zTTKxUKlvz1s0="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 0789431b47b42..4217b87e81e7c 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -34,8 +34,6 @@ # ninja (https://ninja-build.org) must be available to run C++ extensions tests, ninja, - linuxHeaders_5_19, - # dependencies for torch.utils.tensorboard pillow, six, future, tensorboard, protobuf, @@ -191,7 +189,7 @@ in buildPythonPackage rec { '' # error: no member named 'aligned_alloc' in the global namespace; did you mean simply 'aligned_alloc' # This lib overrided aligned_alloc hence the error message. Tltr: his function is linkable but not in header. - + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0") '' + + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") '' substituteInPlace third_party/pocketfft/pocketfft_hdronly.h --replace '#if __cplusplus >= 201703L inline void *aligned_alloc(size_t align, size_t size)' '#if __cplusplus >= 201703L && 0 inline void *aligned_alloc(size_t align, size_t size)' @@ -288,6 +286,29 @@ in buildPythonPackage rec { # ... called on pointer ‘<unknown>’ with nonzero offset [1, 9223372036854775800] [-Werror=free-nonheap-object] ++ lib.optionals (stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "12" ) [ "-Wno-error=free-nonheap-object" + ] + # .../source/torch/csrc/autograd/generated/python_functions_0.cpp:85:3: + # error: cast from ... to ... converts to incompatible function type [-Werror,-Wcast-function-type-strict] + ++ lib.optionals (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16") [ + "-Wno-error=cast-function-type-strict" + # Suppresses the most spammy warnings. + # This is mainly to fix https://github.com/NixOS/nixpkgs/issues/266895. + ] ++ lib.optionals rocmSupport [ + "-Wno-#warnings" + "-Wno-cpp" + "-Wno-unknown-warning-option" + "-Wno-ignored-attributes" + "-Wno-deprecated-declarations" + "-Wno-defaulted-function-deleted" + "-Wno-pass-failed" + ] ++ [ + "-Wno-unused-command-line-argument" + "-Wno-maybe-uninitialized" + "-Wno-uninitialized" + "-Wno-array-bounds" + "-Wno-stringop-overflow" + "-Wno-free-nonheap-object" + "-Wno-unused-result" ])); nativeBuildInputs = [ @@ -304,7 +325,6 @@ in buildPythonPackage rec { ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; buildInputs = [ blas blas.provider ] - ++ lib.optionals stdenv.isLinux [ linuxHeaders_5_19 ] # TMP: avoid "flexible array member" errors for now ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_cccl.dev # <thrust/*> cuda_cudart # cuda_runtime.h and libraries diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix index 03b916883438f..e90648ec08102 100644 --- a/pkgs/development/python-modules/towncrier/default.nix +++ b/pkgs/development/python-modules/towncrier/default.nix @@ -1,38 +1,48 @@ { lib , buildPythonPackage -, fetchPypi -, pythonOlder , click -, click-default-group +, fetchPypi +, git # shells out to git +, hatchling +, importlib-resources , incremental , jinja2 , mock , pytestCheckHook -, toml +, pythonOlder +, tomli , twisted -, setuptools -, git # shells out to git }: buildPythonPackage rec { pname = "towncrier"; - version = "23.6.0"; - format = "setuptools"; + version = "23.11.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-/Cm9WrRyfI2s++Y29/tdxTuZgFti2hyWshSDYVn/cME="; + hash = "sha256-E5N8JH4/iuIKxE2JXPX5amCtRs/cwWcXWVMNeDfZ7l0="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "hatchling ~= 1.17.1" "hatchling" + ''; + + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ click - click-default-group incremental jinja2 - toml - setuptools + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-resources + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; preCheck = '' diff --git a/pkgs/development/python-modules/trainer/default.nix b/pkgs/development/python-modules/trainer/default.nix index 466d6db8da5aa..734bc324e266a 100644 --- a/pkgs/development/python-modules/trainer/default.nix +++ b/pkgs/development/python-modules/trainer/default.nix @@ -4,19 +4,19 @@ , coqpit , fsspec -, torch-bin +, torch , tensorboard , protobuf , psutil , pytestCheckHook , soundfile -, torchvision-bin +, torchvision }: let pname = "trainer"; - version = "0.0.31"; + version = "0.0.32"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { owner = "coqui-ai"; repo = "Trainer"; rev = "refs/tags/v${version}"; - hash = "sha256-avZuujeWG/UGkj7fcGB99Fw7KYktJPIDf8oB4wjoiD4="; + hash = "sha256-lSfkokPFB09KZBHe/Qkon2gUsA82AK52WNK1bJfzCNc="; }; postPatch = '' @@ -40,7 +40,7 @@ buildPythonPackage { psutil soundfile tensorboard - torch-bin + torch ]; # only one test and that requires training data from the internet @@ -48,7 +48,7 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook - torchvision-bin + torchvision ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 7fd258e9123fa..23e3bdc5b546e 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -54,8 +54,12 @@ buildPythonPackage rec { ]; disabledTests = [ - # not compatible with python3.10 - "test_typed_dict" + # AssertionError: 'type of argument "x" must be ' != 'None' + "TestPrecondition::test_precondition_ok_and_typeguard_fails" + # AttributeError: 'C' object has no attribute 'x' + "TestInvariant::test_invariant_ok_and_typeguard_fails" + # AttributeError: 'D' object has no attribute 'x' + "TestInheritance::test_invariant_ok_and_typeguard_fails" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/uamqp/clang-fix-incompatible-function-pointer-conversion.patch b/pkgs/development/python-modules/uamqp/clang-fix-incompatible-function-pointer-conversion.patch new file mode 100644 index 0000000000000..ed177797da0c1 --- /dev/null +++ b/pkgs/development/python-modules/uamqp/clang-fix-incompatible-function-pointer-conversion.patch @@ -0,0 +1,13 @@ +diff --git a/src/message_receiver.pyx b/src/message_receiver.pyx +index b99647c..479cc9c 100644 +--- a/src/message_receiver.pyx ++++ b/src/message_receiver.pyx +@@ -120,7 +120,7 @@ cdef class cMessageReceiver(StructBase): + + #### Callbacks (context is a MessageReceiver instance) + +-cdef void on_message_receiver_state_changed(void* context, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG new_state, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG previous_state): ++cdef void on_message_receiver_state_changed(const void* context, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG new_state, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG previous_state): + if context != NULL: + context_pyobj = <PyObject*>context + if context_pyobj.ob_refcnt == 0: # context is being garbage collected, skip the callback diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index 207ad3d43727f..c306068f7fdbf 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -27,6 +27,9 @@ buildPythonPackage rec { patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ ./darwin-azure-c-shared-utility-corefoundation.patch + ] ++ [ + # Fix incompatible function pointer conversion error with clang 16. + ./clang-fix-incompatible-function-pointer-conversion.patch ]; postPatch = lib.optionalString (stdenv.isDarwin && !stdenv.isx86_64) '' diff --git a/pkgs/development/python-modules/udatetime/default.nix b/pkgs/development/python-modules/udatetime/default.nix index 49b56c5f1e30a..9eef1512490d1 100644 --- a/pkgs/development/python-modules/udatetime/default.nix +++ b/pkgs/development/python-modules/udatetime/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch }: buildPythonPackage rec { @@ -13,14 +12,6 @@ buildPythonPackage rec { hash = "sha256-sQvFVwaZpDinLitaZOdr2MKO4779FvIJOHpVB/oLgwE="; }; - patches = [ - # fix build with python 3.9 - (fetchpatch { - url = "https://github.com/freach/udatetime/pull/33.patch"; - sha256 = "02wm7ivkv1viqn2wflgd10dgpddfqfrwacmrldigb1mwb79n554j"; - }) - ]; - # tests not included on pypi doCheck = false; diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index a5a3e6b8b644b..7a374f7c0c2c5 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -1,4 +1,5 @@ { lib +, backports-zoneinfo , brotli , brotlicffi , buildPythonPackage @@ -8,44 +9,55 @@ , hatchling , idna , isPyPy -, mock , pyopenssl , pysocks -, pytest-freezegun , pytest-timeout , pytestCheckHook -, python-dateutil +, pythonOlder , tornado , trustme }: -buildPythonPackage rec { +let self = buildPythonPackage rec { pname = "urllib3"; - version = "2.0.5"; - format = "pyproject"; + version = "2.0.7"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-E6vzc4LqLOb7dE1NrWeDjuyFfJ9PVwCYkYBeC14SNZQ="; + hash = "sha256-yX394fe9Q6ccjSpY42npsr9pLRM06p+crlWt19DdD4Q="; }; nativeBuildInputs = [ hatchling ]; - # FIXME: remove backwards compatbility hack - propagatedBuildInputs = passthru.optional-dependencies.brotli - ++ passthru.optional-dependencies.socks; + passthru.optional-dependencies = { + brotli = if isPyPy then [ + brotlicffi + ] else [ + brotli + ]; + # Use carefully since pyopenssl is not supported aarch64-darwin + secure = [ + certifi + cryptography + idna + pyopenssl + ]; + socks = [ + pysocks + ]; + }; nativeCheckInputs = [ - python-dateutil - mock - pytest-freezegun pytest-timeout pytestCheckHook tornado trustme - ]; + ] ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); # Tests in urllib3 are mostly timeout-based instead of event-based and # are therefore inherently flaky. On your own machine, the tests will @@ -60,6 +72,8 @@ buildPythonPackage rec { # Still, failures can occur and for that reason tests are disabled. doCheck = false; + passthru.tests.pytest = self.overridePythonAttrs (_: { doCheck = true; }); + preCheck = '' export CI # Increases LONG_TIMEOUT ''; @@ -68,29 +82,12 @@ buildPythonPackage rec { "urllib3" ]; - passthru.optional-dependencies = { - brotli = if isPyPy then [ - brotlicffi - ] else [ - brotli - ]; - # Use carefully since pyopenssl is not supported aarch64-darwin - secure = [ - certifi - cryptography - idna - pyopenssl - ]; - socks = [ - pysocks - ]; - }; - meta = with lib; { - description = "Powerful, sanity-friendly HTTP client for Python"; - homepage = "https://github.com/shazow/urllib3"; + description = "Powerful, user-friendly HTTP client for Python"; + homepage = "https://github.com/urllib3/urllib3"; changelog = "https://github.com/urllib3/urllib3/blob/${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; -} +}; +in self diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 38283c71acd63..9ee7fec919445 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -3,34 +3,42 @@ , buildPythonPackage , pythonOlder , fetchPypi + +# build-system , cython +, setuptools + +# native dependencies , libuv , CoreServices , ApplicationServices -# Check Inputs +# tests , aiohttp , psutil , pyopenssl -, pytest-forked , pytestCheckHook }: buildPythonPackage rec { pname = "uvloop"; - version = "0.17.0"; - format = "setuptools"; - disabled = pythonOlder "3.7"; + version = "0.19.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Dd9rr5zxGhoixxSH858Vss9461vefltF+7meip2RueE="; + hash = "sha256-Akb0/Rvyv3AuBrDUXukWd+5cMSQvOaq06m/gxRrt0P0="; }; nativeBuildInputs = [ cython + setuptools ]; + env.LIBUV_CONFIGURE_HOST = stdenv.hostPlatform.config; + buildInputs = [ libuv ] ++ lib.optionals stdenv.isDarwin [ @@ -38,45 +46,25 @@ buildPythonPackage rec { ApplicationServices ]; - dontUseSetuptoolsCheck = true; nativeCheckInputs = [ - pytest-forked + aiohttp + pyopenssl pytestCheckHook psutil - ] ++ lib.optionals (pythonOlder "3.11") [ - aiohttp ]; - LIBUV_CONFIGURE_HOST = stdenv.hostPlatform.config; - pytestFlagsArray = [ - # from pytest.ini, these are NECESSARY to prevent failures - "--capture=no" - "--assert=plain" - "--strict" - "--tb=native" - # Depend on pyopenssl - "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_flush_before_shutdown" - "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_renegotiation" - # test gets stuck in epoll_pwait on hydras aarch64 builders - # https://github.com/MagicStack/uvloop/issues/412 - "--deselect=tests/test_tcp.py::Test_AIO_TCPSSL::test_remote_shutdown_receives_trailing_data" - # Tries to import cythonized file for which the .pyx file is not shipped via PyPi - "--deselect=tests/test_libuv_api.py::Test_UV_libuv::test_libuv_get_loop_t_ptr" - # Tries to run "env", but fails to find it + # Tries to run "env", but fails to find it, even with coreutils provided "--deselect=tests/test_process.py::Test_UV_Process::test_process_env_2" "--deselect=tests/test_process.py::Test_AIO_Process::test_process_env_2" # AssertionError: b'' != b'out\n' "--deselect=tests/test_process.py::Test_UV_Process::test_process_streams_redirect" "--deselect=tests/test_process.py::Test_AIO_Process::test_process_streams_redirect" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.isDarwin) [ # Segmentation fault "--deselect=tests/test_fs_event.py::Test_UV_FS_EVENT_RENAME::test_fs_event_rename" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # Broken: https://github.com/NixOS/nixpkgs/issues/160904 "--deselect=tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost" - # Segmentation fault - "--deselect=tests/test_fs_event.py::Test_UV_FS_EVENT_RENAME::test_fs_event_rename" ]; disabledTestPaths = [ @@ -84,23 +72,13 @@ buildPythonPackage rec { "tests/test_sourcecode.py" ]; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = '' + # force using installed/compiled uvloop + rm -rf uvloop + '' + lib.optionalString stdenv.isDarwin '' # Work around "OSError: AF_UNIX path too long" # https://github.com/MagicStack/uvloop/issues/463 export TMPDIR="/tmp" - '' + '' - # pyopenssl is not well supported by upstream - # https://github.com/NixOS/nixpkgs/issues/175875 - substituteInPlace tests/test_tcp.py \ - --replace "from OpenSSL import SSL as openssl_ssl" "" - # force using installed/compiled uvloop vs source by moving tests to temp dir - export TEST_DIR=$(mktemp -d) - cp -r tests $TEST_DIR - pushd $TEST_DIR - ''; - - postCheck = '' - popd ''; pythonImportsCheck = [ @@ -112,6 +90,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; meta = with lib; { + changelog = "https://github.com/MagicStack/uvloop/releases/tag/v${version}"; description = "Fast implementation of asyncio event loop on top of libuv"; homepage = "https://github.com/MagicStack/uvloop"; license = licenses.mit; diff --git a/pkgs/development/python-modules/web-cache/default.nix b/pkgs/development/python-modules/web-cache/default.nix index 9246b2b571e7a..dba9d91875c2b 100644 --- a/pkgs/development/python-modules/web-cache/default.nix +++ b/pkgs/development/python-modules/web-cache/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { description = "Simple Python key-value storage backed up by sqlite3 database"; homepage = "https://github.com/desbma/web_cache"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix index 5f77c34f98ade..2b98674fb5759 100644 --- a/pkgs/development/python-modules/wordfreq/default.nix +++ b/pkgs/development/python-modules/wordfreq/default.nix @@ -51,6 +51,5 @@ buildPythonPackage rec { description = "A library for looking up the frequencies of words in many languages, based on many sources of data"; homepage = "https://github.com/rspeer/wordfreq/"; license = licenses.mit; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/xapian/default.nix b/pkgs/development/python-modules/xapian/default.nix index cafc66dab9e30..2daf40454974b 100644 --- a/pkgs/development/python-modules/xapian/default.nix +++ b/pkgs/development/python-modules/xapian/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchurl { url = "https://oligarchy.co.uk/xapian/${version}/xapian-bindings-${version}.tar.xz"; - hash = "sha256-a1RUgzrFKj4ywLs6cpClorUEiNiRjypFJpVX5N6aMeU="; + hash = "sha256-UT1XhIgnkZis4TrUl1ENKyIgTV15S2QUPQW3vpdOts8="; }; configureFlags = [ diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index cb9075567274c..c4c3cd8b8d23b 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.4.20"; - source.sha256 = "sha256-dEsrGVHaYTryr2hU98H54W3ZC0tmzZrxonqfRIx2G+4="; + version = "2.4.22"; + source.sha256 = "sha256-dHulCw5n3yXL07SPlYMad6TVOlgdVfBjly/LFG0ULF8="; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index cd814e4b41452..a380f9734bfda 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -22,7 +22,7 @@ , pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi , cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre, pcre2, gecode_3, curl , msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem -, cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx +, cairo, expat, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk , bundler, libsass, dart-sass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie @@ -76,7 +76,7 @@ in cairo-gobject = attrs: { nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - buildInputs = [ cairo pcre2 xorg.libpthreadstubs xorg.libXdmcp ]; + buildInputs = [ cairo expat pcre2 xorg.libpthreadstubs xorg.libXdmcp ]; }; charlock_holmes = attrs: { @@ -376,7 +376,12 @@ in }; iconv = attrs: { + dontBuild = false; buildFlags = lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; + patches = [ + # Fix incompatible function pointer conversion errors with clang 16 + ./iconv-fix-incompatible-function-pointer-conversions.patch + ]; }; idn-ruby = attrs: { diff --git a/pkgs/development/ruby-modules/gem-config/iconv-fix-incompatible-function-pointer-conversions.patch b/pkgs/development/ruby-modules/gem-config/iconv-fix-incompatible-function-pointer-conversions.patch new file mode 100644 index 0000000000000..1cc38cbae1357 --- /dev/null +++ b/pkgs/development/ruby-modules/gem-config/iconv-fix-incompatible-function-pointer-conversions.patch @@ -0,0 +1,51 @@ +diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c +index 2801049..77fae7e 100644 +--- a/ext/iconv/iconv.c ++++ b/ext/iconv/iconv.c +@@ -188,7 +188,7 @@ static VALUE iconv_convert _((iconv_t cd, VALUE str, long start, long length, in + static VALUE iconv_s_allocate _((VALUE klass)); + static VALUE iconv_initialize _((int argc, VALUE *argv, VALUE self)); + static VALUE iconv_s_open _((int argc, VALUE *argv, VALUE self)); +-static VALUE iconv_s_convert _((struct iconv_env_t* env)); ++static VALUE iconv_s_convert _((VALUE env)); + static VALUE iconv_s_iconv _((int argc, VALUE *argv, VALUE self)); + static VALUE iconv_init_state _((VALUE cd)); + static VALUE iconv_finish _((VALUE self)); +@@ -204,7 +204,7 @@ static VALUE charset_map; + * Returns the map from canonical name to system dependent name. + */ + static VALUE +-charset_map_get(void) ++charset_map_get(VALUE klass) + { + return charset_map; + } +@@ -642,7 +642,7 @@ iconv_s_allocate(VALUE klass) + } + + static VALUE +-get_iconv_opt_i(VALUE i, VALUE arg) ++get_iconv_opt_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arg)) + { + VALUE name; + #if defined ICONV_SET_TRANSLITERATE || defined ICONV_SET_DISCARD_ILSEQ +@@ -784,8 +784,9 @@ iconv_s_open(int argc, VALUE *argv, VALUE self) + } + + static VALUE +-iconv_s_convert(struct iconv_env_t* env) ++iconv_s_convert(VALUE env_value) + { ++ struct iconv_env_t* env = (struct iconv_env_t*)env_value; + VALUE last = 0; + + for (; env->argc > 0; --env->argc, ++env->argv) { +@@ -906,7 +907,7 @@ list_iconv(unsigned int namescount, const char *const *names, void *data) + + #if defined(HAVE_ICONVLIST) || defined(HAVE___ICONV_FREE_LIST) + static VALUE +-iconv_s_list(void) ++iconv_s_list(VALUE klass) + { + #ifdef HAVE_ICONVLIST + int state; diff --git a/pkgs/development/tools/algolia-cli/default.nix b/pkgs/development/tools/algolia-cli/default.nix index b9d0a663aaf18..0e15bec58def4 100644 --- a/pkgs/development/tools/algolia-cli/default.nix +++ b/pkgs/development/tools/algolia-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "algolia-cli"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "algolia"; repo = "cli"; rev = "v${version}"; - hash = "sha256-zwlDn545R7A5l6m7lsFSSf3rW96FND6/HRgeykvVCH0="; + hash = "sha256-T7LklR+NUuB5nDwEedG3eD+qSK+mjUiS/EXerqCAroE="; }; vendorHash = "sha256-cNuBTH7L2K4TgD0H9FZ9CjhE5AGXADaniGLD9Lhrtrk="; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index cf7eb3fd61239..25e04817643d3 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.0.37"; + version = "3.0.38"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-cRc5mBMTh5HCqq5hKfvJmYROs74ZiWjX17cgQv7ub+I="; + hash = "sha256-2ObPi+wrxvoVWjASmp0KSPMLFuIGdWNWK4jRrZC9ODE="; }; patches = [ diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index d5bcd116dc203..412b62593d271 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config which makeWrapper ]; buildInputs = [ libpfm zlib python3Packages.python python3Packages.pexpect procps gdb capnproto - libpfm zlib python3Packages.python python3Packages.pexpect procps capnproto ]; cmakeFlags = [ "-Ddisable32bit=ON" diff --git a/pkgs/development/tools/analysis/snyk/default.nix b/pkgs/development/tools/analysis/snyk/default.nix index 09222eb1d6f2c..9cc58cf405d94 100644 --- a/pkgs/development/tools/analysis/snyk/default.nix +++ b/pkgs/development/tools/analysis/snyk/default.nix @@ -12,9 +12,6 @@ buildNpmPackage rec { }; npmDepsHash = "sha256-j3lMQh8++pb/00d9H2v7QBkpxIJdsuRQoFkNiQbvnF4="; - - nativeBuildInputs = [ nodePackages.node-gyp python3 ]; - npmBuildScript = "build:prod"; meta = with lib; { diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index a43520ecb4b79..c8046b68cd96d 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "valgrind"; - version = "3.21.0"; + version = "3.22.0"; src = fetchurl { url = "https://sourceware.org/pub/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-EM4WGLs+M/rRbreVUrCj4SEXYkSKDX/OEcimJDuayXE="; + hash = "sha256-yBHbWt0sX3KZRMr0fE56Zdyqu5Rh5HK1eHZd179tLUw="; }; patches = [ diff --git a/pkgs/development/tools/ats-acc/default.nix b/pkgs/development/tools/ats-acc/default.nix index 5a3cd9c640108..b8eef344f20dd 100644 --- a/pkgs/development/tools/ats-acc/default.nix +++ b/pkgs/development/tools/ats-acc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Pretty-print error messages of the ATS Compiler"; homepage = "https://github.com/sparverius/ats-acc"; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; license = licenses.unfree; # Upstream has no license }; } diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index c39dca4e28d86..3c60d0e25e2eb 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -1,19 +1,23 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule }: +{ lib +, stdenv +, fetchFromGitHub +, buildGoModule +}: buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.20.1"; + version = "10.21.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; - rev = "v${version}"; - sha256 = "sha256-pfbSNFKZubgebx90zL5sVva36wXS+0NQvvMxPI8kV3Y="; + rev = "refs/tags/v${version}"; + hash = "sha256-FdiDxWmCRkSOa+6A9XgKeyFGk/ba+BgFm3/ChERkYvk="; }; subPackages = [ "." ]; - vendorHash = "sha256-byFroeXRMepN9RYak2++tT9IE8ZbT+0qJAyipHkE5WE="; + vendorHash = "sha256-F5YMPwdS2A5FAwuG1gfiAqBKapZ24VIGzJXnwojoDk0="; doCheck = false; @@ -22,8 +26,10 @@ buildGoModule rec { ''; meta = with lib; { - maintainers = with maintainers; [ colemickens kashw2 ]; - license = licenses.mit; description = "The new Azure Storage data transfer utility - AzCopy v10"; + homepage = "https://github.com/Azure/azure-storage-azcopy"; + changelog = "https://github.com/Azure/azure-storage-azcopy/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ colemickens kashw2 ]; }; } diff --git a/pkgs/development/tools/azure-functions-core-tools/default.nix b/pkgs/development/tools/azure-functions-core-tools/default.nix index e187dbf6b3937..cf039c5758f5e 100644 --- a/pkgs/development/tools/azure-functions-core-tools/default.nix +++ b/pkgs/development/tools/azure-functions-core-tools/default.nix @@ -27,7 +27,7 @@ }; }; - platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; + platformInfo = builtins.getAttr stdenv.hostPlatform.system platforms; in stdenv.mkDerivation rec { pname = "azure-functions-core-tools"; diff --git a/pkgs/development/tools/azure-static-sites-client/default.nix b/pkgs/development/tools/azure-static-sites-client/default.nix index 5ac8f971cf35a..441496ed4352c 100644 --- a/pkgs/development/tools/azure-static-sites-client/default.nix +++ b/pkgs/development/tools/azure-static-sites-client/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { pname = "StaticSitesClient-${versionFlavor}"; version = flavor.buildId; - src = sources.${stdenv.targetPlatform.system} or (throw "Unsupported platform"); + src = sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform"); nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/development/tools/azure-static-sites-client/versions.json b/pkgs/development/tools/azure-static-sites-client/versions.json index 88d31f718ef6f..55c30a12addfc 100644 --- a/pkgs/development/tools/azure-static-sites-client/versions.json +++ b/pkgs/development/tools/azure-static-sites-client/versions.json @@ -1,58 +1,58 @@ [ { "version": "latest", - "buildId": "1.0.024871", - "publishDate": "2023-10-24T04:09:23.7109231Z", + "buildId": "1.0.024941", + "publishDate": "2023-10-31T04:54:50.5527205Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/linux/StaticSitesClient", - "sha": "13d1c02e43dec373be04152f7f8e71974f080440cb9480c3ccb4f83c8c6f036a" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/linux/StaticSitesClient", + "sha": "bea23499732d615698baf4c9dcafe717fdd4ba8344f2d96740233b0380df79b6" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/windows/StaticSitesClient.exe", - "sha": "868f221ea77b13cea8c6c41edbecea53bf5171d42dc9376f34615e544a3874f0" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/windows/StaticSitesClient.exe", + "sha": "a93aa5ec2a17280f3c9c8252948f8c68050c8852770322758ffa3187b6bce1dd" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/macOS/StaticSitesClient", - "sha": "63c9027a7b5e597ae9e0ad8311b31a587bd977ed758555784d08cc3ff35e80a4" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/macOS/StaticSitesClient", + "sha": "57ea66c930aafbf4dea82216e51128b3315ec2db3ab385d41e8d912a3adab2c0" } } }, { "version": "stable", - "buildId": "1.0.024741", - "publishDate": "2023-10-10T20:13:22.904778Z", + "buildId": "1.0.024941", + "publishDate": "2023-10-31T04:54:50.5527205Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024741/linux/StaticSitesClient", - "sha": "0e174b1551a495dbb751240201b8d264f86264c704d66678c189fe4d94f53502" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/linux/StaticSitesClient", + "sha": "bea23499732d615698baf4c9dcafe717fdd4ba8344f2d96740233b0380df79b6" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024741/windows/StaticSitesClient.exe", - "sha": "cb8d6e7cf83ab7ee394627b088f42de6e63fa77ed5c56eb79a088a1de02163ff" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/windows/StaticSitesClient.exe", + "sha": "a93aa5ec2a17280f3c9c8252948f8c68050c8852770322758ffa3187b6bce1dd" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024741/macOS/StaticSitesClient", - "sha": "1ef4292cad223972ed820921d29f6b844e18edd732c99c183269e86b150a8224" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/macOS/StaticSitesClient", + "sha": "57ea66c930aafbf4dea82216e51128b3315ec2db3ab385d41e8d912a3adab2c0" } } }, { "version": "backup", - "buildId": "1.0.024671", - "publishDate": "2023-10-04T00:20:16.1747762Z", + "buildId": "1.0.024871", + "publishDate": "2023-10-24T04:09:23.7109231Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024671/linux/StaticSitesClient", - "sha": "82b8181bb5ea47e1d449c1c56e622bd350513dd97f27ac4abd25bd139fde92e2" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/linux/StaticSitesClient", + "sha": "13d1c02e43dec373be04152f7f8e71974f080440cb9480c3ccb4f83c8c6f036a" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024671/windows/StaticSitesClient.exe", - "sha": "a7660746d9dbed8814259547da7f96122d01ae90de6f8aa5ccf7b07b58f59f19" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/windows/StaticSitesClient.exe", + "sha": "868f221ea77b13cea8c6c41edbecea53bf5171d42dc9376f34615e544a3874f0" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024671/macOS/StaticSitesClient", - "sha": "7584bea04c7d9e685216d4248063226d5a230cc955e560885a48737d1abd385e" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/macOS/StaticSitesClient", + "sha": "63c9027a7b5e597ae9e0ad8311b31a587bd977ed758555784d08cc3ff35e80a4" } } } diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/development/tools/bearer/default.nix index 05b7d61f858e4..3aa78a18ecd96 100644 --- a/pkgs/development/tools/bearer/default.nix +++ b/pkgs/development/tools/bearer/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "bearer"; - version = "1.27.1"; + version = "1.29.0"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; rev = "refs/tags/v${version}"; - hash = "sha256-3kJPBvw12iyAu9WVIZgyUrsW6XQ0AqpDmDl1E72vyuE="; + hash = "sha256-18kXDdkwT0bINpwQ5sG+ic0ZFJS/vBMidzo67/C/fbM="; }; - vendorHash = "sha256-ikrpFnn+CTuhttd3gVyoKU3RIBRR/zL8YjvE0tjIH6I="; + vendorHash = "sha256-UbXKMeia6j5xARzO8GjRiDn6GGYz7gjEIdP8ylvJGT4="; subPackages = [ "cmd/bearer" diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 8c46b2456ee37..f22e7c3c22af4 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazel-buildtools"; - version = "6.3.3"; + version = "6.4.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "buildtools"; rev = "v${version}"; - hash = "sha256-eGX1W3Nc26aw31dWm1hvcUzFh1efL4Vd86dK6Hs2BJc="; + hash = "sha256-k4qbveJ1BORnwjOIZcJLWIGVMRjCAqVhISggQ/VTzA4="; }; vendorHash = "sha256-DigTREfI6I48wxRpGp/bfH1NbUZ4E1B5UTQXpI0LY1A="; diff --git a/pkgs/development/tools/build-managers/boot/builder.sh b/pkgs/development/tools/build-managers/boot/builder.sh index e007cbac9582d..4506e3f0f8615 100644 --- a/pkgs/development/tools/build-managers/boot/builder.sh +++ b/pkgs/development/tools/build-managers/boot/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup boot_bin=$out/bin/boot diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh deleted file mode 100644 index 6305a405af21a..0000000000000 --- a/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ /dev/null @@ -1,42 +0,0 @@ -mesonConfigurePhase() { - runHook preConfigure - - if [ -z "${dontAddPrefix-}" ]; then - mesonFlags="--prefix=$prefix $mesonFlags" - fi - - # See multiple-outputs.sh and meson’s coredata.py - mesonFlags="\ - --libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec \ - --bindir=${!outputBin}/bin --sbindir=${!outputBin}/sbin \ - --includedir=${!outputInclude}/include \ - --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \ - --localedir=${!outputLib}/share/locale \ - -Dauto_features=${mesonAutoFeatures:-enabled} \ - -Dwrap_mode=${mesonWrapMode:-nodownload} \ - $mesonFlags" - - mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-plain} $mesonFlags" - - echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}" - - meson setup build $mesonFlags "${mesonFlagsArray[@]}" - cd build - - if ! [[ -v enableParallelBuilding ]]; then - enableParallelBuilding=1 - echo "meson: enabled parallel building" - fi - - if ! [[ -v enableParallelInstalling ]]; then - enableParallelInstalling=1 - echo "meson: enabled parallel installing" - fi - - runHook postConfigure -} - -if [ -z "${dontUseMesonConfigure-}" -a -z "${configurePhase-}" ]; then - setOutputFlags= - configurePhase=mesonConfigurePhase -fi diff --git a/pkgs/development/tools/build-managers/scons/3.1.2.nix b/pkgs/development/tools/build-managers/scons/3.1.2.nix new file mode 100644 index 0000000000000..097a8ffd519eb --- /dev/null +++ b/pkgs/development/tools/build-managers/scons/3.1.2.nix @@ -0,0 +1,38 @@ +{ lib, fetchurl, python3 }: + +let + pname = "scons"; + version = "3.1.2"; + src = fetchurl { + url = "mirror://sourceforge/scons/scons-${version}.tar.gz"; + hash = "sha256-eAHz9i9lRSjict94C+EMDpM36JdlC2Ldzunzn94T+Ps="; + }; +in +python3.pkgs.buildPythonApplication { + inherit pname version src; + + setupHook = ./setup-hook.sh; + + doCheck = true; + + passthru = { + # expose the used python version so tools using this (and extensing scos + # with other python modules) can use the exact same python version. + inherit python3; + python = python3; + }; + + meta = { + description = "An improved, cross-platform substitute for Make"; + longDescription = '' + SCons is an Open Source software construction tool. Think of SCons as an + improved, cross-platform substitute for the classic Make utility with + integrated functionality similar to autoconf/automake and compiler caches + such as ccache. In short, SCons is an easier, more reliable and faster way + to build software. + ''; + homepage = "https://scons.org/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/development/tools/build-managers/scons/4.1.0.nix b/pkgs/development/tools/build-managers/scons/4.1.0.nix new file mode 100644 index 0000000000000..65499280c2c4a --- /dev/null +++ b/pkgs/development/tools/build-managers/scons/4.1.0.nix @@ -0,0 +1,50 @@ +{ lib, fetchurl, python3 }: + +let + pname = "scons"; + version = "4.1.0"; + src = fetchurl { + url = "mirror://sourceforge/scons/scons-${version}.tar.gz"; + hash = "sha256-ctKNdi4hJnh/Fz49WeCJI5+LL06e8xFNV/ELEgaYXYU="; + }; +in +python3.pkgs.buildPythonApplication { + inherit pname version src; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "build/dist" "dist" \ + --replace "build/doc/man/" "" + ''; + + postInstall = '' + mkdir -p "$out/share/man/man1" + mv "$out/"*.1 "$out/share/man/man1/" + ''; + + setupHook = ./setup-hook.sh; + + # The release tarballs don't contain any tests (runtest.py and test/*): + doCheck = false; + + passthru = { + # expose the used python version so tools using this (and extensing scos + # with other python modules) can use the exact same python version. + inherit python3; + python = python3; + }; + + meta = { + description = "An improved, cross-platform substitute for Make"; + longDescription = '' + SCons is an Open Source software construction tool. Think of SCons as an + improved, cross-platform substitute for the classic Make utility with + integrated functionality similar to autoconf/automake and compiler caches + such as ccache. In short, SCons is an easier, more reliable and faster way + to build software. + ''; + homepage = "https://scons.org/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/development/tools/build-managers/scons/4.5.2.nix b/pkgs/development/tools/build-managers/scons/4.5.2.nix new file mode 100644 index 0000000000000..61d1719642e08 --- /dev/null +++ b/pkgs/development/tools/build-managers/scons/4.5.2.nix @@ -0,0 +1,54 @@ +{ lib, fetchurl, python3 }: + +let + pname = "scons"; + version = "4.5.2"; + src = fetchurl { + url = "mirror://sourceforge/project/scons/scons/${version}/SCons-${version}.tar.gz"; + hash = "sha256-ziaqyV01CnmkGSGWsL6sPLJPTMq84BI+so0zcPV28HI="; + }; +in +python3.pkgs.buildPythonApplication { + inherit pname version src; + + patches = [ + ./env.patch + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "build/dist" "dist" \ + --replace "build/doc/man/" "" + ''; + + postInstall = '' + mkdir -p "$out/share/man/man1" + mv "$out/"*.1 "$out/share/man/man1/" + ''; + + setupHook = ./setup-hook.sh; + + # The release tarballs don't contain any tests (runtest.py and test/*): + doCheck = false; + + passthru = { + # expose the used python version so tools using this (and extensing scos + # with other python modules) can use the exact same python version. + inherit python3; + python = python3; + }; + + meta = { + description = "An improved, cross-platform substitute for Make"; + longDescription = '' + SCons is an Open Source software construction tool. Think of SCons as an + improved, cross-platform substitute for the classic Make utility with + integrated functionality similar to autoconf/automake and compiler caches + such as ccache. In short, SCons is an easier, more reliable and faster way + to build software. + ''; + homepage = "https://scons.org/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix deleted file mode 100644 index 64890d12cea96..0000000000000 --- a/pkgs/development/tools/build-managers/scons/common.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ version, sha256 }: - -{ fetchurl, python, lib }: - -python.pkgs.buildPythonApplication rec { - pname = "scons"; - inherit version; - - src = fetchurl { - url = - if lib.versionAtLeast version "4.3.0" then - "mirror://sourceforge/project/scons/scons/${version}/SCons-${version}.tar.gz" - else - "mirror://sourceforge/scons/scons-${version}.tar.gz"; - inherit sha256; - }; - - setupHook = ./setup-hook.sh; - - patches = lib.optionals (lib.versionAtLeast version "4.3.0") [ - ./env.patch - ]; - - postPatch = lib.optionalString (lib.versionAtLeast version "4.0.0") '' - substituteInPlace setup.cfg \ - --replace "build/dist" "dist" - '' + lib.optionalString (lib.versionAtLeast version "4.1.0") '' - substituteInPlace setup.cfg \ - --replace "build/doc/man/" "" - ''; - - # The release tarballs don't contain any tests (runtest.py and test/*): - doCheck = lib.versionOlder version "4.0.0"; - - postInstall = lib.optionalString (lib.versionAtLeast version "4.1.0") '' - mkdir -p "$out/share/man/man1" - mv "$out/"*.1 "$out/share/man/man1/" - ''; - - passthru = { - # expose the used python version so tools using this (and extensing scos with other python modules) - # can use the exact same python version. - inherit python; - }; - - meta = with lib; { - description = "An improved, cross-platform substitute for Make"; - longDescription = '' - SCons is an Open Source software construction tool. Think of - SCons as an improved, cross-platform substitute for the classic - Make utility with integrated functionality similar to - autoconf/automake and compiler caches such as ccache. In short, - SCons is an easier, more reliable and faster way to build - software. - ''; - homepage = "https://scons.org/"; - changelog = "https://raw.githubusercontent.com/SConsProject/scons/rel_${version}/src/CHANGES.txt"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with lib.maintainers; [ AndersonTorres ]; - }; -} diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix deleted file mode 100644 index f338d346a7017..0000000000000 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ callPackage, python2, python3 }: - -let - mkScons = args: callPackage (import ./common.nix args) { - python = python3; - }; -in { - scons_3_1_2 = (mkScons { - version = "3.1.2"; - sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq"; - }); - scons_4_1_0 = mkScons { - version = "4.1.0"; - sha256 = "11axk03142ziax6i3wwy9qpqp7r3i7h5jg9y2xzph9i15rv8vlkj"; - }; - scons_latest = mkScons { - version = "4.5.2"; - sha256 = "sha256-ziaqyV01CnmkGSGWsL6sPLJPTMq84BI+so0zcPV28HI="; - }; -} diff --git a/pkgs/development/tools/changie/default.nix b/pkgs/development/tools/changie/default.nix index b8ab1367ab1c9..2aca42bbb262d 100644 --- a/pkgs/development/tools/changie/default.nix +++ b/pkgs/development/tools/changie/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "changie"; - version = "1.15.1"; + version = "1.16.0"; src = fetchFromGitHub { owner = "miniscruff"; repo = "changie"; rev = "v${version}"; - hash = "sha256-pjeqaLCxWq2maz+C4jCNNRhYhclvcABi6zC+Qxy2GPw="; + hash = "sha256-lFe59ITcPJ69x0COV+WlX500Hl96XqWLCz5gJMqX6qQ="; }; - vendorHash = "sha256-pBRU/eWuI14uDmTPo593hW0YAye5Y1Fm1axd/+X7nS8="; + vendorHash = "sha256-JmK7bcS8UYCOUvJGs0PAYPNc8iwvCSFzjLlkBEVUa40="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 62856ffd389a0..5dfec9c11a874 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.106.1"; + version = "0.107.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W+3sqWPYpMkbmA8dGEodZy+pZGRBLJdthicBFdkn6oU="; + sha256 = "sha256-PaIjeqL32CADE+m6kq7VIDXMBvEEMVW8eSlXiIwNEJ4="; }; - vendorHash = "sha256-+cxh3/TQqm6n7hUYhW2B3pdfdtzRuepZmLNSGVPA3H0="; + vendorHash = "sha256-OHeoa3SXmDiUROxFiprlq/gfnqMjha6PQ8tlkr7Pd00="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index 383ca09294491..026dbbcc54828 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -37,7 +37,7 @@ buildGoModule rec { "-s" "-w" "-X github.com/openfaas/faas-cli/version.GitCommit=ref/tags/${version}" "-X github.com/openfaas/faas-cli/version.Version=${version}" - "-X github.com/openfaas/faas-cli/commands.Platform=${faasPlatform stdenv.targetPlatform}" + "-X github.com/openfaas/faas-cli/commands.Platform=${faasPlatform stdenv.hostPlatform}" ]; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/fusee-launcher/default.nix b/pkgs/development/tools/fusee-launcher/default.nix index 08cf6caae3ef8..117bd0c9450e2 100644 --- a/pkgs/development/tools/fusee-launcher/default.nix +++ b/pkgs/development/tools/fusee-launcher/default.nix @@ -6,6 +6,10 @@ , makeWrapper } : +let + arm-embedded-cc = pkgsCross.arm-embedded.buildPackages.gcc; +in + stdenv.mkDerivation { pname = "fusee-launcher"; version = "unstable-2018-07-14"; @@ -17,6 +21,10 @@ stdenv.mkDerivation { sha256 = "1pqkgw5bk0xcz9x7pc1f0r0b9nsc8jnnvcs1315d8ml8mx23fshm"; }; + makeFlags = [ + "CROSS_COMPILE=${arm-embedded-cc.targetPrefix}" + ]; + installPhase = '' mkdir -p $out/bin $out/share cp fusee-launcher.py $out/bin/fusee-launcher @@ -28,7 +36,7 @@ stdenv.mkDerivation { --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)" ''; - nativeBuildInputs = [ pkgsCross.arm-embedded.buildPackages.gcc makeWrapper python3Packages.wrapPython ]; + nativeBuildInputs = [ arm-embedded-cc makeWrapper python3Packages.wrapPython ]; buildInputs = [ python3 python3Packages.pyusb ]; pythonPath = with python3Packages; [ pyusb ]; diff --git a/pkgs/development/tools/github/bump/default.nix b/pkgs/development/tools/github/bump/default.nix index 163b4e95496e2..2ba546699f174 100644 --- a/pkgs/development/tools/github/bump/default.nix +++ b/pkgs/development/tools/github/bump/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bump"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "mroth"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tgTG/QlDxX1Ns0WpcNjwr/tvsdtgap7RcxX/JuYcxw8="; + sha256 = "sha256-DFgNx0H9/hZ+wUdPkEybRCIjnLsmuoYWruYgbDuFRhU="; }; - vendorHash = "sha256-ZeKokW6jMiKrXLfnxwEBF+wLuFQufnPUnA/EnuhvrwI="; + vendorHash = "sha256-AiXbCS3RXd6KZwIo7qzz3yM28cJloLRR+gdWqEpyims="; doCheck = false; diff --git a/pkgs/development/tools/hotdoc/default.nix b/pkgs/development/tools/hotdoc/default.nix index b649310214fb3..6758f1b44e9b2 100644 --- a/pkgs/development/tools/hotdoc/default.nix +++ b/pkgs/development/tools/hotdoc/default.nix @@ -22,7 +22,7 @@ , setuptools , toposort , wheezy-template -, libclang +, llvmPackages , gst_all_1 }: @@ -100,9 +100,9 @@ buildPythonApplication rec { postPatch = '' substituteInPlace hotdoc/extensions/c/c_extension.py \ --replace "shutil.which('llvm-config')" 'True' \ - --replace "subprocess.check_output(['llvm-config', '--version']).strip().decode()" '"${libclang.version}"' \ - --replace "subprocess.check_output(['llvm-config', '--prefix']).strip().decode()" '"${libclang.lib}"' \ - --replace "subprocess.check_output(['llvm-config', '--libdir']).strip().decode()" '"${libclang.lib}/lib"' + --replace "subprocess.check_output(['llvm-config', '--version']).strip().decode()" '"${llvmPackages.libclang.version}"' \ + --replace "subprocess.check_output(['llvm-config', '--prefix']).strip().decode()" '"${llvmPackages.libclang.lib}"' \ + --replace "subprocess.check_output(['llvm-config', '--libdir']).strip().decode()" '"${llvmPackages.libclang.lib}/lib"' ''; # Make pytest run from a temp dir to have it pick up installed package for cmark diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/development/tools/ko/default.nix index 66a196ab02d41..3f9bc4c0b3fc7 100644 --- a/pkgs/development/tools/ko/default.nix +++ b/pkgs/development/tools/ko/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ko"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "ko-build"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-z0VemNdN35p5fA+cenXil7Vonl+ryu1ruKxzWFwMPfI="; + hash = "sha256-BEKsa5mzJplcyR65/4T0MizrYxEk8/ON8SDFt8ZxqMU="; }; vendorHash = null; diff --git a/pkgs/development/tools/lalrpop/default.nix b/pkgs/development/tools/lalrpop/default.nix index 0bc8bddefbd01..32e6ec7a35b2f 100644 --- a/pkgs/development/tools/lalrpop/default.nix +++ b/pkgs/development/tools/lalrpop/default.nix @@ -1,6 +1,5 @@ { lib , rustPlatform -, rust , fetchFromGitHub , substituteAll , stdenv @@ -24,7 +23,7 @@ rustPlatform.buildRustPackage rec { patches = [ (substituteAll { src = ./use-correct-binary-path-in-tests.patch; - target_triple = rust.toRustTarget stdenv.hostPlatform; + target_triple = stdenv.hostPlatform.rust.rustcTarget; }) ]; diff --git a/pkgs/development/tools/language-servers/zls/default.nix b/pkgs/development/tools/language-servers/zls/default.nix index 9fda43915ca20..2188af2a11664 100644 --- a/pkgs/development/tools/language-servers/zls/default.nix +++ b/pkgs/development/tools/language-servers/zls/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/zigtools/zls/releases/tag/${finalAttrs.version}"; homepage = "https://github.com/zigtools/zls"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ figsoda fortuneteller2k ]; + maintainers = with lib.maintainers; [ figsoda moni ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/development/tools/misc/automake/builder.sh b/pkgs/development/tools/misc/automake/builder.sh index 0cb1d5d61e33b..b08e7251e9e2b 100644 --- a/pkgs/development/tools/misc/automake/builder.sh +++ b/pkgs/development/tools/misc/automake/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup # Wrap the given `aclocal' program, appending extra `-I' flags diff --git a/pkgs/development/tools/misc/complgen/default.nix b/pkgs/development/tools/misc/complgen/default.nix index 81cf9c120edd9..6c0cdb3c5bb14 100644 --- a/pkgs/development/tools/misc/complgen/default.nix +++ b/pkgs/development/tools/misc/complgen/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "complgen"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "adaszko"; repo = "complgen"; rev = "v${version}"; - hash = "sha256-FetiopX4k58JQP67zTh0ssy1HFJHmi0Op9h9vjH1pLE="; + hash = "sha256-B7ydYz9nui3B/IC3obVTiJZvzTD/lCQyf+tREwFJERg="; }; - cargoHash = "sha256-2EJuxoed+6LGpxxqkdFxbntilA2SihQScliUFYgjYmU="; + cargoHash = "sha256-CXvaGrE4sQlc7K6FVQqGU8EKPfHr8EIV5YFq+VMoBWg="; meta = with lib; { description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar"; diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix index 56bd85b77218e..f65b0386cfd8a 100644 --- a/pkgs/development/tools/misc/cvise/default.nix +++ b/pkgs/development/tools/misc/cvise/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonApplication , fetchFromGitHub +, fetchpatch , bash , cmake , colordiff @@ -29,6 +30,14 @@ buildPythonApplication rec { patches = [ # Refer to unifdef by absolute path. ./unifdef.patch + + # Refer to shell via /usr/bin/env: + # https://github.com/marxin/cvise/pull/121 + (fetchpatch { + name = "env-shell.patch"; + url = "https://github.com/marxin/cvise/commit/6a416eb590be978a2ad25c610974fdde84e88651.patch"; + hash = "sha256-Kn6+TXP+wJpMs6jrgsa9OwjXf6vmIgGzny8jg3dfKWA="; + }) ]; postPatch = '' @@ -37,10 +46,6 @@ buildPythonApplication rec { substituteInPlace CMakeLists.txt \ --replace " -Werror " " " - # 'cvise --command=...' generates a script with hardcoded shebang. - substituteInPlace cvise.py \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" - substituteInPlace cvise/utils/testing.py \ --replace "'colordiff --version'" "'${colordiff}/bin/colordiff --version'" \ --replace "'colordiff'" "'${colordiff}/bin/colordiff'" diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 83a30f3e6f17f..d61cf961615f2 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -8,11 +8,11 @@ # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { pname = "elfutils"; - version = "0.189"; + version = "0.190"; src = fetchurl { url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Ob2PGjOOK3zUq8P/EaDt3G5pD2lXildHjYF5tBSHCMg="; + hash = "sha256-jgCjqbXwS8HcJzroYoHS0m7UEgILOR/8wjGY8QIx1pI="; }; patches = [ diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix index d24d4b66d66c9..6420d56bba2f3 100644 --- a/pkgs/development/tools/misc/gengetopt/default.nix +++ b/pkgs/development/tools/misc/gengetopt/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { 'set +o posix' ''; + env = lib.optionalAttrs stdenv.cc.isClang { + CXXFLAGS = "-std=c++14"; + }; + meta = { description = "Command-line option parser generator"; diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix index 0d4c272e414e1..8e6ba9b70c04d 100644 --- a/pkgs/development/tools/misc/indent/default.nix +++ b/pkgs/development/tools/misc/indent/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ texinfo ]; buildInputs = [ libintl ]; - pkgsBuildBuild = [ buildPackages.stdenv.cc ]; # needed when cross-compiling + depsBuildBuild = [ buildPackages.stdenv.cc ]; # needed when cross-compiling env.NIX_CFLAGS_COMPILE = toString ( lib.optional stdenv.cc.isClang "-Wno-implicit-function-declaration" diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 3bace16de56d2..0c19b59c5c35e 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "2.13.1"; - sha256 = "sha256-Vme/Amnh5i4tnLl0xFb/huBAG9eqO/yNX9uXIzJJ7dw="; + version = "2.13.6"; + sha256 = "sha256-5+BFlt1zrHqpnifNAA+UnbsP7VG9KQmfmwiiXB3wztU="; } diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 941a582cead00..20acab5a8584d 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -2,13 +2,13 @@ luarocks.overrideAttrs (old: { pname = "luarocks-nix"; - version = "unstable-2023-02-26"; + version = "unstable-2023-10-19"; src = fetchFromGitHub { owner = "nix-community"; repo = "luarocks-nix"; - rev = "4cfea3d5d826db4cfbc809ef8bb5f0a9f3a18919"; - sha256 = "sha256-7L8B+/C7Kzt25Ec+OsM2rliYB2/wyZQ3OT63V7AaOxo="; + rev = "4240b25b95d7165cde66fc2acaf5a0f9ad40fd0c"; + sha256 = "sha256-dqFFYehBgK0RqH0/1GtZXq7XLGCcc3Kfadq8ICYNCWk="; }; patches = [ ]; diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index 138765bb22803..47ae36c77ea98 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, stdenv, Security }: rustPlatform.buildRustPackage rec { - version = "0.6.0"; + version = "0.7.2"; pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; rev = "v${version}"; - sha256 = "sha256-/H4QhkWsvq6UvrxuNhRPwlUi/spSYB78h8yUvdCJ2Ws="; + sha256 = "sha256-hup9FM2KEBXRx6NleDGR01C0whJgR1KYyIrcIv2UE80="; }; - cargoSha256 = "sha256-wFkVGKa00WQjk59KSBdOJ9Zfj8MwzC4XOhT9p4yvJM0="; + cargoSha256 = "sha256-Od1uaKZVAZaIDrsNheR1kYIjnmpnThlU7k3EIKdOjzM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/packcc/default.nix b/pkgs/development/tools/packcc/default.nix index b16b0491c9b63..4f618665573c0 100644 --- a/pkgs/development/tools/packcc/default.nix +++ b/pkgs/development/tools/packcc/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { # Disable a failing test. rm -rf ../../tests/style.d + '' + lib.optionalString stdenv.cc.isClang '' + export NIX_CFLAGS_COMPILE+=' -Wno-error=strict-prototypes -Wno-error=int-conversion' ''; installPhase = '' diff --git a/pkgs/development/tools/parsing/antlr/builder.sh b/pkgs/development/tools/parsing/antlr/builder.sh index 55259b9321249..c1d20845e6bff 100644 --- a/pkgs/development/tools/parsing/antlr/builder.sh +++ b/pkgs/development/tools/parsing/antlr/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup tar zxvf $src diff --git a/pkgs/development/tools/rust/cargo-benchcmp/default.nix b/pkgs/development/tools/rust/cargo-benchcmp/default.nix index 4aa3c411f12e3..d46a57355d731 100644 --- a/pkgs/development/tools/rust/cargo-benchcmp/default.nix +++ b/pkgs/development/tools/rust/cargo-benchcmp/default.nix @@ -2,7 +2,6 @@ , rustPlatform , fetchFromGitHub , substituteAll -, rust , stdenv }: @@ -23,7 +22,7 @@ rustPlatform.buildRustPackage rec { # patch the binary path so tests can find the binary when `--target` is present (substituteAll { src = ./fix-test-binary-path.patch; - shortTarget = rust.toRustTarget stdenv.hostPlatform; + shortTarget = stdenv.hostPlatform.rust.rustcTarget; }) ]; diff --git a/pkgs/development/tools/rust/cargo-codspeed/default.nix b/pkgs/development/tools/rust/cargo-codspeed/default.nix index 3086d11d69d5a..d1f5c7d26f913 100644 --- a/pkgs/development/tools/rust/cargo-codspeed/default.nix +++ b/pkgs/development/tools/rust/cargo-codspeed/default.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { openssl zlib ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Security + darwin.apple_sdk.frameworks.Security ]; cargoBuildFlags = [ "-p=cargo-codspeed" ]; diff --git a/pkgs/development/tools/rust/cargo-leptos/Cargo.lock b/pkgs/development/tools/rust/cargo-leptos/Cargo.lock index 1849049179bbd..7e0abac242a84 100644 --- a/pkgs/development/tools/rust/cargo-leptos/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-leptos/Cargo.lock @@ -389,7 +389,7 @@ dependencies = [ [[package]] name = "cargo-leptos" -version = "0.2.1" +version = "0.2.2" dependencies = [ "ansi_term", "anyhow", diff --git a/pkgs/development/tools/rust/cargo-leptos/default.nix b/pkgs/development/tools/rust/cargo-leptos/default.nix index ed40ca1256959..a1e1ca030711f 100644 --- a/pkgs/development/tools/rust/cargo-leptos/default.nix +++ b/pkgs/development/tools/rust/cargo-leptos/default.nix @@ -20,8 +20,8 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "leptos-rs"; repo = pname; - rev = "${version}"; - hash = "sha256-i2nKtQC63BbZsrYvg+HkdqQfK59f0LzZ9dfmFBaqn14="; + rev = "e98b478b0c82af1469151eff30f4246b9af4a539"; + hash = "sha256-7o/yQanBBSA+MmMiGCYSjar4hZ8TRZoPiUniF5ELzXU="; }; cargoLock = { diff --git a/pkgs/development/tools/rust/cargo-mutants/default.nix b/pkgs/development/tools/rust/cargo-mutants/default.nix index ca70c3ecae11e..a3d97ff443989 100644 --- a/pkgs/development/tools/rust/cargo-mutants/default.nix +++ b/pkgs/development/tools/rust/cargo-mutants/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-mutants"; - version = "23.11.0"; + version = "23.11.1"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; rev = "v${version}"; - hash = "sha256-DYHEisVf+Qxiac/ZbPXrGRsFM6UUi584mY5mgzN7ZJE="; + hash = "sha256-UZ4agGxJfkqERrl354RjQb6x+FDMbrrXCjZBp6Gzu/c="; }; - cargoHash = "sha256-bJc33o+vm8oMrTkD/mg/xe7b9xQX/6JSDZlYgWeSa68="; + cargoHash = "sha256-0zezsxZPCt0jtV/4RrSQ6rriWvuwzztHFEUONvW1ZOs="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index fda47b5070aed..63217b655ac59 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -5,7 +5,6 @@ , Cocoa , CoreServices , Foundation -, rust , libiconv }: @@ -27,7 +26,7 @@ rustPlatform.buildRustPackage rec { # `test with_cargo` tries to call cargo-watch as a cargo subcommand # (calling cargo-watch with command `cargo watch`) preCheck = '' - export PATH="$(pwd)/target/${rust.toRustTarget stdenv.hostPlatform}/release:$PATH" + export PATH="$(pwd)/target/${stdenv.hostPlatform.rust.rustcTarget}/release:$PATH" ''; meta = with lib; { diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 4b66ecfa4674c..37cec14ee4c4c 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-hxtT5cL1PTXkTXGB0nVPhMI8Vlqrk4q2MHW0KGosFwc="; + hash = "sha256-MVmu9m+9XhWuPBEEoaYmsSbMFziSZaM5Gg5kOr1DT54="; }; - cargoHash = "sha256-IZWh/Bp9TdB+flc1PXVkwrIdOr83TFk6X6O5M0FVaO4="; + cargoHash = "sha256-hrdrGFtL2vGczINnvDa4rclkXsNWnEqtTt3NVaRay8w="; buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 274aff3f4e15f..8827d6b709e7b 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-tools"; - version = "1.3.261.0"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "sdk-${version}"; - hash = "sha256-K7cv0mMNrXYOlJsxAPwz3rVX5FnsnBNvaU33k9hYnQc="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-Bned5Pa6zCFByfNvqD0M5t3l4uAJYkDlpe6wu8e7a3U="; }; # The cmake options are sufficient for turning on static building, but not diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 754b2d4a5e0a0..09a11cef84f4e 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -23,18 +23,13 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.3.261"; - - # If we were to use "dev" here instead of headers, the setupHook would be - # placed in that output instead of "out". - outputs = ["out" "headers"]; - outputInclude = "headers"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; - rev = "v${version}"; - hash = "sha256-4kE3pkyYu6hnbv19fHhON+hI2HU4vLm31tNlp5fhndM="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-DwkSUclStYKe54tC1H3jMv1KOSScgqf25tR5ajQZ6os="; }; nativeBuildInputs = [ diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index f0f8a3454550f..01496458182fe 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.0.11"; + version = "1.0.12"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-yZp/AFlOVRtZ60865utrtVv0zlerwFMhpqBh26WnfL8="; + hash = "sha256-tGQQEEPBrMx3AuIsJbN0i/xoa7HSf4rNrE6km3NWjHQ="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-/9MKD2iRogrOIiKlCCPUX5KoDD0rM7K8+jVLx9xxs5s="; + hash = "sha256-xMmNBK0t+e/BLXnE3wOxbANXlwpQ/rczTK/7E80T6cw="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-9wE3GL+EGvPHtVgfMx09Jn+WU/VoUf5x/QrrdlhePa8="; + hash = "sha256-/3qLt3duJt0x0aI7xwWIEt8kAzLqSAlwC3C539vZ/aI="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-pT9+GchNC3vmeFgTF0GzzyLzWBrCQcR/DFRVK2CnHCw="; + hash = "sha256-+EWt1/YtGzJm/lRBPrf1RM5xdMVFMWurRNBQACALcSA="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 20fd20a5b9884..e4d2a2fec7076 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -1,11 +1,10 @@ # auto-generated file -- DO NOT EDIT! -{ rust, stdenv, fetchurl }: +{ stdenv, fetchurl }: let - arch = rust.toRustTarget stdenv.hostPlatform; fetch_librusty_v8 = args: fetchurl { name = "librusty_v8-${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${arch}.a"; + url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a"; sha256 = args.shas.${stdenv.hostPlatform.system}; meta = { inherit (args) version; }; }; diff --git a/pkgs/development/web/deno/update/librusty_v8.ts b/pkgs/development/web/deno/update/librusty_v8.ts index b38e0a28f1ab5..39831f6ea2797 100644 --- a/pkgs/development/web/deno/update/librusty_v8.ts +++ b/pkgs/development/web/deno/update/librusty_v8.ts @@ -40,13 +40,12 @@ fetchurl { const templateDeps = (version: string, deps: PrefetchResult[]) => `# auto-generated file -- DO NOT EDIT! -{ rust, stdenv, fetchurl }: +{ stdenv, fetchurl }: let - arch = rust.toRustTarget stdenv.hostPlatform; fetch_librusty_v8 = args: fetchurl { name = "librusty_v8-\${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v\${args.version}/librusty_v8_release_\${arch}.a"; + url = "https://github.com/denoland/rusty_v8/releases/download/v\${args.version}/librusty_v8_release_\${stdenv.hostPlatform.rust.rustcTarget}.a"; sha256 = args.shas.\${stdenv.hostPlatform.system}; meta = { inherit (args) version; }; }; diff --git a/pkgs/development/web/edge-runtime/librusty_v8.nix b/pkgs/development/web/edge-runtime/librusty_v8.nix index 6e9fc0a669fd6..1e0a306c13b6c 100644 --- a/pkgs/development/web/edge-runtime/librusty_v8.nix +++ b/pkgs/development/web/edge-runtime/librusty_v8.nix @@ -1,11 +1,10 @@ # auto-generated file -- DO NOT EDIT! -{ rust, stdenv, fetchurl }: +{ stdenv, fetchurl }: let - arch = rust.toRustTarget stdenv.hostPlatform; fetch_librusty_v8 = args: fetchurl { name = "librusty_v8-${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${arch}.a"; + url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a"; sha256 = args.shas.${stdenv.hostPlatform.system}; meta = { inherit (args) version; }; }; diff --git a/pkgs/development/web/mailcatcher/default.nix b/pkgs/development/web/mailcatcher/default.nix index df6ed0a5233a0..17d25378d8cdf 100644 --- a/pkgs/development/web/mailcatcher/default.nix +++ b/pkgs/development/web/mailcatcher/default.nix @@ -1,10 +1,10 @@ -{ pkgs, lib, bundlerApp, bundlerUpdateScript }: +{ ruby_3_2, lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "mailcatcher"; gemdir = ./.; exes = [ "mailcatcher" "catchmail" ]; - ruby = pkgs.ruby_3_0; + ruby = ruby_3_2; passthru.updateScript = bundlerUpdateScript "mailcatcher"; diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 8b615a55dd3a1..b1bd0ae912d95 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -34,6 +34,7 @@ let */ ]) (builtins.attrNames sharedLibDeps) ++ [ "--with-intl=system-icu" + "--openssl-use-def-ca-store" ]; copyLibHeaders = @@ -52,6 +53,12 @@ let strictDeps = true; + env = lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + # Make sure libc++ uses `posix_memalign` instead of `aligned_alloc` on x86_64-darwin. + # Otherwise, nodejs would require the 11.0 SDK and macOS 10.15+. + NIX_CFLAGS_COMPILE = "-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=101300"; + }; + CC_host = "cc"; CXX_host = "c++"; depsBuildBuild = [ buildPackages.stdenv.cc openssl libuv zlib icu ]; diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index e7dec1c12f665..c2d5d58bea784 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -1,8 +1,20 @@ -{ callPackage, python3, lib, stdenv, openssl, enableNpm ? true }: +{ callPackage, lib, overrideCC, pkgs, buildPackages, openssl, python3, enableNpm ? true }: let + # Clang 16+ cannot build Node v14 due to -Wenum-constexpr-conversion errors. + # Use an older version of clang with the current libc++ for compatibility (e.g., with icu). + ensureCompatibleCC = packages: + if packages.stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion packages.stdenv.cc.cc) "16" + then overrideCC packages.llvmPackages_15.stdenv (packages.llvmPackages_15.stdenv.cc.override { + inherit (packages.llvmPackages) libcxx; + extraPackages = [ packages.llvmPackages.libcxxabi ]; + }) + else packages.stdenv; + buildNodejs = callPackage ./nodejs.nix { inherit openssl; + stdenv = ensureCompatibleCC pkgs; + buildPackages = buildPackages // { stdenv = ensureCompatibleCC buildPackages; }; python = python3; }; in @@ -10,5 +22,5 @@ in inherit enableNpm; version = "14.21.3"; sha256 = "sha256-RY7AkuYK1wDdzwectj1DXBXaTHuz0/mbmo5YqZ5UB14="; - patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; + patches = lib.optional pkgs.stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index d4bb94c07d3e5..930b648ca5597 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -1,8 +1,20 @@ -{ callPackage, openssl, python3, fetchpatch, enableNpm ? true }: +{ callPackage, lib, overrideCC, pkgs, buildPackages, openssl, python3, fetchpatch, enableNpm ? true }: let + # Clang 16+ cannot build Node v14 due to -Wenum-constexpr-conversion errors. + # Use an older version of clang with the current libc++ for compatibility (e.g., with icu). + ensureCompatibleCC = packages: + if packages.stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion packages.stdenv.cc.cc) "16" + then overrideCC packages.llvmPackages_15.stdenv (packages.llvmPackages_15.stdenv.cc.override { + inherit (packages.llvmPackages) libcxx; + extraPackages = [ packages.llvmPackages.libcxxabi ]; + }) + else packages.stdenv; + buildNodejs = callPackage ./nodejs.nix { inherit openssl; + stdenv = ensureCompatibleCC pkgs; + buildPackages = buildPackages // { stdenv = ensureCompatibleCC buildPackages; }; python = python3; }; diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 3c8abbb291880..b36e8e3d0f3a2 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -1,8 +1,20 @@ -{ callPackage, fetchpatch, openssl, python3, enableNpm ? true }: +{ callPackage, lib, overrideCC, pkgs, buildPackages, fetchpatch, openssl, python3, enableNpm ? true }: let + # Clang 16+ cannot build Node v18 due to -Wenum-constexpr-conversion errors. + # Use an older version of clang with the current libc++ for compatibility (e.g., with icu). + ensureCompatibleCC = packages: + if packages.stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion packages.stdenv.cc.cc) "16" + then overrideCC packages.llvmPackages_15.stdenv (packages.llvmPackages_15.stdenv.cc.override { + inherit (packages.llvmPackages) libcxx; + extraPackages = [ packages.llvmPackages.libcxxabi ]; + }) + else packages.stdenv; + buildNodejs = callPackage ./nodejs.nix { inherit openssl; + stdenv = ensureCompatibleCC pkgs; + buildPackages = buildPackages // { stdenv = ensureCompatibleCC buildPackages; }; python = python3; }; in diff --git a/pkgs/games/animatch/default.nix b/pkgs/games/animatch/default.nix new file mode 100644 index 0000000000000..b6bf5473807c8 --- /dev/null +++ b/pkgs/games/animatch/default.nix @@ -0,0 +1,41 @@ +{ lib +, allegro5 +, cmake +, fetchFromGitLab +, libGL +, stdenv +, xorg +}: +stdenv.mkDerivation rec { + pname = "animatch"; + version = "1.0.3"; + src = fetchFromGitLab { + owner = "HolyPangolin"; + repo = "animatch"; + fetchSubmodules = true; + rev = "v${version}"; + hash = "sha256-zBV45WMAXtCpPPbDpr04K/a9UtZ4KLP9nUauBlbhrFo="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + allegro5 + libGL + xorg.libX11 + ]; + + cmakeFlags = [ + "-DLIBSUPERDERPY_STATIC=ON" # recommended by upstream for coexistence with other superderpy games + ]; + + meta = { + homepage = "https://gitlab.com/HolyPangolin/animatch/"; + description = "A cute match three game for the Librem 5 smartphone"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ colinsane ]; + }; +} + diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index 41579b5271054..fb54efee1dd5a 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { ] ++ optionals stdenv.isDarwin [ "NATIVE=osx" "CLANG=1" - "OSX_MIN=${stdenv.targetPlatform.darwinMinVersion}" + "OSX_MIN=${stdenv.hostPlatform.darwinMinVersion}" ]; postInstall = optionalString tiles diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index dad59953533bc..eaf391bbe6b18 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -2,7 +2,7 @@ let platformSlug = - if stdenv.targetPlatform.is32bit then + if stdenv.hostPlatform.is32bit then "linux32" else "linux64"; inifile = "linux/v0.${dwarf-fortress.baseVersion}.${dwarf-fortress.patchVersion}_${platformSlug}.ini"; diff --git a/pkgs/games/enigma/default.nix b/pkgs/games/enigma/default.nix index c9f16918b4900..e2e9ca1338c20 100644 --- a/pkgs/games/enigma/default.nix +++ b/pkgs/games/enigma/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "Puzzle game inspired by Oxyd on the Atari ST and Rock'n'Roll on the Amiga"; license = with licenses; [ gpl2 free ]; # source + bundles libs + art platforms = platforms.unix; - broken = stdenv.targetPlatform.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ iblech ]; homepage = "https://www.nongnu.org/enigma/"; }; diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix index 6ca70596458d4..10bf3f9268e6d 100644 --- a/pkgs/games/orthorobot/default.nix +++ b/pkgs/games/orthorobot/default.nix @@ -48,8 +48,10 @@ stdenv.mkDerivation rec { patches = [ # support for love11 + # https://github.com/Stabyourself/orthorobot/pull/3 (fetchpatch { - url = "https://github.com/Stabyourself/orthorobot/pull/3.patch"; + name = "Stabyourself-orthorobot-pull-3.patch"; + url = "https://github.com/Stabyourself/orthorobot/compare/48f07423950b29a94b04aefe268f2f951f55b62e...05856ba7dbf1bb86d0f16a5f511d8ee9f2176015.patch"; sha256 = "sha256-WHHP6QM7R5eEkVF+J2pGNnds/OKRIRXyon85wjd3GXI="; }) ]; diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 85ef0766b8e8f..923b69d31cfa0 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nasm ]; buildInputs = lib.optionals stdenv.isLinux [ - alsa-lib + alsa-lib libGLU libGL ] ++ lib.optionals stdenv.isDarwin [ Cocoa AudioToolbox Carbon CoreMIDI AudioUnit ] ++ [ - curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libtheora libvorbis libGLU libGL SDL2 zlib + curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libtheora libvorbis SDL2 zlib ]; dontDisableStatic = true; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 2fcbec7a1d313..8ba5087ef7fe7 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -81,7 +81,7 @@ in buildFHSEnv rec { xorg.libXfixes libGL libva - pipewire.lib + pipewire # steamwebhelper harfbuzz diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index c8c67e94b4a4a..593d78afe0ccd 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = writeShellScript "update.sh" '' version=$(${curl}/bin/curl https://repo.steampowered.com/steamrt-images-scout/snapshots/latest-steam-client-general-availability/VERSION.txt) - ${nix-update}/bin/nix-update --version "$version" steamPackages.steam-runtime + ${lib.getExe nix-update} --version "$version" steamPackages.steam-runtime ''; }; diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index 2901f42e095e2..c1c9415b90df3 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -12,30 +12,35 @@ , lua , luajit , zlib +, jsoncpp +, libpng , Cocoa }: stdenv.mkDerivation rec { pname = "the-powder-toy"; - version = "unstable-2022-08-30"; + version = "97.0.352"; src = fetchFromGitHub { owner = "The-Powder-Toy"; repo = "The-Powder-Toy"; - rev = "9e712eba080e194fc162b475f58aaed8f4ea008e"; - sha256 = "sha256-44xUfif1E+T9jzixWgnBxOWmzPPuVZy7rf62ig/CczA="; + rev = "v${version}"; + sha256 = "sha256-LYohsqFU9LBgTXMaV6cf8/zf3fBvT+s5A1JBpPHekH8="; }; nativeBuildInputs = [ meson ninja pkg-config python3 ]; - buildInputs = [ SDL2 bzip2 curl fftwFloat lua luajit zlib ] + buildInputs = [ SDL2 bzip2 curl fftwFloat lua luajit zlib jsoncpp libpng ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + mesonFlags = [ "-Dworkaround_elusive_bzip2=false" ]; + installPhase = '' install -Dm 755 powder $out/bin/powder mkdir -p $out/share/applications - mv ../resources/powder.desktop $out/share/applications mv ../resources $out/share + '' + lib.optionalString stdenv.isLinux '' + mv ./resources/powder.desktop $out/share/applications ''; meta = with lib; { diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index ba414d7aec5b3..c8df29776db95 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # service would stop the socket and break subsequent socket activations. # See https://github.com/apple/cups/issues/6005 sed -i '/PartOf=cups.service/d' scheduler/cups.socket.in - '' + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "12") '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12") '' substituteInPlace backend/usb-darwin.c \ --replace "kIOMainPortDefault" "kIOMasterPortDefault" ''; diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index 40438d333cf97..8614bdda2ab22 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -26,9 +26,9 @@ let system = - if stdenv.targetPlatform.system == "x86_64-linux" then "intel" - else if stdenv.targetPlatform.system == "aarch64-linux" then "arm" - else throw "Unsupported platform for Canon UFR2 Drivers: ${stdenv.targetPlatform.system}"; + if stdenv.hostPlatform.system == "x86_64-linux" then "intel" + else if stdenv.hostPlatform.system == "aarch64-linux" then "arm" + else throw "Unsupported platform for Canon UFR2 Drivers: ${stdenv.hostPlatform.system}"; ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; libs = pkgs: lib.makeLibraryPath buildInputs; diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh b/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh index bdb522744182e..829bc6509e069 100644 --- a/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh +++ b/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup arch=$(uname -m) diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index fe6c5a21ceb20..ca191319243f1 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.6.2"; + version = "10.6.4"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-j4dqLV1Q17RQczkTqGTh8S8Y6ELqXjWuJRr+xB/x2yE="; + hash = "sha256-+qBeE7t+d1Es63hUBO9Bcqyc0vtatcJGoYw2GE0JPxQ="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-aCekNpf6C5fGIEk0pLkz4hJ6mQfBIzeCsIL6Fxf2QGk="; + vendorHash = "sha256-Mh737emdQkIoNOAkaTafCoMQnLqXIGMKX6X5ClsmMzc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/misc/i3a/default.nix b/pkgs/misc/i3a/default.nix index 5bfc2c5c4a392..42d8c11915c8a 100644 --- a/pkgs/misc/i3a/default.nix +++ b/pkgs/misc/i3a/default.nix @@ -24,6 +24,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://git.goral.net.pl/mgoral/i3a"; description = "A set of scripts used for automation of i3 and sway window manager layouts"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/misc/openrussian-cli/default.nix b/pkgs/misc/openrussian-cli/default.nix deleted file mode 100644 index 038bdd5a73f1a..0000000000000 --- a/pkgs/misc/openrussian-cli/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, wget, unzip -, sqlite, which, lua, installShellFiles, makeWrapper -}: -let - luaEnv = lua.withPackages(p: with p; [ luasql-sqlite3 luautf8 ]); -in -stdenv.mkDerivation rec { - pname = "openrussian-cli"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "rhaberkorn"; - repo = "openrussian-cli"; - rev = version; - sha256 = "1ria7s7dpqip2wdwn35wmkry84g8ghdqnxc9cbxzzq63vl6pgvcn"; - }; - - nativeBuildInputs = [ - pkg-config wget unzip sqlite which installShellFiles makeWrapper - ]; - - buildInputs = [ luaEnv ]; - - makeFlags = [ - "LUA=${luaEnv}/bin/lua" - "LUAC=${luaEnv}/bin/luac" - ]; - - dontConfigure = true; - - # Can't use "make install" here - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/openrussian - cp openrussian-sqlite3.db $out/share/openrussian - cp openrussian $out/bin - - wrapProgram $out/bin/openrussian \ - --prefix LUA_PATH ';' '${lua.pkgs.luaLib.genLuaPathAbsStr luaEnv}' \ - --prefix LUA_CPATH ';' '${lua.pkgs.luaLib.genLuaCPathAbsStr luaEnv}' - - runHook postInstall - ''; - - postInstall = '' - installShellCompletion --cmd openrussian --bash ./openrussian-completion.bash - installManPage ./openrussian.1 - ''; - - meta = with lib; { - description = "Offline Console Russian Dictionary (based on openrussian.org)"; - homepage = "https://github.com/rhaberkorn/openrussian-cli"; - license = with licenses; [ gpl3Only mit cc-by-sa-40 ]; - maintainers = with maintainers; [ zane ]; - mainProgram = "openrussian"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/os-specific/darwin/DarwinTools/default.nix b/pkgs/os-specific/darwin/DarwinTools/default.nix index 72a3750284531..11e4c84395dab 100644 --- a/pkgs/os-specific/darwin/DarwinTools/default.nix +++ b/pkgs/os-specific/darwin/DarwinTools/default.nix @@ -13,17 +13,17 @@ stdenv.mkDerivation rec { ./sw_vers-CFPriv.patch ]; - postPatch = '' - substituteInPlace Makefile \ - --replace gcc cc - ''; - configurePhase = '' export SRCROOT=. export SYMROOT=. export DSTROOT=$out ''; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "STRIP=${stdenv.cc.targetPrefix}strip" + ]; + postInstall = '' mv $out/usr/* $out rmdir $out/usr diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 0c959695d7795..5484ba5acb189 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -1,9 +1,6 @@ -{ stdenv, fetchurl, libxml2, xar, cpio, pkgs, python3Minimal, pbzx, lib, darwin-stubs, print-reexports }: +{ stdenv, fetchurl, cpio, pbzx, pkgs, lib, darwin-stubs, print-reexports }: let - xarMinimal = xar.override { - libxml2 = libxml2.override { pythonSupport = false; }; - }; # sadly needs to be exported because security_tool needs it sdk = stdenv.mkDerivation rec { pname = "MacOS_SDK"; @@ -19,27 +16,23 @@ let sha256 = "13xq34sb7383b37hwy076gnhf96prpk1b4087p87xnwswxbrisih"; }; - nativeBuildInputs = [ xarMinimal cpio python3Minimal pbzx ]; + nativeBuildInputs = [ cpio pbzx ]; outputs = [ "out" "dev" "man" ]; unpackPhase = '' - xar -x -f $src + pbzx $src | cpio -idm ''; + sourceRoot = "."; + installPhase = '' - start="$(pwd)" mkdir -p $out - cd $out - pbzx -n $start/Payload | cpio -idm - - mv usr/* . - rmdir usr - mv System/* . - rmdir System + cp -R System/Library $out + cp -R usr/* $out - pushd lib + pushd $out/lib cp ${darwin-stubs}/usr/lib/libcups*.tbd . ln -s libcups.2.tbd libcups.tbd ln -s libcupscgi.1.tbd libcupscgi.tbd diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix index 6e6712f375e65..931bebeae5dd4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix @@ -1,6 +1,13 @@ { appleDerivation', stdenvNoCC }: appleDerivation' stdenvNoCC { + patches = [ + # The source release version of math.h is missing some symbols that are actually present + # in newer SDKs. Patch them into the header to avoid implicit function declaration errors + # when compiling with newer versions of clang. + ./missing-declarations.patch + ]; + installPhase = '' mkdir -p $out/include diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libm/missing-declarations.patch b/pkgs/os-specific/darwin/apple-source-releases/Libm/missing-declarations.patch new file mode 100644 index 0000000000000..e56934e59d4c4 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/Libm/missing-declarations.patch @@ -0,0 +1,292 @@ +--- a/Source/Intel/math.h 2023-10-20 09:43:42.640416006 -0400 ++++ b/Source/Intel/math.h 2023-10-20 09:47:59.743127003 -0400 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved. ++ * Copyright (c) 2002-2015 Apple Inc. All rights reserved. + * + * @APPLE_LICENSE_HEADER_START@ + * +@@ -27,14 +27,17 @@ + * Contains: typedefs, prototypes, and macros germane to C99 floating point.* + * * + *******************************************************************************/ ++#ifndef __MATH_H__ ++#define __MATH_H__ ++ + #ifndef __MATH__ + #define __MATH__ ++#endif + +-#include <sys/cdefs.h> /* For definition of __DARWIN_UNIX03 et al */ ++#include <sys/cdefs.h> ++#include <Availability.h> + +-#ifdef __cplusplus +-extern "C" { +-#endif ++__BEGIN_DECLS + + /****************************************************************************** + * Floating point data types * +@@ -87,14 +90,26 @@ + #define FP_SUBNORMAL 5 + #define FP_SUPERNORMAL 6 /* meaningful only on PowerPC */ + +-/* fma() *function call* is more costly than equivalent (in-line) multiply and add operations */ +-/* For single and double precision, the cost isn't too bad, because we can fall back on higher */ +-/* precision hardware, with the necessary range to handle infinite precision products. However, */ +-/* expect the long double fma to be at least an order of magnitude slower than a simple multiply */ +-/* and an add. */ +-#undef FP_FAST_FMA +-#undef FP_FAST_FMAF +-#undef FP_FAST_FMAL ++#if defined __arm64__ || defined __ARM_VFPV4__ ++/* On these architectures, fma(), fmaf( ), and fmal( ) are generally about as ++ fast as (or faster than) separate multiply and add of the same operands. */ ++# define FP_FAST_FMA 1 ++# define FP_FAST_FMAF 1 ++# define FP_FAST_FMAL 1 ++#elif (defined __i386__ || defined __x86_64__) && (defined __FMA__) ++/* When targeting the FMA ISA extension, fma() and fmaf( ) are generally ++ about as fast as (or faster than) separate multiply and add of the same ++ operands, but fmal( ) may be more costly. */ ++# define FP_FAST_FMA 1 ++# define FP_FAST_FMAF 1 ++# undef FP_FAST_FMAL ++#else ++/* On these architectures, fma( ), fmaf( ), and fmal( ) function calls are ++ significantly more costly than separate multiply and add operations. */ ++# undef FP_FAST_FMA ++# undef FP_FAST_FMAF ++# undef FP_FAST_FMAL ++#endif + + /* The values returned by `ilogb' for 0 and NaN respectively. */ + #define FP_ILOGB0 (-2147483647 - 1) +@@ -191,6 +206,23 @@ + static __inline__ int __inline_isnormalf( float __x ) { float fabsf = __builtin_fabsf(__x); if( __x != __x ) return 0; return fabsf < __builtin_inff() && fabsf >= __FLT_MIN__; } + static __inline__ int __inline_isnormald( double __x ) { double fabsf = __builtin_fabs(__x); if( __x != __x ) return 0; return fabsf < __builtin_inf() && fabsf >= __DBL_MIN__; } + static __inline__ int __inline_isnormal( long double __x ) { long double fabsf = __builtin_fabsl(__x); if( __x != __x ) return 0; return fabsf < __builtin_infl() && fabsf >= __LDBL_MIN__; } ++ ++#if defined __i386__ || defined __x86_64__ ++__header_always_inline int __inline_signbitl(long double __x) { ++ union { ++ long double __ld; ++ struct{ unsigned long long __m; unsigned short __sexp; } __p; ++ } __u; ++ __u.__ld = __x; ++ return (int)(__u.__p.__sexp >> 15); ++} ++#else ++__header_always_inline int __inline_signbitl(long double __x) { ++ union { long double __f; unsigned long long __u;} __u; ++ __u.__f = __x; ++ return (int)(__u.__u >> 63); ++} ++#endif + + #else + +@@ -509,7 +541,112 @@ + extern long double __infl( void ); + extern float __nan( void ); /* 10.3 (and later) must retain in ABI for backward compatability */ + +-#if !defined(_ANSI_SOURCE) ++ ++/****************************************************************************** ++ * Apple extensions to the C standard * ++ ******************************************************************************/ ++ ++/* Because these functions are not specified by any relevant standard, they ++ are prefixed with __, which places them in the implementor's namespace, so ++ they should not conflict with any developer or third-party code. If they ++ are added to a relevant standard in the future, un-prefixed names may be ++ added to the library and they may be moved out of this section of the ++ header. ++ ++ Because these functions are non-standard, they may not be available on non- ++ Apple platforms. */ ++ ++/* __exp10(x) returns 10**x. Edge cases match those of exp( ) and exp2( ). */ ++extern float __exp10f(float) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++extern double __exp10(double) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++ ++/* __sincos(x,sinp,cosp) computes the sine and cosine of x with a single ++ function call, storing the sine in the memory pointed to by sinp, and ++ the cosine in the memory pointed to by cosp. Edge cases match those of ++ separate calls to sin( ) and cos( ). */ ++__header_always_inline void __sincosf(float __x, float *__sinp, float *__cosp); ++__header_always_inline void __sincos(double __x, double *__sinp, double *__cosp); ++ ++/* __sinpi(x) returns the sine of pi times x; __cospi(x) and __tanpi(x) return ++ the cosine and tangent, respectively. These functions can produce a more ++ accurate answer than expressions of the form sin(M_PI * x) because they ++ avoid any loss of precision that results from rounding the result of the ++ multiplication M_PI * x. They may also be significantly more efficient in ++ some cases because the argument reduction for these functions is easier ++ to compute. Consult the man pages for edge case details. */ ++extern float __cospif(float) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++extern double __cospi(double) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++extern float __sinpif(float) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++extern double __sinpi(double) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++extern float __tanpif(float) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++extern double __tanpi(double) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++ ++#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED < 1090) || \ ++ (defined __IPHONE_OS_VERSION_MIN_REQUIRED && __IPHONE_OS_VERSION_MIN_REQUIRED < 70000) ++/* __sincos and __sincosf were introduced in OSX 10.9 and iOS 7.0. When ++ targeting an older system, we simply split them up into discrete calls ++ to sin( ) and cos( ). */ ++__header_always_inline void __sincosf(float __x, float *__sinp, float *__cosp) { ++ *__sinp = sinf(__x); ++ *__cosp = cosf(__x); ++} ++ ++__header_always_inline void __sincos(double __x, double *__sinp, double *__cosp) { ++ *__sinp = sin(__x); ++ *__cosp = cos(__x); ++} ++#else ++/* __sincospi(x,sinp,cosp) computes the sine and cosine of pi times x with a ++ single function call, storing the sine in the memory pointed to by sinp, ++ and the cosine in the memory pointed to by cosp. Edge cases match those ++ of separate calls to __sinpi( ) and __cospi( ), and are documented in the ++ man pages. ++ ++ These functions were introduced in OSX 10.9 and iOS 7.0. Because they are ++ implemented as header inlines, weak-linking does not function as normal, ++ and they are simply hidden when targeting earlier OS versions. */ ++__header_always_inline void __sincospif(float __x, float *__sinp, float *__cosp); ++__header_always_inline void __sincospi(double __x, double *__sinp, double *__cosp); ++ ++/* Implementation details of __sincos and __sincospi allowing them to return ++ two results while allowing the compiler to optimize away unnecessary load- ++ store traffic. Although these interfaces are exposed in the math.h header ++ to allow compilers to generate better code, users should call __sincos[f] ++ and __sincospi[f] instead and allow the compiler to emit these calls. */ ++struct __float2 { float __sinval; float __cosval; }; ++struct __double2 { double __sinval; double __cosval; }; ++ ++extern struct __float2 __sincosf_stret(float); ++extern struct __double2 __sincos_stret(double); ++extern struct __float2 __sincospif_stret(float); ++extern struct __double2 __sincospi_stret(double); ++ ++__header_always_inline void __sincosf(float __x, float *__sinp, float *__cosp) { ++ const struct __float2 __stret = __sincosf_stret(__x); ++ *__sinp = __stret.__sinval; *__cosp = __stret.__cosval; ++} ++ ++__header_always_inline void __sincos(double __x, double *__sinp, double *__cosp) { ++ const struct __double2 __stret = __sincos_stret(__x); ++ *__sinp = __stret.__sinval; *__cosp = __stret.__cosval; ++} ++ ++__header_always_inline void __sincospif(float __x, float *__sinp, float *__cosp) { ++ const struct __float2 __stret = __sincospif_stret(__x); ++ *__sinp = __stret.__sinval; *__cosp = __stret.__cosval; ++} ++ ++__header_always_inline void __sincospi(double __x, double *__sinp, double *__cosp) { ++ const struct __double2 __stret = __sincospi_stret(__x); ++ *__sinp = __stret.__sinval; *__cosp = __stret.__cosval; ++} ++#endif ++ ++/****************************************************************************** ++ * POSIX/UNIX extensions to the C standard * ++ ******************************************************************************/ ++ ++#if __DARWIN_C_LEVEL >= 199506L + extern double j0 ( double ); + + extern double j1 ( double ); +@@ -543,14 +680,32 @@ + extern int signgam; /* required for unix 2003 */ + + +-#endif /* !defined(_ANSI_SOURCE) */ ++#endif /* __DARWIN_C_LEVEL >= 199506L */ + +-#if !defined(__NOEXTENSIONS__) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)) +-#define __WANT_EXTENSIONS__ +-#endif ++/* Long-double versions of M_E, etc for convenience on Intel where long- ++ double is not the same as double. Define __MATH_LONG_DOUBLE_CONSTANTS ++ to make these constants available. */ ++#if defined __MATH_LONG_DOUBLE_CONSTANTS ++#define M_El 0xa.df85458a2bb4a9bp-2L ++#define M_LOG2El 0xb.8aa3b295c17f0bcp-3L ++#define M_LOG10El 0xd.e5bd8a937287195p-5L ++#define M_LN2l 0xb.17217f7d1cf79acp-4L ++#define M_LN10l 0x9.35d8dddaaa8ac17p-2L ++#define M_PIl 0xc.90fdaa22168c235p-2L ++#define M_PI_2l 0xc.90fdaa22168c235p-3L ++#define M_PI_4l 0xc.90fdaa22168c235p-4L ++#define M_1_PIl 0xa.2f9836e4e44152ap-5L ++#define M_2_PIl 0xa.2f9836e4e44152ap-4L ++#define M_2_SQRTPIl 0x9.06eba8214db688dp-3L ++#define M_SQRT2l 0xb.504f333f9de6484p-3L ++#define M_SQRT1_2l 0xb.504f333f9de6484p-4L ++#endif /* defined __MATH_LONG_DOUBLE_CONSTANTS */ + +-#ifdef __WANT_EXTENSIONS__ ++/****************************************************************************** ++ * Legacy BSD extensions to the C standard * ++ ******************************************************************************/ + ++#if __DARWIN_C_LEVEL >= __DARWIN_C_FULL + #define FP_SNAN FP_NAN + #define FP_QNAN FP_NAN + +@@ -560,11 +715,6 @@ + /* Legacy API: please use C99 lround() instead. */ + extern long int roundtol ( double ); + +-/* +- * XOPEN/SVID +- */ +-#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)) +-#if (!defined(_XOPEN_SOURCE) || defined(_DARWIN_C_SOURCE)) + #if !defined(__cplusplus) + /* used by matherr below */ + struct exception { +@@ -592,19 +742,12 @@ + #define TLOSS 5 + #define PLOSS 6 + +-#endif /* (!_XOPEN_SOURCE || _DARWIN_C_SOURCE) */ +-#endif /* !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */ +- +-#if !defined( __STRICT_ANSI__) && !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)) +- + /* Legacy API: please use C99 isfinite() instead. */ + extern int finite ( double ); + + /* Legacy API: please use C99 tgamma() instead. */ + extern double gamma ( double ); + +-#if (!defined(_XOPEN_SOURCE) || defined(_DARWIN_C_SOURCE)) +- + #if !defined(__cplusplus) + extern int matherr ( struct exception * ); + #endif +@@ -633,14 +776,8 @@ + extern double lgamma_r ( double, int * ) AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER; + extern long double lgammal_r ( long double, int * ) AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER; + #endif /* _REENTRANT */ +- +-#endif /* (!_XOPEN_SOURCE || _DARWIN_C_SOURCE) */ +-#endif /* !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */ +- +-#endif /* __WANT_EXTENSIONS__ */ + +-#ifdef __cplusplus +-} +-#endif ++#endif /* __DARWIN_C_LEVEL >= __DARWIN_C_FULL */ + +-#endif /* __MATH__ */ ++__END_DECLS ++#endif /* __MATH_H__ */ diff --git a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix index 38b13f784a328..998bc867e757f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix @@ -1,11 +1,19 @@ -{ lib, stdenv, appleDerivation', launchd, bootstrap_cmds, xnu, xpc, ppp, IOKit, eap8021x, Security +{ lib, stdenv, runCommand, appleDerivation', launchd, bootstrap_cmds, swift-corelibs-foundation, xnu, xpc, ppp, IOKit, eap8021x, Security , headersOnly ? false }: +let + privateHeaders = runCommand "swift-corelibs-foundation-private" { } '' + mkdir -p $out/include/CoreFoundation + + cp ${swift-corelibs-foundation}/Library/Frameworks/CoreFoundation.framework/PrivateHeaders/* \ + $out/include/CoreFoundation + ''; +in appleDerivation' stdenv { meta.broken = stdenv.cc.nativeLibc; nativeBuildInputs = lib.optionals (!headersOnly) [ bootstrap_cmds ]; - buildInputs = lib.optionals (!headersOnly) [ launchd ppp xpc IOKit eap8021x ]; + buildInputs = lib.optionals (!headersOnly) [ privateHeaders launchd ppp xpc IOKit eap8021x ]; propagatedBuildInputs = lib.optionals (!headersOnly) [ Security ]; @@ -13,7 +21,6 @@ appleDerivation' stdenv { NIX_CFLAGS_COMPILE = toString [ "-ISystemConfiguration.framework/Headers" "-I${xnu}/Library/Frameworks/System.framework/Versions/B/PrivateHeaders" - "-D_DNS_SD_LIBDISPATCH" # Needed for DNSServiceSetDispatchQueue to be available ]; }; @@ -23,11 +30,6 @@ appleDerivation' stdenv { substituteInPlace SystemConfiguration.fproj/SCNetworkReachability.c \ --replace ''$'#define\tHAVE_VPN_STATUS' "" - - # Our neutered CoreFoundation doesn't have this function, but I think we'll live... - substituteInPlace SystemConfiguration.fproj/SCNetworkConnectionPrivate.c \ - --replace 'CFPreferencesAppValueIsForced(serviceID, USER_PREFERENCES_APPLICATION_ID)' 'FALSE' \ - --replace 'CFPreferencesAppValueIsForced(userPrivate->serviceID, USER_PREFERENCES_APPLICATION_ID)' 'FALSE' ''; dontBuild = headersOnly; diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix index 30d123ab804c8..e4431c68c9aad 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix @@ -5,12 +5,17 @@ let xnu-src = if stdenv.isAarch64 then macosPackages_11_0_1.xnu.src else xnu.src; arch = if stdenv.isAarch64 then "arm" else "i386"; in appleDerivation { + patches = [ + # Fixes a build failure with newer versions of clang that make implicit int an error. + ./fix-implicit-int.patch + ]; + nativeBuildInputs = [ xcbuildHook ]; buildInputs = [ libutil ]; env.NIX_CFLAGS_COMPILE = "-I."; NIX_LDFLAGS = "-lutil"; - patchPhase = '' + prePatch = '' # ugly hacks for missing headers # most are bsd related - probably should make this a drv unpackFile ${Libc.src} diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/fix-implicit-int.patch b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/fix-implicit-int.patch new file mode 100644 index 0000000000000..df0fff930daf1 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/fix-implicit-int.patch @@ -0,0 +1,11 @@ +diff -ur a/diskdev_cmds.xcodeproj/project.pbxproj b/diskdev_cmds.xcodeproj/project.pbxproj +--- a/quota.tproj/quota.c 2021-10-06 01:13:40.000000000 -0400 ++++ b/quota.tproj/quota.c 2023-10-27 08:24:05.960965958 -0400 +@@ -115,6 +115,7 @@ + + int + main(argc, argv) ++ int argc; + char *argv[]; + { + int ngroups; diff --git a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix b/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix index 4082f5b760cf8..0ba4caee6289a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix @@ -4,6 +4,9 @@ appleDerivation' stdenvNoCC { dontBuild = true; installPhase = '' mkdir -p $out/include - cp mDNSShared/dns_sd.h $out/include + # TODO: Do this only for 765.50.9 once there is a way to apply version-specific + # logic in a source-release derivation. + substitute mDNSShared/dns_sd.h $out/include/dns_sd.h \ + --replace '#define _DNS_SD_LIBDISPATCH 0' '#define _DNS_SD_LIBDISPATCH 1' ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix index c99523d6c8616..c6fc009430374 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix @@ -20,7 +20,12 @@ appleDerivation { done ''; - env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=format-security" ]; # hardeningDisable doesn't cut it + env.NIX_CFLAGS_COMPILE = toString [ + # hardeningDisable doesn't cut it + "-Wno-error=format-security" + # Required to build with clang 16 + "-Wno-error=deprecated-non-prototype" + ]; meta = { platforms = lib.platforms.darwin; diff --git a/pkgs/os-specific/darwin/moltenvk/default.nix b/pkgs/os-specific/darwin/moltenvk/default.nix index 41f929fe90ff6..2293720d7fabe 100644 --- a/pkgs/os-specific/darwin/moltenvk/default.nix +++ b/pkgs/os-specific/darwin/moltenvk/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: { -configuration Release \ -project MoltenVKShaderConverter.xcodeproj \ -scheme MoltenVKShaderConverter \ - -arch ${stdenv.targetPlatform.darwinArch} + -arch ${stdenv.hostPlatform.darwinArch} declare -A products=( [MoltenVKShaderConverter]=bin [libMoltenVKShaderConverter.a]=lib ) for product in "''${!products[@]}"; do cp MoltenVKShaderConverter-*/Build/Products/Release/$product "$build/''${products[$product]}/$product" @@ -127,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: { -configuration Release \ -project MoltenVK.xcodeproj \ -scheme MoltenVK-macOS \ - -arch ${stdenv.targetPlatform.darwinArch} + -arch ${stdenv.hostPlatform.darwinArch} cp MoltenVK-*/Build/Products/Release/dynamic/libMoltenVK.dylib "$build/lib/libMoltenVK.dylib" popd ''; diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix index fa6e1aa01e9f4..f979f7ec020e7 100644 --- a/pkgs/os-specific/darwin/skhd/default.nix +++ b/pkgs/os-specific/darwin/skhd/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation (finalAttrs: { "BUILD_PATH=$(out)/bin" ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + postInstall = '' mkdir -p $out/Library/LaunchDaemons cp ${./org.nixos.skhd.plist} $out/Library/LaunchDaemons/org.nixos.skhd.plist diff --git a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix index d77976773c66d..5c593b1488e29 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, makeSetupHook, cmake, ninja, pkg-config, launchd, libdispatch, python3, libxml2, objc4, icu }: +{ lib, stdenv, fetchFromGitHub, fetchurl, makeSetupHook, cmake, pkg-config, launchd, libdispatch, python3Minimal, libxml2, objc4, icu }: let # 10.12 adds a new sysdir.h that our version of CF in the main derivation depends on, but @@ -21,7 +21,7 @@ stdenv.mkDerivation { sha256 = "17kpql0f27xxz4jjw84vpas5f5sn4vdqwv10g151rc3rswbwln1z"; }; - nativeBuildInputs = [ cmake ninja pkg-config python3 ]; + nativeBuildInputs = [ cmake pkg-config python3Minimal ]; buildInputs = [ (lib.getDev launchd) libdispatch libxml2 objc4 icu ]; patches = [ diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index dc46c790c3af7..98487799aa8aa 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -6,7 +6,7 @@ }: let - tag = "0.3.4"; + tag = "0.3.5"; in stdenv.mkDerivation { pname = "apfs"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { owner = "linux-apfs"; repo = "linux-apfs-rw"; rev = "v${tag}"; - hash = "sha256-EeVOrZtmKi5VfPerW9IntjRvdU3AbFPHG+pyAI4ciGk="; + hash = "sha256-rKz9a4Z+tx63rhknQIl/zu/WIMjxxM0+NGyaxnzxLk4="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/bionic-prebuilt/default.nix b/pkgs/os-specific/linux/bionic-prebuilt/default.nix index da5011e673734..3ce10735f1de8 100644 --- a/pkgs/os-specific/linux/bionic-prebuilt/default.nix +++ b/pkgs/os-specific/linux/bionic-prebuilt/default.nix @@ -5,7 +5,7 @@ let choosePlatform = - let pname = stdenv.targetPlatform.parsed.cpu.name; in + let pname = stdenv.hostPlatform.parsed.cpu.name; in pset: pset.${pname} or (throw "bionic-prebuilt: unsupported platform ${pname}"); prebuilt_crt = choosePlatform { @@ -66,7 +66,7 @@ in stdenvNoCC.mkDerivation rec { pname = "bionic-prebuilt"; version = "ndk-release-r23"; - name = "${stdenv.targetPlatform.parsed.cpu.name}-${pname}-${version}"; + name = "${stdenv.hostPlatform.parsed.cpu.name}-${pname}-${version}"; src = fetchzip { url = "https://android.googlesource.com/platform/bionic/+archive/00e8ce1142d8823b0d2fc8a98b40119b0f1f02cd.tar.gz"; diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index acb484ba6b6a7..c6c7d9d0f509b 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -23,11 +23,11 @@ ]; in stdenv.mkDerivation rec { pname = "bluez"; - version = "5.66"; + version = "5.70"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; - sha256 = "sha256-Of6mS1kMlJKYSgwnqJ/CA+HNx0hmCG77j0aYZ3qytXQ="; + sha256 = "sha256-N+Ny6RaVXhRMuIL4iOS+QImPEK47fCE93N1V7pwAkng="; }; patches = [ diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 7940ce060e4d0..00d46591c1361 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -88,9 +88,9 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" "ASCIIDOC=${buildPackages.asciidoc}/bin/asciidoc" "XMLTO=${buildPackages.xmlto}/bin/xmlto" - ] ++ (lib.optionals (stdenv.buildPlatform != stdenv.targetPlatform) [ - "ARCH=${linuxArchMapping."${stdenv.targetPlatform.linuxArch}"}" - "CROSS_COMPILE=${stdenv.targetPlatform.config}-" + ] ++ (lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "ARCH=${linuxArchMapping."${stdenv.hostPlatform.linuxArch}"}" + "CROSS_COMPILE=${stdenv.hostPlatform.config}-" ]); outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index 296e4b79b3e08..cacef99afd748 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Device that allows access to Linux kernel cryptographic drivers"; homepage = "http://cryptodev-linux.org/"; - maintainers = with lib.maintainers; [ fortuneteller2k ]; + maintainers = with lib.maintainers; [ moni ]; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index c85a75d1f17f4..789a59f751f50 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -3,20 +3,20 @@ , autoreconfHook , pkg-config , dbus -, fetchpatch , sysctl +, gitUpdater }: stdenv.mkDerivation rec { pname = "ell"; - version = "0.58"; + version = "0.59"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; rev = version; - hash = "sha256-CwUwwvyT541aIvypVMqRhHkVJLna121Cme+v7c0FLWo="; + hash = "sha256-uJcGYT+JSdz/XTyJb/VUyedmSKJW/4BbTM3fw3ebtIc="; }; nativeBuildInputs = [ @@ -30,19 +30,17 @@ stdenv.mkDerivation rec { sysctl ]; - patches = [ - # /proc/sys/net/core/somaxconn doesn't always exist in the nix build environment - (fetchpatch { - name = "skip-sysctl-test-if-sysfs-not-available.patch"; - url = "https://patchwork.kernel.org/project/ell/patch/526DA75D-01AB-4D85-BF5C-5F25E5C39480@kloenk.dev/raw/"; - hash = "sha256-YYGYWQ67cbMLt6RnqZmHt+tpvVIDKPbSCqPIouk6alU="; - }) - ]; enableParallelBuilding = true; # tests sporadically fail on musl doCheck = !stdenv.hostPlatform.isMusl; + passthru = { + updateScript = gitUpdater { + url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; + }; + }; + meta = with lib; { homepage = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; description = "Embedded Linux Library"; diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index bbd871a1b9ae7..f4b8bfc5661a5 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -1,4 +1,4 @@ -{ version, sha256Hash }: +{ version, hash }: { lib, stdenv, fetchFromGitHub, fetchpatch , fusePackages, util-linux, gettext, shadow @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { owner = "libfuse"; repo = "libfuse"; rev = "${pname}-${version}"; - sha256 = sha256Hash; + inherit hash; }; preAutoreconf = "touch config.rpath"; @@ -48,6 +48,7 @@ in stdenv.mkDerivation rec { mesonFlags = lib.optionals isFuse3 [ "-Dudevrulesdir=/udev/rules.d" "-Duseroot=false" + "-Dinitscriptdir=" ]; preConfigure = '' diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index 6aa3e46d4e1ae..f692c2fb41c78 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -7,11 +7,11 @@ let in { fuse_2 = mkFuse { version = "2.9.9"; - sha256Hash = "1yxxvm58c30pc022nl1wlg8fljqpmwnchkywic3r74zirvlcq23n"; + hash = "sha256-dgjM6M7xk5MHi9xPyCyvF0vq0KM8UCsEYBcMhkrdvfs="; }; fuse_3 = mkFuse { - version = "3.11.0"; - sha256Hash = "1wx80xxlvjn0wxhmkr1g91vwrgxssyzds1hizzxc2xrd4kjh9dfb"; + version = "3.16.2"; + hash = "sha256-QO9s+IkR0rkqIYNqt2IYST6AVBkCr56jcuuz5nKJuA4="; }; } diff --git a/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch b/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch index 903f30325df2e..582d3eb0dec89 100644 --- a/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch +++ b/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch @@ -1,12 +1,13 @@ +diff --git a/lib/meson.build b/lib/meson.build --- a/lib/meson.build +++ b/lib/meson.build @@ -37,8 +37,7 @@ libfuse = library('fuse3', libfuse_sources, version: meson.project_version(), soversion: '3', include_directories: include_dirs, dependencies: deps, install: true, link_depends: 'fuse_versionscript', -- c_args: [ '-DFUSE_USE_VERSION=35', +- c_args: [ '-DFUSE_USE_VERSION=312', - '-DFUSERMOUNT_DIR="@0@"'.format(fusermount_path) ], -+ c_args: [ '-DFUSE_USE_VERSION=35' ], ++ c_args: [ '-DFUSE_USE_VERSION=312' ], link_args: ['-Wl,--version-script,' + meson.current_source_dir() + '/fuse_versionscript' ]) diff --git a/pkgs/os-specific/linux/fuse/fuse3-install.patch b/pkgs/os-specific/linux/fuse/fuse3-install.patch index 147bcb439fb87..769e3088664cd 100644 --- a/pkgs/os-specific/linux/fuse/fuse3-install.patch +++ b/pkgs/os-specific/linux/fuse/fuse3-install.patch @@ -1,18 +1,20 @@ ---- a/util/install_helper.sh 2019-07-10 12:00:15.984840142 +0200 -+++ b/util/install_helper.sh 2019-07-10 12:28:56.343011401 +0200 -@@ -37,10 +37,10 @@ - fi +--- a/util/install_helper.sh 2023-08-26 22:12:11.028651669 +0200 ++++ b/util/install_helper.sh 2023-08-26 22:38:03.165058694 +0200 +@@ -39,12 +39,12 @@ - install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \ + if [ "${udevrulesdir}" != "" ]; then + install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \ - "${DESTDIR}${udevrulesdir}/99-fuse3.rules" + "${sysconfdir}${udevrulesdir}/99-fuse3.rules" + fi - install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \ -- "${DESTDIR}/etc/init.d/fuse3" -+ "${sysconfdir}/init.d/fuse3" - + if [ "$initscriptdir" != "" ]; then + install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \ +- "${DESTDIR}${initscriptdir}/fuse3" ++ "${sysconfdir}${initscriptdir}/fuse3" - if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then + if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then + /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true diff --git a/util/meson.build b/util/meson.build index aa0e734..06d4378 100644 --- a/util/meson.build diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index a64a0574d8ffb..5bfdf61dff6ba 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.374"; + version = "0.376"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - hash = "sha256-RvjYd8iD6JkGhh6TDy/Qo+UzLxbhPvIJvhl/Rw14lbk="; + hash = "sha256-M1uBamN09XepOembDAcHXO/UvnM9s/OiN+eNzChF5Tw="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 9d2848556eaf2..b82484514e5f7 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -2,31 +2,18 @@ , autoreconfHook, pkg-config, pruneLibtoolFiles, flex, bison , libmnl, libnetfilter_conntrack, libnfnetlink, libnftnl, libpcap , nftablesCompat ? true -, fetchpatch +, gitUpdater }: stdenv.mkDerivation rec { - version = "1.8.9"; + version = "1.8.10"; pname = "iptables"; src = fetchurl { url = "https://www.netfilter.org/projects/${pname}/files/${pname}-${version}.tar.xz"; - sha256 = "72Y5pDvoMlpPjqaBI/+sI2y2lujHhQG2ToEGr7AIyH8="; + sha256 = "XMJVwYk1bjF9BwdVzpNx62Oht4PDRJj7jDAmTzzFnJw="; }; - patches = [ - (fetchpatch { - name = "format-security.patch"; - url = "https://git.netfilter.org/iptables/patch/?id=ed4082a7405a5838c205a34c1559e289949200cc"; - sha256 = "OdytFmHk+3Awu+sDQpGTl5/qip4doRblmW2vQzfNZiU="; - }) - (fetchurl { - name = "static.patch"; - url = "https://lore.kernel.org/netfilter-devel/20230402232939.1060151-1-hi@alyssa.is/raw"; - sha256 = "PkH+1HbJjBb3//ffBe0XUQok1lBwgj/STL8Ppu/28f4="; - }) - ]; - outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ @@ -35,10 +22,6 @@ stdenv.mkDerivation rec { buildInputs = [ libmnl libnetfilter_conntrack libnfnetlink libnftnl libpcap ]; - preConfigure = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -lmnl -lnftnl" - ''; - configureFlags = [ "--enable-bpf-compiler" "--enable-devel" @@ -47,6 +30,8 @@ stdenv.mkDerivation rec { "--enable-shared" ] ++ lib.optional (!nftablesCompat) "--disable-nftables"; + enableParallelBuilding = true; + postInstall = lib.optionalString nftablesCompat '' rm $out/sbin/{iptables,iptables-restore,iptables-save,ip6tables,ip6tables-restore,ip6tables-save} ln -sv xtables-nft-multi $out/bin/iptables @@ -57,6 +42,13 @@ stdenv.mkDerivation rec { ln -sv xtables-nft-multi $out/bin/ip6tables-save ''; + passthru = { + updateScript = gitUpdater { + url = "https://git.netfilter.org/iptables"; + rev-prefix = "v"; + }; + }; + meta = with lib; { description = "A program to configure the Linux IP packet filtering ruleset"; homepage = "https://www.netfilter.org/projects/iptables/index.html"; diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index 585c1661b8afb..df19771501369 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { description = "A daemon to help balance the cpu load generated by interrupts across all of a systems cpus"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index ff40e585b1d8d..e0a3c4319b8b0 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -119,7 +119,10 @@ in { hash = "sha256-eldLvCCALqdrUsp/rwcmf3IEXoYbGJFcUnKpjCer+IQ="; }; patches = [ - ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms + ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms + + # Fix regression turning `struct sockaddr_ll` flexible size. + ./revert-af_packet-flex.patch ]; }; } diff --git a/pkgs/os-specific/linux/kernel-headers/revert-af_packet-flex.patch b/pkgs/os-specific/linux/kernel-headers/revert-af_packet-flex.patch new file mode 100644 index 0000000000000..ed6c8861d2fb4 --- /dev/null +++ b/pkgs/os-specific/linux/kernel-headers/revert-af_packet-flex.patch @@ -0,0 +1,31 @@ +Revert commit https://github.com/torvalds/linux/commit/a0ade8404c3bc2bf2631cb0f20d372eed22d9d96 + +The change caused API regression by turning fixed size struct to +flexible size struct. It was an unintentional change, broke `udp2raw`: + https://github.com/NixOS/nixpkgs/pull/252587#issuecomment-1744427473 +--- a/include/uapi/linux/if_packet.h ++++ b/include/uapi/linux/if_packet.h +@@ -18,11 +18,7 @@ struct sockaddr_ll { + unsigned short sll_hatype; + unsigned char sll_pkttype; + unsigned char sll_halen; +- union { +- unsigned char sll_addr[8]; +- /* Actual length is in sll_halen. */ +- __DECLARE_FLEX_ARRAY(unsigned char, sll_addr_flex); +- }; ++ unsigned char sll_addr[8]; + }; + + /* Packet types */ +--- a/net/packet/af_packet.c ++++ b/net/packet/af_packet.c +@@ -3607,7 +3607,7 @@ static int packet_getname(struct socket *sock, struct sockaddr *uaddr, + if (dev) { + sll->sll_hatype = dev->type; + sll->sll_halen = dev->addr_len; +- memcpy(sll->sll_addr_flex, dev->dev_addr, dev->addr_len); ++ memcpy(sll->sll_addr, dev->dev_addr, dev->addr_len); + } else { + sll->sll_hatype = 0; /* Bad: we have no ARPHRD_UNSPEC */ + sll->sll_halen = 0; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 1ce9aa72a4841..2954ee8f78b90 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -845,6 +845,8 @@ let CLEANCACHE = whenOlder "5.17" (option yes); CRASH_DUMP = option no; + FSCACHE_STATS = yes; + DVB_DYNAMIC_MINORS = option yes; # we use udev EFI_STUB = yes; # EFI bootloader in the bzImage itself diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 74c47db625618..df67005dd8165 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -135,8 +135,6 @@ let platformName = stdenv.hostPlatform.linux-kernel.name; # e.g. "defconfig" kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig; - # e.g. "bzImage" - kernelTarget = stdenv.hostPlatform.linux-kernel.target; makeFlags = lib.optionals (stdenv.hostPlatform.linux-kernel ? makeFlags) stdenv.hostPlatform.linux-kernel.makeFlags ++ extraMakeFlags; diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 5201a4248f853..94ab60aa67b99 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -7,10 +7,6 @@ "version": "6.5.11", "hash": "sha256:06dmb4hbwrms0lp4axphwgj8wbnzsym70sx55lxr501b53wlmqif" }, - "6.4": { - "version": "6.4.16", - "hash": "sha256:0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln" - }, "6.1": { "version": "6.1.62", "hash": "sha256:1v453q4sf0j8708ivs1zmdf645hgimqvxfc8xz7czgnnmipn3zdr" diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 0763ffda26b99..c58c4e67e4d0c 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -6,27 +6,32 @@ # bcachefs-tools stores the expected-revision in: # https://evilpiepirate.org/git/bcachefs-tools.git/tree/.bcachefs_revision # but this does not means that it'll be the latest-compatible revision -, currentCommit ? "84f132d5696138bb038d2dc8f1162d2fab5ac832" -, diffHash ? "sha256-RaBWBU7rXjJFb1euFAFBHWCBQAG7npaCodjp/vMYpyw=" +, currentCommit ? "4d2faeb4fb58c389dc9f76b8d5ae991ef4497e04" +, diffHash ? "sha256-DtMc8P4lTRzvS6PVvD7WtWEPsfnxIXSpqMsKKWs+edI=" , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , argsOverride ? {} , ... } @ args: - # NOTE: bcachefs-tools should be updated simultaneously to preserve compatibility (kernel.override ( args // { - version = "${kernel.version}-bcachefs-unstable-${commitDate}"; - extraMeta = { - branch = "master"; - broken = stdenv.isAarch64; - maintainers = with lib.maintainers; [ davidak Madouura pedrohlc raitobezarius ]; - }; + argsOverride = { + version = "${kernel.version}-bcachefs-unstable-${commitDate}"; + modDirVersion = kernel.modDirVersion; + + extraMeta = { + homepage = "https://bcachefs.org/"; + branch = "master"; + maintainers = with lib.maintainers; [ davidak Madouura pedrohlc raitobezarius YellowOnion ]; + }; + } // argsOverride; structuredExtraConfig = with lib.kernel; { BCACHEFS_FS = module; BCACHEFS_QUOTA = option yes; BCACHEFS_POSIX_ACL = option yes; + # useful for bug reports + FTRACE = option yes; }; kernelPatches = [ { diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index d5b67b5efbe3c..2ba31fbc97892 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl -, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole, kmod +, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole, kmod, ubootTools , fetchpatch }: @@ -120,10 +120,6 @@ let # Ensure that depmod gets resolved through PATH sed -i Makefile -e 's|= /sbin/depmod|= depmod|' - # fixup for pre-5.4 kernels using the $(cd $foo && /bin/pwd) pattern - # FIXME: remove when no longer needed - substituteInPlace Makefile tools/scripts/Makefile.include --replace /bin/pwd pwd - # Don't include a (random) NT_GNU_BUILD_ID, to make the build more deterministic. # This way kernels can be bit-by-bit reproducible depending on settings # (e.g. MODULE_SIG and SECURITY_LOCKDOWN_LSM need to be disabled). @@ -368,8 +364,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat enableParallelBuilding = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr zstd python3Minimal kmod ] - ++ optional (stdenv.hostPlatform.linux-kernel.target == "uImage") buildPackages.ubootTools + nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr zstd python3Minimal kmod ubootTools ] ++ optional (lib.versionOlder version "5.8") libelf ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ] ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole zlib ] diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 82b17d461d2b7..4f967734d5e0e 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -2,6 +2,9 @@ let # These names are how they are designated in https://xanmod.org. + + # NOTE: When updating these, please also take a look at the changes done to + # kernel config in the xanmod version commit ltsVariant = { version = "6.1.62"; hash = "sha256-fo5OQ/MZ+QVdCmLzX0OgFUBedfqrkqp+Ev081RVdtWw="; @@ -26,21 +29,10 @@ let }; structuredExtraConfig = with lib.kernel; { - # AMD P-state driver - X86_AMD_PSTATE = lib.mkOverride 60 yes; - # Google's BBRv3 TCP congestion Control TCP_CONG_BBR = yes; DEFAULT_BBR = yes; - # FQ-PIE Packet Scheduling - NET_SCH_DEFAULT = yes; - DEFAULT_FQ_PIE = yes; - - # Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync. - FUTEX = yes; - FUTEX_PI = yes; - # WineSync driver for fast kernel-backed Wine WINESYNC = module; @@ -52,7 +44,7 @@ let extraMeta = { branch = lib.versions.majorMinor version; - maintainers = with lib.maintainers; [ fortuneteller2k lovesegfault atemu shawn8901 zzzsy ]; + maintainers = with lib.maintainers; [ moni lovesegfault atemu shawn8901 zzzsy ]; description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience"; broken = stdenv.isAarch64; }; diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 0843ca3556aea..3f971e7a6edb3 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -12,7 +12,7 @@ let in stdenv.mkDerivation rec { pname = "kmod"; - version = "30"; + version = "31"; # autogen.sh is missing from the release tarball, # and we need to run it to regenerate gtk_doc.make, @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { # https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/.gitignore?id=61a93a043aa52ad62a11ba940d4ba93cb3254e78 src = fetchzip { url = "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/snapshot/kmod-${version}.tar.gz"; - sha256 = "sha256-/dih2LoqgRrAsVdHRwld28T8pXgqnzapnQhqkXnxbbc="; + hash = "sha256-FNR015/AoYBbi7Eb1M2TXH3yxUuddKICCu+ot10CdeQ="; }; outputs = [ "out" "dev" "lib" ] ++ lib.optional withDevdoc "devdoc"; diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/os-specific/linux/nmon/default.nix index 768e8e43edc95..30285f9c5b254 100644 --- a/pkgs/os-specific/linux/nmon/default.nix +++ b/pkgs/os-specific/linux/nmon/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; dontUnpack = true; buildPhase = "${stdenv.cc.targetPrefix}cc -o nmon ${src} -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -lm -g -D ${ - with stdenv.targetPlatform; + with stdenv.hostPlatform; if isx86 then "X86" else if isAarch then "ARM" else if isPower then "POWER" diff --git a/pkgs/os-specific/linux/numatop/default.nix b/pkgs/os-specific/linux/numatop/default.nix index ad0138f18b751..f4995264b09ed 100644 --- a/pkgs/os-specific/linux/numatop/default.nix +++ b/pkgs/os-specific/linux/numatop/default.nix @@ -16,12 +16,14 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://github.com/intel/numatop/pull/54.patch"; + # https://github.com/intel/numatop/pull/54 + url = "https://github.com/intel/numatop/compare/eab0ac5253c5843aa0f0ac36e2eec7612207711b...c1001fd926c24eae2d40729492e07270ce133b72.patch"; sha256 = "sha256-TbMLv7TT9T8wE4uJ1a/AroyPPwrwL0eX5IBLsh9GTTM="; name = "fix-string-operations.patch"; }) (fetchpatch { - url = "https://github.com/intel/numatop/pull/64.patch"; + # https://github.com/intel/numatop/pull/64 + url = "https://github.com/intel/numatop/commit/635e2ce2ccb1ac793cc276a7fcb8a92b1ffefa5d.patch"; sha256 = "sha256-IevbSFJRTS5iQ5apHOVXzF67f3LJaW6j7DySFmVuyiM="; name = "fix-format-strings-mvwprintw.patch"; }) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index b7824f209776e..fbb116ab42adc 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup unpackManually() { diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh b/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh index 34f9b15794557..ed2c60da26121 100644 --- a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh +++ b/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup mkdir -p $out/lib diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index b16bebbe3d606..a35f40be59550 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -1,5 +1,8 @@ -{ lib, stdenv, buildPackages, fetchurl, flex, cracklib, db4, gettext, audit, libxcrypt +{ lib, stdenv, buildPackages, fetchurl +, fetchpatch +, flex, cracklib, db4, gettext, audit, libxcrypt , nixosTests +, autoreconfHook269, pkg-config-unwrapped }: stdenv.mkDerivation rec { @@ -11,12 +14,25 @@ stdenv.mkDerivation rec { sha256 = "sha256-5OxxMakdpEUSV0Jo9JPG2MoQXIcJFpG46bVspoXU+U0="; }; - patches = [ ./suid-wrapper-path.patch ]; + patches = [ + ./suid-wrapper-path.patch + # Pull support for localization on non-default --prefix: + # https://github.com/NixOS/nixpkgs/issues/249010 + # https://github.com/linux-pam/linux-pam/pull/604 + (fetchpatch { + name = "bind-locales.patch"; + url = "https://github.com/linux-pam/linux-pam/commit/77bd338125cde583ecdfb9fd69619bcd2baf15c2.patch"; + hash = "sha256-tlc9RcLZpEH315NFD4sdN9yOco8qhC6+bszl4OHm+AI="; + }) + ]; outputs = [ "out" "doc" "man" /* "modules" */ ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ flex ] + # autoreconfHook269 is needed for `suid-wrapper-path.patch` and + # `bind-locales.patch` above. + # pkg-config-unwrapped is needed for `AC_CHECK_LIB` and `AC_SEARCH_LIBS` + nativeBuildInputs = [ flex autoreconfHook269 pkg-config-unwrapped ] ++ lib.optional stdenv.buildPlatform.isDarwin gettext; buildInputs = [ cracklib db4 libxcrypt ] diff --git a/pkgs/os-specific/linux/pam/suid-wrapper-path.patch b/pkgs/os-specific/linux/pam/suid-wrapper-path.patch index 71533c51a1902..a427ccf388162 100644 --- a/pkgs/os-specific/linux/pam/suid-wrapper-path.patch +++ b/pkgs/os-specific/linux/pam/suid-wrapper-path.patch @@ -1,6 +1,6 @@ It needs the SUID version during runtime, and that can't be in /nix/store/** ---- a/modules/pam_unix/Makefile.in -+++ b/modules/pam_unix/Makefile.in -@@ -651 +651 @@ +--- a/modules/pam_unix/Makefile.am ++++ b/modules/pam_unix/Makefile.am +@@ -21 +21 @@ - -DCHKPWD_HELPER=\"$(sbindir)/unix_chkpwd\" \ + -DCHKPWD_HELPER=\"/run/wrappers/bin/unix_chkpwd\" \ diff --git a/pkgs/os-specific/linux/pam_p11/default.nix b/pkgs/os-specific/linux/pam_p11/default.nix index 8970f7ed62859..0a7e02f4ad819 100644 --- a/pkgs/os-specific/linux/pam_p11/default.nix +++ b/pkgs/os-specific/linux/pam_p11/default.nix @@ -13,8 +13,10 @@ stdenv.mkDerivation rec { patches = [ # fix with openssl 3.x + # https://github.com/OpenSC/pam_p11/pull/22 (fetchpatch { - url = "https://github.com/OpenSC/pam_p11/pull/22.patch"; + name = "OpenSC-pam_p11-pull-22.patch"; + url = "https://github.com/OpenSC/pam_p11/compare/cd4eba2e921e1c2f93cde71922a76af99376246c...debd4f7acfaf998cfe4002e0be5c35ad9a9591b5.patch"; excludes = [ ".github/build.sh" ]; hash = "sha256-bm/agnBgvrr8L8yoGK4gzBqOGgsNWf9NIgcNJG7proE="; }) diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index e1f88469e04f2..314a95bd55483 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "19.1.0-54729"; + version = "19.1.1-54734"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-Qo/6EuILu5i3hjhxecf3qfoMFEJHJZVY19tDIXDJiag="; + hash = "sha256-02YxBkV9pZGfXuK6GvUDTgE9U5H2MOMk24h9qGJdFTM="; }; hardeningDisable = [ "pic" "format" ]; diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 67b839a1bd367..56a92ffa44ef6 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -27,7 +27,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-RRiz56r9NOwH0AY9JQ/UdJmbILIAIYw65W9dIRPxQbQ="; }; - patches = lib.optionals stdenv.hostPlatform.isMusl [ + patches = [ + ./v3-CVE-2023-4016.patch + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ # NOTE: Starting from 4.x we will not need a patch anymore, but need to add # "--disable-w" to configureFlags instead to prevent the utmp errors (fetchpatch { diff --git a/pkgs/os-specific/linux/procps-ng/v3-CVE-2023-4016.patch b/pkgs/os-specific/linux/procps-ng/v3-CVE-2023-4016.patch new file mode 100644 index 0000000000000..2e260eaf7382a --- /dev/null +++ b/pkgs/os-specific/linux/procps-ng/v3-CVE-2023-4016.patch @@ -0,0 +1,63 @@ +This is https://gitlab.com/procps-ng/procps/-/commit/2c933ecba3bb1d3041a5a7a53a7b4078a6003413.diff +back-ported to procps 3.3.17. That commit changes xmalloc to xcalloc. This patch differs in two ways: + +* We modify it to change malloc (no x-) to xcalloc instead +* We pull in procps-4's definition of xcalloc + +Alternative considered: Also pull in commits that changed malloc to xmalloc and defined xcalloc. +This alternative is rejected because those commits contain many other unrelated changes. + +diff --git a/ps/parser.c b/ps/parser.c +index 4263a1fb..ee9a57d9 100644 +--- a/ps/parser.c ++++ b/ps/parser.c +@@ -36,6 +36,14 @@ + #include "common.h" + #include "c.h" + ++static void *xxcalloc(const size_t nelems, const size_t size) ++{ ++ void *ret = calloc(nelems, size); ++ if (!ret && size && nelems) ++ xerrx(EXIT_FAILURE, "cannot allocate %zu bytes", nelems*size); ++ return ret; ++} ++ + #define ARG_GNU 0 + #define ARG_END 1 + #define ARG_PGRP 2 +@@ -184,7 +192,6 @@ static const char *parse_list(const char *arg, const char *(*parse_fn)(char *, s + const char *err; /* error code that could or did happen */ + /*** prepare to operate ***/ + node = malloc(sizeof(selection_node)); +- node->u = malloc(strlen(arg)*sizeof(sel_union)); /* waste is insignificant */ + node->n = 0; + buf = strdup(arg); + /*** sanity check and count items ***/ +@@ -205,6 +212,7 @@ static const char *parse_list(const char *arg, const char *(*parse_fn)(char *, s + } while (*++walk); + if(need_item) goto parse_error; + node->n = items; ++ node->u = xxcalloc(items, sizeof(sel_union)); + /*** actually parse the list ***/ + walk = buf; + while(items--){ +@@ -1031,15 +1039,15 @@ static const char *parse_trailing_pids(void){ + thisarg = ps_argc - 1; /* we must be at the end now */ + + pidnode = malloc(sizeof(selection_node)); +- pidnode->u = malloc(i*sizeof(sel_union)); /* waste is insignificant */ ++ pidnode->u = xxcalloc(i, sizeof(sel_union)); /* waste is insignificant */ + pidnode->n = 0; + + grpnode = malloc(sizeof(selection_node)); +- grpnode->u = malloc(i*sizeof(sel_union)); /* waste is insignificant */ ++ grpnode->u = xxcalloc(i, sizeof(sel_union)); /* waste is insignificant */ + grpnode->n = 0; + + sidnode = malloc(sizeof(selection_node)); +- sidnode->u = malloc(i*sizeof(sel_union)); /* waste is insignificant */ ++ sidnode->u = xxcalloc(i, sizeof(sel_union)); /* waste is insignificant */ + sidnode->n = 0; + + while(i--){ diff --git a/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix b/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix index a4fc11c8647ce..50793167a3498 100644 --- a/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { description = "RealTek RTL8188eus WiFi driver with monitor mode & frame injection support"; homepage = "https://github.com/aircrack-ng/rtl8188eus"; license = licenses.gpl2Only; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; broken = (lib.versionAtLeast kernel.version "6.6") || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened); }; } diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 9646886a6de17..adc197a1166ec 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation { homepage = "https://github.com/morrownr/8812au-20210629"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 746f9b17a6981..38fec65b33344 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "shadow"; - version = "4.14.0"; + version = "4.14.1"; src = fetchFromGitHub { owner = "shadow-maint"; repo = pname; rev = version; - hash = "sha256-zopJevCv7ot8RLp/rSQGKO05eF4FjkLaOEMo9aq9Afo="; + hash = "sha256-DzPPnttnJSOMQwXWyFcz6fEtjwBC3p2PpZpBAQ/Ew18="; }; outputs = [ "out" "su" "dev" "man" ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 98adb27d796fc..0311d46d1fc4a 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -124,7 +124,7 @@ , withRemote ? !stdenv.hostPlatform.isMusl , withResolved ? true , withShellCompletions ? true -, withSysusers ? false # conflicts with the NixOS user management +, withSysusers ? true , withSysupdate ? true , withTimedated ? true , withTimesyncd ? true @@ -134,6 +134,8 @@ , withUtmp ? !stdenv.hostPlatform.isMusl # tests assume too much system access for them to be feasible for us right now , withTests ? false + # build only libudev and libsystemd +, buildLibsOnly ? false # name argument , pname ? "systemd" @@ -202,6 +204,14 @@ stdenv.mkDerivation (finalAttrs: { ./0017-core-don-t-taint-on-unmerged-usr.patch ./0018-tpm2_context_init-fix-driver-name-checking.patch ./0019-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch + + # Fix for `RuntimeError: ELF .dynamic section is missing.` + # https://github.com/systemd/systemd/issues/29381 + # https://github.com/systemd/systemd/pull/29392 + (fetchpatch { + url = "https://github.com/systemd/systemd/commit/cecbb162a3134b43d2ca160e13198c73ff34c3ef.patch"; + hash = "sha256-hWpUosTDA18mYm5nIb9KnjwOlnzbEHgzha/WpyHoC54="; + }) ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { @@ -372,7 +382,7 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs tools test src/!(rpm|kernel-install|ukify) src/kernel-install/test-kernel-install.sh ''; - outputs = [ "out" "man" "dev" ]; + outputs = [ "out" "dev" ] ++ (lib.optional (!buildLibsOnly) "man"); nativeBuildInputs = [ @@ -436,7 +446,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withUkify (python3Packages.python.withPackages (ps: with ps; [ pefile ])) ; - #dontAddPrefix = true; + mesonBuildType = "release"; mesonFlags = [ "-Dversion-tag=${version}" @@ -697,7 +707,9 @@ stdenv.mkDerivation (finalAttrs: { export DESTDIR=/ ''; - postInstall = '' + mesonInstallTags = lib.optionals buildLibsOnly [ "devel" "libudev" "libsystemd" ]; + + postInstall = lib.optionalString (!buildLibsOnly) '' mkdir -p $out/example/systemd mv $out/lib/{binfmt.d,sysctl.d,tmpfiles.d} $out/example mv $out/lib/systemd/{system,user} $out/example/systemd @@ -715,8 +727,10 @@ stdenv.mkDerivation (finalAttrs: { find $out -name "*kernel-install*" -exec rm {} \; '' + lib.optionalString (!withDocumentation) '' rm -rf $out/share/doc - '' + lib.optionalString withKmod '' + '' + lib.optionalString (withKmod && !buildLibsOnly) '' mv $out/lib/modules-load.d $out/example + '' + lib.optionalString withSysusers '' + mv $out/lib/sysusers.d $out/example ''; # Avoid *.EFI binary stripping. At least on aarch64-linux strip diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix index 09a2d8bf638d1..e0ab2b2802f1a 100644 --- a/pkgs/os-specific/linux/trinity/default.nix +++ b/pkgs/os-specific/linux/trinity/default.nix @@ -1,25 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "trinity"; - version = "1.9"; + version = "1.9-unstable-2023-07-10"; src = fetchFromGitHub { owner = "kernelslacker"; repo = "trinity"; - rev = "v${version}"; - sha256 = "0z1a7x727xacam74jccd223k303sllgwpq30lnq9b6xxy8b659bv"; + rev = "e71872454d26baf37ae1d12e9b04a73d64179555"; + hash = "sha256-Zy+4L1CuB2Ul5iF+AokDkAW1wheDzoCTNkvRZFGRNps="; }; - patches = [ - # Pull upstream fix for -fno-common toolchains - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/kernelslacker/trinity/commit/e53e25cc8dd5bdb5f7d9b4247de9e9921eec81d8.patch"; - sha256 = "0dbhyc98x11cmac6rj692zymnfqfqcbawlrkg1lhgfagzjxxwshg"; - }) - ]; - postPatch = '' patchShebangs configure patchShebangs scripts @@ -27,12 +18,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - makeFlags = [ "DESTDIR=$(out)" ]; + installFlags = [ "DESTDIR=$(out)" ]; meta = with lib; { description = "A Linux System call fuzz tester"; - homepage = "https://codemonkey.org.uk/projects/trinity/"; - license = licenses.gpl2; + homepage = "https://github.com/kernelslacker/trinity"; + license = licenses.gpl2Only; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 20936fa7d4958..cfd94bf33c46a 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "usbutils"; - version = "015"; + version = "017"; src = fetchurl { url = "mirror://kernel/linux/utils/usb/usbutils/usbutils-${version}.tar.xz"; - sha256 = "sha256-w7RRux9P+fY1bKxaaVaprI6F2BZRr1ainmiflPpv2m4="; + hash = "sha256-pqJf/c+RA+ONekRzKsoXBz9OYCuS5K5VYlIxqCcC4Fs="; }; patches = [ diff --git a/pkgs/os-specific/linux/util-linux/bcachefs-patch-set.patch b/pkgs/os-specific/linux/util-linux/bcachefs-patch-set.patch new file mode 100644 index 0000000000000..068744d4f32d0 --- /dev/null +++ b/pkgs/os-specific/linux/util-linux/bcachefs-patch-set.patch @@ -0,0 +1,277 @@ +commit 68564ebb50f8afab5a9527c534417e247cca0b27 +Author: Filipe Manana <fdmanana@kernel.org> +Date: Thu Aug 17 10:20:13 2023 +0100 + + libmount: Fix regression when mounting with atime + + A regression was introduced in v2.39 that causes mounting with the atime + option to fail: + + $ mkfs.ext4 -F /dev/sdi + $ mount -o atime /dev/sdi /mnt/sdi + mount: /mnt/sdi: not mount point or bad option. + dmesg(1) may have more information after failed mount system call. + + The failure comes from the mount_setattr(2) call returning -EINVAL. This + is because we pass an invalid value for the attr_clr argument. From a + strace capture we have: + + mount_setattr(4, "", AT_EMPTY_PATH, {attr_set=0, attr_clr=MOUNT_ATTR_NOATIME, propagation=0 /* MS_??? */, userns_fd=0}, 32) = -1 EINVAL (Invalid argument) + + We can't pass MOUNT_ATTR_NOATIME to mount_setattr(2) through the attr_clr + argument because all atime options are exclusive, so in order to set atime + one has to pass MOUNT_ATTR__ATIME to attr_clr and leave attr_set as + MOUNT_ATTR_RELATIME (which is defined as a value of 0). + + This can be read from the man page for mount_setattr(2) and also from the + kernel source: + + $ cat fs/namespace.c + static int build_mount_kattr(const struct mount_attr *attr, size_t usize, + struct mount_kattr *kattr, unsigned int flags) + { + (...) + /* + * Since the MOUNT_ATTR_<atime> values are an enum, not a bitmap, + * users wanting to transition to a different atime setting cannot + * simply specify the atime setting in @attr_set, but must also + * specify MOUNT_ATTR__ATIME in the @attr_clr field. + * So ensure that MOUNT_ATTR__ATIME can't be partially set in + * @attr_clr and that @attr_set can't have any atime bits set if + * MOUNT_ATTR__ATIME isn't set in @attr_clr. + */ + if (attr->attr_clr & MOUNT_ATTR__ATIME) { + if ((attr->attr_clr & MOUNT_ATTR__ATIME) != MOUNT_ATTR__ATIME) + return -EINVAL; + + /* + * Clear all previous time settings as they are mutually + * exclusive. + */ + kattr->attr_clr |= MNT_RELATIME | MNT_NOATIME; + switch (attr->attr_set & MOUNT_ATTR__ATIME) { + case MOUNT_ATTR_RELATIME: + kattr->attr_set |= MNT_RELATIME; + break; + case MOUNT_ATTR_NOATIME: + kattr->attr_set |= MNT_NOATIME; + break; + case MOUNT_ATTR_STRICTATIME: + break; + default: + return -EINVAL; + } + (...) + + So fix this by setting attr_clr MOUNT_ATTR__ATIME if we want to clear any + atime related option. + + Signed-off-by: Filipe Manana <fdmanana@kernel.org> + +diff --git a/libmount/src/optlist.c b/libmount/src/optlist.c +index 1e962ec6d..0702adae7 100644 +--- a/libmount/src/optlist.c ++++ b/libmount/src/optlist.c +@@ -875,7 +875,18 @@ int mnt_optlist_get_attrs(struct libmnt_optlist *ls, uint64_t *set, uint64_t *cl + + if (opt->ent->mask & MNT_INVERT) { + DBG(OPTLIST, ul_debugobj(ls, " clr: %s", opt->ent->name)); +- *clr |= x; ++ /* ++ * All atime settings are mutually exclusive so *clr must ++ * have MOUNT_ATTR__ATIME set. ++ * ++ * See the function fs/namespace.c:build_mount_kattr() ++ * in the linux kernel source. ++ */ ++ if (x == MOUNT_ATTR_RELATIME || x == MOUNT_ATTR_NOATIME || ++ x == MOUNT_ATTR_STRICTATIME) ++ *clr |= MOUNT_ATTR__ATIME; ++ else ++ *clr |= x; + } else { + DBG(OPTLIST, ul_debugobj(ls, " set: %s", opt->ent->name)); + *set |= x; +diff --git a/tests/expected/libmount/context-mount-flags b/tests/expected/libmount/context-mount-flags +index 960641863..eb71323dd 100644 +--- a/tests/expected/libmount/context-mount-flags ++++ b/tests/expected/libmount/context-mount-flags +@@ -3,3 +3,6 @@ ro,nosuid,noexec + successfully mounted + rw,nosuid,noexec + successfully umounted ++successfully mounted ++rw,relatime ++successfully umounted +diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context +index f5b47185e..a5d2e81a3 100755 +--- a/tests/ts/libmount/context ++++ b/tests/ts/libmount/context +@@ -116,8 +116,15 @@ $TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPU + + ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG + is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG +-ts_finalize_subtest + ++# Test that the atime option works after the migration to use the new kernel mount APIs. ++ts_run $TESTPROG --mount -o atime $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>> $TS_ERRLOG ++is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG ++ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ++is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG ++ ++ts_finalize_subtest + + ts_init_subtest "mount-loopdev" + mkdir -p $MOUNTPOINT &> /dev/null + +commit 1ec71634aa4ef5ddca23d65c8a296f3614231e8a +Author: Colin Gillespie <colin@cgillespie.xyz> +Date: Wed Aug 9 18:28:07 2023 +1000 + + libblkid: (bcachefs) fix not detecting large superblocks + + Probing does not detect bcachefs filesystems with a superblock larger + than 4KiB. Bcachefs superblocks grow in size and can become much larger + than this. + + Increase the superblock maximum size limit to 1MiB. + + Validate the superblock isn't larger than the maximum size defined in + the superblocks layout section. + + (cherry picked from commit 48d573797797650d96456979797c0155d58f61cb) + +diff --git a/libblkid/src/superblocks/bcache.c b/libblkid/src/superblocks/bcache.c +index 40e702d75..236877042 100644 +--- a/libblkid/src/superblocks/bcache.c ++++ b/libblkid/src/superblocks/bcache.c +@@ -102,6 +102,15 @@ union bcachefs_sb_csum { + uint8_t raw[16]; + } __attribute__((packed)); + ++struct bcachefs_sb_layout { ++ uint8_t magic[16]; ++ uint8_t layout_type; ++ uint8_t sb_max_size_bits; ++ uint8_t nr_superblocks; ++ uint8_t pad[5]; ++ uint64_t sb_offset[61]; ++} __attribute__((packed)); ++ + struct bcachefs_super_block { + union bcachefs_sb_csum csum; + uint16_t version; +@@ -123,7 +132,7 @@ struct bcachefs_super_block { + uint64_t flags[8]; + uint64_t features[2]; + uint64_t compat[2]; +- uint8_t layout[512]; ++ struct bcachefs_sb_layout layout; + struct bcachefs_sb_field _start[]; + } __attribute__((packed)); + +@@ -143,7 +152,7 @@ struct bcachefs_super_block { + /* granularity of offset and length fields within superblock */ + #define BCACHEFS_SECTOR_SIZE 512 + /* maximum superblock size */ +-#define BCACHEFS_SB_MAX_SIZE 4096 ++#define BCACHEFS_SB_MAX_SIZE 0x100000 + /* fields offset within super block */ + #define BCACHEFS_SB_FIELDS_OFF offsetof(struct bcachefs_super_block, _start) + /* tag value for members field */ +@@ -302,6 +311,9 @@ static int probe_bcachefs(blkid_probe pr, const struct blkid_idmag *mag) + return BLKID_PROBE_NONE; + + sb_size = BCACHEFS_SB_FIELDS_OFF + BYTES(bcs); ++ if (sb_size > BCACHEFS_SECTOR_SIZE << bcs->layout.sb_max_size_bits) ++ return BLKID_PROBE_NONE; ++ + if (sb_size > BCACHEFS_SB_MAX_SIZE) + return BLKID_PROBE_NONE; + + +commit acbf17ae8f8ee0f941fe98ed12f115f2b349bba8 +Author: Karel Zak <kzak@redhat.com> +Date: Wed Aug 23 11:53:45 2023 +0200 + + libblkid: (bcachefs) fix compiler warning [-Werror=sign-compare] + + Addresses: https://github.com/util-linux/util-linux/pull/2427 + Signed-off-by: Karel Zak <kzak@redhat.com> + (cherry picked from commit 17873d38fc97913c0a31d4bd08cfbfe45c4de5be) + +diff --git a/libblkid/src/superblocks/bcache.c b/libblkid/src/superblocks/bcache.c +index 236877042..6ab3fe9d4 100644 +--- a/libblkid/src/superblocks/bcache.c ++++ b/libblkid/src/superblocks/bcache.c +@@ -311,7 +311,7 @@ static int probe_bcachefs(blkid_probe pr, const struct blkid_idmag *mag) + return BLKID_PROBE_NONE; + + sb_size = BCACHEFS_SB_FIELDS_OFF + BYTES(bcs); +- if (sb_size > BCACHEFS_SECTOR_SIZE << bcs->layout.sb_max_size_bits) ++ if (sb_size > ((uint64_t) BCACHEFS_SECTOR_SIZE << bcs->layout.sb_max_size_bits)) + return BLKID_PROBE_NONE; + + if (sb_size > BCACHEFS_SB_MAX_SIZE) + +commit 6b9fda87c4e5d0c6f945d7565197f157b9fa3d5f +Author: Thomas Weißschuh <thomas@t-8ch.de> +Date: Wed Aug 23 11:58:33 2023 +0200 + + libblkid: (bcachefs) fix size validation + + Avoid signed shift out-of-bounds. + + Also mark the constants explitly as unsigned instead of casting. + + Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de> + (cherry picked from commit befe455f59de8c7bc66b85ed52aae8cbc95325fa) + +diff --git a/libblkid/src/superblocks/bcache.c b/libblkid/src/superblocks/bcache.c +index 6ab3fe9d4..28ac4b52b 100644 +--- a/libblkid/src/superblocks/bcache.c ++++ b/libblkid/src/superblocks/bcache.c +@@ -142,17 +142,19 @@ struct bcachefs_super_block { + /* magic string len */ + #define BCACHE_SB_MAGIC_LEN (sizeof(BCACHE_SB_MAGIC) - 1) + /* super block offset */ +-#define BCACHE_SB_OFF 0x1000 ++#define BCACHE_SB_OFF 0x1000U + /* supper block offset in kB */ + #define BCACHE_SB_KBOFF (BCACHE_SB_OFF >> 10) + /* magic string offset within super block */ + #define BCACHE_SB_MAGIC_OFF offsetof(struct bcache_super_block, magic) + /* start of checksummed data within superblock */ +-#define BCACHE_SB_CSUMMED_START 8 ++#define BCACHE_SB_CSUMMED_START 8U + /* granularity of offset and length fields within superblock */ +-#define BCACHEFS_SECTOR_SIZE 512 ++#define BCACHEFS_SECTOR_SIZE 512U ++/* maximum superblock size shift */ ++#define BCACHEFS_SB_MAX_SIZE_SHIFT 0x10U + /* maximum superblock size */ +-#define BCACHEFS_SB_MAX_SIZE 0x100000 ++#define BCACHEFS_SB_MAX_SIZE (1U << BCACHEFS_SB_MAX_SIZE_SHIFT) + /* fields offset within super block */ + #define BCACHEFS_SB_FIELDS_OFF offsetof(struct bcachefs_super_block, _start) + /* tag value for members field */ +@@ -311,12 +313,16 @@ static int probe_bcachefs(blkid_probe pr, const struct blkid_idmag *mag) + return BLKID_PROBE_NONE; + + sb_size = BCACHEFS_SB_FIELDS_OFF + BYTES(bcs); +- if (sb_size > ((uint64_t) BCACHEFS_SECTOR_SIZE << bcs->layout.sb_max_size_bits)) +- return BLKID_PROBE_NONE; + + if (sb_size > BCACHEFS_SB_MAX_SIZE) + return BLKID_PROBE_NONE; + ++ if (bcs->layout.sb_max_size_bits > BCACHEFS_SB_MAX_SIZE_SHIFT) ++ return BLKID_PROBE_NONE; ++ ++ if (sb_size > (BCACHEFS_SECTOR_SIZE << bcs->layout.sb_max_size_bits)) ++ return BLKID_PROBE_NONE; ++ + sb = blkid_probe_get_sb_buffer(pr, mag, sb_size); + if (!sb) + return BLKID_PROBE_NONE; diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 45c0d57cbff4e..d710fabb7ace0 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { patches = [ ./rtcwake-search-PATH-for-shutdown.patch + ./bcachefs-patch-set.patch ]; # We separate some of the utilities into their own outputs. This diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 2c1b4fbb4f4f6..e17fda67218e1 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { description = "A kernel module to create V4L2 loopback devices"; homepage = "https://github.com/umlaeute/v4l2loopback"; license = licenses.gpl2Only; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; platforms = platforms.linux; outputsToInstall = [ "out" ]; }; diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 7b7687bc30634..614831c057d2b 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - maintainers = with maintainers; [ goibhniu fortuneteller2k ]; + maintainers = with maintainers; [ goibhniu moni ]; description = "Wacom digitizer driver for X11"; homepage = "https://linuxwacom.sourceforge.net"; license = licenses.gpl2Only; diff --git a/pkgs/servers/bloat/default.nix b/pkgs/servers/bloat/default.nix index 4a28c4377ff6b..bd4ae38efaa87 100644 --- a/pkgs/servers/bloat/default.nix +++ b/pkgs/servers/bloat/default.nix @@ -6,12 +6,12 @@ buildGoModule { pname = "bloat"; - version = "unstable-2023-10-15"; + version = "unstable-2023-10-25"; src = fetchgit { url = "git://git.freesoftwareextremist.com/bloat"; - rev = "67b13c71baea56eeb15532ca1b1377f6da8d18ac"; - hash = "sha256-h885uAuVjpVsp5cAAX9pIxfydcBiajBX3ZSmQUr3/4Q="; + rev = "f4881e72675e87a9eae716436c3ac18a788d596d"; + hash = "sha256-i6HjhGPPXKtQ7hVPECk9gZglFmjb/Fo9pFIq5ikw4Y8="; }; vendorHash = null; diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix index a5806a20d4113..1d15bddc09f7e 100644 --- a/pkgs/servers/dante/default.nix +++ b/pkgs/servers/dante/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = if !stdenv.isDarwin then [ "--with-libc=libc.so.6" ] - else [ "--with-libc=libc${stdenv.targetPlatform.extensions.sharedLibrary}" ]; + else [ "--with-libc=libc${stdenv.hostPlatform.extensions.sharedLibrary}" ]; dontAddDisableDepTrack = stdenv.isDarwin; diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index d722f6beb0ab1..4dfe4b33318c5 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -1,5 +1,12 @@ -{ lib, buildGoModule, fetchFromGitHub, nix-update-script -, nixosTests, postgresql, postgresqlTestHook }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, nix-update-script +, nixosTests +, postgresql +, postgresqlTestHook +}: buildGoModule rec { pname = "matrix-dendrite"; @@ -44,6 +51,9 @@ buildGoModule rec { rm roomserver/internal/input/input_test.go ''; + # PostgreSQL's request for a shared memory segment exceeded your kernel's SHMALL parameter + doCheck = !(stdenv.isDarwin && stdenv.isx86_64); + passthru.tests = { inherit (nixosTests) dendrite; }; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 8df8b1807f093..28fe866dfdcc6 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -83,7 +83,7 @@ unwrapped = stdenv.mkDerivation rec { postInstall = '' rm "$out"/lib/libkres.a rm "$out"/lib/knot-resolver/upgrade-4-to-5.lua # not meaningful on NixOS - '' + optionalString stdenv.targetPlatform.isLinux '' + '' + optionalString stdenv.hostPlatform.isLinux '' rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help ''; diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index 0abc196d8db7e..eab68fb93dbfa 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bftpd"; - version = "6.1"; + version = "6.2"; src = fetchurl { url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-lyHQYU4aXQ/muAyaigStqO/ULL393SOelagFmuKDqm8="; + sha256 = "sha256-lZGFsUV6LNjkBNUpV9UYedVt1yt1qTBJUorxGt4ApsI="; }; # utmp.h is deprecated on aarch64-darwin diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 119c9af546f20..1c0de10079625 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -40,6 +40,16 @@ let }; }); + # https://github.com/home-assistant/core/pull/101913 + aiohttp = super.aiohttp.overridePythonAttrs (old: rec { + version = "3.8.5"; + src = fetchPypi { + inherit (old) pname; + inherit version; + hash = "sha256-uVUuxSzBR9vxlErHrJivdgLlHqLc0HbtGUyjwNHH0Lw="; + }; + }); + aiowatttime = super.aiowatttime.overridePythonAttrs (oldAttrs: rec { version = "0.1.1"; src = fetchFromGitHub { @@ -290,16 +300,6 @@ let }; }); - websockets = super.websockets.overridePythonAttrs (oldAttrs: rec { - version = "11.0.1"; - src = fetchFromGitHub { - owner = "aaugustin"; - repo = "websockets"; - rev = "refs/tags/${version}"; - hash = "sha256-cD8pC7n2OGS8AjG0VdjNXi8jXxvN7yKkadNR0GCqc90="; - }; - }); - # internal python packages only consumed by home-assistant itself home-assistant-frontend = self.callPackage ./frontend.nix { }; home-assistant-intents = self.callPackage ./intents.nix { }; diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 87b60d0682c54..650b0c0c6c535 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,16 +16,16 @@ buildGoModule rec { pname = "evcc"; - version = "0.122.0"; + version = "0.122.1"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-CgLMDztU5FRqYndNMsncJmc7B5pcBhoO58cVoLGERJM="; + hash = "sha256-mD4D2DVai9KV7/RYFmcY7iOGVQGRpwg+rTfNsP8OpCY="; }; - vendorHash = "sha256-rVzogKzURZWQSc8q9VRUKUe/eeo2R1YGbjUDUKm1fOI="; + vendorHash = "sha256-B4gR9sXpGuVv3x6sktFSPlbhq5n5aD5d7ksz67X5nY8="; npmDeps = fetchNpmDeps { inherit src; diff --git a/pkgs/servers/http/jetty/11.x.nix b/pkgs/servers/http/jetty/11.x.nix new file mode 100644 index 0000000000000..3196b24d74856 --- /dev/null +++ b/pkgs/servers/http/jetty/11.x.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "11.0.18"; + hash = "sha256-HxtO2r6YWo6+MAYUgk7dNSPDqQZoyO9t/8NdI5pPkL4="; +} diff --git a/pkgs/servers/http/jetty/12.x.nix b/pkgs/servers/http/jetty/12.x.nix new file mode 100644 index 0000000000000..4dba445b6b90e --- /dev/null +++ b/pkgs/servers/http/jetty/12.x.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "12.0.3"; + hash = "sha256-Z/jJKKzoqTPZnoFOMwbpSd/Kd1w+rXloKH+aw6aNrKs="; +} diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/common.nix index 1ebd33f51d6f4..83adac4ddd0d3 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/common.nix @@ -1,11 +1,15 @@ +{ version, hash }: + { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "jetty"; - version = "12.0.2"; + + inherit version; + src = fetchurl { url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz"; - hash = "sha256-DtlHTXjbr31RmK6ycDdiWOL7jIpbWNh0la90OnOhzvM="; + inherit hash; }; dontBuild = true; @@ -17,10 +21,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Web server and javax.servlet container"; - homepage = "https://www.eclipse.org/jetty/"; + homepage = "https://eclipse.dev/jetty/"; platforms = platforms.all; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = with licenses; [ asl20 epl10 ]; - maintainers = with maintainers; [ emmanuelrosa ]; + maintainers = with maintainers; [ emmanuelrosa anthonyroussel ]; }; } diff --git a/pkgs/servers/http/router/librusty_v8.nix b/pkgs/servers/http/router/librusty_v8.nix index 60c6b4caef887..3e3bf55c757e4 100644 --- a/pkgs/servers/http/router/librusty_v8.nix +++ b/pkgs/servers/http/router/librusty_v8.nix @@ -1,10 +1,9 @@ -{ rust, stdenv, fetchurl }: +{ stdenv, fetchurl }: let - arch = rust.toRustTarget stdenv.hostPlatform; fetch_librusty_v8 = args: fetchurl { name = "librusty_v8-${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${arch}.a"; + url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a"; sha256 = args.shas.${stdenv.hostPlatform.system}; meta = { inherit (args) version; }; }; diff --git a/pkgs/servers/http/tomcat/axis2/builder.sh b/pkgs/servers/http/tomcat/axis2/builder.sh index d334ab6f927f4..de8e225456b42 100644 --- a/pkgs/servers/http/tomcat/axis2/builder.sh +++ b/pkgs/servers/http/tomcat/axis2/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup unzip $src diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 5d1da4c470602..6f75352796cdd 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -5,7 +5,6 @@ , withPHP82 ? false, php82 , withPerl536 ? false, perl536 , withPerl538 ? true, perl538 -, withRuby_3_0 ? false, ruby_3_0 , withRuby_3_1 ? true, ruby_3_1 , withRuby_3_2 ? false, ruby_3_2 , withSSL ? true, openssl ? null @@ -47,7 +46,6 @@ in stdenv.mkDerivation rec { ++ optional withPHP82 php82-unit ++ optional withPerl536 perl536 ++ optional withPerl538 perl538 - ++ optional withRuby_3_0 ruby_3_0 ++ optional withRuby_3_1 ruby_3_1 ++ optional withRuby_3_2 ruby_3_2 ++ optional withSSL openssl; @@ -70,7 +68,6 @@ in stdenv.mkDerivation rec { ${optionalString withPHP82 "./configure php --module=php81 --config=${php82-unit.unwrapped.dev}/bin/php-config --lib-path=${php82-unit}/lib"} ${optionalString withPerl536 "./configure perl --module=perl536 --perl=${perl536}/bin/perl"} ${optionalString withPerl538 "./configure perl --module=perl538 --perl=${perl538}/bin/perl"} - ${optionalString withRuby_3_0 "./configure ruby --module=ruby30 --ruby=${ruby_3_0}/bin/ruby"} ${optionalString withRuby_3_1 "./configure ruby --module=ruby31 --ruby=${ruby_3_1}/bin/ruby"} ${optionalString withRuby_3_2 "./configure ruby --module=ruby32 --ruby=${ruby_3_2}/bin/ruby"} ''; diff --git a/pkgs/servers/mail/mailpit/default.nix b/pkgs/servers/mail/mailpit/default.nix index 69a2dc7ce6f25..baf15dce13e9d 100644 --- a/pkgs/servers/mail/mailpit/default.nix +++ b/pkgs/servers/mail/mailpit/default.nix @@ -7,17 +7,19 @@ , npmHooks , fetchFromGitHub , fetchNpmDeps +, testers +, mailpit }: let - version = "1.9.9"; + version = "1.10.0"; src = fetchFromGitHub { owner = "axllent"; repo = "mailpit"; rev = "v${version}"; - hash = "sha256-WPfr1LHOgOFsF2g3junJ0km0gOk/LC52jekJ8BXlqP0="; + hash = "sha256-MrhTgyY89rU2EQILRSFJk8U7QWaoUf2p83ksFjA7xOM="; }; # Separate derivation, because if we mix this in buildGoModule, the separate @@ -29,7 +31,7 @@ let npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-RaXD+WfNywItveKzc+KWOw38H1EZ2yukgbMrtOfPSJc="; + hash = "sha256-r4yv2qImIlNMPJagz5i1sxqBDnFAucc2kDUmjGktM6A="; }; nativeBuildInputs = [ nodejs python3 libtool npmHooks.npmConfigHook ]; @@ -49,7 +51,7 @@ buildGoModule { pname = "mailpit"; inherit src version; - vendorHash = "sha256-akt72aBoiQKp1Hxf3NgzSmfgmsnjpheIh62lPCTyHBs="; + vendorHash = "sha256-TXa97oOul9cf07uNGdIoxIM++da5HBFeoh05LaJzQTA="; CGO_ENABLED = 0; @@ -59,6 +61,12 @@ buildGoModule { cp -r ${ui} server/ui/dist ''; + passthru.tests.version = testers.testVersion { + inherit version; + package = mailpit; + command = "mailpit version"; + }; + meta = with lib; { description = "An email and SMTP testing tool with API for developers"; homepage = "https://github.com/axllent/mailpit"; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 4b7c6d21f30d5..ef8ff520c072b 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , python3 , openssl +, libiconv , cargo , rustPlatform , rustc @@ -57,6 +58,8 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ openssl + ] ++ lib.optionals stdenv.isDarwin [ + libiconv ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix b/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix index 99b28a4defa4f..f784036075c89 100644 --- a/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix @@ -5,7 +5,6 @@ , makeWrapper , matrix-sdk-crypto-nodejs , mkYarnPackage -, rust , cargo , rustPlatform , rustc @@ -60,7 +59,7 @@ mkYarnPackage rec { buildPhase = '' runHook preBuild cd deps/${pname} - napi build --target ${rust.toRustTargetSpec stdenv.targetPlatform} --dts ../src/libRs.d.ts --release ./lib + napi build --target ${stdenv.hostPlatform.rust.rustcTargetSpec} --dts ../src/libRs.d.ts --release ./lib yarn run build:app:fix-defs yarn run build:app yarn run build:web diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix index 7894e759b168c..09fed144e57a4 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix @@ -1,7 +1,7 @@ { stdenvNoCC, fetchurl, unzip, lib }: { pname, version, zipHash, meta ? {}, passthru ? {}, ... }@args: -let plat = stdenvNoCC.targetPlatform.system; in stdenvNoCC.mkDerivation ({ +let plat = stdenvNoCC.hostPlatform.system; in stdenvNoCC.mkDerivation ({ inherit pname version; src = if lib.isAttrs zipHash then diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index aa781f7e26fb8..df166ad0ff04b 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -148,7 +148,7 @@ let depsBuildBuild = [ buildPackages.stdenv.cc ]; - postPatch = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "12.0") '' + postPatch = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12.0") '' substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \ --replace kAudioObjectPropertyElement{Main,Master} \ --replace kAudioHardwareServiceDeviceProperty_Virtual{Main,Master}Volume diff --git a/pkgs/servers/networkaudiod/default.nix b/pkgs/servers/networkaudiod/default.nix index 5a09c7933d148..dacd315aba343 100644 --- a/pkgs/servers/networkaudiod/default.nix +++ b/pkgs/servers/networkaudiod/default.nix @@ -6,7 +6,7 @@ , alsa-lib }: let - inherit (stdenv.targetPlatform) system; + inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 36c978e364fea..52b9125e99d5d 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -15,12 +15,12 @@ , lzo , which , targetArchitecture ? null -, asmOptimizations ? gcc10Stdenv.targetPlatform.isx86 +, asmOptimizations ? gcc10Stdenv.hostPlatform.isx86 }: let defaultTargetArchitecture = - if gcc10Stdenv.targetPlatform.isx86 + if gcc10Stdenv.hostPlatform.isx86 then "haswell" else "core"; @@ -72,7 +72,7 @@ gcc10Stdenv.mkDerivation rec { "-DTARGET_ARCHITECTURE=${targetArch}" ] ++ lib.optionals asmOptimizations [ "-DASM_OPTIMIZATIONS=ON" - "-DHAVE_SSE42=${if gcc10Stdenv.targetPlatform.sse4_2Support then "ON" else "OFF"}" + "-DHAVE_SSE42=${if gcc10Stdenv.hostPlatform.sse4_2Support then "ON" else "OFF"}" ]; meta = with lib; { diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix index 4f683b83a5719..ba46d7f01289d 100644 --- a/pkgs/servers/nosql/ferretdb/default.nix +++ b/pkgs/servers/nosql/ferretdb/default.nix @@ -6,13 +6,13 @@ buildGo121Module rec { pname = "ferretdb"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - hash = "sha256-D1iMYh76a9H38tiZWByuJZrABWfjQFCkyxtbtLM/DMw="; + hash = "sha256-x5In8cBRki3rHaAB+iSglL19UCD8DtITr5gjb8KKuAw="; }; postPatch = '' @@ -20,7 +20,7 @@ buildGo121Module rec { echo nixpkgs > build/version/package.txt ''; - vendorHash = "sha256-WrnACseWo+bLn0IJhGY/DFsrMFAyy7J02cjO4FvE2xA="; + vendorHash = "sha256-0DFNDfJmBFpgzarg9FaGb8GV11LhA1N8oq0kSXIWxi8="; CGO_ENABLED = 0; diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index 5be49f18891f9..df7efb33b68ee 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, sconsPackages +, scons_3_1_2 , boost , gperftools , pcre-cpp @@ -31,7 +31,8 @@ with lib; let variants = - if versionAtLeast version "6.0" then rec { + if versionAtLeast version "6.0" + then rec { python = scons.python.withPackages (ps: with ps; [ pyyaml cheetah3 @@ -41,12 +42,13 @@ let pymongo ]); - scons = sconsPackages.scons_3_1_2; + scons = scons_3_1_2; mozjsVersion = "60"; mozjsReplace = "defined(HAVE___SINCOS)"; - } else rec { + } + else rec { python = scons.python.withPackages (ps: with ps; [ pyyaml cheetah3 @@ -54,7 +56,7 @@ let setuptools ]); - scons = sconsPackages.scons_3_1_2; + scons = scons_3_1_2; mozjsVersion = "60"; mozjsReplace = "defined(HAVE___SINCOS)"; @@ -84,7 +86,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ variants.scons ] - ++ lib.optionals (versionAtLeast version "4.4") [ xz ]; + ++ lib.optionals (versionAtLeast version "4.4") [ xz ]; buildInputs = [ boost @@ -147,7 +149,7 @@ in stdenv.mkDerivation rec { "--disable-warnings-as-errors" "VARIANT_DIR=nixos" # Needed so we don't produce argument lists that are too long for gcc / ld ] ++ lib.optionals (versionAtLeast version "4.4") [ "--link-model=static" ] - ++ map (lib: "--use-system-${lib}") system-libraries; + ++ map (lib: "--use-system-${lib}") system-libraries; # This seems to fix mongodb not able to find OpenSSL's crypto.h during build hardeningDisable = [ "fortify3" ]; diff --git a/pkgs/servers/owntracks-recorder/default.nix b/pkgs/servers/owntracks-recorder/default.nix index 85985584c8277..83ebe99c11292 100644 --- a/pkgs/servers/owntracks-recorder/default.nix +++ b/pkgs/servers/owntracks-recorder/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "owntracks-recorder"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "owntracks"; repo = "recorder"; rev = finalAttrs.version; - hash = "sha256-N9qMMAIgmBUEscydJKBQneLcX8odOEXY+560lJJz52g="; + hash = "sha256-QpPZDh++WHIvIgml32UWtAe3tzh2x7lFUu2xdioNGW4="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/redpanda/server.nix b/pkgs/servers/redpanda/server.nix index 27e6343a42a21..ec4250820d3a6 100644 --- a/pkgs/servers/redpanda/server.nix +++ b/pkgs/servers/redpanda/server.nix @@ -16,7 +16,7 @@ , p11-kit , pkg-config , procps -, protobuf3_21 +, protobuf_21 , python3 , snappy , src @@ -100,7 +100,7 @@ llvmPackages_14.stdenv.mkDerivation rec { dpdk hdr-histogram p11-kit - protobuf3_21 + protobuf_21 rapidjson seastar snappy diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 7b7717828e17e..fbf9f06cff72e 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -31,6 +31,11 @@ stdenv.mkDerivation rec { optional zlibSupport "--with-zlib" ++ optional lz4Support "--with-lz4"; + env = lib.optionalAttrs stdenv.cc.isClang { + # Prevent warning about using a GNU extension from being promoted to an error. + NIX_CFLAGS_COMPILE = "-Wno-error=gnu-folding-constant"; + }; + doInstallCheck = true; installCheckPhase = "$out/bin/groonga --version"; diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index 197e9b48d18b8..312629fc3b62a 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.29.1"; + version = "2.29.2"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-ZE17VCrpHlZ4GMc7+DaUyuehKtYWMr7NJFV1hGQ+UsA="; + sha256 = "sha256-f7xjjYy7uPSgssEftXPrfEcNrU6OFlXgwoTTWXgHfUU="; }; sourceRoot = "snappymail"; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 427a394873fae..ec2f95f5bd55b 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -296,6 +296,7 @@ let homepage = "https://www.postgresql.org"; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; + changelog = "https://www.postgresql.org/docs/release/${finalAttrs.version}/"; maintainers = with maintainers; [ thoughtpolice danbst globin marsam ivan ma27 ]; pkgConfigModules = [ "libecpg" "libecpg_compat" "libpgtypes" "libpq" ]; platforms = platforms.unix; @@ -345,45 +346,45 @@ let mkPackages = self: { postgresql_12 = self.callPackage generic { - version = "12.16"; + version = "12.17"; psqlSchema = "12"; - hash = "sha256-xfH/96D5Ph7DdGQXsFlCkOzmF7SZXtlbjVJ68LoOOPM="; + hash = "sha256-k+jhsjmB1fA8bFdj93soGEwc5NtxlPpGbi7bZdnBxfY="; this = self.postgresql_12; thisAttr = "postgresql_12"; inherit self; }; postgresql_13 = self.callPackage generic { - version = "13.12"; + version = "13.13"; psqlSchema = "13"; - hash = "sha256-DaHtzuNRS3vHum268MAEmeisFZBmjoeJxQJTpiSfIYs="; + hash = "sha256-ivacJZkEeirSRlZ9aOxBMa7xFpVNjD5GnpeJCAs3pHQ="; this = self.postgresql_13; thisAttr = "postgresql_13"; inherit self; }; postgresql_14 = self.callPackage generic { - version = "14.9"; + version = "14.10"; psqlSchema = "14"; - hash = "sha256-sf47qbGn86ljfdFlbf2tKIkBYHP9TTXxO1AUPLu2qO8="; + hash = "sha256-yZQxxI6dRwsNCrlG6yFBo80ZEwwvtNxLMoSnd07Mg5k="; this = self.postgresql_14; thisAttr = "postgresql_14"; inherit self; }; postgresql_15 = self.callPackage generic { - version = "15.4"; + version = "15.5"; psqlSchema = "15"; - hash = "sha256-uuxaS9xENzNmU7bLXZ7Ym+W9XAxYuU4L7O4KmZ5jyPk="; + hash = "sha256-j1OqldeOuOglNupGtoGHeTtCu6O09lqjQvVAsjybEKY="; this = self.postgresql_15; thisAttr = "postgresql_15"; inherit self; }; postgresql_16 = self.callPackage generic { - version = "16.0"; + version = "16.1"; psqlSchema = "16"; - hash = "sha256-356CPrIjMEROHUjlLMZRNaZSpv2zzjJePwhUkzn1G5k="; + hash = "sha256-zjxNhdGbASH+DT+O8fpgH3GYnob4pm99w61UbdVWT+w="; this = self.postgresql_16; thisAttr = "postgresql_16"; inherit self; diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 5745630964e4d..583bde82f4816 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { homepage = "https://postgis.net/"; changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"; license = licenses.gpl2; - maintainers = [ maintainers.marcweber ]; + maintainers = with maintainers; teams.geospatial.members ++ [ marcweber ]; inherit (postgresql.meta) platforms; broken = versionOlder postgresql.version "12"; }; diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/servers/static-web-server/default.nix index a14313cdaf69c..a8057cac7e7de 100644 --- a/pkgs/servers/static-web-server/default.nix +++ b/pkgs/servers/static-web-server/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "static-web-server"; - version = "2.24.0"; + version = "2.24.1"; src = fetchFromGitHub { owner = "static-web-server"; repo = pname; rev = "v${version}"; - hash = "sha256-NJjzfl44qRPph3M6u1jYELSvMzsPww8aD8DDNXSQjOo="; + hash = "sha256-U+B/k/stwjJw+mxUCb4A3yUtc/+Tg0PsWhVnovLLX4A="; }; - cargoHash = "sha256-gHs8aFZozWgF4uE2mp/qRb9J3hRAohRwu15Q5/FLtTs="; + cargoHash = "sha256-ZDrRjIM8187nr72MlzFr0NAqH2f8qkF1sGAT9+NvfhA="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index b07a715f6736c..b4c2d24751727 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }: let - version = "1.52.1"; + version = "1.54.0"; in buildGoModule { pname = "tailscale"; @@ -11,9 +11,9 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-hscKV4jhJ+tqgTFuOEThABpu8iqK3+av7+DcuSmZwQ4="; + hash = "sha256-/l3csuj1AZQo7C0BzkhqvkMNEQxc6Ers0KtZvxWS96Q="; }; - vendorHash = "sha256-WGZkpffwe4I8FewdBHXGaLbKQP/kHr7UF2lCXBTcNb4="; + vendorHash = "sha256-/kuu7DKPklMZOvYqJpsOp3TeDG9KDEET4U0G+sq+4qY="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 48c59db1cc30f..77d85bc81ef4a 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -4,4 +4,8 @@ version = "6.3.2"; hash = "sha256-Jo2/Vlm4Ml24ucPI6ZHs2mkbpY2rZB1dofmGXNPweA8="; }; + wordpress6_4 = { + version = "6.4.1"; + hash = "sha256-NF3tvVNUYlKPvtvJZzM7djGflOUT4VUlm4AyHPFzfdw="; + }; } diff --git a/pkgs/servers/web-apps/wordpress/packages/languages.json b/pkgs/servers/web-apps/wordpress/packages/languages.json index 49a832a56dd8f..66a2f6c1ba11b 100644 --- a/pkgs/servers/web-apps/wordpress/packages/languages.json +++ b/pkgs/servers/web-apps/wordpress/packages/languages.json @@ -7,8 +7,8 @@ }, "fr_FR": { "path": "fr_FR", - "rev": "1258401", - "sha256": "157w59jl4b3ysjiflzav3kvbmqkglgr3k4cbh6f8iqhz6wkzw5h3", + "rev": "1263147", + "sha256": "0rgypx5z7pi88da7ll0aby6hlvahja6wqjl8iacabwsnqawqbbx6", "version": "6.3" }, "ro_RO": { diff --git a/pkgs/servers/web-apps/wordpress/packages/plugins.json b/pkgs/servers/web-apps/wordpress/packages/plugins.json index 5628f57f138b2..5514822edb9b7 100644 --- a/pkgs/servers/web-apps/wordpress/packages/plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/plugins.json @@ -7,8 +7,8 @@ }, "akismet": { "path": "akismet/tags/5.3", - "rev": "2966753", - "sha256": "17ayrjbwc6ij7qqaph3jjn94i27nmhr6hki5gjl4dzrz8142zrwn", + "rev": "2991242", + "sha256": "1i7y09x2aikndf80wl7xv65m71nv5s0w6jcadpp0dsyzp2m3gjnn", "version": "5.3" }, "antispam-bee": { @@ -24,10 +24,10 @@ "version": "2.21.08.31" }, "breeze": { - "path": "breeze/tags/2.0.31", - "rev": "2982492", - "sha256": "0ij7lqxnhkpzd98bxfsdz2ydgm7yj9ig41fxkibr25crv76dwfai", - "version": "2.0.31" + "path": "breeze/tags/2.0.32", + "rev": "2995658", + "sha256": "0c0sh7l6cwz6hbc54gjaasdldrv8h6ynx4b75zzkj2arrmyhjjxg", + "version": "2.0.32" }, "co-authors-plus": { "path": "co-authors-plus/tags/3.5.15", @@ -60,10 +60,10 @@ "version": "1.4.0" }, "gutenberg": { - "path": "gutenberg/tags/16.9.0", - "rev": "2984221", - "sha256": "09pyh2w7kbqdq0y1zbsss3xizbk03g9wb85f510shc5znyjapngd", - "version": "16.9.0" + "path": "gutenberg/tags/17.0.2", + "rev": "2995211", + "sha256": "07c1smvapzm0gzkjzjk5irnp47x6hl2d4zcmlfprzj17igdqwa5s", + "version": "17.0.2" }, "hello-dolly": { "path": "hello-dolly/tags/1.7.2", @@ -78,10 +78,10 @@ "version": "2.4.5" }, "jetpack": { - "path": "jetpack/tags/12.8", - "rev": "2990174", - "sha256": "10s2870kp8gp89rbgbkg21bxk6c238kklm1rgrpkry7m1w8qzsi2", - "version": "12.8" + "path": "jetpack/tags/12.8.1", + "rev": "2995420", + "sha256": "1i59npwwk29rsq5myl0axr1vsyfw19dyx22ckc2szkc3a4my8h40", + "version": "12.8.1" }, "jetpack-lite": { "path": "jetpack-lite/tags/3.0.3", @@ -102,27 +102,27 @@ "version": "2.06" }, "mailpoet": { - "path": "mailpoet/tags/4.29.0", - "rev": "2972087", - "sha256": "0n0aq8p4265zskq5vblpn551v45870vrmnjzbyvppnyagydfc1q8", - "version": "4.29.0" + "path": "mailpoet/tags/4.35.1", + "rev": "2990976", + "sha256": "0pf7r8q939420bzwd0mlv5zbnlkg824hg40vf3w082ryclzyiap5", + "version": "4.35.1" }, "merge-minify-refresh": { "path": "merge-minify-refresh/trunk", - "rev": "2967306", - "sha256": "038sfnyr0ab8hzk5ybs0vnpiklhp1649dszbmlxilb5lm8rphbgq", - "version": "1.14.4" + "rev": "2980433", + "sha256": "0vx71g1dihlmxrrgmc8fa3glxxndgxcrysidbc23hz33xd18wcbh", + "version": "1.15.1" }, "opengraph": { - "path": "opengraph/tags/1.11.1", - "rev": "2950019", - "sha256": "0vfxv2d3z572m99nlxzla0l5s1lp14a6inb3x1plr779zn0rlg5c", - "version": "1.11.1" + "path": "opengraph/tags/1.11.2", + "rev": "2995321", + "sha256": "03cg7jm0g3rfwkvgjcg392mw09mlbmnvhw261rlldycfglmi270m", + "version": "1.11.2" }, "simple-login-captcha": { "path": "simple-login-captcha/tags/1.3.5", - "rev": "2947230", - "sha256": "054f51gybpy71iwdjnxf89v8x8dlvg4k4ggd2psvjjf16ai258dw", + "rev": "2988106", + "sha256": "1byq8f5qkxxnhjc4dk1ab7h8vzcr01y1nid81wwj2k1i03z9llqa", "version": "1.3.5" }, "static-mail-sender-configurator": { @@ -132,10 +132,10 @@ "version": "0.10.0" }, "webp-converter-for-media": { - "path": "webp-converter-for-media/tags/5.11.2", - "rev": "2985470", - "sha256": "1q8jdpvjrp5y5avgrg4cyq7amvz93ww7nm4mpiqgxmjn9l01dmvv", - "version": "5.11.2" + "path": "webp-converter-for-media/tags/5.11.4", + "rev": "2995294", + "sha256": "0grlszp00rw63psv21n70alapkw1pgaq8cp9c0b1klk50jcnnx8q", + "version": "5.11.4" }, "webp-express": { "path": "webp-express/tags/0.25.8", @@ -144,10 +144,10 @@ "version": "0.25.8" }, "wordpress-seo": { - "path": "wordpress-seo/tags/20.7", - "rev": "2909990", - "sha256": "187lkzb9p889xj8s9cwp3r7pjbzq3nv34ix2hcy8a7sr4380518w", - "version": "20.7" + "path": "wordpress-seo/tags/21.5", + "rev": "2986840", + "sha256": "1a1mnsh4imy7ab0b7hp0nis46ixwvj47wgibifa90qndbkv2mwsn", + "version": "21.5" }, "worker": { "path": "worker/tags/4.9.17", @@ -162,10 +162,10 @@ "version": "1.0" }, "wp-fastest-cache": { - "path": "wp-fastest-cache/tags/1.2.1", - "rev": "2988099", - "sha256": "07fbib36zwzagshnx85i7lis65vgbva8q9fs2i1zk687yway60fx", - "version": "1.2.1" + "path": "wp-fastest-cache/tags/1.2.2", + "rev": "2994820", + "sha256": "1mj18yrljjdrd07b0yjkd9pwdciyn4jyrs6hgx6jcys0mc5p009v", + "version": "1.2.2" }, "wp-gdpr-compliance": { "path": "wp-gdpr-compliance/tags/2.0.22", @@ -174,16 +174,16 @@ "version": "2.0.22" }, "wp-mail-smtp": { - "path": "wp-mail-smtp/tags/3.9.0", - "rev": "2960628", - "sha256": "1zxpbm92v2hmqipr9jy5awv3wmp7zik85hk9sb7i4ccvds8i90yw", - "version": "3.9.0" + "path": "wp-mail-smtp/tags/3.10.0", + "rev": "2992136", + "sha256": "0py4ns4vsy9rpqq5gjyfc2p1lvf2gy28klw9ixkm6gdiim8pvl61", + "version": "3.10.0" }, "wp-statistics": { - "path": "wp-statistics/tags/14.1.6.2", - "rev": "2968479", - "sha256": "1sx8zki5ip2s3lkjdllsyybmsisy7dqzgnpgwj0ksk2gr4aksz1y", - "version": "14.1.6.2" + "path": "wp-statistics/tags/14.2", + "rev": "2976338", + "sha256": "0vcw6qp5w2whbpwcd9m0dpxf4ah0i7snygszp211lqg4g53qbyyv", + "version": "14.2" }, "wp-swiper": { "path": "wp-swiper/trunk", diff --git a/pkgs/servers/web-apps/wordpress/packages/themes.json b/pkgs/servers/web-apps/wordpress/packages/themes.json index 89923e6b538a0..92d09ef4ca97e 100644 --- a/pkgs/servers/web-apps/wordpress/packages/themes.json +++ b/pkgs/servers/web-apps/wordpress/packages/themes.json @@ -1,32 +1,32 @@ { "twentynineteen": { - "path": "twentynineteen/2.6", - "rev": "206169", - "sha256": "0wad8gnha0hnvqmcpvckq42xzi8nvrys4jflsbxiq694fzzr8wk5", - "version": "2.6" + "path": "twentynineteen/2.7", + "rev": "207575", + "sha256": "19zbbpj1qxfz6599di2455qr97z5x4vrprf0bf20c8dq8n8lrh41", + "version": "2.7" }, "twentytwenty": { - "path": "twentytwenty/2.3", - "rev": "206172", - "sha256": "0za1hkaymnphscabwrjxiskv9wgzp7rjwbxazyi19zhb85zh9niq", - "version": "2.3" + "path": "twentytwenty/2.4", + "rev": "207576", + "sha256": "0xp2jcgsn16gv9ad8dirm7j24mi7633yrl524wi858l3m8dh4q4a", + "version": "2.4" }, "twentytwentyone": { - "path": "twentytwentyone/1.9", - "rev": "206170", - "sha256": "0z7w6lk8aaj9wzi1g5rx5ji0w8d221k6cr7asyvsjwm0axdgnj50", - "version": "1.9" + "path": "twentytwentyone/2.0", + "rev": "207577", + "sha256": "0ypdqxfd1va9m6f3zbc0281i69br5hpvvjdqb03kk2xnmam2hjaa", + "version": "2.0" }, "twentytwentythree": { - "path": "twentytwentythree/1.2", - "rev": "198780", - "sha256": "1qybkprcjv89qrzkbv8lrhir6ns1wx3kzdimjnjhx70ggkbygh5y", - "version": "1.2" + "path": "twentytwentythree/1.3", + "rev": "207579", + "sha256": "0r2k73yskqaxhl641ri1shy74rck5xvmfi7b562kz3j44hx0dz4f", + "version": "1.3" }, "twentytwentytwo": { - "path": "twentytwentytwo/1.5", - "rev": "206171", - "sha256": "1zk83kn23gksk27xddqn31sdlhmsqz48p2r24qrbqyay367j8jln", - "version": "1.5" + "path": "twentytwentytwo/1.6", + "rev": "207578", + "sha256": "0ga1682a5sh038xfc7whvdws5vfy1g3qvvy13rm5dln79x022riq", + "version": "1.6" } } diff --git a/pkgs/servers/windmill/default.nix b/pkgs/servers/windmill/default.nix index 6b822ade08b69..a10610ea19580 100644 --- a/pkgs/servers/windmill/default.nix +++ b/pkgs/servers/windmill/default.nix @@ -16,7 +16,6 @@ , pixman , pkg-config , python3 -, rust , rustfmt , stdenv , swagger-cli @@ -70,11 +69,10 @@ rustPlatform.buildRustPackage { SQLX_OFFLINE = "true"; RUSTY_V8_ARCHIVE = let - arch = rust.toRustTarget stdenv.hostPlatform; fetch_librusty_v8 = args: fetchurl { name = "librusty_v8-${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${arch}.a"; + url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a"; sha256 = args.shas.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); meta = { inherit (args) version; }; }; diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh index a9c607ae35ea0..833acf43a5b0a 100644 --- a/pkgs/servers/x11/xorg/builder.sh +++ b/pkgs/servers/x11/xorg/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi # This is the builder for all X.org components. source $stdenv/setup diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 870ea4ad05854..e561e854a7102 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1518,11 +1518,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXrandr = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXrender, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXrandr"; - version = "1.5.3"; + version = "1.5.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXrandr-1.5.3.tar.xz"; - sha256 = "0a5l9q37c9m6gfdchlj43a9j3mw2avfwasfn0ivlkqbq980kjxl9"; + url = "mirror://xorg/individual/lib/libXrandr-1.5.4.tar.xz"; + sha256 = "1lxlqd9ffjr1myfpyk91594n1h07ck6121m6ba8qajjz6xjv1m8s"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1919,11 +1919,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! luit = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "luit"; - version = "20190106"; + version = "20230201"; builder = ./builder.sh; src = fetchurl { - url = "https://invisible-mirror.net/archives/luit/luit-20190106.tgz"; - sha256 = "081rrajj5hpgx3pvm43grqzscnq5kl320q0wq6zzhf6wrijhz41b"; + url = "https://invisible-mirror.net/archives/luit/luit-20230201.tgz"; + sha256 = "0vy5fqp26pnrdn0hmgnmar6m2y06syrz188jqh03vqkyphfqsapf"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -2859,11 +2859,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videoati = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-ati"; - version = "5eba006e4129e8015b822f9e1d2f1e613e252cda"; + version = "22.0.0"; builder = ./builder.sh; src = fetchurl { - url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/archive/5eba006e4129e8015b822f9e1d2f1e613e252cda/xf86-video-ati-5eba006e4129e8015b822f9e1d2f1e613e252cda.tar.bz2"; - sha256 = "0gmymk8207fd9rjliq05l2gvx220h432rj3h75hv2ylr3k9vmp2b"; + url = "mirror://xorg/individual/driver/xf86-video-ati-22.0.0.tar.xz"; + sha256 = "0vdznwx78alhbb05paw2xd65hcsila2kqflwwnbpq8pnsdbbpj68"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3899,11 +3899,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xkeyboardconfig = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xkeyboard-config"; - version = "2.39"; + version = "2.40"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.39.tar.xz"; - sha256 = "10m6mbjymi7qf30g5yd400kqijdjg7ym9qjzh0bc3c7pxwrzbias"; + url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.40.tar.xz"; + sha256 = "1qrakn6gyj701mxwbrlhjv4gd73ws51140ns68a1kivxxhdvlgbs"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 280e1b19ec5ae..b3aac93d89cb4 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -570,17 +570,6 @@ self: super: configureFlags = [ "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d" ]; }); - xf86videoati = super.xf86videoati.overrideAttrs (attrs: { - nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ]; - buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ]; - patches = [ - (fetchpatch { - url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/commit/e0511968d04b42abf11bc0ffb387f143582bc144.patch"; - sha256 = "sha256-79nqKuJRgMYXDEMB8IWxdmbxtI/m+Oca1wSLYeGMuEk="; - }) - ]; - }); - xf86videonouveau = super.xf86videonouveau.overrideAttrs (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ]; buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 06a2b69d505af..6a2cfd52886ee 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -1,4 +1,4 @@ -https://invisible-mirror.net/archives/luit/luit-20190106.tgz +https://invisible-mirror.net/archives/luit/luit-20230201.tgz mirror://xorg/individual/xcb/libpthread-stubs-0.5.tar.xz mirror://xorg/individual/xcb/xcb-util-0.4.1.tar.xz mirror://xorg/individual/xcb/xcb-util-cursor-0.1.4.tar.xz @@ -74,7 +74,7 @@ mirror://xorg/individual/app/xwininfo-1.1.6.tar.xz mirror://xorg/individual/app/xwud-1.0.6.tar.xz mirror://xorg/individual/data/xbitmaps-1.1.3.tar.xz mirror://xorg/individual/data/xcursor-themes-1.0.7.tar.xz -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.39.tar.xz +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.40.tar.xz mirror://xorg/individual/doc/xorg-docs-1.7.2.tar.gz mirror://xorg/individual/doc/xorg-sgml-doctools-1.12.tar.gz mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2 @@ -89,7 +89,7 @@ mirror://xorg/individual/driver/xf86-video-amdgpu-23.0.0.tar.xz mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.6.tar.xz mirror://xorg/individual/driver/xf86-video-ast-1.1.6.tar.xz -https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/archive/5eba006e4129e8015b822f9e1d2f1e613e252cda/xf86-video-ati-5eba006e4129e8015b822f9e1d2f1e613e252cda.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-22.0.0.tar.xz mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.6.0.tar.xz mirror://xorg/individual/driver/xf86-video-dummy-0.4.1.tar.xz @@ -195,7 +195,7 @@ mirror://xorg/individual/lib/libXmu-1.1.4.tar.xz mirror://xorg/individual/lib/libXp-1.0.4.tar.xz mirror://xorg/individual/lib/libXpm-3.5.17.tar.xz mirror://xorg/individual/lib/libXpresent-1.0.1.tar.xz -mirror://xorg/individual/lib/libXrandr-1.5.3.tar.xz +mirror://xorg/individual/lib/libXrandr-1.5.4.tar.xz mirror://xorg/individual/lib/libXrender-0.9.11.tar.xz mirror://xorg/individual/lib/libXres-1.2.2.tar.xz mirror://xorg/individual/lib/libXScrnSaver-1.2.4.tar.xz diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 1cbd33cd4fd9a..9e0601fbd0939 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -10,13 +10,14 @@ , withZlib ? true, zlib , withTools ? false , withRedis ? false +, withImagemagick ? false, imagemagick }: let ctlpath = lib.makeBinPath [ bash gnused gnugrep gawk coreutils util-linux procps ]; in stdenv.mkDerivation rec { pname = "ejabberd"; - version = "23.01"; + version = "23.10"; nativeBuildInputs = [ makeWrapper autoreconfHook ]; @@ -28,7 +29,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://www.process-one.net/downloads/downloads-action.php?file=/${version}/ejabberd-${version}.tar.gz"; - sha256 = "sha256-K4P+A2u/Hbina4b3GP8T3wmPoQxiv88GuB4KZOb2+cA="; + hash = "sha256-DW5/DYLZHNqJ4lddmag1B0E9ov/eObIVGASUeioPolg="; + # remember to update the deps FOD hash & its pinned ejabberd-po commit }; passthru.tests = { @@ -40,6 +42,15 @@ in stdenv.mkDerivation rec { inherit src version; + # pin ejabberd-po dep + # update: curl -L api.github.com/repos/processone/ejabberd-po/branches/main | jq .commit.sha -r + postPatch = '' + substituteInPlace rebar.config \ + --replace \ + '{git, "https://github.com/processone/ejabberd-po", {branch, "main"}}' \ + '{git, "https://github.com/processone/ejabberd-po", {tag, "26d6463386588d39f07027dabff3cb8dd938bf6b"}}' + ''; + configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite.dev}" ]; nativeBuildInputs = [ @@ -56,9 +67,10 @@ in stdenv.mkDerivation rec { git reset --hard git clean -ffdx git describe --always --tags > .rev - rm -rf .git + rm -rf .git .github ) done + # not a typo; comes from `make deps` rm deps/.got cp -r deps $out @@ -71,7 +83,7 @@ in stdenv.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-Lj4YSPOiiJQ6uN4cAR+1s/eVSfoIsuvWR7gGkVYrOfc="; + outputHash = "sha256-HrLu3wTF+cUxpGX0yK3nbB57SRM2ND3Crlxs5/8FIwI="; }; configureFlags = [ @@ -100,6 +112,7 @@ in stdenv.mkDerivation rec { -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \ $out/sbin/ejabberdctl wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libpng libjpeg libwebp ]}" + ${lib.optionalString withImagemagick ''wrapProgram $out/lib/ejabberd-*/priv/bin/captcha.sh --prefix PATH : "${lib.makeBinPath [ imagemagick ]}"''} rm $out/bin/{mix,iex,elixir} ''; diff --git a/pkgs/shells/hilbish/default.nix b/pkgs/shells/hilbish/default.nix index e558402543bf9..f5450e1da5c32 100644 --- a/pkgs/shells/hilbish/default.nix +++ b/pkgs/shells/hilbish/default.nix @@ -35,7 +35,7 @@ buildGoModule rec { description = "An interactive Unix-like shell written in Go"; changelog = "https://github.com/Rosettea/Hilbish/releases/tag/v${version}"; homepage = "https://github.com/Rosettea/Hilbish"; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; license = licenses.mit; }; } diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix index b7c7284e9f43b..5dc50c558acd1 100644 --- a/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -35,6 +35,6 @@ stdenvNoCC.mkDerivation rec { changelog = "https://github.com/spaceship-prompt/spaceship-prompt/releases/tag/v${version}"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ nyanloutre fortuneteller2k kyleondy ]; + maintainers = with maintainers; [ nyanloutre moni kyleondy ]; }; } diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index f7d7053c77a97..dd29871907188 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -42,6 +42,50 @@ rec { stdenv.override (prev: { allowedRequisites = null; extraBuildInputs = (prev.extraBuildInputs or []) ++ pkgs; }); + # Override the libc++ dynamic library used in the stdenv to use the one from the platform’s + # default stdenv. This allows building packages and linking dependencies with different + # compiler versions while still using the same libc++ implementation for compatibility. + # + # Note that this adapter still uses the headers from the new stdenv’s libc++. This is necessary + # because older compilers may not be able to parse the headers from the default stdenv’s libc++. + overrideLibcxx = stdenv: + assert stdenv.cc.libcxx != null; + let + llvmLibcxxVersion = lib.getVersion llvmLibcxx; + stdenvLibcxxVersion = lib.getVersion stdenvLibcxx; + + stdenvLibcxx = pkgs.stdenv.cc.libcxx; + stdenvCxxabi = pkgs.stdenv.cc.libcxx.cxxabi; + + llvmLibcxx = stdenv.cc.libcxx; + llvmCxxabi = stdenv.cc.libcxx.cxxabi; + + libcxx = pkgs.runCommand "${stdenvLibcxx.name}-${llvmLibcxxVersion}" { + outputs = [ "out" "dev" ]; + inherit cxxabi; + isLLVM = true; + } '' + mkdir -p "$dev/nix-support" + ln -s '${stdenvLibcxx}' "$out" + echo '${stdenvLibcxx}' > "$dev/nix-support/propagated-build-inputs" + ln -s '${lib.getDev llvmLibcxx}/include' "$dev/include" + ''; + + cxxabi = pkgs.runCommand "${stdenvCxxabi.name}-${llvmLibcxxVersion}" { + outputs = [ "out" "dev" ]; + inherit (stdenvCxxabi) libName; + } '' + mkdir -p "$dev/nix-support" + ln -s '${stdenvCxxabi}' "$out" + echo '${stdenvCxxabi}' > "$dev/nix-support/propagated-build-inputs" + ln -s '${lib.getDev llvmCxxabi}/include' "$dev/include" + ''; + in + overrideCC stdenv (stdenv.cc.override { + inherit libcxx; + extraPackages = [ cxxabi pkgs.pkgsTargetTarget."llvmPackages_${lib.versions.major llvmLibcxxVersion}".compiler-rt ]; + }); + # Override the setup script of stdenv. Useful for testing new # versions of the setup script without causing a rebuild of # everything. @@ -60,12 +104,13 @@ rec { mkDerivationFromStdenv = withOldMkDerivation old (stdenv: mkDerivationSuper: args: if stdenv.hostPlatform.isDarwin then throw "Cannot build fully static binaries on Darwin/macOS" - else (mkDerivationSuper args).overrideAttrs(finalAttrs: { - NIX_CFLAGS_LINK = toString (finalAttrs.NIX_CFLAGS_LINK or "") + " -static"; - } // lib.optionalAttrs (!(finalAttrs.dontAddStaticConfigureFlags or false)) { - configureFlags = (finalAttrs.configureFlags or []) ++ [ - "--disable-shared" # brrr... - ]; + else (mkDerivationSuper args).overrideAttrs (args: { + NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -static"; + } // lib.optionalAttrs (!(args.dontAddStaticConfigureFlags or false)) { + configureFlags = (args.configureFlags or []) ++ [ + "--disable-shared" # brrr... + ]; + cmakeFlags = (args.cmakeFlags or []) ++ ["-DCMAKE_SKIP_INSTALL_RPATH=On"]; })); } // lib.optionalAttrs (stdenv0.hostPlatform.libc == "glibc") { extraBuildInputs = (old.extraBuildInputs or []) ++ [ @@ -245,4 +290,131 @@ rec { env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.env.NIX_CFLAGS_COMPILE or "") + " ${toString compilerFlags}"; }; }); }); + + # Overriding the SDK changes the Darwin SDK used to build the package, which: + # * Ensures that the compiler and bintools have the correct Libsystem version; and + # * Replaces any SDK references with those in the SDK corresponding to the requested SDK version. + # + # `sdkVersion` can be any of the following: + # * A version string indicating the requested SDK version; or + # * An attrset consisting of either or both of the following fields: darwinSdkVersion and darwinMinVersion. + overrideSDK = stdenv: sdkVersion: + let + inherit ( + { inherit (stdenv.hostPlatform) darwinMinVersion darwinSdkVersion; } + // (if lib.isAttrs sdkVersion then sdkVersion else { darwinSdkVersion = sdkVersion; }) + ) darwinMinVersion darwinSdkVersion; + + sdk = pkgs.darwin."apple_sdk_${lib.replaceStrings [ "." ] [ "_" ] darwinSdkVersion}"; + # TODO: Make this unconditional after #229210 has been merged, + # and the 10.12 SDK is updated to follow the new structure. + Libsystem = if darwinSdkVersion == "10.12" then pkgs.darwin.Libsystem else sdk.Libsystem; + + replacePropagatedFrameworks = pkg: + let + propagatedInputs = pkg.propagatedBuildInputs; + mappedInputs = map mapPackageToSDK propagatedInputs; + + env = { + inherit (pkg) outputs; + # Map old frameworks to new ones and the package’s outputs to their original outPaths. + # Also map any packages that have propagated frameworks to their proxy packages using + # the requested SDK version. These mappings are rendered into tab-separated files to be + # parsed and read back with `read`. + dependencies = lib.concatMapStrings (pair: "${pair.fst}\t${pair.snd}\n") (lib.zipLists propagatedInputs mappedInputs); + pkgOutputs = lib.concatMapStrings (output: "${output}\t${(lib.getOutput output pkg).outPath}\n") pkg.outputs; + passAsFile = [ "dependencies" "pkgOutputs" ]; + }; + in + # Only remap the package’s propagated inputs if there are any and if any of them were themselves remapped. + if lib.length propagatedInputs > 0 && propagatedInputs != mappedInputs + then pkgs.runCommand pkg.name env '' + # Iterate over the outputs in the package being replaced to make sure the proxy is + # a fully functional replacement. This is like `symlinkJoin` except for outputs and + # the contents of `nix-support`, which will be customized for the requested SDK. + while IFS=$'\t\n' read -r outputName pkgOutputPath; do + mkdir -p "''${!outputName}" + + for targetPath in "$pkgOutputPath"/*; do + targetName=$(basename "$targetPath") + + # `nix-support` is special-cased because any propagated inputs need their SDK + # frameworks replaced with those from the requested SDK. + if [ "$targetName" == "nix-support" ]; then + mkdir "''${!outputName}/nix-support" + + for file in "$targetPath"/*; do + fileName=$(basename "$file") + + if [ "$fileName" == "propagated-build-inputs" ]; then + cp "$file" "''${!outputName}/nix-support/$fileName" + + while IFS=$'\t\n' read -r oldFramework newFramework; do + substituteInPlace "''${!outputName}/nix-support/$fileName" \ + --replace "$oldFramework" "$newFramework" + done < "$dependenciesPath" + fi + done + else + ln -s "$targetPath" "''${!outputName}/$targetName" + fi + done + done < "$pkgOutputsPath" + '' + else pkg; + + # Remap a framework from one SDK version to another. + mapPackageToSDK = pkg: + let + name = lib.getName pkg; + framework = lib.removePrefix "apple-framework-" name; + in + /**/ if pkg == null then pkg + else if name != framework then sdk.frameworks."${framework}" + else replacePropagatedFrameworks pkg; + + mapRuntimeToSDK = pkg: + # Only remap xcbuild for now, which exports the SDK used to build it. + if pkg != null && lib.isAttrs pkg && lib.getName pkg == "xcodebuild" + then pkg.override { stdenv = overrideSDK stdenv { inherit darwinMinVersion darwinSdkVersion; }; } + else pkg; + + mapInputsToSDK = inputs: args: + let + runsAtBuild = lib.flip lib.elem [ + "depsBuildBuild" + "depsBuildBuildPropagated" + "nativeBuildInputs" + "propagatedNativeBuildInputs" + "depsBuildTarget" + "depsBuildTargetPropagated" + ]; + atBuildInputs = lib.filter runsAtBuild inputs; + atRuntimeInputs = lib.subtractLists atBuildInputs inputs; + in + lib.genAttrs atRuntimeInputs (input: map mapPackageToSDK (args."${input}" or [ ])) + // lib.genAttrs atBuildInputs (input: map mapRuntimeToSDK (args."${input}" or [ ])); + + mkCC = cc: cc.override { + bintools = cc.bintools.override { libc = Libsystem; }; + libc = Libsystem; + }; + in + # TODO: make this work across all input types and not just propagatedBuildInputs + stdenv.override (old: { + buildPlatform = old.buildPlatform // { inherit darwinMinVersion darwinSdkVersion; }; + hostPlatform = old.hostPlatform // { inherit darwinMinVersion darwinSdkVersion; }; + targetPlatform = old.targetPlatform // { inherit darwinMinVersion darwinSdkVersion; }; + + allowedRequisites = null; + cc = mkCC old.cc; + + extraBuildInputs = [sdk.frameworks.CoreFoundation ]; + mkDerivationFromStdenv = extendMkDerivationArgs old (mapInputsToSDK [ + "buildInputs" + "nativeBuildInputs" + "propagatedNativeBuildInputs" + "propagatedBuildInputs" + ]); + }); } diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 25a80fd11aa2d..c94c56daae1c2 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -245,7 +245,8 @@ in coreutils = bootstrapTools; gnugrep = bootstrapTools; - pbzx = bootstrapTools; + # Either pbzx or Libsystem is required from bootstrap tools (one is used building the other). + pbzx = if localSystem.isAarch64 then bootstrapTools else super.pbzx; cpio = self.stdenv.mkDerivation { name = "bootstrap-stage0-cpio"; buildCommand = '' @@ -255,7 +256,11 @@ in passthru.isFromBootstrapFiles = true; }; - darwin = super.darwin.overrideScope (selfDarwin: _: { + darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { + # Prevent CF from being propagated to the initial stdenv. Packages that require it + # will have to manually add it to their build inputs. + CF = null; + binutils-unwrapped = bootstrapTools // { version = "boot"; }; @@ -296,15 +301,6 @@ in sigtool = bootstrapTools; } // lib.optionalAttrs (! useAppleSDKLibs) { - CF = self.stdenv.mkDerivation { - name = "bootstrap-stage0-CF"; - buildCommand = '' - mkdir -p $out/Library/Frameworks - ln -s ${bootstrapTools}/Library/Frameworks/CoreFoundation.framework $out/Library/Frameworks - ''; - passthru.isFromBootstrapFiles = true; - }; - Libsystem = self.stdenv.mkDerivation { name = "bootstrap-stage0-Libsystem"; buildCommand = '' @@ -424,15 +420,18 @@ in # making sure both packages are present on x86_64-darwin and aarch64-darwin. (prevStage: # previous stage0 stdenv: - assert lib.all isFromBootstrapFiles (with prevStage; [ bash coreutils cpio gnugrep pbzx ]); + assert lib.all isFromBootstrapFiles ( + with prevStage; [ bash coreutils cpio gnugrep ] ++ lib.optionals useAppleSDKLibs [ pbzx ] + ); assert lib.all isFromBootstrapFiles (with prevStage.darwin; [ binutils-unwrapped cctools print-reexports rewrite-tbd sigtool ]); - assert (! useAppleSDKLibs) -> lib.all isFromBootstrapFiles (with prevStage.darwin; [ CF Libsystem ]); - assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem ]); + assert (! useAppleSDKLibs) -> lib.all isFromBootstrapFiles (with prevStage.darwin; [ Libsystem ]); + assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ Libsystem ]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd xnu ]); + assert (with prevStage.darwin; (! useAppleSDKLibs) -> CF == null); assert lib.all isFromBootstrapFiles (with prevStage.llvmPackages; [ clang-unwrapped libclang libllvm llvm compiler-rt libcxx libcxxabi @@ -445,7 +444,11 @@ in inherit (prevStage) ccWrapperStdenv coreutils gnugrep; - cmake = super.cmakeMinimal; + # Use this stage’s CF to build CMake. It’s required but can’t be included in the stdenv. + cmake = self.cmakeMinimal; + cmakeMinimal = super.cmakeMinimal.overrideAttrs (old: { + buildInputs = old.buildInputs ++ [ self.darwin.CF ]; + }); curl = super.curlMinimal; @@ -457,9 +460,18 @@ in ninja = super.ninja.override { buildDocs = false; }; - python3 = super.python3Minimal; + # Use this stage’s CF to build Python. It’s required but can’t be included in the stdenv. + python3 = self.python3Minimal; + python3Minimal = super.python3Minimal.overrideAttrs (old: { + buildInputs = old.buildInputs ++ [ self.darwin.CF ]; + }); darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { + # Use this stage’s CF to build configd. It’s required but can’t be included in the stdenv. + configd = superDarwin.configd.overrideAttrs (old: { + buildInputs = old.buildInputs or [ ] ++ [ self.darwin.CF ]; + }); + signingUtils = prevStage.darwin.signingUtils.override { inherit (selfDarwin) sigtool; }; @@ -529,7 +541,8 @@ in assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool ]); - assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ CF Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd xnu ]); @@ -628,7 +641,8 @@ in binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool ]); - assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ CF Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd xnu ]); @@ -725,7 +739,8 @@ in binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool ]); - assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ CF Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); @@ -824,8 +839,9 @@ in binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool ]); - assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ CF configd ]); + assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]); assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]); + assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); @@ -951,7 +967,8 @@ in ]); assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]); - assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ CF Libsystem ]); + assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]); + assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); @@ -1031,7 +1048,8 @@ in ]); assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]); - assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ CF Libsystem ]); + assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]); + assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); @@ -1047,9 +1065,9 @@ in overrides = self: super: { inherit (prevStage) ccWrapperStdenv - autoconf automake bash bison cmake cmakeMinimal cpio cyrus_sasl db expat flex groff - libedit libtool m4 ninja openldap openssh patchutils pbzx perl pkg-config python3 - python3Minimal scons serf sqlite subversion sysctl texinfo unzip which + autoconf automake bash bison cmake cmakeMinimal cyrus_sasl db expat flex groff + libedit libtool m4 ninja openldap openssh patchutils perl pkg-config python3 scons + serf sqlite subversion sysctl texinfo unzip which # CF dependencies - don’t rebuild them. icu @@ -1057,11 +1075,40 @@ in # LLVM dependencies - don’t rebuild them. libffi libiconv libxml2 ncurses zlib; + # These overrides are required to break an infinite recursion. curl depends on Darwin + # frameworks, but those frameworks require these dependencies to build, which + # depend on curl indirectly. + cpio = super.cpio.override { + inherit (prevStage) fetchurl; + }; + + libyaml = super.libyaml.override { + inherit (prevStage) fetchFromGitHub; + }; + + pbzx = super.pbzx.override { + inherit (prevStage) fetchFromGitHub; + }; + + python3Minimal = super.python3Minimal.override { + inherit (prevStage) fetchurl; + }; + + xar = super.xar.override { + inherit (prevStage) fetchurl; + }; + darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { inherit (prevStage.darwin) dyld CF Libsystem darwin-stubs # CF dependencies - don’t rebuild them. libobjc objc4; + # rewrite-tbd is also needed to build Darwin frameworks, so it’s built using the + # previous stage’s fetchFromGitHub to avoid an infinite recursion (same as above). + rewrite-tbd = superDarwin.rewrite-tbd.override { + inherit (prevStage) fetchFromGitHub; + }; + signingUtils = superDarwin.signingUtils.override { inherit (selfDarwin) sigtool; }; @@ -1158,16 +1205,18 @@ in (prevStage: # previous stage4 stdenv: assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [ - bash binutils-unwrapped brotli bzip2 curl diffutils ed file findutils gawk gettext gmp - gnugrep gnumake gnused gnutar gzip icu libffi libiconv libidn2 libkrb5 libssh2 - libunistring libxml2 ncurses nghttp2 openbsm openpam openssl patch pcre xz zlib zstd + bash binutils-unwrapped brotli bzip2 cpio curl diffutils ed file findutils gawk + gettext gmp gnugrep gnumake gnused gnutar gzip icu libffi libiconv libidn2 libkrb5 + libssh2 libunistring libxml2 libyaml ncurses nghttp2 openbsm openpam openssl patch + pbzx pcre python3Minimal xar xz zlib zstd ]); assert lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ binutils-unwrapped cctools libtapi locale print-reexports rewrite-tbd sigtool ]); - assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ CF Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); @@ -1176,9 +1225,9 @@ in ]); assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ - autoconf automake bison cmake cmakeMinimal cpio cyrus_sasl db expat flex groff libedit - libtool m4 ninja openldap openssh patchutils pbzx perl pkg-config.pkg-config python3 - python3Minimal scons serf sqlite subversion sysctl.provider texinfo unzip which + autoconf automake bison cmake cmakeMinimal cyrus_sasl db expat flex groff libedit + libtool m4 ninja openldap openssh patchutils perl pkg-config.pkg-config python3 scons + serf sqlite subversion sysctl.provider texinfo unzip which ]); assert prevStage.darwin.cctools == prevStage.darwin.cctools-llvm; @@ -1307,14 +1356,14 @@ in overrides = self: super: { inherit (prevStage) - bash binutils brotli bzip2 coreutils curl diffutils ed file findutils gawk gettext - gmp gnugrep gnumake gnused gnutar gzip icu libffi libiconv libidn2 libssh2 - libunistring libxml2 ncurses nghttp2 openbsm openpam openssl patch pcre xz zlib - zstd; + bash binutils brotli bzip2 coreutils cpio curl diffutils ed file findutils gawk + gettext gmp gnugrep gnumake gnused gnutar gzip icu libffi libiconv libidn2 libssh2 + libunistring libxml2 libyaml ncurses nghttp2 openbsm openpam openssl patch pbzx + pcre python3Minimal xar xz zlib zstd; darwin = super.darwin.overrideScope (_: _: { inherit (prevStage.darwin) - CF ICU Libsystem darwin-stubs dyld locale libobjc libtapi xnu; + CF ICU Libsystem darwin-stubs dyld locale libobjc libtapi rewrite-tbd xnu; } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { inherit (prevStage.darwin) binutils binutils-unwrapped cctools-llvm cctools-port; }); diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 448d6ecd9f179..1324c78c5fd64 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -1,5 +1,21 @@ { pkgspath ? ../../.., test-pkgspath ? pkgspath , localSystem ? { system = builtins.currentSystem; } +# Specify the desired LLVM version in an overlay to avoid the use of +# mismatching versions. +# +# The llvmPackages that we take things (clang, libc++ and such) from +# is specified explicitly to be llvmPackages_11 to keep the +# bootstrap-tools stable. However, tools like otool, +# install_name_tool and strip are taken straight from stdenv.cc, +# which, after the bump, is a different LLVM version altogether. +# +# The original intent was that bootstrap-tools specified LLVM 11 +# exhaustively but it didn't. That should be rectified with this +# PR. As to why stick with 11? That's just to keep the +# bootstrap-tools unchanged. +# +# https://github.com/NixOS/nixpkgs/pull/267058/files#r1390889848 +, overlays ? [(self: super: { llvmPackages = super.llvmPackages_11; })] , crossSystem ? null , bootstrapFiles ? null }: @@ -13,11 +29,9 @@ let cross = if crossSystem != null in (import "${pkgspath}/pkgs/stdenv/darwin" args'); } else {}; -in with import pkgspath ({ inherit localSystem; } // cross // custom-bootstrap); +in with import pkgspath ({ inherit localSystem overlays; } // cross // custom-bootstrap); -let - llvmPackages = llvmPackages_11; -in rec { +rec { coreutils_ = coreutils.override (args: { # We want coreutils without ACL support. aclSupport = false; @@ -28,7 +42,7 @@ in rec { cctools_ = darwin.cctools; # Avoid debugging larger changes for now. - bzip2_ = bzip2.override (args: { linkStatic = true; }); + bzip2_ = bzip2.override (args: { enableStatic = true; enableShared = false; }); # Avoid messing with libkrb5 and libnghttp2. curl_ = curlMinimal.override (args: { gssSupport = false; http2Support = false; }); diff --git a/pkgs/stdenv/generic/default-builder.sh b/pkgs/stdenv/generic/default-builder.sh index 8c6fec7873b6e..d49fb8aa57fcc 100644 --- a/pkgs/stdenv/generic/default-builder.sh +++ b/pkgs/stdenv/generic/default-builder.sh @@ -1,6 +1,4 @@ -if [ -f .attrs.sh ]; then - . .attrs.sh -fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup genericBuild diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 8c52eb10c3cfb..63d02c8f08570 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -439,6 +439,7 @@ else let crossFile = builtins.toFile "cross-file.conf" '' [properties] + bindgen_clang_arguments = ['-target', '${stdenv.targetPlatform.config}'] needs_exe_wrapper = ${boolToString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform)} [host_machine] @@ -449,6 +450,7 @@ else let [binaries] llvm-config = 'llvm-config-native' + rust = ['rustc', '--target', '${stdenv.targetPlatform.rust.rustcTargetSpec}'] ''; crossFlags = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ]; in crossFlags ++ mesonFlags; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index ad9857fc9d61c..37c10fb2957b1 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -16,29 +16,15 @@ if (( "${NIX_DEBUG:-0}" >= 6 )); then set -x fi -if [ -f .attrs.sh ]; then +if [ -f .attrs.sh ] || [[ -n "${NIX_ATTRS_JSON_FILE:-}" ]]; then __structuredAttrs=1 echo "structuredAttrs is enabled" -else - __structuredAttrs= -fi -if [ -n "$__structuredAttrs" ]; then for outputName in "${!outputs[@]}"; do # ex: out=/nix/store/... export "$outputName=${outputs[$outputName]}" done - # Before Nix 2.4, $NIX_ATTRS_*_FILE was named differently: - # https://github.com/NixOS/nix/commit/27ce722 - if [[ -n "${ATTRS_JSON_FILE:-}" ]]; then - export NIX_ATTRS_JSON_FILE="$ATTRS_JSON_FILE" - fi - - if [[ -n "${ATTRS_SH_FILE:-}" ]]; then - export NIX_ATTRS_SH_FILE="$ATTRS_SH_FILE" - fi - # $NIX_ATTRS_JSON_FILE pointed to the wrong location in sandbox # https://github.com/NixOS/nix/issues/6736; please keep around until the # fix reaches *every patch version* that's >= lib/minver.nix @@ -49,6 +35,7 @@ if [ -n "$__structuredAttrs" ]; then export NIX_ATTRS_SH_FILE="$NIX_BUILD_TOP/.attrs.sh" fi else + __structuredAttrs= : "${outputs:=out}" fi @@ -1539,6 +1526,44 @@ showPhaseFooter() { } +runPhase() { + local curPhase="$*" + if [[ "$curPhase" = unpackPhase && -n "${dontUnpack:-}" ]]; then return; fi + if [[ "$curPhase" = patchPhase && -n "${dontPatch:-}" ]]; then return; fi + if [[ "$curPhase" = configurePhase && -n "${dontConfigure:-}" ]]; then return; fi + if [[ "$curPhase" = buildPhase && -n "${dontBuild:-}" ]]; then return; fi + if [[ "$curPhase" = checkPhase && -z "${doCheck:-}" ]]; then return; fi + if [[ "$curPhase" = installPhase && -n "${dontInstall:-}" ]]; then return; fi + if [[ "$curPhase" = fixupPhase && -n "${dontFixup:-}" ]]; then return; fi + if [[ "$curPhase" = installCheckPhase && -z "${doInstallCheck:-}" ]]; then return; fi + if [[ "$curPhase" = distPhase && -z "${doDist:-}" ]]; then return; fi + + if [[ -n $NIX_LOG_FD ]]; then + echo "@nix { \"action\": \"setPhase\", \"phase\": \"$curPhase\" }" >&"$NIX_LOG_FD" + fi + + showPhaseHeader "$curPhase" + dumpVars + + local startTime=$(date +"%s") + + # Evaluate the variable named $curPhase if it exists, otherwise the + # function named $curPhase. + eval "${!curPhase:-$curPhase}" + + local endTime=$(date +"%s") + + showPhaseFooter "$curPhase" "$startTime" "$endTime" + + if [ "$curPhase" = unpackPhase ]; then + # make sure we can cd into the directory + [ -n "${sourceRoot:-}" ] && chmod +x "${sourceRoot}" + + cd "${sourceRoot:-.}" + fi +} + + genericBuild() { # variable used by our gzip wrapper to add -n. # gzip is in common-path.nix and is added to nix-shell but we only want to change its behaviour in nix builds. do not move to a setupHook in gzip. @@ -1565,39 +1590,7 @@ genericBuild() { # phase name is space-free, which it must be because it's the name # of either a shell variable or a shell function. for curPhase in ${phases[*]}; do - if [[ "$curPhase" = unpackPhase && -n "${dontUnpack:-}" ]]; then continue; fi - if [[ "$curPhase" = patchPhase && -n "${dontPatch:-}" ]]; then continue; fi - if [[ "$curPhase" = configurePhase && -n "${dontConfigure:-}" ]]; then continue; fi - if [[ "$curPhase" = buildPhase && -n "${dontBuild:-}" ]]; then continue; fi - if [[ "$curPhase" = checkPhase && -z "${doCheck:-}" ]]; then continue; fi - if [[ "$curPhase" = installPhase && -n "${dontInstall:-}" ]]; then continue; fi - if [[ "$curPhase" = fixupPhase && -n "${dontFixup:-}" ]]; then continue; fi - if [[ "$curPhase" = installCheckPhase && -z "${doInstallCheck:-}" ]]; then continue; fi - if [[ "$curPhase" = distPhase && -z "${doDist:-}" ]]; then continue; fi - - if [[ -n $NIX_LOG_FD ]]; then - echo "@nix { \"action\": \"setPhase\", \"phase\": \"$curPhase\" }" >&"$NIX_LOG_FD" - fi - - showPhaseHeader "$curPhase" - dumpVars - - local startTime=$(date +"%s") - - # Evaluate the variable named $curPhase if it exists, otherwise the - # function named $curPhase. - eval "${!curPhase:-$curPhase}" - - local endTime=$(date +"%s") - - showPhaseFooter "$curPhase" "$startTime" "$endTime" - - if [ "$curPhase" = unpackPhase ]; then - # make sure we can cd into the directory - [ -n "${sourceRoot:-}" ] && chmod +x "${sourceRoot}" - - cd "${sourceRoot:-.}" - fi + runPhase "$curPhase" done } diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index d8c5f3208bca8..9543e165a8053 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -67,7 +67,6 @@ with pkgs; # libcxx does not build for some reason on aarch64-linux (filterAttrs (n: _: n != "llvmPackages_7")) ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ - (filterAttrs (n: _: n != "llvmPackages_5")) (filterAttrs (n: _: n != "llvmPackages_6")) (filterAttrs (n: _: n != "llvmPackages_7")) (filterAttrs (n: _: n != "llvmPackages_8")) diff --git a/pkgs/test/simple/builder.sh b/pkgs/test/simple/builder.sh index 908faec3c3888..0b09a109beadb 100644 --- a/pkgs/test/simple/builder.sh +++ b/pkgs/test/simple/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi set -x export NIX_DEBUG=1 diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index e65cac675dbdb..7bbc1e14efbe2 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -3,24 +3,20 @@ , fetchPypi , groff , less +, nix-update-script +, testers +, awscli }: python3.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.29.9"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.30.2"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - hash = "sha256-8SmOu79FZESL1Hd15wdd1m1Uewswqaum2y8LOZAl9P8="; + hash = "sha256-XbYsPbYUIJPCS+nhcE3A5K7yxHcGUkulT5vHPT5T9kM="; }; - # https://github.com/aws/aws-cli/issues/4837 - postPatch = '' - substituteInPlace setup.py \ - --replace "docutils>=0.10,<0.17" "docutils>=0.10" \ - --replace "colorama>=0.2.5,<0.4.5" "colorama>=0.2.5,<0.5" \ - --replace "rsa>=3.1.2,<4.8" "rsa<5,>=3.1.2" - ''; propagatedBuildInputs = with python3.pkgs; [ botocore @@ -44,10 +40,6 @@ python3.pkgs.buildPythonApplication rec { rm $out/bin/aws.cmd ''; - passthru = { - python = python3; # for aws_shell - }; - doInstallCheck = true; installCheckPhase = '' @@ -59,12 +51,25 @@ python3.pkgs.buildPythonApplication rec { runHook postInstallCheck ''; + passthru = { + python = python3; # for aws_shell + updateScript = nix-update-script { + # Excludes 1.x versions from the Github tags list + extraArgs = [ "--version-regex" "^(1\.(.*))" ]; + }; + tests.version = testers.testVersion { + package = awscli; + command = "aws --version"; + inherit version; + }; + }; + meta = with lib; { homepage = "https://aws.amazon.com/cli/"; changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; description = "Unified tool to manage your AWS services"; license = licenses.asl20; mainProgram = "aws"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ anthonyroussel ]; }; } diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 779d6d32de72b..78fd0510629f4 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -8,20 +8,20 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.824.0) - aws-sdk-core (3.181.1) + aws-partitions (1.851.0) + aws-sdk-core (3.186.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.71.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sdk-kms (1.72.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.134.0) + aws-sdk-s3 (1.136.0) aws-sdk-core (~> 3, >= 3.181.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.6) - aws-sigv4 (1.6.0) + aws-sigv4 (1.6.1) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.1.0) @@ -32,11 +32,10 @@ GEM declarative (0.0.20) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) + domain_name (0.6.20231109) dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.103.0) + excon (0.104.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -66,7 +65,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.7) - fastlane (2.216.0) + fastlane (2.217.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -107,9 +106,9 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.49.0) + google-apis-androidpublisher_v3 (0.52.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-core (0.11.1) + google-apis-core (0.11.2) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -122,23 +121,23 @@ GEM google-apis-core (>= 0.11.0, < 2.a) google-apis-playcustomapp_v1 (0.13.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-storage_v1 (0.19.0) - google-apis-core (>= 0.9.0, < 2.a) + google-apis-storage_v1 (0.29.0) + google-apis-core (>= 0.11.0, < 2.a) google-cloud-core (1.6.0) google-cloud-env (~> 1.0) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) google-cloud-errors (1.3.1) - google-cloud-storage (1.44.0) + google-cloud-storage (1.45.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.19.0) + google-apis-storage_v1 (~> 0.29.0) google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.8.0) + googleauth (1.8.1) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) @@ -161,7 +160,7 @@ GEM os (1.1.4) plist (3.7.0) public_suffix (5.0.3) - rake (13.0.6) + rake (13.1.0) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -189,13 +188,10 @@ GEM tty-spinner (0.9.3) tty-cursor (~> 0.7) uber (0.1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.2) - unicode-display_width (2.4.2) + unicode-display_width (2.5.0) webrick (1.8.1) word_wrap (1.0.0) - xcodeproj (1.22.0) + xcodeproj (1.23.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -214,4 +210,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 2.4.19 + 2.4.20 diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index a28442fd04cee..033ce2a4292e1 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -45,10 +45,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03dy04n302202rn97cy2r65ybx7ik0s2qqg8s4w3jgi4nvhyy8b4"; + sha256 = "1aj4c8m40kpyy48j5gmr3gnz27sy97zjrdd3xpn6i0ix2m9sq2c5"; type = "gem"; }; - version = "1.824.0"; + version = "1.851.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qnwh40d45pqm77dayvh1zdlb5xjbbj7hv29s8nhxj7c3qkl4bpb"; + sha256 = "19zl449qzc2ir0yzwhdy82nkm0ycd1822pym6b2i0h1k7zw69may"; type = "gem"; }; - version = "3.181.1"; + version = "3.186.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -67,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zr5w2cjd895abyn7y5gifhq37bxcinssvdx2l1qmlkllbdxbwq0"; + sha256 = "01z32ryrl18al0hazyimww808ij144pgs5m8wmp0k49i7k33hnlw"; type = "gem"; }; - version = "1.71.0"; + version = "1.72.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -78,10 +78,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fbz259as60xnf563z9byp8blq5fsc81h92h3wicai4bmz45w4r5"; + sha256 = "0qwdkbwp3f5illkkmivzdr9gcrcg69yv73xlfp6fc7fmhlm30irm"; type = "gem"; }; - version = "1.134.0"; + version = "1.136.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -89,10 +89,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z889c4c1w7wsjm3szg64ay5j51kjl4pdf94nlr1yks2rlanm7na"; + sha256 = "1wzi7mkyfcr23y8r3dx64zqil115rjy8d9nmkd2q5a6ssxs8y58w"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; babosa = { groups = ["default"]; @@ -178,15 +178,14 @@ version = "0.6.5"; }; domain_name = { - dependencies = ["unf"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + sha256 = "1gpciaifmxql8h01ci12qq08dnqrdlzkkz6fmia9v9yc3r9a29si"; type = "gem"; }; - version = "0.5.20190701"; + version = "0.6.20231109"; }; dotenv = { groups = ["default"]; @@ -213,10 +212,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15la3ni3fwl8aj8mifn3hkryfjg6z09j4cc8j24rq6kwknlry5ff"; + sha256 = "104vrqqy6bszbhpvabgz9ra7dm6lnb5jwzwqm2fks0ka44spknyl"; type = "gem"; }; - version = "0.103.0"; + version = "0.104.0"; }; faraday = { dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; @@ -368,10 +367,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05mqlcnblhs1dp4433skziqissl92frwcbf4bbq1ihvywlbpayfb"; + sha256 = "0p2b92csayzlj60v15fz3mq4h23kvvr7swhaavi6fpaqzf70iafi"; type = "gem"; }; - version = "2.216.0"; + version = "2.217.0"; }; gh_inspector = { groups = ["default"]; @@ -389,10 +388,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15wdy5r6rhnj9744fvibkm1npgz3nm7wfcaann1laz45mh499f2g"; + sha256 = "0rxxj033ziwx94xcym2cs76lcqjiyxv5vv52i32s97nkpk6wid6g"; type = "gem"; }; - version = "0.49.0"; + version = "0.52.0"; }; google-apis-core = { dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"]; @@ -400,10 +399,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z4p7fyqlnydjgprawmhc7q6yjfzdjjvhn0hh0j6a9rq9wii2xli"; + sha256 = "1cly6ycryjhk15d60v3nqvhqpjk9f0nznnslbdnin90f5r54sbpd"; type = "gem"; }; - version = "0.11.1"; + version = "0.11.2"; }; google-apis-iamcredentials_v1 = { dependencies = ["google-apis-core"]; @@ -433,10 +432,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17qamcjnf22zvw1g169g8a2gkzdsxx4ij3a4ganihyrcf9r62asj"; + sha256 = "1k432qgxf41c4m6d68rascm0gyj18r7ypmrnyzmxh7k7nh543awx"; type = "gem"; }; - version = "0.19.0"; + version = "0.29.0"; }; google-cloud-core = { dependencies = ["google-cloud-env" "google-cloud-errors"]; @@ -476,10 +475,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1skhlpcykxxzw3050cwngdyc3n746wfx443w1w9chxwjbh2ix6i9"; + sha256 = "0033bi8qwm0ksxsv5zhz4nzwsiaapq3xk79z8f8rx3v09vdap07j"; type = "gem"; }; - version = "1.44.0"; + version = "1.45.0"; }; googleauth = { dependencies = ["faraday" "jwt" "multi_json" "os" "signet"]; @@ -487,10 +486,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06yg24bdh0daxz3bz7ap90b14j3blli7ywg5q05a5kghs9xa26y1"; + sha256 = "1ry9v23kndgx2pxq9v31l68k9lnnrcz1w4v75bkxq88jmbddljl1"; type = "gem"; }; - version = "1.8.0"; + version = "1.8.1"; }; highline = { groups = ["default"]; @@ -658,10 +657,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; type = "gem"; }; - version = "13.0.6"; + version = "13.1.0"; }; representable = { dependencies = ["declarative" "trailblazer-option" "uber"]; @@ -828,36 +827,15 @@ }; version = "0.1.0"; }; - unf = { - dependencies = ["unf_ext"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; - type = "gem"; - }; - version = "0.1.4"; - }; - unf_ext = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch"; - type = "gem"; - }; - version = "0.0.8.2"; - }; unicode-display_width = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a"; + sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; type = "gem"; }; - version = "2.4.2"; + version = "2.5.0"; }; webrick = { groups = ["default"]; @@ -885,10 +863,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s7hxaqd1fi4rlmm2jbrglyvka1r95frlxan61vfcnd8n6pxynpi"; + sha256 = "176ndahc5fssyx04q176vy6wngs1av4vrsdrkdpjij700hqll8hn"; type = "gem"; }; - version = "1.22.0"; + version = "1.23.0"; }; xcpretty = { dependencies = ["rouge"]; diff --git a/pkgs/tools/admin/scalr-cli/default.nix b/pkgs/tools/admin/scalr-cli/default.nix index 3450019afa266..7adbaf7f6689c 100644 --- a/pkgs/tools/admin/scalr-cli/default.nix +++ b/pkgs/tools/admin/scalr-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "scalr-cli"; - version = "0.15.2"; + version = "0.15.3"; src = fetchFromGitHub { owner = "Scalr"; repo = "scalr-cli"; rev = "v${version}"; - hash = "sha256-vuYkUFh9C+D6Sbu/vbEFV57FDVQVSCkvOxdLeDVbe18="; + hash = "sha256-ciretC6z2NcLffSkK78DFIUqbRHgVTA7OEyNk6qdAgI="; }; vendorHash = "sha256-zyshSluHq5f+DQV4K7qxHNsZ4nKzL8J5A25rdg9fHeM="; diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix index ee1693ee18e25..07aa89fa5caf2 100644 --- a/pkgs/tools/archivers/unar/default.nix +++ b/pkgs/tools/archivers/unar/default.nix @@ -50,15 +50,17 @@ stdenv.mkDerivation rec { lib.optionals stdenv.isLinux [ gnustep.make ] ++ lib.optionals stdenv.isDarwin [ xcbuildHook ]; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + # xcbuild links with clang instead of clang++. + env = lib.optionalAttrs stdenv.isDarwin { + LD_FLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + xcbuildFlags = lib.optionals stdenv.isDarwin [ "-target unar" "-target lsar" "-configuration Release" - "MACOSX_DEPLOYMENT_TARGET=10.12" - # Fix "ld: file not found: /nix/store/*-clang-7.1.0/lib/arc/libarclite_macosx." error - # Disabling ARC may leak memory, however since this program is generally not used for - # long periods of time, it shouldn't be an issue - "CLANG_LINK_OBJC_RUNTIME=NO" + "MACOSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}" ]; makefile = lib.optionalString (!stdenv.isDarwin) "Makefile.linux"; diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 5e196a5b557bc..22925dce99fa8 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -1,35 +1,68 @@ -{ lib, stdenv, makeWrapper, fetchurl, which, pkg-config +{ lib, stdenv, makeWrapper, fetchFromGitHub, which, pkg-config , libjpeg , ocamlPackages -, awscli2, curl, ffmpeg, youtube-dl -, runtimePackages ? [ awscli2 curl ffmpeg youtube-dl ] +, awscli2, bubblewrap, curl, ffmpeg, yt-dlp +, runtimePackages ? [ awscli2 bubblewrap curl ffmpeg yt-dlp ] }: let pname = "liquidsoap"; - version = "2.1.4"; + version = "2.2.2"; in stdenv.mkDerivation { inherit pname version; - src = fetchurl { - url = "https://github.com/savonet/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-GQuG7f9U+/HqPcuj6hnBoH5mWEhxSwWgBnkCuLqHTAc="; + src = fetchFromGitHub { + owner = "savonet"; + repo = "liquidsoap"; + rev = "refs/tags/v${version}"; + hash = "sha256-t7rkWHSAd3DaTCXaGfL9NcIQYT+f4Od9D6huuZlwhWk="; }; - postFixup = '' + postPatch = '' + substituteInPlace src/lang/dune \ + --replace "(run git rev-parse --short HEAD)" "(run echo -n nixpkgs)" + ''; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + dune build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + dune install --prefix "$out" + + runHook postInstall + ''; + + fixupPhase = '' + runHook preFixup + wrapProgram $out/bin/liquidsoap \ --set LIQ_LADSPA_PATH /run/current-system/sw/lib/ladspa \ --prefix PATH : ${lib.makeBinPath runtimePackages} - ''; + runHook postFixup + ''; strictDeps = true; - nativeBuildInputs = - [ makeWrapper pkg-config which - ocamlPackages.ocaml ocamlPackages.findlib ocamlPackages.menhir - ]; + nativeBuildInputs = [ + makeWrapper + pkg-config + which + ocamlPackages.ocaml + ocamlPackages.dune_3 + ocamlPackages.findlib + ocamlPackages.menhir + ]; buildInputs = [ libjpeg @@ -38,29 +71,36 @@ stdenv.mkDerivation { ocamlPackages.dtools ocamlPackages.duppy ocamlPackages.mm - ocamlPackages.ocaml_pcre - ocamlPackages.menhir ocamlPackages.menhirLib - (ocamlPackages.camomile.override { version = "1.0.2"; }) ocamlPackages.ocurl + ocamlPackages.cry + ocamlPackages.camomile ocamlPackages.uri - ocamlPackages.sedlex + ocamlPackages.fileutils + ocamlPackages.menhir # liquidsoap-lang + ocamlPackages.menhirLib + ocamlPackages.metadata + ocamlPackages.dune-build-info + ocamlPackages.re + ocamlPackages.sedlex # liquidsoap-lang + ocamlPackages.ppx_string # Recommended dependencies ocamlPackages.ffmpeg # Optional dependencies - ocamlPackages.camlimages - ocamlPackages.gd4o ocamlPackages.alsa ocamlPackages.ao ocamlPackages.bjack - ocamlPackages.cry + ocamlPackages.camlimages ocamlPackages.dssi ocamlPackages.faad ocamlPackages.fdkaac ocamlPackages.flac ocamlPackages.frei0r + ocamlPackages.gd4o + ocamlPackages.graphics ocamlPackages.gstreamer + ocamlPackages.imagelib ocamlPackages.inotify ocamlPackages.ladspa ocamlPackages.lame @@ -72,25 +112,22 @@ stdenv.mkDerivation { ocamlPackages.ogg ocamlPackages.opus ocamlPackages.portaudio + ocamlPackages.posix-time2 ocamlPackages.pulseaudio - ocamlPackages.shine ocamlPackages.samplerate + ocamlPackages.shine ocamlPackages.soundtouch ocamlPackages.speex ocamlPackages.srt ocamlPackages.ssl ocamlPackages.taglib ocamlPackages.theora - ocamlPackages.vorbis - ocamlPackages.xmlplaylist - ocamlPackages.posix-time2 ocamlPackages.tsdl ocamlPackages.tsdl-image ocamlPackages.tsdl-ttf - - # Undocumented dependencies - ocamlPackages.graphics - ocamlPackages.cohttp-lwt-unix + ocamlPackages.vorbis + ocamlPackages.xmlplaylist + ocamlPackages.yaml ]; meta = with lib; { diff --git a/pkgs/tools/audio/piper/default.nix b/pkgs/tools/audio/piper/default.nix index 5b69721bdb4ba..ec55b78c4f8b7 100644 --- a/pkgs/tools/audio/piper/default.nix +++ b/pkgs/tools/audio/piper/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "piper"; - version = "2023.11.6-1"; + version = "2023.11.14-2"; src = fetchFromGitHub { owner = "rhasspy"; repo = "piper"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-9y7HuVgbI8if5XrgQGnEZV1lOw8oMXTFRUTvy/kTGfs="; + hash = "sha256-3ynWyNcdf1ffU3VoDqrEMrm5Jo5Zc5YJcVqwLreRCsI="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index f6b1f6d9f669c..48c936ca632fa 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.19.1"; - format = "pyproject"; + version = "0.20.2"; + pyproject = true; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "refs/tags/v${version}"; - hash = "sha256-GYVr/Wam1IGCSR2vHMAu5Fg/jRB333L6iNjltnRKh4E="; + hash = "sha256-1nlSf15IEX1qKfDtR6+jQqskjxIuzaIWatkj9Z1fh8Y="; }; postPatch = let @@ -57,7 +57,9 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = with python.pkgs; [ cython + numpy packaging + setuptools ]; propagatedBuildInputs = with python.pkgs; [ diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index a55dbc96f107a..96eeeb39a9cb1 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -1,7 +1,6 @@ -args @ { +{ lib, stdenv, - llvmPackages_12, # Anything newer than 11 fetchzip, which, attr, @@ -22,12 +21,6 @@ args @ { CoreFoundation, }: -let - # Fails to build with clang-11 on Darwin: - # error: exception specification of overriding function is more lax than base version - stdenv = if args.stdenv.isDarwin then llvmPackages_12.stdenv else args.stdenv; -in - stdenv.mkDerivation rec { version = "2.7.13"; pname = "dar"; diff --git a/pkgs/tools/bluetooth/bluetuith/default.nix b/pkgs/tools/bluetooth/bluetuith/default.nix index 6b12605531887..d6fad23c1632d 100644 --- a/pkgs/tools/bluetooth/bluetuith/default.nix +++ b/pkgs/tools/bluetooth/bluetuith/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bluetuith"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "darkhz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b+J+8nxFZYJlAKOStpH7ItPqMw7inM5pss17kyX1brg="; + sha256 = "sha256-vdHnG0uQdy5PboIovtxl5i9xwFpjYLCZf2IGeiMcWe8="; }; - vendorHash = "sha256-d0O54KNGLXU8FGr1eSEp30JMWNVo91Le2MI8UnAfTuU="; + vendorHash = "sha256-pYVEFKLPfstWWO6ypgv7ntAaE1Wmq2XKuZC2ccMa8Vc="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index de54827071c64..402e6f4dde370 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -15,7 +15,12 @@ stdenv.mkDerivation rec { lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon IOKit iconv ]); hardeningDisable = [ "format" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-D__THROW="; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isMusl [ + "-D__THROW=" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=int-conversion" + "-Wno-error=implicit-function-declaration" + ]); # efi-boot-patch extracted from http://arm.koji.fedoraproject.org/koji/rpminfo?rpmID=174244 patches = [ ./include-path.patch ./cdrkit-1.1.9-efi-boot.patch ./cdrkit-1.1.11-fno-common.patch ]; diff --git a/pkgs/tools/cd-dvd/sacd/default.nix b/pkgs/tools/cd-dvd/sacd/default.nix index 963300c9ca110..948c514284023 100644 --- a/pkgs/tools/cd-dvd/sacd/default.nix +++ b/pkgs/tools/cd-dvd/sacd/default.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Makefile prefix, otherwise `/usr` prefix is enforced + # https://github.com/Sound-Linux-More/sacd/pull/1 (fetchpatch { - url = "https://github.com/Sound-Linux-More/sacd/pull/1.patch"; + url = "https://github.com/Sound-Linux-More/sacd/commit/a72def4fab234bcd68b444cf7447a8876b4e2ce8.patch"; name = "makefile-prefix.patch"; sha256 = "0a7r4x0yqpg6l4vr84dq4wbrypabqm4vvcjv91am068gqjiw6w64"; }) diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index be456cf594427..bfab2dbb94670 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl -, linkStatic ? with stdenv.hostPlatform; isStatic || isCygwin +, enableStatic ? with stdenv.hostPlatform; isStatic || isCygwin +, enableShared ? true , autoreconfHook , testers }: @@ -47,8 +48,12 @@ in { outputs = [ "bin" "dev" "out" "man" ]; - configureFlags = - lib.optionals linkStatic [ "--enable-static" "--disable-shared" ]; + configureFlags = lib.concatLists [ + (lib.optional enableStatic "--enable-static") + (lib.optional (!enableShared) "--disable-shared") + ]; + + dontDisableStatic = enableStatic; enableParallelBuilding = true; diff --git a/pkgs/tools/compression/zfp/default.nix b/pkgs/tools/compression/zfp/default.nix index d63140b147602..fdb005007f1e9 100644 --- a/pkgs/tools/compression/zfp/default.nix +++ b/pkgs/tools/compression/zfp/default.nix @@ -2,7 +2,7 @@ , config , enableCfp ? true , enableCuda ? config.cudaSupport -, enableFortran ? builtins.elem stdenv.targetPlatform.system gfortran.meta.platforms +, enableFortran ? builtins.elem stdenv.hostPlatform.system gfortran.meta.platforms , enableOpenMP ? true , enablePython ? true , enableUtilities ? true }: diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 791dda4f11ef3..75b306b368aa3 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -2,7 +2,8 @@ , fixDarwinDylibNames , file , legacySupport ? false -, static ? stdenv.hostPlatform.isStatic +, static ? stdenv.hostPlatform.isStatic # generates static libraries *only* +, enableStatic ? static # these need to be ran on the host, thus disable when cross-compiling , buildContrib ? stdenv.hostPlatform == stdenv.buildPlatform , doCheck ? stdenv.hostPlatform == stdenv.buildPlatform @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { cmakeFlags = lib.attrsets.mapAttrsToList (name: value: "-DZSTD_${name}:BOOL=${if value then "ON" else "OFF"}") { BUILD_SHARED = !static; - BUILD_STATIC = static; + BUILD_STATIC = enableStatic; BUILD_CONTRIB = buildContrib; PROGRAMS_LINK_SHARED = !static; LEGACY_SUPPORT = legacySupport; diff --git a/pkgs/tools/filesystems/bcachefs-tools/Cargo.lock b/pkgs/tools/filesystems/bcachefs-tools/Cargo.lock index c4dd7f58c7042..f43cc63c95982 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/Cargo.lock +++ b/pkgs/tools/filesystems/bcachefs-tools/Cargo.lock @@ -4,27 +4,67 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] -name = "android_system_properties" -version = "0.1.5" +name = "anstream" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" dependencies = [ - "libc", + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" +dependencies = [ + "anstyle", + "windows-sys", ] [[package]] name = "anyhow" -version = "1.0.68" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "atty" @@ -55,7 +95,7 @@ dependencies = [ "clap", "colored", "either", - "errno", + "errno 0.2.8", "gag", "getset", "itertools", @@ -74,7 +114,7 @@ dependencies = [ "anyhow", "bindgen", "bitfield", - "bitflags", + "bitflags 1.3.2", "byteorder", "chrono", "colored", @@ -92,7 +132,7 @@ name = "bindgen" version = "0.64.0" source = "git+https://evilpiepirate.org/git/rust-bindgen.git#f773267b090bf16b9e8375fcbdcd8ba5e88806a8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", @@ -103,7 +143,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn", + "syn 1.0.109", ] [[package]] @@ -119,22 +159,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "bumpalo" -version = "3.12.0" +name = "bitflags" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cexpr" @@ -153,24 +196,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ - "iana-time-zone", - "js-sys", - "num-integer", "num-traits", - "time", - "wasm-bindgen", - "winapi", ] [[package]] name = "clang-sys" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", @@ -178,118 +215,68 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.4" +version = "4.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" +checksum = "fb690e81c7840c0d7aade59f242ea3b41b9bc27bcd5997890e7702ae4b32e487" dependencies = [ - "bitflags", + "clap_builder", "clap_derive", - "clap_lex", - "is-terminal", "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ed2e96bc16d8d740f6f48d663eddf4b8a0983e79210fd55479b7bcd0a69860e" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", "strsim", - "termcolor", "terminal_size", ] [[package]] name = "clap_derive" -version = "4.1.0" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] name = "clap_lex" -version = "0.3.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" -dependencies = [ - "os_str_bytes", -] +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" [[package]] -name = "codespan-reporting" -version = "0.11.1" +name = "colorchoice" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "colored" -version = "2.0.0" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" dependencies = [ - "atty", + "is-terminal", "lazy_static", - "winapi", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "cxx" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "windows-sys", ] [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "errno" @@ -303,6 +290,16 @@ dependencies = [ ] [[package]] +name = "errno" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] name = "errno-dragonfly" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -314,12 +311,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.8.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -dependencies = [ - "instant", -] +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "filedescriptor" @@ -351,7 +345,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -377,65 +371,29 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" -dependencies = [ - "cxx", - "cxx-build", -] - -[[package]] -name = "instant" -version = "0.1.12" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "io-lifetimes" -version = "1.0.4" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ + "hermit-abi 0.3.3", "libc", "windows-sys", ] [[package]] name = "is-terminal" -version = "0.4.2" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.2.6", - "io-lifetimes", - "rustix", + "hermit-abi 0.3.3", + "rustix 0.38.21", "windows-sys", ] @@ -449,15 +407,6 @@ dependencies = [ ] [[package]] -name = "js-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" -dependencies = [ - "wasm-bindgen", -] - -[[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -471,9 +420,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libudev-sys" @@ -486,34 +435,28 @@ dependencies = [ ] [[package]] -name = "link-cplusplus" -version = "1.0.8" +name = "linux-raw-sys" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -541,35 +484,19 @@ dependencies = [ ] [[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] [[package]] name = "once_cell" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" - -[[package]] -name = "os_str_bytes" -version = "6.4.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "parse-display" @@ -592,15 +519,15 @@ dependencies = [ "proc-macro2", "quote", "regex", - "regex-syntax", - "syn", + "regex-syntax 0.6.29", + "syn 1.0.109", ] [[package]] name = "paste" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "peeking_take_while" @@ -610,9 +537,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "proc-macro-error" @@ -623,7 +550,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -640,56 +567,65 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.50" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.23" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.7.1" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.8.2", ] [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] -name = "remove_dir_all" -version = "0.5.3" +name = "regex-syntax" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rpassword" @@ -709,29 +645,36 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.36.7" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ - "bitflags", - "errno", + "bitflags 1.3.2", + "errno 0.3.5", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", "windows-sys", ] [[package]] -name = "scratch" -version = "1.0.3" +name = "rustix" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +dependencies = [ + "bitflags 2.4.1", + "errno 0.3.5", + "libc", + "linux-raw-sys 0.4.10", + "windows-sys", +] [[package]] name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "strsim" @@ -741,9 +684,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -751,67 +694,57 @@ dependencies = [ ] [[package]] -name = "tempfile" -version = "3.3.0" +name = "syn" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ - "cfg-if", - "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] -name = "termcolor" -version = "1.2.0" +name = "tempfile" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ - "winapi-util", + "cfg-if", + "fastrand", + "redox_syscall", + "rustix 0.38.21", + "windows-sys", ] [[package]] name = "terminal_size" -version = "0.2.3" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907" +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ - "rustix", + "rustix 0.37.27", "windows-sys", ] [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi", - "winapi", + "syn 2.0.38", ] [[package]] @@ -827,21 +760,21 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] -name = "unicode-width" -version = "0.1.10" +name = "utf8parse" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.3.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" [[package]] name = "version_check" @@ -850,66 +783,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasm-bindgen" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - -[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -926,15 +799,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -942,9 +806,18 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -957,42 +830,42 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 7df877f102f6d..e6263ca62c677 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -12,33 +12,29 @@ , lz4 , attr , udev -, valgrind , nixosTests , fuse3 , cargo , rustc -, coreutils , rustPlatform , makeWrapper , fuseSupport ? false }: let - version = "1.3.1"; + version = "1.3.3"; in stdenv.mkDerivation { pname = "bcachefs-tools"; inherit version; + src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; rev = "v${version}"; - hash = "sha256-4TmH6YOW6ktISVA6RLo7JRl8/SnRzGMrdbyCr+mDkqY="; + hash = "sha256-73vgwgBqyRLQ/Tts7bl6DhZMOs8ndIOiCke5tN89Wps="; }; - # errors on fsck_err function. Maybe miss-detection? - NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; - nativeBuildInputs = [ pkg-config cargo @@ -72,7 +68,6 @@ stdenv.mkDerivation { doCheck = false; # needs bcachefs module loaded on builder checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ]; - nativeCheckInputs = [ valgrind ]; makeFlags = [ "PREFIX=${placeholder "out"}" @@ -80,7 +75,7 @@ stdenv.mkDerivation { "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" ]; - preCheck = lib.optionalString fuseSupport '' + preCheck = lib.optionalString (!fuseSupport) '' rm tests/test_fuse.py ''; @@ -89,11 +84,6 @@ stdenv.mkDerivation { inherit (nixosTests.installer) bcachefsSimple bcachefsEncrypted bcachefsMulti; }; - postFixup = '' - wrapProgram $out/bin/mount.bcachefs \ - --prefix PATH : ${lib.makeBinPath [ coreutils ]} - ''; - enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index d9beb8f12fcbd..6761947367315 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - hash = "sha256-PpLLbYO93mEjGP2ARt1u/0fHhuWdVt1Ozph5RdUTfJ4="; + hash = "sha256-tCZzbclOKwS2mD6ZjE3EJ9wWbWbd6iRsiQ7ZwqRQBE8="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/dduper/default.nix b/pkgs/tools/filesystems/dduper/default.nix index efdb9f3dc1d60..ba14fcad6c580 100644 --- a/pkgs/tools/filesystems/dduper/default.nix +++ b/pkgs/tools/filesystems/dduper/default.nix @@ -4,9 +4,8 @@ let btrfsProgsPatched = btrfs-progs.overrideAttrs { patches = [ (fetchpatch { - name = "0001-Print-csum-for-a-given-file-on-stdout.patch"; - url = "https://raw.githubusercontent.com/Lakshmipathi/dduper/ecc2664c380616ec75cfc1e600b5514cdff5c687/patch/btrfs-progs-v6.1/0001-Print-csum-for-a-given-file-on-stdout.patch"; - sha256 = "sha256-M4LT7G6gwBfSXf6EL4pxNoQJMyUTOA+ojxEJqw2yss4="; + url = "https://raw.githubusercontent.com/Lakshmipathi/dduper/1f1d29eff61430e118f88239545a29f0bcf3e15d/patch/btrfs-progs-v6.3.3/0001-Print-csum-for-a-given-file-on-stdout.patch"; + hash = "sha256-bO0t8QePnUbMkQQPesZlBF/khD/H8AaWHr2GkOnT6x8="; }) ]; }; diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 14701a615c01e..966c396823928 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , cmake, pkg-config, perl , gettext, fuse, openssl, tinyxml2 }: @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { owner = "vgough"; }; + patches = lib.optionals stdenv.cc.isClang [ + # Fixes a build failure when building with newer versions of clang. + # https://github.com/vgough/encfs/pull/650 + (fetchpatch { + url = "https://github.com/vgough/encfs/commit/406b63bfe234864710d1d23329bf41d48001fbfa.patch"; + hash = "sha256-VunC5ICRJBgCXqkr7ad7DPzweRJr1bdOpo1LKNCs4zY="; + }) + ]; + buildInputs = [ gettext fuse openssl tinyxml2 ]; nativeBuildInputs = [ cmake pkg-config perl ]; diff --git a/pkgs/tools/filesystems/stratisd/Cargo.lock b/pkgs/tools/filesystems/stratisd/Cargo.lock index 7fbf8fc968f33..d3554b3ce19fa 100644 --- a/pkgs/tools/filesystems/stratisd/Cargo.lock +++ b/pkgs/tools/filesystems/stratisd/Cargo.lock @@ -1269,7 +1269,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "stratisd" -version = "3.6.1" +version = "3.6.2" dependencies = [ "assert_cmd", "assert_matches", diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix index ea519112b1cfe..707b3ac654e4a 100644 --- a/pkgs/tools/filesystems/stratisd/default.nix +++ b/pkgs/tools/filesystems/stratisd/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "refs/tags/stratisd-v${version}"; - hash = "sha256-qpuJzsN6AXqvKtKBDZZEmviWBpPR0qNuq+3tIHGSWLs="; + hash = "sha256-R6Bb6ep5T8ePmxwDTxQyeXcSpp2S1C2zqwxmX2Wt1L8="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/pkgs/tools/games/pocket-updater-utility/default.nix b/pkgs/tools/games/pocket-updater-utility/default.nix index ef52b388ae8c1..2d841c00c5168 100644 --- a/pkgs/tools/games/pocket-updater-utility/default.nix +++ b/pkgs/tools/games/pocket-updater-utility/default.nix @@ -6,7 +6,7 @@ , dotnetCorePackages ? pkgs.dotnetCorePackages , openssl ? pkgs.openssl , zlib ? pkgs.zlib -, targetPlatform ? pkgs.targetPlatform +, hostPlatform ? stdenv.hostPlatform }: buildDotnetModule rec { @@ -30,7 +30,7 @@ buildDotnetModule rec { patches = [ ./add-runtime-identifier.patch ]; postPatch = '' substituteInPlace pocket_updater.csproj \ - --replace @RuntimeIdentifier@ "${dotnetCorePackages.systemToDotnetRid targetPlatform.system}" + --replace @RuntimeIdentifier@ "${dotnetCorePackages.systemToDotnetRid hostPlatform.system}" ''; projectFile = "pocket_updater.csproj"; diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index dd446fb26c75c..105169c5e0305 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -95,6 +95,10 @@ stdenv.mkDerivation { runHook postConfigure ''; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; + }; + installPhase = '' runHook preInstall diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix index 1bf20910cf54a..642a49c39b843 100644 --- a/pkgs/tools/graphics/spirv-cross/default.nix +++ b/pkgs/tools/graphics/spirv-cross/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-cross"; - version = "1.3.261.0"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; - rev = "sdk-${finalAttrs.version}"; - hash = "sha256-abVqLovvcKBJhGhSCbyD5mc1DSfvh4TWssGxi52ukQ8="; + rev = "vulkan-sdk-${finalAttrs.version}"; + hash = "sha256-UIk5hihUPjXNzEeO2laS4dUef/rEExxXAZjMcftx+3A="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/tools/graphics/ueberzugpp/default.nix b/pkgs/tools/graphics/ueberzugpp/default.nix index 60e7e7221a13a..8159831264511 100644 --- a/pkgs/tools/graphics/ueberzugpp/default.nix +++ b/pkgs/tools/graphics/ueberzugpp/default.nix @@ -24,8 +24,6 @@ , wayland-protocols , enableX11 ? stdenv.isLinux , xorg -, withoutStdRanges ? stdenv.isDarwin -, range-v3 }: stdenv.mkDerivation rec { @@ -69,8 +67,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableX11 [ xorg.libX11 xorg.xcbutilimage - ] ++ lib.optionals withoutStdRanges [ - range-v3 ]; cmakeFlags = lib.optionals (!enableOpencv) [ diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index 96edbcad83f60..dae55225a0b3f 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, writeText, vulkan-headers, jq, libX11, libXrandr, libxcb, wayland }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, writeText, vulkan-headers, vulkan-utility-libraries, jq, libX11, libXrandr, libxcb, wayland }: stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.3.261"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; - rev = "v${version}"; - hash = "sha256-MeW7mmbjgqEvXEnAYzTNu4omC4fqq1fplIVjDpV2LcA="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-rSKPTeTDOz6IeJGRt9aIu1VH8VfVzXNYZfjdiSXEJxg="; }; nativeBuildInputs = [ cmake pkg-config jq ]; - buildInputs = [ vulkan-headers libX11 libXrandr libxcb wayland ]; + buildInputs = [ vulkan-headers vulkan-utility-libraries libX11 libXrandr libxcb wayland ]; # Help vulkan-loader find the validation layers setupHook = writeText "setup-hook" '' diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 072876e46dec2..ab593a9bc4de7 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -16,23 +16,22 @@ , which , xcbutilkeysyms , xcbutilwm +, valijson , vulkan-headers , vulkan-loader -, symlinkJoin -, vulkan-validation-layers +, vulkan-utility-libraries , writeText }: stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; - version = "1.3.261"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; - rev = "v${version}"; - hash = "sha256-Kem3nWVaMeDEsidKYMsWr9Bu0yBgjjennDB0sKBDogA="; - fetchSubmodules = true; + rev = "vulkan-sdk-${version}"; + hash = "sha256-2ZUD+RBsl35QV3250JOPCIoJb4sJcBsiRE4SZaS6ROs="; }; nativeBuildInputs = [ cmake python3 jq which pkg-config ]; @@ -45,6 +44,10 @@ stdenv.mkDerivation rec { libXrandr libffi libxcb + valijson + vulkan-headers + vulkan-loader + vulkan-utility-libraries wayland xcbutilkeysyms xcbutilwm @@ -52,27 +55,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}" - "-DVULKAN_LOADER_INSTALL_DIR=${vulkan-loader}" - "-DVULKAN_VALIDATIONLAYERS_INSTALL_DIR=${ - symlinkJoin { - name = "vulkan-validation-layers-merged"; - paths = [ vulkan-validation-layers.headers vulkan-validation-layers ]; - } - }" - # Hide dev warnings that are useless for packaging - "-Wno-dev" ]; preConfigure = '' - # We need to run this update script which generates some source files, - # Remove the line in it which calls 'git submodule update' though. - # Also patch the scripts in ./scripts - update=update_external_sources.sh - patchShebangs $update patchShebangs scripts/* - sed -i '/^git /d' $update - ./$update - substituteInPlace via/CMakeLists.txt --replace "jsoncpp_static" "jsoncpp" ''; @@ -85,13 +71,6 @@ stdenv.mkDerivation rec { done ''; - patches = [ - ./gtest.patch - ]; - - # Same as vulkan-validation-layers - dontPatchELF = true; - # Help vulkan-loader find the validation layers setupHook = writeText "setup-hook" '' export XDG_CONFIG_DIRS=@out@/etc''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}} diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/gtest.patch b/pkgs/tools/graphics/vulkan-tools-lunarg/gtest.patch deleted file mode 100644 index cf062a8591ff2..0000000000000 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/gtest.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/external/googletest/googlemock/CMakeLists.txt b/external/googletest/googlemock/CMakeLists.txt -index e7df8ec53d..869bfcb716 100644 ---- a/external/googletest/googlemock/CMakeLists.txt -+++ b/external/googletest/googlemock/CMakeLists.txt -@@ -111,10 +111,10 @@ endif() - if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") - target_include_directories(gmock SYSTEM INTERFACE - "$<BUILD_INTERFACE:${gmock_build_include_dirs}>" -- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") -+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>") - target_include_directories(gmock_main SYSTEM INTERFACE - "$<BUILD_INTERFACE:${gmock_build_include_dirs}>" -- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") -+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>") - endif() - - ######################################################################## -diff --git a/external/googletest/googletest/CMakeLists.txt b/external/googletest/googletest/CMakeLists.txt -index abdd98b79a..7ae174d566 100644 ---- a/external/googletest/googletest/CMakeLists.txt -+++ b/external/googletest/googletest/CMakeLists.txt -@@ -138,10 +138,10 @@ set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION}) - if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") - target_include_directories(gtest SYSTEM INTERFACE - "$<BUILD_INTERFACE:${gtest_build_include_dirs}>" -- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") -+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>") - target_include_directories(gtest_main SYSTEM INTERFACE - "$<BUILD_INTERFACE:${gtest_build_include_dirs}>" -- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") -+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>") - endif() - target_link_libraries(gtest_main PUBLIC gtest) - diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 9327bd9c9d6ed..e148f51d86893 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.3.261"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; - rev = "v${version}"; - hash = "sha256-C5FVkI9F/dgIS8qp7VaOn9J2zoNLb1PnmgAemsVO6zM="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-IsMxiAR4ak6kC3BNYhtI+JVNkEka4ZceSElxk39THXg="; }; nativeBuildInputs = [ @@ -57,27 +57,19 @@ stdenv.mkDerivation rec { Cocoa ]; - libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ]; - - patches = [ - # Vulkan-Tools expects to find the MoltenVK ICD and `libMoltenVK.dylib` in its source repo. - # Patch it to use the already-built binaries and ICD in nixpkgs. - ./use-nix-moltenvk.patch - ]; - - # vkcube.app and vkcubepp.app require `ibtool`, but the version in `xib2nib` is not capable of - # building these apps. Build them using `ibtool` from Xcode, but don’t allow any other binaries - # into the sandbox. Note that the CLT are not supported because `ibtool` requires Xcode. - sandboxProfile = lib.optionalString stdenv.isDarwin '' - (allow process-exec - (literal "/usr/bin/ibtool") - (regex "/Xcode.app/Contents/Developer/usr/bin/ibtool") - (regex "/Xcode.app/Contents/Developer/usr/bin/xcodebuild")) - (allow file-read*) - (deny file-read* (subpath "/usr/local") (with no-log)) - (allow file-write* (subpath "/private/var/folders")) + postPatch = lib.optionalString stdenv.isDarwin '' + # Modify mac_common.cmake to find the ICD where nixpkgs puts it. + substituteInPlace mac_common.cmake \ + --replace MoltenVK/icd/MoltenVK_icd.json MoltenVK_icd.json + # Remove the unconditional check for `ibtool` since the cube demo that needs it won’t be built. + sed -e '/#.*Interface Builder/,/^endif()/d' -i mac_common.cmake + # Install `vulkaninfo` to $out/bin even on Darwin. + substituteInPlace vulkaninfo/CMakeLists.txt \ + --replace 'install(TARGETS vulkaninfo RUNTIME DESTINATION "vulkaninfo")' 'install(TARGETS vulkaninfo)' ''; + libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ]; + dontPatchELF = true; cmakeFlags = [ @@ -91,7 +83,8 @@ stdenv.mkDerivation rec { "-Wno-dev" ] ++ lib.optionals stdenv.isDarwin [ "-DMOLTENVK_REPO_ROOT=${moltenvk}/share/vulkan/icd.d" - "-DIBTOOL=/usr/bin/ibtool" + # Don’t build the cube demo because it requires `ibtool`, which is not available in nixpkgs. + "-DBUILD_CUBE=OFF" ]; meta = with lib; { @@ -102,7 +95,6 @@ stdenv.mkDerivation rec { use of the Vulkan API. ''; homepage = "https://github.com/KhronosGroup/Vulkan-Tools"; - hydraPlatforms = [ "x86_64-linux" "i686-linux" ]; platforms = platforms.unix; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/tools/graphics/vulkan-tools/use-nix-moltenvk.patch b/pkgs/tools/graphics/vulkan-tools/use-nix-moltenvk.patch deleted file mode 100644 index 5d09bff9c958c..0000000000000 --- a/pkgs/tools/graphics/vulkan-tools/use-nix-moltenvk.patch +++ /dev/null @@ -1,123 +0,0 @@ -diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt -index a2f026e7..327f5dba 100644 ---- a/cube/CMakeLists.txt -+++ b/cube/CMakeLists.txt -@@ -257,14 +257,7 @@ else() - endif() - - if(APPLE) -- # Keep RPATH so fixup_bundle can use it to find libraries -- set_target_properties(vkcube PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE) -- install(TARGETS vkcube BUNDLE DESTINATION "cube") -- # Fix up the library references to be self-contained within the bundle. -- install(CODE " -- include(BundleUtilities) -- fixup_bundle(\${CMAKE_INSTALL_PREFIX}/cube/vkcube.app \"\" \"${Vulkan_LIBRARY_DIR}\") -- ") -+ install(TARGETS vkcube BUNDLE DESTINATION "Applications") - else() - install(TARGETS vkcube RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() -@@ -302,14 +295,7 @@ else() - endif() - - if(APPLE) -- # Keep RPATH so fixup_bundle can use it to find libraries -- set_target_properties(vkcubepp PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE) -- install(TARGETS vkcubepp BUNDLE DESTINATION "cube") -- # Fix up the library references to be self-contained within the bundle. -- install(CODE " -- include(BundleUtilities) -- fixup_bundle(\${CMAKE_INSTALL_PREFIX}/cube/vkcubepp.app \"\" \"${Vulkan_LIBRARY_DIR}\") -- ") -+ install(TARGETS vkcubepp BUNDLE DESTINATION "Applications") - else() - install(TARGETS vkcubepp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() -diff --git a/cube/macOS/cube/cube.cmake b/cube/macOS/cube/cube.cmake -index 9b823f95..0c43a2c9 100644 ---- a/cube/macOS/cube/cube.cmake -+++ b/cube/macOS/cube/cube.cmake -@@ -72,12 +72,14 @@ set_source_files_properties("${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json" - # Copy the MoltenVK lib into the bundle. - if(${CMAKE_GENERATOR} MATCHES "^Xcode.*") - add_custom_command(TARGET vkcube POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib" -+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/vkcube.app/Contents/Frameworks -+ COMMAND ${CMAKE_COMMAND} -E create_symlink "${MOLTENVK_DIR}/lib/libMoltenVK.dylib" - ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/vkcube.app/Contents/Frameworks/libMoltenVK.dylib - DEPENDS vulkan) - else() - add_custom_command(TARGET vkcube POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib" -+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/vkcube.app/Contents/Frameworks -+ COMMAND ${CMAKE_COMMAND} -E create_symlink "${MOLTENVK_DIR}/lib/libMoltenVK.dylib" - ${CMAKE_CURRENT_BINARY_DIR}/vkcube.app/Contents/Frameworks/libMoltenVK.dylib - DEPENDS vulkan) - endif() -diff --git a/cube/macOS/cubepp/cubepp.cmake b/cube/macOS/cubepp/cubepp.cmake -index eae4de3c..e528ae26 100644 ---- a/cube/macOS/cubepp/cubepp.cmake -+++ b/cube/macOS/cubepp/cubepp.cmake -@@ -74,12 +74,14 @@ set_source_files_properties("${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json" - # Copy the MoltenVK lib into the bundle. - if(${CMAKE_GENERATOR} MATCHES "^Xcode.*") - add_custom_command(TARGET vkcubepp POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib" -+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/vkcubepp.app/Contents/Frameworks -+ COMMAND ${CMAKE_COMMAND} -E create_symlink "${MOLTENVK_DIR}/lib/libMoltenVK.dylib" - ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/vkcubepp.app/Contents/Frameworks/libMoltenVK.dylib - DEPENDS vulkan) - else() - add_custom_command(TARGET vkcubepp POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib" -+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/vkcubepp.app/Contents/Frameworks -+ COMMAND ${CMAKE_COMMAND} -E create_symlink "${MOLTENVK_DIR}/lib/libMoltenVK.dylib" - ${CMAKE_CURRENT_BINARY_DIR}/vkcubepp.app/Contents/Frameworks/libMoltenVK.dylib - DEPENDS vulkan) - endif() -diff --git a/mac_common.cmake b/mac_common.cmake -index bad3c414..b498906d 100644 ---- a/mac_common.cmake -+++ b/mac_common.cmake -@@ -23,9 +23,8 @@ set(MOLTENVK_DIR ${MOLTENVK_REPO_ROOT}) - # MoltenVK JSON File - - execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/staging-json) --execute_process(COMMAND sed -e "/\"library_path\":/s$:[[:space:]]*\"[[:space:]]*[\\.\\/]*$: \"..\\/..\\/..\\/Frameworks\\/$" -- ${MOLTENVK_DIR}/MoltenVK/icd/MoltenVK_icd.json -- OUTPUT_FILE ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json) -+execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${MOLTENVK_DIR}/MoltenVK_icd.json -+ ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json) - - # ~~~ - # Modify the ICD JSON file to adjust the library path. -@@ -36,10 +35,9 @@ execute_process(COMMAND sed -e "/\"library_path\":/s$:[[:space:]]*\"[[:space:]]* - # ~~~ - add_custom_target(MoltenVK_icd-staging-json ALL - COMMAND mkdir -p ${CMAKE_BINARY_DIR}/staging-json -- COMMAND sed -e "/\"library_path\":/s$:[[:space:]]*\"[[:space:]]*[\\.\\/]*$: \"..\\/..\\/..\\/Frameworks\\/$" -- ${MOLTENVK_DIR}/MoltenVK/icd/MoltenVK_icd.json > ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json -- VERBATIM -- DEPENDS "${MOLTENVK_DIR}/MoltenVK/icd/MoltenVK_icd.json") -+ COMMAND ${CMAKE_COMMAND} -E create_symlink ${MOLTENVK_DIR}/MoltenVK_icd.json -+ ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json -+ DEPENDS "${MOLTENVK_DIR}/MoltenVK_icd.json") - set_source_files_properties(${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json PROPERTIES GENERATED TRUE) - - find_library(COCOA NAMES Cocoa) -diff --git a/vulkaninfo/CMakeLists.txt b/vulkaninfo/CMakeLists.txt -index d23dcf89..32aa0ebb 100644 ---- a/vulkaninfo/CMakeLists.txt -+++ b/vulkaninfo/CMakeLists.txt -@@ -136,9 +136,5 @@ elseif(APPLE) - add_definitions(-DVK_USE_PLATFORM_MACOS_MVK -DVK_USE_PLATFORM_METAL_EXT) - endif() - --if(APPLE) -- install(TARGETS vulkaninfo RUNTIME DESTINATION "vulkaninfo") --else() -- install(TARGETS vulkaninfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) --endif() -+install(TARGETS vulkaninfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - diff --git a/pkgs/tools/graphics/xcolor/default.nix b/pkgs/tools/graphics/xcolor/default.nix index 1ef2c807bde7d..dabe14d895fa7 100644 --- a/pkgs/tools/graphics/xcolor/default.nix +++ b/pkgs/tools/graphics/xcolor/default.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Lightweight color picker for X11"; homepage = "https://github.com/Soft/xcolor"; - maintainers = with lib.maintainers; [ fortuneteller2k ]; + maintainers = with lib.maintainers; [ moni ]; license = licenses.mit; }; } diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix index b3c8ac43d9193..cedbb1b9f22da 100644 --- a/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -8,6 +8,7 @@ , extra-cmake-modules , cairo , pango +, expat , fribidi , fmt , wayland @@ -29,6 +30,7 @@ , libdatrie , xcbutilkeysyms , pcre +, xcbutil , xcbutilwm , xcb-imdkit , libxkbfile @@ -63,6 +65,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + expat fmt isocodes cairo @@ -84,6 +87,7 @@ stdenv.mkDerivation rec { libXdmcp libxkbcommon pcre + xcbutil xcbutilwm xcbutilkeysyms xcb-imdkit diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix index f74d1a8c803a5..793e06fb3d056 100644 --- a/pkgs/tools/misc/archi/default.nix +++ b/pkgs/tools/misc/archi/default.nix @@ -1,31 +1,33 @@ { lib, stdenv , fetchurl -, fetchzip , autoPatchelfHook , makeWrapper , jdk , libsecret , webkitgtk , wrapGAppsHook +, _7zz +, nixosTests }: stdenv.mkDerivation rec { pname = "Archi"; - version = "4.7.1"; + version = "5.2.0"; - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://www.archimatetool.com/downloads/archi/Archi-Linux64-${version}.tgz"; - sha256 = "0sd57cfnh5q2p17sd86c8wgmqyipg29rz6iaa5brq8mwn8ps2fdw"; - } - else if stdenv.hostPlatform.system == "x86_64-darwin" then - fetchzip { - url = "https://www.archimatetool.com/downloads/archi/Archi-Mac-${version}.zip"; - sha256 = "1h05lal5jnjwm30dbqvd6gisgrmf1an8xf34f01gs9pwqvqfvmxc"; - } - else - throw "Unsupported system"; + src = { + "x86_64-linux" = fetchurl { + url = "https://www.archimatetool.com/downloads/archi_5.php?/${version}/Archi-Linux64-${version}.tgz"; + hash = "sha256-uGW4Wl3E71ZCgWzPHkmXv/PluegDF8C64FUQ7C5/SDA="; + }; + "x86_64-darwin" = fetchurl { + url = "https://www.archimatetool.com/downloads/archi_5.php?/${version}/Archi-Mac-${version}.dmg"; + hash = "sha256-GI9aIAYwu60RdjN0Y3O94sVMzJR1+nX4txVcvqn1r58="; + }; + "aarch64-darwin" = fetchurl { + url = "https://www.archimatetool.com/downloads/archi_5.php?/${version}/Archi-Mac-Silicon-${version}.dmg"; + hash = "sha256-Jg+tl902OWSm4GHxF7QXbRU5nxX4/5q6LTGubHWQ08E="; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system"); buildInputs = [ libsecret @@ -34,7 +36,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper wrapGAppsHook - ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + _7zz + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + autoPatchelfHook + ]; + + unpackPhase = if stdenv.hostPlatform.isDarwin then '' + 7zz x $src + '' else null; installPhase = if stdenv.hostPlatform.system == "x86_64-linux" then @@ -55,6 +65,8 @@ stdenv.mkDerivation rec { mv Archi.app "$out/Applications/" ''; + passthru.tests = { inherit (nixosTests) archi; }; + meta = with lib; { description = "ArchiMate modelling toolkit"; longDescription = '' diff --git a/pkgs/tools/misc/bfetch/default.nix b/pkgs/tools/misc/bfetch/default.nix index 107f2cd945285..675a8cb11f382 100644 --- a/pkgs/tools/misc/bfetch/default.nix +++ b/pkgs/tools/misc/bfetch/default.nix @@ -24,6 +24,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/NNBnh/bfetch"; license = licenses.gpl3Only; platforms = platforms.all; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/tools/misc/bootspec/default.nix b/pkgs/tools/misc/bootspec/default.nix index 7bf6bc478d7c0..2ffa6c47ab09e 100644 --- a/pkgs/tools/misc/bootspec/default.nix +++ b/pkgs/tools/misc/bootspec/default.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "bootspec"; @@ -13,6 +14,17 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5IGSMHeL0eKfl7teDejAckYQjc8aeLwfwIQSzQ8YaAg="; }; + patches = [ + # https://github.com/DeterminateSystems/bootspec/pull/127 + # Fixes the synthesize tool for aarch64-linux + (fetchpatch { + name = "aarch64-support.patch"; + url = "https://github.com/DeterminateSystems/bootspec/commit/1d0e925f360f0199f13422fb7541225fd162fd4f.patch"; + sha256 = "sha256-wU/jWnOqVBrU2swANdXbQfzRpNd/JIS4cxSyCvixZM0="; + }) + + ]; + cargoHash = "sha256-eGSKVHjPnHK7WyGkO5LIjocNGHawahYQR3H5Lgk1C9s="; meta = with lib; { diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 8926b9714291e..09a4ef57c69f6 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -78,11 +78,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "251"; + version = "252"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-7oAFxzLLEds9SI14F88QRhirb/3pjXhmGaW0SWUgpv4="; + hash = "sha256-NmYv5htZT2v04vVksIWGuaPI1rXfNmrVSmErT/faBbQ="; }; outputs = [ diff --git a/pkgs/tools/misc/elfcat/default.nix b/pkgs/tools/misc/elfcat/default.nix index 359bd6d3ab932..222470299739e 100644 --- a/pkgs/tools/misc/elfcat/default.nix +++ b/pkgs/tools/misc/elfcat/default.nix @@ -17,6 +17,6 @@ rustPlatform.buildRustPackage rec { description = "ELF visualizer, generates HTML files from ELF binaries."; homepage = "https://github.com/ruslashev/elfcat"; license = licenses.zlib; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 33d26ad06e02f..8639358ebcaf2 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2023.11.0"; + version = "2023.11.1"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-965gjYQmdsx4G4HJdBYx8u1jvAk48fLRP8QXDv1eQLM="; + hash = "sha256-hdSWrKOht1McZxTJtgvy+vqN49bi/P54/D7WDxIRb4w="; }; postPatch = '' diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 19ab5158a65b6..e2457ad63e137 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -6,18 +6,29 @@ tcl.mkTclDerivation rec { src = fetchurl { url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz"; - sha256 = "0d1cp5hggjl93xwc8h1y6adbnrvpkk0ywkd00inz9ndxn21xm9s9"; + hash = "sha256-Safag7C92fRtBKBN7sGcd2e7mjI+QMR4H4nK92C5LDQ="; }; patches = [ (fetchpatch { url = "https://raw.githubusercontent.com/buildroot/buildroot/c05e6aa361a4049eabd8b21eb64a34899ef83fc7/package/expect/0001-enable-cross-compilation.patch"; - sha256 = "1jwx2l1slidvcpahxbyqs942l81jd62rzbxliyd9lwysk38c8b6b"; + hash = "sha256-yyzE0Jjac5qaj7Svn4VpMiAqSNLYrw7VZbtFqgMVncs="; }) (substituteAll { src = ./fix-cross-compilation.patch; tcl = "${buildPackages.tcl}/bin/tclsh"; }) + # The following patches fix compilation with clang 15+ + (fetchpatch { + url = "https://sourceforge.net/p/expect/patches/24/attachment/0001-Add-prototype-to-function-definitions.patch"; + hash = "sha256-X2Vv6VVM3KjmBHo2ukVWe5YTVXRmqe//Kw2kr73OpZs="; + }) + (fetchpatch { + url = "https://sourceforge.net/p/expect/patches/_discuss/thread/b813ca9895/6759/attachment/expect-configure-c99.patch"; + hash = "sha256-PxQQ9roWgVXUoCMxkXEgu+it26ES/JuzHF6oML/nk54="; + }) + # Include `sys/ioctl.h` and `util.h` on Darwin, which are required for `ioctl` and `openpty`. + ./fix-darwin-clang16.patch ]; postPatch = '' diff --git a/pkgs/tools/misc/expect/fix-darwin-clang16.patch b/pkgs/tools/misc/expect/fix-darwin-clang16.patch new file mode 100644 index 0000000000000..9454769c99c8f --- /dev/null +++ b/pkgs/tools/misc/expect/fix-darwin-clang16.patch @@ -0,0 +1,31 @@ +diff -ur a/exp_win.c b/exp_win.c +--- a/exp_win.c 2018-02-02 14:15:52.000000000 -0500 ++++ b/exp_win.c 2023-10-10 07:47:33.082690432 -0400 +@@ -39,7 +39,8 @@ + /* Sigh. On AIX 2.3, termios.h exists but does not define TIOCGWINSZ */ + /* Instead, it has to come from ioctl.h. However, As I said above, this */ + /* can't be cavalierly included on all machines, even when it exists. */ +-#if defined(HAVE_TERMIOS) && !defined(HAVE_TIOCGWINSZ_IN_TERMIOS_H) ++/* Darwin also has termios.h, but it requires ioctl.h for `ioctl`. */ ++#if defined(HAVE_TERMIOS) && (defined(__APPLE__) || !defined(HAVE_TIOCGWINSZ_IN_TERMIOS_H)) + # include <sys/ioctl.h> + #endif + +diff -ur d/pty_termios.c c/pty_termios.c +--- d/pty_termios.c 2023-10-10 07:59:23.244452442 -0400 ++++ c/pty_termios.c 2023-10-10 08:00:35.303231582 -0400 +@@ -7,7 +7,13 @@ + + */ + +-#include <pty.h> /* openpty */ ++/* openpty */ ++#ifdef __APPLE__ ++#include <util.h> ++#else /* pty.h is Linux-specific */ ++#include <pty.h> ++#endif ++ + #include <stdio.h> + #include <signal.h> + diff --git a/pkgs/tools/misc/fetchutils/default.nix b/pkgs/tools/misc/fetchutils/default.nix index e9ee3fba516d4..d1c830f877d63 100644 --- a/pkgs/tools/misc/fetchutils/default.nix +++ b/pkgs/tools/misc/fetchutils/default.nix @@ -24,6 +24,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/lptstr/fetchutils"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/tools/misc/graylog/5.1.nix b/pkgs/tools/misc/graylog/5.1.nix index 3dc849eaeec76..cc033e50fee58 100644 --- a/pkgs/tools/misc/graylog/5.1.nix +++ b/pkgs/tools/misc/graylog/5.1.nix @@ -2,8 +2,8 @@ let buildGraylog = callPackage ./graylog.nix {}; in buildGraylog { - version = "5.1.4"; - sha256 = "sha256-ZuzmNbc+qB6oYCnR5iAsSEQGTB+pk+ghF0/+O3BTLkA="; + version = "5.1.7"; + sha256 = "sha256-OIdDBrLJEXhnQF98F0ncsoYcrH4KtHUz9Di1Jefsi6w="; maintainers = [ lib.maintainers.f2k1de ]; license = lib.licenses.sspl; } diff --git a/pkgs/tools/misc/halp/default.nix b/pkgs/tools/misc/halp/default.nix index d9028a8392a8d..89867fe7a9410 100644 --- a/pkgs/tools/misc/halp/default.nix +++ b/pkgs/tools/misc/halp/default.nix @@ -5,7 +5,6 @@ , stdenv , darwin , unixtools -, rust }: rustPlatform.buildRustPackage rec { @@ -48,7 +47,7 @@ rustPlatform.buildRustPackage rec { postPatch = '' substituteInPlace src/helper/args/mod.rs \ - --subst-var-by releaseDir target/${rust.toRustTargetSpec stdenv.hostPlatform}/$cargoCheckType + --subst-var-by releaseDir target/${stdenv.hostPlatform.rust.rustcTargetSpec}/$cargoCheckType ''; preCheck = '' diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index b6577a17bb195..2636cb71717bb 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -95,6 +95,13 @@ stdenv.mkDerivation rec { else [ "-DHDF4_BUILD_FORTRAN=OFF" ] ); + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=implicit-int" + ]; + }; + doCheck = true; excludedTests = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 39c0b680b0022..89702cfd1a7f1 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -27,7 +27,7 @@ assert !cppSupport || !mpiSupport; let inherit (lib) optional optionals; in stdenv.mkDerivation rec { - version = "1.14.2"; + version = "1.14.3"; pname = "hdf5" + lib.optionalString cppSupport "-cpp" + lib.optionalString fortranSupport "-fortran" @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { majorMinorPatch = with lib.versions; "${major version}.${minor version}.${patch version}"; in "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${majorMinor}/hdf5-${majorMinorPatch}/src/hdf5-${version}.tar.bz2"; - sha256 = "sha256-6jxeJX7zIq9ed/weUurTrWvzu0rAZIDdF+45ANeiTPs="; + sha256 = "sha256-lCXyJO110SgLtG1vJpI92Tj5BA5+rr9X5m7HNXwI+Rc="; }; passthru = { diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix index b396de5002d95..c8ce33207787a 100644 --- a/pkgs/tools/misc/mmv/default.nix +++ b/pkgs/tools/misc/mmv/default.nix @@ -20,6 +20,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gengetopt m4 git gnupg perl autoconf automake help2man pkg-config ]; buildInputs = [ boehmgc ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=implicit-int" + ]; + }; + meta = { homepage = "https://github.com/rrthomas/mmv"; description = "Utility for wildcard renaming, copying, etc"; diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix index 039e9acb2e8e9..dc7fe1627a1ce 100644 --- a/pkgs/tools/misc/plantuml-server/default.nix +++ b/pkgs/tools/misc/plantuml-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, nixosTests }: let version = "1.2023.12"; @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { cp "$src" "$out/webapps/plantuml.war" ''; + passthru.tests = { + inherit (nixosTests) plantuml-server; + }; + meta = with lib; { description = "A web application to generate UML diagrams on-the-fly."; homepage = "https://plantuml.com/"; diff --git a/pkgs/tools/misc/qflipper/default.nix b/pkgs/tools/misc/qflipper/default.nix index 86043f7b0ba45..5c139d017c864 100644 --- a/pkgs/tools/misc/qflipper/default.nix +++ b/pkgs/tools/misc/qflipper/default.nix @@ -24,8 +24,8 @@ }: let pname = "qFlipper"; - version = "1.3.2"; - sha256 = "sha256-n/vvLR4p7ZmQC+FuYOvarmgydfYwxRBRktzs7CfiNQg="; + version = "1.3.3"; + sha256 = "sha256-/Xzy+OA0Nl/UlSkOOZW2YsOHdJvS/7X3Z3ITkPByAOc="; timestamp = "99999999999"; commit = "nix-${version}"; diff --git a/pkgs/tools/misc/sacad/default.nix b/pkgs/tools/misc/sacad/default.nix index aca6e18e372c8..5aa6adf768a2a 100644 --- a/pkgs/tools/misc/sacad/default.nix +++ b/pkgs/tools/misc/sacad/default.nix @@ -34,6 +34,6 @@ python3Packages.buildPythonApplication rec { description = "Smart Automatic Cover Art Downloader"; homepage = "https://github.com/desbma/sacad"; license = licenses.mpl20; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/tools/misc/shim/default.nix b/pkgs/tools/misc/shim/default.nix index 1615a6d8c794a..0989a37454ca7 100644 --- a/pkgs/tools/misc/shim/default.nix +++ b/pkgs/tools/misc/shim/default.nix @@ -3,7 +3,7 @@ let - inherit (stdenv.targetPlatform) system; + inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; target = { diff --git a/pkgs/tools/misc/tailspin/default.nix b/pkgs/tools/misc/tailspin/default.nix index 7d9693e41d69b..f6360061a5be7 100644 --- a/pkgs/tools/misc/tailspin/default.nix +++ b/pkgs/tools/misc/tailspin/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "tailspin"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "bensadeh"; repo = "tailspin"; - rev = "refs/tags/${version}"; - hash = "sha256-NGPwdTkgzowdchUjuoJ9iVrkmAjXvyijHmUfb5cAUKY="; + rev = version; + hash = "sha256-WsQpMmFTlAPg+9uEecMKfpys29cQ642IZ8yvsPxmCfo="; }; - cargoHash = "sha256-Pi8JiToF56a6zaUpGTAF6Bw8W8elSzLQimfMDua83Nk="; + cargoHash = "sha256-sttQ8fGRGdq7nDiG3/z/YEg2NA+miTwahGNv3yNnnds="; meta = with lib; { description = "A log file highlighter"; diff --git a/pkgs/tools/misc/vector/Cargo.lock b/pkgs/tools/misc/vector/Cargo.lock index c3cb420f5fea8..d5b347bb41551 100644 --- a/pkgs/tools/misc/vector/Cargo.lock +++ b/pkgs/tools/misc/vector/Cargo.lock @@ -9864,7 +9864,7 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "vector" -version = "0.34.0" +version = "0.34.1" dependencies = [ "apache-avro", "approx", diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 7c4afb16ebca7..fe58e934f55f5 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -27,14 +27,14 @@ # the second feature flag is passed to the rdkafka dependency # building on linux fails without this feature flag (both x86_64 and AArch64) ++ lib.optionals enableKafka [ "rdkafka?/gssapi-vendored" ] - ++ lib.optional stdenv.targetPlatform.isUnix "unix") + ++ lib.optional stdenv.hostPlatform.isUnix "unix") , nixosTests , nix-update-script }: let pname = "vector"; - version = "0.34.0"; + version = "0.34.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - hash = "sha256-E9sbpVFDVKJKYqSiqXeC9AItset/bXvVA9mURazTn/I="; + hash = "sha256-vK+k+VbUVgJ8idlvuod5ExAkkeTYDk/135dyLRct0zs="; }; cargoLock = { diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index fc87723208ede..eb1e7c5b01b79 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation rec { chmod a+x $out/bin/xvfb-run patchShebangs $out/bin/xvfb-run wrapProgram $out/bin/xvfb-run \ - --set FONTCONFIG_FILE "${fontsConf}" \ + --set-default FONTCONFIG_FILE "${fontsConf}" \ --prefix PATH : ${lib.makeBinPath [ getopt xorgserver xauth which util-linux gawk coreutils ]} ''; diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 29426eef06e4c..094cc8733bdcd 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, autoreconfHook , gnutls, c-ares, libxml2, sqlite, zlib, libssh2 , cppunit, sphinx , Security diff --git a/pkgs/tools/networking/configurable-http-proxy/default.nix b/pkgs/tools/networking/configurable-http-proxy/default.nix index 34cf5307038d9..74d009d3ed1a6 100644 --- a/pkgs/tools/networking/configurable-http-proxy/default.nix +++ b/pkgs/tools/networking/configurable-http-proxy/default.nix @@ -24,6 +24,5 @@ buildNpmPackage rec { homepage = "https://github.com/jupyterhub/configurable-http-proxy"; license = lib.licenses.bsd3; mainProgram = "configurable-http-proxy"; - maintainers = with lib.maintainers; [ ixxie ]; }; } diff --git a/pkgs/tools/networking/containerlab/default.nix b/pkgs/tools/networking/containerlab/default.nix index 0a8b02af7cf5e..856a21cb9679b 100644 --- a/pkgs/tools/networking/containerlab/default.nix +++ b/pkgs/tools/networking/containerlab/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "containerlab"; - version = "0.46.2"; + version = "0.48.1"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-TzHTiAcN57FDdKBkZq5YwFwjP3s6OmN3431XGoMgnwI="; + hash = "sha256-k166J9algbbwGMG65Sr0sshwhLwo5M7JDtGnG4AKZJM="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-3ALEwpFDnbSoTm3bxHZmRGkw1DeQ4Ikl6PpTosa1S6E="; + vendorHash = "sha256-w5lwZTSG6OI85P/swjK3NtovMqfgttr9DC+CPSKlpKQ="; ldflags = [ "-s" @@ -41,6 +41,6 @@ buildGoModule rec { changelog = "https://github.com/srl-labs/containerlab/releases/tag/${src.rev}"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ aaronjheng ]; }; } diff --git a/pkgs/tools/networking/crackle/default.nix b/pkgs/tools/networking/crackle/default.nix index 00d0acd2aa94c..ea42e7a0b3208 100644 --- a/pkgs/tools/networking/crackle/default.nix +++ b/pkgs/tools/networking/crackle/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Crack and decrypt BLE encryption"; homepage = "https://github.com/mikeryan/crackle"; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; license = licenses.bsd2; }; } diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index c99f09e7f93a0..48bf59e252661 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, perl, nixosTests +{ lib, stdenv, fetchurl, darwin, pkg-config, perl, nixosTests , brotliSupport ? false, brotli , c-aresSupport ? false, c-aresMinimal , gnutlsSupport ? false, gnutls @@ -57,10 +57,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-FsYqnErw9wPSi9pte783ukcFWtNBTXDexj4uYzbyqC0="; }; - patches = [ - ./7.79.1-darwin-no-systemconfiguration.patch - ]; - outputs = [ "bin" "dev" "out" "man" "devdoc" ]; separateDebugInfo = stdenv.isLinux; @@ -90,7 +86,12 @@ stdenv.mkDerivation (finalAttrs: { optional wolfsslSupport wolfssl ++ optional rustlsSupport rustls-ffi ++ optional zlibSupport zlib ++ - optional zstdSupport zstd; + optional zstdSupport zstd ++ + optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + CoreFoundation + CoreServices + SystemConfiguration + ]); # for the second line see https://curl.haxx.se/mail/tracker-2014-03/0087.html preConfigure = '' diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index b23753e204126..43d2124d682b3 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, nettle -, libidn, libnetfilter_conntrack, buildPackages +, libidn, libnetfilter_conntrack, nftables, buildPackages , dbusSupport ? stdenv.isLinux , dbus , nixosTests @@ -13,6 +13,7 @@ let "-DHAVE_DBUS" ] ++ lib.optionals stdenv.isLinux [ "-DHAVE_CONNTRACK" + "-DHAVE_NFTSET" ]); in stdenv.mkDerivation rec { @@ -75,7 +76,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ nettle libidn ] ++ lib.optionals dbusSupport [ dbus ] - ++ lib.optionals stdenv.isLinux [ libnetfilter_conntrack ]; + ++ lib.optionals stdenv.isLinux [ libnetfilter_conntrack nftables ]; passthru.tests = { prometheus-exporter = nixosTests.prometheus-exporters.dnsmasq; diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index e4eb2eeaac41f..9b1723a4d122a 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -34,6 +34,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ help2man perl /* for `whois' */ ]; buildInputs = [ ncurses /* for `talk' */ libxcrypt ]; + env = lib.optionalAttrs stdenv.isDarwin { + # This is a temporary workaround for missing headers in the 10.12 SDK to avoid a mass rebuild. + # A commit to revert this change will be included in the fix PR targeting staging. + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + # Don't use help2man if cross-compiling # https://lists.gnu.org/archive/html/bug-sed/2017-01/msg00001.html # https://git.congatec.com/yocto/meta-openembedded/blob/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb#L44 diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index aaa26a38c3ae4..637214809d41e 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { hardeningDisable = lib.optional stdenv.isDarwin "format"; + env = lib.optionalAttrs stdenv.isDarwin { + # Required to build with clang 16 or `configure` will fail to detect several standard functions. + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + configureFlags = [ "--with-openssl" "--with-readline=${readline.dev}" diff --git a/pkgs/tools/networking/mdk4/default.nix b/pkgs/tools/networking/mdk4/default.nix index 903504633ac8f..979584db432d7 100644 --- a/pkgs/tools/networking/mdk4/default.nix +++ b/pkgs/tools/networking/mdk4/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A tool that injects data into wireless networks"; homepage = "https://github.com/aircrack-ng/mdk4"; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 9f928224ca7eb..5490977df12d0 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -57,11 +57,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.44.0"; + version = "1.44.2"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-7coJY30YL4BrOxLYxWI9e629c8zKGuY74g0vKYd5+58="; + sha256 = "sha256-S1i/OsV+LO+1ZS79CUXrC0vDamPZKmGrRx2LssmkIOE="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; diff --git a/pkgs/tools/networking/redfang/default.nix b/pkgs/tools/networking/redfang/default.nix index 8e799b7d41fd3..a4ba12b29489d 100644 --- a/pkgs/tools/networking/redfang/default.nix +++ b/pkgs/tools/networking/redfang/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { description = "A small proof-of-concept application to find non discoverable bluetooth devices"; homepage = "https://gitlab.com/kalilinux/packages/redfang"; license = licenses.gpl2Only; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/tools/networking/rosenpass/default.nix b/pkgs/tools/networking/rosenpass/default.nix index 9467904fe6983..790d1d9cecdf0 100644 --- a/pkgs/tools/networking/rosenpass/default.nix +++ b/pkgs/tools/networking/rosenpass/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nixosTests , rustPlatform -, targetPlatform +, hostPlatform , installShellFiles , cmake , libsodium @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { # nix defaults to building for aarch64 _without_ the armv8-a # crypto extensions, but liboqs depends on these - preBuild = lib.optionalString targetPlatform.isAarch64 '' + preBuild = lib.optionalString hostPlatform.isAarch64 '' NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -march=armv8-a+crypto" ''; diff --git a/pkgs/tools/networking/stevenblack-blocklist/default.nix b/pkgs/tools/networking/stevenblack-blocklist/default.nix index 8a71f6d99fd40..6c690fe4064e7 100644 --- a/pkgs/tools/networking/stevenblack-blocklist/default.nix +++ b/pkgs/tools/networking/stevenblack-blocklist/default.nix @@ -15,6 +15,6 @@ fetchFromGitHub { description = "Unified hosts file with base extensions"; homepage = "https://github.com/StevenBlack/hosts"; license = licenses.mit; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/tools/package-management/ciel/default.nix b/pkgs/tools/package-management/ciel/default.nix index 7ccd34c665dc1..d6040c4a07632 100644 --- a/pkgs/tools/package-management/ciel/default.nix +++ b/pkgs/tools/package-management/ciel/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { # FIXME: remove this patch after https://github.com/AOSC-Dev/ciel-rs/pull/16 is merged (fetchpatch { name = "use-canonicalize-path-to-find-libexec.patch"; - url = "https://github.com/AOSC-Dev/ciel-rs/pull/16.patch"; + url = "https://github.com/AOSC-Dev/ciel-rs/commit/17f41538ed1057e855540f5abef7faf6ea4abf5c.patch"; sha256 = "sha256-ELK2KpOuoBS774apomUIo8q1eXYs/FX895G7eBdgOQg="; }) ]; diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index 755286ec87054..20d5c3105e97c 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -37,6 +37,7 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/Mic92/nix-update/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ figsoda mic92 zowoq ]; + mainProgram = "nix-update"; platforms = platforms.all; }; } diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix index c948c66b47f12..07aa1a7accc15 100644 --- a/pkgs/tools/package-management/xbps/default.nix +++ b/pkgs/tools/package-management/xbps/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, which, zlib, openssl, libarchive }: +{ lib, stdenv, fetchFromGitHub, pkg-config, which, zlib, openssl, libarchive }: stdenv.mkDerivation rec { pname = "xbps"; - version = "0.59.1"; + version = "0.59.2"; src = fetchFromGitHub { owner = "void-linux"; repo = "xbps"; rev = version; - sha256 = "0pab3xf97y4wqlyrb92zxd3cfsrbnlx6pssbw4brgwcxccw9jrhy"; + hash = "sha256-3+LzFLDZ1zfRPBETMlpEn66zsfHRHQLlgeZPdMtmA14="; }; nativeBuildInputs = [ pkg-config which ]; @@ -17,16 +17,17 @@ stdenv.mkDerivation rec { patches = [ ./cert-paths.patch - # fix openssl 3 - (fetchpatch { - url = "https://github.com/void-linux/xbps/commit/db1766986c4389eb7e17c0e0076971b711617ef9.patch"; - hash = "sha256-CmyZdsHStPsELdEgeJBWIbXIuVeBhv7VYb2uGYxzUWQ="; - }) ]; env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=deprecated-declarations"; postPatch = '' + # _BSD_SOURCE causes cpp warning + # https://github.com/void-linux/xbps/issues/576 + substituteInPlace bin/xbps-fbulk/main.c lib/util.c lib/external/dewey.c lib/external/fexec.c \ + --replace 'define _BSD_SOURCE' 'define _DEFAULT_SOURCE' \ + --replace '# define _BSD_SOURCE' '#define _DEFAULT_SOURCE' + # fix unprefixed ranlib (needed on cross) substituteInPlace lib/Makefile \ --replace 'SILENT}ranlib ' 'SILENT}$(RANLIB) ' diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 2add249ed821c..f3c836fd38600 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -174,5 +174,6 @@ in buildNpmPackage rec { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ amarshall kiwi ]; platforms = [ "x86_64-linux" ]; + mainProgram = "bitwarden"; }; } diff --git a/pkgs/tools/security/certmgr/default.nix b/pkgs/tools/security/certmgr/default.nix index e2318c853f112..da62e7d0568eb 100644 --- a/pkgs/tools/security/certmgr/default.nix +++ b/pkgs/tools/security/certmgr/default.nix @@ -35,7 +35,9 @@ in # TODO: remove patch when PR is merged. patches = [ (fetchpatch { - url = "https://github.com/cloudflare/certmgr/pull/51.patch"; + # https://github.com/cloudflare/certmgr/pull/51 + name = "cloudflare-certmgr-pull-51.patch"; + url = "https://github.com/cloudflare/certmgr/compare/232e0adf8379db28ab74c46e0dd3eddb3cd8f2ea...55c595a4a2dc871726b3c8337469daf5597718a3.patch"; sha256 = "0jhsw159d2mgybvbbn6pmvj4yqr5cwcal5fjwkcn9m4f4zlb6qrs"; }) ]; diff --git a/pkgs/tools/security/chain-bench/default.nix b/pkgs/tools/security/chain-bench/default.nix index fef69399cc142..e123cf30b43ff 100644 --- a/pkgs/tools/security/chain-bench/default.nix +++ b/pkgs/tools/security/chain-bench/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "chain-bench"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vQzxTOShxQGitZRCuR8izSxCkZdPWm2ohoXBOvAkwfw="; + sha256 = "sha256-eNCQbmqTnCBBwrppFL2yvmiwgj439sosYVkk2ryMa0I="; }; vendorHash = "sha256-sAZIMJRx/E+l12Zyp/vKfuiaCMeaonRbEcsRIRXbXm8="; diff --git a/pkgs/tools/security/enpass/data.json b/pkgs/tools/security/enpass/data.json index dc6ef20497235..bcb086410723d 100644 --- a/pkgs/tools/security/enpass/data.json +++ b/pkgs/tools/security/enpass/data.json @@ -1,8 +1,8 @@ { "amd64": { - "path": "pool/main/e/enpass/enpass_6.9.0.1467_amd64.deb", - "sha256": "fe405f7119d45822164da3ad009b99c5cd516685198c1d335b7803d84e5ba2ca", - "version": "6.9.0.1467" + "path": "pool/main/e/enpass/enpass_6.9.2.1563_amd64.deb", + "sha256": "013a6ecab29ad6b1a91203fea3cd771d039d777ea24c03d0a74ec5aa86b720ff", + "version": "6.9.2.1563" }, "i386": { "path": "pool/main/e/enpass/enpass_5.6.9_i386.deb", diff --git a/pkgs/tools/security/ibm-sw-tpm2/default.nix b/pkgs/tools/security/ibm-sw-tpm2/default.nix index 012d492aacad6..de260e0682490 100644 --- a/pkgs/tools/security/ibm-sw-tpm2/default.nix +++ b/pkgs/tools/security/ibm-sw-tpm2/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, lib, openssl }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, openssl +}: stdenv.mkDerivation rec { pname = "ibm-sw-tpm2"; @@ -9,6 +14,18 @@ stdenv.mkDerivation rec { hash = "sha256-PLZC+HGheyPVCwRuX5X0ScIodBX8HnrrS9u4kg28s48="; }; + patches = [ + # Backport openssl-3.1 from development branch. + # Can be removed with next release. + (fetchpatch { + name = "openssl-3.1.patch"; + url = "https://github.com/kgoldman/ibmswtpm2/commit/15501bf4973d334ca9420fa2fb0f0fe1800871e0.patch"; + includes = [ "TpmToOsslMath.h" ]; + stripLen = 1; + hash = "sha256-8TwyZVy8pQwq5Fl8cy9xJWtdckwL+QK0+DL5EHDLYUY="; + }) + ]; + buildInputs = [ openssl ]; sourceRoot = "src"; diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 478cca8be0e2f..a4ae25715c3fe 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -8,7 +8,7 @@ , python3 , dbus , polkit -, systemdMinimal +, systemdLibs , IOKit , pname ? "pcsclite" , polkitSupport ? false @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config perl ]; buildInputs = [ python3 ] - ++ lib.optionals stdenv.isLinux [ systemdMinimal ] + ++ lib.optionals stdenv.isLinux [ systemdLibs ] ++ lib.optionals stdenv.isDarwin [ IOKit ] ++ lib.optionals polkitSupport [ dbus polkit ]; diff --git a/pkgs/tools/security/sequoia-sqop/default.nix b/pkgs/tools/security/sequoia-sqop/default.nix index fdefbdea9e503..19dd99b871b0e 100644 --- a/pkgs/tools/security/sequoia-sqop/default.nix +++ b/pkgs/tools/security/sequoia-sqop/default.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { pname = "sequoia-sqop"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage rec { # generated etc repo = "sequoia-sop"; rev = "v${version}"; - hash = "sha256-2fRlHkT2jhUp1dIqKe8r7ktSbgudCmzuiiyF0WcbYIE="; + hash = "sha256-qGSVmjLdx84YphAXt1MRF1cIfk7xLOvtUj+3e7vO+jA="; }; - cargoHash = "sha256-/LLW0AHCgqi2pAOkhZXNGlmNF/+u0TmSstd/B6mDr6M="; + cargoHash = "sha256-y4n6UPAYwI9P+jw59TOf98xSdNvzEgJp5n/GtiixsIU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/system/which/default.nix b/pkgs/tools/system/which/default.nix index 82316541f4c73..831791a2f8be6 100644 --- a/pkgs/tools/system/which/default.nix +++ b/pkgs/tools/system/which/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/which/which-${version}.tar.gz"; - sha256 = "1bgafvy3ypbhhfznwjv1lxmd6mci3x1byilnnkc7gcr486wlb8pl"; + hash = "sha256-9KJFuUEks3fYtJZGv0IfkVXTaqdhS26/g3BdP/x26q0="; }; strictDeps = true; @@ -19,10 +19,11 @@ stdenv.mkDerivation rec { lib.optional stdenv.hostPlatform.is32bit "-D_FILE_OFFSET_BITS=64" ); - meta = with lib; { + meta = { homepage = "https://www.gnu.org/software/which/"; description = "Shows the full path of (shell) commands"; - platforms = platforms.all; - license = licenses.gpl3; + license = lib.licenses.gpl3Plus; + mainProgram = "which"; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/system/zram-generator/default.nix b/pkgs/tools/system/zram-generator/default.nix index 81bf4082d5c14..3d55d7c19613e 100644 --- a/pkgs/tools/system/zram-generator/default.nix +++ b/pkgs/tools/system/zram-generator/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, rust , rustPlatform , pkg-config , ronn @@ -28,7 +27,7 @@ rustPlatform.buildRustPackage rec { postPatch = '' cp ${./Cargo.lock} Cargo.lock substituteInPlace Makefile \ - --replace 'target/$(BUILDTYPE)' 'target/${rust.toRustTargetSpec stdenv.hostPlatform}/$(BUILDTYPE)' + --replace 'target/$(BUILDTYPE)' 'target/${stdenv.hostPlatform.rust.rustcTargetSpec}/$(BUILDTYPE)' substituteInPlace src/generator.rs \ --replace 'Command::new("systemd-detect-virt")' 'Command::new("${systemd}/bin/systemd-detect-virt")' \ --replace 'Command::new("modprobe")' 'Command::new("${kmod}/bin/modprobe")' diff --git a/pkgs/tools/text/html2text/default.nix b/pkgs/tools/text/html2text/default.nix index fff3e44baf694..7ef802e925fb5 100644 --- a/pkgs/tools/text/html2text/default.nix +++ b/pkgs/tools/text/html2text/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { substituteInPlace configure \ --replace /bin/echo echo \ --replace CXX=unknown ':' + '' + lib.optionalString stdenv.cc.isClang '' + substituteInPlace HTMLParser.C \ + --replace "register " "" ''; # the --prefix has no effect diff --git a/pkgs/tools/text/mecab/base.nix b/pkgs/tools/text/mecab/base.nix index 572ec28c07500..ea572104238c8 100644 --- a/pkgs/tools/text/mecab/base.nix +++ b/pkgs/tools/text/mecab/base.nix @@ -15,5 +15,9 @@ finalAttrs: { "--with-charset=utf8" ]; + # mecab uses several features that have been removed in C++17. + # Force the language mode to C++14, so that it can compile with clang 16. + makeFlags = [ "CXXFLAGS=-std=c++14" ]; + doCheck = true; } diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index c8a775e644591..d20b3692f31c3 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -14,16 +14,24 @@ stdenv.mkDerivation rec { patches = [ # gcc-11 compat upstream patch (fetchpatch { - url = "http://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=904949c9026cb772dc93fbe0947a252ef47127f4"; - sha256 = "1wnj0jmkmrwjww7qk9dvfxh8h06jdn7mi8v2fvwh95b6x87z5l47"; + url = "https://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=904949c9026cb772dc93fbe0947a252ef47127f4"; + hash = "sha256-h9DyD+pmlQT5dmKjWI9t0gCIYHe7pYkP55LnOqsE0vI="; excludes = [ "ChangeLog" ]; }) # Upstream fix for clang-13 and gcc-12 test support (fetchpatch { name = "gcc-12.patch"; - url = "http://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=ab9fe5cb9b85c5afab94f2a7f4b6d7d473c14ee9"; - sha256 = "1v33zd2766k7cdgmajw2lffw9wd7v4f8z01f40z53f6bp608nr62"; + url = "https://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=ab9fe5cb9b85c5afab94f2a7f4b6d7d473c14ee9"; + hash = "sha256-wmSLgLnLuFE+IC6AjxzZp/HEnaOCS1VfY2cac0T7Y+w="; + }) + ] ++ lib.optionals stdenv.cc.isClang [ + # Adds compatibility with C++17 by removing the `register` storage class specifier. + (fetchpatch { + name = "remove-register-keyword"; + url = "https://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=416b39758dba2c74515584514a959ad1b0ad50d1"; + hash = "sha256-R5A7IGHhU82EqceMCsuNBanhRz4dFVqiaH8637dr7jw="; + includes = [ "lib/*" ]; }) ]; diff --git a/pkgs/tools/typesetting/tex/blahtexml/default.nix b/pkgs/tools/typesetting/tex/blahtexml/default.nix index ce071c7006f25..43981eb2ae92d 100644 --- a/pkgs/tools/typesetting/tex/blahtexml/default.nix +++ b/pkgs/tools/typesetting/tex/blahtexml/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { hash = "sha256-DL5DyfARHHbwWBVHSa/VwHzNaAx/v7EDdnw1GLOk+y0="; }; + postPatch = lib.optionalString stdenv.cc.isClang '' + substituteInPlace makefile \ + --replace "\$(CXX)" "\$(CXX) -std=c++98" + ''; + outputs = [ "out" "doc" ]; nativeBuildInputs = [ texliveFull ]; # scheme-full needed for ucs package diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 402c0c247e958..2d7f859c809cd 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -310,12 +310,21 @@ chktex = stdenv.mkDerivation { }; -dvisvgm = stdenv.mkDerivation rec { +dvisvgm = stdenv.mkDerivation { pname = "texlive-dvisvgm.bin"; inherit version; inherit (common) src; + patches = [ + (fetchpatch { + url = "https://github.com/mgieseki/dvisvgm/commit/629544928877362d0c6d64f20695f7df3073c5eb.patch"; + stripLen = 1; + extraPrefix = "texk/dvisvgm/dvisvgm-src/"; + hash = "sha256-CBCbc/woaFeLw7aBG/kSVYc3a5Q56zbAB64kK6mRy4g="; + }) + ]; + preConfigure = "cd texk/dvisvgm"; configureFlags = common.configureFlags diff --git a/pkgs/tools/video/blackmagic-desktop-video/default.nix b/pkgs/tools/video/blackmagic-desktop-video/default.nix index dc6f2eff78732..435db1221eab2 100644 --- a/pkgs/tools/video/blackmagic-desktop-video/default.nix +++ b/pkgs/tools/video/blackmagic-desktop-video/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { SITEURL = "https://www.blackmagicdesign.com/api/register/us/download/${DOWNLOADID}"; USERAGENT = builtins.concatStringsSep " " [ - "User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.targetPlatform.linuxArch})" + "User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.hostPlatform.linuxArch})" "AppleWebKit/537.36 (KHTML, like Gecko)" "Chrome/77.0.3865.75" "Safari/537.36" diff --git a/pkgs/tools/video/go2rtc/default.nix b/pkgs/tools/video/go2rtc/default.nix index 3fde1c8a7671d..9b0f9bbe3f705 100644 --- a/pkgs/tools/video/go2rtc/default.nix +++ b/pkgs/tools/video/go2rtc/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go2rtc"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "AlexxIT"; repo = "go2rtc"; rev = "refs/tags/v${version}"; - hash = "sha256-h63Z6y0dMZQaNvnx3fzd/sA2K7cO5h6wHpMkbQVfHLA="; + hash = "sha256-3cWhASwOgSovApNT/MUbhHhmp/o4k3ckgfcSFwJJqI8="; }; - vendorHash = "sha256-GRjadpgIryeMhWfmdzSWKH694cgDp9lfD0RRjuPrYqE="; + vendorHash = "sha256-SV4sMDgUv6Ci0aC7wsam7ftqMSpFwsMGkC9qLpR+O68="; buildFlagArrays = [ "-trimpath" diff --git a/pkgs/tools/video/mjpegtools/c++-17-fixes.patch b/pkgs/tools/video/mjpegtools/c++-17-fixes.patch new file mode 100644 index 0000000000000..018cc7e9beabd --- /dev/null +++ b/pkgs/tools/video/mjpegtools/c++-17-fixes.patch @@ -0,0 +1,44 @@ +diff -ur a/mplex/main.cpp b/mplex/main.cpp +--- a/mplex/main.cpp 2021-09-05 02:14:13.029372000 -0400 ++++ b/mplex/main.cpp 2023-09-23 08:47:07.683450627 -0400 +@@ -50,7 +50,7 @@ + #include "multiplexor.hpp" + + +-using std::auto_ptr; ++using std::unique_ptr; + + + /************************************************************************* +@@ -138,7 +138,7 @@ + void + FileOutputStream::NextSegment( ) + { +- auto_ptr<char> prev_filename_buf( new char[strlen(cur_filename)+1] ); ++ unique_ptr<char> prev_filename_buf( new char[strlen(cur_filename)+1] ); + char *prev_filename = prev_filename_buf.get(); + fclose(strm); + ++segment_num; +diff -ur a/utils/fastintfns.h b/utils/fastintfns.h +--- a/utils/fastintfns.h 2021-09-05 02:14:13.033372000 -0400 ++++ b/utils/fastintfns.h 2023-09-23 08:44:40.147112973 -0400 +@@ -2,12 +2,17 @@ + * + * WARNING: Assumes 2's complement arithmetic. + */ +-static inline int intmax( register int x, register int y ) ++#ifdef __cplusplus ++#define REGISTER ++#else ++#define REGISTER register ++#endif ++static inline int intmax( REGISTER int x, REGISTER int y ) + { + return x < y ? y : x; + } + +-static inline int intmin( register int x, register int y ) ++static inline int intmin( REGISTER int x, REGISTER int y ) + { + return x < y ? x : y; + } diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index 675dfc109de13..f231d6ed184da 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-sYBTbX2ZYLBeACOhl7ANyxAJKaSaq3HRnVX0obIQ9Jo="; }; + # Clang 16 defaults to C++17. `std::auto_ptr` has been removed from C++17, and the + # `register` type class specifier is no longer allowed. + patches = [ ./c++-17-fixes.patch ]; + hardeningDisable = [ "format" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index 70e95cb4f0166..146ff6072544d 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -13,10 +13,7 @@ , buildPackages }: -let - rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; - -in rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "rav1e"; version = "0.6.6"; @@ -47,11 +44,11 @@ in rustPlatform.buildRustPackage rec { checkType = "debug"; postBuild = '' - ${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} ''; postInstall = '' - ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} ''; meta = with lib; { diff --git a/pkgs/tools/wayland/chayang/default.nix b/pkgs/tools/wayland/chayang/default.nix index ccfba6a0cf020..30780ed90a8b0 100644 --- a/pkgs/tools/wayland/chayang/default.nix +++ b/pkgs/tools/wayland/chayang/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - pkgsBuildBuild = [ + depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 69ff0e39f6f12..5b096430c1e5f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -161,7 +161,6 @@ mapAliases ({ cvs_fast_export = cvs-fast-export; # Added 2021-06-10 # these are for convenience, not for backward compat and shouldn't expire - clang5Stdenv = lowPrio llvmPackages_5.stdenv; clang6Stdenv = lowPrio llvmPackages_6.stdenv; clang7Stdenv = lowPrio llvmPackages_7.stdenv; clang8Stdenv = lowPrio llvmPackages_8.stdenv; @@ -452,6 +451,7 @@ mapAliases ({ libbencodetools = bencodetools; # Added 2022-07-30 libbpf_1 = libbpf; # Added 2022-12-06 libcap_pam = throw "'libcap_pam' has been replaced with 'libcap'"; # Converted to throw 2023-09-10 + libclc = llvmPackages_latest.libclc; # Added 2023-10-28 libgme = game-music-emu; # Added 2022-07-20 libgpgerror = libgpg-error; # Added 2021-09-04 libheimdal = heimdal; # Added 2022-11-18 @@ -727,6 +727,9 @@ mapAliases ({ prometheus-speedtest-exporter = throw "prometheus-speedtest-exporter was removed as unmaintained"; # Added 2023-07-31 protobuf3_17 = throw "protobuf3_17 does not receive updates anymore and has been removed"; # Added 2023-05-21 protobuf3_19 = throw "protobuf3_19 does not receive updates anymore and has been removed"; # Added 2023-10-01 + protobuf3_24 = protobuf_24; + protobuf3_23 = protobuf_23; + protobuf3_21 = protobuf_21; protonup = protonup-ng; # Added 2022-11-06 proxmark3-rrg = proxmark3; # Added 2023-07-25 proxmark3-unstable = throw "removed in favor of rfidresearchgroup fork"; # Added 2023-07-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index caef0bfaf5b10..7fb9cdafdd724 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -778,7 +778,7 @@ with pkgs; protoc-gen-go-vtproto = callPackage ../development/tools/protoc-gen-go-vtproto { }; protoc-gen-grpc-web = callPackage ../development/tools/protoc-gen-grpc-web { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; protoc-gen-connect-go = callPackage ../development/tools/protoc-gen-connect-go { }; @@ -1102,7 +1102,7 @@ with pkgs; antlr = antlr4_10; boost = boost177; # Configure checks for specific version. icu = icu69; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix { @@ -1111,7 +1111,7 @@ with pkgs; antlr = antlr4_10; boost = boost177; # Configure checks for specific version. icu = icu69; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; broadlink-cli = callPackage ../tools/misc/broadlink-cli { }; @@ -2700,7 +2700,7 @@ with pkgs; gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { }; goldberg-emu = callPackage ../applications/emulators/goldberg-emu { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; gopsuinfo = callPackage ../tools/system/gopsuinfo { }; @@ -2865,7 +2865,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) CoreBluetooth ForceFeedback IOBluetooth IOKit OpenGL VideoToolbox; inherit (darwin) moltenvk; stdenv = - if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv + if stdenv.isDarwin then overrideLibcxx darwin.apple_sdk_11_0.llvmPackages_16.stdenv else stdenv; }; @@ -4180,7 +4180,7 @@ with pkgs; amoco = callPackage ../tools/security/amoco { }; anbox = callPackage ../os-specific/linux/anbox { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; androidenv = callPackage ../development/mobile/androidenv { }; @@ -4732,7 +4732,7 @@ with pkgs; common-licenses = callPackage ../data/misc/common-licenses { }; compactor = callPackage ../applications/networking/compactor { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; consul = callPackage ../servers/consul { }; @@ -5543,7 +5543,7 @@ with pkgs; ghdorker = callPackage ../tools/security/ghdorker { }; ghidra = darwin.apple_sdk_11_0.callPackage ../tools/security/ghidra/build.nix { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; ghidra-bin = callPackage ../tools/security/ghidra { }; @@ -5781,7 +5781,9 @@ with pkgs; joystickwake = callPackage ../tools/games/joystickwake { }; - juce = darwin.apple_sdk_11_0.callPackage ../development/misc/juce { }; + juce = callPackage ../development/misc/juce { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; jumppad = callPackage ../tools/virtualization/jumppad { }; @@ -5979,10 +5981,6 @@ with pkgs; merriweather-sans = callPackage ../data/fonts/merriweather-sans { }; - meson = callPackage ../development/tools/build-managers/meson { - inherit (darwin.apple_sdk.frameworks) Foundation OpenGL AppKit Cocoa; - }; - # while building documentation meson may want to run binaries for host # which needs an emulator # example of an error which this fixes @@ -6002,7 +6000,7 @@ with pkgs; # outer level, but not its outPath can still be evaluated if the condition # doesn't hold. This ensures that splicing still can work correctly. (if (!stdenv.hostPlatform.canExecute stdenv.targetPlatform) then - ../development/tools/build-managers/meson/emulator-hook.sh + ../by-name/me/meson/emulator-hook.sh else throw "mesonEmulatorHook may only be added to nativeBuildInputs when the target binaries can't be executed; however you are attempting to use it in a situation where ${stdenv.hostPlatform.config} can execute ${stdenv.targetPlatform.config}. Consider only adding mesonEmulatorHook according to a conditional based canExecute in your package expression."); @@ -6793,6 +6791,7 @@ with pkgs; cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; cdrtools = callPackage ../tools/cd-dvd/cdrtools { + stdenv = if stdenv.isDarwin then overrideLibcxx llvmPackages_14.stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) Carbon IOKit; }; @@ -6864,7 +6863,7 @@ with pkgs; clementine = libsForQt5.callPackage ../applications/audio/clementine { gst_plugins = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ]; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { }; @@ -7069,7 +7068,7 @@ with pkgs; mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { stdenv = clangStdenv; - protobuf = pkgs.protobuf3_21.overrideDerivation (_: { stdenv = clangStdenv; }); + protobuf = pkgs.protobuf_21.overrideDerivation (_: { stdenv = clangStdenv; }); }; openbangla-keyboard = libsForQt5.callPackage ../applications/misc/openbangla-keyboard { withIbusSupport = true; }; @@ -9991,6 +9990,8 @@ with pkgs; lldpd = callPackage ../tools/networking/lldpd { }; + llm = with python3Packages; toPythonApplication llm; + lnav = callPackage ../tools/misc/lnav { }; lnch = callPackage ../tools/misc/lnch { }; @@ -10272,7 +10273,7 @@ with pkgs; netdata = callPackage ../tools/system/netdata { inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; netdataCloud = netdata.override { withCloud = !stdenv.isDarwin; @@ -11418,7 +11419,7 @@ with pkgs; nq = callPackage ../tools/system/nq { }; nsjail = callPackage ../tools/security/nsjail { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd { }; @@ -11548,7 +11549,7 @@ with pkgs; oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { }; ola = callPackage ../applications/misc/ola { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; olive-editor = qt6Packages.callPackage ../applications/video/olive-editor { @@ -11647,10 +11648,6 @@ with pkgs; openrgb-plugin-hardwaresync = libsForQt5.callPackage ../applications/misc/openrgb-plugins/hardwaresync { }; - openrussian-cli = callPackage ../misc/openrussian-cli { - lua = lua5_3; - }; - opensbi = callPackage ../misc/opensbi { }; opensc = callPackage ../tools/security/opensc { @@ -11821,7 +11818,7 @@ with pkgs; p3x-onenote = callPackage ../applications/office/p3x-onenote { }; p4c = callPackage ../development/compilers/p4c { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; p7zip = callPackage ../tools/archivers/p7zip { }; @@ -11921,7 +11918,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost177; # Configure checks for specific version. icu = icu69; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; percona-xtrabackup = percona-xtrabackup_8_0; percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix { @@ -14511,9 +14508,7 @@ with pkgs; SDL = SDL_sixel; }; - vtm = callPackage ../tools/misc/vtm { - stdenv = if stdenv.isDarwin then llvmPackages_16.stdenv else stdenv; - }; + vtm = callPackage ../tools/misc/vtm { }; witness = callPackage ../tools/security/witness { }; @@ -15043,9 +15038,7 @@ with pkgs; clipnotify = callPackage ../tools/misc/clipnotify { }; - clipboard-jh = callPackage ../tools/misc/clipboard-jh { - stdenv = if stdenv.isDarwin then llvmPackages_16.stdenv else stdenv; - }; + clipboard-jh = callPackage ../tools/misc/clipboard-jh { }; clipbuzz = callPackage ../tools/misc/clipbuzz { }; @@ -15208,7 +15201,7 @@ with pkgs; zasm = callPackage ../development/compilers/zasm { }; zbackup = callPackage ../tools/backup/zbackup { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; zbar = libsForQt5.callPackage ../tools/graphics/zbar { @@ -15653,7 +15646,6 @@ with pkgs; }; clang = llvmPackages.clang; - clang_5 = llvmPackages_5.clang; clang_6 = llvmPackages_6.clang; clang_7 = llvmPackages_7.clang; clang_8 = llvmPackages_8.clang; @@ -15670,10 +15662,6 @@ with pkgs; llvmPackages = llvmPackages_14; }; - clang-tools_5 = callPackage ../development/tools/clang-tools { - llvmPackages = llvmPackages_5; - }; - clang-tools_6 = callPackage ../development/tools/clang-tools { llvmPackages = llvmPackages_6; }; @@ -16606,7 +16594,6 @@ with pkgs; }; lld = llvmPackages.lld; - lld_5 = llvmPackages_5.lld; lld_6 = llvmPackages_6.lld; lld_7 = llvmPackages_7.lld; lld_8 = llvmPackages_8.lld; @@ -16620,7 +16607,6 @@ with pkgs; lld_16 = llvmPackages_16.lld; lldb = lldb_14; - lldb_5 = llvmPackages_5.lldb; lldb_6 = llvmPackages_6.lldb; lldb_7 = llvmPackages_7.lldb; lldb_8 = llvmPackages_8.lldb; @@ -16634,7 +16620,6 @@ with pkgs; lldb_16 = llvmPackages_16.lldb; llvm = llvmPackages.llvm; - llvm_5 = llvmPackages_5.llvm; llvm_6 = llvmPackages_6.llvm; llvm_7 = llvmPackages_7.llvm; llvm_8 = llvmPackages_8.llvm; @@ -16654,11 +16639,11 @@ with pkgs; # This returns the minimum supported version for the platform. The # assumption is that or any later version is good. choose = platform: - /**/ if platform.isDarwin then 11 + /**/ if platform.isDarwin then 16 else if platform.isFreeBSD then 12 else if platform.isAndroid then 12 - else if platform.isLinux then 11 - else if platform.isWasm then 12 + else if platform.isLinux then 16 + else if platform.isWasm then 16 else 14; # We take the "max of the mins". Why? Since those are lower bounds of the # supported version set, this is like intersecting those sets and then @@ -16667,13 +16652,6 @@ with pkgs; stdenv.targetPlatform)); in pkgs.${"llvmPackages_${minSupported}"}; - llvmPackages_5 = recurseIntoAttrs (callPackage ../development/compilers/llvm/5 { - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_5.tools; - targetLlvm = targetPackages.llvmPackages_5.llvm or llvmPackages_5.llvm; - targetLlvmLibraries = targetPackages.llvmPackages_5.libraries or llvmPackages_5.libraries; - }); - llvmPackages_6 = recurseIntoAttrs (callPackage ../development/compilers/llvm/6 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_6.tools; @@ -16940,11 +16918,11 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_72 = callPackage ../development/compilers/rust/1_72.nix { + rust_1_73 = callPackage ../development/compilers/rust/1_73.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_16 = llvmPackages_16.libllvm; }; - rust = rust_1_72; + rust = rust_1_73; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -16952,8 +16930,8 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_72 = rust_1_72.packages.stable; - rustPackages = rustPackages_1_72; + rustPackages_1_73 = rust_1_73.packages.stable; + rustPackages = rustPackages_1_73; inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; @@ -17013,7 +16991,12 @@ with pkgs; cargo-clone = callPackage ../development/tools/rust/cargo-clone { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - cargo-codspeed = callPackage ../development/tools/rust/cargo-codspeed { }; + cargo-codspeed = callPackage ../development/tools/rust/cargo-codspeed { + rustPlatform = makeRustPlatform { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + inherit rustc cargo; + }; + }; cargo-component = callPackage ../development/tools/rust/cargo-component { }; cargo-cranky = callPackage ../development/tools/rust/cargo-cranky { }; cargo-criterion = callPackage ../development/tools/rust/cargo-criterion { }; @@ -17762,7 +17745,7 @@ with pkgs; ### End of CuboCore maude = callPackage ../development/interpreters/maude { - stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; + stdenv = if stdenv.cc.isClang then llvmPackages_7.stdenv else stdenv; }; me_cleaner = callPackage ../tools/misc/me_cleaner { }; @@ -18039,14 +18022,13 @@ with pkgs; inherit (darwin) libobjc; }; - inherit (darwin.apple_sdk_11_0.callPackage ../development/interpreters/ruby { + inherit (callPackage ../development/interpreters/ruby { inherit (darwin) libobjc libunwind; - inherit (darwin.apple_sdk_11_0.frameworks) Foundation; + inherit (darwin.apple_sdk.frameworks) Foundation; }) mkRubyVersion mkRuby ruby_2_7 - ruby_3_0 ruby_3_1 ruby_3_2 ruby_3_3; @@ -18055,7 +18037,6 @@ with pkgs; rubyPackages = rubyPackages_3_1; rubyPackages_2_7 = recurseIntoAttrs ruby_2_7.gems; - rubyPackages_3_0 = recurseIntoAttrs ruby_3_0.gems; rubyPackages_3_1 = recurseIntoAttrs ruby_3_1.gems; rubyPackages_3_2 = recurseIntoAttrs ruby_3_2.gems; rubyPackages_3_3 = recurseIntoAttrs ruby_3_3.gems; @@ -18178,9 +18159,9 @@ with pkgs; # Needed for autogen guile_2_0 = callPackage ../development/interpreters/guile/2.0.nix { }; - guile_2_2 = darwin.apple_sdk_11_0.callPackage ../development/interpreters/guile/2.2.nix { }; + guile_2_2 = callPackage ../development/interpreters/guile/2.2.nix { }; - guile_3_0 = darwin.apple_sdk_11_0.callPackage ../development/interpreters/guile/3.0.nix { }; + guile_3_0 = callPackage ../development/interpreters/guile/3.0.nix { }; guile = guile_3_0; @@ -18902,11 +18883,9 @@ with pkgs; ctmg = callPackage ../tools/security/ctmg { }; - cmake = callPackage ../development/tools/build-managers/cmake { }; - # can't use override - it triggers infinite recursion - cmakeMinimal = callPackage ../development/tools/build-managers/cmake { - isBootstrap = true; + cmakeMinimal = callPackage ../by-name/cm/cmake/package.nix { + isMinimalBuild = true; }; cmakeCurses = cmake.override { @@ -19653,7 +19632,7 @@ with pkgs; modd = callPackage ../development/tools/modd { }; mold = callPackage ../development/tools/mold { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_13.stdenv else stdenv; + stdenv = if stdenv.isDarwin then overrideLibcxx darwin.apple_sdk_11_0.llvmPackages_16.stdenv else stdenv; tbb = tbb_2021_8; }; @@ -20020,8 +19999,10 @@ with pkgs; sca2d = callPackage ../development/tools/sca2d { }; - sconsPackages = dontRecurseIntoAttrs (callPackage ../development/tools/build-managers/scons { }); - scons = sconsPackages.scons_latest; + scons = scons_4_5_2; + scons_3_1_2 = callPackage ../development/tools/build-managers/scons/3.1.2.nix { }; + scons_4_1_0 = callPackage ../development/tools/build-managers/scons/4.1.0.nix { }; + scons_4_5_2 = callPackage ../development/tools/build-managers/scons/4.5.2.nix { }; mill = callPackage ../development/tools/build-managers/mill { }; @@ -20121,12 +20102,12 @@ with pkgs; }; spoofer = callPackage ../tools/networking/spoofer { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; spoofer-gui = callPackage ../tools/networking/spoofer { withGUI = true; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; spooles = callPackage ../development/libraries/science/math/spooles { }; @@ -20471,10 +20452,30 @@ with pkgs; aalib = callPackage ../development/libraries/aalib { }; - abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { }; - abseil-cpp_202206 = callPackage ../development/libraries/abseil-cpp/202206.nix { }; - abseil-cpp_202301 = callPackage ../development/libraries/abseil-cpp/202301.nix { }; - abseil-cpp_202308 = callPackage ../development/libraries/abseil-cpp/202308.nix { }; + abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { + # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib. + stdenv = if stdenv.isDarwin && stdenv.isx86_64 + then overrideSDK stdenv { darwinMinVersion = "10.13"; } + else stdenv; + }; + abseil-cpp_202206 = callPackage ../development/libraries/abseil-cpp/202206.nix { + # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib. + stdenv = if stdenv.isDarwin && stdenv.isx86_64 + then overrideSDK stdenv { darwinMinVersion = "10.13"; } + else stdenv; + }; + abseil-cpp_202301 = callPackage ../development/libraries/abseil-cpp/202301.nix { + # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib. + stdenv = if stdenv.isDarwin && stdenv.isx86_64 + then overrideSDK stdenv { darwinMinVersion = "10.13"; } + else stdenv; + }; + abseil-cpp_202308 = callPackage ../development/libraries/abseil-cpp/202308.nix { + # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib. + stdenv = if stdenv.isDarwin && stdenv.isx86_64 + then overrideSDK stdenv { darwinMinVersion = "10.13"; } + else stdenv; + }; abseil-cpp = abseil-cpp_202301; accountsservice = callPackage ../development/libraries/accountsservice { }; @@ -20869,7 +20870,7 @@ with pkgs; cmrt = callPackage ../development/libraries/cmrt { }; codecserver = callPackage ../applications/audio/codecserver { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; coeurl = callPackage ../development/libraries/coeurl { }; @@ -21163,7 +21164,6 @@ with pkgs; fancypp = callPackage ../development/libraries/fancypp { }; far2l = callPackage ../applications/misc/far2l { - stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) IOKit Carbon Cocoa AudioToolbox OpenGL System; }; @@ -21383,7 +21383,7 @@ with pkgs; gallia = callPackage ../tools/security/gallia { }; gamenetworkingsockets = callPackage ../development/libraries/gamenetworkingsockets { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; game-music-emu = callPackage ../development/libraries/audio/game-music-emu { }; @@ -21448,7 +21448,9 @@ with pkgs; geomyidae = callPackage ../applications/networking/gopher/geomyidae { }; - geos = callPackage ../development/libraries/geos { }; + geos = callPackage ../development/libraries/geos { + stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_14.stdenv else stdenv; + }; geos39 = callPackage ../development/libraries/geos/3.9.nix { }; @@ -21760,7 +21762,11 @@ with pkgs; grilo-plugins = callPackage ../development/libraries/grilo-plugins { }; - grpc = callPackage ../development/libraries/grpc { }; + grpc = darwin.apple_sdk_11_0.callPackage ../development/libraries/grpc { + stdenv = if stdenv.isDarwin && stdenv.isx86_64 + then overrideSDK darwin.apple_sdk_11_0.stdenv { darwinMinVersion = "10.13"; } + else stdenv; + }; gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { }; @@ -22011,8 +22017,6 @@ with pkgs; hidapi = callPackage ../development/libraries/hidapi { inherit (darwin.apple_sdk.frameworks) Cocoa IOKit; - # TODO: remove once `udev` is `systemdMinimal` everywhere. - udev = systemdMinimal; }; highfive = callPackage ../development/libraries/highfive { }; @@ -22360,7 +22364,9 @@ with pkgs; lerc = callPackage ../development/libraries/lerc { }; - lib2geom = callPackage ../development/libraries/lib2geom { }; + lib2geom = callPackage ../development/libraries/lib2geom { + stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_13.stdenv else stdenv; + }; lib3ds = callPackage ../development/libraries/lib3ds { }; @@ -22562,8 +22568,6 @@ with pkgs; libcint = callPackage ../development/libraries/libcint { }; - libclc = callPackage ../development/libraries/libclc { }; - libcli = callPackage ../development/libraries/libcli { }; libclthreads = callPackage ../development/libraries/libclthreads { }; @@ -22720,9 +22724,7 @@ with pkgs; libfakekey = callPackage ../development/libraries/libfakekey { }; - libfido2 = callPackage ../development/libraries/libfido2 { - udev = systemdMinimal; - }; + libfido2 = callPackage ../development/libraries/libfido2 {}; libfilezilla = darwin.apple_sdk_11_0.callPackage ../development/libraries/libfilezilla { inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices; @@ -23407,7 +23409,7 @@ with pkgs; libptytty = callPackage ../development/libraries/libptytty { }; libpulsar = callPackage ../development/libraries/libpulsar { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; libpwquality = callPackage ../development/libraries/libpwquality { @@ -23520,7 +23522,6 @@ with pkgs; libtomcrypt = callPackage ../development/libraries/libtomcrypt { }; libtorrent-rasterbar-2_0_x = callPackage ../development/libraries/libtorrent-rasterbar { - stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) SystemConfiguration; python = python3; }; @@ -23600,8 +23601,6 @@ with pkgs; libusb1 = callPackage ../development/libraries/libusb1 { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) IOKit Security; - # TODO: remove once `udev` is `systemdMinimal` everywhere. - udev = systemdMinimal; }; libusbgx = callPackage ../development/libraries/libusbgx { }; @@ -24415,7 +24414,8 @@ with pkgs; inherit (callPackages ../development/libraries/openssl { }) openssl_1_1 - openssl_3; + openssl_3 + openssl_3_1; opensubdiv = callPackage ../development/libraries/opensubdiv { }; @@ -24557,7 +24557,9 @@ with pkgs; primesieve = callPackage ../applications/science/math/primesieve { }; - proj = callPackage ../development/libraries/proj { }; + proj = callPackage ../development/libraries/proj { + stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_13.stdenv else stdenv; + }; proj_7 = callPackage ../development/libraries/proj/7.nix { }; @@ -24570,13 +24572,14 @@ with pkgs; prospector = callPackage ../development/tools/prospector { }; - protobuf = protobuf3_24; + protobuf = protobuf_24; - protobuf3_24 = callPackage ../development/libraries/protobuf/3.24.nix { }; - protobuf3_23 = callPackage ../development/libraries/protobuf/3.23.nix { }; - protobuf3_21 = callPackage ../development/libraries/protobuf/3.21.nix { + protobuf_24 = callPackage ../development/libraries/protobuf/24.nix { }; + protobuf_23 = callPackage ../development/libraries/protobuf/23.nix { }; + protobuf_21 = callPackage ../development/libraries/protobuf/21.nix { abseil-cpp = abseil-cpp_202103; }; + protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { abseil-cpp = abseil-cpp_202103; }; @@ -24633,10 +24636,11 @@ with pkgs; inherit (__splicedPackages) makeScopeWithSplicing' generateSplicesForMkScope lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper bison cups dconf harfbuzz libGL perl gtk3 python3 + llvmPackages_15 overrideSDK overrideLibcxx darwin; inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base; inherit config; - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; }); libsForQt5 = recurseIntoAttrs (import ./qt5-packages.nix { @@ -24750,7 +24754,7 @@ with pkgs; qm-dsp = callPackage ../development/libraries/audio/qm-dsp { }; qradiolink = callPackage ../applications/radio/qradiolink { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; qrupdate = callPackage ../development/libraries/qrupdate { }; @@ -25421,7 +25425,16 @@ with pkgs; ucommon = callPackage ../development/libraries/ucommon { }; - v8 = darwin.apple_sdk_11_0.callPackage ../development/libraries/v8 { }; + v8 = callPackage ../development/libraries/v8 ( + let + stdenv' = if stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc.cc) "16" + then overrideLibcxx llvmPackages_15.stdenv + else stdenv; + in + { + stdenv = if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv'; + } + ); intel-vaapi-driver = callPackage ../development/libraries/intel-vaapi-driver { }; @@ -25433,7 +25446,7 @@ with pkgs; valhalla = callPackage ../development/libraries/valhalla { boost = boost.override { enablePython = true; python = python38; }; - protobuf = protobuf3_21.override { + protobuf = protobuf_21.override { abseil-cpp = abseil-cpp_202103.override { cxxStandard = "17"; }; @@ -26531,7 +26544,9 @@ with pkgs; jboss_mysql_jdbc = callPackage ../servers/http/jboss/jdbc/mysql { }; - jetty = callPackage ../servers/http/jetty { }; + jetty = jetty_12; + jetty_12 = callPackage ../servers/http/jetty/12.x.nix { }; + jetty_11 = callPackage ../servers/http/jetty/11.x.nix { }; jibri = callPackage ../servers/jibri { }; @@ -26964,7 +26979,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost177; # Configure checks for specific version. icu = icu69; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; @@ -27249,7 +27264,7 @@ with pkgs; rethinkdb = callPackage ../servers/nosql/rethinkdb { stdenv = clangStdenv; libtool = darwin.cctools; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; rippled = callPackage ../servers/rippled { @@ -28064,14 +28079,6 @@ with pkgs; inherit (callPackages ../os-specific/linux/kernel-headers { inherit (pkgsBuildBuild) elf-header; }) linuxHeaders makeLinuxHeaders; - linuxHeaders_5_19 = linuxHeaders.overrideAttrs rec { - version = "5.19.16"; - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - hash = "sha256-oeuvZn4QWa4tcqpjdKTW4v68C4zNpqEkaHrMLqlh4I0="; - }; - }; - klibc = callPackage ../os-specific/linux/klibc { }; klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { }); @@ -28233,10 +28240,6 @@ with pkgs; lsscsi = callPackage ../os-specific/linux/lsscsi { }; lvm2 = callPackage ../os-specific/linux/lvm2/2_03.nix { - # udev is the same package as systemd which depends on cryptsetup - # which depends on lvm2 again. But we only need the libudev part - # which does not depend on cryptsetup. - udev = systemdMinimal; # break the cyclic dependency: # util-linux (non-minimal) depends (optionally, but on by default) on systemd, # systemd (optionally, but on by default) on cryptsetup and cryptsetup depends on lvm2 @@ -28682,7 +28685,7 @@ with pkgs; sgx-ssl = callPackage ../os-specific/linux/sgx/ssl { }; sgx-psw = callPackage ../os-specific/linux/sgx/psw { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; shadow = callPackage ../os-specific/linux/shadow { }; @@ -28770,6 +28773,7 @@ with pkgs; withResolved = false; withShellCompletions = false; withSysupdate = false; + withSysusers = false; withTimedated = false; withTimesyncd = false; withTpm2Tss = false; @@ -28777,11 +28781,14 @@ with pkgs; withUkify = false; withBootloader = false; }; - + systemdLibs = systemdMinimal.override { + pname = "systemd-minimal-libs"; + buildLibsOnly = true; + }; udev = if (with stdenv.hostPlatform; isLinux && isStatic) then libudev-zero - else systemd; # TODO: change to systemdMinimal + else systemdLibs; systemd-wait = callPackage ../os-specific/linux/systemd-wait { }; @@ -30244,7 +30251,9 @@ with pkgs; dcw-gmt = callPackage ../applications/gis/gmt/dcw.nix { }; - grass = callPackage ../applications/gis/grass { }; + grass = callPackage ../applications/gis/grass { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { }; @@ -30460,7 +30469,7 @@ with pkgs; astroid = callPackage ../applications/networking/mailreaders/astroid { vim = vim-full.override { features = "normal"; }; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; aucatctl = callPackage ../applications/audio/aucatctl { }; @@ -32485,7 +32494,7 @@ with pkgs; }; hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { }; @@ -33309,7 +33318,7 @@ with pkgs; ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv; + stdenv = if stdenv.isDarwin then overrideLibcxx darwin.apple_sdk_11_0.llvmPackages_16.stdenv else stdenv; }; lazpaint = callPackage ../applications/graphics/lazpaint { }; @@ -33651,7 +33660,7 @@ with pkgs; }; sapling = callPackage ../applications/version-management/sapling { - inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreGraphics CoreServices Security WebKit; }; mercurialFull = mercurial.override { fullBuild = true; }; @@ -33987,14 +33996,14 @@ with pkgs; avahi = avahi-compat; pulseSupport = config.pulseaudio or false; iceSupport = config.murmur.iceSupport or true; - protobuf = protobuf3_21; + protobuf = protobuf_21; }).murmur; mumble = (callPackages ../applications/networking/mumble { avahi = avahi-compat; jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; - protobuf = protobuf3_21; + protobuf = protobuf_21; }).mumble; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { @@ -34120,7 +34129,7 @@ with pkgs; osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; ostinato = libsForQt5.callPackage ../applications/networking/ostinato { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; p4 = callPackage ../applications/version-management/p4 { @@ -34222,7 +34231,7 @@ with pkgs; shotcut = libsForQt5.callPackage ../applications/video/shotcut { }; shogun = callPackage ../applications/science/machine-learning/shogun { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; @@ -34585,7 +34594,7 @@ with pkgs; osmo-sip-connector = callPackage ../servers/osmocom/osmo-sip-connector { }; osmscout-server = libsForQt5.callPackage ../applications/misc/osmscout-server { - protobuf = protobuf3_21.override { + protobuf = protobuf_21.override { abseil-cpp = abseil-cpp_202103.override { cxxStandard = "17"; }; @@ -35109,7 +35118,7 @@ with pkgs; rgp = libsForQt5.callPackage ../development/tools/rgp { }; ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; ries = callPackage ../applications/science/math/ries { }; @@ -35435,7 +35444,7 @@ with pkgs; curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; cura = libsForQt5.callPackage ../applications/misc/cura { }; @@ -35830,7 +35839,7 @@ with pkgs; tijolo = callPackage ../applications/editors/tijolo { }; tilemaker = callPackage ../applications/misc/tilemaker { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; timbreid = callPackage ../applications/audio/pd-plugins/timbreid { @@ -36043,9 +36052,7 @@ with pkgs; ueberzug = with python3Packages; toPythonApplication ueberzug; - ueberzugpp = darwin.apple_sdk_11_0.callPackage ../tools/graphics/ueberzugpp { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv; - }; + ueberzugpp = darwin.apple_sdk_11_0.callPackage ../tools/graphics/ueberzugpp { }; uefi-run = callPackage ../tools/virtualization/uefi-run { }; @@ -36436,13 +36443,17 @@ with pkgs; webex = callPackage ../applications/networking/instant-messengers/webex { }; - webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs { }; + webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs { + stdenv = if stdenv.cc.isClang then gccStdenv else stdenv; + }; websploit = python3Packages.callPackage ../tools/security/websploit { }; webssh = with python3Packages; toPythonApplication webssh; - webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop { }; + webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop { + electron = electron_27; + }; wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { }; @@ -37031,11 +37042,11 @@ with pkgs; bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc { withGui = true; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc { mkDerivation = stdenv.mkDerivation; - protobuf = protobuf3_21; + protobuf = protobuf_21; withGui = false; }; @@ -37531,6 +37542,8 @@ with pkgs; angband = callPackage ../games/angband { }; + animatch = callPackage ../games/animatch { }; + anki = callPackage ../games/anki { inherit (darwin.apple_sdk.frameworks) AVKit CoreAudio; }; @@ -37624,7 +37637,7 @@ with pkgs; ckan = callPackage ../games/ckan { }; cockatrice = libsForQt5.callPackage ../games/cockatrice { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; commandergenius = callPackage ../games/commandergenius { }; @@ -38217,12 +38230,12 @@ with pkgs; pong3d = callPackage ../games/pong3d { }; pokerth = libsForQt5.callPackage ../games/pokerth { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; pokerth-server = libsForQt5.callPackage ../games/pokerth { target = "server"; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; pokete = callPackage ../games/pokete { }; @@ -38315,7 +38328,6 @@ with pkgs; scid-vs-pc = callPackage ../games/scid-vs-pc { }; scummvm = callPackage ../games/scummvm { - stdenv = if (stdenv.isDarwin && stdenv.isAarch64) then llvmPackages_14.stdenv else stdenv; inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) Cocoa AudioToolbox Carbon CoreMIDI AudioUnit; }; @@ -39310,7 +39322,7 @@ with pkgs; or-tools = callPackage ../development/libraries/science/math/or-tools { python = python3; - protobuf = protobuf3_21; + protobuf = protobuf_21; # or-tools builds with -std=c++20, so abseil-cpp must # also be built that way abseil-cpp = abseil-cpp_202206.override { @@ -39710,7 +39722,9 @@ with pkgs; btor2tools = callPackage ../applications/science/logic/btor2tools { }; - boolector = callPackage ../applications/science/logic/boolector { }; + boolector = callPackage ../applications/science/logic/boolector { + stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_14.stdenv else stdenv; + }; bitwuzla = callPackage ../applications/science/logic/bitwuzla { }; @@ -39792,6 +39806,8 @@ with pkgs; with3d = false; }; + kicadAddons = recurseIntoAttrs (callPackage ../applications/science/electronics/kicad/addons {}); + librepcb = libsForQt5.callPackage ../applications/science/electronics/librepcb { }; ngspice = libngspice.override { @@ -39997,7 +40013,7 @@ with pkgs; root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix { inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; - stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; + stdenv = if stdenv.cc.isClang then llvmPackages_7.stdenv else stdenv; }); rinetd = callPackage ../servers/rinetd { }; @@ -41443,7 +41459,7 @@ with pkgs; wmutils-opt = callPackage ../tools/X11/wmutils-opt { }; inherit (callPackage ../servers/web-apps/wordpress {}) - wordpress wordpress6_3; + wordpress wordpress6_3 wordpress6_4; wordpressPackages = ( callPackage ../servers/web-apps/wordpress/packages { plugins = lib.importJSON ../servers/web-apps/wordpress/packages/plugins.json; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index bc35b20656976..2547b0c81cca9 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -13,6 +13,11 @@ let # default. targetPrefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-"); + + # Bootstrap `fetchurl` needed to build SDK packages without causing an infinite recursion. + fetchurlBoot = import ../build-support/fetchurl/boot.nix { + inherit (stdenv) system; + }; in makeScopeWithSplicing' { @@ -32,10 +37,13 @@ makeScopeWithSplicing' { apple_sdk_10_12 = pkgs.callPackage ../os-specific/darwin/apple-sdk { inherit (buildPackages.darwin) print-reexports; inherit (self) darwin-stubs; + fetchurl = fetchurlBoot; }; # macOS 11.0 SDK - apple_sdk_11_0 = pkgs.callPackage ../os-specific/darwin/apple-sdk-11.0 { }; + apple_sdk_11_0 = pkgs.callPackage ../os-specific/darwin/apple-sdk-11.0 { + fetchurl = fetchurlBoot; + }; # Pick an SDK apple_sdk = if stdenv.hostPlatform.isAarch64 then apple_sdk_11_0 else apple_sdk_10_12; @@ -192,26 +200,29 @@ impure-cmds // appleSourcePackages // chooseLibs // { CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { }; - # TODO: make swift-corefoundation build with apple_sdk_11_0.Libsystem - CF = if useAppleSDKLibs - then - # This attribute (CF) is included in extraBuildInputs in the stdenv. This - # is typically the open source project. When a project refers to - # "CoreFoundation" it has an extra setup hook to force impure system - # CoreFoundation into the link step. - # - # In this branch, we only have a single "CoreFoundation" to choose from. - # To be compatible with the existing convention, we define - # CoreFoundation with the setup hook, and CF as the same package but - # with the setup hook removed. - # - # This may seem unimportant, but without it packages (e.g., bacula) will - # fail with linker errors referring ___CFConstantStringClassReference. - # It's not clear to me why some packages need this extra setup. - lib.overrideDerivation apple_sdk.frameworks.CoreFoundation (drv: { - setupHook = null; - }) - else callPackage ../os-specific/darwin/swift-corelibs/corefoundation.nix { }; + # TODO: Remove the CF hook if a solution to the crashes is not found. + CF = + # CF used to refer to the open source version of CoreFoundation from the Swift + # project. As of macOS 14, the rpath-based approach allowing packages to choose + # which version to use no longer seems to work reliably. Sometimes they works, + # but sometimes they crash with the error (in the system crash logs): + # CF objects must have a non-zero isa. + # See https://developer.apple.com/forums/thread/739355 for more on that error. + # + # In this branch, we only have a single "CoreFoundation" to choose from. + # To be compatible with the existing convention, we define + # CoreFoundation with the setup hook, and CF as the same package but + # with the setup hook removed. + # + # This may seem unimportant, but without it packages (e.g., bacula) will + # fail with linker errors referring ___CFConstantStringClassReference. + # It's not clear to me why some packages need this extra setup. + lib.overrideDerivation apple_sdk.frameworks.CoreFoundation (drv: { + setupHook = null; + }); + + # Formerly the CF attribute. Use this is you need the open source release. + swift-corelibs-foundation = callPackage ../os-specific/darwin/swift-corelibs/corefoundation.nix { }; # As the name says, this is broken, but I don't want to lose it since it's a direction we want to go in # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index e0afcc773f0a9..2cd4319e6650e 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -203,15 +203,9 @@ in { linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix { # Pinned on the last version which Kent's commits can be cleany rebased up. - kernel = callPackage ../os-specific/linux/kernel/mainline.nix { - branch = "6.4"; - }; - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.dell_xps_regression - ]; - }; + kernel = linux_6_5; + kernelPatches = linux_6_5.kernelPatches; + }; # Using zenKernels like this due lqx&zen came from one source, but may have different base kernel version # https://github.com/NixOS/nixpkgs/pull/161773#discussion_r820134708 diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 635a8d71c2e2a..516db732bc43c 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1046,6 +1046,8 @@ let merlin-lib = callPackage ../development/tools/ocaml/merlin/lib.nix { }; + metadata = callPackage ../development/ocaml-modules/metadata { }; + metrics = callPackage ../development/ocaml-modules/metrics { }; metrics-influx = callPackage ../development/ocaml-modules/metrics/influx.nix { }; @@ -1604,6 +1606,8 @@ let ringo = callPackage ../development/ocaml-modules/ringo { }; + riot = callPackage ../development/ocaml-modules/riot { }; + rock = callPackage ../development/ocaml-modules/rock { }; rope = callPackage ../development/ocaml-modules/rope { }; diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index 79be645162ea7..b1c436d1ccf2b 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -20,7 +20,6 @@ quicklispPackagesSBCL rPackages roundcubePlugins - sconsPackages sourceHanPackages steamPackages ut2004Packages diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7a0db7fa21656..a884bcd346188 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -190,10 +190,10 @@ with self; { AlgorithmCheckDigits = buildPerlModule { pname = "Algorithm-CheckDigits"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MAMAWE/Algorithm-CheckDigits-v1.3.5.tar.gz"; - hash = "sha256-qVbQUXGA1tkEL0fXOqaicot1/L1UaUDS2+Cn589Cj3M="; + url = "mirror://cpan/authors/id/M/MA/MAMAWE/Algorithm-CheckDigits-v1.3.6.tar.gz"; + hash = "sha256-DySHqP0fMbGcUbJlCELyJkwed9liSHoTtSG74GbEtLw="; }; buildInputs = [ ProbePerl ]; meta = { @@ -248,10 +248,10 @@ with self; { AlienBaseModuleBuild = buildPerlModule { pname = "Alien-Base-ModuleBuild"; - version = "1.15"; + version = "1.17"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Base-ModuleBuild-1.15.tar.gz"; - hash = "sha256-E8lDLPQbNMsU3yRUoD5UDivV3J65yCgktq0PTGd5Ov0="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Base-ModuleBuild-1.17.tar.gz"; + hash = "sha256-/nJwrHNa3ehk5GjiHGQqRxuoi6Ja0w2pRXiDITLyufQ="; }; buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ AlienBuild ArchiveExtract CaptureTiny Filechdir PathTiny ShellConfigGenerate ShellGuess SortVersions URI ]; @@ -264,10 +264,10 @@ with self; { AlienBuild = buildPerlPackage { pname = "Alien-Build"; - version = "2.37"; + version = "2.80"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-2.37.tar.gz"; - hash = "sha256-MAC8vphIJkP3a7z/zkL9SPJMY6ZFf4qiwWlfSBrJ7VE="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-2.80.tar.gz"; + hash = "sha256-2e3JNrBnBbtcte5aLqi89hEaPogVkU8XfhXjwP7TAfM="; }; propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny PkgConfig ]; buildInputs = [ DevelHide Test2Suite ]; @@ -278,6 +278,22 @@ with self; { }; }; + AlienBuildPluginDownloadGitLab = buildPerlPackage { + pname = "Alien-Build-Plugin-Download-GitLab"; + version = "0.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-Plugin-Download-GitLab-0.01.tar.gz"; + hash = "sha256-wfCJyOoVKniZCdSKg9v88mJvdz2vMEMchiJYKyarqQI="; + }; + buildInputs = [ Test2Suite ]; + propagatedBuildInputs = [ AlienBuild PathTiny URI ]; + meta = { + homepage = "https://metacpan.org/pod/Alien::Build::Plugin::Download::GitLab"; + description = "Alien::Build plugin to download from GitLab"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AlienFFI = buildPerlPackage { pname = "Alien-FFI"; version = "0.27"; @@ -331,15 +347,15 @@ with self; { AlienLibxml2 = buildPerlPackage { pname = "Alien-Libxml2"; - version = "0.17"; + version = "0.19"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.17.tar.gz"; - hash = "sha256-c7RSRPC1w25TMsM1abgqGrLDPiY/HQB4XSADvK7GjbM="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.19.tar.gz"; + hash = "sha256-9KZ0CZu9V0fAw7derYQfOyRJNdnvQro1NoAkvWERdMk="; }; strictDeps = true; nativeBuildInputs = [ pkgs.pkg-config ]; propagatedBuildInputs = [ AlienBuild ]; - buildInputs = [ pkgs.libxml2 MojoDOM58 SortVersions Test2Suite URI ]; + buildInputs = [ pkgs.libxml2 AlienBuildPluginDownloadGitLab MojoDOM58 SortVersions Test2Suite URI ]; meta = { description = "Install the C libxml2 library on your system"; homepage = "https://metacpan.org/pod/Alien::Libxml2"; @@ -434,10 +450,10 @@ with self; { Alienm4 = buildPerlPackage { pname = "Alien-m4"; - version = "0.19"; + version = "0.21"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-m4-0.19.tar.gz"; - hash = "sha256-SdvvZKGoDGtKc3T85ovix+6eZdHA3/Uxw5u1lBRG0PY="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-m4-0.21.tar.gz"; + hash = "sha256-qypAXIA5RP0BxR+h6fK+/VhxqwPxdE3sKlZonyFI02E="; }; propagatedBuildInputs = [ AlienBuild ]; buildInputs = [ pkgs.gnum4 Alienpatch IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI ]; @@ -654,10 +670,10 @@ with self; { ApacheAuthCookie = buildPerlPackage { pname = "Apache-AuthCookie"; - version = "3.30"; + version = "3.31"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSCHOUT/Apache-AuthCookie-3.30.tar.gz"; - hash = "sha256-H3G5TT1VqVCksy2uTpD252yBV1CKfiruUGIbF5qtsfs="; + url = "mirror://cpan/authors/id/M/MS/MSCHOUT/Apache-AuthCookie-3.31.tar.gz"; + hash = "sha256-ByhnLrmLzWZSWWenXXxNYXwLTEEWIBOsmkzv5G99/3w="; }; buildInputs = [ ApacheTest ]; propagatedBuildInputs = [ ClassLoad HTTPBody HashMultiValue WWWFormUrlEncoded ]; @@ -720,10 +736,10 @@ with self; { ApacheTest = buildPerlPackage { pname = "Apache-Test"; - version = "1.42"; + version = "1.43"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.42.tar.gz"; - hash = "sha256-BoHwfX2KlCnQ7fioxa1qZVvn/oGtoUJnCyuOd2s7s+s="; + url = "mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.43.tar.gz"; + hash = "sha256-qZmfAqeBpYkhi1ibGHnBHEladFrwlXXly7It/LZWgKw="; }; doCheck = false; meta = { @@ -734,10 +750,10 @@ with self; { AppCLI = buildPerlPackage { pname = "App-CLI"; - version = "0.50"; + version = "0.52"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PT/PTC/App-CLI-0.50.tar.gz"; - hash = "sha256-UdP1gzq1GftG5VUrYOVFXk+cHGgn0e7kFT0LQJ8qk0U="; + url = "mirror://cpan/authors/id/P/PT/PTC/App-CLI-0.52.tar.gz"; + hash = "sha256-Ur1D9VWRPML/1kBfmVHSqr1Gr2PXAdm140amMycJ8M4="; }; propagatedBuildInputs = [ CaptureTiny ClassLoad ]; buildInputs = [ TestKwalitee TestPod ]; @@ -776,10 +792,10 @@ with self; { AppCmd = buildPerlPackage { pname = "App-Cmd"; - version = "0.331"; + version = "0.336"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/App-Cmd-0.331.tar.gz"; - hash = "sha256-Sl098ABr0niIDQH0lXqqZSqPkf6PZuk633D7oMPstoA="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/App-Cmd-0.336.tar.gz"; + hash = "sha256-35ZrV9WauxluADBIheW/EXypWBgq4/Tu3xchjqKDjoE="; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ CaptureTiny ClassLoad GetoptLongDescriptive IOTieCombine ModulePluggable StringRewritePrefix ]; @@ -820,10 +836,10 @@ with self; { Appcpanminus = buildPerlPackage { pname = "App-cpanminus"; - version = "1.7045"; + version = "1.7047"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7045.tar.gz"; - hash = "sha256-rE5K3CP+wKtU8IispRH1pX2V5sl6EqHLmO7R/g/g6Zw="; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz"; + hash = "sha256-lj5jxuGocl/y9iTpCGOWrhUNtR3QozfDeB0JqZSvBaU="; }; # Use TLS endpoints for downloads and metadata by default preConfigure = '' @@ -844,10 +860,10 @@ with self; { Appcpm = buildPerlModule { pname = "App-cpm"; - version = "0.997011"; + version = "0.997014"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.997011.tar.gz"; - hash = "sha256-YyECxuZ958nP9R1vqg2dA7/vvtNbXMXZaRn3uSAlAck="; + url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.997014.tar.gz"; + hash = "sha256-LdTAPFQDnC0CzN0u+VvG/1bPvbdGzQdvywqVR8UEmQg="; }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ CPAN02PackagesSearch CPANCommonIndex CPANDistnameInfo ClassTiny CommandRunner ExtUtilsInstall ExtUtilsInstallPaths FileCopyRecursive Filepushd HTTPTinyish MenloLegacy Modulecpmfile ModuleCPANfile ParsePMFile ParallelPipes locallib ]; @@ -866,10 +882,10 @@ with self; { Applify = buildPerlPackage { pname = "Applify"; - version = "0.22"; + version = "0.23"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Applify-0.22.tar.gz"; - hash = "sha256-iiSlTkuhclGss88IO2drzqCYsClF9iMsV4nQd3ImxHg="; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Applify-0.23.tar.gz"; + hash = "sha256-fI3Z55e9DsJgDTAOzUnul4EZgxxlay0L3q7OoENIoRI="; }; meta = { description = "Write object oriented scripts with ease"; @@ -881,12 +897,12 @@ with self; { AppMusicChordPro = buildPerlPackage { pname = "App-Music-ChordPro"; - version = "6.010"; + version = "6.030"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JV/JV/App-Music-ChordPro-6.010.tar.gz"; - hash = "sha256-SqTkbR2bWIMcU5gSRf2WW6s1ckHtJVPkxj/bBO9X4kM="; + url = "mirror://cpan/authors/id/J/JV/JV/App-Music-ChordPro-6.030.tar.gz"; + hash = "sha256-a+5H8U5gmYPkrBUyxxwajPQy9m6sWeDlaeHTfg2cwnc="; }; - buildInputs = [ PodParser ]; + buildInputs = [ ObjectPad ]; propagatedBuildInputs = [ AppPackager FileLoadLines FileHomeDir IOString ImageInfo PDFAPI2 StringInterpolateNamed TextLayout ] ++ lib.optionals (!stdenv.isDarwin) [ Wx ]; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; @@ -911,10 +927,10 @@ with self; { AppPackager = buildPerlPackage { pname = "App-Packager"; - version = "1.430.1"; + version = "1.440"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JV/JV/App-Packager-1.430.1.tar.gz"; - hash = "sha256-V/TQFEWDh/ni7S39hhXR4lRbimUEsQryJIZXjYvjdKM="; + url = "mirror://cpan/authors/id/J/JV/JV/App-Packager-1.440.tar.gz"; + hash = "sha256-VoFBa+b9eJe+mEg8TqKOsN3gzGWzwg5o1HswRN7PKHo="; }; meta = { description = "Abstraction for Packagers"; @@ -924,10 +940,10 @@ with self; { Appperlbrew = buildPerlModule { pname = "App-perlbrew"; - version = "0.89"; + version = "0.98"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-0.89.tar.gz"; - hash = "sha256-D/pYdfYMe0L3yDK5Qtyaq+L8KHYXEjvd6bj8rW31eQI="; + url = "mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-0.98.tar.gz"; + hash = "sha256-oWD3ESJYjdU12pTbsLgwHkjlONJaRCobE/cZCWKIWTI="; }; buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ]; propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl PodParser locallib ]; @@ -957,11 +973,11 @@ with self; { }; AppSqitch = buildPerlModule { - version = "1.3.1"; + version = "1.4.0"; pname = "App-Sqitch"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.3.1.tar.gz"; - hash = "sha256-9edo0pjNQEfuKuQjGXgujCzaMSc3vL2/r1gL1H7+i5Q="; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.4.0.tar.gz"; + hash = "sha256-sNs4cDH3dWJmLgA7xV16EComOAtK1/25qKO61XaeUBw="; }; buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestMockObject TestNoWarnings TestWarn ]; propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict PodParser StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl-perl ]; @@ -1068,10 +1084,10 @@ with self; { ArrayCompare = buildPerlModule { pname = "Array-Compare"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.7.tar.gz"; - hash = "sha256-ROMQ9pnresGYGNunIh7ohCoecESLdFWMUSaWKy7ZU9w="; + url = "mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.8.tar.gz"; + hash = "sha256-MEc7XpEBU4QNJDHqlGO55W5SPN56PFBhadaaK5dC2DQ="; }; buildInputs = [ TestNoWarnings ]; @@ -1169,10 +1185,10 @@ with self; { ArchiveExtract = buildPerlPackage { pname = "Archive-Extract"; - version = "0.86"; + version = "0.88"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/Archive-Extract-0.86.tar.gz"; - hash = "sha256-ms0JzbjozwttCCEKO4A0IwDImjWYVTGb9rAMFMSqtoc="; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Archive-Extract-0.88.tar.gz"; + hash = "sha256-z/zxNc0GIih9OwIVT31nFklUSfyu0DlmYhlI4l6l90I="; }; meta = { description = "Generic archive extracting mechanism"; @@ -1182,10 +1198,10 @@ with self; { ArchiveTar = buildPerlPackage { pname = "Archive-Tar"; - version = "2.38"; + version = "3.02"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-2.38.tar.gz"; - hash = "sha256-xeSPU1FCiBhYMM7ZO/Phb731zdzpfe0dHYqbCiHqKHs="; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-3.02.tar.gz"; + hash = "sha256-gWM8h/c3hGGD01wPTJ1ALalHqEa0iBswzObZ6+PInRk="; }; meta = { description = "Manipulates TAR archives"; @@ -1225,10 +1241,10 @@ with self; { AstroFITSHeader = buildPerlModule rec { pname = "Astro-FITS-Header"; - version = "3.07"; + version = "3.09"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TJ/TJENNESS/${pname}-${version}.tar.gz"; - hash = "sha256-Uw1Z7wwJNfmGLRhxh6LXWDsSxjm7Z9sU+YMyKxYYktk="; + url = "mirror://cpan/authors/id/G/GS/GSB/Astro-FITS-Header-3.09.tar.gz"; + hash = "sha256-cq1oveWku+zv8VFtZ3A/4tACFDlwQpo81pplFlLVaYY="; }; meta = { description = "Object-oriented interface to FITS HDUs"; @@ -1411,10 +1427,10 @@ with self; { AuthenSASL = buildPerlPackage { pname = "Authen-SASL"; - version = "2.16"; + version = "2.1700"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GB/GBARR/Authen-SASL-2.16.tar.gz"; - hash = "sha256-ZhT6dRjwlPhTdBtjxz82JxaMXTrKibHQKxAW3DKFTgk="; + url = "mirror://cpan/authors/id/E/EH/EHUELS/Authen-SASL-2.1700.tar.gz"; + hash = "sha256-uG1aV2uNOHruJPOfR6VK/RS7ZrCQA9tQZQAfHeA6js4="; }; propagatedBuildInputs = [ DigestHMAC ]; meta = { @@ -1613,10 +1629,10 @@ with self; { BCOW = buildPerlPackage { pname = "B-COW"; - version = "0.004"; + version = "0.007"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AT/ATOOMIC/B-COW-0.004.tar.gz"; - hash = "sha256-/K+3de2EpFvCwGxf/XE0LLPAb7C9zVwbUbDBL4tYX1E="; + url = "mirror://cpan/authors/id/A/AT/ATOOMIC/B-COW-0.007.tar.gz"; + hash = "sha256-EpDa8ifosJiJoxzxguKRBvHPnxpOm/d1L53pLtEVi0Q="; }; meta = { description = "B::COW additional B helpers to check COW status"; @@ -1689,10 +1705,10 @@ with self; { BHooksEndOfScope = buildPerlPackage { pname = "B-Hooks-EndOfScope"; - version = "0.24"; + version = "0.26"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-0.24.tar.gz"; - hash = "sha256-A6o9/l0KpkcalvQ/6DGBedGXlNSmQHCPAoj5IW7HrMY="; + url = "mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-0.26.tar.gz"; + hash = "sha256-Od8vjAB6dUZyB1+VuQeXuuvpetptlEsZemNScJyzBnE="; }; propagatedBuildInputs = [ ModuleImplementation SubExporterProgressive ]; meta = { @@ -1965,10 +1981,10 @@ with self; { BusinessISBN = buildPerlPackage { pname = "Business-ISBN"; - version = "3.005"; + version = "3.008"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-3.005.tar.gz"; - hash = "sha256-ZTD7rkDFY3bbTmaGw0r42j21xLqtDRBAR7HvPiT+Lio="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-3.008.tar.gz"; + hash = "sha256-GcSh1NmaDddpWpAZKxNASg4+7r7fy+l6AgLjayOMDmk="; }; propagatedBuildInputs = [ BusinessISBNData ]; meta = { @@ -1980,10 +1996,10 @@ with self; { BusinessISBNData = buildPerlPackage { pname = "Business-ISBN-Data"; - version = "20191107"; + version = "20231006.001"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-Data-20191107.tar.gz"; - hash = "sha256-hExPZPGT04k0C0RlodW8NMYPDI5C5caayK/j07vFyg0="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-Data-20231006.001.tar.gz"; + hash = "sha256-KhazbjIzXOjI337m8ig2LzSuc8T8wSNQCVCiyMd/F0g="; }; meta = { description = "Data pack for Business::ISBN"; @@ -1994,10 +2010,10 @@ with self; { BusinessISMN = buildPerlPackage { pname = "Business-ISMN"; - version = "1.201"; + version = "1.203"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISMN-1.201.tar.gz"; - hash = "sha256-SjIxoWRWv4y/F/JrZSQ/JHB4tRRdmgOqdYa68JV37LI="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISMN-1.203.tar.gz"; + hash = "sha256-T1Ou2rLmh9Th9yhW6vwiFZOQYhEj2q955FBqiX4pPog="; }; propagatedBuildInputs = [ TieCycle ]; meta = { @@ -2009,10 +2025,10 @@ with self; { BusinessISSN = buildPerlPackage { pname = "Business-ISSN"; - version = "1.004"; + version = "1.005"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-1.004.tar.gz"; - hash = "sha256-l+yrFdJNEeKFK/Cyj4TIeYvThAKgpp4Xvg5mibJycV4="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-1.005.tar.gz"; + hash = "sha256-OwmwJn8KZmD7krb1DEx3lu9qJjtirTu+qgcYmgx8ObM="; }; meta = { description = "Perl extension for International Standard Serial Numbers"; @@ -2067,10 +2083,10 @@ with self; { CacheFastMmap = buildPerlPackage { pname = "Cache-FastMmap"; - version = "1.54"; + version = "1.57"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.54.tar.gz"; - hash = "sha256-NULiALmAJ3rkVqvjbgyp+bjyvya7FVivJOFAgUrWeVI="; + url = "mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.57.tar.gz"; + hash = "sha256-4Es6KNmJ7bj7lur6zcK4f57MuE8EfrLifLJqp9CMx7g="; }; buildInputs = [ TestDeep ]; meta = { @@ -2112,11 +2128,12 @@ with self; { CacheMemcachedFast = buildPerlPackage { pname = "Cache-Memcached-Fast"; - version = "0.26"; + version = "0.28"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.26.tar.gz"; - hash = "sha256-Xo5G2SLMpuTzhRMsLLLHHu9/S171j702o5n5Fp3qoJo="; + url = "mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.28.tar.gz"; + hash = "sha256-fEJMJTtl/2LPFXe7QYgCGSoYgF6jH6/Ap65YnkRsidI="; }; + buildInputs = [ Test2Suite ]; meta = { description = "Perl client for memcached, in C language"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -2153,10 +2170,10 @@ with self; { Cairo = buildPerlPackage { pname = "Cairo"; - version = "1.108"; + version = "1.109"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.108.tar.gz"; - hash = "sha256-YELLfcUWdasjQ3BZxjhHE8X7vOhExMYAF9LgYZSPBdo="; + url = "mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.109.tar.gz"; + hash = "sha256-ghlzbkAcIxHaX1FXdd5D/YfmOEtQTaNqGS8rIXZDB38="; }; buildInputs = [ pkgs.cairo ]; propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig ]; @@ -2282,10 +2299,10 @@ with self; { CarpAssert = buildPerlPackage { pname = "Carp-Assert"; - version = "0.21"; + version = "0.22"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/Carp-Assert-0.21.tar.gz"; - hash = "sha256-kk+OK048s9iyYka1+cB82qS4gAzvNF+ggR1ykw1zpU4="; + url = "mirror://cpan/authors/id/Y/YV/YVES/Carp-Assert-0.22.tar.gz"; + hash = "sha256-gH6pfGvtdqwuSWnvun2uSP7+ufKHl/ESZxs6yKSTVfc="; }; meta = { description = "Executable comments"; @@ -2295,10 +2312,10 @@ with self; { CarpAssertMore = buildPerlPackage { pname = "Carp-Assert-More"; - version = "1.24"; + version = "2.3.0"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.24.tar.gz"; - hash = "sha256-ulzBZichfdu/tbGk9rGEv500LvuBSNkdo0SfCwN1sis="; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-2.3.0.tar.gz"; + hash = "sha256-/2nqCb2maiAPygiK3ZHFww5lcqt7ujF6f58zxRKzzqc="; }; propagatedBuildInputs = [ CarpAssert ]; buildInputs = [ TestException ]; @@ -2324,10 +2341,10 @@ with self; { Carton = buildPerlPackage { pname = "Carton"; - version = "1.0.34"; + version = "1.0.35"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Carton-v1.0.34.tar.gz"; - hash = "sha256-d9QrknMrz8GKWdNB5WzkdiBbHE04Dqs6ByJPV0XCPkU="; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Carton-v1.0.35.tar.gz"; + hash = "sha256-nEVYypfNCLaf37UrKMPdwgQ+9S8GJ7kOU9BaQIc0QXU="; }; propagatedBuildInputs = [ MenloLegacy PathTiny TryTiny ]; meta = { @@ -2419,10 +2436,10 @@ with self; { CatalystAuthenticationStoreLDAP = buildPerlPackage { pname = "Catalyst-Authentication-Store-LDAP"; - version = "1.016"; + version = "1.017"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-LDAP-1.016.tar.gz"; - hash = "sha256-CFeBKmF83Y1FcdDZonm1hmEy9dhFBv0kK8Bh3HdKozI="; + url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-LDAP-1.017.tar.gz"; + hash = "sha256-keW4vd/XOGYqNh6/6nPYQrO6Me1wne2xqE7DRB3O7sU="; }; propagatedBuildInputs = [ perlldap CatalystPluginAuthentication ClassAccessor ]; buildInputs = [ TestMockObject TestException NetLDAPServerTest ]; @@ -2525,10 +2542,10 @@ with self; { CatalystModelDBICSchema = buildPerlPackage { pname = "Catalyst-Model-DBIC-Schema"; - version = "0.65"; + version = "0.66"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GB/GBJK/Catalyst-Model-DBIC-Schema-0.65.tar.gz"; - hash = "sha256-JqkR7173/8gbbOZcMVb3H7NQg8RWrSfm2C0twCST7uo="; + url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Model-DBIC-Schema-0.66.tar.gz"; + hash = "sha256-GST0wA6PD/HF0a+hbv5PhW8cXnT+VW7Cxfj1v2OtA0g="; }; buildInputs = [ DBDSQLite TestException TestRequires ]; propagatedBuildInputs = [ CatalystComponentInstancePerContext CatalystXComponentTraits DBIxClassSchemaLoader MooseXMarkAsMethods MooseXNonMoose MooseXTypesLoadableClass TieIxHash ]; @@ -2540,10 +2557,10 @@ with self; { CatalystRuntime = buildPerlPackage { pname = "Catalyst-Runtime"; - version = "5.90128"; + version = "5.90131"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Runtime-5.90128.tar.gz"; - hash = "sha256-pt87Da9fZsW0NxDDvyLjSL6LBTdf8dloYIfm9pRiYPk="; + url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Runtime-5.90131.tar.gz"; + hash = "sha256-nWQe+s8PmTXm7LmPWjtHbJYbH4Gb0vjyOmR9HYZ+GEk="; }; buildInputs = [ TestFatal TypeTiny ]; propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT DataDump HTTPBody ModulePluggable MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass PerlIOutf8_strict PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix TaskWeaken TextSimpleTable TreeSimpleVisitorFactory URIws ]; @@ -2733,12 +2750,12 @@ with self; { CatalystPluginSession = buildPerlPackage { pname = "Catalyst-Plugin-Session"; - version = "0.41"; + version = "0.43"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Plugin-Session-0.41.tar.gz"; - hash = "sha256-hWEKF8ofQOuZ3b615TRi8ebVaOiv2Z1Pl1uwf1IKhSg="; + url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Plugin-Session-0.43.tar.gz"; + hash = "sha256-Xn180rlbH8IkS8buuPRPg11gPqB/WjkRCIHbYJKLFMQ="; }; - buildInputs = [ TestDeep TestException TestWWWMechanizePSGI ]; + buildInputs = [ TestDeep TestException TestNeeds ]; propagatedBuildInputs = [ CatalystRuntime ObjectSignature ]; meta = { description = "Generic Session plugin - ties together server side storage and client side state required to maintain session data"; @@ -2833,10 +2850,10 @@ with self; { CatalystPluginStaticSimple = buildPerlPackage { pname = "Catalyst-Plugin-Static-Simple"; - version = "0.36"; + version = "0.37"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Plugin-Static-Simple-0.36.tar.gz"; - hash = "sha256-Nrczj5a+9PJoX3pFVbFRl5Oud4O9PW0iyX87cY8wlFQ="; + url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Plugin-Static-Simple-0.37.tar.gz"; + hash = "sha256-Wk2Fo1iM1Og/GwAlgUEufXG31X9mBW5dh6Nvk9icnnw="; }; patches = [ ../development/perl-modules/catalyst-plugin-static-simple-etag.patch ]; propagatedBuildInputs = [ CatalystRuntime MIMETypes MooseXTypes ]; @@ -2862,10 +2879,10 @@ with self; { CatalystViewCSV = buildPerlPackage { pname = "Catalyst-View-CSV"; - version = "1.7"; + version = "1.8"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MC/MCB/Catalyst-View-CSV-1.7.tar.gz"; - hash = "sha256-5BMmtgmYkfJEtDKSHtEAlqxhnzK4xPi0FjMxO9VGYts="; + url = "mirror://cpan/authors/id/J/JM/JMREIN/Catalyst-View-CSV-1.8.tar.gz"; + hash = "sha256-vKcEaDzDXEevuJrDjHFRAu2+gIF57gcz0qDrMRojbN8="; }; buildInputs = [ CatalystActionRenderView CatalystModelDBICSchema CatalystPluginConfigLoader CatalystXComponentTraits ConfigGeneral DBDSQLite DBIxClass TestException ]; propagatedBuildInputs = [ CatalystRuntime TextCSV ]; @@ -2905,10 +2922,10 @@ with self; { CatalystViewTT = buildPerlPackage { pname = "Catalyst-View-TT"; - version = "0.45"; + version = "0.46"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-View-TT-0.45.tar.gz"; - hash = "sha256-KN8SU3w9Xg5aSJ/GZL2+rgEyfZvegkW/QJjfgt+870s="; + url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-View-TT-0.46.tar.gz"; + hash = "sha256-7aRFfbv4GkJBtzWl1GnZcn2KMJHSSvGuPJog8CTeUcw="; }; propagatedBuildInputs = [ CatalystRuntime ClassAccessor TemplateTimer ]; meta = { @@ -2997,10 +3014,10 @@ with self; { Catmandu = buildPerlModule { pname = "Catmandu"; - version = "1.2013"; + version = "1.2020"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NI/NICS/Catmandu-1.2013.tar.gz"; - hash = "sha256-OHIYl8hKwsKNVYHBHTtGevkwwfN34L0uwzCPAiXGBGo="; + url = "mirror://cpan/authors/id/H/HO/HOCHSTEN/Catmandu-1.2020.tar.gz"; + hash = "sha256-1jIbR+NkGvkb7vZjNhWZVk88wzwAc5isa7opuO5A4cU="; }; propagatedBuildInputs = [ AnyURIEscape AppCmd CGIExpand ConfigOnion CpanelJSONXS DataCompare DataUtil IOHandleUtil LWP ListMoreUtils LogAny MIMETypes ModuleInfo MooXAliases ParserMGC PathIteratorRule PathTiny StringCamelCase TextCSV TextHogan Throwable TryTinyByClass URITemplate UUIDTiny YAMLLibYAML namespaceclean ]; buildInputs = [ LogAnyAdapterLog4perl LogLog4perl TestDeep TestException TestLWPUserAgent TestPod ]; @@ -3043,10 +3060,10 @@ with self; { CGI = buildPerlPackage { pname = "CGI"; - version = "4.51"; + version = "4.59"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.51.tar.gz"; - hash = "sha256-C9IV5wEvn1Lmp9P+aV7jDvlZ15bo5TRy+g7YxT+6YAo="; + url = "mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.59.tar.gz"; + hash = "sha256-be5LibiLEOd8lvPAjRm1hq74M7F6Ql1hiq19KMJi+Rw="; }; buildInputs = [ TestDeep TestNoWarnings TestWarn ]; propagatedBuildInputs = [ HTMLParser ]; @@ -3059,10 +3076,10 @@ with self; { CGICompile = buildPerlModule { pname = "CGI-Compile"; - version = "0.25"; + version = "0.26"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RK/RKITOVER/CGI-Compile-0.25.tar.gz"; - hash = "sha256-9Et07t+9Hrjw+WiPndrhVCLl+kiueL4hsK/LnjJJDqU="; + url = "mirror://cpan/authors/id/R/RK/RKITOVER/CGI-Compile-0.26.tar.gz"; + hash = "sha256-TzhcEMLJd+tgPzjNFT4OA2jfA3H9vSP1qm7nL0/GXcg="; }; propagatedBuildInputs = [ Filepushd SubName ]; buildInputs = [ CGI CaptureTiny ModuleBuildTiny SubIdentify Switch TestNoWarnings TestRequires TryTiny ]; @@ -3118,10 +3135,10 @@ with self; { CGIFast = buildPerlPackage { pname = "CGI-Fast"; - version = "2.15"; + version = "2.16"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEEJO/CGI-Fast-2.15.tar.gz"; - hash = "sha256-5TQt89xZPt+3JMev6FCxoO51P01zP1GT4DewRjPf7s4="; + url = "mirror://cpan/authors/id/L/LE/LEEJO/CGI-Fast-2.16.tar.gz"; + hash = "sha256-AiPX+RuAA3ud/183NgZAtx9dyNvZiaBZPV0i8/c8s9Q="; }; propagatedBuildInputs = [ CGI FCGI ]; doCheck = false; @@ -3189,14 +3206,13 @@ with self; { }; }; - CGISimple = buildPerlModule { + CGISimple = buildPerlPackage { pname = "CGI-Simple"; - version = "1.25"; + version = "1.280"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.25.tar.gz"; - hash = "sha256-5ebPNuoG8OZ7vc3Zz7aY80yZNR6usy3U+mNviZQ+9H4="; + url = "mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.280.tar.gz"; + hash = "sha256-GOAen/uBTl5O6neshImyBp/oNlGFUPN/bCIT61Wcar8="; }; - propagatedBuildInputs = [ IOStringy ]; buildInputs = [ TestException TestNoWarnings ]; meta = { description = "A Simple totally OO CGI interface that is CGI.pm compliant"; @@ -3220,10 +3236,10 @@ with self; { CHI = buildPerlPackage { pname = "CHI"; - version = "0.60"; + version = "0.61"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JS/JSWARTZ/CHI-0.60.tar.gz"; - hash = "sha256-x/Gis1cKj+3khOkz+Juhcp4KvQWTV5HRRsUi3RIO6FE="; + url = "mirror://cpan/authors/id/A/AS/ASB/CHI-0.61.tar.gz"; + hash = "sha256-WDVFyeUxK7QZOrFt6fVf+PS0p97RKM7o3SywIdRni1s="; }; preConfigure = '' # fix error 'Unescaped left brace in regex is illegal here in regex' @@ -3239,12 +3255,13 @@ with self; { Chart = buildPerlPackage { pname = "Chart"; - version = "2.4.10"; + version = "2.403.9"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHARTGRP/Chart-2.4.10.tar.gz"; - hash = "sha256-hL2ZoaDOckd7FeNYgeYSA5i7P1U67rXo1ysIhSDk9r8="; + url = "mirror://cpan/authors/id/L/LI/LICHTKIND/Chart-v2.403.9.tar.gz"; + hash = "sha256-V8aCi7TIpyFw/rZ9wfFIq/Gcqzgnd54wh3tGEe1n86s="; }; - propagatedBuildInputs = [ GD ]; + buildInputs = [ TestWarn ]; + propagatedBuildInputs = [ GD GraphicsToolkitColor ]; meta = { description = "A series of charting modules"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -3266,10 +3283,10 @@ with self; { CLASS = buildPerlPackage { pname = "CLASS"; - version = "1.00"; + version = "1.1.8"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSCHWERN/CLASS-1.00.tar.gz"; - hash = "sha256-xRhWIIFXAbP+whMUzNjFaT5r/VGUMVJ9ozcKgWQiBnE="; + url = "mirror://cpan/authors/id/J/JD/JDEGUEST/CLASS-v1.1.8.tar.gz"; + hash = "sha256-IZAaUmXL29iRJ36X/Gs0X3nby/B3RFePX/iGaltddgM="; }; meta = { description = "Alias for __PACKAGE__"; @@ -3451,10 +3468,10 @@ with self; { ClassDataInheritable = buildPerlPackage { pname = "Class-Data-Inheritable"; - version = "0.08"; + version = "0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.08.tar.gz"; - hash = "sha256-mWf+zuoVIn5ELsgYcjFj621zuJR+MfFquAb24jka8Uo="; + url = "mirror://cpan/authors/id/R/RS/RSHERER/Class-Data-Inheritable-0.09.tar.gz"; + hash = "sha256-RAiNbpBxLhh7ilsFDKWxxw7+K6oyrhI+m9j1nynwbk0="; }; meta = { description = "Inheritable, overridable class data"; @@ -3602,10 +3619,10 @@ with self; { ClassMethodModifiers = buildPerlPackage { pname = "Class-Method-Modifiers"; - version = "2.13"; + version = "2.15"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Class-Method-Modifiers-2.13.tar.gz"; - hash = "sha256-q1gH9xAYqELea3pIJtbB8kuNWwn8zlAFozCc9upA/WM="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Class-Method-Modifiers-2.15.tar.gz"; + hash = "sha256-Zc2Fv+R10GbpGG96jMY2BwmFswsOuxzehoHPBiwuFfw="; }; buildInputs = [ TestFatal TestNeeds ]; meta = { @@ -3734,10 +3751,10 @@ with self; { ClassObservable = buildPerlPackage { pname = "Class-Observable"; - version = "1.04"; + version = "2.004"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CW/CWINTERS/Class-Observable-1.04.tar.gz"; - hash = "sha256-PvGHM6DwPBE/O8+KxQR24Jyh/mI09KqsqiTfypUWgJQ="; + url = "mirror://cpan/authors/id/A/AR/ARISTOTLE/Class-Observable-2.004.tar.gz"; + hash = "sha256-bfMun+XwCIkfxO+k5PReqhQE0wIgRZyPyKUB8KfPLmk="; }; propagatedBuildInputs = [ ClassISA ]; meta = { @@ -3836,13 +3853,13 @@ with self; { CLIHelpers = buildPerlPackage { pname = "CLI-Helpers"; - version = "1.8"; + version = "2.0"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BL/BLHOTSKY/CLI-Helpers-1.8.tar.gz"; - hash = "sha256-In25W2MzgnAkVUzDLvcI0wwaf/uW39RCX4/g46/18cE="; + url = "mirror://cpan/authors/id/B/BL/BLHOTSKY/CLI-Helpers-2.0.tar.gz"; + hash = "sha256-yhpPFnTzsfMmjyekfJiAszgmrenxI34sEUXnAqfIePY="; }; buildInputs = [ PodCoverageTrustPod TestPerlCritic ]; - propagatedBuildInputs = [ CaptureTiny RefUtil SubExporter TermReadKey YAML ]; + propagatedBuildInputs = [ CaptureTiny IOInteractive RefUtil TermReadKey YAML ]; meta = { description = "Subroutines for making simple command line scripts"; homepage = "https://github.com/reyjrar/CLI-Helpers"; @@ -3852,10 +3869,10 @@ with self; { Clipboard = buildPerlModule { pname = "Clipboard"; - version = "0.26"; + version = "0.28"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.26.tar.gz"; - hash = "sha256-iGrkPchTj5v8Tgf9vPCbf71u5Zwx82RhjIWd4UlTxYo="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.28.tar.gz"; + hash = "sha256-no15AVGUJjNXwloPXQlIAP/0O9v5+GAew7DtXrCWbSY="; }; propagatedBuildInputs = [ CGI ]; # Disable test on darwin because MacPasteboard fails when not logged in interactively. @@ -3873,10 +3890,10 @@ with self; { Clone = buildPerlPackage { pname = "Clone"; - version = "0.45"; + version = "0.46"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Clone-0.45.tar.gz"; - hash = "sha256-y7buNIr6lUMuSHiJO0Z1JUnnDcaP5tnkMNHS6ZB5qeY="; + url = "mirror://cpan/authors/id/G/GA/GARU/Clone-0.46.tar.gz"; + hash = "sha256-qt7tXkyL1rvfaMDdAGbLUT4Wq55bQ4LcSgqv1ViQaXs="; }; buildInputs = [ BCOW ]; meta = { @@ -3915,10 +3932,10 @@ with self; { CodeTidyAll = buildPerlPackage { pname = "Code-TidyAll"; - version = "0.78"; + version = "0.83"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.78.tar.gz"; - hash = "sha256-Ml67QdhZAG7jK2Qmu+hlhnjqywPAESCqYoZZ9uY3ubY="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.83.tar.gz"; + hash = "sha256-FqBS0DprF/xYqEqZb68p5C7O124sQMRyc+uKsxzBXKE="; }; propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ]; buildInputs = [ TestClass TestClassMost TestDeep TestDifferences TestException TestFatal TestMost TestWarn TestWarnings librelative ]; @@ -4033,10 +4050,10 @@ with self; { CompressRawBzip2 = buildPerlPackage { pname = "Compress-Raw-Bzip2"; - version = "2.101"; + version = "2.206"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.101.tar.gz"; - hash = "sha256-DJsTT9OIKQ4w6Q/J9jkAlmEn+Y52sFTs1IHrO1UAuNg="; + url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.206.tar.gz"; + hash = "sha256-ISuB2xwK6CLRmShhmmA70QjLXVxHAPxn3HyxaeDMZSU="; }; # Don't build a private copy of bzip2. @@ -4053,10 +4070,10 @@ with self; { CompressRawLzma = buildPerlPackage { pname = "Compress-Raw-Lzma"; - version = "2.101"; + version = "2.206"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Lzma-2.101.tar.gz"; - hash = "sha256-uyZ/0xmB7aEfREA4+KD8pLlKUa5hsttxJGq/ak0yKjY="; + url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Lzma-2.206.tar.gz"; + hash = "sha256-4BpwQLhL3GdZLRPuwMeIWQ4faW0dTwfHCXvXKk+IbrQ="; }; preConfigure = '' cat > config.in <<EOF @@ -4073,11 +4090,11 @@ with self; { CompressRawZlib = buildPerlPackage { pname = "Compress-Raw-Zlib"; - version = "2.103"; + version = "2.206"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.103.tar.gz"; - hash = "sha256-1p0mIMoCTcG0JPf0Io/hFpsrd0FrswMQ6JDTvn2kff8="; + url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.206.tar.gz"; + hash = "sha256-Rnhaajg6HIQ4lbf58l1ddZ58MFFZ+dHgSjYE63THc3Q="; }; preConfigure = '' @@ -4087,6 +4104,7 @@ with self; { LIB = ${pkgs.zlib.out}/lib OLD_ZLIB = False GZIP_OS_CODE = AUTO_DETECT + USE_ZLIB_NG = False EOF ''; @@ -4114,10 +4132,10 @@ with self; { ConfigAny = buildPerlPackage { pname = "Config-Any"; - version = "0.32"; + version = "0.33"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Config-Any-0.32.tar.gz"; - hash = "sha256-aNoqXPJfrt1NJM89DVcJlcGZ1blQEIot541A3s7TYVA="; + url = "mirror://cpan/authors/id/H/HA/HAARG/Config-Any-0.33.tar.gz"; + hash = "sha256-wGaOtfLNNVvyBVfwTcGKJUdLegvPp5Vi4xZdmjx4kzM="; }; propagatedBuildInputs = [ ModulePluggable ]; meta = { @@ -4128,10 +4146,10 @@ with self; { ConfigAutoConf = buildPerlPackage { pname = "Config-AutoConf"; - version = "0.319"; + version = "0.320"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.319.tar.gz"; - hash = "sha256-ME9mzCZTJkwP4SfSFmnobT0YzXLyV02PUTG+7DGgoz4="; + url = "mirror://cpan/authors/id/A/AM/AMBS/Config-AutoConf-0.320.tar.gz"; + hash = "sha256-u1epWO9J0/cWInba4Up71a9D/R2FEyMa811mVFlFQCM="; }; propagatedBuildInputs = [ CaptureTiny ]; meta = { @@ -4143,10 +4161,10 @@ with self; { ConfigGeneral = buildPerlPackage { pname = "Config-General"; - version = "2.63"; + version = "2.65"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.63.tar.gz"; - hash = "sha256-Cpv5d7iqvnY0PogJXSKWyKQiQQ/SoFoZAfKyDi4fb60="; + url = "mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.65.tar.gz"; + hash = "sha256-TW1XVL46nzCQaDbwzBDlVMiDLhTnoTQe+xWwXXBvxY8="; }; meta = { description = "Generic Config Module"; @@ -4185,10 +4203,10 @@ with self; { ConfigINI = buildPerlPackage { pname = "Config-INI"; - version = "0.025"; + version = "0.029"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Config-INI-0.025.tar.gz"; - hash = "sha256-Yov3bVuR+J3eItSBPsAzAm6/cbdyu2HM2pCdoAyGlzI="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Config-INI-0.029.tar.gz"; + hash = "sha256-C755enMCEGRKkH2QzUqisjrVgMsnvTk5O/xqfvn9/eo="; }; propagatedBuildInputs = [ MixinLinewise ]; meta = { @@ -4262,10 +4280,10 @@ with self; { ConfigMVP = buildPerlPackage { pname = "Config-MVP"; - version = "2.200011"; + version = "2.200013"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200011.tar.gz"; - hash = "sha256-I8lWZvxDxK2uvMCTsbVgke/CpqotdTZqIW0Y7alq1xY="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200013.tar.gz"; + hash = "sha256-AY0WFiPuOmf4YNnmgOIuYbeermAY8OfDtSX8k09bfUU="; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ ModulePluggable MooseXOneArgNew RoleHasMessage RoleIdentifiable Throwable TieIxHash ]; @@ -4278,10 +4296,10 @@ with self; { ConfigMVPReaderINI = buildPerlPackage { pname = "Config-MVP-Reader-INI"; - version = "2.101463"; + version = "2.101465"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-Reader-INI-2.101463.tar.gz"; - hash = "sha256-aakWvzcR68nn1MqqcPPGlekYuTpZI5WHczA+DaC21EU="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-Reader-INI-2.101465.tar.gz"; + hash = "sha256-E8eqJ8HfmM0zraOZ5Z/zj6v6nWVRPkKvAvcsLT9jYkc="; }; propagatedBuildInputs = [ ConfigINI ConfigMVP ]; meta = { @@ -4333,10 +4351,10 @@ with self; { ConfigTiny = buildPerlPackage { pname = "Config-Tiny"; - version = "2.24"; + version = "2.29"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Config-Tiny-2.24.tgz"; - hash = "sha256-EGSUjkvFfobjGNvIeRxTyludlblYzEdDZ8MneYETUjI="; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Config-Tiny-2.29.tgz"; + hash = "sha256-PeebDqA6jWqT6dkSj+hF+1ViIrFGmaT28NXKBXrjMzs="; }; buildInputs = [ TestPod ]; meta = { @@ -4363,10 +4381,10 @@ with self; { Connector = buildPerlModule { pname = "Connector"; - version = "1.47"; + version = "1.53"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.47.tar.gz"; - hash = "sha256-I2R4pAq53cIVgu4na6krnjgbP8XtljkKLe2o4nSGeoM="; + url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.53.tar.gz"; + hash = "sha256-1D50VEcZ/7lKDgZFhqetRXVbKTZPGJHZ4ncEFqsSTPo="; }; buildInputs = [ ModuleBuildTiny ConfigMerge ConfigStd ConfigVersioned DBDSQLite DBI IOSocketSSL JSON LWP LWPProtocolHttps ProcSafeExec TemplateToolkit YAML ]; propagatedBuildInputs = [ LogLog4perl Moose ]; @@ -4417,10 +4435,10 @@ with self; { ConvertASN1 = buildPerlPackage { pname = "Convert-ASN1"; - version = "0.33"; + version = "0.34"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TIMLEGGE/Convert-ASN1-0.33.tar.gz"; - hash = "sha256-H98ARSDHnjokTPlohhYpNRbBF5PXRsdh82dJbrPQYHY="; + url = "mirror://cpan/authors/id/T/TI/TIMLEGGE/Convert-ASN1-0.34.tar.gz"; + hash = "sha256-pijXydOQVo+3Y1mXX6A/YmzlfxDcF5gOjjWH13E+Tuc="; }; meta = { description = "ASN.1 Encode/Decode library"; @@ -4458,12 +4476,12 @@ with self; { ConvertColor = buildPerlModule { pname = "Convert-Color"; - version = "0.11"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Convert-Color-0.11.tar.gz"; - hash = "sha256-tBIXxykxA0ukQX16nh4pmfBFgNTmsxxwmT/tzMJEDTg="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Convert-Color-0.17.tar.gz"; + hash = "sha256-5/jDN8VSXqoDd3xXaD6hGvm5j/HQURojSvH4CkMiTsc="; }; - buildInputs = [ TestNumberDelta ]; + buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ ListUtilsBy ModulePluggable ]; meta = { description = "Color space conversions and named lookups"; @@ -4500,10 +4518,10 @@ with self; { curry = buildPerlPackage { pname = "curry"; - version = "1.001000"; + version = "2.000001"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSTROUT/curry-1.001000.tar.gz"; - hash = "sha256-ixhgeSAgZPs9zCXPcpCqP11VHZjRuG1YRHBqdgwfVtQ="; + url = "mirror://cpan/authors/id/M/MS/MSTROUT/curry-2.000001.tar.gz"; + hash = "sha256-yY/iBQ+t7KOYGdboDVROkSGE/oRsvnNTnGhpT7G1HAg="; }; meta = { description = "Create automatic curried method call closures for any class or object"; @@ -4619,10 +4637,10 @@ with self; { CPAN = buildPerlPackage { pname = "CPAN"; - version = "2.29"; + version = "2.36"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.29.tar.gz"; - hash = "sha256-H1VnLv1QWpuqz6GSTRFTYhIKpr+O+rehfHywkLF8zEE="; + url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.36.tar.gz"; + hash = "sha256-HXKl60DliOPBDx88hckC6HGxaDdH1ncjOvd3yCv8kJ4="; }; propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases CompressBzip2 Expect FileHomeDir FileWhich LWP LogLog4perl ModuleSignature TermReadKey TextGlob YAML YAMLLibYAML YAMLSyck IOSocketSSL ]; meta = { @@ -4634,10 +4652,10 @@ with self; { CPANAudit = buildPerlPackage { pname = "CPAN-Audit"; - version = "20230309.004"; + version = "20230826.001"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/CPAN-Audit-20230309.004.tar.gz"; - hash = "sha256-RzrvktoYTMY1SqiG8QvwRnjvovHpmxZ/o+nvXOGmS14="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/CPAN-Audit-20230826.001.tar.gz"; + hash = "sha256-DXU7O9fdpXweIKycWScKcKTNkfttfN4mJEPoVUy2Geo="; }; buildInputs = [ CaptureTiny YAMLTiny ]; propagatedBuildInputs = [ CPANDistnameInfo IOInteractive JSON ModuleCPANfile ModuleExtractVERSION PerlIOgzip Mojolicious ]; @@ -4650,10 +4668,10 @@ with self; { CPANMini = buildPerlPackage { pname = "CPAN-Mini"; - version = "1.111016"; + version = "1.111017"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Mini-1.111016.tar.gz"; - hash = "sha256-Wil6/D42etgIEUZNTrfk3Tyv+LpJnN0rVY9ieUQ6dlc="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Mini-1.111017.tar.gz"; + hash = "sha256-8gQpO+JqyEGsyHBEoYjbD1kegIgTFseiiK7A7s4wYVU="; }; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = [ FileHomeDir LWPProtocolHttps ]; @@ -4672,10 +4690,10 @@ with self; { CpanelJSONXS = buildPerlPackage { pname = "Cpanel-JSON-XS"; - version = "4.36"; + version = "4.37"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.36.tar.gz"; - hash = "sha256-7OhHQhfLLt8E5PUaGM7aN4e1sd//7iyJGbLrEJpnJu0="; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.37.tar.gz"; + hash = "sha256-wkFhWg4X/3Raqoa79Gam4pzSQFFeZfBqegUBe2GebUs="; }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; @@ -4686,10 +4704,10 @@ with self; { CPAN02PackagesSearch = buildPerlModule { pname = "CPAN-02Packages-Search"; - version = "0.001"; + version = "0.100"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/CPAN-02Packages-Search-0.001.tar.gz"; - hash = "sha256-Z1wVLOaOcz9MQPVuzcGhkVxv/1X2IrBEFCqlrOjFrwk="; + url = "mirror://cpan/authors/id/S/SK/SKAJI/CPAN-02Packages-Search-0.100.tar.gz"; + hash = "sha256-prabrHmiUwA0RrKD76bzrv+mCdDBxStCCYeCEtpw+as="; }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ TieHandleOffset ]; @@ -4760,10 +4778,10 @@ with self; { CPANMetaCheck = buildPerlPackage { pname = "CPAN-Meta-Check"; - version = "0.014"; + version = "0.018"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.014.tar.gz"; - hash = "sha256-KKBXK/wcBnjZzn2kjPUhCXraIw+W6z0GP8uuHP5qNR8="; + url = "mirror://cpan/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.018.tar.gz"; + hash = "sha256-9hnS316g/ZHIz4PrVKzMteQ9nm7Bo/cns9CsFdDPN4o="; }; buildInputs = [ TestDeep ]; meta = { @@ -4774,10 +4792,10 @@ with self; { CPANPerlReleases = buildPerlPackage { pname = "CPAN-Perl-Releases"; - version = "5.20201120"; + version = "5.20230920"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20201120.tar.gz"; - hash = "sha256-c2ByY+fKTXwrKu7EUR06vAtYz5CHFSS373iaUoyoUuM="; + url = "mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20230920.tar.gz"; + hash = "sha256-MbyTiJR2uOx1iRjdmSSmKYPgh7BsjN6Sb7mnp+h60cA="; }; meta = { description = "Mapping Perl releases on CPAN to the location of the tarballs"; @@ -4788,10 +4806,10 @@ with self; { CPANPLUS = buildPerlPackage { pname = "CPANPLUS"; - version = "0.9908"; + version = "0.9914"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/CPANPLUS-0.9908.tar.gz"; - hash = "sha256-WPastH15HtjjCm68wlCJIYusrZbkbajmIakrd4xWndQ="; + url = "mirror://cpan/authors/id/B/BI/BINGOS/CPANPLUS-0.9914.tar.gz"; + hash = "sha256-dsPl2mI6SvYP5krexEj7H44Mrp9nmKNraIZZdAROm2c="; }; propagatedBuildInputs = [ ArchiveExtract ModulePluggable ObjectAccessor PackageConstants TermUI ]; meta = { @@ -4804,10 +4822,10 @@ with self; { CPANUploader = buildPerlPackage { pname = "CPAN-Uploader"; - version = "0.103015"; + version = "0.103018"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103015.tar.gz"; - hash = "sha256-jgh+/jYl3suBaymR/4195K1xkPmGPQSQlnAU9nGfu8U="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103018.tar.gz"; + hash = "sha256-xP/k7enbebOW47/F583w4umCHh8eCH9SO8+nTJ/J4kg="; }; propagatedBuildInputs = [ FileHomeDir GetoptLongDescriptive LWPProtocolHttps TermReadKey ]; meta = { @@ -4820,10 +4838,10 @@ with self; { CryptArgon2 = buildPerlModule { pname = "Crypt-Argon2"; - version = "0.010"; + version = "0.019"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Argon2-0.010.tar.gz"; - hash = "sha256-PqHABvEO9m/UF+UCpWnfFcTMHHdrCE41Y5dRxBzmZxo="; + url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Argon2-0.019.tar.gz"; + hash = "sha256-+Fm+6NL2tAf11EZFwiOu4hL+AFkd/YLlBlrhvnio5Dg="; }; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; meta = { @@ -4887,17 +4905,11 @@ with self; { CryptCurve25519 = buildPerlPackage { pname = "Crypt-Curve25519"; - version = "0.06"; + version = "0.07"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AJ/AJGB/Crypt-Curve25519-0.06.tar.gz"; - hash = "sha256-n0hwPbTuyiluqCwtZuShOfInC437C+38T/lEVLt7IMc="; + url = "mirror://cpan/authors/id/K/KA/KARASIK/Crypt-Curve25519-0.07.tar.gz"; + hash = "sha256-Z6mIcTclIdb34R/dYnyq21wdVAFCag6c9CFnpDxbSx0="; }; - patches = [ - (fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-perl/Crypt-Curve25519/files/Crypt-Curve25519-0.60.0-fmul-fixedvar.patch?id=cec727ad614986ca1e6b9468eea7f1a5a9183382"; - hash = "sha256-Dq431QnMuI9V34BKy7SNaQMXD4lykDuo3wab278sAFA="; - }) - ]; meta = { description = "Generate shared secret using elliptic-curve Diffie-Hellman function"; homepage = "https://metacpan.org/release/Crypt-Curve25519"; @@ -5008,10 +5020,10 @@ with self; { CryptFormat = buildPerlPackage { pname = "Crypt-Format"; - version = "0.10"; + version = "0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FE/FELIPE/Crypt-Format-0.10.tar.gz"; - hash = "sha256-id3AEKbJHVvnoYdKUo7tbto58sQBwY5j2A3fv3En4t0="; + url = "mirror://cpan/authors/id/F/FE/FELIPE/Crypt-Format-0.12.tar.gz"; + hash = "sha256-p1cdS+9XeOGln0O2XPLVaAtJ+nu78z89IfRSL0Pmp9o="; }; buildInputs = [ TestException TestFailWarnings ]; meta = { @@ -5061,10 +5073,10 @@ with self; { CryptJWT = buildPerlPackage { pname = "Crypt-JWT"; - version = "0.029"; + version = "0.035"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIK/Crypt-JWT-0.029.tar.gz"; - hash = "sha256-D8z/KQZaAJju8VHe6zPBLA1o4WoctOdGWybrvUwYzS8="; + url = "mirror://cpan/authors/id/M/MI/MIK/Crypt-JWT-0.035.tar.gz"; + hash = "sha256-XPvVX63DrtNtZ0/AU6zoZ7XT4aTOiiDPu3wmef3wlkE="; }; propagatedBuildInputs = [ CryptX JSON ]; meta = { @@ -5089,10 +5101,10 @@ with self; { CryptPassphraseArgon2 = buildPerlPackage { pname = "Crypt-Passphrase-Argon2"; - version = "0.003"; + version = "0.009"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Passphrase-Argon2-0.003.tar.gz"; - hash = "sha256-cCkLtb3GfBcBKN8+UWexfQS7eTkzqubAWnWGfao/OTg="; + url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Passphrase-Argon2-0.009.tar.gz"; + hash = "sha256-M39AVZY6EG2bt7tcJvwPSHCGYJ2XKHVgucpEwEPCF1I="; }; propagatedBuildInputs = with perlPackages; [ CryptArgon2 CryptPassphrase ]; meta = { @@ -5116,12 +5128,12 @@ with self; { }; }; - CryptPasswdMD5 = buildPerlModule { + CryptPasswdMD5 = buildPerlPackage { pname = "Crypt-PasswdMD5"; - version = "1.40"; + version = "1.42"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Crypt-PasswdMD5-1.40.tgz"; - hash = "sha256-t31q7qJTAa975nn3RS6JTKiK+XEL/9bgHWZaFBw5GUg="; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Crypt-PasswdMD5-1.42.tgz"; + hash = "sha256-/Tlubn9E7rkj6TyZOUC49nqa7Vb8dKrK8Dj8QFPvO1k="; }; meta = { description = "Provide interoperable MD5-based crypt() functions"; @@ -5131,12 +5143,12 @@ with self; { CryptPKCS10 = buildPerlModule { pname = "Crypt-PKCS10"; - version = "2.001"; + version = "2.005"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-PKCS10-2.001.tar.gz"; - hash = "sha256-95RbdqLY9Njs9iey646k9B0AHmqRXv6C5x1rl/6j/6k="; + url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-PKCS10-2.005.tar.gz"; + hash = "sha256-LdEv0JHCPjp8NKZqw1rDq/kHQCOUtVV0mO3kj8QUU6c="; }; - buildInputs = [ pkgs.unzip ModuleBuildTiny ]; + buildInputs = [ CryptX ModuleBuildTiny pkgs.unzip ]; propagatedBuildInputs = [ ConvertASN1 ]; meta = { description = "Parse PKCS #10 certificate requests"; @@ -5163,10 +5175,10 @@ with self; { CryptRandom = buildPerlPackage rec { pname = "Crypt-Random"; - version = "1.52"; + version = "1.54"; src = fetchurl { - url = "mirror://cpan/authors/id/V/VI/VIPUL/Crypt-Random-1.52.tar.gz"; - hash = "sha256-qTwG3kCeby6y6YaOptTmU9mfL3kAssGDHh9lrODE74Q="; + url = "mirror://cpan/authors/id/V/VI/VIPUL/Crypt-Random-1.54.tar.gz"; + hash = "sha256-1m+OF+3Dh3zHl/3VneU045kGNvjxpecmBiFZr35n2sw="; }; propagatedBuildInputs = [ ClassLoader MathPari StatisticsChiSquare ]; meta = { @@ -5221,10 +5233,10 @@ with self; { CryptRandPasswd = buildPerlPackage { pname = "Crypt-RandPasswd"; - version = "0.06"; + version = "0.07"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/Crypt-RandPasswd-0.06.tar.gz"; - hash = "sha256-sb2QR42cx19MffpNvub9DApAoaUpKI33JpeHMwgpSDE="; + url = "mirror://cpan/authors/id/J/JA/JANITOR/Crypt-RandPasswd-0.07.tar.gz"; + hash = "sha256-bd26Sdx+DwBRr6oKvhbxN4OiRM0eu1+B2qEay2KKSWE="; }; meta = { description = "Random password generator based on FIPS-181"; @@ -5264,10 +5276,10 @@ with self; { CryptRijndael = buildPerlPackage { pname = "Crypt-Rijndael"; - version = "1.15"; + version = "1.16"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-1.15.tar.gz"; - hash = "sha256-oJibVZkNeQXRtb9STNi0aq3A3neEFNTKjUBqoqpZQWM="; + url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-1.16.tar.gz"; + hash = "sha256-ZUAIXjgEuCpvB1LBEiz3jK3SIZkBNt1v1MCX0FbITUA="; }; meta = { description = "Crypt::CBC compliant Rijndael encryption module"; @@ -5290,10 +5302,10 @@ with self; { CryptURandom = buildPerlPackage { pname = "Crypt-URandom"; - version = "0.36"; + version = "0.39"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DD/DDICK/Crypt-URandom-0.36.tar.gz"; - hash = "sha256-gf7JkhrcXTyRy+CtjLK7ibBFxPsN6cs8Q/F+WOR3+KE="; + url = "mirror://cpan/authors/id/D/DD/DDICK/Crypt-URandom-0.39.tar.gz"; + hash = "sha256-Jol7PPualWAJFRLWCHMaPVv08pn20Pj3LIXzmQEkQSI="; }; meta = { description = "Provide non blocking randomness"; @@ -5394,11 +5406,12 @@ with self; { CryptOpenSSLAES = buildPerlPackage { pname = "Crypt-OpenSSL-AES"; - version = "0.02"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TT/TTAR/Crypt-OpenSSL-AES-0.02.tar.gz"; - hash = "sha256-tm+rUU7fl/wy9Y2iV1gnBKIQwrNeKX1cMbf6L/0I6Qg="; + url = "mirror://cpan/authors/id/T/TI/TIMLEGGE/Crypt-OpenSSL-AES-0.17.tar.gz"; + hash = "sha256-7+GBsYxtIqc/LlNWOQ6Fdyes5UY2JeIhHdhgIyvtO7c="; }; + buildInputs = [ CryptOpenSSLGuess FileWhich pkgs.openssl ]; env.NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -lcrypto"; meta = { @@ -5473,10 +5486,10 @@ with self; { CryptOpenSSLX509 = buildPerlPackage rec { pname = "Crypt-OpenSSL-X509"; - version = "1.914"; + version = "1.915"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JO/JONASBN/Crypt-OpenSSL-X509-1.914.tar.gz"; - hash = "sha256-ScV1JX5kCK1aiQEeW1gA1Zj5zK/fQucQBO2Byy9E7no="; + url = "mirror://cpan/authors/id/J/JO/JONASBN/Crypt-OpenSSL-X509-1.915.tar.gz"; + hash = "sha256-xNvBbE/CloV4I3v8MkWH/9eSSacQFQJlLbnjjUSJUX8="; }; env.NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -lcrypto"; @@ -5510,13 +5523,13 @@ with self; { CryptPerl = buildPerlPackage { pname = "Crypt-Perl"; - version = "0.34"; + version = "0.38"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FE/FELIPE/Crypt-Perl-0.34.tar.gz"; - hash = "sha256-DhyyI98AQfbZsBDxHm+XqXq1WhGKJzk460/oXUA/GxE="; + url = "mirror://cpan/authors/id/F/FE/FELIPE/Crypt-Perl-0.38.tar.gz"; + hash = "sha256-eJdUj7AeFqIK5JDt3UZX+Br3sZKEFLkvbbQsY10ax+A="; }; nativeCheckInputs = [ pkgs.openssl MathBigIntGMP ]; - buildInputs = [ CallContext FileSlurp FileWhich TestClass TestDeep TestException TestFailWarnings TestNoWarnings ]; + buildInputs = [ CallContext ExtUtilsMakeMakerCPANfile FileSlurp FileWhich TestClass TestDeep TestException TestFailWarnings TestNoWarnings ]; propagatedBuildInputs = [ BytesRandomSecureTiny ClassAccessor ConvertASN1 CryptFormat MathProvablePrime SymbolGet TryTiny ]; meta = { description = "Cryptography in pure Perl"; @@ -5527,10 +5540,10 @@ with self; { CryptEd25519 = buildPerlPackage { pname = "Crypt-Ed25519"; - version = "1.04"; + version = "1.05"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Crypt-Ed25519-1.04.tar.gz"; - hash = "sha256-WFBKYedGQB6HiEEE/MmNAxM51T9IfElV//tesdAykMs="; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Crypt-Ed25519-1.05.tar.gz"; + hash = "sha256-sdEaWU/rUeQG2BsUfcDRClV8z0yrgcDbP4mBAmd9JKg="; }; nativeBuildInputs = [ CanaryStability ]; @@ -5568,6 +5581,9 @@ with self; { hash = "sha256-Zbl46/PDmF5V7jK7baHp+upJSoXTAFxjuux+lphZ8CY="; }; propagatedBuildInputs = [ Clone ]; + preCheck = '' + rm t/css-dom.t # Remove test that fails due to deprecated package separator warning + ''; meta = { description = "Document Object Model for Cascading Style Sheets"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -5587,14 +5603,15 @@ with self; { }; }; - CSSMinifierXS = buildPerlModule { + CSSMinifierXS = buildPerlPackage { pname = "CSS-Minifier-XS"; - version = "0.09"; + version = "0.13"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.09.tar.gz"; - hash = "sha256-iKaZf6DfazlNHjRr0OV81WWFfiF9gHtlLxdrAGvm2tc="; + url = "mirror://cpan/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.13.tar.gz"; + hash = "sha256-xBnjCM3IKvHCXWuNB7L/JjR6Yit6Y+wghWq+jbQFH4I="; }; perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; + buildInputs = [ TestDiagINC ]; meta = { description = "XS based CSS minifier"; homepage = "https://metacpan.org/release/CSS-Minifier-XS"; @@ -5619,13 +5636,17 @@ with self; { Curses = buildPerlPackage { pname = "Curses"; - version = "1.37"; + version = "1.44"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GI/GIRAFFED/Curses-1.37.tar.gz"; - hash = "sha256-dHB6460Zs1u+/aKx1r0x9XtAzayKuHIXHIcUyIlU2yA="; + url = "mirror://cpan/authors/id/G/GI/GIRAFFED/Curses-1.44.tar.gz"; + hash = "sha256-ou+4x8iG1pL/xNshNhx2gJoGXliOQ/rQ1n5E751CvTA="; }; + preConfigure = '' + substituteInPlace makeConfig \ + --replace '#! /usr/bin/perl' '#!${perl}/bin/perl' + ''; propagatedBuildInputs = [ pkgs.ncurses ]; - NIX_CFLAGS_LINK = "-lncurses"; + NIX_CFLAGS_LINK = "-L${pkgs.ncurses.out}/lib -lncurses"; meta = { description = "Perl bindings to ncurses"; license = with lib.licenses; [ artistic1 ]; @@ -5662,10 +5683,10 @@ with self; { CryptX = buildPerlPackage { pname = "CryptX"; - version = "0.078"; + version = "0.080"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.078.tar.gz"; - hash = "sha256-kxYLEkL31XQ8s8kxuO/HyzmCHQ4y+U+Wkz8eiOYYvL0="; + url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.080.tar.gz"; + hash = "sha256-tFe3khlKbJwT8G/goLXqFYllwygvOFypPh8AorM+fok="; }; meta = { description = "Cryptographic toolkit"; @@ -5675,10 +5696,10 @@ with self; { CryptX509 = buildPerlPackage { pname = "Crypt-X509"; - version = "0.53"; + version = "0.55"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-X509-0.53.tar.gz"; - hash = "sha256-0v9hT5RX3IerJ3uBvO01MsPtMJtzuaYarvvpSIyeZg8="; + url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-X509-0.55.tar.gz"; + hash = "sha256-FHlrEdFfdq10ROeKYZtw/92RMIaN0LANhYV5yTA4Icc="; }; propagatedBuildInputs = [ ConvertASN1 ]; meta = { @@ -5718,12 +5739,26 @@ with self; { }; }; + DataCompactReadonly = buildPerlPackage { + pname = "Data-CompactReadonly"; + version = "0.1.0"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Data-CompactReadonly-0.1.0.tar.gz"; + hash = "sha256-fVYJCEz1E7p6d4u1lSNHDoNXdn1ZHL1CxYTgPfO+xug="; + }; + propagatedBuildInputs = [ DataIEEE754 DevelStackTrace ScalarType StringBinaryInterpolation TestDifferences TestException ]; + meta = { + description = "A Compact Read Only Database that consumes very little memory"; + license = with lib.licenses; [ artistic1 gpl2Only ]; + }; + }; + DataCompare = buildPerlPackage { pname = "Data-Compare"; - version = "1.27"; + version = "1.29"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Data-Compare-1.27.tar.gz"; - hash = "sha256-gYog8fOPdOZSU8+Lz2/tf5SlqN1mL3UzDcr0sRfO6L0="; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Data-Compare-1.29.tar.gz"; + hash = "sha256-U8nbO5MmPIiqo8QHLYGere0CTXo2s4wMN3N9KI1a+ow="; }; propagatedBuildInputs = [ Clone FileFindRule ]; meta = { @@ -5734,10 +5769,10 @@ with self; { DataDump = buildPerlPackage { pname = "Data-Dump"; - version = "1.23"; + version = "1.25"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.23.tar.gz"; - hash = "sha256-r1OwXvE4e0yrRCfmeJF5KD5PDajPA26NtRbds0RRK2U="; + url = "mirror://cpan/authors/id/G/GA/GARU/Data-Dump-1.25.tar.gz"; + hash = "sha256-pKpuDdvznVrUm93+D4nZ2oZOO8APYnEl0bxYBHL1P70="; }; meta = { description = "Pretty printing of data structures"; @@ -5818,10 +5853,10 @@ with self; { DataGUID = buildPerlPackage { pname = "Data-GUID"; - version = "0.049"; + version = "0.051"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-GUID-0.049.tar.gz"; - hash = "sha256-uK9DfUn9BCWiPr/z5ZidrmTe6vDgRqpfQTZlzTFpp3s="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-GUID-0.051.tar.gz"; + hash = "sha256-aOp3xz/KiROC8gbhJEkJRQG2+/Llf1SQLVBkInz9ji4="; }; propagatedBuildInputs = [ DataUUID SubExporter ]; meta = { @@ -5833,10 +5868,10 @@ with self; { DataHexDump = buildPerlPackage { pname = "Data-HexDump"; - version = "0.02"; + version = "0.04"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FT/FTASSIN/Data-HexDump-0.02.tar.gz"; - hash = "sha256-Gp2EPn9mfBxvd8Z69dd+dGL/I7QZN8sXRU0DU1zZvnA="; + url = "mirror://cpan/authors/id/N/NE/NEILB/Data-HexDump-0.04.tar.gz"; + hash = "sha256-vDb0BEOKw2rSuSlVOSJ9Nvmc0WI/HjR693xZTEDMvPg="; }; meta = { description = "Hexadecial Dumper"; @@ -5919,10 +5954,10 @@ with self; { DataMessagePack = buildPerlModule { pname = "Data-MessagePack"; - version = "1.01"; + version = "1.02"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SY/SYOHEX/Data-MessagePack-1.01.tar.gz"; - hash = "sha256-j6DtAQHQTmYYIae3jo1izj4ZspknW7/tF44rqJEmY+o="; + url = "mirror://cpan/authors/id/S/SY/SYOHEX/Data-MessagePack-1.02.tar.gz"; + hash = "sha256-wz20R5CqjSVBR4guI3jf/pcK1gMxNQveBi0XlTSCsbc="; }; buildInputs = [ ModuleBuildXSUtil TestRequires ]; meta = { @@ -5936,10 +5971,10 @@ with self; { DataOptList = buildPerlPackage { pname = "Data-OptList"; - version = "0.110"; + version = "0.114"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.110.tar.gz"; - hash = "sha256-NmEXyylmRz8lWfL0V1/2rmnoTGmg8woHc+G1GkV+9cM="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.114.tar.gz"; + hash = "sha256-n9EJO5F6Ift5rhYH21PRE7TgrY/grndssHen5QBE/fM="; }; propagatedBuildInputs = [ ParamsUtil SubInstall ]; meta = { @@ -6009,10 +6044,10 @@ with self; { DataPrinter = buildPerlPackage { pname = "Data-Printer"; - version = "0.40"; + version = "1.001001"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GARU/Data-Printer-0.40.tar.gz"; - hash = "sha256-YGkwEH2CdcyuLyVFQ6N270gWE3rVZimAIcypcj+CUlo="; + url = "mirror://cpan/authors/id/G/GA/GARU/Data-Printer-1.001001.tar.gz"; + hash = "sha256-q64DMVUU0rcxxkYrjwZ2SN2ZChA1SyFgbHeM/ZHUe4A="; }; propagatedBuildInputs = [ ClonePP FileHomeDir PackageStash SortNaturally ]; meta = { @@ -6037,10 +6072,10 @@ with self; { DataSection = buildPerlPackage { pname = "Data-Section"; - version = "0.200007"; + version = "0.200008"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-Section-0.200007.tar.gz"; - hash = "sha256-zZN+W3DjSquIX/QU4qbRnkeDt8KPw82lFFsjBRTrtN4="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-Section-0.200008.tar.gz"; + hash = "sha256-g6zHpV091+026deNNQrzE4xpz6F4pEdlgicS/0M7mQ4="; }; propagatedBuildInputs = [ MROCompat SubExporter ]; buildInputs = [ TestFailWarnings ]; @@ -6169,12 +6204,12 @@ with self; { DataULID = buildPerlPackage { pname = "Data-ULID"; - version = "1.0.0"; + version = "1.2.1"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BA/BALDUR/Data-ULID-1.0.0.tar.gz"; - hash = "sha256-TXV0dYk9utUWXwplxEbTi0fzkBnTb3fanSnJjL8nIG8="; + url = "mirror://cpan/authors/id/B/BA/BALDUR/Data-ULID-1.2.1.tar.gz"; + hash = "sha256-SbThGyY0inXfNONGF0UuMZ/XpygasJQgYvFieeqKHSc="; }; - propagatedBuildInputs = [ DateTime EncodeBase32GMP MathRandomSecure ]; + propagatedBuildInputs = [ CryptX ]; meta = { description = "Universally Unique Lexicographically Sortable Identifier"; homepage = "https://metacpan.org/release/Data-ULID"; @@ -6198,10 +6233,10 @@ with self; { DataUtil = buildPerlModule { pname = "Data-Util"; - version = "0.66"; + version = "0.67"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SY/SYOHEX/Data-Util-0.66.tar.gz"; - hash = "sha256-w10520UglupaaVtUZo2Z1YuVTHL8nvgi4+CmJ/EVxvQ="; + url = "mirror://cpan/authors/id/S/SY/SYOHEX/Data-Util-0.67.tar.gz"; + hash = "sha256-tVypHHafgTN8xrCrIMMmg4eOWyZj8cwljFEamZpd/dM="; }; buildInputs = [ HashUtilFieldHashCompat ModuleBuildXSUtil ScopeGuard TestException ]; perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' @@ -6260,10 +6295,10 @@ with self; { DataValidateDomain = buildPerlPackage { pname = "Data-Validate-Domain"; - version = "0.14"; + version = "0.15"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-Domain-0.14.tar.gz"; - hash = "sha256-RHDyU7jScgpN0/o65VCZVBfCJp875/8DDgGvoEo6lCE="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-Domain-0.15.tar.gz"; + hash = "sha256-PJ95GHsNPHGt0fj1WbgN8VmTAKbSA+CxYcvhjhdqqzY="; }; buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ NetDomainTLD ]; @@ -6276,10 +6311,10 @@ with self; { DataValidateIP = buildPerlPackage { pname = "Data-Validate-IP"; - version = "0.27"; + version = "0.31"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-IP-0.27.tar.gz"; - hash = "sha256-4aqSI13LnG/ZtsjNoYTRr3NTfMd/T4Og+IIHqL+/t9Y="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-IP-0.31.tar.gz"; + hash = "sha256-c0r/hrb5ytQOHE2oHyj68Y4IAsdqVm2V5WE9QxgYL8E="; }; buildInputs = [ TestRequires ]; propagatedBuildInputs = [ NetAddrIP ]; @@ -6306,10 +6341,10 @@ with self; { DataVisitor = buildPerlPackage { pname = "Data-Visitor"; - version = "0.31"; + version = "0.32"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Data-Visitor-0.31.tar.gz"; - hash = "sha256-K7FpMou80tzO3Lk4Yn6HIOf0w/jjGCMCD7TCBQXTTG4="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Data-Visitor-0.32.tar.gz"; + hash = "sha256-sZQpDyV8xidaA5N0ERVUxmahZQ5MAa15nB4KJ39HkX0="; }; buildInputs = [ TestNeeds ]; propagatedBuildInputs = [ Moose TieToObject namespaceclean ]; @@ -6351,10 +6386,10 @@ with self; { DateManip = buildPerlPackage { pname = "Date-Manip"; - version = "6.83"; + version = "6.92"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.83.tar.gz"; - hash = "sha256-9JGy4dh2wiKllWOxu9iTwQNCB+0DNzBL85YxHZ6Rmfo="; + url = "mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.92.tar.gz"; + hash = "sha256-q5Yr05ygnsb8/n5aaRKvcbDB9vA+TtK+9uRHHJ02ehM="; }; # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work patchPhase = '' @@ -6398,12 +6433,12 @@ with self; { DateTime = buildPerlPackage { pname = "DateTime"; - version = "1.54"; + version = "1.59"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.54.tar.gz"; - hash = "sha256-sS7abZAHE/Inlk3E3A4u+4bSlOi8Lxa+npW2WflTsuc="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.59.tar.gz"; + hash = "sha256-3j6aY84VRwtNtK2tS6asjsKX2IwMbGs1SwgYg7CmdpU="; }; - buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; + buildInputs = [ CPANMetaCheck TestFatal TestWarnings TestWithoutModule ]; propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ]; meta = { description = "A date and time object for Perl"; @@ -6414,10 +6449,10 @@ with self; { DateTimeCalendarJulian = buildPerlPackage { pname = "DateTime-Calendar-Julian"; - version = "0.102"; + version = "0.107"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WY/WYANT/DateTime-Calendar-Julian-0.102.tar.gz"; - hash = "sha256-RouCo0qopmY/sFWAnu2KcAx6PM8mfgKWl1cboypsJUk="; + url = "mirror://cpan/authors/id/W/WY/WYANT/DateTime-Calendar-Julian-0.107.tar.gz"; + hash = "sha256-/LK0JIRLsTvK1GsceqI5taCbqyVW9TvR8n+tkMJg0z0="; }; propagatedBuildInputs = [ DateTime ]; meta = { @@ -6485,10 +6520,10 @@ with self; { DateTimeFormatFlexible = buildPerlPackage { pname = "DateTime-Format-Flexible"; - version = "0.32"; + version = "0.34"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.32.tar.gz"; - hash = "sha256-UKe5/rKHuxSycyOlPCMkSGGBo6tss/THZi1CvpAa2O4="; + url = "mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.34.tar.gz"; + hash = "sha256-g2rvXSXm/4gnMIpDv/dBkeXSAiDao9ISAFC8w0FI/PE="; }; propagatedBuildInputs = [ DateTimeFormatBuilder ListMoreUtils ModulePluggable ]; buildInputs = [ TestException TestMockTime TestNoWarnings ]; @@ -6528,10 +6563,10 @@ with self; { DateTimeFormatISO8601 = buildPerlPackage { pname = "DateTime-Format-ISO8601"; - version = "0.15"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ISO8601-0.15.tar.gz"; - hash = "sha256-FJdow2i5134fJdM5bH8D4kKRAB/RTCxdq2p2JbKm2qk="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ISO8601-0.16.tar.gz"; + hash = "sha256-WChH9uApBlM0oAVk8gzXwo9OXNTsIVE9D2klMe07VuE="; }; propagatedBuildInputs = [ DateTimeFormatBuilder ]; buildInputs = [ Test2Suite ]; @@ -6558,13 +6593,13 @@ with self; { DateTimeFormatNatural = buildPerlModule { pname = "DateTime-Format-Natural"; - version = "1.11"; + version = "1.18"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.11.tar.gz"; - hash = "sha256-c4+w+xTkL/rhQqMi9J9HHIzBImlM++bTNYA2MgP0RVI="; + url = "mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.18.tar.gz"; + hash = "sha256-2TRqRhUDVFnYvO4PrD1OuuoDj09DsoT2nt9z9u1XUf4="; }; - buildInputs = [ ModuleUtil TestMockTime ]; - propagatedBuildInputs = [ Clone DateTime ListMoreUtils ParamsValidate boolean ]; + buildInputs = [ ModuleUtil TestMockTimeHiRes ]; + propagatedBuildInputs = [ Clone DateTime DateTimeHiRes DateTimeTimeZone ListMoreUtils ParamsValidate boolean ]; meta = { description = "Parse informal natural language date/time strings"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -6574,10 +6609,10 @@ with self; { DateTimeFormatMySQL = buildPerlModule { pname = "DateTime-Format-MySQL"; - version = "0.06"; + version = "0.08"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XM/XMIKEW/DateTime-Format-MySQL-0.06.tar.gz"; - hash = "sha256-mBjUFi7JzsYTm6l7OeBInSF1gaHUP7txPzvv/oD5jx0="; + url = "mirror://cpan/authors/id/X/XM/XMIKEW/DateTime-Format-MySQL-0.08.tar.gz"; + hash = "sha256-Gctw6YWEZV41TS1qjnHMXKkC3dw6xEQWcS+RY9Eiueg="; }; propagatedBuildInputs = [ DateTimeFormatBuilder ]; meta = { @@ -6588,10 +6623,10 @@ with self; { DateTimeFormatPg = buildPerlModule { pname = "DateTime-Format-Pg"; - version = "0.16013"; + version = "0.16014"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DM/DMAKI/DateTime-Format-Pg-0.16013.tar.gz"; - hash = "sha256-f4YupeUb1Fvrxsb5cISXuYlkky5aOevK/jQCNRzgUZs="; + url = "mirror://cpan/authors/id/D/DM/DMAKI/DateTime-Format-Pg-0.16014.tar.gz"; + hash = "sha256-OLuWZlJNw4TDNm9jQsuWVsULrA+XFqPUTxz1Usy+Drk="; }; propagatedBuildInputs = [ DateTimeFormatBuilder ]; buildInputs = [ ModuleBuildTiny ]; @@ -6604,10 +6639,10 @@ with self; { DateTimeFormatStrptime = buildPerlPackage { pname = "DateTime-Format-Strptime"; - version = "1.77"; + version = "1.79"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.77.tar.gz"; - hash = "sha256-L6Q8g47PU1byIakaQcgduiLnhgxUdLSmFyMlmJgXPko="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.79.tar.gz"; + hash = "sha256-cB5GgCyG7U2IaVwabay76QszkL7reU84fnx5IwADdXk="; }; buildInputs = [ TestFatal TestWarnings ]; propagatedBuildInputs = [ DateTime ]; @@ -6634,10 +6669,10 @@ with self; { DateTimeFormatW3CDTF = buildPerlPackage { pname = "DateTime-Format-W3CDTF"; - version = "0.07"; + version = "0.08"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GW/GWILLIAMS/DateTime-Format-W3CDTF-0.07.tar.gz"; - hash = "sha256-aaArZhu/HaoUpIE8tnhuqmbb3ydD8LP0WOMCNMOiYmg="; + url = "mirror://cpan/authors/id/G/GW/GWILLIAMS/DateTime-Format-W3CDTF-0.08.tar.gz"; + hash = "sha256-3MIAoHOiHLpIEipdrgtqh135PT+MiunURtzdm++qQTo="; }; propagatedBuildInputs = [ DateTime ]; meta = { @@ -6647,12 +6682,27 @@ with self; { }; }; + DateTimeHiRes = buildPerlPackage { + pname = "DateTime-HiRes"; + version = "0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-HiRes-0.04.tar.gz"; + hash = "sha256-HCMVkzLDD566VLdeZpK+TeqAUiQ+r/MCbJyQuLZLw5U="; + }; + propagatedBuildInputs = [ DateTime ]; + meta = { + homepage = "https://metacpan.org/release/DateTime-HiRes"; + description = "Create DateTime objects with sub-second current time resolution"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DateTimeLocale = buildPerlPackage { pname = "DateTime-Locale"; - version = "1.28"; + version = "1.39"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.28.tar.gz"; - hash = "sha256-bGBNjFycJzm3jgU4pAIoO4Kx30GeYL7yCwSEPkWEut4="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.39.tar.gz"; + hash = "sha256-EMFFpsfa9xGIZOl0grSun5T5O5QUIS7uiqMLFqgTUQA="; }; buildInputs = [ CPANMetaCheck FileShareDirInstall IPCSystemSimple PathTiny Test2PluginNoWarnings Test2Suite TestFileShareDir ]; propagatedBuildInputs = [ FileShareDir ParamsValidationCompiler Specio namespaceautoclean ]; @@ -6694,10 +6744,10 @@ with self; { DateTimeTimeZone = buildPerlPackage { pname = "DateTime-TimeZone"; - version = "2.44"; + version = "2.60"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.44.tar.gz"; - hash = "sha256-Vz3UBZot/Tgz1qfSvwhHeKxllaAJsR3qY2DX0CLORSY="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.60.tar.gz"; + hash = "sha256-8EYNN5MjkFtXm+1E4UEjejN9wl3Sa2qwxgrCuAYpMj0="; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ]; @@ -6710,10 +6760,10 @@ with self; { DateTimeXEasy = buildPerlPackage { pname = "DateTimeX-Easy"; - version = "0.089"; + version = "0.091"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RO/ROKR/DateTimeX-Easy-0.089.tar.gz"; - hash = "sha256-F+bSAuesYElSMEjpe7jxlePHkghXDaFQT0MTWE5Ienk="; + url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/DateTimeX-Easy-0.091.tar.gz"; + hash = "sha256-pfjbvntpZdUD4VJYIBXaKk+B46WGA9/t1Oc9H92s/II="; }; buildInputs = [ TestMost ]; propagatedBuildInputs = [ DateTimeFormatFlexible DateTimeFormatICal DateTimeFormatNatural TimeDate ]; @@ -6797,10 +6847,10 @@ with self; { DevelChecklib = buildPerlPackage { pname = "Devel-CheckLib"; - version = "1.14"; + version = "1.16"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MATTN/Devel-CheckLib-1.14.tar.gz"; - hash = "sha256-8hxeKZrTzg/cDLD0E3jcqFpw6NbJp1mfDlapVyAOwpQ="; + url = "mirror://cpan/authors/id/M/MA/MATTN/Devel-CheckLib-1.16.tar.gz"; + hash = "sha256-hp04wljmRtzvZ2YJ8N18qQ8IX1bPb9cAGwGaXVuDH8o="; }; buildInputs = [ CaptureTiny MockConfig ]; meta = { @@ -6811,11 +6861,12 @@ with self; { DevelCheckOS = buildPerlPackage { pname = "Devel-CheckOS"; - version = "1.85"; + version = "1.96"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-CheckOS-1.85.tar.gz"; - hash = "sha256-b0Op2h3G+v2qybYbg80C2IO/Yq7xUck5hr75inrmWMo="; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-CheckOS-1.96.tar.gz"; + hash = "sha256-+GB5BfT1reSI9+9Et8HnyFI/ure5HS3IMLMa6cqBPfU="; }; + buildInputs = [ TestWarnings ]; propagatedBuildInputs = [ FileFindRule ]; meta = { description = "Check what OS we're running on"; @@ -6823,6 +6874,21 @@ with self; { }; }; + DevelDeprecationsEnvironmental = buildPerlPackage { + pname = "Devel-Deprecations-Environmental"; + version = "1.101"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-Deprecations-Environmental-1.101.tar.gz"; + hash = "sha256-S+SC08PcOtHvR0P6s4DOuQG3QVZQeVOoNITfadolpqY="; + }; + propagatedBuildInputs = [ DevelCheckOS DevelHide TestException TestTime ]; + meta = { + description = "A framework for managing deprecations"; + homepage = "https://github.com/DrHyde/perl-modules-Devel-Deprecations-Environmental"; + license = with lib.licenses; [ gpl2Only artistic1 ]; + }; + }; + DevelLeak = buildPerlPackage rec { pname = "Devel-Leak"; version = "0.03"; @@ -6869,10 +6935,10 @@ with self; { DevelPPPort = buildPerlPackage { pname = "Devel-PPPort"; - version = "3.62"; + version = "3.68"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.62.tar.gz"; - hash = "sha256-8Z0ExG8uWQpBHCMAeew2KEsucaDAv3oExXARMHqtgZs="; + url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.68.tar.gz"; + hash = "sha256-UpDVu4TN6enmEROiDGe11HJn645loRmookjMlqrAuts="; }; meta = { description = "Perl/Pollution/Portability"; @@ -6928,10 +6994,10 @@ with self; { DBDCSV = buildPerlPackage { pname = "DBD-CSV"; - version = "0.56"; + version = "0.60"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HM/HMBRAND/DBD-CSV-0.56.tgz"; - hash = "sha256-WmLB0Jvmu+IDmZTxCNhPQtJKh9KkAcXolNtayiF7MJs="; + url = "mirror://cpan/authors/id/H/HM/HMBRAND/DBD-CSV-0.60.tgz"; + hash = "sha256-AYuDow95mXm8jDwwRMixyAAc32C9w+dGhIgYGVJUtOc="; }; propagatedBuildInputs = [ DBI SQLStatement TextCSV_XS ]; meta = { @@ -6942,10 +7008,10 @@ with self; { DBDMock = buildPerlModule { pname = "DBD-Mock"; - version = "1.58"; + version = "1.59"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JL/JLCOOPER/DBD-Mock-1.58.tar.gz"; - hash = "sha256-ux6/ASQQE5blu4PerQ8U8S3V8XXLE3ilnaUpXGLJxzw="; + url = "mirror://cpan/authors/id/J/JL/JLCOOPER/DBD-Mock-1.59.tar.gz"; + hash = "sha256-ClqllTq2XPeQaB5sBFLjGK1X2ArCf1dfhJGMYDqkdAY="; }; propagatedBuildInputs = [ DBI ]; buildInputs = [ ModuleBuildTiny TestException ]; @@ -6957,11 +7023,11 @@ with self; { DBDSQLite = buildPerlPackage { pname = "DBD-SQLite"; - version = "1.70"; + version = "1.74"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.70.tar.gz"; - hash = "sha256-QP2N31OeDnc6ek5tN2eUwzAUWfmrAFCXi9z5cRPa/j4="; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.74.tar.gz"; + hash = "sha256-iZSZfYS5/rRUd5X3h0bGYfty48tqJdvdeJtzH1aIpN0="; }; propagatedBuildInputs = [ DBI ]; @@ -6997,10 +7063,10 @@ with self; { DBDMariaDB = buildPerlPackage { pname = "DBD-MariaDB"; - version = "1.22"; + version = "1.23"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PA/PALI/DBD-MariaDB-1.22.tar.gz"; - hash = "sha256-C2j9VCuWU/FbIFhXgZhjSNcehafjhD8JGZdwR6F5scY="; + url = "mirror://cpan/authors/id/P/PA/PALI/DBD-MariaDB-1.23.tar.gz"; + hash = "sha256-DQx2xmDd1VVw5I8+L96o9iGmmsDtSBkOjPyvy16bhZ0="; }; buildInputs = [ pkgs.mariadb-connector-c DevelChecklib TestDeep TestDistManifest TestPod ]; propagatedBuildInputs = [ DBI ]; @@ -7035,11 +7101,11 @@ with self; { DBDOracle = buildPerlPackage { pname = "DBD-Oracle"; - version = "1.80"; + version = "1.83"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MJ/MJEVANS/DBD-Oracle-1.80.tar.gz"; - hash = "sha256-8F4lKCNuPRNWXAuRI54HdZTb8GV6xZSY9Uov7psZ6uc="; + url = "mirror://cpan/authors/id/Z/ZA/ZARQUON/DBD-Oracle-1.83.tar.gz"; + hash = "sha256-Uf6cFYlV/aDKkXqAaGPwvFEGi1M/u8dCOzzErVle0VM="; }; ORACLE_HOME = "${pkgs.oracle-instantclient.lib}/lib"; @@ -7058,11 +7124,11 @@ with self; { DBDPg = buildPerlPackage { pname = "DBD-Pg"; - version = "3.14.2"; + version = "3.17.0"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.14.2.tar.gz"; - hash = "sha256-yXPphFiWCnjsVAMqcbOEDxeEGN1+adBj5GKg8Q7Gjk0="; + url = "mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.17.0.tar.gz"; + hash = "sha256-jZANTA50nzchh1KmZh+w01V6sfzMjeo4TLWHw4LeIZs="; }; buildInputs = [ pkgs.postgresql ]; @@ -7083,11 +7149,11 @@ with self; { DBDsybase = buildPerlPackage { pname = "DBD-Sybase"; - version = "1.16"; + version = "1.23"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ME/MEWP/DBD-Sybase-1.16.tar.gz"; - hash = "sha256-Z/Qn6Lf/rirMPMiYRGPYeKu7Iom8F9t5opTlbIMR1sw="; + url = "mirror://cpan/authors/id/M/ME/MEWP/DBD-Sybase-1.23.tar.gz"; + hash = "sha256-B1e6aqyaKaLcOFmV1myPQSqIlo/SNsDYu0ZZAo5OmWU="; }; SYBASE = pkgs.freetds; @@ -7106,11 +7172,11 @@ with self; { DBFile = buildPerlPackage { pname = "DB_File"; - version = "1.855"; + version = "1.859"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/DB_File-1.855.tar.gz"; - hash = "sha256-2f/iolvmzf7no01kI1zciZ6Zuos/uN6Knn9K8g5MqWA="; + url = "mirror://cpan/authors/id/P/PM/PMQS/DB_File-1.859.tar.gz"; + hash = "sha256-VnTg0s0LBgxNElNnDqAixk2EKlUlf5647bGcD1PiVlw="; }; preConfigure = '' @@ -7324,13 +7390,13 @@ with self; { DBIxClassSchemaLoader = buildPerlPackage { pname = "DBIx-Class-Schema-Loader"; - version = "0.07049"; + version = "0.07051"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/DBIx-Class-Schema-Loader-0.07049.tar.gz"; - hash = "sha256-6GnN3hN4z+vM8imwzeWNJ0bcYIC3X1bQcqpfH852p2Q="; + url = "mirror://cpan/authors/id/V/VE/VEESH/DBIx-Class-Schema-Loader-0.07051.tar.gz"; + hash = "sha256-GgieUISlJ2j0J0vCGB3LrhTcxXnk2YD89WnGeBsGCSw="; }; buildInputs = [ DBDSQLite TestDeep TestDifferences TestException TestWarn ]; - propagatedBuildInputs = [ CarpClan ClassUnload DBIxClass DataDump StringToIdentifierEN curry ]; + propagatedBuildInputs = [ CarpClan ClassUnload DBIxClass DataDump StringCamelCase StringToIdentifierEN curry ]; meta = { description = "Create a DBIx::Class::Schema based on a database"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -7338,12 +7404,12 @@ with self; { }; }; - DBIxConnector = buildPerlModule { + DBIxConnector = buildPerlPackage { pname = "DBIx-Connector"; - version = "0.56"; + version = "0.59"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/DBIx-Connector-0.56.tar.gz"; - hash = "sha256-V8CNLBlRSGy5XPuD9Rj0YqPb8g01Pz7uT0avRPoZw1k="; + url = "mirror://cpan/authors/id/A/AR/ARISTOTLE/DBIx-Connector-0.59.tar.gz"; + hash = "sha256-eCmU8T9JVVhAU4SU+EBrC/JVj1M8zahsjSuV4jAQh/Q="; }; buildInputs = [ TestMockModule ]; propagatedBuildInputs = [ DBI ]; @@ -7355,10 +7421,10 @@ with self; { DBIxDBSchema = buildPerlPackage { pname = "DBIx-DBSchema"; - version = "0.45"; + version = "0.47"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IV/IVAN/DBIx-DBSchema-0.45.tar.gz"; - hash = "sha256-eiqXj7bZ/qo+SxCcccljsmoAii0TDFh27PJMWnIzih0="; + url = "mirror://cpan/authors/id/I/IV/IVAN/DBIx-DBSchema-0.47.tar.gz"; + hash = "sha256-7u4hDcFKjWPrAawtZsZ6HcJ5+Sib6WphckyJUXkcUhI="; }; propagatedBuildInputs = [ DBI ]; meta = { @@ -7398,10 +7464,10 @@ with self; { DBMDeep = buildPerlPackage { pname = "DBM-Deep"; - version = "2.0016"; + version = "2.0017"; src = fetchurl { - url = "https://cpan.metacpan.org/authors/id/S/SP/SPROUT/DBM-Deep-2.0016.tar.gz"; - hash = "sha256-kCp8eqBIjY0KDops89oOlrQJOuRx5rdy8MbViY5HDk0="; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/DBM-Deep-2.0017.tar.gz"; + hash = "sha256-1yNFIFdVO72UXWMhXr/gqnepLsbg+jOw2spXrhuKTSQ="; }; buildInputs = [ TestDeep TestException TestPod TestPodCoverage TestWarn ]; meta = { @@ -7456,10 +7522,10 @@ with self; { DevelCamelcadedb = buildPerlPackage { pname = "Devel-Camelcadedb"; - version = "2021.2"; + version = "2023.1"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HU/HURRICUP/Devel-Camelcadedb-v2021.2.tar.gz"; - hash = "sha256-iKHZ6V05j/5NQRSGHiHDb3wiMVs9A+f3ZMy84BirPkc="; + url = "mirror://cpan/authors/id/H/HU/HURRICUP/Devel-Camelcadedb-v2023.1.tar.gz"; + hash = "sha256-z/jSTllF45RN6/ITmVprFVuR5YE0aRVrE9Ws819qXZ8="; }; propagatedBuildInputs = [ HashStoredIterator JSONXS PadWalker ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; @@ -7540,10 +7606,10 @@ with self; { DevelHide = buildPerlPackage { pname = "Devel-Hide"; - version = "0.0013"; + version = "0.0015"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-Hide-0.0013.tar.gz"; - hash = "sha256-b8O7z08CU6blFoKWyQmTjBPIhpI6eZWslp5Hrfzwfss="; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-Hide-0.0015.tar.gz"; + hash = "sha256-/I2+t/fXWnjtSWseDgXPyZxorKs6LpLP8VXKXw+l31g="; }; meta = { description = "Forces the unavailability of specified Perl modules (for testing)"; @@ -7573,10 +7639,10 @@ with self; { DevelOverloadInfo = buildPerlPackage { pname = "Devel-OverloadInfo"; - version = "0.005"; + version = "0.007"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/Devel-OverloadInfo-0.005.tar.gz"; - hash = "sha256-i/3i/6R8mUb4rcjPxEXC+XuNHN1ngRG+6fRE6C96puc="; + url = "mirror://cpan/authors/id/I/IL/ILMARI/Devel-OverloadInfo-0.007.tar.gz"; + hash = "sha256-IaGEFjuQ+R8G/8f13guWg1ZUaum0AKnXXFc8lYwkYiI="; }; propagatedBuildInputs = [ MROCompat PackageStash SubIdentify ]; buildInputs = [ TestFatal ]; @@ -7672,10 +7738,10 @@ with self; { DigestCRC = buildPerlPackage { pname = "Digest-CRC"; - version = "0.22.2"; + version = "0.24"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OL/OLIMAUL/Digest-CRC-0.22.2.tar.gz"; - hash = "sha256-EStQ9/vG9rr11FhO6X9ULO1snsA6MUf3kCyEuLJneMs="; + url = "mirror://cpan/authors/id/O/OL/OLIMAUL/Digest-CRC-0.24.tar.gz"; + hash = "sha256-ugIqBbGtvsc3EsRvIz2Eif4Tobn8QKH8zu2bUvkN78E="; }; meta = { description = "Module that calculates CRC sums of all sorts"; @@ -7685,10 +7751,10 @@ with self; { DigestHMAC = buildPerlPackage { pname = "Digest-HMAC"; - version = "1.03"; + version = "1.04"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.03.tar.gz"; - hash = "sha256-O8csbT/xRNc677kOmnjTNhLVjPHNFjHs+4mFupbaSlk="; + url = "mirror://cpan/authors/id/A/AR/ARODLAND/Digest-HMAC-1.04.tar.gz"; + hash = "sha256-1ryBVqonXETXlLfBj0TNrEpYFAJFyVnmsZssODiwjtQ="; }; meta = { description = "Keyed-Hashing for Message Authentication"; @@ -7779,10 +7845,10 @@ with self; { DigestSHA3 = buildPerlPackage { pname = "Digest-SHA3"; - version = "1.04"; + version = "1.05"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSHELOR/Digest-SHA3-1.04.tar.gz"; - hash = "sha256-Smi2fFA09A+7E0SzBM1myqpeMg61IwBSAcwk921HDBQ="; + url = "mirror://cpan/authors/id/M/MS/MSHELOR/Digest-SHA3-1.05.tar.gz"; + hash = "sha256-rfG5B5sreBdV5XBId6FDCl8SmX6oIgX9KWbJzEZahSI="; }; meta = { description = "Perl extension for SHA-3"; @@ -7868,10 +7934,10 @@ with self; { DistZilla = buildPerlPackage { pname = "Dist-Zilla"; - version = "6.017"; + version = "6.030"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.017.tar.gz"; - hash = "sha256-XI0wzjOsi16Tfm+D/Pp3nnIlyhSZUe5cm8LDrzwrb+4="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.030.tar.gz"; + hash = "sha256-xAa75oCelO23DKlDJMMBQz1sij375wsC3xLh3/LzsTA="; }; buildInputs = [ CPANMetaCheck TestDeep TestFailWarnings TestFatal TestFileShareDir ]; propagatedBuildInputs = [ AppCmd CPANUploader ConfigMVPReaderINI DateTime FileCopyRecursive FileFindRule FileShareDirInstall Filepushd LogDispatchouli MooseXLazyRequire MooseXSetOnce MooseXTypesPerl PathTiny PerlPrereqScanner SoftwareLicense TermEncoding TermUI YAMLTiny ]; @@ -7938,10 +8004,10 @@ with self; { DistZillaPluginPodWeaver = buildPerlPackage { pname = "Dist-Zilla-Plugin-PodWeaver"; - version = "4.008"; + version = "4.010"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-Plugin-PodWeaver-4.008.tar.gz"; - hash = "sha256-H9njgz8qEsTQSQ9FXgb2gZ87+Bt1I46kSOKToo2IwTk="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-Plugin-PodWeaver-4.010.tar.gz"; + hash = "sha256-Zm1S1UXUjSpn8VN63HTPOMdkofmVHQtiNiP2IGDLYj4="; }; propagatedBuildInputs = [ DistZilla PodElementalPerlMunger PodWeaver ]; meta = { @@ -8033,12 +8099,12 @@ with self; { DistZillaPluginTestDistManifest = buildPerlModule { pname = "Dist-Zilla-Plugin-Test-DistManifest"; - version = "2.000005"; + version = "2.000006"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-DistManifest-2.000005.tar.gz"; - hash = "sha256-Twrye7OHRdLex9lBvPdJ5tf76vjnvPinmhMQqWObD2U="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-DistManifest-2.000006.tar.gz"; + hash = "sha256-Wj2kW/yYzjhf7X3BZTp4kGEfC57xVsABOueFdPiWYH0="; }; - buildInputs = [ TestDeep TestDistManifest TestOutput ]; + buildInputs = [ ModuleBuildTiny TestDeep TestDistManifest TestOutput ]; propagatedBuildInputs = [ DistZilla ]; meta = { description = "Author test that validates a package MANIFEST"; @@ -8143,10 +8209,10 @@ with self; { DistZillaPluginTestPortability = buildPerlModule { pname = "Dist-Zilla-Plugin-Test-Portability"; - version = "2.001000"; + version = "2.001001"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Portability-2.001000.tar.gz"; - hash = "sha256-4I/1vZ4kz5UDBVMwFIkTgI2Ro9/jIKK9+LD8Y4cZsXk="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Portability-2.001001.tar.gz"; + hash = "sha256-07kxVx4VoidI6BJwmq/aclEKdMAA/AaiyrWHVYEACyA="; }; buildInputs = [ ModuleBuildTiny TestDeep TestPortabilityFiles TestWarnings ]; propagatedBuildInputs = [ DistZilla ]; @@ -8174,12 +8240,12 @@ with self; { DistZillaPluginTestUnusedVars = buildPerlModule { pname = "Dist-Zilla-Plugin-Test-UnusedVars"; - version = "2.000007"; + version = "2.001001"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-UnusedVars-2.000007.tar.gz"; - hash = "sha256-6gGZo6AEMhPdwTJQi57ZsTHvcXc1uPk9eCkRkdBLQ8I="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-UnusedVars-2.001001.tar.gz"; + hash = "sha256-df7W0NzCv0B/8nrJ4W7yFTRnFEuYbPovmPhpuqWNdkc="; }; - buildInputs = [ TestDeep TestOutput TestVars ]; + buildInputs = [ ModuleBuildTiny TestDeep TestOutput TestVars ]; propagatedBuildInputs = [ DistZilla ]; meta = { description = "Release tests for unused variables"; @@ -8236,10 +8302,10 @@ with self; { Dumbbench = buildPerlPackage { pname = "Dumbbench"; - version = "0.111"; + version = "0.503"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/Dumbbench-0.111.tar.gz"; - hash = "sha256-0x08p9ZyvZKBg8y/KdMnXqWU99Mkrl9J22GClnxassc="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Dumbbench-0.503.tar.gz"; + hash = "sha256-0BYBmoGDE+cERk8oDPZB72Dodx0HeRtZuZ4XoeyAH6k="; }; propagatedBuildInputs = [ CaptureTiny ClassXSAccessor DevelCheckOS NumberWithError StatisticsCaseResampling ]; meta = { @@ -8252,10 +8318,10 @@ with self; { EmailAbstract = buildPerlPackage { pname = "Email-Abstract"; - version = "3.008"; + version = "3.010"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Abstract-3.008.tar.gz"; - hash = "sha256-/HFprLbEPffwBefvatCO6MputnlrXRYEWTyZczfMgkA="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Abstract-3.010.tar.gz"; + hash = "sha256-jBL2i1l0yvyZ10lCq+/IWXGTA1qv0nYxKOaqr8pLftY="; }; propagatedBuildInputs = [ EmailSimple MROCompat ModulePluggable ]; meta = { @@ -8267,10 +8333,10 @@ with self; { EmailAddress = buildPerlPackage { pname = "Email-Address"; - version = "1.912"; + version = "1.913"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.912.tar.gz"; - hash = "sha256-D6N4UpjML2eA5j46X7HKgU3Lw2DOtZ7Y+oTrT/oG+e8="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.913.tar.gz"; + hash = "sha256-avtUH232tTXM92QtNhrhjXqVo/k6zhvFNz9kwkEMpa8="; }; meta = { description = "RFC 2822 Address Parsing and Creation"; @@ -8296,10 +8362,10 @@ with self; { EmailAddressXS = buildPerlPackage { pname = "Email-Address-XS"; - version = "1.04"; + version = "1.05"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PA/PALI/Email-Address-XS-1.04.tar.gz"; - hash = "sha256-mV9tBKe0h91eG1XjtSythMh3UJN8lv624k6PHxDNWT4="; + url = "mirror://cpan/authors/id/P/PA/PALI/Email-Address-XS-1.05.tar.gz"; + hash = "sha256-FRC38Q1nIBA3zVDSLJ1rJu7KVe3tpM20a7yiflmk6hY="; }; meta = { description = "Parse and format RFC 5322 email addresses and groups"; @@ -8309,10 +8375,10 @@ with self; { EmailDateFormat = buildPerlPackage { pname = "Email-Date-Format"; - version = "1.005"; + version = "1.008"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Date-Format-1.005.tar.gz"; - hash = "sha256-V5xhfjA7nYdEEce2G0a1nTb4FXGGJQdK5oMue7nbUQQ="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Date-Format-1.008.tar.gz"; + hash = "sha256-Qyt8g/+IdJrxKAA/UlfFc67BpGNBjbkO0ihDy7wli08="; }; meta = { description = "Produce RFC 2822 date strings"; @@ -8338,10 +8404,10 @@ with self; { EmailMessageID = buildPerlPackage { pname = "Email-MessageID"; - version = "1.406"; + version = "1.408"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MessageID-1.406.tar.gz"; - hash = "sha256-7EJd2/OV4OGsfG+VtJM8VcV6yfHnUUADx8kE7GzTQrg="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MessageID-1.408.tar.gz"; + hash = "sha256-Hz1bT/Cxx7OemsfDGPs3rc0LrJVWA2VGSU0U8G3FZDw="; }; meta = { description = "Generate world unique message-ids"; @@ -8352,10 +8418,10 @@ with self; { EmailMIME = buildPerlPackage { pname = "Email-MIME"; - version = "1.949"; + version = "1.953"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.949.tar.gz"; - hash = "sha256-Owrfa7QTz+Uddfi6eayoDer8mNwReap7LXp5r/Wmq5w="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.953.tar.gz"; + hash = "sha256-mPsGeFBpmiJLq8NI8c7+MNdExg2okC56XOnYt+c99zU="; }; propagatedBuildInputs = [ EmailAddressXS EmailMIMEContentType EmailMIMEEncodings EmailMessageID EmailSimple MIMETypes ModuleRuntime ]; meta = { @@ -8384,10 +8450,10 @@ with self; { EmailMIMEContentType = buildPerlPackage { pname = "Email-MIME-ContentType"; - version = "1.024"; + version = "1.028"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.024.tar.gz"; - hash = "sha256-QtFkrH/03C6oSOcQ/iH6hVCaO8u5HtLTVuSrqVHtiDU="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.028.tar.gz"; + hash = "sha256-55UCRkM/ftbD5P1N8iJ+DyNBE3w8qxmJAY/DcPWBRcQ="; }; propagatedBuildInputs = [ TextUnidecode ]; meta = { @@ -8399,10 +8465,10 @@ with self; { EmailMIMEEncodings = buildPerlPackage { pname = "Email-MIME-Encodings"; - version = "1.315"; + version = "1.317"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Encodings-1.315.tar.gz"; - hash = "sha256-THEEVQezHshT3WAVK0DjO6N0F3nA9JuxQ7UM+NJDq1w="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Encodings-1.317.tar.gz"; + hash = "sha256-SppBZxqdFQTE2iQb5BmpUD+jSGJiUm7bgeyp4uvqC68="; }; buildInputs = [ CaptureTiny ]; meta = { @@ -8430,10 +8496,10 @@ with self; { EmailOutlookMessage = buildPerlModule { pname = "Email-Outlook-Message"; - version = "0.920"; + version = "0.921"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MV/MVZ/Email-Outlook-Message-0.920.tar.gz"; - hash = "sha256-kiIClZ94m6tztu4mQAes+49UORNJb8y2cWGC5Nrlw4A="; + url = "mirror://cpan/authors/id/M/MV/MVZ/Email-Outlook-Message-0.921.tar.gz"; + hash = "sha256-+0q+6hTNpRweYLwhHPlSG7uq50uEEYym1Y8KciNoA4g="; }; propagatedBuildInputs = [ EmailMIME EmailSender IOAll IOString OLEStorage_Lite ]; preCheck = "rm t/internals.t t/plain_jpeg_attached.t"; # these tests expect EmailMIME version 1.946 and fail with 1.949 (the output difference in benign) @@ -8448,13 +8514,13 @@ with self; { EmailSender = buildPerlPackage { pname = "Email-Sender"; - version = "1.300035"; + version = "2.600"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-1.300035.tar.gz"; - hash = "sha256-FEvYbPdo6nkQfKDpkpGoGM4738/qebtfbaE3nMfV2nk="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-2.600.tar.gz"; + hash = "sha256-7MZ10DDXnZpPsGRWfqiFxmsXw4Yjea0w+CBaKBzY7ik="; }; buildInputs = [ CaptureTiny ]; - propagatedBuildInputs = [ EmailAbstract EmailAddress MooXTypesMooseLike SubExporter Throwable TryTiny ]; + propagatedBuildInputs = [ EmailAbstract EmailAddressXS EmailSimple ModuleRuntime Moo MooXTypesMooseLike SubExporter Throwable TryTiny ]; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; postPatch = '' patchShebangs --build util @@ -8471,10 +8537,10 @@ with self; { EmailSimple = buildPerlPackage { pname = "Email-Simple"; - version = "2.216"; + version = "2.218"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Simple-2.216.tar.gz"; - hash = "sha256-2F9jzRCI0RMREDZ2qM9Jj/9WSiAbU43lLNdTteXKi9Q="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Simple-2.218.tar.gz"; + hash = "sha256-Lc4daP3pnVPbnKQ+IRtpsWm6Lvrs+HpVyzOpM2BHyW0="; }; propagatedBuildInputs = [ EmailDateFormat ]; meta = { @@ -8486,10 +8552,10 @@ with self; { EmailStuffer = buildPerlPackage { pname = "Email-Stuffer"; - version = "0.018"; + version = "0.020"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Stuffer-0.018.tar.gz"; - hash = "sha256-0ACijvCWNpmx6ytORptYq3w6DPpKdDGeDnRhVuG9igs="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Stuffer-0.020.tar.gz"; + hash = "sha256-Ch77fy3t05BSsSb3GMotO1hFpBI6OTkv2d+gx25gV8c="; }; buildInputs = [ Moo TestFatal ]; propagatedBuildInputs = [ EmailMIME EmailSender ModuleRuntime ParamsUtil ]; @@ -8503,10 +8569,10 @@ with self; { EmailValid = buildPerlPackage { pname = "Email-Valid"; - version = "1.202"; + version = "1.203"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-1.202.tar.gz"; - hash = "sha256-0CEIm2YqYOagyKvbcr2cXkaEjSSNmKmMHqKt3xqsE6I="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-1.203.tar.gz"; + hash = "sha256-ICG/ux4sJ55evYRoDllvlzRNQphQsjIme3b0kDdSK5M="; }; propagatedBuildInputs = [ IOCaptureOutput MailTools NetDNS NetDomainTLD ]; doCheck = false; @@ -8681,10 +8747,10 @@ with self; { enum = buildPerlPackage { pname = "enum"; - version = "1.11"; + version = "1.12"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/enum-1.11.tar.gz"; - hash = "sha256-0vNrUBXx419kAVmGe2C/XVzWa1bNXkLTP1Mb5o5e7jU="; + url = "mirror://cpan/authors/id/N/NE/NEILB/enum-1.12.tar.gz"; + hash = "sha256-aaeokc04iO2LAsXpmh9In5KmLsNRwLx4lP1719FEfqk="; }; meta = { description = "C style enumerated types and bitmask flags in Perl"; @@ -8750,10 +8816,10 @@ with self; { EV = buildPerlPackage { pname = "EV"; - version = "4.33"; + version = "4.34"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.33.tar.gz"; - hash = "sha256-Su6DkbiBE7Qhh/kf1JJF/cjpsZOhWsIC9RnKriqo6jU="; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.34.tar.gz"; + hash = "sha256-EhFoPc57Z3H0q3EMwVNxK913umFXoTKU0LtzSR/QZWA="; }; buildInputs = [ CanaryStability ]; propagatedBuildInputs = [ commonsense ]; @@ -8796,10 +8862,10 @@ with self; { ExcelWriterXLSX = buildPerlPackage { pname = "Excel-Writer-XLSX"; - version = "1.09"; + version = "1.11"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/Excel-Writer-XLSX-1.09.tar.gz"; - hash = "sha256-1nnGrBnpPDKrd1lMeT5BuUjHuzhztgDnCtY30JPcoYc="; + url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/Excel-Writer-XLSX-1.11.tar.gz"; + hash = "sha256-yzMA0jEZxpiGTvC3PBmnLLpxi/wG7QBzWaUxP5YcwqA="; }; propagatedBuildInputs = [ ArchiveZip ]; meta = { @@ -8829,10 +8895,10 @@ with self; { ExceptionClass = buildPerlPackage { pname = "Exception-Class"; - version = "1.44"; + version = "1.45"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Exception-Class-1.44.tar.gz"; - hash = "sha256-M/P7+LE407BOpOwLqD+w32uomIBrz07zk9TK/Boj7g0="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Exception-Class-1.45.tar.gz"; + hash = "sha256-VIKnfvAnyh+fOeH0jFWDVulUk2/I+73ubIEcUScBskk="; }; propagatedBuildInputs = [ ClassDataInheritable DevelStackTrace ]; meta = { @@ -8889,10 +8955,10 @@ with self; { ExporterLite = buildPerlPackage { pname = "Exporter-Lite"; - version = "0.08"; + version = "0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/Exporter-Lite-0.08.tar.gz"; - hash = "sha256-wFs5Ca9MuG82SV6UpZnSPrq0K+ehjv0NFB/BWGMJ2sI="; + url = "mirror://cpan/authors/id/N/NE/NEILB/Exporter-Lite-0.09.tar.gz"; + hash = "sha256-edixT9UBOSLGPoUPFb9RBZ8lAkBFNetmkO8jYSwqGY0="; }; meta = { description = "Lightweight exporting of functions and variables"; @@ -8902,10 +8968,10 @@ with self; { ExporterTiny = buildPerlPackage { pname = "Exporter-Tiny"; - version = "1.002002"; + version = "1.006002"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002002.tar.gz"; - hash = "sha256-APC5VxaxgVcTLGwRje2LoxOSVj0Z5JBDPpplOC5wcQE="; + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.006002.tar.gz"; + hash = "sha256-byleLL/7HbwVvbna3DQWccHgzSvfLTErF1Jic8MiY40="; }; meta = { description = "An exporter with the features of Sub::Exporter but only core dependencies"; @@ -8987,10 +9053,10 @@ with self; { ExtUtilsCppGuess = buildPerlPackage { pname = "ExtUtils-CppGuess"; - version = "0.21"; + version = "0.26"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-CppGuess-0.21.tar.gz"; - hash = "sha256-/2KReDIaHlkbg/gJcSWT6uRAikE6pEhlS85ZsVbyQVM="; + url = "mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-CppGuess-0.26.tar.gz"; + hash = "sha256-yLNiuGAXKkB2rO4AQ49SuGRk8sUAcCz891J4Ef+aaD4="; }; doCheck = !stdenv.isDarwin; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; @@ -9004,10 +9070,10 @@ with self; { ExtUtilsDepends = buildPerlPackage { pname = "ExtUtils-Depends"; - version = "0.8000"; + version = "0.8001"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.8000.tar.gz"; - hash = "sha256-eA/3ISjATCoi5oARh6qcWMqymEB/bp0GJwavHCULvpg="; + url = "mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.8001.tar.gz"; + hash = "sha256-ZzxDh+eJbBohYJnB+7P6qndj1/X5WhpWpgoqKQbBMcU="; }; meta = { description = "Easily build XS extensions that depend on XS extensions"; @@ -9017,10 +9083,10 @@ with self; { ExtUtilsF77 = buildPerlPackage rec { pname = "ExtUtils-F77"; - version = "1.24"; + version = "1.26"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KG/KGB/ExtUtils-F77-1.24.tar.gz"; - hash = "sha256-NVh4pKf5AesY0h+eIb6Mi/xqr5Zl00skG8HUPjLFtzA="; + url = "mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-F77-1.26.tar.gz"; + hash = "sha256-q90dPuxMpPyuXxUrQLyqhi48gG4H5KqRI3V/aqSLndY="; }; buildInputs = [ pkgs.gfortran ]; propagatedBuildInputs = [ FileWhich ]; @@ -9045,10 +9111,10 @@ with self; { ExtUtilsInstall = buildPerlPackage { pname = "ExtUtils-Install"; - version = "2.18"; + version = "2.22"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Install-2.18.tar.gz"; - hash = "sha256-5d2He6I7Z7uybHhMR8/aHUEasaiZbu5ehNozPuZ+MMU="; + url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Install-2.22.tar.gz"; + hash = "sha256-M3Jbr77Tgp1hPkxlHC4a0SBnDH0qxc8F+DdX/Jddb/I="; }; meta = { description = "Install files from here to there"; @@ -9087,10 +9153,10 @@ with self; { ExtUtilsMakeMaker = buildPerlPackage { pname = "ExtUtils-MakeMaker"; - version = "7.62"; + version = "7.70"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.62.tar.gz"; - hash = "sha256-UCKthX/Xa9P2sWrwmf4jJGOdmTLgjyHokfsxPZyuFwU="; + url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.70.tar.gz"; + hash = "sha256-8Qi9RkINLwDSQoJfhlsPaIUQhJJJJPkiYdaExJ4+enQ="; }; meta = { description = "Create a module Makefile"; @@ -9218,11 +9284,12 @@ with self; { FCGI = buildPerlPackage { pname = "FCGI"; - version = "0.79"; + version = "0.82"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/FCGI-0.79.tar.gz"; - hash = "sha256-jPpOGxT7jVrKoiztZyxq9owKjiXcKpaXoO1/Sk77NOQ="; + url = "mirror://cpan/authors/id/E/ET/ETHER/FCGI-0.82.tar.gz"; + hash = "sha256-TH1g4m2iwH8Fik40UCHpJQUnOzPJVCIVl34IRhHwns8="; }; + buildInputs = [ FCGIClient ]; postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' sed -i '/use IO::File/d' Makefile.PL ''; @@ -9280,12 +9347,13 @@ with self; { FFICheckLib = buildPerlPackage { pname = "FFI-CheckLib"; - version = "0.27"; + version = "0.31"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.27.tar.gz"; - hash = "sha256-jUQnR8JPzYVgEH7Z3rmCZYOPF7yFDLcjf4ttSCGZLXQ="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.31.tar.gz"; + hash = "sha256-BNiF/Dd9RIluXqHE7DEPl5uwTy8YZYp+ek1Qn36Au4A="; }; buildInputs = [ Test2Suite ]; + propagatedBuildInputs = [ FileWhich ]; meta = { description = "Check that a library is available for FFI"; homepage = "https://metacpan.org/pod/FFI::CheckLib"; @@ -9293,6 +9361,21 @@ with self; { }; }; + FeatureCompatTry = buildPerlModule { + pname = "Feature-Compat-Try"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PEVANS/Feature-Compat-Try-0.05.tar.gz"; + hash = "sha256-WaHHFzysMNsTHF8T+jhA9xhYju+bV5NS/+FWtVBxbXw="; + }; + buildInputs = [ Test2Suite ]; + propagatedBuildInputs = [ SyntaxKeywordTry ]; + meta = { + description = "Make C<try/catch> syntax available"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + FFICStat = buildPerlPackage { pname = "FFI-C-Stat"; version = "0.02"; @@ -9392,10 +9475,10 @@ with self; { Filechdir = buildPerlPackage { pname = "File-chdir"; - version = "0.1010"; + version = "0.1011"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/File-chdir-0.1010.tar.gz"; - hash = "sha256-78Eh9AvXoPYvjsm4vHD39UCdgc1wXjcAhZbI78RFKwE="; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/File-chdir-0.1011.tar.gz"; + hash = "sha256-Mev5Et9I1daB3vdLmIDXix86ykNRoO0f41cLjgOvbHk="; }; meta = { description = "A more sensible way to change directories"; @@ -9492,10 +9575,10 @@ with self; { FileCopyRecursiveReduced = buildPerlPackage { pname = "File-Copy-Recursive-Reduced"; - version = "0.006"; + version = "0.007"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JK/JKEENAN/File-Copy-Recursive-Reduced-0.006.tar.gz"; - hash = "sha256-5hj5k6afQ1UgXFj///aYJgnyi0f2RuxuJE5BtcZwfiw="; + url = "mirror://cpan/authors/id/J/JK/JKEENAN/File-Copy-Recursive-Reduced-0.007.tar.gz"; + hash = "sha256-07WFIuaYA6kUN+KcCZ63Bug3Px7vBRik3DZp3T383Cc="; }; buildInputs = [ CaptureTiny PathTiny ]; meta = { @@ -9564,11 +9647,12 @@ with self; { FileFindObject = buildPerlModule { pname = "File-Find-Object"; - version = "0.3.5"; + version = "0.3.8"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-0.3.5.tar.gz"; - hash = "sha256-3EEkq+ZNwSdOjopeW/nheiqSad66zkWBFbV0afHhapE="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-0.3.8.tar.gz"; + hash = "sha256-TlJRRt6GTt+8kJsIRGKe7O0AY7YdQYuXLu8D+ES7NRQ="; }; + buildInputs = [ FileTreeCreate TestFile ]; propagatedBuildInputs = [ ClassXSAccessor ]; meta = { description = "An object oriented File::Find replacement"; @@ -9579,12 +9663,13 @@ with self; { FileFindObjectRule = buildPerlModule { pname = "File-Find-Object-Rule"; - version = "0.0312"; + version = "0.0313"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-Rule-0.0312.tar.gz"; - hash = "sha256-Pgtsja32Ni5l8jEFMLG+Y37WqsETOZ0QxvkSnnNK//k="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-Rule-0.0313.tar.gz"; + hash = "sha256-gZQPKZ1khySPvzDY8ft99sajSz35RApWIbE1yONPz/I="; }; - propagatedBuildInputs = [ FileFindObject NumberCompare TextGlob ]; + buildInputs = [ FileTreeCreate ]; + propagatedBuildInputs = [ ClassXSAccessor FileFindObject NumberCompare TextGlob ]; # restore t/sample-data which is corrupted by patching shebangs preCheck = '' tar xf $src */t/sample-data --strip-components=1 @@ -9614,10 +9699,10 @@ with self; { FileFindRulePerl = buildPerlPackage { pname = "File-Find-Rule-Perl"; - version = "1.15"; + version = "1.16"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/File-Find-Rule-Perl-1.15.tar.gz"; - hash = "sha256-mkhDP4bgjOGOA1JuKYLeUhYuuQnRlzVGDwfu/K9GPqY="; + url = "mirror://cpan/authors/id/E/ET/ETHER/File-Find-Rule-Perl-1.16.tar.gz"; + hash = "sha256-rhiGBQ2cohIjwHPihwq9yA3DDj9VKJoRw32jggqDIf8="; }; propagatedBuildInputs = [ FileFindRule ParamsUtil ]; meta = { @@ -9754,10 +9839,10 @@ with self; { FileListing = buildPerlPackage { pname = "File-Listing"; - version = "6.14"; + version = "6.16"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/File-Listing-6.14.tar.gz"; - hash = "sha256-FbOkhx4jFko28iY4G3TUUK9B8SzJSYX1kqZp/Kx7SP8="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/File-Listing-6.16.tar.gz"; + hash = "sha256-GJs6E/wKG6QSudnsWQHp5eREzHRrnwFW1DmTcNM2VcY="; }; propagatedBuildInputs = [ HTTPDate ]; meta = { @@ -9782,10 +9867,10 @@ with self; { FileMimeInfo = buildPerlPackage { pname = "File-MimeInfo"; - version = "0.30"; + version = "0.33"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MICHIELB/File-MimeInfo-0.30.tar.gz"; - hash = "sha256-4sbkv5C+O4Y7+07628sbSwKfx09OeUvYaWWsp+47qHI="; + url = "mirror://cpan/authors/id/M/MI/MICHIELB/File-MimeInfo-0.33.tar.gz"; + hash = "sha256-9r6ms4kGITJeycJ5KvruiOlIoK4dEIcvpyxxELPhscQ="; }; doCheck = false; # Failed test 'desktop file is the right one' buildInputs = [ FileBaseDir FileDesktopEntry EncodeLocale ]; @@ -9810,10 +9895,10 @@ with self; { FileMap = buildPerlModule { pname = "File-Map"; - version = "0.67"; + version = "0.71"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/File-Map-0.67.tar.gz"; - hash = "sha256-Enhdvt/CzN+jjbTZenhGSSWRjbNy/Rm67PL6l68i+8I="; + url = "mirror://cpan/authors/id/L/LE/LEONT/File-Map-0.71.tar.gz"; + hash = "sha256-yOJpM4BOhw1KupJiO3iGrIs8dgyY+/zTvcSyMFxGR1k="; }; perlPreHook = "export LD=$CC"; propagatedBuildInputs = [ PerlIOLayers SubExporterProgressive ]; @@ -9927,10 +10012,10 @@ with self; { FileRemove = buildPerlModule { pname = "File-Remove"; - version = "1.60"; + version = "1.61"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Remove-1.60.tar.gz"; - hash = "sha256-6G4qQP/txtVpfQcVA/1roUpfm4IgrzrwIhENjnJPjKY="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Remove-1.61.tar.gz"; + hash = "sha256-/YV/WFkI/FA0YbnkizyFlOZTV2a8FL6xfJC6WNXcSXU="; }; meta = { description = "Remove files and directories"; @@ -9940,12 +10025,12 @@ with self; { FileShare = buildPerlPackage { pname = "File-Share"; - version = "0.25"; + version = "0.27"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/File-Share-0.25.tar.gz"; - hash = "sha256-jp0lbgrEOEIoOEtK0qV4GaFj7bOfIJiO1cExjAFAcHA="; + url = "mirror://cpan/authors/id/I/IN/INGY/File-Share-0.27.tar.gz"; + hash = "sha256-1uj0tV69OOC7ReRDkuP6J9wf3harxdH/U+FX4ZpXVb4="; }; - propagatedBuildInputs = [ FileShareDir ]; + propagatedBuildInputs = [ FileShareDir Readonly ]; meta = { description = "Extend File::ShareDir to Local Libraries"; homepage = "https://github.com/ingydotnet/file-share-pm"; @@ -9986,10 +10071,10 @@ with self; { FileShareDirInstall = buildPerlPackage { pname = "File-ShareDir-Install"; - version = "0.13"; + version = "0.14"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/File-ShareDir-Install-0.13.tar.gz"; - hash = "sha256-Rb798Nlcvv58JaHa8pPYX3gNbSV2FGVG5oKKrSblgPk="; + url = "mirror://cpan/authors/id/E/ET/ETHER/File-ShareDir-Install-0.14.tar.gz"; + hash = "sha256-j5UzsZjy1KmlKIy8fSJPdnmtBaeoVzdFWZeJQovFrqA="; }; meta = { description = "Install shared files"; @@ -10056,10 +10141,10 @@ with self; { FileSlurper = buildPerlPackage { pname = "File-Slurper"; - version = "0.012"; + version = "0.014"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/File-Slurper-0.012.tar.gz"; - hash = "sha256-TvsupBaxEKG9pvgTNUnMbqNnZALjyvdSn84DEyUKpXg="; + url = "mirror://cpan/authors/id/L/LE/LEONT/File-Slurper-0.014.tar.gz"; + hash = "sha256-1aNkhzOYiMPNdY5kgWDuHXDrQVPKy6/1eEbbzvs0Sww="; }; buildInputs = [ TestWarnings ]; meta = { @@ -10097,10 +10182,10 @@ with self; { FileTouch = buildPerlPackage { pname = "File-Touch"; - version = "0.11"; + version = "0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/File-Touch-0.11.tar.gz"; - hash = "sha256-43ml/4lCDPOZBuXO/zCbjOlY+Z+cPletUrUAKjmC2Tw="; + url = "mirror://cpan/authors/id/N/NE/NEILB/File-Touch-0.12.tar.gz"; + hash = "sha256-KgTcQk30jpjFRVbGBFyrAmpJ43N6qUohz0l3YbDy5Zw="; }; meta = { description = "Update file access and modification times, optionally creating files if needed"; @@ -10110,6 +10195,20 @@ with self; { }; }; + FileTreeCreate = buildPerlModule { + pname = "File-TreeCreate"; + version = "0.0.1"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-TreeCreate-0.0.1.tar.gz"; + hash = "sha256-V2hvEIQ76Br/rRha5BMXkLoMSvNtIQTW+2kSZSgFUmc="; + }; + meta = { + homepage = "http://metacpan.org/release/File-TreeCreate"; + description = "Recursively create a directory tree"; + license = lib.licenses.mit; + }; + }; + FileType = buildPerlModule { pname = "File-Type"; version = "0.22"; @@ -10156,10 +10255,10 @@ with self; { FileWhich = buildPerlPackage { pname = "File-Which"; - version = "1.23"; + version = "1.27"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/File-Which-1.23.tar.gz"; - hash = "sha256-t53CJEstl7bycWf8O3eZ72GheQQPOr12zh4KOwvE4Hg="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/File-Which-1.27.tar.gz"; + hash = "sha256-MgHxpg4/FkhAguYEXIloQiYfw0Xen7LmIP0qLHrzqTo="; }; meta = { description = "Perl implementation of the which utility as an API"; @@ -10183,10 +10282,10 @@ with self; { Filter = buildPerlPackage { pname = "Filter"; - version = "1.60"; + version = "1.64"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/Filter-1.60.tar.gz"; - hash = "sha256-4R7y8u6HJ7f2Zv0kmjIm92jm6t/VHZzbSbPD8aNUZPk="; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Filter-1.64.tar.gz"; + hash = "sha256-E+f7fh0yZZjjZgEDzxl0vun2kKxbQ7M58sAi8rX87yw="; }; meta = { description = "Source Filters"; @@ -10298,10 +10397,10 @@ with self; { FunctionParameters = buildPerlPackage { pname = "Function-Parameters"; - version = "2.001003"; + version = "2.002004"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MAUKE/Function-Parameters-2.001003.tar.gz"; - hash = "sha256-6qIsa0PAJJnsfbB1jC3SGKOyq0enFLK9+AELXuETwkI="; + url = "mirror://cpan/authors/id/M/MA/MAUKE/Function-Parameters-2.002004.tar.gz"; + hash = "sha256-KKvqWODAnOMnmaCMvXr3DaHimXd8KZEZQpygaacYg+g="; }; buildInputs = [ DirSelf TestFatal ]; meta = { @@ -10312,10 +10411,10 @@ with self; { Furl = buildPerlModule { pname = "Furl"; - version = "3.13"; + version = "3.14"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/Furl-3.13.tar.gz"; - hash = "sha256-iHrPu7zcq71HQVD5v+nG5QfTUWdbhivM/XZ/6dMWqvM="; + url = "mirror://cpan/authors/id/S/SY/SYOHEX/Furl-3.14.tar.gz"; + hash = "sha256-Nd29iIDXHxniAkM+F2H9EXc4XmML9QaFvEi2t6y4V7k="; }; propagatedBuildInputs = [ ClassAccessorLite HTTPParserXS MozillaCA ]; buildInputs = [ HTTPCookieJar HTTPProxy ModuleBuildTiny Plack Starlet TestFakeHTTPD TestRequires TestSharedFork TestTCP TestValgrind URI ]; @@ -10359,12 +10458,12 @@ with self; { FutureIO = buildPerlModule { pname = "Future-IO"; - version = "0.11"; + version = "0.14"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-IO-0.11.tar.gz"; - hash = "sha256-dVM2JvgfdoxfIxyXAhBsJbV3KotplcqixYvMSsyRB8k="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-IO-0.14.tar.gz"; + hash = "sha256-a1j++vwwlMJwHwp7mMsUCwmItRaKfV3069Hu6OhyBgo="; }; - buildInputs = [ TestIdentity ]; + buildInputs = [ TestFutureIOImpl ]; propagatedBuildInputs = [ Future StructDumb ]; preCheck = "rm t/06connect.t"; # this test fails in sandbox meta = { @@ -10408,13 +10507,13 @@ with self; { GD = buildPerlPackage { pname = "GD"; - version = "2.73"; + version = "2.78"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/GD-2.73.tar.gz"; - hash = "sha256-SRyecyOFIuKYfmZyWiCTX0Joo4ZCAuy69GWaFpG6Mis="; + url = "mirror://cpan/authors/id/R/RU/RURBAN/GD-2.78.tar.gz"; + hash = "sha256-aDEFS/VCS09cI9NifT0UhEgPb5wsZmMiIpFfKFG+buQ="; }; - buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm ExtUtilsPkgConfig TestFork ]; + buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm ExtUtilsPkgConfig TestFork TestNoWarnings ]; # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]" hardeningDisable = [ "format" ]; @@ -10519,10 +10618,10 @@ with self; { GetoptLong = buildPerlPackage { pname = "Getopt-Long"; - version = "2.52"; + version = "2.54"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JV/JV/Getopt-Long-2.52.tar.gz"; - hash = "sha256-ncenw3M1PVwF765UjnsSOqijHR9Qbrjbvsjw3Kd3Bfo="; + url = "mirror://cpan/authors/id/J/JV/JV/Getopt-Long-2.54.tar.gz"; + hash = "sha256-WEujyZuy1rNBN1IS+bh0YT9wbPsBzuIbiiZ2qYq5hf4="; }; meta = { description = "Extended processing of command line options"; @@ -10532,10 +10631,10 @@ with self; { GetoptLongDescriptive = buildPerlPackage { pname = "Getopt-Long-Descriptive"; - version = "0.105"; + version = "0.111"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.105.tar.gz"; - hash = "sha256-pxzbz0BDWIsmpCoT0VHCQ/bszzjo/AsY/7W1NlGrjBU="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.111.tar.gz"; + hash = "sha256-m40V/K8Y/ddAJGtDjw5+uRS4McUdnXCMCZ7Kd2YiB20="; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; propagatedBuildInputs = [ ParamsValidate SubExporter ]; @@ -10576,10 +10675,10 @@ with self; { GitAutofixup = buildPerlPackage rec { pname = "App-Git-Autofixup"; - version = "0.003001"; + version = "0.004001"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-0.003001.tar.gz"; - hash = "sha256-F/ayRn/nnFksouFyx3vmICNlxK+hncifKhMNIT+o8eA="; + url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-0.004001.tar.gz"; + hash = "sha256-WroBPI3hOZD1iRoOKjnJcHTQcnvjZTIMLGrxnTbF3aw="; }; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; postInstall = lib.optionalString stdenv.isDarwin '' @@ -10611,10 +10710,10 @@ with self; { GitRepository = buildPerlPackage { pname = "Git-Repository"; - version = "1.324"; + version = "1.325"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOOK/Git-Repository-1.324.tar.gz"; - hash = "sha256-gU360QSpVGNJ+eD9SSyGE33oJ+vChAF6kaUmfBIK1PY="; + url = "mirror://cpan/authors/id/B/BO/BOOK/Git-Repository-1.325.tar.gz"; + hash = "sha256-mypPoZT0oOtFI1XQyAhyfl6cFsFFrH0kw+qW0Kvv7UM="; }; buildInputs = [ TestRequiresGit ]; propagatedBuildInputs = [ GitVersionCompare SystemCommand namespaceclean ]; @@ -10626,10 +10725,10 @@ with self; { GitVersionCompare = buildPerlPackage { pname = "Git-Version-Compare"; - version = "1.004"; + version = "1.005"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOOK/Git-Version-Compare-1.004.tar.gz"; - hash = "sha256-Y+gmTtNRyyNxtHhSpyNmIUFktfP62dvWgwnH/GPQZJE="; + url = "mirror://cpan/authors/id/B/BO/BOOK/Git-Version-Compare-1.005.tar.gz"; + hash = "sha256-NX/e2eVflesvUWoY9dwbRyCp3u+eLA52vNX+SuubPLs="; }; buildInputs = [ TestNoWarnings ]; meta = { @@ -10640,10 +10739,10 @@ with self; { Glib = buildPerlPackage { pname = "Glib"; - version = "1.3293"; + version = "1.3294"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-1.3293.tar.gz"; - hash = "sha256-cxagwefMXLPbchEhT0XXvcI1Q2WmgKxL06yL8G0ctQA="; + url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-1.3294.tar.gz"; + hash = "sha256-1xX1qGvMGHB13oXnrlvAewcU1u3BlqktpDmG76ROXLs="; }; buildInputs = [ pkgs.glib ]; propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig ]; @@ -10656,10 +10755,10 @@ with self; { GlibObjectIntrospection = buildPerlPackage { pname = "Glib-Object-Introspection"; - version = "0.049"; + version = "0.051"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-Object-Introspection-0.049.tar.gz"; - hash = "sha256-RkYoy53QKLEEOMI4kt5vijAgI1Wk5OsBv9E7jP41r1c="; + url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-Object-Introspection-0.051.tar.gz"; + hash = "sha256-ZWlhHcyArBSCx8IiZLGujJw1HUmDUR65psX0ehAVAIk="; }; nativeCheckInputs = [ pkgs.cairo CairoGObject ]; propagatedBuildInputs = [ pkgs.gobject-introspection Glib ]; @@ -10684,10 +10783,10 @@ with self; { Gnome2 = buildPerlPackage { pname = "Gnome2"; - version = "1.047"; + version = "1.048"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-1.047.tar.gz"; - hash = "sha256-zMhcXcPBT5Fe0aGG0jhoHYP+89F+7RwgABSZ/1a2OQw="; + url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-1.048.tar.gz"; + hash = "sha256-ZPzDgnFKvY1XaSrDdjKMOiDGy8i81zKwB9FMv5ooLd0="; }; buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gnome2Canvas Gnome2VFS Gtk2 ]; propagatedBuildInputs = [ pkgs.gnome2.libgnomeui ]; @@ -10701,10 +10800,10 @@ with self; { Gnome2Canvas = buildPerlPackage { pname = "Gnome2-Canvas"; - version = "1.004"; + version = "1.006"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-Canvas-1.004.tar.gz"; - hash = "sha256-ObezmyNdE85IhJ/QKnrNC4dIpLslXVtKLWkUjKtbgjw="; + url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-Canvas-1.006.tar.gz"; + hash = "sha256-aQZnxziSHeLWUWtOtjlVOlceSoMQ2AMfFYZYU23lq0I="; }; buildInputs = [ pkgs.gnome2.libgnomecanvas ]; propagatedBuildInputs = [ Gtk2 ]; @@ -10717,10 +10816,10 @@ with self; { Gnome2VFS = buildPerlPackage { pname = "Gnome2-VFS"; - version = "1.083"; + version = "1.084"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-VFS-1.083.tar.gz"; - hash = "sha256-7Kl0Zp305/IbT87blsijKEIjacaLjCzZm5zpzF16eXk="; + url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-VFS-1.084.tar.gz"; + hash = "sha256-PI2Mlca2XCN9ueiJx57bK7gIvzfAhKvfu9mFn+93h8w="; }; propagatedBuildInputs = [ pkgs.gnome2.gnome_vfs Glib ]; meta = { @@ -10731,10 +10830,10 @@ with self; { Gnome2Wnck = buildPerlPackage { pname = "Gnome2-Wnck"; - version = "0.16"; + version = "0.18"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Wnck-0.16.tar.gz"; - hash = "sha256-YEqOzoisKfEy1ZsMqsJ2V+wxNxwWBqRpiiFg6IrFhuU="; + url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-Wnck-0.18.tar.gz"; + hash = "sha256-RL7OyLLX9B8ngKc7CSJp/bec1JJluuDI/zkQN8RWSjU="; }; buildInputs = [ pkgs.libwnck2 pkgs.glib pkgs.gtk2 ]; propagatedBuildInputs = [ Gtk2 ]; @@ -10762,10 +10861,10 @@ with self; { GnuPGInterface = buildPerlPackage { pname = "GnuPG-Interface"; - version = "1.02"; + version = "1.03"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BP/BPS/GnuPG-Interface-1.02.tar.gz"; - hash = "sha256-wnpIw9SOGpIF42Lu6mbUawMr2EY3mR/fCxOCi8r90+Y="; + url = "mirror://cpan/authors/id/B/BP/BPS/GnuPG-Interface-1.03.tar.gz"; + hash = "sha256-WvVmMPD6wpDXJCGD9kSaoOAoKfRhHcYrxunps4CPGHo="; }; buildInputs = [ pkgs.which pkgs.gnupg1compat ]; propagatedBuildInputs = [ MooXHandlesVia MooXlate ]; @@ -10868,10 +10967,10 @@ with self; { Graph = buildPerlPackage { pname = "Graph"; - version = "0.9722"; + version = "0.9727"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETJ/Graph-0.9722.tar.gz"; - hash = "sha256-wRNjODPzob74+o65ZoC+NtAOQe9AS93X/Au5hwPijU0="; + url = "mirror://cpan/authors/id/E/ET/ETJ/Graph-0.9727.tar.gz"; + hash = "sha256-OSqJFtyVExq+jJE9/Kx2mEhL9IZrQq9fcEPABi50Iik="; }; propagatedBuildInputs = [ HeapFibonacci SetObject ]; meta = { @@ -10898,10 +10997,10 @@ with self; { GraphicsTIFF = buildPerlPackage { pname = "Graphics-TIFF"; - version = "16"; + version = "20"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/Graphics-TIFF-9.tar.gz"; - hash = "sha256-Kv0JTCBGnvp8+cMmDjzuqd4Qw9r+BjOo0eJC405OOdg="; + url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/Graphics-TIFF-20.tar.gz"; + hash = "sha256-PlXMIJRl4GQBmiFaUvBf9RBAKX0CA5P+n7PeJ60CDjU="; }; buildInputs = [ pkgs.libtiff ExtUtilsDepends ExtUtilsPkgConfig ]; propagatedBuildInputs = [ Readonly ]; @@ -10912,12 +11011,26 @@ with self; { }; }; + GraphicsToolkitColor = buildPerlPackage { + pname = "Graphics-Toolkit-Color"; + version = "1.71"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LI/LICHTKIND/Graphics-Toolkit-Color-1.71.tar.gz"; + hash = "sha256-NOiLb2hY9H2ZYQHxWC8esA23+G4Snl8dYb9/m922LvI="; + }; + buildInputs = [ TestWarn ]; + meta = { + description = "Color palette constructor"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + GraphViz = buildPerlPackage { pname = "GraphViz"; - version = "2.24"; + version = "2.26"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RS/RSAVAGE/GraphViz-2.24.tgz"; - hash = "sha256-2V76xM3u2xgoMQDv4+AMWcGt1STZzojByKNYNZEi9a0="; + url = "mirror://cpan/authors/id/E/ET/ETJ/GraphViz-2.26.tar.gz"; + hash = "sha256-ml0lILMmK/MEdSct12SkRfjn+TG++Ivg49O/9EXacyg="; }; # XXX: It'd be nicer it `GraphViz.pm' could record the path to graphviz. @@ -11008,6 +11121,10 @@ with self; { url = "mirror://cpan/authors/id/X/XA/XAOC/Gtk2-1.24993.tar.gz"; hash = "sha256-ScRDdDsu7+EadoACck9/akxI78lP8806VZ+357aTyWc="; }; + patches = [ + # Fix incompatible function pointer conversion (assigning `GdkNativeWindow` to `guint32`). + ../development/perl-modules/Gtk2-fix-incompatible-pointer-conversion.patch + ]; buildInputs = [ pkgs.gtk2 ]; # https://rt.cpan.org/Public/Bug/Display.html?id=130742 # doCheck = !stdenv.isDarwin; @@ -11022,10 +11139,10 @@ with self; { Gtk2TrayIcon = buildPerlPackage { pname = "Gtk2-TrayIcon"; - version = "0.06"; + version = "0.07"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BORUP/Gtk2-TrayIcon-0.06.tar.gz"; - hash = "sha256-y7djK3XX9BVU3+jukGPb/R2FIikQd8ZdDYLpzrXpSuI="; + url = "mirror://cpan/authors/id/X/XA/XAOC/Gtk2-TrayIcon-0.07.tar.gz"; + hash = "sha256-OfwrmabmE9qeqXfYy1MD+l4H5poVJIk03hIXqXuWRVQ="; }; propagatedBuildInputs = [ pkgs.gtk2 Gtk2 ]; meta = { @@ -11073,10 +11190,10 @@ with self; { Gtk2Unique = buildPerlPackage { pname = "Gtk2-Unique"; - version = "0.05"; + version = "0.07"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PO/POTYL/Gtk2-Unique-0.05.tar.gz"; - hash = "sha256-ro37D2hE3aos57W0RVNBlJDI6Dwk/TXEMUBqWPa+D08="; + url = "mirror://cpan/authors/id/X/XA/XAOC/Gtk2-Unique-0.07.tar.gz"; + hash = "sha256-nOX2ikFgC8z31u/eMMBwqxFOk57XqKx8O3rZE5mJGGc="; }; propagatedBuildInputs = [ pkgs.libunique pkgs.gtk2 Gtk2 ]; meta = { @@ -11282,6 +11399,21 @@ with self; { }; }; + HashOrdered = buildPerlPackage { + pname = "Hash-Ordered"; + version = "0.014"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Hash-Ordered-0.014.tar.gz"; + hash = "sha256-jcNs15FVrjerij3l/ZEg/7qaMeQJJYwoUp7FJRxZdHs="; + }; + buildInputs = [ TestDeep TestFailWarnings TestFatal ]; + meta = { + homepage = "https://github.com/dagolden/Hash-Ordered"; + description = "A fast, pure-Perl ordered hash class"; + license = lib.licenses.asl20; + }; + }; + HashSafeKeys = buildPerlPackage { pname = "Hash-SafeKeys"; version = "0.04"; @@ -11397,10 +11529,10 @@ with self; { HTMLEscape = buildPerlModule { pname = "HTML-Escape"; - version = "1.10"; + version = "1.11"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/HTML-Escape-1.10.tar.gz"; - hash = "sha256-scusQVetje2saRThYohV4FuNyIWkAH0uTfgXfGqbcPs="; + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/HTML-Escape-1.11.tar.gz"; + hash = "sha256-Wl7viWUA0epsJKkIXs++mkOr7mjPxmwD+InSostoml0="; }; buildInputs = [ ModuleBuildPluggablePPPort TestRequires ]; perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' @@ -11429,12 +11561,13 @@ with self; { HTMLForm = buildPerlPackage { pname = "HTML-Form"; - version = "6.07"; + version = "6.11"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/HTML-Form-6.07.tar.gz"; - hash = "sha256-faqMfq/0AFUBw0Mci/R41Yu+57g2+GNYGqFK/htLYic="; + url = "mirror://cpan/authors/id/S/SI/SIMBABQUE/HTML-Form-6.11.tar.gz"; + hash = "sha256-Q7+qcIc5NIfS1RJhoap/b4Gpex2P73pI/PbvMrFtZFQ="; }; - propagatedBuildInputs = [ HTMLParser ]; + buildInputs = [ TestWarnings ]; + propagatedBuildInputs = [ HTMLParser URI ]; meta = { description = "Class that represents an HTML form element"; homepage = "https://github.com/libwww-perl/HTML-Form"; @@ -11597,10 +11730,10 @@ with self; { HTMLParser = buildPerlPackage { pname = "HTML-Parser"; - version = "3.75"; + version = "3.81"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CA/CAPOEIRAB/HTML-Parser-3.75.tar.gz"; - hash = "sha256-rGteJajfevVIhSAekcRfuatnRMCM7cGjj8x9ldIRk6k="; + url = "mirror://cpan/authors/id/O/OA/OALDERS/HTML-Parser-3.81.tar.gz"; + hash = "sha256-wJEKXI+S+IF+3QbM/SJLocLr6MEPVR8DJYeh/IPWL/I="; }; propagatedBuildInputs = [ HTMLTagset HTTPMessage ]; meta = { @@ -11653,10 +11786,10 @@ with self; { HTMLSelectorXPath = buildPerlPackage { pname = "HTML-Selector-XPath"; - version = "0.25"; + version = "0.28"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CO/CORION/HTML-Selector-XPath-0.25.tar.gz"; - hash = "sha256-Gl1N4UvH+G8OvXZik+Ok4SaYzS3gRnMkP/065xVqauE="; + url = "mirror://cpan/authors/id/C/CO/CORION/HTML-Selector-XPath-0.28.tar.gz"; + hash = "sha256-QycX8D7Szz1kETDP09ShU/Ca1PhW2gB4E3kv4LLljQ8="; }; buildInputs = [ TestBase ]; meta = { @@ -11776,10 +11909,10 @@ with self; { HTMLTiny = buildPerlPackage { pname = "HTML-Tiny"; - version = "1.05"; + version = "1.08"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANDYA/HTML-Tiny-1.05.tar.gz"; - hash = "sha256-183J1ZheLkTOuhC3Vqzx4NOhs+47UW5bVK24UP55/aM="; + url = "mirror://cpan/authors/id/A/AR/ARISTOTLE/HTML-Tiny-1.08.tar.gz"; + hash = "sha256-DwHfDJ/ICz2dooi6q/jApTdHRE964euWAOevxKPc/rU="; }; meta = { description = "Lightweight, dependency free HTML/XML generation"; @@ -11879,10 +12012,10 @@ with self; { HTTPCookieJar = buildPerlPackage { pname = "HTTP-CookieJar"; - version = "0.010"; + version = "0.014"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/HTTP-CookieJar-0.010.tar.gz"; - hash = "sha256-VuMz6CPF2HKiiSQEgrlM3oQesDe38v/U0bQ6opjG9dA="; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/HTTP-CookieJar-0.014.tar.gz"; + hash = "sha256-cJTqXJH1NtJjuF6Dq06alj4RxECM4I7K5VP6nAzEfnM="; }; propagatedBuildInputs = [ HTTPDate ]; buildInputs = [ TestDeep TestRequires URI ]; @@ -11897,10 +12030,10 @@ with self; { HTTPCookies = buildPerlPackage { pname = "HTTP-Cookies"; - version = "6.09"; + version = "6.10"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Cookies-6.09.tar.gz"; - hash = "sha256-kD8Bevqlt4WZzJDvwU7MzIzC6/tjbrjAL48WuoYdH+A="; + url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Cookies-6.10.tar.gz"; + hash = "sha256-4282Yzxc5rXkuHb/z3R4fMXv4HNt1/SHvdc8FPC9cAc="; }; propagatedBuildInputs = [ HTTPMessage ]; meta = { @@ -11912,29 +12045,11 @@ with self; { HTTPDaemon = buildPerlPackage { pname = "HTTP-Daemon"; - version = "6.14"; + version = "6.16"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Daemon-6.14.tar.gz"; - hash = "sha256-8HZ+fzy7gLITE8dh8HrY7SU7zp+i0LqAaz+3LTCbLh0="; + url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Daemon-6.16.tar.gz"; + hash = "sha256-s40JJyXm+k4MTcKkfhVwcEkbr6Db4Wx4o1joBqp+Fz0="; }; - patches = [ - # Patches for CVE-2022-3108, from upstream pre 6.15 - (fetchpatch { - url = "https://github.com/libwww-perl/HTTP-Daemon/commit/331d5c1d1f0e48e6b57ef738c2a8509b1eb53376.patch"; - hash = "sha256-vRSyiO38jnsSeKeGbCnKi+VLaTqQSB349eybl1Wa8SQ="; - name = "HTTP-Daemon-CVE-2022-3108-pre.patch"; - }) - (fetchpatch { - url = "https://github.com/libwww-perl/HTTP-Daemon/commit/e84475de51d6fd7b29354a997413472a99db70b2.patch"; - hash = "sha256-z8RXcbVEpjSZcm8dUZcDWYeQHtVZODOGCdcDTfXQpfA="; - name = "HTTP-Daemon-CVE-2022-3108-1.patch"; - }) - (fetchpatch { - url = "https://github.com/libwww-perl/HTTP-Daemon/commit/8dc5269d59e2d5d9eb1647d82c449ccd880f7fd0.patch"; - hash = "sha256-e1lxt+AJGfbjNOZoKj696H2Ftkx9wlTF557WkZCLE5Q="; - name = "HTTP-Daemon-CVE-2022-3108-2.patch"; - }) - ]; buildInputs = [ ModuleBuildTiny TestNeeds ]; propagatedBuildInputs = [ HTTPMessage ]; meta = { @@ -11946,10 +12061,10 @@ with self; { HTTPDate = buildPerlPackage { pname = "HTTP-Date"; - version = "6.05"; + version = "6.06"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Date-6.05.tar.gz"; - hash = "sha256-Nl1ilN+9N+vFHe+LZbget5s5NOy8laLsLU2Cfv5qkis="; + url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Date-6.06.tar.gz"; + hash = "sha256-e2hRkcasw+dz0fwCyV7h+frpT3d4MXX154wYHMktK1I="; }; propagatedBuildInputs = [ TimeDate ]; meta = { @@ -12053,13 +12168,13 @@ with self; { HTTPMessage = buildPerlPackage { pname = "HTTP-Message"; - version = "6.26"; + version = "6.45"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.26.tar.gz"; - hash = "sha256-bObDWd51w7uGaWo5AYm0heyT4//FUya20ET6kA8XJeE="; + url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.45.tar.gz"; + hash = "sha256-AcuEBmEqP3OIQtHpcxOuTYdIcNG41tZjMfFgAJQ9TL4="; }; - buildInputs = [ TryTiny ]; - propagatedBuildInputs = [ EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ]; + buildInputs = [ TestNeeds TryTiny ]; + propagatedBuildInputs = [ Clone EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ]; meta = { description = "HTTP style message (base class)"; homepage = "https://github.com/libwww-perl/HTTP-Message"; @@ -12229,10 +12344,10 @@ with self; { HTTPTinyish = buildPerlPackage { pname = "HTTP-Tinyish"; - version = "0.17"; + version = "0.18"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Tinyish-0.17.tar.gz"; - hash = "sha256-R70RHkdFZtczxBhw4jdMgWidteC1pDrcSK22ZdifsGc="; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Tinyish-0.18.tar.gz"; + hash = "sha256-gDgLjTPGv6lrsBBPpqQcJ9zE6cg6SN8frTkJf1/c/eU="; }; propagatedBuildInputs = [ FileWhich IPCRun3 ]; meta = { @@ -12305,10 +12420,10 @@ with self; { ImageInfo = buildPerlPackage { pname = "Image-Info"; - version = "1.42"; + version = "1.44"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SREZIC/Image-Info-1.42.tar.gz"; - hash = "sha256-K8pWDD9xs8HNY6w6l05i87rrmGt/+qAmuSkIG5FKj08="; + url = "mirror://cpan/authors/id/S/SR/SREZIC/Image-Info-1.44.tar.gz"; + hash = "sha256-y3/GXdHv/gHrR8HHmlLdFlT0KOOpfbHvI7EmzgFjbw0="; }; propagatedBuildInputs = [ IOStringy ]; meta = { @@ -12431,10 +12546,10 @@ with self; { IO = buildPerlPackage { pname = "IO"; - version = "1.42"; + version = "1.51"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/IO-1.42.tar.gz"; - hash = "sha256-7sXMM6bN26i10kJbYHUogq3X5NQbdDGg6k3Nc8wfjMo="; + url = "mirror://cpan/authors/id/T/TO/TODDR/IO-1.51.tar.gz"; + hash = "sha256-VJPqVZmHKM0rfsuCNMWPtdXfJwmNDwet3KIkRNdhbOA="; }; doCheck = false; meta = { @@ -12486,7 +12601,7 @@ with self; { }; preCheck = "rm t/50resolver.t"; # this test fails with "Temporary failure in name resolution" in sandbox propagatedBuildInputs = [ Future StructDumb ]; - buildInputs = [ FutureIO TestFatal TestIdentity TestMetricsAny TestRefcount ]; + buildInputs = [ TestFatal TestFutureIOImpl TestIdentity TestMetricsAny TestRefcount ]; meta = { description = "Asynchronous event-driven programming"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -12495,19 +12610,11 @@ with self; { IOAsyncSSL = buildPerlModule { pname = "IO-Async-SSL"; - version = "0.23"; + version = "0.25"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-SSL-0.23.tar.gz"; - hash = "sha256-0vyuFuJ+F6yjkDpK1aK/L7wmjQZRzn8ARabQVG9YTy4="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-SSL-0.25.tar.gz"; + hash = "sha256-Te9IXbHv9OE5tLWRIgLA/WHDrtLOw1vVq4v3u9g/WnU="; }; - patches = [ - (fetchpatch { - # Fixes test compatibility with OpenSSL 3 - url = "https://sources.debian.org/data/main/libi/libio-async-ssl-perl/0.23-1/debian/patches/upgrade-error-match.patch"; - hash = "sha256-RK36nVba203I9awZtHiU7jwhCV7U8Gw6wnbs3e9Hbjk="; - name = "IO-Async-SSL-upgrade-error-match.patch"; - }) - ]; buildInputs = [ TestIdentity ]; propagatedBuildInputs = [ Future IOAsync IOSocketSSL ]; meta = { @@ -12546,10 +12653,10 @@ with self; { IOCompress = buildPerlPackage { pname = "IO-Compress"; - version = "2.102"; + version = "2.206"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.102.tar.gz"; - hash = "sha256-1vp/mlvu5EZFKg+8Q1iaDHP+fpJcB1uYYosBgEjccqQ="; + url = "mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.206.tar.gz"; + hash = "sha256-fTBiuaSU91fo0GFPIg2D8icxu9oa6198/w5yqD9DPTU="; }; propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; # Same as CompressRawZlib @@ -12607,10 +12714,10 @@ with self; { IOInteractive = buildPerlPackage { pname = "IO-Interactive"; - version = "1.022"; + version = "1.025"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/IO-Interactive-1.022.tar.gz"; - hash = "sha256-DtU7iuk66Hfpjg2Jt7Qp4pzNHuTCjpUsTqmqc9Af69w="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/IO-Interactive-1.025.tar.gz"; + hash = "sha256-yh7G+6t6AnXdLpz2e3yw4ARYY/MVMyEMfcVEYxtqqqc="; }; meta = { description = "Utilities for interactive I/O"; @@ -12721,10 +12828,10 @@ with self; { IOSocketINET6 = buildPerlModule { pname = "IO-Socket-INET6"; - version = "2.72"; + version = "2.73"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/IO-Socket-INET6-2.72.tar.gz"; - hash = "sha256-heAg+heShBJfwdCOYKkCKvPsEnEHf+FLEzwXhc2/Hrs="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/IO-Socket-INET6-2.73.tar.gz"; + hash = "sha256-ttp0aFMlPVtKxDGRtPaaRxlZXuE6fKZ2qAVM825tFrs="; }; propagatedBuildInputs = [ Socket6 ]; doCheck = false; @@ -12736,10 +12843,10 @@ with self; { IOSocketSSL = buildPerlPackage { pname = "IO-Socket-SSL"; - version = "2.068"; + version = "2.083"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.068.tar.gz"; - hash = "sha256-RCD8AFbxgntN0SRerMoNpW4hgrTvb8B48QfcQ8P7j/k="; + url = "mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.083.tar.gz"; + hash = "sha256-kE7yh2VECpfYqaDfWX+MPX88sKBT0bCCwQvtA7yAIGk="; }; propagatedBuildInputs = [ MozillaCA NetSSLeay ]; # Fix path to default certificate store. @@ -12842,11 +12949,12 @@ with self; { IOTty = buildPerlPackage { pname = "IO-Tty"; - version = "1.15"; + version = "1.17"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-1.15.tar.gz"; - hash = "sha256-Q/nMD4diC7sVngiQ4ZayOo5kGcvQQiTBDz3O6Uj2tRo="; + url = "mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-1.17.tar.gz"; + hash = "sha256-pfGoMCC8W13WwbVw9Ix1RuCo9/rBCgaHQLA5Ja2eFOg="; }; + patches = [ ../development/perl-modules/IO-Tty-fix-makefile.patch ]; doCheck = !stdenv.isDarwin; # openpty fails in the sandbox meta = { description = "Low-level allocate a pseudo-Tty, import constants"; @@ -12900,10 +13008,10 @@ with self; { IPCRun = buildPerlPackage { pname = "IPC-Run"; - version = "20200505.0"; + version = "20231003.0"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-20200505.0.tar.gz"; - hash = "sha256-gW6/IX+g35nFg9c8Csxs7XisdzeHxmTHXL8UC7fkyQE="; + url = "mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-20231003.0.tar.gz"; + hash = "sha256-6yW731kT0pF5fvG/6ZjxUTC0VdPtAqrN5oVvCyXk/lc="; }; doCheck = false; /* attempts a network connection to localhost */ propagatedBuildInputs = [ IOTty ]; @@ -13040,10 +13148,10 @@ with self; { InlineC = buildPerlPackage { pname = "Inline-C"; - version = "0.81"; + version = "0.82"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TINITA/Inline-C-0.81.tar.gz"; - hash = "sha256-8YUljZBQ1/ebTwDxJiXMRpwvcA/2LT6DHLGNgNLIeqw="; + url = "mirror://cpan/authors/id/E/ET/ETJ/Inline-C-0.82.tar.gz"; + hash = "sha256-EPvPHhWNHI134d2TTjeRZbEmpFwTZFrQvp3AfRUd0Mw="; }; buildInputs = [ FileCopyRecursive TestWarn YAMLLibYAML ]; propagatedBuildInputs = [ Inline ParseRecDescent Pegex ]; @@ -13061,13 +13169,14 @@ with self; { InlineJava = buildPerlPackage { pname = "Inline-Java"; - version = "0.66"; + version = "0.67"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETJ/Inline-Java-0.66.tar.gz"; - hash = "sha256-x0PgaOb28b2HMGH+R6h05cJIpP2ks8fM6J8P2/oz2Ug="; + url = "mirror://cpan/authors/id/E/ET/ETJ/Inline-Java-0.67.tar.gz"; + hash = "sha256-9YVLMcvOFjwz4mJN0jFODA2X4JRDcbcYjlkBuj9vpMk="; }; + buildInputs = [ FileWhich ]; propagatedBuildInputs = [ Inline ]; # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731 @@ -13103,13 +13212,14 @@ with self; { }; }; - JavaScriptMinifierXS = buildPerlModule { + JavaScriptMinifierXS = buildPerlPackage { pname = "JavaScript-Minifier-XS"; - version = "0.11"; + version = "0.15"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-0.11.tar.gz"; - hash = "sha256-FRISykvVCy9eHebQHjywhGBAe9dfJ9/IFi8veSeDnu4="; + url = "mirror://cpan/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-0.15.tar.gz"; + hash = "sha256-XZsDT1jwtv9bZGR708WpzgWypw7e4zn7wxc67nR8wFA="; }; + buildInputs = [ TestDiagINC ]; perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; meta = { description = "XS based JavaScript minifier"; @@ -13134,10 +13244,10 @@ with self; { JSON = buildPerlPackage { pname = "JSON"; - version = "4.02"; + version = "4.10"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-4.02.tar.gz"; - hash = "sha256-REqIdVqJ/6KlQkq07R0R3KYYCOvvV+gSQ0JGGanoYnw="; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-4.10.tar.gz"; + hash = "sha256-34tRQ9mn3pnEe1XxoXC9H2n3EZNcGGptwKtW3QV1jjU="; }; # Do not abort cross-compilation on failure to load native JSON module into host perl preConfigure = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' @@ -13152,12 +13262,12 @@ with self; { JSONAny = buildPerlPackage { pname = "JSON-Any"; - version = "1.39"; + version = "1.40"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/JSON-Any-1.39.tar.gz"; - hash = "sha256-rkl1XPNxCmoydqN6t9XD5+DArrLas1Ss12gsCad5V8M="; + url = "mirror://cpan/authors/id/E/ET/ETHER/JSON-Any-1.40.tar.gz"; + hash = "sha256-CDJWJVpICU/ZrBI54P6ooQojg6nNHvSxxyZO3htEAKs="; }; - buildInputs = [ TestFatal TestRequires TestWarnings TestWithoutModule ]; + buildInputs = [ TestFatal TestNeeds TestWarnings TestWithoutModule ]; meta = { description = "(DEPRECATED) Wrapper Class for the various JSON classes"; homepage = "https://github.com/karenetheridge/JSON-Any"; @@ -13181,10 +13291,10 @@ with self; { JSONMaybeXS = buildPerlPackage { pname = "JSON-MaybeXS"; - version = "1.004003"; + version = "1.004005"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/JSON-MaybeXS-1.004003.tar.gz"; - hash = "sha256-W+47F/+dz/1umauM9/NXR2UL/OHcYi460QuFoZRGL78="; + url = "mirror://cpan/authors/id/E/ET/ETHER/JSON-MaybeXS-1.004005.tar.gz"; + hash = "sha256-9ba8GfV55mtymfh0i4rD4XGTbcTn/LcqiiV6m9SCozE="; }; buildInputs = [ TestNeeds ]; meta = { @@ -13195,10 +13305,10 @@ with self; { JSONPP = buildPerlPackage { pname = "JSON-PP"; - version = "4.05"; + version = "4.16"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.05.tar.gz"; - hash = "sha256-1aK8przPTUT0Ouqs4PRa5lQbt/UNtaSJtdL/X76L8M4="; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.16.tar.gz"; + hash = "sha256-i8LxYrr8QmRcSJkFrXJUDw08KEs2DJYpkJUYPDDMl4k="; }; meta = { description = "JSON::XS compatible pure-Perl module"; @@ -13222,10 +13332,10 @@ with self; { JSONParse = buildPerlPackage { pname = "JSON-Parse"; - version = "0.61"; + version = "0.62"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.61.tar.gz"; - hash = "sha256-zo5V5wvvm8u6LpavYx0QpgWQCWGiLK2XfnGqtWw/KAY="; + url = "mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.62.tar.gz"; + hash = "sha256-YnMYD5OSSXQB3dbYIHBvWqhsG+iIkd1qq02Qa1z/Ztk="; }; meta = { description = "Parse JSON"; @@ -13403,10 +13513,10 @@ with self; { LexicalSealRequireHints = buildPerlModule { pname = "Lexical-SealRequireHints"; - version = "0.0011"; + version = "0.012"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Lexical-SealRequireHints-0.011.tar.gz"; - hash = "sha256-npGO0RjvaF1uCdqxzW5m7gox13b+JLumPlJDkG9WATo="; + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Lexical-SealRequireHints-0.012.tar.gz"; + hash = "sha256-wyvcOOBvjWyQdlu74xaMNYJH2n2uhbgLqEotoXY3V90="; }; meta = { description = "Prevent leakage of lexical hints"; @@ -13473,10 +13583,10 @@ with self; { libintl-perl = buildPerlPackage { pname = "libintl-perl"; - version = "1.32"; + version = "1.33"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.32.tar.gz"; - hash = "sha256-gBCCmPJWTsv8cRCjBCAI5mXtAMLhVbNrAYjmwRNc66U="; + url = "mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.33.tar.gz"; + hash = "sha256-USbtqczQ7rENuC3e9jy8r329dx54zA+xEMw7WmuGeec="; }; meta = { description = "Portable l10n and i10n functions"; @@ -13486,18 +13596,11 @@ with self; { libnet = buildPerlPackage { pname = "libnet"; - version = "3.12"; + version = "3.15"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHAY/libnet-3.13.tar.gz"; - hash = "sha256-WjX7Hy1KopFoDrGvOImfq0U8IsKOcffHvTdHtaPbNIw="; + url = "mirror://cpan/authors/id/S/SH/SHAY/libnet-3.15.tar.gz"; + hash = "sha256-px9NtYDhp2fWk2+qW6848fpheCQ0LaB4tWEoPob49KI="; }; - patches = [ - (fetchpatch { - name = "deterministic-libnet.cfg"; - url = "https://github.com/steve-m-hay/perl-libnet/commit/7d076c4352f67ee4ed64092cfad3963a2321bd53.patch"; - hash = "sha256-GyPx0ZQ/u/+DaFM7eNDvXrMFC0+d3GyLxVZJBKrg6V0="; - }) - ]; meta = { description = "Collection of network protocol modules"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -13506,10 +13609,10 @@ with self; { librelative = buildPerlPackage { pname = "lib-relative"; - version = "1.000"; + version = "1.002"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DB/DBOOK/lib-relative-1.000.tar.gz"; - hash = "sha256-3+DHAF/Yvd0lp+jCUEsPreFix0ynG096y36OdhBtbNc="; + url = "mirror://cpan/authors/id/D/DB/DBOOK/lib-relative-1.002.tar.gz"; + hash = "sha256-5EcCFRZ8QGkXYD54vk2TESz2kTzTQq64ALQS4BHIp4s="; }; meta = { description = "Add paths relative to the current file to @INC"; @@ -13520,10 +13623,10 @@ with self; { libwwwperl = buildPerlPackage { pname = "libwww-perl"; - version = "6.70"; + version = "6.72"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SI/SIMBABQUE/libwww-perl-6.70.tar.gz"; - hash = "sha256-NPANI0R1e5wLVa01gI1T6T19kvekZOyDf+anPFH7WWk="; + url = "mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.72.tar.gz"; + hash = "sha256-6bg1T9XiC+IHr+I93VhPzVm/gpmNwHfez2hLodrloF0="; }; buildInputs = [ HTTPDaemon TestFatal TestNeeds TestRequiresInternet ]; propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookieJar HTTPCookies HTTPDate HTTPMessage HTTPNegotiate LWPMediaTypes NetHTTP TryTiny URI WWWRobotRules ]; @@ -13734,10 +13837,10 @@ with self; { LinguaTranslit = buildPerlPackage { pname = "Lingua-Translit"; - version = "0.28"; + version = "0.29"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AL/ALINKE/Lingua-Translit-0.28.tar.gz"; - hash = "sha256-ET+R2PwsYwQ3FTpJ+3pSsCOvj2J47ZbAcLH2CCS46uE="; + url = "mirror://cpan/authors/id/A/AL/ALINKE/Lingua-Translit-0.29.tar.gz"; + hash = "sha256-GtL6vAB52tcIt9nVVDfJ67GS5hC/lgryWUWFi5JZd1I="; }; doCheck = false; meta = { @@ -13813,10 +13916,10 @@ with self; { LinuxFD = buildPerlModule { pname = "Linux-FD"; - version = "0.011"; + version = "0.014"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/Linux-FD-0.011.tar.gz"; - hash = "sha256-a7V51HZEyw7TVib/d+kJrmkGMHPGrAmqBhT+8A+jc1Y="; + url = "mirror://cpan/authors/id/L/LE/LEONT/Linux-FD-0.014.tar.gz"; + hash = "sha256-eDHcJkxG2bh/dkNhdNdmFBRSQ2Mwg+CQqrTZo1LwQ60="; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ SubExporter ]; @@ -13830,10 +13933,10 @@ with self; { LinuxInotify2 = buildPerlPackage { pname = "Linux-Inotify2"; - version = "2.2"; + version = "2.3"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Linux-Inotify2-2.2.tar.gz"; - hash = "sha256-3UGiDaVon7IHHuojo4PE4PjYW0YrpluqbE9TolTtNDM="; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Linux-Inotify2-2.3.tar.gz"; + hash = "sha256-y5kVD5/6UdvDvl7pjY6RyYzf6uIuuI5xjyzzZ78nDRc="; }; propagatedBuildInputs = [ commonsense ]; @@ -13860,10 +13963,10 @@ with self; { ListAllUtils = buildPerlPackage { pname = "List-AllUtils"; - version = "0.18"; + version = "0.19"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.18.tar.gz"; - hash = "sha256-t8S/gAkLKBxKFWDHahqBkJTDoSlDAvd6+4xgykhi7Pk="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.19.tar.gz"; + hash = "sha256-MKgUarIad4e4xW1YKc+afysVJ207P8oHM2rDjTAC/7w="; }; propagatedBuildInputs = [ ListSomeUtils ListUtilsBy ]; meta = { @@ -13935,10 +14038,10 @@ with self; { ListSomeUtils = buildPerlPackage { pname = "List-SomeUtils"; - version = "0.58"; + version = "0.59"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/List-SomeUtils-0.58.tar.gz"; - hash = "sha256-lur7NZM50ivyot5CEpiEejxA9qKLbUQAXQll2oalRp0="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/List-SomeUtils-0.59.tar.gz"; + hash = "sha256-+rMDcuTGe/WkYGLaONHQyHVief6tqGbrQ5+ilXGi3Hs="; }; buildInputs = [ TestLeakTrace ]; propagatedBuildInputs = [ ModuleImplementation ]; @@ -13951,10 +14054,10 @@ with self; { ListUtilsBy = buildPerlModule { pname = "List-UtilsBy"; - version = "0.11"; + version = "0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.11.tar.gz"; - hash = "sha256-+t30O0vCHbjkwOiaJuXyP+YmzeNJHsZRtqozhif1d1o="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.12.tar.gz"; + hash = "sha256-//EoH9Rp/pgrGlgES+z9lw8xO/86JuHHsrP0wKXtceA="; }; meta = { description = "Higher-order list utility functions"; @@ -13964,10 +14067,10 @@ with self; { LocaleCodes = buildPerlPackage { pname = "Locale-Codes"; - version = "3.66"; + version = "3.76"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.66.tar.gz"; - hash = "sha256-mfrNbVbijKaPMj0Cy3/GyOuYM7BpalqDPvSsP15cV+c="; + url = "mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.76.tar.gz"; + hash = "sha256-Qo00GFUJ7fbaYoYoAJcohrsCwySTRU/L4Y+Zmk9DXzk="; }; buildInputs = [ TestInter ]; meta = { @@ -14181,10 +14284,10 @@ with self; { LogAny = buildPerlPackage { pname = "Log-Any"; - version = "1.708"; + version = "1.717"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PR/PREACTION/Log-Any-1.708.tar.gz"; - hash = "sha256-4UB3WdyUYqsJbU3cif6qyKuzQcVCnjjPb3uKmWo17Nk="; + url = "mirror://cpan/authors/id/P/PR/PREACTION/Log-Any-1.717.tar.gz"; + hash = "sha256-VmSdoPOQAjDJ49KSUssKdIBvst3r0igFrNc2iVmmW8o="; }; # Syslog test fails. preCheck = "rm t/syslog.t"; @@ -14243,10 +14346,10 @@ with self; { LogDispatch = buildPerlPackage { pname = "Log-Dispatch"; - version = "2.70"; + version = "2.71"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.70.tar.gz"; - hash = "sha256-o9kcxSRn06PGaDED899EctceQFpF9VMolEhxOsQpPyE="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.71.tar.gz"; + hash = "sha256-nWDZZIw1zidUcx603rfwWAns4b1jO3TXR5Wu2exzJXA="; }; propagatedBuildInputs = [ DevelGlobalDestruction ParamsValidationCompiler Specio namespaceautoclean ]; buildInputs = [ IPCRun3 TestFatal TestNeeds ]; @@ -14259,10 +14362,10 @@ with self; { LogDispatchFileRotate = buildPerlPackage { pname = "Log-Dispatch-FileRotate"; - version = "1.36"; + version = "1.38"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSCHOUT/Log-Dispatch-FileRotate-1.36.tar.gz"; - hash = "sha256-RyyxCw+sa71nKYvCjxSVhZrYWy356IxKH366c0+IlW4="; + url = "mirror://cpan/authors/id/M/MS/MSCHOUT/Log-Dispatch-FileRotate-1.38.tar.gz"; + hash = "sha256-tV1s7ePwoGQmSI+/pVT0VhMgsBTBAjiTztKVCOW85Ow="; }; propagatedBuildInputs = [ DateManip LogDispatch ]; buildInputs = [ PathTiny TestWarn ]; @@ -14290,10 +14393,10 @@ with self; { Logger = buildPerlPackage { pname = "Log-ger"; - version = "0.037"; + version = "0.040"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PERLANCAR/Log-ger-0.037.tar.gz"; - hash = "sha256-wuJBcu2iBD14bm4gUUG72xvei7Lt/CtjAtxPih46oDg="; + url = "mirror://cpan/authors/id/P/PE/PERLANCAR/Log-ger-0.040.tar.gz"; + hash = "sha256-6JEdM4ePoWmeQ+jQpU7V1WEEA4Z/9cM5+TQQPRfsZLA="; }; meta = { description = "A lightweight, flexible logging framework"; @@ -14359,10 +14462,10 @@ with self; { MCE = buildPerlPackage { pname = "MCE"; - version = "1.874"; + version = "1.889"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.874.tar.gz"; - hash = "sha256-2AnjAYR1EVrX7MuL70m9478+dau7zYBWRyi7z6uG09A="; + url = "mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.889.tar.gz"; + hash = "sha256-22FT5HTQRvwlMFC/U8VAAthM1Mp30hwrnfVv7rgJu+0="; }; meta = { description = "Many-Core Engine for Perl providing parallel processing capabilities"; @@ -14388,10 +14491,10 @@ with self; { LogDispatchArray = buildPerlPackage { pname = "Log-Dispatch-Array"; - version = "1.003"; + version = "1.005"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatch-Array-1.003.tar.gz"; - hash = "sha256-DCCTHC978mp2ugE3C5WCIV/lIWsWGCLAw/IEqB+4fzc="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatch-Array-1.005.tar.gz"; + hash = "sha256-MRZAt6ln+N18m7QaInBzVlY21w30/MHUT+2KgiOzR8o="; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ LogDispatch ]; @@ -14404,10 +14507,10 @@ with self; { LogDispatchouli = buildPerlPackage { pname = "Log-Dispatchouli"; - version = "2.022"; + version = "3.007"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatchouli-2.022.tar.gz"; - hash = "sha256-KipBdq2vuFoeucncOJBSkZ6MLJ35mqulOMBrjalkpd8="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatchouli-3.007.tar.gz"; + hash = "sha256-mIEYlllSukmo+nkaZTaIDIkBf0651ywXRe1n0VwNJyw="; }; buildInputs = [ TestDeep TestFatal ]; propagatedBuildInputs = [ LogDispatchArray StringFlogger SubExporterGlobExporter ]; @@ -14467,12 +14570,15 @@ with self; { LWP = buildPerlPackage { pname = "libwww-perl"; - version = "6.67"; + version = "6.72"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.67.tar.gz"; - hash = "sha256-lu7ECj/QqhvYNBF75eshxDj3MJTYYaGn5XdPCxImtyM="; + url = "mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.72.tar.gz"; + hash = "sha256-6bg1T9XiC+IHr+I93VhPzVm/gpmNwHfez2hLodrloF0="; }; - propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPNegotiate NetHTTP TryTiny WWWRobotRules ]; + propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPCookieJar HTTPNegotiate NetHTTP TryTiny WWWRobotRules ]; + preCheck = '' + export NO_NETWORK_TESTING=1 + ''; # support cross-compilation by avoiding using `has_module` which does not work in miniperl (it requires B native module) postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' substituteInPlace Makefile.PL --replace 'if has_module' 'if 0; #' @@ -14531,15 +14637,17 @@ with self; { LWPProtocolHttps = buildPerlPackage { pname = "LWP-Protocol-https"; - version = "6.09"; + version = "6.11"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.09.tar.gz"; - hash = "sha256-Fs/hpRFpCwZttWZ8hxSALuK5xdKKMaPnvTb7xwo69ZI="; + url = "mirror://cpan/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.11.tar.gz"; + hash = "sha256-ATLdvwNmFWXKhQUPKlCU+5Jjy7w8yxpNnEGsm7CDuRc="; }; patches = [ ../development/perl-modules/lwp-protocol-https-cert-file.patch ]; propagatedBuildInputs = [ IOSocketSSL LWP ]; - doCheck = false; # tries to connect to https://www.apache.org/. - buildInputs = [ TestRequiresInternet ]; + preCheck = '' + export NO_NETWORK_TESTING=1 + ''; + buildInputs = [ TestRequiresInternet TestNeeds ]; meta = { description = "Provide https support for LWP::UserAgent"; homepage = "https://github.com/libwww-perl/LWP-Protocol-https"; @@ -14643,10 +14751,10 @@ with self; { MacPasteboard = buildPerlPackage { pname = "Mac-Pasteboard"; - version = "0.011"; + version = "0.103"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WY/WYANT/Mac-Pasteboard-0.011.tar.gz"; - hash = "sha256-vYxFELHoBcQ+S1UVXAvq8AK2Sf4wtqeEH/Bec5m6Aqk="; + url = "mirror://cpan/authors/id/W/WY/WYANT/Mac-Pasteboard-0.103.tar.gz"; + hash = "sha256-L16N0tsNZEVVhITKbULYOcWpfuiqGyUOaU1n1bf2Y0w="; }; buildInputs = [ pkgs.darwin.apple_sdk.frameworks.ApplicationServices ]; meta = { @@ -14689,13 +14797,13 @@ with self; { MailAuthenticationResults = buildPerlPackage { pname = "Mail-AuthenticationResults"; - version = "1.20200824.1"; + version = "2.20230112"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-AuthenticationResults-1.20200824.1.tar.gz"; - hash = "sha256-M7qo4p+rDobNtHkNAJzFn3IlZyUWaCvHKy1MH4ahHpo="; + url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-AuthenticationResults-2.20230112.tar.gz"; + hash = "sha256-wtFEyuAiX4vJ0PX60cPxOdJ89TT85+rHB2T79m/SI0E="; }; buildInputs = [ TestException ]; - propagatedBuildInputs = [ JSON ]; + propagatedBuildInputs = [ Clone JSON ]; meta = { description = "Object Oriented Authentication-Results Headers"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -14738,11 +14846,11 @@ with self; { }; MailBox = buildPerlPackage { - version = "3.009"; + version = "3.010"; pname = "Mail-Box"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-3.009.tar.gz"; - hash = "sha256-kYUhaw4UyRnsI4R2lSVVlJHtfVbSetsbyYWh++t5kWU="; + url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-3.010.tar.gz"; + hash = "sha256-rhlPolDFRcm5FT4/tRA8qyn3nPKs1On9dc7FMiAalWQ="; }; doCheck = false; @@ -14773,10 +14881,10 @@ with self; { MailMessage = buildPerlPackage { pname = "Mail-Message"; - version = "3.010"; + version = "3.013"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.010.tar.gz"; - hash = "sha256-WEFLGuOCmIFTqRXTFyRdid1FDxhuz204PJZLNnOnixM="; + url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.013.tar.gz"; + hash = "sha256-yK1YiNsBWkUOti7Cqj6mbcLdwRtwpdtsjKGn+fgg6B8="; }; propagatedBuildInputs = [ IOStringy MIMETypes MailTools URI UserIdentity ]; meta = { @@ -14788,10 +14896,10 @@ with self; { MailDKIM = buildPerlPackage { pname = "Mail-DKIM"; - version = "1.20200907"; + version = "1.20230911"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-1.20200907.tar.gz"; - hash = "sha256-q/8RvQl3ubjDssP8Kg290tONoklWhphxD+wQAtQlG/U="; + url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-1.20230911.tar.gz"; + hash = "sha256-kecxcoK3JM+9LJtuZjDvFDKISLb8UgPv1w3sL7hyaMo="; }; propagatedBuildInputs = [ CryptOpenSSLRSA MailAuthenticationResults MailTools NetDNS ]; doCheck = false; # tries to access the domain name system @@ -14804,10 +14912,10 @@ with self; { MailIMAPClient = buildPerlPackage { pname = "Mail-IMAPClient"; - version = "3.42"; + version = "3.43"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.42.tar.gz"; - hash = "sha256-HCJk1QxUyDmj44zi+O3aPSTzDMYHlA11dL6rGcsAzn4="; + url = "mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.43.tar.gz"; + hash = "sha256-CTyX+sFbR6j+TSk27y3zd6v3fMirdAktISi7lF0ftG8="; }; propagatedBuildInputs = [ ParseRecDescent ]; meta = { @@ -14818,10 +14926,10 @@ with self; { MailPOP3Client = buildPerlPackage { pname = "Mail-POP3Client"; - version = "2.19"; + version = "2.21"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SD/SDOWD/Mail-POP3Client-2.19.tar.gz"; - hash = "sha256-EULWJHqTy4ayPtiDVVO7LSJ/+CE+4nQ+QVW7k/R6y1k="; + url = "mirror://cpan/authors/id/S/SD/SDOWD/Mail-POP3Client-2.21.tar.gz"; + hash = "sha256-sW7yFJtuNXOHPx5ZDk1RNmxZlLi1MV3xaSXRe4niSQE="; }; meta = { description = "Perl 5 module to talk to a POP3 (RFC1939) server"; @@ -14933,10 +15041,10 @@ with self; { MathBase85 = buildPerlPackage { pname = "Math-Base85"; - version = "0.4"; + version = "0.5"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PT/PTC/Math-Base85-0.4.tar.gz"; - hash = "sha256-nqhYYA+SXh/8fwqGO3g1iS2Ymfz0Sz5QkOyjpGm5iw0="; + url = "mirror://cpan/authors/id/P/PT/PTC/Math-Base85-0.5.tar.gz"; + hash = "sha256-CwX3+2UKh5ezktjqkPLnK/uNCFBcmi4LlV39RacqNOU="; }; meta = { description = "Perl extension for base 85 numbers, as referenced by RFC 1924"; @@ -15003,10 +15111,10 @@ with self; { MathBigInt = buildPerlPackage { pname = "Math-BigInt"; - version = "1.999818"; + version = "1.999842"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-1.999818.tar.gz"; - hash = "sha256-snY0NWzir5t8ASOsg5WomjL7Fa6ugvzTnegVbK0njBU="; + url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-1.999842.tar.gz"; + hash = "sha256-VGAcUMaZPn7hPYw6wzRs8VpNgGMUnNu+husB5WEORnU="; }; meta = { description = "Arbitrary size integer/float math package"; @@ -15016,10 +15124,10 @@ with self; { MathBigIntGMP = buildPerlPackage { pname = "Math-BigInt-GMP"; - version = "1.6007"; + version = "1.6013"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-GMP-1.6007.tar.gz"; - hash = "sha256-XXJebSDMs34HJnNijwsN0Q5d0BFhn3D1CtWK3tRUwB8="; + url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-GMP-1.6013.tar.gz"; + hash = "sha256-yxqS4CJn1AUV+OA6TiEvZv0wfJdMu9MT4j3jL98Q9rU="; }; buildInputs = [ pkgs.gmp ]; doCheck = false; @@ -15034,10 +15142,10 @@ with self; { MathBigIntLite = buildPerlPackage { pname = "Math-BigInt-Lite"; - version = "0.19"; + version = "0.29"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.19.tar.gz"; - hash = "sha256-MPYDS/XSXAKBPISo5aKpivhuLbyoFJwlqSd3GN8mFRo="; + url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.29.tar.gz"; + hash = "sha256-R4YN/KYxl4txxKqZkaGynk7LrzYbW7nrOVl1t//Nd/U="; }; propagatedBuildInputs = [ MathBigInt ]; meta = { @@ -15089,10 +15197,10 @@ with self; { MathGMP = buildPerlPackage { pname = "Math-GMP"; - version = "2.20"; + version = "2.25"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Math-GMP-2.20.tar.gz"; - hash = "sha256-Ftpfge9SdChiuzyHhASq/bJM2rT4rL/KEoAzJIe8VV8="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Math-GMP-2.25.tar.gz"; + hash = "sha256-OCtx5Udi9jnppCqbBpNBUZh7pX0Ru3DTXjvsiNUEUM4="; }; buildInputs = [ pkgs.gmp AlienGMP ]; env.NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include"; @@ -15105,12 +15213,12 @@ with self; { MathGMPz = buildPerlPackage { pname = "Math-GMPz"; - version = "0.48"; + version = "0.59"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SI/SISYPHUS/Math-GMPz-0.48.tar.gz"; - hash = "sha256-9EWe0y+5u3k+JQT9RCxRX9RopKNNKh+Y5GykHidcc8s="; + url = "mirror://cpan/authors/id/S/SI/SISYPHUS/Math-GMPz-0.59.tar.gz"; + hash = "sha256-mmrN45G0Ff5f7HwUyCTVUf/j+W81rycYRWuJ3jpkEaQ="; }; - buildInputs = [ pkgs.gmp ]; + buildInputs = [ TestWarn pkgs.gmp ]; NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp"; meta = { description = "Perl interface to the GMP integer functions"; @@ -15166,7 +15274,7 @@ with self; { MathPari = buildPerlPackage rec { pname = "Math-Pari"; - version = "2.030518"; + version = "2.030523"; nativeBuildInputs = [ pkgs.unzip ]; pariversion = "2.1.7"; pari_tgz = fetchurl { @@ -15241,12 +15349,12 @@ with self; { MathProvablePrime = buildPerlPackage { pname = "Math-ProvablePrime"; - version = "0.045"; + version = "0.51"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FE/FELIPE/Math-ProvablePrime-0.045.tar.gz"; - hash = "sha256-MtzkKGHOBlqHWpHsFMZVfomvB98QzEUNHE3tE9y+PdU="; + url = "mirror://cpan/authors/id/F/FE/FELIPE/Math-ProvablePrime-0.51.tar.gz"; + hash = "sha256-D7YWRJ+weorR6KgJxwghthjlPcD/3ayWVnYY3jPEbBE="; }; - buildInputs = [ FileWhich TestClass TestDeep TestException TestNoWarnings ]; + buildInputs = [ FileWhich TestClass TestDeep TestException TestFailWarnings ]; propagatedBuildInputs = [ BytesRandomSecureTiny ]; meta = { description = "Generate a provable prime number, in pure Perl"; @@ -15372,10 +15480,10 @@ with self; { MaxMindDBReaderXS = buildPerlModule { pname = "MaxMind-DB-Reader-XS"; - version = "1.000008"; + version = "1.000009"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-XS-1.000008.tar.gz"; - hash = "sha256-hKr7yC+sjP7q2amOLkhX2+v0Sem4Ff6QiRUNf04Nx4c="; + url = "mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-XS-1.000009.tar.gz"; + hash = "sha256-qm+4f+0Z1UnymxNd55l+6SsSJ9Ymyw6JBgCpHK3DBTo="; }; propagatedBuildInputs = [ pkgs.libmaxminddb MathInt128 MaxMindDBReader ]; buildInputs = [ NetWorks PathClass TestFatal TestNumberDelta TestRequires ]; @@ -15407,10 +15515,10 @@ with self; { Memoize = buildPerlPackage { pname = "Memoize"; - version = "1.03"; + version = "1.16"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MJ/MJD/Memoize-1.03.tgz"; - hash = "sha256-UjnMX2RKULDen/6qUfqZkesG7LG/RniHPjq4mvnA2vM="; + url = "mirror://cpan/authors/id/A/AR/ARISTOTLE/Memoize-1.16.tar.gz"; + hash = "sha256-CRlSvPSS7O41ueW41ykgxYAjRB15IIwduHg3xcV4B74="; }; meta = { description = "Make functions faster by trading space for time"; @@ -15478,10 +15586,10 @@ with self; { MetaCPANClient = buildPerlPackage { pname = "MetaCPAN-Client"; - version = "2.029000"; + version = "2.030000"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MICKEY/MetaCPAN-Client-2.029000.tar.gz"; - hash = "sha256-xdiDkDs3mlpq2wLgFuxbUiiK8FZS1WTIlTFlk/PH5Xw="; + url = "mirror://cpan/authors/id/M/MI/MICKEY/MetaCPAN-Client-2.030000.tar.gz"; + hash = "sha256-2bdlxSN3VPFyYmljgqc4XZCy0BmGl5gXhisWZLBt068="; }; # Most tests are online, so we only include offline tests @@ -15517,12 +15625,12 @@ with self; { MetricsAny = buildPerlModule { pname = "Metrics-Any"; - version = "0.06"; + version = "0.10"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Metrics-Any-0.06.tar.gz"; - hash = "sha256-nFKd+Oiid7sVjWJBxzvRp+oIrq6eHtu1WDoaB0j7mDc="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Metrics-Any-0.10.tar.gz"; + hash = "sha256-qQ6t+civJKUWu5obZwYfZBhT+QuP7p/8JNK7lyDouZs="; }; - buildInputs = [ TestFatal ]; + buildInputs = [ Test2Suite ]; meta = { description = "Abstract collection of monitoring metrics"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -15532,15 +15640,13 @@ with self; { # TODO: use CPAN version MHonArc = buildPerlPackage rec { pname = "MHonArc"; - version = "2.6.19"; + version = "2.6.24"; src = fetchurl { - url = "https://www.mhonarc.org/release/MHonArc/tar/MHonArc-${version}.tar.gz"; - hash = "sha256-+L8odObqN4MLDVFV+5ms94gAWHffdXPxJ2NE6Ufag1I="; + url = "mirror://cpan/authors/id/L/LD/LDIDRY/MHonArc-2.6.24.tar.gz"; + hash = "sha256-RX3HN07lnLdaBynlHO8vLFK0gYD3Odj9lW6hmIKBXzM="; }; - patches = [ ../development/perl-modules/mhonarc.patch ]; - outputs = [ "out" "dev" ]; # no "devdoc" installTargets = [ "install" ]; @@ -15599,10 +15705,10 @@ with self; { MIMELite = buildPerlPackage { pname = "MIME-Lite"; - version = "3.031"; + version = "3.033"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/MIME-Lite-3.031.tar.gz"; - hash = "sha256-8SNYZkgrZ/AIWLPtqk/0z5Ce+QDx0V2ImUi/nAOlkeA="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/MIME-Lite-3.033.tar.gz"; + hash = "sha256-eKJ58dLiQlUcNH75ehP8Z1dmYCy4TCqAxWlAD082i6s="; }; propagatedBuildInputs = [ EmailDateFormat ]; meta = { @@ -15643,10 +15749,10 @@ with self; { MIMETypes = buildPerlPackage { pname = "MIME-Types"; - version = "2.18"; + version = "2.24"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-2.18.tar.gz"; - hash = "sha256-Mco1pB8q6ZjM19M8GeQgI+5lQP2d7WGbmr1I/waglb4="; + url = "mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-2.24.tar.gz"; + hash = "sha256-Yp42HyKyIL5QwtpzVOI8BFF1dwmgPCWiLzFg7blMtl8="; }; meta = { description = "Definition of MIME types"; @@ -15690,10 +15796,10 @@ with self; { MinionBackendSQLite = buildPerlModule { pname = "Minion-Backend-SQLite"; - version = "5.0.6"; + version = "5.0.7"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DB/DBOOK/Minion-Backend-SQLite-v5.0.6.tar.gz"; - hash = "sha256-/uDUEe9WsAkru8BTN5InaH3hQZUoy2t0T3U9vcH7FNk="; + url = "mirror://cpan/authors/id/D/DB/DBOOK/Minion-Backend-SQLite-v5.0.7.tar.gz"; + hash = "sha256-zd49IrGv+n32seErKlLp88G2gci1k6G+TeO+aOTaXHI="; }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ Minion MojoSQLite ]; @@ -15707,10 +15813,10 @@ with self; { MinionBackendmysql = buildPerlPackage { pname = "Minion-Backend-mysql"; - version = "1.000"; + version = "1.003"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PR/PREACTION/Minion-Backend-mysql-1.000.tar.gz"; - hash = "sha256-cGS+CHHxmbSwTl1yQprfNbLkr2qHGorM0Mm1wqP9E00="; + url = "mirror://cpan/authors/id/P/PR/PREACTION/Minion-Backend-mysql-1.003.tar.gz"; + hash = "sha256-aaJcJAyw5NTvTxqjKgTt+Nolt+jTqCDP1kVhWZ7aRUI="; }; buildInputs = [ Testmysqld ]; propagatedBuildInputs = [ Minion Mojomysql ]; @@ -15724,10 +15830,10 @@ with self; { MixinLinewise = buildPerlPackage { pname = "Mixin-Linewise"; - version = "0.108"; + version = "0.111"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Mixin-Linewise-0.108.tar.gz"; - hash = "sha256-ffIGeEdMCXOTCkcrDFXj+Ohbd5C2irGO9hj5xFPIrvI="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Mixin-Linewise-0.111.tar.gz"; + hash = "sha256-0o6IUWzptSlcMWMdzM3A/I8qt9ilzIdrsbIBMQh7Ads="; }; propagatedBuildInputs = [ PerlIOutf8_strict SubExporter ]; meta = { @@ -15782,11 +15888,11 @@ with self; { ModernPerl = buildPerlPackage { pname = "Modern-Perl"; - version = "1.20200211"; + version = "1.20230106"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20200211.tar.gz"; - hash = "sha256-2hyDzuhPq57bnjHX96usQ+Ezey5mAVGR7EttpZKYxIA="; + url = "mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20230106.tar.gz"; + hash = "sha256-BFncq4DOgrY0Yf2B7pTgbpplFdmPP7wxmDjdHmAoUfc="; }; meta = { description = "Enable all of the features of Modern Perl with one import"; @@ -15797,10 +15903,10 @@ with self; { Modulecpmfile = buildPerlModule { pname = "Module-cpmfile"; - version = "0.002"; + version = "0.006"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/Module-cpmfile-0.002.tar.gz"; - hash = "sha256-iEk/pG307LIe8RdaNJTyUQsGc+nNtN2AVzzo9nhhvaE="; + url = "mirror://cpan/authors/id/S/SK/SKAJI/Module-cpmfile-0.006.tar.gz"; + hash = "sha256-G8l24pN3JIlsn26unl3KmB4n+YQwuS3icO41FP0ArA8="; }; buildInputs = [ ModuleBuildTiny ModuleCPANfile Test2Suite ]; propagatedBuildInputs = [ YAMLPP ]; @@ -15814,10 +15920,10 @@ with self; { ModuleBuild = buildPerlPackage { pname = "Module-Build"; - version = "0.4231"; + version = "0.4234"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4231.tar.gz"; - hash = "sha256-fg9MaSwXQMGshOoU1+o9i8eYsvsmwJh3Ip4E9DCytxc="; + url = "mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4234.tar.gz"; + hash = "sha256-Zq6sYSdBi+XkcerTdEZIx2a9AUgoJcW2ZlJnXyvIao8="; }; postConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' # for unknown reason, the first run of Build fails @@ -15903,10 +16009,10 @@ with self; { ModuleBuildTiny = buildPerlModule { pname = "Module-Build-Tiny"; - version = "0.039"; + version = "0.047"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.039.tar.gz"; - hash = "sha256-fVgP9qzgy+VVvza4bcjqIyWBUwy+quoJvMtXtVeX8Rw="; + url = "mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.047.tar.gz"; + hash = "sha256-cSYOlCG5PDPdGz59DPFfdZwMp8dT+oQCeew75w+PjJ0="; }; buildInputs = [ FileShareDir ]; propagatedBuildInputs = [ ExtUtilsHelpers ExtUtilsInstallPaths ]; @@ -15964,12 +16070,12 @@ with self; { ModuleCPANTSAnalyse = buildPerlPackage { pname = "Module-CPANTS-Analyse"; - version = "1.01"; + version = "1.02"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-1.01.tar.gz"; - hash = "sha256-vZkLpNAFG22yKEyrhAaZ4zr1QtiBgv1FTPpw6tMeyEk="; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-1.02.tar.gz"; + hash = "sha256-nhFzm5zQi6LXWllzfx+yl/RYA/KJBjxcdZv8eP1Rbns="; }; - propagatedBuildInputs = [ ArchiveAnyLite ArrayDiff DataBinary FileFindObject PerlPrereqScannerNotQuiteLite SoftwareLicense ]; + propagatedBuildInputs = [ ArchiveAnyLite ArrayDiff ClassAccessor DataBinary FileFindObject ModuleFind ParseDistname PerlPrereqScannerNotQuiteLite SoftwareLicense ]; buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings ]; meta = { description = "Generate Kwalitee ratings for a distribution"; @@ -15995,10 +16101,10 @@ with self; { ModuleExtractUse = buildPerlModule { pname = "Module-ExtractUse"; - version = "0.343"; + version = "0.345"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOMM/Module-ExtractUse-0.343.tar.gz"; - hash = "sha256-SFJGW0g2GhIM15hyBYF5Lbpa2lJs7vWJHiVNbPl7DAI="; + url = "mirror://cpan/authors/id/D/DO/DOMM/Module-ExtractUse-0.345.tar.gz"; + hash = "sha256-juJOh0KrnaeSKL4Yfdoxm01fUKkaHs+H1JQhO1uzDdE="; }; propagatedBuildInputs = [ ParseRecDescent PodStrip ]; buildInputs = [ TestDeep TestNoWarnings ]; @@ -16024,10 +16130,10 @@ with self; { ModuleFind = buildPerlPackage { pname = "Module-Find"; - version = "0.15"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CR/CRENZ/Module-Find-0.15.tar.gz"; - hash = "sha256-XFSCp/4+nhA1s2qYRHC4hvevCV7u/2P18ZrsjNLYqF4="; + url = "mirror://cpan/authors/id/C/CR/CRENZ/Module-Find-0.16.tar.gz"; + hash = "sha256-S8qqN2kVAUco1PUzqYxbWdZlBRzTzbr8lg5aZv0TEJI="; }; meta = { description = "Find and use installed modules in a (sub)category"; @@ -16069,10 +16175,10 @@ with self; { ModuleInstall = buildPerlPackage { pname = "Module-Install"; - version = "1.19"; + version = "1.21"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Module-Install-1.19.tar.gz"; - hash = "sha256-GlOnjd86uePAP8XjVLQ2MZqUTLpCgbrwuQT6kyoTARs="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Module-Install-1.21.tar.gz"; + hash = "sha256-+/kQB/MFZfOSDhBgVf0NQoeYHV59rYs1MjzktzPxWns="; }; propagatedBuildInputs = [ FileRemove ModuleBuild ModuleScanDeps YAMLTiny ]; meta = { @@ -16256,10 +16362,10 @@ with self; { ModuleRefresh = buildPerlPackage { pname = "Module-Refresh"; - version = "0.17"; + version = "0.18"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AL/ALEXMV/Module-Refresh-0.17.tar.gz"; - hash = "sha256-azCmzt3GUSq0SQwWNy7PMJolnyyhR9Yi5HisVOCFEcM="; + url = "mirror://cpan/authors/id/B/BP/BPS/Module-Refresh-0.18.tar.gz"; + hash = "sha256-4JTaqQmv32SJqeKzJzP2haLBy1zIh2BhB1SGEJsN71k="; }; buildInputs = [ PathClass ]; meta = { @@ -16298,12 +16404,13 @@ with self; { ModuleScanDeps = buildPerlPackage { pname = "Module-ScanDeps"; - version = "1.29"; + version = "1.34"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.29.tar.gz"; - hash = "sha256-7rDOkTU6L2JnpkrxeyDY3o96z/YulbYI3qJIAwC4iE4="; + url = "mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.34.tar.gz"; + hash = "sha256-ysUw5c/EE+BneXx9I3xsXNMpFcPZ+u5dlANcjzqFUOs="; }; - buildInputs = [ TestRequires ]; + buildInputs = [ TestRequires IPCRun3 ]; + propagatedBuildInputs = [ TextParsewords ]; meta = { description = "Recursively scan Perl code for dependencies"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -16369,10 +16476,10 @@ with self; { MojoDOM58 = buildPerlPackage { pname = "Mojo-DOM58"; - version = "2.000"; + version = "3.001"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojo-DOM58-2.000.tar.gz"; - hash = "sha256-hkxqNXH7SYaprgrw8shArLEC8fc6Gq8Cewa0K40EXvM="; + url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojo-DOM58-3.001.tar.gz"; + hash = "sha256-GLJtVB5TFEFa3d8xQ2nZQMi6BrESNMpQb9vmzyJPV5Y="; }; meta = { description = "Minimalistic HTML/XML DOM parser with CSS selectors"; @@ -16418,10 +16525,10 @@ with self; { MojoliciousPluginAssetPack = buildPerlPackage { pname = "Mojolicious-Plugin-AssetPack"; - version = "2.13"; + version = "2.14"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-AssetPack-2.13.tar.gz"; - hash = "sha256-8j2HYgo92IoFoZ+aKovRn6UboGDdy0vMHZsfBo73pIg="; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-AssetPack-2.14.tar.gz"; + hash = "sha256-jwWMyIw1mb6/ZjeK7GS91uvNkMljGL3m1ov6551j6qM="; }; propagatedBuildInputs = [ FileWhich IPCRun3 Mojolicious ]; meta = { @@ -16577,10 +16684,10 @@ with self; { MojoliciousPluginWebpack = buildPerlPackage { pname = "Mojolicious-Plugin-Webpack"; - version = "1.01"; + version = "1.02"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Webpack-1.01.tar.gz"; - hash = "sha256-detndnGR/zMzwNAXsK1vZxHHxIW66i5+6XtTtPzJzfA="; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Webpack-1.02.tar.gz"; + hash = "sha256-REzqioOZquelrWt8iQ/yFgk8WM6uaxyKBl77cBC3zn0="; }; propagatedBuildInputs = [ Mojolicious Filechdir ]; meta = { @@ -16625,13 +16732,13 @@ with self; { MojoSQLite = buildPerlModule { pname = "Mojo-SQLite"; - version = "3.005"; + version = "3.009"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojo-SQLite-3.005.tar.gz"; - hash = "sha256-Qf3LUFrH9OzUdWez2utcKHyITJE0DG27a7+pkqH/9yo="; + url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojo-SQLite-3.009.tar.gz"; + hash = "sha256-Vzmprz/A/BYrOAMt9hCgcANSY7++C+wWrsUvDd3Xtkc="; }; buildInputs = [ ModuleBuildTiny ]; - propagatedBuildInputs = [ DBDSQLite Mojolicious SQLAbstract URIdb ]; + propagatedBuildInputs = [ DBDSQLite Mojolicious SQLAbstractPg URIdb URI ]; meta = { description = "A tiny Mojolicious wrapper for SQLite"; homepage = "https://github.com/Grinnz/Mojo-SQLite"; @@ -16642,10 +16749,10 @@ with self; { Mojomysql = buildPerlPackage rec { pname = "Mojo-mysql"; - version = "1.25"; + version = "1.26"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojo-mysql-1.25.tar.gz"; - hash = "sha256-YC14GXw0HdCPLLH1XZg31P3gFHQz1k2+vxloaAtVzMs="; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojo-mysql-1.26.tar.gz"; + hash = "sha256-H9LjBlr4Je9N2x2W9g9MVc9NCCD77L0wrHGdTeJx5rw="; }; propagatedBuildInputs = [ DBDmysql Mojolicious SQLAbstract ]; buildInputs = [ TestDeep ]; @@ -16731,10 +16838,10 @@ with self; { MojoUserAgentCached = buildPerlPackage { pname = "Mojo-UserAgent-Cached"; - version = "1.19"; + version = "1.25"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NI/NICOMEN/Mojo-UserAgent-Cached-1.19.tar.gz"; - hash = "sha256-wlmZ2qqCHkZUhLWjINFVqlJZAMh4Ml2aiSAfSnWBxd8="; + url = "mirror://cpan/authors/id/N/NI/NICOMEN/Mojo-UserAgent-Cached-1.25.tar.gz"; + hash = "sha256-lZmikTjq/ZKPWF7jDvFm0j/x3FKkBn50hyxR4W3shko="; }; buildInputs = [ ModuleInstall ]; propagatedBuildInputs = [ AlgorithmLCSS CHI DataSerializer DevelStackTrace Mojolicious Readonly StringTruncate ]; @@ -16782,10 +16889,10 @@ with self; { IOPipely = buildPerlPackage { pname = "IO-Pipely"; - version = "0.005"; + version = "0.006"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RC/RCAPUTO/IO-Pipely-0.005.tar.gz"; - hash = "sha256-4zts9csrRu4whRP1HmI5h6UKiZAegb8ZcB3ONRefLnQ="; + url = "mirror://cpan/authors/id/R/RC/RCAPUTO/IO-Pipely-0.006.tar.gz"; + hash = "sha256-Dj/NhBoyfvtUn6AbIIPcNpXnLqDGMwPlbtUWG/gQQTs="; }; meta = { description = "Portably create pipe() or pipe-like handles, one way or another"; @@ -16796,10 +16903,10 @@ with self; { Moo = buildPerlPackage { pname = "Moo"; - version = "2.004004"; + version = "2.005005"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Moo-2.004004.tar.gz"; - hash = "sha256-cUt3sRV4hwjG2KtvGO6hc/gQnTl67NNOMsxxoP/PIkY="; + url = "mirror://cpan/authors/id/H/HA/HAARG/Moo-2.005005.tar.gz"; + hash = "sha256-+1opUmSfrtBzc/Igt4AEqcaro4dzkTN0DBdw6bH0sQg="; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ ClassMethodModifiers ModuleRuntime RoleTiny SubQuote ]; @@ -16811,13 +16918,13 @@ with self; { Moose = buildPerlPackage { pname = "Moose"; - version = "2.2013"; + version = "2.2206"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Moose-2.2013.tar.gz"; - hash = "sha256-33TceAiJIReO33LYJwF9bJJzfJhmWfLa3FM64kZ153w="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Moose-2.2206.tar.gz"; + hash = "sha256-Z5csTivDn72jhRgXevDme7vrVIVi5OxLdZoaelg+UFs="; }; - buildInputs = [ CPANMetaCheck TestCleanNamespaces TestFatal TestRequires ]; - propagatedBuildInputs = [ ClassLoadXS DevelGlobalDestruction DevelOverloadInfo DevelStackTrace EvalClosure ModuleRuntimeConflicts PackageDeprecationManager PackageStashXS SubExporter ]; + buildInputs = [ DistCheckConflicts CPANMetaCheck TestCleanNamespaces TestFatal TestNeeds TestRequires ]; + propagatedBuildInputs = [ ClassLoadXS DataOptList DevelGlobalDestruction DevelOverloadInfo DevelStackTrace EvalClosure MROCompat ModuleRuntimeConflicts PackageDeprecationManager PackageStashXS ParamsUtil SubExporter TryTiny ]; preConfigure = '' export LD=$CC ''; @@ -17019,10 +17126,10 @@ with self; { MooseXAppCmd = buildPerlModule { pname = "MooseX-App-Cmd"; - version = "0.32"; + version = "0.34"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-App-Cmd-0.32.tar.gz"; - hash = "sha256-Lju/coOkvuctkdJusgRDYDCZK75Vy9NewzpUbxb5c/8="; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-App-Cmd-0.34.tar.gz"; + hash = "sha256-9eLy7xKcOI8qPjb1PeWYBErxtyLofXEFKdBcwl0jesI="; }; buildInputs = [ ModuleBuildTiny MooseXConfigFromFile TestOutput YAML ]; propagatedBuildInputs = [ AppCmd MooseXGetopt MooseXNonMoose ]; @@ -17035,10 +17142,10 @@ with self; { MooseXStorageFormatJSONpm = buildPerlPackage { pname = "MooseX-Storage-Format-JSONpm"; - version = "0.093093"; + version = "0.093094"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/MooseX-Storage-Format-JSONpm-0.093093.tar.gz"; - hash = "sha256-6+BAen6xhwJw4OJXnwl9/X3yrqMwf7cfMk+2niQsxY8="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/MooseX-Storage-Format-JSONpm-0.093094.tar.gz"; + hash = "sha256-9sgItyC99HI4VaZ4sblQLHSSABXFq8YL2uasYNFGxYQ="; }; buildInputs = [ Moose TestDeepJSON TestWithoutModule DigestHMAC MooseXTypes ]; propagatedBuildInputs = [ JSON MooseXRoleParameterized MooseXStorage namespaceautoclean ]; @@ -17240,6 +17347,9 @@ with self; { url = "mirror://cpan/authors/id/G/GF/GFUJI/MouseX-Getopt-0.38.tar.gz"; hash = "sha256-3j6o70Ut2VAeqMTtqHRLciRgJgKwRpJgft19YrefA48="; }; + patches = [ + ../development/perl-modules/MouseX-Getopt-gld-tests.patch + ]; buildInputs = [ ModuleBuildTiny MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ]; propagatedBuildInputs = [ GetoptLongDescriptive Mouse ]; meta = { @@ -17343,10 +17453,10 @@ with self; { MooseXGetopt = buildPerlModule { pname = "MooseX-Getopt"; - version = "0.74"; + version = "0.75"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Getopt-0.74.tar.gz"; - hash = "sha256-HeDfO0Mevp81Y730Vp6s1+B+hlqDl/KpkNDLV9TLLCQ="; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Getopt-0.75.tar.gz"; + hash = "sha256-Y/O+W7K8OB6eSLW5XAMw8hcYtmVuj/sZyZ0u4KwU68g="; }; buildInputs = [ ModuleBuildTiny MooseXStrictConstructor PathTiny TestDeep TestFatal TestNeeds TestTrap TestWarnings ]; propagatedBuildInputs = [ GetoptLongDescriptive MooseXRoleParameterized ]; @@ -17454,10 +17564,10 @@ with self; { MooseXOneArgNew = buildPerlPackage { pname = "MooseX-OneArgNew"; - version = "0.005"; + version = "0.007"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/MooseX-OneArgNew-0.005.tar.gz"; - hash = "sha256-fk/PR06mxCRPCIXxBmcpz9xHL71xkN1BtLVbzWfDED8="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/MooseX-OneArgNew-0.007.tar.gz"; + hash = "sha256-hCgkNfEWnPCddRP6k4fiCReRY1zzWgeLUAuCmu6gYTg="; }; propagatedBuildInputs = [ MooseXRoleParameterized ]; meta = { @@ -17763,10 +17873,10 @@ with self; { MooseXTypesPerl = buildPerlPackage { pname = "MooseX-Types-Perl"; - version = "0.101343"; + version = "0.101344"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/MooseX-Types-Perl-0.101343.tar.gz"; - hash = "sha256-8IS+rzwzIJxo0F1NvCTCXWBKZFi5c42W3OsIbI7xMlo="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/MooseX-Types-Perl-0.101344.tar.gz"; + hash = "sha256-h2RDVPdPplI1yyv8pEJ3kwp+q+UazF+B+2MVMKg1XiQ="; }; propagatedBuildInputs = [ MooseXTypes ]; meta = { @@ -17809,13 +17919,13 @@ with self; { MooseXTypesURI = buildPerlModule { pname = "MooseX-Types-URI"; - version = "0.08"; + version = "0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-URI-0.08.tar.gz"; - hash = "sha256-0xDSD6Nh/i3/dYI234eUnMe/mOXPOnx5EVNl7M3mzME="; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-URI-0.09.tar.gz"; + hash = "sha256-Jxd1Ta25EIbhHSH+oGy6qaEuYBtB0VRDFQ7dfZUI7+g="; }; - buildInputs = [ ModuleBuildTiny TestSimple13 ]; - propagatedBuildInputs = [ MooseXTypesPathClass URIFromHash ]; + buildInputs = [ ModuleBuildTiny TestNeeds TestWithoutModule ]; + propagatedBuildInputs = [ MooseXTypes URI URIFromHash namespaceautoclean ]; meta = { description = "URI related types and coercions for Moose"; homepage = "https://github.com/moose/MooseX-Types-URI"; @@ -17838,10 +17948,10 @@ with self; { MP3Tag = buildPerlPackage { pname = "MP3-Tag"; - version = "1.15"; + version = "1.16"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILYAZ/modules/MP3-Tag-1.15.zip"; - hash = "sha256-qqxI9GN+3KQI/Xk4G8C/8PmxG9jh6U3gWdrpkzZfVtE="; + url = "mirror://cpan/authors/id/I/IL/ILYAZ/modules/MP3-Tag-1.16.zip"; + hash = "sha256-UDhQk6owAFa8Jiu2pACpbiGVl3wcXh6/FaXgdak3e4Y="; }; buildInputs = [ pkgs.unzip ]; @@ -17858,6 +17968,20 @@ with self; { }; }; + MockMonkeyPatch = buildPerlModule { + pname = "Mock-MonkeyPatch"; + version = "1.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JB/JBERGER/Mock-MonkeyPatch-1.02.tar.gz"; + hash = "sha256-xbaUTKVP6DVXN2cwYO1OnvhyNyZXfXluHK5eVr8bAYE="; + }; + buildInputs = [ ModuleBuildTiny ]; + meta = { + description = "Monkey patching with test mocking in mind"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Mouse = buildPerlModule { pname = "Mouse"; version = "2.5.10"; @@ -17892,10 +18016,10 @@ with self; { MozillaCA = buildPerlPackage { pname = "Mozilla-CA"; - version = "20200520"; + version = "20230821"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AB/ABH/Mozilla-CA-20200520.tar.gz"; - hash = "sha256-s8oAAjEL8koWwNWSC96pei9G53574+c3foUNAzOHxyY="; + url = "mirror://cpan/authors/id/L/LW/LWP/Mozilla-CA-20230821.tar.gz"; + hash = "sha256-MuHQBFKZAEBFucTRbC2q5FOiFiCIc97qJED3EmCnzaE="; }; postPatch = '' @@ -17913,10 +18037,10 @@ with self; { MROCompat = buildPerlPackage { pname = "MRO-Compat"; - version = "0.13"; + version = "0.15"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/MRO-Compat-0.13.tar.gz"; - hash = "sha256-iiw7bMwZMo1VedAqfZEoXir9hdgB9J1COo6xbzI9pPg="; + url = "mirror://cpan/authors/id/H/HA/HAARG/MRO-Compat-0.15.tar.gz"; + hash = "sha256-DUU1+I5Dur2Eq2BIZiFfxNBDmL1Nt7IYUtSjGxwV72E="; }; meta = { description = "Mro::* interface compatibility for Perls < 5.9.5"; @@ -17962,10 +18086,10 @@ with self; { MusicBrainz = buildPerlModule { pname = "WebService-MusicBrainz"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BF/BFAIST/WebService-MusicBrainz-1.0.5.tar.gz"; - hash = "sha256-UjuDmWggbFdR6p7mcMeJLIw74PWTqlkaAMAxVGjQkJk="; + url = "mirror://cpan/authors/id/B/BF/BFAIST/WebService-MusicBrainz-1.0.6.tar.gz"; + hash = "sha256-XpH1ZZZ3w5CJv28lO0Eoe7zTVh9qJaB5Zc6DsmKIUuE="; }; propagatedBuildInputs = [ Mojolicious ]; doCheck = false; # Test performs network access. @@ -18172,10 +18296,10 @@ with self; { NetAmazonS3 = buildPerlPackage { pname = "Net-Amazon-S3"; - version = "0.97"; + version = "0.991"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BA/BARNEY/Net-Amazon-S3-0.97.tar.gz"; - hash = "sha256-A9hWd9BIPq+tJD2nBWS13xpDCSKZa/22xPGbbCh43jQ="; + url = "mirror://cpan/authors/id/B/BA/BARNEY/Net-Amazon-S3-0.991.tar.gz"; + hash = "sha256-+3r4umSUjRo/MdgJ13EFImiA8GmYrH8Rn4JITmijI9M="; }; buildInputs = [ TestDeep TestException TestLWPUserAgent TestMockTime TestWarnings ]; propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule LWPUserAgentDetermined MIMETypes MooseXRoleParameterized MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions RefUtil RegexpCommon SafeIsa SubOverride TermEncoding TermProgressBarSimple XMLLibXML ]; @@ -18202,12 +18326,12 @@ with self; { NetAsyncHTTP = buildPerlModule { pname = "Net-Async-HTTP"; - version = "0.48"; + version = "0.49"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Async-HTTP-0.48.tar.gz"; - hash = "sha256-nUvW+ZW8rn2LzTorNo7nCO3khABrYij17SXr86gh9z4="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Async-HTTP-0.49.tar.gz"; + hash = "sha256-OSBtBpSV0bhq7jeqitPJM0025ZzObPec04asDPN5jNs="; }; - buildInputs = [ HTTPCookies TestIdentity TestMetricsAny TestRefcount ]; + buildInputs = [ HTTPCookies Test2Suite TestMetricsAny ]; propagatedBuildInputs = [ Future HTTPMessage IOAsync MetricsAny StructDumb URI ]; preCheck = lib.optionalString stdenv.isDarwin '' # network tests fail on Darwin/sandbox, so disable these @@ -18223,12 +18347,12 @@ with self; { NetAsyncHTTPServer = buildPerlModule { pname = "Net-Async-HTTP-Server"; - version = "0.13"; + version = "0.14"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Async-HTTP-Server-0.13.tar.gz"; - hash = "sha256-yk3kcfIieNI5PIqy7G56xO8hfbRjXS3Mi6KoynIhFO4="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Async-HTTP-Server-0.14.tar.gz"; + hash = "sha256-6nG3kcEtD6X3JubMA/Zuo20bRhNxj2xb84EzvRinsrY="; }; - buildInputs = [ TestIdentity TestMetricsAny TestRefcount TestSimple13 ]; + buildInputs = [ Test2Suite TestMetricsAny TestRefcount ]; propagatedBuildInputs = [ HTTPMessage IOAsync MetricsAny ]; meta = { description = "Serve HTTP with IO::Async"; @@ -18291,10 +18415,10 @@ with self; { NetCIDR = buildPerlPackage { pname = "Net-CIDR"; - version = "0.20"; + version = "0.21"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MR/MRSAM/Net-CIDR-0.20.tar.gz"; - hash = "sha256-x17caBi7Ng1xwTkWn9ZK1lw1//bSufrHufnmxGfxh7U="; + url = "mirror://cpan/authors/id/M/MR/MRSAM/Net-CIDR-0.21.tar.gz"; + hash = "sha256-MPMDwHNZSNozNw3sx+h8+mi8QwqkS4HRj42CO20av78="; }; meta = { description = "Manipulate IPv4/IPv6 netblocks in CIDR notation"; @@ -18379,10 +18503,10 @@ with self; { NetDNS = buildPerlPackage { pname = "Net-DNS"; - version = "1.29"; + version = "1.40"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.29.tar.gz"; - hash = "sha256-hS1u6H6PDQFCIwJlgcu1aSS6jN3TzrKcYZHbthItQ8U="; + url = "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.40.tar.gz"; + hash = "sha256-IJu9QN6NSMG9eq3kjaI3/gpJn4nSebqi4amb1eySLdw="; }; propagatedBuildInputs = [ DigestHMAC ]; makeMakerFlags = [ "--noonline-tests" ]; @@ -18394,10 +18518,10 @@ with self; { NetDNSResolverMock = buildPerlPackage { pname = "Net-DNS-Resolver-Mock"; - version = "1.20200215"; + version = "1.20230216"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20200215.tar.gz"; - hash = "sha256-vvfxUOUw5VZbi67VmOqvdLb5X60Sit4NH3VQE1ghZ+c="; + url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20230216.tar.gz"; + hash = "sha256-7UkwV3/Rop1kNbWHVTPTso9cElijWDP+bKLLaiaFpJs="; }; propagatedBuildInputs = [ NetDNS ]; buildInputs = [ TestException ]; @@ -18481,10 +18605,10 @@ with self; { NetHTTP = buildPerlPackage { pname = "Net-HTTP"; - version = "6.19"; + version = "6.23"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/Net-HTTP-6.19.tar.gz"; - hash = "sha256-UrduwTlZUiyuZNll8V2j2Z3LRF7d2F0s5OT03zhbL8Q="; + url = "mirror://cpan/authors/id/O/OA/OALDERS/Net-HTTP-6.23.tar.gz"; + hash = "sha256-DWXAndbIWJsq4RGBdNPBphcDtuz8FKNEKox0r2XgyU4="; }; propagatedBuildInputs = [ URI ]; __darwinAllowLocalNetworking = true; @@ -18529,10 +18653,10 @@ with self; { NetIMAPClient = buildPerlPackage { pname = "Net-IMAP-Client"; - version = "0.9505"; + version = "0.9507"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GANGLION/Net-IMAP-Client-0.9505.tar.gz"; - hash = "sha256-0/amCLheCagICmepkzg3qubyzQ6O453zOAEj3F496RI="; + url = "mirror://cpan/authors/id/G/GA/GANGLION/Net-IMAP-Client-0.9507.tar.gz"; + hash = "sha256-QE5vW7xQjPFnxAUqXhRwXv7sb7eTvPm1xCniX0cYNUk="; }; propagatedBuildInputs = [ IOSocketSSL ListMoreUtils ]; meta = { @@ -18586,10 +18710,10 @@ with self; { NetIPv6Addr = buildPerlPackage { pname = "Net-IPv6Addr"; - version = "1.01"; + version = "1.02"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BK/BKB/Net-IPv6Addr-1.01.tar.gz"; - hash = "sha256-J+J/A/61X9kVFnOXNbGetUHK+HmVNjKd1+OhKQqkCwE="; + url = "mirror://cpan/authors/id/B/BK/BKB/Net-IPv6Addr-1.02.tar.gz"; + hash = "sha256-sjQBwSJv7o3+Yn9a4OkMVaxUcBDso5gRDcFjH0HJ7H0="; }; propagatedBuildInputs = [ MathBase85 NetIPv4Addr ]; meta = { @@ -18673,10 +18797,10 @@ with self; { NetNetmask = buildPerlPackage { pname = "Net-Netmask"; - version = "2.0001"; + version = "2.0002"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JM/JMASLAK/Net-Netmask-2.0001.tar.gz"; - hash = "sha256-FzVu+GZ/s4xEEKHDzH+kxzVn2/VnS/l/USNtbkiPUXE="; + url = "mirror://cpan/authors/id/J/JM/JMASLAK/Net-Netmask-2.0002.tar.gz"; + hash = "sha256-JKmy58a8wTAteXROukwCG/PeR/FJqvrM2U+bBC/dv5Q="; }; buildInputs = [ Test2Suite TestUseAllModules ]; meta = { @@ -18703,10 +18827,10 @@ with self; { NetMQTTSimple = buildPerlPackage { pname = "Net-MQTT-Simple"; - version = "1.26"; + version = "1.28"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JU/JUERD/Net-MQTT-Simple-1.26.tar.gz"; - hash = "sha256-ERxNNnu1AgXci8AjFfDGuw3mDRwwfQLnUuQuwRtPiLQ="; + url = "mirror://cpan/authors/id/J/JU/JUERD/Net-MQTT-Simple-1.28.tar.gz"; + hash = "sha256-Sp6hB+a8IuJrUzZ4oKPMbEI7N4TsP8ROjjM5t8Vr7gM="; }; meta = { description = "Minimal MQTT version 3 interface"; @@ -18745,10 +18869,10 @@ with self; { NetPing = buildPerlPackage { pname = "Net-Ping"; - version = "2.74"; + version = "2.75"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.74.tar.gz"; - hash = "sha256-sSqJWbvtXnxVgRF+5eVAAZKy/wo1i/EYX87tDulzfRE="; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.75.tar.gz"; + hash = "sha256-tH3zz9lpLM0Aca05/nRxjrwy9ZcBVWpgT9FaCfCeDXQ="; }; meta = { description = "Check a remote host for reachability"; @@ -18773,10 +18897,10 @@ with self; { NetPrometheus = buildPerlModule { pname = "Net-Prometheus"; - version = "0.11"; + version = "0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Prometheus-0.11.tar.gz"; - hash = "sha256-IvgJ4njq1Rk2rVOVgGUbTOXLyRwgnkpXesgjg82fcmo="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Prometheus-0.12.tar.gz"; + hash = "sha256-rs73NJygSW/yNahKkQ+KBDZtB/WqQfrieixKxbip6SM="; }; propagatedBuildInputs = [ RefUtil StructDumb URI ]; buildInputs = [ HTTPMessage TestFatal ]; @@ -18806,10 +18930,10 @@ with self; { NetServer = buildPerlPackage { pname = "Net-Server"; - version = "2.009"; + version = "2.014"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RH/RHANDOM/Net-Server-2.009.tar.gz"; - hash = "sha256-gmfGVgNV4uD0g9PMFhlfNC8y/hPK6d3nWgoezl6agT8="; + url = "mirror://cpan/authors/id/R/RH/RHANDOM/Net-Server-2.014.tar.gz"; + hash = "sha256-NAa5ylpmKgB17tR/t43hMWtgHJT2Kg7jSlVE25uqNyA="; }; doCheck = false; # seems to hang waiting for connections meta = { @@ -18821,10 +18945,10 @@ with self; { NetSFTPForeign = buildPerlPackage { pname = "Net-SFTP-Foreign"; - version = "1.91"; + version = "1.93"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SA/SALVA/Net-SFTP-Foreign-1.91.tar.gz"; - hash = "sha256-tzlQgTFPJvO5PIV9ZenICgSmNwnfaYWD8io2D/zn4Xg="; + url = "mirror://cpan/authors/id/S/SA/SALVA/Net-SFTP-Foreign-1.93.tar.gz"; + hash = "sha256-bH1kJQh2hz2kNIAOUGCovvekZFHYH4F+N+Q8/aUaD3o="; }; propagatedBuildInputs = [ pkgs.openssl ]; patchPhase = '' @@ -18959,10 +19083,10 @@ with self; { NetSSHPerl = buildPerlPackage { pname = "Net-SSH-Perl"; - version = "2.14"; + version = "2.142"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SC/SCHWIGON/Net-SSH-Perl-2.14.tar.gz"; - hash = "sha256-K10bsTWQtYcBFnBOfx3OmpgjxPgP9UYbl7smoxc5MBc="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Net-SSH-Perl-2.142.tar.gz"; + hash = "sha256-UAHbPllS/BjYXDF5Uhr2kT0VQ+tP30/ZfcYDpHSMLJY="; }; propagatedBuildInputs = [ CryptCurve25519 CryptIDEA CryptX FileHomeDir MathGMP StringCRC32 ]; preCheck = "export HOME=$TMPDIR"; @@ -19011,10 +19135,10 @@ with self; { NetTelnet = buildPerlPackage { pname = "Net-Telnet"; - version = "3.04"; + version = "3.05"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JR/JROGERS/Net-Telnet-3.04.tar.gz"; - hash = "sha256-5k1Wek4WKV7LqUk2jnpri1rioWs61oISHZsAfcXSo3o="; + url = "mirror://cpan/authors/id/J/JR/JROGERS/Net-Telnet-3.05.tar.gz"; + hash = "sha256-Z39ouizSqCT64yP6guGDv349A8PEmckdkjvWKDeWp0M="; }; meta = { description = "Interact with TELNET port or other TCP ports"; @@ -19115,10 +19239,10 @@ with self; { NumberFraction = buildPerlModule { pname = "Number-Fraction"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAVECROSS/Number-Fraction-v3.0.3.tar.gz"; - hash = "sha256-OwCqQz/lFGviH9chZHa6lkG5Y0NlfEzc9A72/KxpEO8="; + url = "mirror://cpan/authors/id/D/DA/DAVECROSS/Number-Fraction-v3.0.4.tar.gz"; + hash = "sha256-xkGcird4/XKbENfmp487ewf8CJV8H3nlZm3Ny01iwIU="; }; propagatedBuildInputs = [ Moo MooXTypesMooseLike ]; meta = { @@ -19142,13 +19266,18 @@ with self; { NumberPhone = buildPerlPackage { pname = "Number-Phone"; - version = "3.8004"; + version = "4.0000"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Number-Phone-3.8004.tar.gz"; - hash = "sha256-ZY7hyNGXTvSwV+B4L0mTi/PelA6QY/2bYecY6siwO+8="; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Number-Phone-4.0000.tar.gz"; + hash = "sha256-H0mX/oMJSrDNgUDwvn/cHz+JGQKareajOYH4fLBIZjQ="; }; - buildInputs = [ DevelHide FileShareDirInstall ParallelForkManager TestDifferences TestPod TestPodCoverage TestWarnings ]; - propagatedBuildInputs = [ DataDumperConcise DBMDeep DevelCheckOS FileFindRule FileShareDir ]; + buildInputs = [ DevelHide FileShareDirInstall ParallelForkManager TestDifferences TestWarnings ]; + propagatedBuildInputs = [ DataDumperConcise DataCompactReadonly DevelCheckOS DevelDeprecationsEnvironmental FileFindRule FileShareDir ]; + preCheck = '' + # Remove slow memory hungry tests + rm t/fork.t + rm t/uk_slurp.t + ''; meta = { description = "Large suite of perl modules for parsing and dealing with phone numbers"; homepage = "https://github.com/DrHyde/perl-modules-Number-Phone"; @@ -19229,10 +19358,10 @@ with self; { ObjectPad = buildPerlModule { pname = "Object-Pad"; - version = "0.79"; + version = "0.804"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Object-Pad-0.79.tar.gz"; - hash = "sha256-+wsQ+J5i1UFlvWqyHbVfYLVT+gCPyOddNJhwwafiKtY="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Object-Pad-0.804.tar.gz"; + hash = "sha256-z4jSquGKKHHX1/MPi6bU7lv5U+IP3KileME8dB0W0a0="; }; buildInputs = [ Test2Suite TestFatal TestRefcount ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; @@ -19276,10 +19405,10 @@ with self; { OLEStorage_Lite = buildPerlPackage { pname = "OLE-Storage_Lite"; - version = "0.20"; + version = "0.22"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/OLE-Storage_Lite-0.20.tar.gz"; - hash = "sha256-qximFxwOCOqTTuoUoKtPOokJl13anaQhJJIutB6E+Lo="; + url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/OLE-Storage_Lite-0.22.tar.gz"; + hash = "sha256-0FZtbCnTl+pzY3ncUVw2hJ9rlxB89wC6glBQXJhM+WU="; }; meta = { description = "Read and write OLE storage files"; @@ -19302,10 +19431,10 @@ with self; { OpenAPIClient = buildPerlPackage rec { pname = "OpenAPI-Client"; - version = "1.04"; + version = "1.07"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/OpenAPI-Client-1.04.tar.gz"; - hash = "sha256-szo5AKzdLO5hAHu5MigNjDzslJkpnUNyud+Yd0vXTAo="; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/OpenAPI-Client-1.07.tar.gz"; + hash = "sha256-Ue1kHSg7j0u7wG0BwVZzm9K5qItO+Et7hPlQ+g7hTbM="; }; propagatedBuildInputs = [ MojoliciousPluginOpenAPI ]; meta = { @@ -19391,10 +19520,10 @@ with self; { NetOpenSSH = buildPerlPackage { pname = "Net-OpenSSH"; - version = "0.80"; + version = "0.84"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.80.tar.gz"; - hash = "sha256-/uCTZX3ys2FHKimChZWIpuS8XhrugRjs5e6/6vqNrrM="; + url = "mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.84.tar.gz"; + hash = "sha256-h4DmLwGxzw20PJy3BclP9JSbAyIzvkvpH8kavHkVOfg="; }; meta = { description = "Perl SSH client package implemented on top of OpenSSH"; @@ -19449,10 +19578,10 @@ with self; { PackageDeprecationManager = buildPerlPackage { pname = "Package-DeprecationManager"; - version = "0.17"; + version = "0.18"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Package-DeprecationManager-0.17.tar.gz"; - hash = "sha256-HXQ62kgrXJhx2JSWbofUwg7clpMbuUn7JjiwAN3WaEs="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Package-DeprecationManager-0.18.tar.gz"; + hash = "sha256-to0/DO1Vt2Ff3btgKbifkqNP4N2Mb9a87/wVfVaDT+g="; }; buildInputs = [ TestFatal TestWarnings ]; propagatedBuildInputs = [ PackageStash ParamsUtil SubInstall SubName ]; @@ -19478,10 +19607,10 @@ with self; { PackageStash = buildPerlPackage { pname = "Package-Stash"; - version = "0.39"; + version = "0.40"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-0.39.tar.gz"; - hash = "sha256-kWX1VREuCASTzg6RKd4Ihtowslk/s1Oiq9HHay0mIbU="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-0.40.tar.gz"; + hash = "sha256-WpcixtnLKe4TPl97CKU2J2KgtWM/9RcGQqWwaG6V4GY="; }; buildInputs = [ CPANMetaCheck TestFatal TestNeeds TestRequires ]; propagatedBuildInputs = [ DistCheckConflicts ModuleImplementation ]; @@ -19495,12 +19624,12 @@ with self; { PackageStashXS = buildPerlPackage { pname = "Package-Stash-XS"; - version = "0.29"; + version = "0.30"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-XS-0.29.tar.gz"; - hash = "sha256-02drqUZB4D1qMOlR8JJmxMPKP1tYqnsxSmfyjkGYeKo="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-XS-0.30.tar.gz"; + hash = "sha256-JrrWXBlZxXN5s+E53HdvvsX3ApBmF+8nzcKT3fEjkjE="; }; - buildInputs = [ TestFatal TestRequires ]; + buildInputs = [ TestFatal TestNeeds ]; meta = { description = "Faster and more correct implementation of the Package::Stash API"; homepage = "https://github.com/moose/Package-Stash-XS"; @@ -19558,10 +19687,10 @@ with self; { ParallelPipes = buildPerlModule { pname = "Parallel-Pipes"; - version = "0.102"; + version = "0.200"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/Parallel-Pipes-0.102.tar.gz"; - hash = "sha256-JjZfgQXcYGsUC9HUX41w1cMFQ5D3Xk/bdISj5ZHL+pc="; + url = "mirror://cpan/authors/id/S/SK/SKAJI/Parallel-Pipes-0.200.tar.gz"; + hash = "sha256-iLmFDqzJ1hjz6RpRyqOGxKZOgswYc1AzUkTjSbgREQY="; }; buildInputs = [ ModuleBuildTiny ]; meta = { @@ -19617,10 +19746,10 @@ with self; { ParamsValidate = buildPerlModule { pname = "Params-Validate"; - version = "1.30"; + version = "1.31"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Params-Validate-1.30.tar.gz"; - hash = "sha256-mjo1WD0xJdB+jIAsH5L1vn1SbnbdSW6UTaJwseJz2BI="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Params-Validate-1.31.tar.gz"; + hash = "sha256-G/JRjvLEhp+RWQ4hn1RcjvEu1TzzE+DrVwSt9/Gylh4="; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ModuleImplementation ]; @@ -19634,10 +19763,10 @@ with self; { ParamsValidationCompiler = buildPerlPackage { pname = "Params-ValidationCompiler"; - version = "0.30"; + version = "0.31"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.30.tar.gz"; - hash = "sha256-3FvuIzg75CdlBz2yhL7Z+9gZ1HBa1knCC2REUgkNFss="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.31.tar.gz"; + hash = "sha256-e2SXFz8batsp9dUdjPnsNtLxIZQStLJBDp13qQHoSm0="; }; propagatedBuildInputs = [ EvalClosure ExceptionClass ]; buildInputs = [ Specio Test2PluginNoWarnings Test2Suite TestWithoutModule ]; @@ -19650,10 +19779,10 @@ with self; { Paranoid = buildPerlPackage { pname = "Paranoid"; - version = "2.07"; + version = "2.10"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CO/CORLISS/Paranoid/Paranoid-2.07.tar.gz"; - hash = "sha256-tVz9jG1fGB4hjv0BL3EaUM0U5NvIgEZQuVR3F49Dt/w="; + url = "mirror://cpan/authors/id/C/CO/CORLISS/Paranoid/Paranoid-2.10.tar.gz"; + hash = "sha256-vvS25l1cmk72C8qjF0hvOg0jm/2rRQqnEgLCl5i4dSk="; }; patches = [ ../development/perl-modules/Paranoid-blessed-path.patch ]; preConfigure = '' @@ -19670,10 +19799,10 @@ with self; { PARDist = buildPerlPackage { pname = "PAR-Dist"; - version = "0.51"; + version = "0.52"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-Dist-0.51.tar.gz"; - hash = "sha256-0kIGLfm2ifOQQOTE4JExpsRk0O7629HJrJRxc68z3/g="; + url = "mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-Dist-0.52.tar.gz"; + hash = "sha256-y+ljAJ6nnSRUqF/heU9CW33cHoa3F0nIhNsp1gHqj4g="; }; meta = { description = "Create and manipulate PAR distributions"; @@ -19739,6 +19868,20 @@ with self; { }; }; + ParseDistname = buildPerlPackage { + pname = "Parse-Distname"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-Distname-0.05.tar.gz"; + hash = "sha256-pfqTvsLat22IPaEtTzRLc7+L6wzEtmwkN28+Dzh67wc="; + }; + buildInputs = [ ExtUtilsMakeMakerCPANfile TestDifferences TestUseAllModules ]; + meta = { + description = "Parse a distribution name"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ParseIRC = buildPerlPackage { pname = "Parse-IRC"; version = "1.22"; @@ -19771,10 +19914,10 @@ with self; { ParsePlainConfig = buildPerlPackage { pname = "Parse-PlainConfig"; - version = "3.05"; + version = "3.06"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CO/CORLISS/Parse-PlainConfig/Parse-PlainConfig-3.05.tar.gz"; - hash = "sha256-a3ioVSOYsNLXBjUFyTs8/tBDLFss9uALjlH+v0EcHvo="; + url = "mirror://cpan/authors/id/C/CO/CORLISS/Parse-PlainConfig/Parse-PlainConfig-3.06.tar.gz"; + hash = "sha256-8ffT5OWawrbPbJjaDKpBxdTl2GVcIQdRSBlplS/+G4c="; }; propagatedBuildInputs = [ ClassEHierarchy Paranoid ]; meta = { @@ -19786,10 +19929,10 @@ with self; { ParsePMFile = buildPerlPackage { pname = "Parse-PMFile"; - version = "0.43"; + version = "0.44"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-PMFile-0.43.tar.gz"; - hash = "sha256-vmHoByBHOM8MUu0yFVGZL9x/qPqkPtQ/9InQwmmQBiM="; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-PMFile-0.44.tar.gz"; + hash = "sha256-4I8PVkVbOsEtzNjHEWUGErfTzRUPim+K5rQ7LaR9+ZQ="; }; buildInputs = [ ExtUtilsMakeMakerCPANfile ]; meta = { @@ -19826,12 +19969,13 @@ with self; { ParserMGC = buildPerlModule { pname = "Parser-MGC"; - version = "0.16"; + version = "0.21"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Parser-MGC-0.16.tar.gz"; - hash = "sha256-dERhxfDIOAEvO+jFgEKlVgkhIAzBbbDn0ASn8rgTe5E="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Parser-MGC-0.21.tar.gz"; + hash = "sha256-DmGIpydqn5B1fGIEc98W08mGGRO6viWvIJz0RhWgKk8="; }; - propagatedBuildInputs = [ FileSlurpTiny ]; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ FeatureCompatTry ]; meta = { description = "Build simple recursive-descent parsers"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -19883,10 +20027,10 @@ with self; { PathIteratorRule = buildPerlPackage { pname = "Path-Iterator-Rule"; - version = "1.014"; + version = "1.015"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Iterator-Rule-1.014.tar.gz"; - hash = "sha256-P3QB2L7UP8kwNAnvbZ80uFogPeaUQFC765WFXTKYsaY="; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Iterator-Rule-1.015.tar.gz"; + hash = "sha256-87Bixo4Hx29o3lvDOHfP6eB4tjUaYboWUOM+CfUeyyk="; }; propagatedBuildInputs = [ NumberCompare TextGlob TryTiny ]; buildInputs = [ Filepushd PathTiny TestDeep TestFilename ]; @@ -19899,10 +20043,10 @@ with self; { PathTiny = buildPerlPackage { pname = "Path-Tiny"; - version = "0.114"; + version = "0.144"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.114.tar.gz"; - hash = "sha256-zQ+I83pY/DZn7AZXZ/4B5z7m76GKESv9NQjPZXnKAOE="; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.144.tar.gz"; + hash = "sha256-9uoJTs6EXJUqAsJ4kzJXk1TejUEKcH+bcEW9JBIGSH0="; }; preConfigure = '' @@ -19929,6 +20073,8 @@ with self; { url = "mirror://cpan/authors/id/X/XS/XSAWYERX/PathTools-3.75.tar.gz"; hash = "sha256-pVhQOqax+McnwAczOQgad4iGBqpwGtoa1i3Z2MP5RaI="; }; + # cwd() and fastgetcwd() does not work with taint due to PATH in nixpkgs + preCheck = "rm t/taint.t"; meta = { description = "Get pathname of current working directory"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -19973,10 +20119,10 @@ with self; { PDFAPI2 = buildPerlPackage { pname = "PDF-API2"; - version = "2.044"; + version = "2.045"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.044.tar.gz"; - hash = "sha256-stFVeeQnI9jX+bct6G0NNc3jTx63cTRWuirTX7PL6n4="; + url = "mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.045.tar.gz"; + hash = "sha256-tr204NDNZSYQP91YwXHgVgw2uEO3/jyk3cm7HkyDJAY="; }; buildInputs = [ TestException TestMemoryCycle ]; propagatedBuildInputs = [ FontTTF ]; @@ -19988,10 +20134,10 @@ with self; { PDFBuilder = buildPerlPackage { pname = "PDF-Builder"; - version = "3.023"; + version = "3.025"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMPERRY/PDF-Builder-3.022.tar.gz"; - hash = "sha256-SCskaQxxhfLn+7r5pIKz0SieJduAC/SPKVn1Epl3yjE="; + url = "mirror://cpan/authors/id/P/PM/PMPERRY/PDF-Builder-3.025.tar.gz"; + hash = "sha256-qb6076DsKXWpFFzvBSEYsgmPRtnBUQ3WV4agPQ2j49U="; }; nativeCheckInputs = [ TestException TestMemoryCycle ]; propagatedBuildInputs = [ FontTTF ]; @@ -20095,14 +20241,14 @@ with self; { PerlCritic = buildPerlModule { pname = "Perl-Critic"; - version = "1.140"; + version = "1.150"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.140.tar.gz"; - hash = "sha256-v+7wqjbwlBaCpgchJZPbUwssilSZ9tx9QffmGo69/ds="; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.150.tar.gz"; + hash = "sha256-5c2V3j5DvOcHdRdidLqkBfMm/IdA3wBUu4FpdcyNNJs="; }; buildInputs = [ TestDeep ]; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - propagatedBuildInputs = [ BKeywords ConfigTiny FileWhich ListMoreUtils ModulePluggable PPIxQuoteLike PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ]; + propagatedBuildInputs = [ BKeywords ConfigTiny ExceptionClass FileWhich ListSomeUtils ModulePluggable PPI PPIxQuoteLike PPIxRegexp PPIxUtilities PPIxUtils PerlTidy PodSpell Readonly StringFormat ]; postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/perlcritic ''; @@ -20116,10 +20262,10 @@ with self; { PerlCriticCommunity = buildPerlModule { pname = "Perl-Critic-Community"; - version = "1.0.0"; + version = "1.0.3"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DB/DBOOK/Perl-Critic-Community-v1.0.0.tar.gz"; - hash = "sha256-MRt3XaQZPp3pTPUiXpk8xU3Qlq4efvYHOM2uHZuIVOc="; + url = "mirror://cpan/authors/id/D/DB/DBOOK/Perl-Critic-Community-v1.0.3.tar.gz"; + hash = "sha256-Ed3bt5F5/mIp8zPKOS+U/firXNmJzJfZk1IaidXEetU="; }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ PPI PathTiny PerlCritic PerlCriticPolicyVariablesProhibitLoopOnHash PerlCriticPulp ]; @@ -20203,10 +20349,10 @@ with self; { PerlIOeol = buildPerlPackage { pname = "PerlIO-eol"; - version = "0.17"; + version = "0.19"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/PerlIO-eol-0.17.tar.gz"; - hash = "sha256-zszL/kVFsZZdESqGKY3/5Q1oBhgAkMa+x9dXto+4Xrk="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/PerlIO-eol-0.19.tar.gz"; + hash = "sha256-/3O+xgRP2EepbEGZZPNw5Qn9Nv1XH3o7fDUXX1iviFk="; }; meta = { description = "PerlIO layer for normalizing line endings"; @@ -20231,10 +20377,10 @@ with self; { PerlIOutf8_strict = buildPerlPackage { pname = "PerlIO-utf8_strict"; - version = "0.008"; + version = "0.010"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/PerlIO-utf8_strict-0.008.tar.gz"; - hash = "sha256-X3mN7VDcx9QhtXhQ+DcxBmbYF/TGfBW6D1odOMdN9Fk="; + url = "mirror://cpan/authors/id/L/LE/LEONT/PerlIO-utf8_strict-0.010.tar.gz"; + hash = "sha256-vNKEi3LfKQtemE+uixpsqW9tByADzyIjiajJ6OHFcM0="; }; buildInputs = [ TestException ]; meta = { @@ -20349,10 +20495,10 @@ with self; { PerlTidy = buildPerlPackage rec { pname = "Perl-Tidy"; - version = "20211029"; + version = "20230912"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20211029.tar.gz"; - hash = "sha256-7AOx42pX0JRWmjAIJoj3IiU0AcfMk0rGTS4+tN6IDto="; + url = "mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20230912.tar.gz"; + hash = "sha256-DFeIjyBvmHd34WZA5yV0qgp3eEZxn44+0EE8NTJfVUA="; }; meta = { description = "Indent and reformat perl scripts"; @@ -20398,10 +20544,10 @@ with self; { Plack = buildPerlPackage { pname = "Plack"; - version = "1.0048"; + version = "1.0050"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0048.tar.gz"; - hash = "sha256-MPXyXhm0N4WRVqJSb2HKmrcI1Q1XMMJ5GJQDqr/lQqY="; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0050.tar.gz"; + hash = "sha256-0mUa3oLrv/er4KOhifyTLa3Ed5GGzolGjlbQGJ6qbtQ="; }; buildInputs = [ AuthenSimplePasswd CGIEmulatePSGI FileShareDirInstall HTTPRequestAsCGI HTTPServerSimplePSGI IOHandleUtil LWP LWPProtocolhttp10 LogDispatchArray MIMETypes TestMockTimeHiRes TestRequires TestSharedFork TestTCP ]; propagatedBuildInputs = [ ApacheLogFormatCompiler CookieBaker DevelStackTraceAsHTML FileShareDir FilesysNotifySimple HTTPEntityParser HTTPHeadersFast HTTPMessage TryTiny ]; @@ -20640,10 +20786,10 @@ with self; { POE = buildPerlPackage { pname = "POE"; - version = "1.368"; + version = "1.370"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/POE-1.368.tar.gz"; - hash = "sha256-t7Hcdh421Is5BoNJtXba/A7MvDudtRxnfeDhqvrf4SE="; + url = "mirror://cpan/authors/id/B/BI/BINGOS/POE-1.370.tar.gz"; + hash = "sha256-V94rY1sV+joxqeVd1REiFJ5UFOEVjugiNQYmNO4YppM="; }; # N.B. removing TestPodLinkCheck from buildInputs because tests requiring # this module don't disable themselves when "run_network_tests" is @@ -20691,10 +20837,10 @@ with self; { PPI = buildPerlPackage { pname = "PPI"; - version = "1.270"; + version = "1.277"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.270.tar.gz"; - hash = "sha256-YippjHgbuF0r33u/4ED+cNM7eXdMmuAfziN13HP69Fc="; + url = "mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.277.tar.gz"; + hash = "sha256-h8efg7aHbiBgUZZdUBnSUHxVH4GahnUAgOx+xDsuCvg="; }; buildInputs = [ ClassInspector TestDeep TestNoWarnings TestObject TestSubCalls ]; propagatedBuildInputs = [ Clone IOString ParamsUtil TaskWeaken ]; @@ -20712,10 +20858,10 @@ with self; { PPIxQuoteLike = buildPerlModule { pname = "PPIx-QuoteLike"; - version = "0.013"; + version = "0.023"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.013.tar.gz"; - hash = "sha256-jR4zg4J40lKrb1hoQPzucOGbtzUgNbqF/TIkdSYtGBc="; + url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.023.tar.gz"; + hash = "sha256-NXajFJ0sU+B+lze3iSvlz7hKSZpu8d8JC3E7BUQjTSE="; }; propagatedBuildInputs = [ PPI Readonly ]; meta = { @@ -20726,10 +20872,10 @@ with self; { PPIxRegexp = buildPerlModule { pname = "PPIx-Regexp"; - version = "0.076"; + version = "0.088"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.076.tar.gz"; - hash = "sha256-EGB9kyJyjEs3ZMCf4dy0qTmv8Nq+psSMpPhUogd6AUo="; + url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.088.tar.gz"; + hash = "sha256-iFQz+bEC+tT9NrIccyC7A2A2ERyvmYExv0FvfNXul2Q="; }; propagatedBuildInputs = [ PPI ]; meta = { @@ -20753,6 +20899,21 @@ with self; { }; }; + PPIxUtils = buildPerlPackage { + pname = "PPIx-Utils"; + version = "0.003"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DB/DBOOK/PPIx-Utils-0.003.tar.gz"; + hash = "sha256-KpvM/I6tA74BtnJI/o4VJSIED3mChvpO9EMrfy79uhE="; + }; + propagatedBuildInputs = [ BKeywords PPI ]; + meta = { + homepage = "https://github.com/Grinnz/PPIx-Utils"; + description = "Utility functions for PPI"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PPR = buildPerlPackage { pname = "PPR"; version = "0.001008"; @@ -20769,10 +20930,10 @@ with self; { ProcBackground = buildPerlPackage { pname = "Proc-Background"; - version = "1.21"; + version = "1.32"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NERDVANA/Proc-Background-1.21.tar.gz"; - hash = "sha256-kbalrrhBscMTSYx4+tCON9F1lXAtxiBbWtOO9plJt+4="; + url = "mirror://cpan/authors/id/N/NE/NERDVANA/Proc-Background-1.32.tar.gz"; + hash = "sha256-Wxp4DduSnKQnJeuQtRgyFCX/d4tKE3+G+sldn7nNKWc="; }; meta = { description = "Run asynchronous child processes under Unix or Windows"; @@ -20783,10 +20944,10 @@ with self; { ProcProcessTable = buildPerlPackage { pname = "Proc-ProcessTable"; - version = "0.59"; + version = "0.636"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.59.tar.gz"; - hash = "sha256-+MxQVNeMNaDOOft1QwtO9ALiqZAT0uw355l/MWWUYGw="; + url = "mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.636.tar.gz"; + hash = "sha256-lEIk/7APwe81BpYzdwoK/ahiO1x1MtHkq0ip3zlIkP0="; }; meta = { description = "Perl extension to access the unix process table"; @@ -20893,12 +21054,12 @@ with self; { PrometheusTiny = buildPerlPackage { pname = "Prometheus-Tiny"; - version = "0.008"; + version = "0.011"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RO/ROBN/Prometheus-Tiny-0.008.tar.gz"; - hash = "sha256-c2pmkTuYAL7skh1QoSsFyzdLXwnVcJ6vQ5hNyJJZp50="; + url = "mirror://cpan/authors/id/R/RO/ROBN/Prometheus-Tiny-0.011.tar.gz"; + hash = "sha256-jbFIDzyJ64bUFM9fR/7tjfMRKzjEY8uPZbTAZOILHhM="; }; - buildInputs = [ HTTPMessage Plack TestException ]; + buildInputs = [ HTTPMessage Plack TestException TestWarn ]; meta = { description = "A tiny Prometheus client"; homepage = "https://github.com/robn/Prometheus-Tiny"; @@ -20908,12 +21069,12 @@ with self; { PrometheusTinyShared = buildPerlPackage { pname = "Prometheus-Tiny-Shared"; - version = "0.024"; + version = "0.027"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RO/ROBN/Prometheus-Tiny-Shared-0.024.tar.gz"; - hash = "sha256-j7xUPgv9XY9zvcEhotrK/UNErupLmbcVxQ3Nqkgmggs="; + url = "mirror://cpan/authors/id/R/RO/ROBN/Prometheus-Tiny-Shared-0.027.tar.gz"; + hash = "sha256-egULqhjKfA0gsoih1L0nJ3E6lFg/Qmskn5XcjUDty9E="; }; - buildInputs = [ DataRandom HTTPMessage Plack TestDifferences TestException ]; + buildInputs = [ DataRandom HTTPMessage Plack TestDifferences TestException TestWarn ]; propagatedBuildInputs = [ HashSharedMem JSONXS PrometheusTiny ]; meta = { description = "A tiny Prometheus client with a shared database behind it"; @@ -21023,10 +21184,10 @@ with self; { PerlMinimumVersion = buildPerlPackage { pname = "Perl-MinimumVersion"; - version = "1.38"; + version = "1.40"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/Perl-MinimumVersion-1.38.tar.gz"; - hash = "sha256-R4tYJHkbh/x0yUqJIYBoK9Bq0s3zQDSxpLhZJzkngCo="; + url = "mirror://cpan/authors/id/D/DB/DBOOK/Perl-MinimumVersion-1.40.tar.gz"; + hash = "sha256-dYmleMtg1wykdVw5WzWStECgzWobB05OzqyTsDGhvpA="; }; buildInputs = [ TestScript ]; propagatedBuildInputs = [ FileFindRulePerl PerlCritic ]; @@ -21040,12 +21201,13 @@ with self; { PerlPrereqScanner = buildPerlPackage { pname = "Perl-PrereqScanner"; - version = "1.023"; + version = "1.100"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.023.tar.gz"; - hash = "sha256-KAocRxA5CGX7nzEKhho0cgsotMvlBgnIQa9c8tOivO0="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.100.tar.gz"; + hash = "sha256-ARgdOKLnr/g40mISJWPFBja6SzZS7l0dT471uj9bGGs="; }; - propagatedBuildInputs = [ GetoptLongDescriptive ListMoreUtils ModulePath Moose PPI StringRewritePrefix namespaceautoclean ]; + buildInputs = [ TryTiny ]; + propagatedBuildInputs = [ GetoptLongDescriptive ModulePath Moo ParamsUtil PPI StringRewritePrefix TypeTiny namespaceautoclean ]; meta = { description = "A tool to scan your Perl code for its prerequisites"; homepage = "https://github.com/rjbs/Perl-PrereqScanner"; @@ -21056,13 +21218,13 @@ with self; { PerlPrereqScannerNotQuiteLite = buildPerlPackage { pname = "Perl-PrereqScanner-NotQuiteLite"; - version = "0.9913"; + version = "0.9917"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9913.tar.gz"; - hash = "sha256-lw2fxeFJOMDxdA+M/tCU1c+kxL2NR/qAxZqbATnPVI0="; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9917.tar.gz"; + hash = "sha256-O6fuF9lfDJqNkqLkwYVLZKcH0cAihGIm3Q36Qvfeud0="; }; propagatedBuildInputs = [ DataDump ModuleCPANfile ModuleFind RegexpTrie URIcpan ]; - buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings TestUseAllModules ]; + buildInputs = [ ExtUtilsMakeMakerCPANfile ParseDistname TestFailWarnings TestUseAllModules ]; meta = { description = "A tool to scan your Perl code for its prerequisites"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -21102,10 +21264,10 @@ with self; { PodChecker = buildPerlPackage { pname = "Pod-Checker"; - version = "1.74"; + version = "1.75"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MAREKR/Pod-Checker-1.74.tar.gz"; - hash = "sha256-LiFirwqIYORXAxiGbsGO++ezf+uNmQs0hIuffFJKpYg="; + url = "mirror://cpan/authors/id/M/MA/MAREKR/Pod-Checker-1.75.tar.gz"; + hash = "sha256-82O1dOxmCvbtvT5dTJ/8UVodRsvxx8ytmkbO0oh5wiE="; }; meta = { description = "Verifies POD documentation contents for compliance with the POD format specifications"; @@ -21131,10 +21293,10 @@ with self; { PodCoverageTrustPod = buildPerlPackage { pname = "Pod-Coverage-TrustPod"; - version = "0.100005"; + version = "0.100006"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Coverage-TrustPod-0.100005.tar.gz"; - hash = "sha256-bGiDXCTNyvuxVn5oCrErsXYWOCuvi8RM5FfkGh01cyE="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Coverage-TrustPod-0.100006.tar.gz"; + hash = "sha256-NYrcJQTwOetpCYqpm93mrp3JNTZKjhRPZAXoKTs6fKM="; }; propagatedBuildInputs = [ PodCoverage PodEventual ]; meta = { @@ -21146,10 +21308,10 @@ with self; { PodElemental = buildPerlPackage { pname = "Pod-Elemental"; - version = "0.103005"; + version = "0.103006"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-0.103005.tar.gz"; - hash = "sha256-gkM27BgybjuXDngVkis5IbCoIdLuDlCwxbK8Mn+ZYV4="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-0.103006.tar.gz"; + hash = "sha256-dQw6edjhgkdYpu99LdB33N3KUDVCuMNOzNWsu3edxCM="; }; buildInputs = [ TestDeep TestDifferences ]; propagatedBuildInputs = [ MooseXTypes PodEventual StringRewritePrefix StringTruncate ]; @@ -21162,10 +21324,10 @@ with self; { PodElementalPerlMunger = buildPerlPackage { pname = "Pod-Elemental-PerlMunger"; - version = "0.200006"; + version = "0.200007"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-PerlMunger-0.200006.tar.gz"; - hash = "sha256-Cf07XVMRlDegHc7Wa0Lq/c1TiVs8MqKw94Hzb9oPZls="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-PerlMunger-0.200007.tar.gz"; + hash = "sha256-UYleTEGgeere+fJPXcSOMkWlwG40BO15yF+lzv63lak="; }; buildInputs = [ TestDifferences ]; propagatedBuildInputs = [ PPI PodElemental ]; @@ -21178,10 +21340,10 @@ with self; { PodEventual = buildPerlPackage { pname = "Pod-Eventual"; - version = "0.094001"; + version = "0.094003"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Eventual-0.094001.tar.gz"; - hash = "sha256-vp+4kQsQjl0aZvACtlmtIlduiNd5twPf+dFRIsP4CDQ="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Eventual-0.094003.tar.gz"; + hash = "sha256-fwYMw00RZWzgadsGHj1g7cDKvI+JpKLcfqrpXayFbS0="; }; propagatedBuildInputs = [ MixinLinewise ]; buildInputs = [ TestDeep ]; @@ -21194,10 +21356,10 @@ with self; { PodParser = buildPerlPackage { pname = "Pod-Parser"; - version = "1.63"; + version = "1.66"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MAREKR/Pod-Parser-1.63.tar.gz"; - hash = "sha256-2+C1YSmXWy+DoChB6ODtR76A8GBobGbqN+Up2XqnDM0="; + url = "mirror://cpan/authors/id/M/MA/MAREKR/Pod-Parser-1.66.tar.gz"; + hash = "sha256-IpKKe//mG0UsBbu7j1IW1LnPn+KoSbd2wlUA0k0g33w="; }; meta = { description = "Modules for parsing/translating POD format documents"; @@ -21270,10 +21432,10 @@ with self; { podlators = buildPerlPackage { pname = "podlators"; - version = "4.14"; + version = "5.01"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RR/RRA/podlators-4.14.tar.gz"; - hash = "sha256-evHEHeNLLk2/9wCinXOHVJwrbPFhQiFEUMkkcH3bD4I="; + url = "mirror://cpan/authors/id/R/RR/RRA/podlators-5.01.tar.gz"; + hash = "sha256-zP0d+fGkfwlbzm1xj61a9A94ziSR8scjlibhW3AgvHE="; }; preCheck = '' # remove failing spdx check @@ -21378,10 +21540,10 @@ with self; { PodSimple = buildPerlPackage { pname = "Pod-Simple"; - version = "3.42"; + version = "3.45"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KH/KHW/Pod-Simple-3.42.tar.gz"; - hash = "sha256-qfzrLgMY43hlJea/IF4+FD8M82InQIGcq18FjmV+isU="; + url = "mirror://cpan/authors/id/K/KH/KHW/Pod-Simple-3.45.tar.gz"; + hash = "sha256-hIO7lc0+QwfWbe8JKjd5+EOvdySCv9wCTj4A0MTbDPo="; }; meta = { description = "Framework for parsing Pod"; @@ -21391,10 +21553,10 @@ with self; { PodSpell = buildPerlPackage { pname = "Pod-Spell"; - version = "1.20"; + version = "1.26"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOLMEN/Pod-Spell-1.20.tar.gz"; - hash = "sha256-Y4P3v+IrwNg5oIBXoM54BpiwRhhK6pNb5IM9lJht0Dw="; + url = "mirror://cpan/authors/id/H/HA/HAARG/Pod-Spell-1.26.tar.gz"; + hash = "sha256-LwW/yc+wS5b8v6LIVE0eaukIWW02lsRuDiZVa3UK+78="; }; propagatedBuildInputs = [ ClassTiny FileShareDir LinguaENInflect PathTiny PodParser ]; buildInputs = [ FileShareDirInstall TestDeep ]; @@ -21408,10 +21570,10 @@ with self; { PodStrip = buildPerlModule { pname = "Pod-Strip"; - version = "1.02"; + version = "1.100"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOMM/Pod-Strip-1.02.tar.gz"; - hash = "sha256-2A2s9qeszIfTZoMBZSNNchvS827uGHrvaCtgyQR3Uv8="; + url = "mirror://cpan/authors/id/D/DO/DOMM/Pod-Strip-1.100.tar.gz"; + hash = "sha256-Z1BqZh+pyuzv57pPQvC8FbCm8JZ8eWB3QPbLaXSu1M0="; }; meta = { description = "Remove POD from Perl code"; @@ -21438,10 +21600,10 @@ with self; { PodWeaver = buildPerlPackage { pname = "Pod-Weaver"; - version = "4.015"; + version = "4.019"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Weaver-4.015.tar.gz"; - hash = "sha256-WvJbKaVXg+SVqd9e9ikyQOLJqwJ2RhPXnx7VCxLexa4="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Weaver-4.019.tar.gz"; + hash = "sha256-aUatHwTq+aoR8kzFRJTh1Xli9Y4FkS82S3T5WT595/c="; }; buildInputs = [ PPI SoftwareLicense TestDifferences ]; propagatedBuildInputs = [ ConfigMVPReaderINI DateTime ListMoreUtils LogDispatchouli PodElemental ]; @@ -21592,10 +21754,10 @@ with self; { Redis = buildPerlModule { pname = "Redis"; - version = "1.998"; + version = "2.000"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAMS/Redis-1.998.tar.gz"; - hash = "sha256-WfO7F2w6elTLN3lJe4mnuuH7IXVlxocR1YX8HwnXnIc="; + url = "mirror://cpan/authors/id/D/DA/DAMS/Redis-2.000.tar.gz"; + hash = "sha256-FMuJl5chJhW06T+Rbcva+0jQHF6qsgOP5ssXm/lcb+s="; }; buildInputs = [ IOString ModuleBuildTiny TestDeep TestFatal TestSharedFork TestTCP ]; propagatedBuildInputs = [ IOSocketTimeout TryTiny ]; @@ -21677,10 +21839,10 @@ with self; { RegexpGrammars = buildPerlModule { pname = "Regexp-Grammars"; - version = "1.057"; + version = "1.058"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCONWAY/Regexp-Grammars-1.057.tar.gz"; - hash = "sha256-r1PBmBhGHNcBrrV8Sd/9tGPtxL+PZY2epObVNKwXcEE="; + url = "mirror://cpan/authors/id/D/DC/DCONWAY/Regexp-Grammars-1.058.tar.gz"; + hash = "sha256-6ojVjiUWdPrjm0n007U0LqzLj8tVhWzTBKoaX/PUHJI="; }; meta = { description = "Add grammatical parsing features to Perl 5.10 regexes"; @@ -21730,10 +21892,10 @@ with self; { RESTClient = buildPerlPackage { pname = "REST-Client"; - version = "273"; + version = "281"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KK/KKANE/REST-Client-273.tar.gz"; - hash = "sha256-qGUqIhQwj6/yxovlzmTJBNzMxehr5/MjdsFZCGnQGEQ="; + url = "mirror://cpan/authors/id/A/AK/AKHUETTEL/REST-Client-281.tar.gz"; + hash = "sha256-+hDSGgA35oJgHv5mc4p1j/dSEJSqASKek8iIpnmyyPY="; }; propagatedBuildInputs = [ LWPProtocolHttps ]; meta = { @@ -21760,10 +21922,10 @@ with self; { RpcXML = buildPerlPackage { pname = "RPC-XML"; - version = "0.80"; + version = "0.82"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.80.tar.gz"; - hash = "sha256-6g18qHqrcMEoF99Yk/a/4Eks5j9uDmPAtFLjdTRMfvc="; + url = "mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.82.tar.gz"; + hash = "sha256-UnnrDRNsUz/4l/aTTDqtbyBQS5l/smBuUsXbvZJ1jnM="; }; propagatedBuildInputs = [ XMLParser ]; doCheck = false; @@ -21803,10 +21965,10 @@ with self; { RoleHasMessage = buildPerlPackage { pname = "Role-HasMessage"; - version = "0.006"; + version = "0.007"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Role-HasMessage-0.006.tar.gz"; - hash = "sha256-9qbb4Edv+V7h/774JesY2bArBhjeukaG58Y7mdV21NM="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Role-HasMessage-0.007.tar.gz"; + hash = "sha256-XiZ6TXYgs2hIEgTIjqIES4sqWP+LBVd/JxeydUwEFM4="; }; propagatedBuildInputs = [ MooseXRoleParameterized StringErrf ]; meta = { @@ -21816,12 +21978,28 @@ with self; { }; }; + RoleHooks = buildPerlPackage { + pname = "Role-Hooks"; + version = "0.008"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Role-Hooks-0.008.tar.gz"; + hash = "sha256-KNZuoKjcMGt22oP/CHlJPYCPcxhbz5xO03LzlG+1Q+w="; + }; + buildInputs = [ TestRequires ]; + propagatedBuildInputs = [ ClassMethodModifiers ]; + meta = { + homepage = "https://metacpan.org/release/Role-Hooks"; + description = "Role callbacks"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + RoleIdentifiable = buildPerlPackage { pname = "Role-Identifiable"; - version = "0.007"; + version = "0.009"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Role-Identifiable-0.007.tar.gz"; - hash = "sha256-VhNG0aGgekW9hR2FmoJaf2eSWno7pbpY4M2ti7mQc60="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Role-Identifiable-0.009.tar.gz"; + hash = "sha256-WnNen3F3+euuBH63uuKbfsKewCCuN2N66lNQ0wwIe3Y="; }; propagatedBuildInputs = [ Moose ]; meta = { @@ -21833,10 +22011,10 @@ with self; { RoleTiny = buildPerlPackage { pname = "Role-Tiny"; - version = "2.001004"; + version = "2.002004"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Role-Tiny-2.001004.tar.gz"; - hash = "sha256-krpXEoUKdBAsk8lC625/Yvek+PSDc07SidCLMkwoFoc="; + url = "mirror://cpan/authors/id/H/HA/HAARG/Role-Tiny-2.002004.tar.gz"; + hash = "sha256-173unhOKT4OqUtCpgWJWRL2of/FmQt+oRdy0TZokK0U="; }; meta = { description = "Roles: a nouvelle cuisine portion size slice of Moose"; @@ -21892,10 +22070,10 @@ with self; { RTClientREST = buildPerlModule { pname = "RT-Client-REST"; - version = "0.60"; + version = "0.72"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DJ/DJZORT/RT-Client-REST-0.60.tar.gz"; - hash = "sha256-Dm8to9lpA0kbQ7GcYSIcvuqIQUJk+QcxLyd9qvFEJIs="; + url = "mirror://cpan/authors/id/D/DJ/DJZORT/RT-Client-REST-0.72.tar.gz"; + hash = "sha256-KPIBWKD3sfNLdM423lvdVimeuUAUBHLISXyVNYIm/bM="; }; buildInputs = [ CGI HTTPServerSimple TestException ]; propagatedBuildInputs = [ DateTimeFormatDateParse Error LWP ParamsValidate ]; @@ -21921,10 +22099,10 @@ with self; { ScalarListUtils = buildPerlPackage { pname = "Scalar-List-Utils"; - version = "1.55"; + version = "1.63"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.55.tar.gz"; - hash = "sha256-TSvcHHKnvE1p1qXMhbx1Zkl8Oxg8YXW4MnhDKdWP60s="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.63.tar.gz"; + hash = "sha256-yvvfIS9oJ9yaDdO1e27lDoYFhtcZgiijMmLVXFWesqk="; }; meta = { description = "Common Scalar and List utility subroutines"; @@ -21945,6 +22123,20 @@ with self; { }; }; + ScalarType = buildPerlPackage { + pname = "Scalar-Type"; + version = "0.3.2"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Scalar-Type-0.3.2.tar.gz"; + hash = "sha256-WQyv6gz1RZmSoEiFYsDb1vnfdYtfAH8OQ6uhMLRe7oY="; + }; + propagatedBuildInputs = [ CaptureTiny TestException ]; + meta = { + description = "Figure out what type a scalar is"; + license = with lib.licenses; [ artistic1 gpl2Only ]; + }; + }; + SCGI = buildPerlModule { pname = "SCGI"; version = "0.6"; @@ -22009,10 +22201,10 @@ with self; { SearchXapian = buildPerlPackage rec { pname = "Search-Xapian"; - version = "1.2.25.4"; + version = "1.2.25.5"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-1.2.25.4.tar.gz"; - hash = "sha256-hxlDGZuA79mOMfS0cRuwcKV2yRvmkhk9ikOv+tZFdN0="; + url = "mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-1.2.25.5.tar.gz"; + hash = "sha256-IE+9xxLWcR/6tmjB9M/AB7Y5qftkrX4ZyyD8EKkQuos="; }; buildInputs = [ pkgs.xapian DevelLeak ]; meta = { @@ -22024,10 +22216,10 @@ with self; { SerealDecoder = buildPerlPackage { pname = "Sereal-Decoder"; - version = "4.025"; + version = "5.004"; src = fetchurl { - url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-Decoder-4.025.tar.gz"; - hash = "sha256-jg47mprxp3i33iFQb6MHl/sbUg3NAC8/KebctSRG3qU="; + url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-Decoder-5.004.tar.gz"; + hash = "sha256-aO8DFNh9Gm5guw9m/PQ+ssrN6xdUQy9eJeeE450+Z4Q="; }; buildInputs = [ TestDeep TestDifferences TestLongString TestWarn ]; preBuild = "ls"; @@ -22041,10 +22233,10 @@ with self; { SerealEncoder = buildPerlPackage { pname = "Sereal-Encoder"; - version = "4.025"; + version = "5.004"; src = fetchurl { - url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-Encoder-4.025.tar.gz"; - hash = "sha256-D9UbpggwJmUNCFJnWCYRc8GKuCNMVSb6x+25GtnGAm4="; + url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-Encoder-5.004.tar.gz"; + hash = "sha256-XlqGzNMtrjTtgJMuy+XGjil1K13g6bCnk6t+sspVyxs="; }; buildInputs = [ SerealDecoder TestDeep TestDifferences TestLongString TestWarn ]; meta = { @@ -22057,10 +22249,10 @@ with self; { Sereal = buildPerlPackage { pname = "Sereal"; - version = "4.025"; + version = "5.004"; src = fetchurl { - url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-4.025.tar.gz"; - hash = "sha256-C+X+VStQtnhjk+Q+qczldzpItf80o6zyopWqdgmgYrk="; + url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-5.004.tar.gz"; + hash = "sha256-nCW7euS9c20ksa0dk9dzlbDGXKh0HiZr/Ay+VCJh128="; }; buildInputs = [ TestDeep TestLongString TestWarn ]; propagatedBuildInputs = [ SerealDecoder SerealEncoder ]; @@ -22093,6 +22285,7 @@ with self; { hash = "sha256-Z23A1s/0ZIU4Myxjwy+4itCe2GghPqnmLj8Z+tQbnEA="; }; buildInputs = [ TestRequires TestSharedFork TestTCP ]; + doCheck = false; # Tests are slow and unstable meta = { description = "A superdaemon for hot-deploying server programs"; homepage = "https://github.com/kazuho/p5-Server-Starter"; @@ -22145,10 +22338,10 @@ with self; { SetObject = buildPerlPackage { pname = "Set-Object"; - version = "1.40"; + version = "1.42"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/Set-Object-1.40.tar.gz"; - hash = "sha256-HE2EZME+bZSVfPAhzmA8lhsI9S22qer1pbDTeGjNN7c="; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Set-Object-1.42.tar.gz"; + hash = "sha256-0YxaiiM+q70CBs89pbAPzdezf+vxKpPcw9HAJub97EU="; }; meta = { description = "Unordered collections (sets) of Perl Objects"; @@ -22274,10 +22467,10 @@ with self; { SoftwareLicense = buildPerlPackage { pname = "Software-License"; - version = "0.103014"; + version = "0.104004"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/Software-License-0.103014.tar.gz"; - hash = "sha256-60XqYC11AGaDeJ+7pXoBwKH3A3Nx3pXqVLkVd1NdF4k="; + url = "mirror://cpan/authors/id/L/LE/LEONT/Software-License-0.104004.tar.gz"; + hash = "sha256-of2iTsh3UhmAlzgPuTAMFLV0gmJwzFgNr3UONYX8Jww="; }; buildInputs = [ TryTiny ]; propagatedBuildInputs = [ DataSection TextTemplate ]; @@ -22332,10 +22525,10 @@ with self; { Specio = buildPerlPackage { pname = "Specio"; - version = "0.46"; + version = "0.48"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.46.tar.gz"; - hash = "sha256-C/QqoRYHbW78GPcrcsestWOL1BwKoJrswS/Iv5zrlZY="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.48.tar.gz"; + hash = "sha256-DIV5NYDxJ07wgXMHkTHRAfd7IqzOp6+oJVIC8IEWgrI="; }; propagatedBuildInputs = [ DevelStackTrace EvalClosure MROCompat ModuleRuntime RoleTiny SubQuote TryTiny ]; buildInputs = [ TestFatal TestNeeds ]; @@ -22348,10 +22541,10 @@ with self; { SpecioLibraryPathTiny = buildPerlPackage { pname = "Specio-Library-Path-Tiny"; - version = "0.04"; + version = "0.05"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Specio-Library-Path-Tiny-0.04.tar.gz"; - hash = "sha256-72gT6or1FyQwREmZjbIeoqk7JYJVSet50/HpFx/qzjM="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Specio-Library-Path-Tiny-0.05.tar.gz"; + hash = "sha256-YN8Lubza6yxmoHi/bfmVTqT5Qz1stoCImULlQsfCelE="; }; propagatedBuildInputs = [ PathTiny Specio ]; buildInputs = [ Filepushd TestFatal ]; @@ -22499,13 +22692,13 @@ with self; { SQLSplitStatement = buildPerlPackage { pname = "SQL-SplitStatement"; - version = "1.00020"; + version = "1.00023"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EM/EMAZEP/SQL-SplitStatement-1.00020.tar.gz"; - hash = "sha256-93ww9E2HFY2C9lTp+pTTmlD994WcWn+9WBMnRmYhDy8="; + url = "mirror://cpan/authors/id/V/VE/VEESH/SQL-SplitStatement-1.00023.tar.gz"; + hash = "sha256-GnSEIM0q00HCUk7xGFt273Fylp8XqeS6tvQ3bw3p814="; }; - buildInputs = [ TestException ]; - propagatedBuildInputs = [ ClassAccessor ListMoreUtils RegexpCommon SQLTokenizer ]; + buildInputs = [ TestDifferences TestException ]; + propagatedBuildInputs = [ ClassAccessor ListMoreUtils RegexpCommon ]; meta = { description = "Split any SQL code into atomic statements"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -22543,10 +22736,10 @@ with self; { SQLTranslator = buildPerlPackage { pname = "SQL-Translator"; - version = "1.62"; + version = "1.63"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/SQL-Translator-1.62.tar.gz"; - hash = "sha256-Cs1P+aw6L41dZxmarALNwSfgOIjkecUce73CG4XBziQ="; + url = "mirror://cpan/authors/id/V/VE/VEESH/SQL-Translator-1.63.tar.gz"; + hash = "sha256-WIWwTJNJi+MqGX3JcjlHUdXeYJNBiTqWZW3oikJgMTM="; }; buildInputs = [ FileShareDirInstall JSONMaybeXS TestDifferences TestException XMLWriter YAML ]; propagatedBuildInputs = [ CarpClan DBI FileShareDir Moo PackageVariant ParseRecDescent TryTiny GraphViz GD ]; @@ -22615,10 +22808,10 @@ with self; { Starman = buildPerlModule { pname = "Starman"; - version = "0.4015"; + version = "0.4017"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4015.tar.gz"; - hash = "sha256-EPUJe8o5pDJ/9uaec/B2CdOmWaeJa+OWS0nMJBKxM/g="; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4017.tar.gz"; + hash = "sha256-b/q5FfMj9gCJ4+v4Urm5cH1pFyZt+K/XNw+sBL/f7k4="; }; buildInputs = [ LWP ModuleBuildTiny TestRequires TestTCP ]; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; @@ -22678,10 +22871,10 @@ with self; { StatisticsDescriptive = buildPerlModule { pname = "Statistics-Descriptive"; - version = "3.0800"; + version = "3.0801"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0800.tar.gz"; - hash = "sha256-sE7e6ia/7UNapgKZVnmMKB9/UtRUXz9Fsq1ElU6W+Tk="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0801.tar.gz"; + hash = "sha256-BHtwpj/cqpFhaOD/LVjhVeDrvGjtTMvXOnIT3KMCj2U="; }; propagatedBuildInputs = [ ListMoreUtils ]; meta = { @@ -22759,6 +22952,19 @@ with self; { }; }; + StringBinaryInterpolation = buildPerlPackage { + pname = "String-Binary-Interpolation"; + version = "1.0.0"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/String-Binary-Interpolation-1.0.0.tar.gz"; + hash = "sha256-2lXYmCTBrdniqpWP8OpILyaCLkJI7TOo1rT7vXdYivE="; + }; + meta = { + description = "Make it easier to interpolate binary bytes into a string"; + license = with lib.licenses; [ artistic2 gpl2Only ]; + }; + }; + StringCamelCase = buildPerlPackage { pname = "String-CamelCase"; version = "0.04"; @@ -22787,10 +22993,10 @@ with self; { StringCRC32 = buildPerlPackage { pname = "String-CRC32"; - version = "2"; + version = "2.100"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEEJO/String-CRC32-2.tar.gz"; - hash = "sha256-7bf+rlDsn9cSV9j7IeH+1/9N/jDXmLGvIm0q96a92S0="; + url = "mirror://cpan/authors/id/L/LE/LEEJO/String-CRC32-2.100.tar.gz"; + hash = "sha256-lwYJOy0Gi2cV01tMWPUVWON5YAgyAhKfuwClfhmnRxM="; }; meta = { description = "Perl interface for cyclic redundancy check generation"; @@ -22823,10 +23029,10 @@ with self; { StringErrf = buildPerlPackage { pname = "String-Errf"; - version = "0.008"; + version = "0.009"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Errf-0.008.tar.gz"; - hash = "sha256-rhNveD2sZYeuotItZOwgUnIVOoP5VLB1dm49KYpO1ts="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Errf-0.009.tar.gz"; + hash = "sha256-4f7b+bT9ZLZOqBA43bdqTGzYX12xW8IfEGVqKYNJ3B8="; }; buildInputs = [ JSONMaybeXS TimeDate ]; propagatedBuildInputs = [ StringFormatter ]; @@ -22852,10 +23058,10 @@ with self; { StringFlogger = buildPerlPackage { pname = "String-Flogger"; - version = "1.101245"; + version = "1.101246"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Flogger-1.101245.tar.gz"; - hash = "sha256-qgPAjgH4AqNYwXXGCTwCrflohlmgh6jd79w+nO9yZAs="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Flogger-1.101246.tar.gz"; + hash = "sha256-FfhJHgeBi7PPqfa9Oqv2QwuptOMJ8YEUNYvj2Bv/Og8="; }; propagatedBuildInputs = [ JSONMaybeXS SubExporter ]; meta = { @@ -22880,10 +23086,10 @@ with self; { StringFormatter = buildPerlPackage { pname = "String-Formatter"; - version = "0.102084"; + version = "1.235"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Formatter-0.102084.tar.gz"; - hash = "sha256-gzVBEv0MZt8eEuAi33XvvzDr20NYHACJfIbsHDOonFY="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Formatter-1.235.tar.gz"; + hash = "sha256-CCNqkTuRHOZSzwhZjnwH0t8/Np/Ee/QBpIWlBKFmB4M="; }; propagatedBuildInputs = [ SubExporter ]; meta = { @@ -22894,10 +23100,10 @@ with self; { StringInterpolate = buildPerlPackage { pname = "String-Interpolate"; - version = "0.32"; + version = "0.33"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/String-Interpolate-0.32.tar.gz"; - hash = "sha256-xynYmEj1WjV7z5e3m3i2uSsmPkw8knR+fe02Of5d3JU="; + url = "mirror://cpan/authors/id/N/NE/NEILB/String-Interpolate-0.33.tar.gz"; + hash = "sha256-qH7Qk4kH0xr32qltc6BjL1xko40d4N6HxLRCWDEpxBM="; }; meta = { # https://metacpan.org/pod/String::Interpolate @@ -22937,10 +23143,10 @@ with self; { StringRandom = buildPerlModule { pname = "String-Random"; - version = "0.31"; + version = "0.32"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/String-Random-0.31.tar.gz"; - hash = "sha256-S0rR7mOix9xwkSrBuQRyNamdjwmkdEcZkgEwM4erl1w="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/String-Random-0.32.tar.gz"; + hash = "sha256-nZPGeaNP+ibTtPoIN8rtHNLmfXZXKBi5HpfepzRwUkY="; }; meta = { description = "Perl module to generate random strings based on a pattern"; @@ -22950,10 +23156,10 @@ with self; { StringRewritePrefix = buildPerlPackage { pname = "String-RewritePrefix"; - version = "0.008"; + version = "0.009"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/String-RewritePrefix-0.008.tar.gz"; - hash = "sha256-5Fox1pFOj1/HIu9I2IGUANr8AhBeDGFBSqu/AbziCOs="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/String-RewritePrefix-0.009.tar.gz"; + hash = "sha256-RJGL7JalSvjKN8qJfkNnCewoSgeyhRbvPM5GZoaWRtU="; }; propagatedBuildInputs = [ SubExporter ]; meta = { @@ -23051,10 +23257,10 @@ with self; { StringTruncate = buildPerlPackage { pname = "String-Truncate"; - version = "1.100602"; + version = "1.100603"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Truncate-1.100602.tar.gz"; - hash = "sha256-qqPU7sARNpIUhBORM+t11cVx/lGwrTKfCJ5tRpojX24="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Truncate-1.100603.tar.gz"; + hash = "sha256-q0VgLM4t2VFe37sublzeGc3VSY1hojr9jEbB8R+O7GI="; }; propagatedBuildInputs = [ SubExporter ]; meta = { @@ -23081,10 +23287,10 @@ with self; { StringUtil = buildPerlModule { pname = "String-Util"; - version = "1.31"; + version = "1.34"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BA/BAKERSCOT/String-Util-1.31.tar.gz"; - hash = "sha256-+7yafqQMgylOBCuzud6x71LMkaDUgye1RC4cT4Df0m0="; + url = "mirror://cpan/authors/id/B/BA/BAKERSCOT/String-Util-1.34.tar.gz"; + hash = "sha256-MZzozWZTQeVlIfoVXZYqGTKOkNn3A2dlklzN4mclxGk="; }; buildInputs = [ ModuleBuildTiny ]; meta = { @@ -23098,12 +23304,12 @@ with self; { StructDumb = buildPerlModule { pname = "Struct-Dumb"; - version = "0.12"; + version = "0.14"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Struct-Dumb-0.12.tar.gz"; - hash = "sha256-Us5wxDPmlirRwg6eKXpTkeC3SkRSD7zi5IL1RONlf3M="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Struct-Dumb-0.14.tar.gz"; + hash = "sha256-E8FIU2sQ4oxuC04TLynkym5ptXSQWcRBV6J+hKVFlDY="; }; - buildInputs = [ TestFatal ]; + buildInputs = [ Test2Suite ]; meta = { description = "Make simple lightweight record-like structures"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -23112,10 +23318,10 @@ with self; { SubExporter = buildPerlPackage { pname = "Sub-Exporter"; - version = "0.987"; + version = "0.990"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-0.987.tar.gz"; - hash = "sha256-VDyy6AOrkT1EJyx9pqcLtiwZ5GfzsSqqxMlSMlmwg9Y="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-0.990.tar.gz"; + hash = "sha256-vGTsWgaGX5zGdiFcBqlEizoMizl0/7I6JPjirQkFRPw="; }; propagatedBuildInputs = [ DataOptList ]; meta = { @@ -23127,10 +23333,10 @@ with self; { SubExporterForMethods = buildPerlPackage { pname = "Sub-Exporter-ForMethods"; - version = "0.100052"; + version = "0.100055"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-ForMethods-0.100052.tar.gz"; - hash = "sha256-Qh+7pPb/zxPEM18sIGMNcJ5vplnAdUXQlNvFpVitMAY="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-ForMethods-0.100055.tar.gz"; + hash = "sha256-eR9CA7p8D32DgLwBvsICFffIvHDX7QPlUu7kRUGr6U4="; }; buildInputs = [ namespaceautoclean ]; propagatedBuildInputs = [ SubExporter SubName ]; @@ -23143,10 +23349,10 @@ with self; { SubExporterGlobExporter = buildPerlPackage { pname = "Sub-Exporter-GlobExporter"; - version = "0.005"; + version = "0.006"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-GlobExporter-0.005.tar.gz"; - hash = "sha256-L8Re7+beB80/2K+eeZxpf701oC7NW/m82MlM77bbemM="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-GlobExporter-0.006.tar.gz"; + hash = "sha256-3nQ/CAJnAcKmoiKotBxM3CVLGkr+fvmJh806ukzlJpY="; }; propagatedBuildInputs = [ SubExporter ]; meta = { @@ -23172,13 +23378,13 @@ with self; { SubHandlesVia = buildPerlPackage { pname = "Sub-HandlesVia"; - version = "0.016"; + version = "0.050000"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOBYINK/Sub-HandlesVia-0.016.tar.gz"; - hash = "sha256-ad7USuVHJAJ0AWZ0dsivJoqQCvTqYEf/RPKDvF4s+dU="; + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Sub-HandlesVia-0.050000.tar.gz"; + hash = "sha256-Lfk0k+L56VvleblQtuGf9ST5TIBhOq3AOohhHf91eU8="; }; - propagatedBuildInputs = [ ClassMethodModifiers ClassTiny RoleTiny ScalarListUtils TypeTiny ]; - buildInputs = [ TestFatal TestRequires ]; + propagatedBuildInputs = [ ClassMethodModifiers RoleHooks RoleTiny TypeTiny ]; + buildInputs = [ TestFatal TestRequires TryTiny ]; meta = { description = "Alternative handles_via implementation"; homepage = "https://metacpan.org/release/Sub-HandlesVia"; @@ -23215,10 +23421,10 @@ with self; { SubInstall = buildPerlPackage { pname = "Sub-Install"; - version = "0.928"; + version = "0.929"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.928.tar.gz"; - hash = "sha256-YeVnp2eViIh7e4bUJ7xHbqbXf//n4NF9ZA+JAH2Y7w8="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.929.tar.gz"; + hash = "sha256-gLHigdjNOysx2scR9cihZXqHzYC75przkkvL605dsHc="; }; meta = { description = "Install subroutines into packages easily"; @@ -23229,10 +23435,10 @@ with self; { SubName = buildPerlPackage { pname = "Sub-Name"; - version = "0.26"; + version = "0.27"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Sub-Name-0.26.tar.gz"; - hash = "sha256-LS8taX1RbIlUfnxDB/HnlEFkHK4sc5XnMZswbTkN8QU="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Sub-Name-0.27.tar.gz"; + hash = "sha256-7PNvuhxHypPh2qOUlo7TnEGGhnRZ2c0XPEIeK5cgQ+g="; }; buildInputs = [ BC DevelCheckBin ]; meta = { @@ -23258,10 +23464,10 @@ with self; { SubQuote = buildPerlPackage { pname = "Sub-Quote"; - version = "2.006006"; + version = "2.006008"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-2.006006.tar.gz"; - hash = "sha256-bk4q9COI+m0mCeDoJBfefMa+RyI/V2WSxlbHPHUk2J0="; + url = "mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-2.006008.tar.gz"; + hash = "sha256-lL69UAr1V2LoPqLyvFlNh6+CgHI3DHEQxgwjioANFbI="; }; buildInputs = [ TestFatal ]; meta = { @@ -23433,11 +23639,12 @@ with self; { SyntaxKeywordTry = buildPerlModule { pname = "Syntax-Keyword-Try"; - version = "0.27"; + version = "0.29"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Syntax-Keyword-Try-0.27.tar.gz"; - hash = "sha256-JG4bAz4/8i/VQgVQ1Lbg1WtDjNy7nTXL6LG1uhV03iM="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Syntax-Keyword-Try-0.29.tar.gz"; + hash = "sha256-zDIHGdNgjaqVFHQ6Q9rCvpnLjM2Ymx/vooUpDLHVnY8="; }; + buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ XSParseKeyword ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; meta = { @@ -23560,10 +23767,10 @@ with self; { SystemCommand = buildPerlPackage { pname = "System-Command"; - version = "1.121"; + version = "1.122"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOOK/System-Command-1.121.tar.gz"; - hash = "sha256-Q95ezSDB2kbopvT86rKeBGl6KJCpm/apGzygBKRookE="; + url = "mirror://cpan/authors/id/B/BO/BOOK/System-Command-1.122.tar.gz"; + hash = "sha256-2bgjsmYZqmn3oGFmUKeBDolajfBi3p0iQNZdvlz+dHo="; }; propagatedBuildInputs = [ IPCRun ]; buildInputs = [ PodCoverageTrustPod TestCPANMeta TestPod TestPodCoverage ]; @@ -23595,10 +23802,10 @@ with self; { TAPParserSourceHandlerpgTAP = buildPerlModule { pname = "TAP-Parser-SourceHandler-pgTAP"; - version = "3.35"; + version = "3.36"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/TAP-Parser-SourceHandler-pgTAP-3.35.tar.gz"; - hash = "sha256-hO45b6fOw9EfD172hB1f6wl80Mz8ACAMPs2zQM8YpZg="; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/TAP-Parser-SourceHandler-pgTAP-3.36.tar.gz"; + hash = "sha256-B75RUy4GPqxu2OWBUFRw7ryB1VBkQa8tzzK8Dr7pjGc="; }; doCheck = !stdenv.isDarwin; meta = { @@ -23707,10 +23914,10 @@ with self; { TclpTk = buildPerlPackage { pname = "Tcl-pTk"; - version = "1.10"; + version = "1.11"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CA/CAC/Tcl-pTk-1.10.tar.gz"; - hash = "sha256-sMb4KXzTL7KhkF17OSbWMb8p+iM/jYTNHtb+2J85/QQ="; + url = "mirror://cpan/authors/id/C/CA/CAC/Tcl-pTk-1.11.tar.gz"; + hash = "sha256-05PxKxzN7I8ZbN27WJHZSEx5qpQQWmN22f+cRg2CDN0="; }; propagatedBuildInputs = [ ClassISA @@ -23822,10 +24029,10 @@ with self; { TemplateTiny = buildPerlPackage { pname = "Template-Tiny"; - version = "1.12"; + version = "1.14"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AD/ADAMK/Template-Tiny-1.12.tar.gz"; - hash = "sha256-Bz4GLGMLUd+3Jc1khaMpFVy3LVxZboy2mOtnxFZvCko="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Template-Tiny-1.14.tar.gz"; + hash = "sha256-gZz6tgREg8/ijOsof938MXaiAlsbbw6YCy3MJtImm0w="; }; meta = { description = "Template Toolkit reimplemented in as little code as possible"; @@ -23881,10 +24088,10 @@ with self; { TermProgressBar = buildPerlPackage { pname = "Term-ProgressBar"; - version = "2.22"; + version = "2.23"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MANWAR/Term-ProgressBar-2.22.tar.gz"; - hash = "sha256-JkLsylsLA4wUgSvK06lhH/eRHcWckQTSIHl/g3qIDEk="; + url = "mirror://cpan/authors/id/M/MA/MANWAR/Term-ProgressBar-2.23.tar.gz"; + hash = "sha256-3vwD+59KwcnfE1nTEr/zwIZd3vvzq6ZM1CppqGIV1J0="; }; buildInputs = [ CaptureTiny TestException TestWarnings ]; propagatedBuildInputs = [ ClassMethodMaker TermReadKey ]; @@ -23956,10 +24163,10 @@ with self; { TermReadLineGnu = buildPerlPackage { pname = "Term-ReadLine-Gnu"; - version = "1.36"; + version = "1.46"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.36.tar.gz"; - hash = "sha256-mgj3pAE8m4ZVQcENu6EhB3nrkSi5YSULdG0mcCuraSU="; + url = "mirror://cpan/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.46.tar.gz"; + hash = "sha256-sTgyEy5QNmw0/qwSzoKDfAqds0ylMK5dJ9uXz5yWTHs="; }; buildInputs = [ pkgs.readline pkgs.ncurses ]; NIX_CFLAGS_LINK = "-lreadline -lncursesw"; @@ -24021,10 +24228,10 @@ with self; { TermShell = buildPerlModule { pname = "Term-Shell"; - version = "0.12"; + version = "0.13"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Term-Shell-0.12.tar.gz"; - hash = "sha256-fWz1ecALZUDC2x2Sl8rXTuCzgP4B/9OPjm1uTM47Pdc="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Term-Shell-0.13.tar.gz"; + hash = "sha256-U6C9smVokcUIpHDZPLfhz+qzjuqeWClWCn2LX2APa/I="; }; propagatedBuildInputs = [ TermReadKey TextAutoformat ]; meta = { @@ -24076,10 +24283,10 @@ with self; { TermTable = buildPerlPackage { pname = "Term-Table"; - version = "0.015"; + version = "0.017"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/Term-Table-0.015.tar.gz"; - hash = "sha256-2KGLKAH5Hw5ddHFHznhpZKdvkdGFaGUpCKPcBqm5SNU="; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Term-Table-0.017.tar.gz"; + hash = "sha256-8R20JorYBE9uGhrJU0ygzTrXecQAb/83+uUA25j6yRo="; }; propagatedBuildInputs = [ Importer ]; meta = { @@ -24103,10 +24310,10 @@ with self; { TermUI = buildPerlPackage { pname = "Term-UI"; - version = "0.46"; + version = "0.50"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/Term-UI-0.46.tar.gz"; - hash = "sha256-kZRsgNf0qrDKS/7cO74KdbN8qxopvXvKOzt0VtQX6aY="; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Term-UI-0.50.tar.gz"; + hash = "sha256-YL/dbUwVi4jTcBM/xlsgSFo2pFsS2QYAC4HHjKUkFj0="; }; propagatedBuildInputs = [ LogMessageSimple ]; meta = { @@ -24158,14 +24365,15 @@ with self; { Test2Harness = buildPerlPackage { pname = "Test2-Harness"; - version = "1.000152"; + version = "1.000155"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Harness-1.000152.tar.gz"; - hash = "sha256-iIqWAdvTPuuaSTcdZmK7JE8Ad/QJlM4gvJClvlSRqls="; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Harness-1.000155.tar.gz"; + hash = "sha256-Hvi/euDKALaHu24RXzq4yVBI5ICsmuUylzabxpSkc4s="; }; checkPhase = '' patchShebangs ./t ./scripts/yath + export AUTOMATED_TESTING=1 ./scripts/yath test -j $NIX_BUILD_CORES ''; @@ -24225,10 +24433,10 @@ with self; { Test2Suite = buildPerlPackage { pname = "Test2-Suite"; - version = "0.000155"; + version = "0.000156"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000155.tar.gz"; - hash = "sha256-x45rxNabwJeDaXaGM4K1K54MMe4YUGbOYMVL10uq1T0="; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000156.tar.gz"; + hash = "sha256-vzgq5y86k79+02iFEY+uL/qw/xF3Q/WQON8lTv7yyU4="; }; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; meta = { @@ -24273,10 +24481,10 @@ with self; { TestAbortable = buildPerlPackage { pname = "Test-Abortable"; - version = "0.002"; + version = "0.003"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Abortable-0.002.tar.gz"; - hash = "sha256-l5C3+bl2mOosUwQ2xgkMJRGcb1vS9w14r8SZIsPwJ20="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Abortable-0.003.tar.gz"; + hash = "sha256-TVPDXvPLf5wXUrqfEdOpeiETt9hMJg6rj5p8G4Aba40="; }; propagatedBuildInputs = [ SubExporter ]; buildInputs = [ TestNeeds ]; @@ -24379,10 +24587,10 @@ with self; { TestClass = buildPerlPackage { pname = "Test-Class"; - version = "0.50"; + version = "0.52"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Class-0.50.tar.gz"; - hash = "sha256-CZFU7YyvP/l8cSN/q5UiZKwcA9knBzelYHHKvmWZE1A="; + url = "mirror://cpan/authors/id/S/SZ/SZABGAB/Test-Class-0.52.tar.gz"; + hash = "sha256-QMGx04jwqGdHacJ1KfDMNjTKD9nY9ysZbAUxYRk0vII="; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ MROCompat ModuleRuntime TryTiny ]; @@ -24453,10 +24661,10 @@ with self; { TestCompile = buildPerlModule { pname = "Test-Compile"; - version = "2.4.1"; + version = "3.3.1"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v2.4.1.tar.gz"; - hash = "sha256-VqejRZ213g+SQZApzxtNUcRN0C1GkM/zxO7fZm9tjUY="; + url = "mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v3.3.1.tar.gz"; + hash = "sha256-gIRQ89Ref0GapNZo4pgodonp6jY4hpO/8YDXhwzj5iE="; }; propagatedBuildInputs = [ UNIVERSALrequire ]; meta = { @@ -24510,10 +24718,10 @@ with self; { TestDeep = buildPerlPackage { pname = "Test-Deep"; - version = "1.130"; + version = "1.204"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.130.tar.gz"; - hash = "sha256-QGT0lPX2JYfQrlAcpDkQWCHuWEbGh9xlAyM/VTAKfFY="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.204.tar.gz"; + hash = "sha256-tlkfbM3YU8fvyf88V1Y3BAMhHP/kYEfwgrHNFhGoTl8="; }; meta = { description = "Extremely flexible deep comparison"; @@ -24554,6 +24762,21 @@ with self; { }; }; + TestDiagINC = buildPerlPackage { + pname = "Test-DiagINC"; + version = "0.010"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-DiagINC-0.010.tar.gz"; + hash = "sha256-W8uNNWxQnjWdU9hpwH79qo/uXWz5mJcBi5qRTOshIi4="; + }; + buildInputs = [ CaptureTiny ]; + meta = { + homepage = "https://github.com/dagolden/Test-DiagINC"; + description = "List modules and versions loaded if tests fail"; + license = lib.licenses.asl20; + }; + }; + TestDir = buildPerlPackage { pname = "Test-Dir"; version = "1.16"; @@ -24569,10 +24792,10 @@ with self; { TestDifferences = buildPerlPackage { pname = "Test-Differences"; - version = "0.67"; + version = "0.70"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.67.tar.gz"; - hash = "sha256-yI27tIuTSwaShIdPM6u6qkOKoxIEqj+nO/wvSurIeNo="; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.70.tar.gz"; + hash = "sha256-vuG1GGqpuif+0r8bBnRSDQvQzQUdkTOH+QhsH5SlaFQ="; }; propagatedBuildInputs = [ CaptureTiny TextDiff ]; meta = { @@ -24672,10 +24895,10 @@ with self; { TestFatal = buildPerlPackage { pname = "Test-Fatal"; - version = "0.016"; + version = "0.017"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.016.tar.gz"; - hash = "sha256-coPUMPK6IDC4zZea4wOdPxsuw93hoRymrgn5kqZveI8="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.017.tar.gz"; + hash = "sha256-N9//2vuEt2Lv6WsC+yqkHzcCbHPmuDWQ23YilpfzxKY="; }; propagatedBuildInputs = [ TryTiny ]; meta = { @@ -24699,12 +24922,12 @@ with self; { }; }; - TestFileContents = buildPerlModule { + TestFileContents = buildPerlPackage { pname = "Test-File-Contents"; - version = "0.23"; + version = "0.242"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/Test-File-Contents-0.23.tar.gz"; - hash = "sha256-zW+t+5ELNLS1OZH/Ix2tmZKcqIUKvsOtDigQxL17Hz0="; + url = "mirror://cpan/authors/id/A/AR/ARISTOTLE/Test-File-Contents-0.242.tar.gz"; + hash = "sha256-qDisC29uEOiWE7UMphdzzbqbpHh7qC57tl2q9whKpQs="; }; propagatedBuildInputs = [ TextDiff ]; meta = { @@ -24757,6 +24980,20 @@ with self; { }; }; + TestFutureIOImpl = buildPerlModule { + pname = "Test-Future-IO-Impl"; + version = "0.14"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PEVANS/Test-Future-IO-Impl-0.14.tar.gz"; + hash = "sha256-AH22GdPUljQyXFbvvKDh5Vdt0z95RV8t6llb5u344jU="; + }; + propagatedBuildInputs = [ Test2Suite ]; + meta = { + description = "Acceptance tests for C<Future::IO> implementations"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestHarnessStraps = buildPerlModule { pname = "Test-Harness-Straps"; version = "0.30"; @@ -24875,10 +25112,10 @@ with self; { TestLeakTrace = buildPerlPackage { pname = "Test-LeakTrace"; - version = "0.16"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEEJO/Test-LeakTrace-0.16.tar.gz"; - hash = "sha256-Xwie7ZFfHsjHQ/bSd3w+zQygHfL3ueEAONMWlSWD5AM="; + url = "mirror://cpan/authors/id/L/LE/LEEJO/Test-LeakTrace-0.17.tar.gz"; + hash = "sha256-d31k0pOPXqWGMA7vl+8D6stD1MGFPJw7EJHrMxFGeXA="; }; meta = { description = "Traces memory leaks"; @@ -25016,10 +25253,10 @@ with self; { TestMockModule = buildPerlModule { pname = "Test-MockModule"; - version = "0.175.0"; + version = "0.177.0"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-v0.175.0.tar.gz"; - hash = "sha256-B7KE1xPdgs7RtCxgzLFiGjx3xUshsTuGlKdZRcBF7v4="; + url = "mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-v0.177.0.tar.gz"; + hash = "sha256-G9p6SdzqdgdtQKe2psPz4V5rGchLYXHfRFNNkROPEEU="; }; propagatedBuildInputs = [ SUPER ]; buildInputs = [ TestWarnings ]; @@ -25118,10 +25355,10 @@ with self; { TestMost = buildPerlPackage { pname = "Test-Most"; - version = "0.37"; + version = "0.38"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.37.tar.gz"; - hash = "sha256-UzNwFB658Yz0rDgPbe0qtXgCpuGEAIqA/SMEv8xHT8c="; + url = "mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.38.tar.gz"; + hash = "sha256-CJ64lPe6zkw3xjNODikOsgM47hAiOvDILL5ygceDgt8="; }; propagatedBuildInputs = [ ExceptionClass ]; buildInputs = [ TestDeep TestDifferences TestException TestWarn ]; @@ -25150,10 +25387,10 @@ with self; { TestNeeds = buildPerlPackage { pname = "Test-Needs"; - version = "0.002006"; + version = "0.002010"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Test-Needs-0.002006.tar.gz"; - hash = "sha256-d/n/8MlsXgnzTQQWs1M8Mxn3zQux9/6PgHKtWfQz8OU="; + url = "mirror://cpan/authors/id/H/HA/HAARG/Test-Needs-0.002010.tar.gz"; + hash = "sha256-kj/9x4/LqWYJdT5LriawugGGiT3kpjzVI24BLHyQ4gg="; }; meta = { description = "Skip tests when modules not available"; @@ -25177,10 +25414,10 @@ with self; { TestNoWarnings = buildPerlPackage { pname = "Test-NoWarnings"; - version = "1.04"; + version = "1.06"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AD/ADAMK/Test-NoWarnings-1.04.tar.gz"; - hash = "sha256-Y4pXZYyxGa8f5bFec9R8JUTc/vhK8Maxsul/CCAraGw="; + url = "mirror://cpan/authors/id/H/HA/HAARG/Test-NoWarnings-1.06.tar.gz"; + hash = "sha256-wtxRFDt+tjIxIQ4n3yDSyDk3cuCjM1R+yLeiBe1i9zc="; }; meta = { description = "Make sure you didn't emit any warnings while testing"; @@ -25203,10 +25440,10 @@ with self; { TestOutput = buildPerlPackage { pname = "Test-Output"; - version = "1.031"; + version = "1.034"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-Output-1.031.tar.gz"; - hash = "sha256-+LjzcYVxeHJyfQb2wHj6d9t5RBD68vbaTTewt2UPfqQ="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-Output-1.034.tar.gz"; + hash = "sha256-zULigBwNK0gtGMn7SwbHVwVIGLy7KCTl378zrXo9aaA="; }; propagatedBuildInputs = [ CaptureTiny ]; meta = { @@ -25246,10 +25483,10 @@ with self; { TestPerlTidy = buildPerlModule rec { pname = "Test-PerlTidy"; - version = "20200930"; + version = "20230226"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-PerlTidy-${version}.tar.gz"; - hash = "sha256-n29omXRe17bNtREFsJSUp/ohdVBMxAgWrkYGfUp0V7Y="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-PerlTidy-20230226.tar.gz"; + hash = "sha256-wOJCEQeVeV1Nu2xEFmzlV09cftuninidG8rnZoXYA8E="; }; propagatedBuildInputs = [ PathTiny PerlTidy TextDiff ]; buildInputs = [ TestPerlCritic ]; @@ -25406,10 +25643,10 @@ with self; { TestRoutine = buildPerlPackage { pname = "Test-Routine"; - version = "0.027"; + version = "0.031"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Routine-0.027.tar.gz"; - hash = "sha256-utQOEupgikPogy9W5BqLSfNmN7L5wz3pQcdfsUEY01g="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Routine-0.031.tar.gz"; + hash = "sha256-f9kp7TPyVMoJkCJQGSYInHeU71d7uoYHbn2YFlYPXAc="; }; buildInputs = [ TestAbortable TestFatal ]; propagatedBuildInputs = [ Moose namespaceautoclean ]; @@ -25555,10 +25792,10 @@ with self; { TestScript = buildPerlPackage { pname = "Test-Script"; - version = "1.26"; + version = "1.29"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/Test-Script-1.26.tar.gz"; - hash = "sha256-bUIjeuzi8NxB+mZTN5V0Z0BhhI8CCs1NY962uBtac7c="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Test-Script-1.29.tar.gz"; + hash = "sha256-iS5+bB6nsWcQkJlCz1wL2rcO7i79SqnBbqlS4rkPiVA="; }; buildInputs = [ Test2Suite ]; @@ -25658,10 +25895,10 @@ with self; { TestSynopsis = buildPerlPackage { pname = "Test-Synopsis"; - version = "0.16"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZO/ZOFFIX/Test-Synopsis-0.16.tar.gz"; - hash = "sha256-GxPsc7z3JGLAYPiBlJFETXRz8+qK60wO2CgmPu0OCSU="; + url = "mirror://cpan/authors/id/Z/ZO/ZOFFIX/Test-Synopsis-0.17.tar.gz"; + hash = "sha256-0mjJizPS+hTbsisg1lYbq0ie6CWH374ZrSd2IMe4tt4="; }; meta = { description = "Test your SYNOPSIS code"; @@ -25730,10 +25967,10 @@ with self; { TestTime = buildPerlPackage { pname = "Test-Time"; - version = "0.08"; + version = "0.092"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SA/SATOH/Test-Time-0.08.tar.gz"; - hash = "sha256-uLw7B0uyJH6FiDmcHlXQcfBJz2zhyLQZLDjPPCRVlUg="; + url = "mirror://cpan/authors/id/A/AN/ANATOFUZ/Test-Time-0.092.tar.gz"; + hash = "sha256-MNkPVM6ECJPHuiysKk0e7NTJzfgFkQxZXjronf1kRzg="; }; meta = { description = "Overrides the time() and sleep() core functions for testing"; @@ -25757,11 +25994,12 @@ with self; { TestTrailingSpace = buildPerlModule { pname = "Test-TrailingSpace"; - version = "0.0600"; + version = "0.0601"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-TrailingSpace-0.0600.tar.gz"; - hash = "sha256-8J0mOt7AZwCkOiTin1SEz20pOZFMYH3sUVkPS7j6WhE="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-TrailingSpace-0.0601.tar.gz"; + hash = "sha256-q7jOdEg6Y9c/4e9gO3zgptR8mO3nMZVdc1eE+tHcT8w="; }; + buildInputs = [ FileTreeCreate ]; propagatedBuildInputs = [ FileFindObjectRule ]; meta = { description = "Test for trailing space in source files"; @@ -25785,10 +26023,10 @@ with self; { TestWarn = buildPerlPackage { pname = "Test-Warn"; - version = "0.36"; + version = "0.37"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.36.tar.gz"; - hash = "sha256-7LyjRtN5zvjTwOSsDI6zsmE9c3/6rq5SJxw41788bNo="; + url = "mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.37.tar.gz"; + hash = "sha256-mMoy5/L16om4v7mgYJl389FT4kLi5RcFEmy5VPGga1c="; }; propagatedBuildInputs = [ SubUplevel ]; meta = { @@ -25799,10 +26037,10 @@ with self; { TestWarnings = buildPerlPackage { pname = "Test-Warnings"; - version = "0.030"; + version = "0.032"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.030.tar.gz"; - hash = "sha256-iaSUfd8VZK4BEiJ1WEQz1/bENwNwvPN2iSLXlpVq4k8="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.032.tar.gz"; + hash = "sha256-Ryfa4kFunwfkHi3DqRQ7pq/8HsV2UhF8mdUAOOMT6dk="; }; buildInputs = [ CPANMetaCheck PadWalker ]; meta = { @@ -25841,10 +26079,10 @@ with self; { TestWWWMechanize = buildPerlPackage { pname = "Test-WWW-Mechanize"; - version = "1.54"; + version = "1.60"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.54.tar.gz"; - hash = "sha256-3KiLWxdBFL9apseC/58OzFDBRCuDJMEdORd1LqNDmvw="; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.60.tar.gz"; + hash = "sha256-I/1y5+0b553h0CotFfDfCTQV4Oq2/GFf9rtoh0Emhnc="; }; buildInputs = [ TestLongString ]; propagatedBuildInputs = [ CarpAssertMore HTTPServerSimple WWWMechanize ]; @@ -25902,12 +26140,12 @@ with self; { }; }; - TestXPath = buildPerlModule { + TestXPath = buildPerlPackage { pname = "Test-XPath"; - version = "0.19"; + version = "0.20"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MANWAR/Test-XPath-0.19.tar.gz"; - hash = "sha256-3vzMDBRY569dkrxzAD5oZ8Z+L6SVWqccVLOE5xEiwPM="; + url = "mirror://cpan/authors/id/M/MA/MANWAR/Test-XPath-0.20.tar.gz"; + hash = "sha256-36phHnFGrZyXabW89oiUmXa4Ny3354ekC5M6FI2JIDk="; }; propagatedBuildInputs = [ XMLLibXML ]; meta = { @@ -25979,10 +26217,10 @@ with self; { TextBalanced = buildPerlPackage { pname = "Text-Balanced"; - version = "2.04"; + version = "2.06"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHAY/Text-Balanced-2.04.tar.gz"; - hash = "sha256-9JxAi4XIC6dieFQoqHWZvtItwP1rt2XJ+m3fqjLk5+I="; + url = "mirror://cpan/authors/id/S/SH/SHAY/Text-Balanced-2.06.tar.gz"; + hash = "sha256-dz4PDyHAyyz2ZM7muij/cCWbq8yJL5tlD5y9oAvgkq0="; }; meta = { description = "Extract delimited text sequences from strings"; @@ -25992,11 +26230,11 @@ with self; { TextBibTeX = buildPerlModule { pname = "Text-BibTeX"; - version = "0.88"; + version = "0.89"; buildInputs = [ CaptureTiny ConfigAutoConf ExtUtilsLibBuilder ]; src = fetchurl { - url = "mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.88.tar.gz"; - hash = "sha256-sBRYbmi9vK+wos+gQB6woE6l3oxNW8Nt0Pf66ras9Cw="; + url = "mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.89.tar.gz"; + hash = "sha256-iKeOvwiOx1AvQBxaKxOMhiz1RYU0t3MiO786r0EiQZY="; }; # libbtparse.so: cannot open shared object file patches = [ ../development/perl-modules/TextBibTeX-use-lib.patch ]; @@ -26045,10 +26283,10 @@ with self; { TextCSV = buildPerlPackage { pname = "Text-CSV"; - version = "2.00"; + version = "2.03"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-2.00.tar.gz"; - hash = "sha256-jMvZGVgFIi2ZWEQRTQ5ZW7JM4Yj4UoTb8lYIAxHLssI="; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-2.03.tar.gz"; + hash = "sha256-SLvOnyNJNaiFlWGOBN0UFigkbWUPKnJgJN8cE34LZfs="; }; meta = { description = "Comma-separated values manipulator (using XS or PurePerl)"; @@ -26073,10 +26311,10 @@ with self; { TextCSV_XS = buildPerlPackage { pname = "Text-CSV_XS"; - version = "1.44"; + version = "1.52"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.44.tgz"; - hash = "sha256-xIEt3KjiZUc2xEvCzmCyekKKG8TVNksO0frTYJyPm8Q="; + url = "mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.52.tgz"; + hash = "sha256-5BWqcFut+Es1ncTA8MmC8b9whIHaoUdW8xNufInA5B0="; }; meta = { description = "Comma-Separated Values manipulation routines"; @@ -26214,10 +26452,10 @@ with self; { TestInter = buildPerlPackage { pname = "Test-Inter"; - version = "1.09"; + version = "1.10"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SB/SBECK/Test-Inter-1.09.tar.gz"; - hash = "sha256-Hp8SnMGgAfuVRJ04UlOzivq/W0ZuOzvTPk5DDyFuF3o="; + url = "mirror://cpan/authors/id/S/SB/SBECK/Test-Inter-1.10.tar.gz"; + hash = "sha256-cewRXqwm+2aJGb1mQLQcNzInUuvUjBx222a3O679O10="; }; buildInputs = [ FileFindRule TestPod TestPodCoverage ]; meta = { @@ -26253,12 +26491,12 @@ with self; { }; }; - TextLorem = buildPerlModule { + TextLorem = buildPerlPackage { pname = "Text-Lorem"; - version = "0.3"; + version = "0.34"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AD/ADEOLA/Text-Lorem-0.3.tar.gz"; - hash = "sha256-ZLtjb7ISExAaZGtBTsvcG1Xt+QXLzcf10kd07FBh/i0="; + url = "mirror://cpan/authors/id/A/AD/ADEOLA/Text-Lorem-0.34.tar.gz"; + hash = "sha256-DOajwZkXsjI0JKGqdC2YiwY8OUQEJ6MQGkzsbb2EcVc="; }; meta = { description = "Generate random Latin looking text"; @@ -26270,10 +26508,10 @@ with self; { TestManifest = buildPerlPackage { pname = "Test-Manifest"; - version = "2.021"; + version = "2.023"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-Manifest-2.021.tar.gz"; - hash = "sha256-pHqq1xxYDhbm5j2MA3zd3NkZh2dUvrLJXZqIaC3TMtk="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-Manifest-2.023.tar.gz"; + hash = "sha256-0k5SVT58uc2oH5L/6MkrPkNGcY5HEIAaWzW38lGnceI="; }; meta = { description = "Interact with a t/test_manifest file"; @@ -26319,10 +26557,10 @@ with self; { TestMinimumVersion = buildPerlPackage { pname = "Test-MinimumVersion"; - version = "0.101082"; + version = "0.101083"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-MinimumVersion-0.101082.tar.gz"; - hash = "sha256-P7pOj890gGJZqmOb59kOcDRq0ODkuLYZWTSQ43gkGXA="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-MinimumVersion-0.101083.tar.gz"; + hash = "sha256-MqHrzYA/oQ7vylU7w87dQ1lqdZ3Dl1revSJoiCPDauo="; }; propagatedBuildInputs = [ PerlMinimumVersion ]; meta = { @@ -26347,10 +26585,10 @@ with self; { TextMultiMarkdown = buildPerlPackage { pname = "Text-MultiMarkdown"; - version = "1.000035"; + version = "1.001"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Text-MultiMarkdown-1.000035.tar.gz"; - hash = "sha256-JGfdE3UdwpedfIgLJOdilSEw/fQqHtPuBP33LUtSZGo="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Text-MultiMarkdown-1.001.tar.gz"; + hash = "sha256-UB1ErH2lSUSZzqhR6bL7UlOAgLDB6TYjDIwm1n4EhDM="; }; buildInputs = [ ListMoreUtils TestException ]; propagatedBuildInputs = [ HTMLParser TextMarkdown ]; @@ -26377,10 +26615,10 @@ with self; { TextParsewords = buildPerlPackage { pname = "Text-ParseWords"; - version = "3.30"; + version = "3.31"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHORNY/Text-ParseWords-3.30.tar.gz"; - hash = "sha256-heAjgXndQ5l+WMZr1RYRGCvH1TNQUCmi2w0yMu2v9eg="; + url = "mirror://cpan/authors/id/N/NE/NEILB/Text-ParseWords-3.31.tar.gz"; + hash = "sha256-KuVVughNdbK4/u640aAJESdoFa2oa8yxRSI2lk1aL8c="; }; meta = { description = "Parse text into an array of tokens or array of arrays"; @@ -26546,10 +26784,10 @@ with self; { TextTable = buildPerlModule { pname = "Text-Table"; - version = "1.134"; + version = "1.135"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.134.tar.gz"; - hash = "sha256-us9Cmxi3wLIsCIIZBVBj45AnSVMdSI69exfqt3V80Qs="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.135.tar.gz"; + hash = "sha256-/KPBboMSf3xE3ePT9+PHPqUNEJoQVERd6Agv6nlMpdI="; }; propagatedBuildInputs = [ TextAligner ]; meta = { @@ -26574,10 +26812,10 @@ with self; { TextTemplate = buildPerlPackage { pname = "Text-Template"; - version = "1.59"; + version = "1.61"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.59.tar.gz"; - hash = "sha256-HdLHiMBTA+2alw4YgRCWQhUfqT4Cx6gNTHBggna6se4="; + url = "mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.61.tar.gz"; + hash = "sha256-opXqfR7yQa4mQMH3hktij45vmewU+x2ngbL18haNzwk="; }; buildInputs = [ TestMoreUTF8 TestWarnings ]; meta = { @@ -26602,10 +26840,10 @@ with self; { TestVars = buildPerlModule { pname = "Test-Vars"; - version = "0.014"; + version = "0.015"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Test-Vars-0.014.tar.gz"; - hash = "sha256-p/ehLpdx/SH8HsPePjdSJ6dL/uOye70480WkrCfAKGM="; + url = "mirror://cpan/authors/id/G/GF/GFUJI/Test-Vars-0.015.tar.gz"; + hash = "sha256-4Y3RWCcuTsmTnh37M8dDGrTnXGtAsoDDi16AT9pHGlQ="; }; buildInputs = [ ModuleBuildTiny ]; @@ -26634,10 +26872,10 @@ with self; { TextTrim = buildPerlPackage { pname = "Text-Trim"; - version = "1.03"; + version = "1.04"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJT/Text-Trim-1.03.tar.gz"; - hash = "sha256-oPz8HUbd3sQcCYggdF6DxosG/YKfc5T6NSuw1LdTSU8="; + url = "mirror://cpan/authors/id/R/RJ/RJT/Text-Trim-1.04.tar.gz"; + hash = "sha256-1YeKkHnTPNF2bParxEzWJb0AoCE9LOjjFD/mlEq6qhE="; }; meta = { description = "Remove leading and/or trailing whitespace from strings"; @@ -26779,10 +27017,10 @@ with self; { Throwable = buildPerlPackage { pname = "Throwable"; - version = "0.200013"; + version = "1.001"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Throwable-0.200013.tar.gz"; - hash = "sha256-mYfQ3rW93TUqYzDO++ky+ILjbdjIpFZLz9Ny3Dlrj6A="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Throwable-1.001.tar.gz"; + hash = "sha256-0MtenX0G1w8sxW7s+FeoOkXqykOFDc3akdP+tN3eTFE="; }; propagatedBuildInputs = [ DevelStackTrace Moo ]; meta = { @@ -26822,10 +27060,10 @@ with self; { TieCycle = buildPerlPackage { pname = "Tie-Cycle"; - version = "1.225"; + version = "1.227"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/Tie-Cycle-1.225.tar.gz"; - hash = "sha256-8zDYIWlK+bJptgg1cNXBDqIubrOyGEEEjOKCUrHAPUU="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Tie-Cycle-1.227.tar.gz"; + hash = "sha256-eDgzV5HnGjszuKGd4wUpSeGJCkgj3vY5eCPJkiL6Hdg="; }; meta = { description = "Cycle through a list of values via a scalar"; @@ -26851,10 +27089,10 @@ with self; { TieFile = buildPerlPackage { pname = "Tie-File"; - version = "1.05"; + version = "1.07"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/Tie-File-1.05.tar.gz"; - hash = "sha256-ipgLV3/0sQ/hEGLtjHdIV/qMmDPFMF8ui/szR69j8Tk="; + url = "mirror://cpan/authors/id/T/TO/TODDR/Tie-File-1.07.tar.gz"; + hash = "sha256-S1NUpB/pVBvc6lK0/VMBRPMVME0D8F3Q/vwynYHCawg="; }; meta = { description = "Access the lines of a disk file via a Perl array"; @@ -27012,10 +27250,10 @@ with self; { TimeDurationParse = buildPerlPackage { pname = "Time-Duration-Parse"; - version = "0.15"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-Parse-0.15.tar.gz"; - hash = "sha256-YdgUOo5pgcwfepdIBNSSA55eVnFnZ4KdXkvNntdK44E="; + url = "mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-Parse-0.16.tar.gz"; + hash = "sha256-EISmRj7ieQ+ZIVvXaxNcpFr+K/ppmPpv1UcLaeG6vBI="; }; buildInputs = [ TimeDuration ]; propagatedBuildInputs = [ ExporterLite ]; @@ -27028,10 +27266,10 @@ with self; { TimeLocal = buildPerlPackage { pname = "Time-Local"; - version = "1.30"; + version = "1.35"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Time-Local-1.30.tar.gz"; - hash = "sha256-x3RPaymGuUbT4s8DTfNxvuFs26/lPpRauxpULE+JIMs="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Time-Local-1.35.tar.gz"; + hash = "sha256-HRNrcb0EHL5vZsQxgO555nW3KtWjWWq9akTSEQcq2ik="; }; meta = { description = "Efficiently compute time from local and GMT time"; @@ -27191,10 +27429,10 @@ with self; { TreeDAGNode = buildPerlPackage { pname = "Tree-DAG_Node"; - version = "1.31"; + version = "1.32"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-DAG_Node-1.31.tgz"; - hash = "sha256-HIuml3JWizdYBUJHCXUSxVDv4xUXwyn7Ze73r8zJ0wQ="; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-DAG_Node-1.32.tgz"; + hash = "sha256-ItnePW5vSv2J5tglxmT5SCh4vUninLgTQqcHr0BULT0="; }; propagatedBuildInputs = [ FileSlurpTiny ]; meta = { @@ -27205,10 +27443,10 @@ with self; { TreeSimple = buildPerlPackage { pname = "Tree-Simple"; - version = "1.33"; + version = "1.34"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-1.33.tgz"; - hash = "sha256-2zrXFCjsbDI9DL8JAWkQ5bft2bbTs1RDoorYw8zilqo="; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-1.34.tgz"; + hash = "sha256-t+l5m9Iiu5TP+ZP312WYDL6hts0qql7L6tY1q99H0pw="; }; buildInputs = [ TestException ]; meta = { @@ -27219,10 +27457,10 @@ with self; { TreeSimpleVisitorFactory = buildPerlPackage { pname = "Tree-Simple-VisitorFactory"; - version = "0.15"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-VisitorFactory-0.15.tgz"; - hash = "sha256-Nn6C7OfOPioWbDjc+mYI59xxV4HpTgtTmQcMOr/awhs="; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-VisitorFactory-0.16.tgz"; + hash = "sha256-nPU4+qEsVP+0qRQ5lF5IjxhW9iuJrFByqSIRngGIDaY="; }; propagatedBuildInputs = [ TreeSimple ]; buildInputs = [ TestException ]; @@ -27234,10 +27472,10 @@ with self; { TryTiny = buildPerlPackage { pname = "Try-Tiny"; - version = "0.30"; + version = "0.31"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Try-Tiny-0.30.tar.gz"; - hash = "sha256-2lvQ1ckDUZu/ELuboMt7ysBWOIK8/kUDruP7FD7d72s="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Try-Tiny-0.31.tar.gz"; + hash = "sha256-MwDTHYpAdbJtj0bOhkodkT4OhGfO66ZlXV0rLiBsEb4="; }; buildInputs = [ CPANMetaCheck CaptureTiny ]; meta = { @@ -27263,10 +27501,10 @@ with self; { Twiggy = buildPerlPackage { pname = "Twiggy"; - version = "0.1025"; + version = "0.1026"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Twiggy-0.1025.tar.gz"; - hash = "sha256-11rfljqoFclx8PFxxpTtAI2mAWszfA0/zYdZz5edp6g="; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Twiggy-0.1026.tar.gz"; + hash = "sha256-TZHqbtmumo70MU3Cp89S6wJrNlvmg4azXqaGTfrFf54="; }; propagatedBuildInputs = [ AnyEvent Plack ]; buildInputs = [ TestRequires TestSharedFork TestTCP ]; @@ -27280,10 +27518,10 @@ with self; { TypeTiny = buildPerlPackage { pname = "Type-Tiny"; - version = "1.012000"; + version = "2.004000"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.012000.tar.gz"; - hash = "sha256-09sSIBYcKuprC4oiJcT+9Sbo275WtL/+naq8A+Lv6pA="; + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-2.004000.tar.gz"; + hash = "sha256-aX5/d17fyF9M8HeS0E/RmwnCUoX5j1k46O/E90UHoSg="; }; propagatedBuildInputs = [ ExporterTiny ]; buildInputs = [ TestMemoryCycle ]; @@ -27296,10 +27534,10 @@ with self; { TypeTinyXS = buildPerlPackage { pname = "Type-Tiny-XS"; - version = "0.022"; + version = "0.025"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-XS-0.022.tar.gz"; - hash = "sha256-vMNKMffcHTDMgDiJtcj5Dkdztztb7L2zhg9avn4i/wA="; + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-XS-0.025.tar.gz"; + hash = "sha256-mmFFDdqQKU9gbNej+kTzsaNmvNiKQZkXsFTuXiPRSL0="; }; meta = { description = "Provides an XS boost for some of Type::Tiny's built-in type constraints"; @@ -27352,10 +27590,10 @@ with self; { UNIVERSALrequire = buildPerlPackage { pname = "UNIVERSAL-require"; - version = "0.18"; + version = "0.19"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.18.tar.gz"; - hash = "sha256-sqc2qHlnoUPatYyKEQUB1SNbzdLIsqO//808C9BrOO0="; + url = "mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.19.tar.gz"; + hash = "sha256-1GfNJuBsjDsgP9O8B5aubIN6xeMQCTyCJn/134UPGgM="; }; meta = { description = "Require() modules from a variable [deprecated]"; @@ -27464,12 +27702,12 @@ with self; { URI = buildPerlPackage { pname = "URI"; - version = "5.05"; + version = "5.21"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/URI-5.05.tar.gz"; - hash = "sha256-pcET0tAnBtn73KaobykMWwWy+Gg21Of+FEfwYyYbeew="; + url = "mirror://cpan/authors/id/O/OA/OALDERS/URI-5.21.tar.gz"; + hash = "sha256-liZYYM1hveFuhBXc+/EIBW3hYsqgrDf4HraVydLgq3c="; }; - buildInputs = [ TestNeeds ]; + buildInputs = [ TestFatal TestNeeds TestWarnings ]; meta = { description = "Uniform Resource Identifiers (absolute and relative)"; homepage = "https://github.com/libwww-perl/URI"; @@ -27479,10 +27717,10 @@ with self; { URIdb = buildPerlModule { pname = "URI-db"; - version = "0.20"; + version = "0.21"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.20.tar.gz"; - hash = "sha256-FMjaFawgljG445/BJFHJsTEa0LXKX5Aye9+peLfRPxQ="; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.21.tar.gz"; + hash = "sha256-pkM9wVF6kH4YmRKkx2td/HYzLj/X/Is4oTfkAZx4CzQ="; }; propagatedBuildInputs = [ URINested ]; meta = { @@ -27540,11 +27778,12 @@ with self; { UserIdentity = buildPerlPackage { pname = "User-Identity"; - version = "1.00"; + version = "1.02"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/User-Identity-1.00.tar.gz"; - hash = "sha256-khm0Jxz+tyYzDpVkWJ6jp9tLbdb29EI3RgSN8aCOn0o="; + url = "mirror://cpan/authors/id/M/MA/MARKOV/User-Identity-1.02.tar.gz"; + hash = "sha256-OySu5/UnjGXD8EEVsHyG5kaTTpnqQJJANj8wiZE+uJk="; }; + propagatedBuildInputs = [ HashOrdered ]; meta = { description = "Collect information about a user"; homepage = "http://perl.overmeer.net/CPAN"; @@ -27612,10 +27851,10 @@ with self; { URIcpan = buildPerlPackage { pname = "URI-cpan"; - version = "1.007"; + version = "1.009"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/URI-cpan-1.007.tar.gz"; - hash = "sha256-EloTlGYuCkXiaWl3SWwdAnsUOH/245tgwH4PlurhUtM="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/URI-cpan-1.009.tar.gz"; + hash = "sha256-JFV5sCW2P1d8cndDARmEcjhxykDcNezsjq05riSkjhI="; }; propagatedBuildInputs = [ CPANDistnameInfo URI ]; meta = { @@ -27642,10 +27881,10 @@ with self; { UUID4Tiny = buildPerlPackage { pname = "UUID4-Tiny"; - version = "0.002"; + version = "0.003"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CV/CVLIBRARY/UUID4-Tiny-0.002.tar.gz"; - hash = "sha256-51NbMeOG1DLex63eIUNIOJ4dXPdT5+0H8a4ExDYIQM8="; + url = "mirror://cpan/authors/id/C/CV/CVLIBRARY/UUID4-Tiny-0.003.tar.gz"; + hash = "sha256-4S9sgrg1dcORd3O0HA+1HPeDx8bPcuDJkWks4u8Hg2I="; }; postPatch = lib.optionalString (stdenv.isAarch64) '' # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/uapi/asm-generic/unistd.h @@ -27704,10 +27943,10 @@ with self; { Version = buildPerlPackage { pname = "version"; - version = "0.9928"; + version = "0.9930"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/version-0.9928.tar.gz"; - hash = "sha256-JA4Ujct24WVH7/hcflx/fuBBZLgbiiOhppzDfABdqo4="; + url = "mirror://cpan/authors/id/L/LE/LEONT/version-0.9930.tar.gz"; + hash = "sha256-YduVX7yzn1kC+myLlXrrJ0HiPUhA+Eq/hGrx9nCu7jA="; }; meta = { description = "Structured version objects"; @@ -27717,10 +27956,10 @@ with self; { vidir = buildPerlPackage { pname = "App-vidir"; - version = "0.050"; + version = "0.052"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WO/WOLDRICH/App-vidir-0.050.tar.gz"; - hash = "sha256-cEYIQDTAkYMTQ/S7UJMQ4pEaMl0NUG8vUlj1uZbaQ/U="; + url = "mirror://cpan/authors/id/W/WO/WOLDRICH/App-vidir-0.052.tar.gz"; + hash = "sha256-GSKQdqXxPvGe1sEbu5Bcrc4iYH+pDoXJrxqqKbWsFQo="; }; outputs = [ "out" ]; meta = { @@ -27762,10 +28001,10 @@ with self; { W3CLinkChecker = buildPerlPackage { pname = "W3C-LinkChecker"; - version = "4.81"; + version = "5.0.0"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SC/SCOP/W3C-LinkChecker-4.81.tar.gz"; - hash = "sha256-Yjn2GyDZHc57IeTU9iark6jx4vIH2lAVWQ1QjPbGamU="; + url = "mirror://cpan/authors/id/D/DH/DHM/W3C-LinkChecker-5.0.0.tar.gz"; + hash = "sha256-CvdY0ZUMswTdqvqnoDmHaHTYjC/teL2KYx6zkG5U+6Y="; }; outputs = [ "out" ]; propagatedBuildInputs = [ CGI CSSDOM ConfigGeneral LWP LocaleCodes NetIP TermReadKey ]; @@ -27786,9 +28025,9 @@ with self; { }; patches = [ (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/curl-7.71.0.patch?h=perl-www-curl&id=261d84887d736cc097abef61164339216fb79180"; - hash = "sha256-2lHV8qKZPdM/WnuvNYphCGRAq7UOTdPKH0k56iYtPMI="; - name = "WWWCurl-curl-7.71.0.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/makefile.patch?h=perl-www-curl&id=7e004bb8c5dc49c903a5d5fa5ff28c30a58e2595"; + hash = "sha256-8JZbe4IMfRZyLa118AAH/wsXrazOFy79OoH3Nuy57A4="; + name = "perl-www-curl-makefile.patch"; }) ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type"; @@ -27816,10 +28055,10 @@ with self; { WWWMechanize = buildPerlPackage { pname = "WWW-Mechanize"; - version = "2.03"; + version = "2.17"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-2.03.tar.gz"; - hash = "sha256-Px3XTfYdYVIsAnDxluzG6AxAj4xNGDW5nh/OCg2ThF4="; + url = "mirror://cpan/authors/id/S/SI/SIMBABQUE/WWW-Mechanize-2.17.tar.gz"; + hash = "sha256-nAIAPoRiHeoSyYDEEB555PjK5OOCzT2iOfqovRmPBjo="; }; propagatedBuildInputs = [ HTMLForm HTMLTree LWP ]; doCheck = false; @@ -27908,15 +28147,15 @@ with self; { }; }; - Workflow = buildPerlModule { + Workflow = buildPerlPackage { pname = "Workflow"; - version = "1.48"; + version = "1.62"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JO/JONASBN/Workflow-1.48.tar.gz"; - hash = "sha256-TgSwvHYuWYzMCwzD1N9qYfWkWzTIVQRnLPD5mmh85i8="; + url = "mirror://cpan/authors/id/J/JO/JONASBN/Workflow-1.62.tar.gz"; + hash = "sha256-WNNokAm4j+Gp2DcWfTKaoe4xTzFZeeVik2OGVFs80pU="; }; - buildInputs = [ DBDMock ListMoreUtils PodCoverageTrustPod TestException TestKwalitee TestPod TestPodCoverage ]; - propagatedBuildInputs = [ ClassAccessor ClassFactory ClassObservable DBI DataUUID DateTimeFormatStrptime FileSlurp LogDispatch LogLog4perl XMLSimple ]; + buildInputs = [ DBDMock ListMoreUtils MockMonkeyPatch PodCoverageTrustPod TestException TestKwalitee TestPod TestPodCoverage ]; + propagatedBuildInputs = [ ClassAccessor ClassFactory DateTime DBI DataUUID DateTimeFormatStrptime ExceptionClass FileSlurp LogLog4perl Readonly XMLSimple ]; meta = { description = "Simple, flexible system to implement workflows"; homepage = "https://github.com/jonasbn/perl-workflow"; @@ -28040,18 +28279,11 @@ with self; { X11XCB = buildPerlPackage { pname = "X11-XCB"; - version = "0.18"; + version = "0.20"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSTPLBG/X11-XCB-0.18.tar.gz"; - hash = "sha256-rtvML3GhEeEVcqJ8nu0qfwoh6venLQoEn0xZdjh8V7I="; + url = "mirror://cpan/authors/id/Z/ZH/ZHMYLOVE/X11-XCB-0.20.tar.gz"; + hash = "sha256-rVY5Yd4gIlVOdZHvXLjZY0ngxzdxIYXkeFBViMZ6L9I="; }; - patches = [ - # Pull upstream fix for parallel build failure - (fetchpatch { - url = "https://github.com/stapelberg/X11-XCB/commit/813608dacdae1ae35c9eb0f171a958617e014520.patch"; - hash = "sha256-gxxY8549/ebS3QORjSs8IgdBs2aD05Tu+9Bn70gu7gQ="; - }) - ]; env.AUTOMATED_TESTING = false; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.xorg.libxcb pkgs.xorg.xcbproto pkgs.xorg.xcbutil pkgs.xorg.xcbutilwm ExtUtilsDepends ExtUtilsPkgConfig TestDeep TestException XSObjectMagic ]; @@ -28240,14 +28472,17 @@ with self; { XMLLibXML = buildPerlPackage { pname = "XML-LibXML"; - version = "2.0208"; + version = "2.0209"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0208.tar.gz"; - hash = "sha256-DABrA7+NDrUx+1a9o64VdUylbYiN17noBauesZ1f1lM="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0209.tar.gz"; + hash = "sha256-tKWrvNaJqi+7yLe0UznpYcSYTkgQhJTrbCgrR0giJCU="; }; SKIP_SAX_INSTALL = 1; buildInputs = [ AlienBuild AlienLibxml2 ] ++ lib.optionals stdenv.isDarwin (with pkgs; [ libiconv zlib ]); + patches = [ + ../development/perl-modules/XML-LibXML-clang16.patch + ]; # Remove test that fails after LibXML 2.11 upgrade postPatch = '' rm t/35huge_mode.t @@ -28275,10 +28510,10 @@ with self; { XMLLibXSLT = buildPerlPackage { pname = "XML-LibXSLT"; - version = "1.99"; + version = "2.002001"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXSLT-1.99.tar.gz"; - hash = "sha256-En4XqHf7YeR7nouHv42q0xM5pioAEh+XUdUitDiw9/A="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXSLT-2.002001.tar.gz"; + hash = "sha256-34knxP8ZSfYlgNHB5vAPDNVrU9OpV+5LFxtZv/pjssA="; }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.zlib pkgs.libxml2 pkgs.libxslt ]; @@ -28352,10 +28587,10 @@ with self; { XMLXPath = buildPerlPackage { pname = "XML-XPath"; - version = "1.44"; + version = "1.48"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MANWAR/XML-XPath-1.44.tar.gz"; - hash = "sha256-HMkRBwUWXcCd0Jl03XwLZwnJNR1raxzvWnEQVfiR3Q8="; + url = "mirror://cpan/authors/id/M/MA/MANWAR/XML-XPath-1.48.tar.gz"; + hash = "sha256-e8db42sjnlsucAqVcNK1O0MJPUZ/Kr5qdD+f+Qk3kM0="; }; buildInputs = [ PathTiny ]; propagatedBuildInputs = [ XMLParser ]; @@ -28619,10 +28854,10 @@ with self; { XSParseKeyword = buildPerlModule { pname = "XS-Parse-Keyword"; - version = "0.34"; + version = "0.38"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.34.tar.gz"; - hash = "sha256-EDPdtAmSTZ1Cs4MEodeXRaBDSrxrBJHrErbIu5bx1sE="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.38.tar.gz"; + hash = "sha256-JQDEeGnPXKjGHdI8Z7rav2a48e+14nkgdlfBzmk+IR4="; }; buildInputs = [ ExtUtilsCChecker Test2Suite ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; @@ -28635,12 +28870,12 @@ with self; { XSParseSublike = buildPerlModule { pname = "XS-Parse-Sublike"; - version = "0.16"; + version = "0.20"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Sublike-0.16.tar.gz"; - hash = "sha256-IV5AmzmFgdJfDv8DeFBjvCUTu4YbrL6Z/m1VNTRvZt8="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Sublike-0.20.tar.gz"; + hash = "sha256-Wn0myqMroqQQUZwMJLHYCznvMgdRN224vbef2u/pms0="; }; - buildInputs = [ TestFatal ]; + buildInputs = [ Test2Suite ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; meta = { description = "XS functions to assist in parsing sub-like syntax"; @@ -28651,10 +28886,10 @@ with self; { XXX = buildPerlPackage { pname = "XXX"; - version = "0.35"; + version = "0.38"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/XXX-0.35.tar.gz"; - hash = "sha256-pmY2DEl9zgf0HL5FtfjExW24G8iPDHU/Qaxv0QYU86s="; + url = "mirror://cpan/authors/id/I/IN/INGY/XXX-0.38.tar.gz"; + hash = "sha256-0QUQ6gD2Gav0erKZ8Ui9WzYM+gfcDtUYE4t87HJpLSo="; }; propagatedBuildInputs = [ YAMLPP ]; meta = { @@ -28713,10 +28948,10 @@ with self; { YAMLTiny = buildPerlPackage { pname = "YAML-Tiny"; - version = "1.73"; + version = "1.74"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/YAML-Tiny-1.73.tar.gz"; - hash = "sha256-vDFfoS6PHj7l4vQw2Qtwil3H5HyGfbqNzjprj74ld0Q="; + url = "mirror://cpan/authors/id/E/ET/ETHER/YAML-Tiny-1.74.tar.gz"; + hash = "sha256-ezjKn1084kIwpri9wfR/Wy2zSOf3+WZsJvWVVjbjPWw="; }; meta = { description = "Read/Write YAML files with as little code as possible"; @@ -28726,10 +28961,10 @@ with self; { YAMLLibYAML = buildPerlPackage { pname = "YAML-LibYAML"; - version = "0.83"; + version = "0.88"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.83.tar.gz"; - hash = "sha256-tHF1tP85etdaT3eB09g8CGN9pv8LrjJq87OJ2FS+xJA="; + url = "mirror://cpan/authors/id/I/IN/INGY/YAML-LibYAML-0.88.tar.gz"; + hash = "sha256-qKJzjMzDMqj3VJxMJ/PgCQyasR7vD2yFZEUXc5gTVng="; }; meta = { description = "Perl YAML Serialization using XS and libyaml"; @@ -28739,10 +28974,10 @@ with self; { YAMLPP = buildPerlPackage { pname = "YAML-PP"; - version = "0.026"; + version = "0.036"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.026.tar.gz"; - hash = "sha256-S4WOZxzz6WbsxUQI6AMXQMLyj4fClO6WefsC4C1aRes="; + url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.036.tar.gz"; + hash = "sha256-yLTlBYSt+S73Vz9rsB1u1Y5iF2MsV0J7cnTPp8pG/Bs="; }; buildInputs = [ TestDeep TestWarn ]; meta = { @@ -28831,10 +29066,10 @@ with self; { ZonemasterCLI = buildPerlPackage { pname = "Zonemaster-CLI"; - version = "5.0.1"; + version = "6.000003"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-CLI-v5.0.1.tar.gz"; - hash = "sha256-a/PPgavkaw9gCW44rj7+6AjOOSHKglg4H3kr6jXuRE4="; + url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-CLI-v6.0.3.tar.gz"; + hash = "sha256-oYDBYVygvPUZ9vrGX/y5A0MAQ6zgSsrf6AtUdFcZG4Q="; }; propagatedBuildInputs = [ JSONXS @@ -28874,10 +29109,10 @@ with self; { ZonemasterLDNS = buildPerlPackage { pname = "Zonemaster-LDNS"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-LDNS-3.1.0.tar.gz"; - hash = "sha256-Rr4uoQg5g9/ZLVnFQiLAz5MB+Uj39U24YWEa+o2+9HE="; + url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-LDNS-3.2.0.tar.gz"; + hash = "sha256-BpsWQRcpX6gtJSlAocqLMIrYsfPocjvk6CaqqX9wbWw="; }; env.NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include -I${pkgs.libidn2}.dev}/include"; NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.libidn2}/lib -lcrypto -lidn2"; @@ -28885,7 +29120,7 @@ with self; { makeMakerFlags = [ "--prefix-openssl=${pkgs.openssl.dev}" ]; nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = [ DevelChecklib ModuleInstall ModuleInstallXSUtil TestFatal pkgs.ldns pkgs.libidn2 pkgs.openssl ]; + buildInputs = [ DevelChecklib ModuleInstall ModuleInstallXSUtil TestFatal TestDifferences pkgs.ldns pkgs.libidn2 pkgs.openssl ]; meta = { description = "Perl wrapper for the ldns DNS library"; license = with lib.licenses; [ bsd3 ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 3810390f7862f..20e39d98fb42a 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -30,6 +30,7 @@ , openldap , openssl_1_1 , openssl +, overrideSDK , pam , pcre2 , postgresql @@ -239,6 +240,9 @@ lib.makeScope pkgs.newScope (self: with self; { couchbase = callPackage ../development/php-packages/couchbase { }; datadog_trace = callPackage ../development/php-packages/datadog_trace { + buildPecl = buildPecl.override { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; inherit (pkgs) darwin; }; diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json index 4578b0f92b255..50eae9ac572dd 100644 --- a/pkgs/top-level/pkg-config/pkg-config-data.json +++ b/pkgs/top-level/pkg-config/pkg-config-data.json @@ -773,11 +773,6 @@ "ruby_2_7" ] }, - "ruby-3.0": { - "attrPath": [ - "ruby_3_0" - ] - }, "ruby-3.1": { "attrPath": [ "ruby_3_1" diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 24ffa5b35136e..6f105d0fcccf8 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -410,7 +410,9 @@ mapAliases ({ sphinx-jquery = sphinxcontrib-jquery; # added 2023-02-24 sphinx_pypi_upload = throw "sphinx_pypi_upload has been removed since it is abandoned."; # added 2023-10-11 sphinx_rtd_theme = sphinx-rtd-theme; # added 2022-08-03 - sphinxcontrib-autoapi = sphinx-autoapi; # added 2023-02=28 + sphinxcontrib-autoapi = sphinx-autoapi; # added 2023-02-28 + sphinxcontrib_httpdomain = sphinxcontrib-httpdomain; # added 2023-07-20 + sphinxcontrib_newsfeed = sphinxcontrib-newsfeed; # added 2023-07-20 sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02 sphinx-navtree = throw "sphinx-navtree has been removed since it is not compatible with sphinx 3.3 and unmaintained"; # added 2023-07-03 sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 922e5a1b792e3..0a2f0fea4627c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2492,10 +2492,10 @@ self: super: with self; { cython = callPackage ../development/python-modules/Cython { }; cython_3 = self.cython.overridePythonAttrs (old: rec { - version = "3.0.2"; + version = "3.0.3"; src = old.src.override { inherit version; - hash = "sha256-lZSBjcqLsirmWAxSItorxcwyM0NQvS0pSgDYZpvMYbU="; + hash = "sha256-MnMJMBsB9ynxc6lFEcsigMh7oDyJ7UKOiPkT93gkUDA="; }; patches = [ ]; }); @@ -3657,6 +3657,8 @@ self: super: with self; { et-xmlfile = callPackage ../development/python-modules/et-xmlfile { }; + euclid3 = callPackage ../development/python-modules/euclid3 { }; + eufylife-ble-client = callPackage ../development/python-modules/eufylife-ble-client { }; evaluate = callPackage ../development/python-modules/evaluate { }; @@ -6138,13 +6140,15 @@ self: super: with self; { }; libarcus = callPackage ../development/python-modules/libarcus { - protobuf = pkgs.protobuf3_21; + protobuf = pkgs.protobuf_21; }; libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns; }; + libclang = callPackage ../development/python-modules/libclang { }; + libcloud = callPackage ../development/python-modules/libcloud { }; libcst = callPackage ../development/python-modules/libcst { }; @@ -6386,6 +6390,8 @@ self: super: with self; { inherit (pkgs) fuse; }; + llm = callPackage ../development/python-modules/llm { }; + llvmlite = callPackage ../development/python-modules/llvmlite { # llvmlite always requires a specific version of llvm. llvm = pkgs.llvm_14; @@ -6955,7 +6961,9 @@ self: super: with self; { mobly = callPackage ../development/python-modules/mobly { }; - mocket = callPackage ../development/python-modules/mocket { }; + mocket = callPackage ../development/python-modules/mocket { + redis-server = pkgs.redis; + }; mock = callPackage ../development/python-modules/mock { }; @@ -8405,12 +8413,7 @@ self: super: with self; { onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { }; onnx = callPackage ../development/python-modules/onnx { - # in linux c++ defaults to 17 - # on darwin clang is on an old version so c++ defaults to 11 - abseil-cpp = if stdenv.isLinux then - pkgs.abseil-cpp_202301 - else - pkgs.abseil-cpp_202301.override { cxxStandard = "14"; }; + abseil-cpp = pkgs.abseil-cpp_202301; }; onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common { @@ -8843,6 +8846,8 @@ self: super: with self; { inherit (pkgs) libpcap; # Avoid confusion with python package of the same name }; + pcbnew-transition = callPackage ../development/python-modules/pcbnew-transition { }; + pcodedmp = callPackage ../development/python-modules/pcodedmp { }; pcpp = callPackage ../development/python-modules/pcpp { }; @@ -9009,6 +9014,10 @@ self: super: with self; { psrpcore = callPackage ../development/python-modules/psrpcore { }; + pybars3 = callPackage ../development/python-modules/pybars3 { }; + + pymeta3 = callPackage ../development/python-modules/pymeta3 { }; + pypemicro = callPackage ../development/python-modules/pypemicro { }; pyprecice = callPackage ../development/python-modules/pyprecice { }; @@ -9112,6 +9121,8 @@ self: super: with self; { pixelmatch = callPackage ../development/python-modules/pixelmatch { }; + pixel-ring = callPackage ../development/python-modules/pixel-ring { }; + pjsua2 = (toPythonModule (pkgs.pjsip.override { pythonSupport = true; python3 = self.python; @@ -9582,11 +9593,11 @@ self: super: with self; { # Protobuf 4.x protobuf = callPackage ../development/python-modules/protobuf { # If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version. - inherit (pkgs) protobuf; + protobuf = pkgs.protobuf; }; # Protobuf 3.x - protobuf3 = callPackage ../development/python-modules/protobuf { + protobuf3 = callPackage ../development/python-modules/protobuf/3.nix { protobuf = pkgs.protobuf3_20; }; @@ -9615,6 +9626,7 @@ self: super: with self; { psd-tools = callPackage ../development/python-modules/psd-tools { }; psutil = callPackage ../development/python-modules/psutil { + stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; @@ -12825,7 +12837,7 @@ self: super: with self; { shellingham = callPackage ../development/python-modules/shellingham { }; shiboken2 = toPythonModule (callPackage ../development/python-modules/shiboken2 { - inherit (pkgs) cmake llvmPackages qt5; + inherit (pkgs) cmake llvmPackages_15 qt5; }); shiboken6 = toPythonModule (callPackage ../development/python-modules/shiboken6 { @@ -13248,7 +13260,7 @@ self: super: with self; { sphinxcontrib-htmlhelp = callPackage ../development/python-modules/sphinxcontrib-htmlhelp { }; - sphinxcontrib_httpdomain = callPackage ../development/python-modules/sphinxcontrib_httpdomain { }; + sphinxcontrib-httpdomain = callPackage ../development/python-modules/sphinxcontrib-httpdomain { }; sphinxcontrib-jquery = callPackage ../development/python-modules/sphinxcontrib-jquery { }; @@ -13264,7 +13276,7 @@ self: super: with self; { sphinxcontrib-nwdiag = callPackage ../development/python-modules/sphinxcontrib-nwdiag { }; - sphinxcontrib_newsfeed = callPackage ../development/python-modules/sphinxcontrib_newsfeed { }; + sphinxcontrib-newsfeed = callPackage ../development/python-modules/sphinxcontrib-newsfeed { }; sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { }; @@ -13744,7 +13756,7 @@ self: super: with self; { tensorflow-build = let compat = rec { - protobufTF = pkgs.protobuf3_21.override { + protobufTF = pkgs.protobuf_21.override { abseil-cpp = pkgs.abseil-cpp; }; grpcTF = (pkgs.grpc.overrideAttrs ( @@ -13864,6 +13876,8 @@ self: super: with self; { textual = callPackage ../development/python-modules/textual { }; + textual-dev = callPackage ../development/python-modules/textual-dev { }; + textual-universal-directorytree = callPackage ../development/python-modules/textual-universal-directorytree { }; testbook = callPackage ../development/python-modules/testbook { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 81308413d3cd6..a9e25eb54a8ea 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -140,7 +140,9 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP liblastfm = callPackage ../development/libraries/liblastfm { }; - libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { }; + libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { + stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; + }; packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { }; @@ -190,7 +192,8 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { }; - qca-qt5 = pkgs.darwin.apple_sdk_11_0.callPackage ../development/libraries/qca-qt5 { + qca-qt5 = callPackage ../development/libraries/qca-qt5 { + stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; inherit (libsForQt5) qtbase; }; @@ -221,8 +224,8 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP qtinstaller = callPackage ../development/libraries/qtinstaller { }; qtkeychain = callPackage ../development/libraries/qtkeychain { - stdenv = if pkgs.stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; - inherit (pkgs.darwin.apple_sdk_11_0.frameworks) CoreFoundation Security; + stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; + inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; }; qtmpris = callPackage ../development/libraries/qtmpris { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 034dccdcd475c..a8e9f397c0bf3 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -143,10 +143,12 @@ let jobs.tests.cc-wrapper.llvmPackages.clang.x86_64-linux jobs.tests.cc-wrapper.llvmPackages.libcxx.x86_64-linux - jobs.tests.cc-wrapper.llvmPackages_5.clang.x86_64-linux - jobs.tests.cc-wrapper.llvmPackages_5.libcxx.x86_64-linux jobs.tests.cc-wrapper.llvmPackages_6.clang.x86_64-linux jobs.tests.cc-wrapper.llvmPackages_6.libcxx.x86_64-linux + jobs.tests.cc-wrapper.llvmPackages_7.clang.x86_64-linux + jobs.tests.cc-wrapper.llvmPackages_7.libcxx.x86_64-linux + jobs.tests.cc-wrapper.llvmPackages_7.clang.x86_64-linux + jobs.tests.cc-wrapper.llvmPackages_7.libcxx.x86_64-linux jobs.tests.cc-multilib-gcc.x86_64-linux jobs.tests.cc-multilib-clang.x86_64-linux jobs.tests.stdenv-inputs.x86_64-linux @@ -243,6 +245,18 @@ let (mapTestOn ((packagePlatforms pkgs) // { haskell.compiler = packagePlatforms pkgs.haskell.compiler; haskellPackages = packagePlatforms pkgs.haskellPackages; + # Build selected packages (HLS) for multiple Haskell compilers to rebuild + # the cache after a staging merge + haskell.packages = lib.genAttrs [ + # TODO: share this list between release.nix and release-haskell.nix + "ghc90" + "ghc92" + "ghc94" + "ghc96" + ] (compilerName: { + inherit (packagePlatforms pkgs.haskell.packages.${compilerName}) + haskell-language-server; + }); idrisPackages = packagePlatforms pkgs.idrisPackages; agdaPackages = packagePlatforms pkgs.agdaPackages; |