diff --git a/.github/workflows/check-by-name.yml b/.github/workflows/check-by-name.yml index 0c0727eba122..f9d1846c8798 100644 --- a/.github/workflows/check-by-name.yml +++ b/.github/workflows/check-by-name.yml @@ -94,7 +94,7 @@ jobs: base=$(mktemp -d) git worktree add "$base" "$(git rev-parse HEAD^1)" echo "base=$base" >> "$GITHUB_ENV" - - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 + - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 if: env.mergedSha - name: Fetching the pinned tool if: env.mergedSha diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml index a3ffc40cc37b..eed685946c3b 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-nix-format.yml @@ -15,7 +15,7 @@ permissions: jobs: nixos: runs-on: ubuntu-latest - if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')" + if: "!contains(github.event.pull_request.title, '[skip treewide]')" steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: @@ -76,7 +76,7 @@ jobs: if [[ -n "$source" ]] && ! nixfmt --check ${{ env.base }}/"$source" 2>/dev/null; then echo "Ignoring file $file because it's not formatted in the base commit" elif ! nixfmt --check "$dest"; then - unformattedFiles+=("$file") + unformattedFiles+=("$dest") fi done < <(git diff -z --name-status ${{ env.baseRev }} -- '*.nix') diff --git a/.github/workflows/check-nixf-tidy.yml b/.github/workflows/check-nixf-tidy.yml new file mode 100644 index 000000000000..5a8fdbc96248 --- /dev/null +++ b/.github/workflows/check-nixf-tidy.yml @@ -0,0 +1,128 @@ +name: Check changed Nix files with nixf-tidy (experimental) + +on: + pull_request_target: + types: [opened, synchronize, reopened, edited] +permissions: + contents: read + +jobs: + nixos: + runs-on: ubuntu-latest + if: "!contains(github.event.pull_request.title, '[skip treewide]')" + steps: + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + with: + # pull_request_target checks out the base branch by default + ref: refs/pull/${{ github.event.pull_request.number }}/merge + # Fetches the merge commit and its parents + fetch-depth: 2 + - name: Checking out base branch + run: | + base=$(mktemp -d) + baseRev=$(git rev-parse HEAD^1) + git worktree add "$base" "$baseRev" + echo "baseRev=$baseRev" >> "$GITHUB_ENV" + echo "base=$base" >> "$GITHUB_ENV" + - name: Get Nixpkgs revision for nixf + run: | + # pin to a commit from nixpkgs-unstable to avoid e.g. building nixf + # from staging + # This should not be a URL, because it would allow PRs to run arbitrary code in CI! + rev=$(jq -r .rev ci/pinned-nixpkgs.json) + echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV" + - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 + with: + # explicitly enable sandbox + extra_nix_config: sandbox = true + nix_path: nixpkgs=${{ env.url }} + - name: Install nixf and jq + # provided jq is incompatible with our expression + run: "nix-env -f '' -iAP nixf jq" + - name: Check that Nix files pass nixf-tidy + run: | + # Filtering error messages we don't like + nixf_wrapper(){ + nixf-tidy --variable-lookup < "$1" | jq -r ' + [ + "sema-escaping-with" + ] + as $ignored_errors|[.[]|select(.sname as $s|$ignored_errors|index($s)|not)] + ' + } + + failedFiles=() + + # Don't report errors to file overview + # to avoid duplicates when editing title and description + if [[ "${{ github.event.action }}" == 'edited' ]] && [[ -z "${{ github.event.edited.changes.base }}" ]]; then + DONT_REPORT_ERROR=1 + else + DONT_REPORT_ERROR= + fi + # TODO: Make this more parallel + + # Loop through all Nix files touched by the PR + while readarray -d '' -n 2 entry && (( ${#entry[@]} != 0 )); do + type=${entry[0]} + file=${entry[1]} + case $type in + A*) + source="" + dest=$file + ;; + M*) + source=$file + dest=$file + ;; + C*|R*) + source=$file + read -r -d '' dest + ;; + *) + echo "Ignoring file $file with type $type" + continue + esac + + if [[ -n "$source" ]] && [[ "$(nixf_wrapper ${{ env.base }}/"$source")" != '[]' ]] 2>/dev/null; then + echo "Ignoring file $file because it doesn't pass nixf-tidy in the base commit" + echo # insert blank line + else + nixf_report="$(nixf_wrapper "$dest")" + if [[ "$nixf_report" != '[]' ]]; then + echo "$dest doesn't pass nixf-tidy. Reported by nixf-tidy:" + errors=$(echo "$nixf_report" | jq -r --arg dest "$dest" ' + def getLCur: "line=" + (.line+1|tostring) + ",col=" + (.column|tostring); + def getRCur: "endLine=" + (.line+1|tostring) + ",endColumn=" + (.column|tostring); + def getRange: "file=\($dest)," + (.lCur|getLCur) + "," + (.rCur|getRCur); + def getBody: . as $top|(.range|getRange) + ",title="+ .sname + "::" + + (.message|sub("{}" ; ($top.args.[]|tostring))); + def getNote: "\n::notice " + (.|getBody); + def getMessage: "::error " + (.|getBody) + (if (.notes|length)>0 then + ([.notes.[]|getNote]|add) else "" end); + .[]|getMessage + ') + if [[ -z "$DONT_REPORT_ERROR" ]]; then + echo "$errors" + else + # just print in plain text + echo "$errors" | sed 's/^:://' + echo # add one empty line + fi + failedFiles+=("$dest") + fi + fi + done < <(git diff -z --name-status ${{ env.baseRev }} -- '*.nix') + + if [[ -n "$DONT_REPORT_ERROR" ]]; then + echo "Edited the PR but didn't change the base branch, only the description/title." + echo "Not reporting errors again to avoid duplication." + echo # add one empty line + fi + + if (( "${#failedFiles[@]}" > 0 )); then + echo "Some new/changed Nix files don't pass nixf-tidy." + echo "See ${{ github.event.pull_request.html_url }}/files for reported errors." + echo "If you believe this is a false positive, ping @Aleksanaa and @inclyc in this PR." + exit 1 + fi diff --git a/lib/strings.nix b/lib/strings.nix index 49c625e232c0..aafbdffaa7bc 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -1,4 +1,6 @@ -/* String manipulation functions. */ +/** + String manipulation functions. +*/ { lib }: let @@ -39,161 +41,371 @@ rec { unsafeDiscardStringContext ; - /* Concatenate a list of strings. + /** + Concatenate a list of strings. - Type: concatStrings :: [string] -> string + # Type - Example: - concatStrings ["foo" "bar"] - => "foobar" + ``` + concatStrings :: [string] -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.concatStrings` usage example + + ```nix + concatStrings ["foo" "bar"] + => "foobar" + ``` + + ::: */ concatStrings = builtins.concatStringsSep ""; - /* Map a function over a list and concatenate the resulting strings. + /** + Map a function over a list and concatenate the resulting strings. - Type: concatMapStrings :: (a -> string) -> [a] -> string - Example: - concatMapStrings (x: "a" + x) ["foo" "bar"] - => "afooabar" + # Inputs + + `f` + : 1\. Function argument + + `list` + : 2\. Function argument + + # Type + + ``` + concatMapStrings :: (a -> string) -> [a] -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.concatMapStrings` usage example + + ```nix + concatMapStrings (x: "a" + x) ["foo" "bar"] + => "afooabar" + ``` + + ::: */ concatMapStrings = f: list: concatStrings (map f list); - /* Like `concatMapStrings` except that the f functions also gets the - position as a parameter. + /** + Like `concatMapStrings` except that the f functions also gets the + position as a parameter. - Type: concatImapStrings :: (int -> a -> string) -> [a] -> string - Example: - concatImapStrings (pos: x: "${toString pos}-${x}") ["foo" "bar"] - => "1-foo2-bar" + # Inputs + + `f` + : 1\. Function argument + + `list` + : 2\. Function argument + + # Type + + ``` + concatImapStrings :: (int -> a -> string) -> [a] -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.concatImapStrings` usage example + + ```nix + concatImapStrings (pos: x: "${toString pos}-${x}") ["foo" "bar"] + => "1-foo2-bar" + ``` + + ::: */ concatImapStrings = f: list: concatStrings (lib.imap1 f list); - /* Place an element between each element of a list + /** + Place an element between each element of a list - Type: intersperse :: a -> [a] -> [a] - Example: - intersperse "/" ["usr" "local" "bin"] - => ["usr" "/" "local" "/" "bin"]. + # Inputs + + `separator` + : Separator to add between elements + + `list` + : Input list + + # Type + + ``` + intersperse :: a -> [a] -> [a] + ``` + + # Examples + :::{.example} + ## `lib.strings.intersperse` usage example + + ```nix + intersperse "/" ["usr" "local" "bin"] + => ["usr" "/" "local" "/" "bin"]. + ``` + + ::: */ intersperse = - # Separator to add between elements separator: - # Input list list: if list == [] || length list == 1 then list else tail (lib.concatMap (x: [separator x]) list); - /* Concatenate a list of strings with a separator between each element + /** + Concatenate a list of strings with a separator between each element - Type: concatStringsSep :: string -> [string] -> string + # Inputs - Example: - concatStringsSep "/" ["usr" "local" "bin"] - => "usr/local/bin" + `sep` + : Separator to add between elements + + `list` + : List of input strings + + # Type + + ``` + concatStringsSep :: string -> [string] -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.concatStringsSep` usage example + + ```nix + concatStringsSep "/" ["usr" "local" "bin"] + => "usr/local/bin" + ``` + + ::: */ concatStringsSep = builtins.concatStringsSep; - /* Maps a function over a list of strings and then concatenates the - result with the specified separator interspersed between - elements. + /** + Maps a function over a list of strings and then concatenates the + result with the specified separator interspersed between + elements. - Type: concatMapStringsSep :: string -> (a -> string) -> [a] -> string - Example: - concatMapStringsSep "-" (x: toUpper x) ["foo" "bar" "baz"] - => "FOO-BAR-BAZ" + # Inputs + + `sep` + : Separator to add between elements + + `f` + : Function to map over the list + + `list` + : List of input strings + + # Type + + ``` + concatMapStringsSep :: string -> (a -> string) -> [a] -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.concatMapStringsSep` usage example + + ```nix + concatMapStringsSep "-" (x: toUpper x) ["foo" "bar" "baz"] + => "FOO-BAR-BAZ" + ``` + + ::: */ concatMapStringsSep = - # Separator to add between elements sep: - # Function to map over the list f: - # List of input strings list: concatStringsSep sep (map f list); - /* Same as `concatMapStringsSep`, but the mapping function - additionally receives the position of its argument. + /** + Same as `concatMapStringsSep`, but the mapping function + additionally receives the position of its argument. - Type: concatIMapStringsSep :: string -> (int -> a -> string) -> [a] -> string - Example: - concatImapStringsSep "-" (pos: x: toString (x / pos)) [ 6 6 6 ] - => "6-3-2" + # Inputs + + `sep` + : Separator to add between elements + + `f` + : Function that receives elements and their positions + + `list` + : List of input strings + + # Type + + ``` + concatIMapStringsSep :: string -> (int -> a -> string) -> [a] -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.concatImapStringsSep` usage example + + ```nix + concatImapStringsSep "-" (pos: x: toString (x / pos)) [ 6 6 6 ] + => "6-3-2" + ``` + + ::: */ concatImapStringsSep = - # Separator to add between elements sep: - # Function that receives elements and their positions f: - # List of input strings list: concatStringsSep sep (lib.imap1 f list); - /* Concatenate a list of strings, adding a newline at the end of each one. - Defined as `concatMapStrings (s: s + "\n")`. + /** + Concatenate a list of strings, adding a newline at the end of each one. + Defined as `concatMapStrings (s: s + "\n")`. - Type: concatLines :: [string] -> string + # Inputs - Example: - concatLines [ "foo" "bar" ] - => "foo\nbar\n" + `list` + : List of strings. Any element that is not a string will be implicitly converted to a string. + + # Type + + ``` + concatLines :: [string] -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.concatLines` usage example + + ```nix + concatLines [ "foo" "bar" ] + => "foo\nbar\n" + ``` + + ::: */ concatLines = concatMapStrings (s: s + "\n"); - /* - Replicate a string n times, + /** + Repeat a string `n` times, and concatenate the parts into a new string. - Type: replicate :: int -> string -> string - Example: - replicate 3 "v" - => "vvv" - replicate 5 "hello" - => "hellohellohellohellohello" + # Inputs + + `n` + : 1\. Function argument + + `s` + : 2\. Function argument + + # Type + + ``` + replicate :: int -> string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.replicate` usage example + + ```nix + replicate 3 "v" + => "vvv" + replicate 5 "hello" + => "hellohellohellohellohello" + ``` + + ::: */ replicate = n: s: concatStrings (lib.lists.replicate n s); - /* - Remove leading and trailing whitespace from a string. + /** + Remove leading and trailing whitespace from a string `s`. Whitespace is defined as any of the following characters: " ", "\t" "\r" "\n" - Type: trim :: string -> string + # Inputs - Example: - trim " hello, world! " - => "hello, world!" + `s` + : The string to trim + + # Type + + ``` + trim :: string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.trim` usage example + + ```nix + trim " hello, world! " + => "hello, world!" + ``` + + ::: */ trim = trimWith { start = true; end = true; }; - /* - Remove leading and/or trailing whitespace from a string. + /** + Remove leading and/or trailing whitespace from a string `s`. + To remove both leading and trailing whitespace, you can also use [`trim`](#function-library-lib.strings.trim) Whitespace is defined as any of the following characters: " ", "\t" "\r" "\n" - Type: trimWith :: { start ? false, end ? false } -> string -> string + # Inputs - Example: - trimWith { start = true; } " hello, world! "} - => "hello, world! " - trimWith { end = true; } " hello, world! "} - => " hello, world!" + `config` (Attribute set) + : `start` + : Whether to trim leading whitespace (`false` by default) + + : `end` + : Whether to trim trailing whitespace (`false` by default) + + `s` + : The string to trim + + # Type + + ``` + trimWith :: { start :: Bool; end :: Bool } -> String -> String + ``` + + # Examples + :::{.example} + ## `lib.strings.trimWith` usage example + + ```nix + trimWith { start = true; } " hello, world! "} + => "hello, world! " + + trimWith { end = true; } " hello, world! "} + => " hello, world!" + ``` + ::: */ trimWith = { - # Trim leading whitespace (`false` by default) start ? false, - # Trim trailing whitespace (`false` by default) end ? false, }: s: @@ -220,83 +432,198 @@ rec { in optionalString (res != null) (head res); - /* Construct a Unix-style, colon-separated search path consisting of - the given `subDir` appended to each of the given paths. + /** + Construct a Unix-style, colon-separated search path consisting of + the given `subDir` appended to each of the given paths. - Type: makeSearchPath :: string -> [string] -> string + # Inputs - Example: - makeSearchPath "bin" ["/root" "/usr" "/usr/local"] - => "/root/bin:/usr/bin:/usr/local/bin" - makeSearchPath "bin" [""] - => "/bin" + `subDir` + : Directory name to append + + `paths` + : List of base paths + + # Type + + ``` + makeSearchPath :: string -> [string] -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.makeSearchPath` usage example + + ```nix + makeSearchPath "bin" ["/root" "/usr" "/usr/local"] + => "/root/bin:/usr/bin:/usr/local/bin" + makeSearchPath "bin" [""] + => "/bin" + ``` + + ::: */ makeSearchPath = - # Directory name to append subDir: - # List of base paths paths: concatStringsSep ":" (map (path: path + "/" + subDir) (filter (x: x != null) paths)); - /* Construct a Unix-style search path by appending the given - `subDir` to the specified `output` of each of the packages. If no - output by the given name is found, fallback to `.out` and then to - the default. + /** + Construct a Unix-style search path by appending the given + `subDir` to the specified `output` of each of the packages. - Type: string -> string -> [package] -> string + If no output by the given name is found, fallback to `.out` and then to + the default. - Example: - makeSearchPathOutput "dev" "bin" [ pkgs.openssl pkgs.zlib ] - => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev/bin:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/bin" + + # Inputs + + `output` + : Package output to use + + `subDir` + : Directory name to append + + `pkgs` + : List of packages + + # Type + + ``` + makeSearchPathOutput :: string -> string -> [package] -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.makeSearchPathOutput` usage example + + ```nix + makeSearchPathOutput "dev" "bin" [ pkgs.openssl pkgs.zlib ] + => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev/bin:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/bin" + ``` + + ::: */ makeSearchPathOutput = - # Package output to use output: - # Directory name to append subDir: - # List of packages pkgs: makeSearchPath subDir (map (lib.getOutput output) pkgs); - /* Construct a library search path (such as RPATH) containing the - libraries for a set of packages + /** + Construct a library search path (such as RPATH) containing the + libraries for a set of packages - Example: - makeLibraryPath [ "/usr" "/usr/local" ] - => "/usr/lib:/usr/local/lib" - pkgs = import { } - makeLibraryPath [ pkgs.openssl pkgs.zlib ] - => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r/lib:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/lib" + # Inputs + + `packages` + : List of packages + + # Type + + ``` + makeLibraryPath :: [package] -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.makeLibraryPath` usage example + + ```nix + makeLibraryPath [ "/usr" "/usr/local" ] + => "/usr/lib:/usr/local/lib" + pkgs = import { } + makeLibraryPath [ pkgs.openssl pkgs.zlib ] + => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r/lib:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/lib" + ``` + + ::: */ makeLibraryPath = makeSearchPathOutput "lib" "lib"; - /* Construct an include search path (such as C_INCLUDE_PATH) containing the - header files for a set of packages or paths. + /** + Construct an include search path (such as C_INCLUDE_PATH) containing the + header files for a set of packages or paths. - Example: - makeIncludePath [ "/usr" "/usr/local" ] - => "/usr/include:/usr/local/include" - pkgs = import { } - makeIncludePath [ pkgs.openssl pkgs.zlib ] - => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev/include:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8-dev/include" + # Inputs + + `packages` + : List of packages + + # Type + + ``` + makeIncludePath :: [package] -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.makeIncludePath` usage example + + ```nix + makeIncludePath [ "/usr" "/usr/local" ] + => "/usr/include:/usr/local/include" + pkgs = import { } + makeIncludePath [ pkgs.openssl pkgs.zlib ] + => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev/include:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8-dev/include" + ``` + + ::: */ makeIncludePath = makeSearchPathOutput "dev" "include"; - /* Construct a binary search path (such as $PATH) containing the - binaries for a set of packages. + /** + Construct a binary search path (such as $PATH) containing the + binaries for a set of packages. - Example: - makeBinPath ["/root" "/usr" "/usr/local"] - => "/root/bin:/usr/bin:/usr/local/bin" + # Inputs + + `packages` + : List of packages + + # Type + + ``` + makeBinPath :: [package] -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.makeBinPath` usage example + + ```nix + makeBinPath ["/root" "/usr" "/usr/local"] + => "/root/bin:/usr/bin:/usr/local/bin" + ``` + + ::: */ makeBinPath = makeSearchPathOutput "bin" "bin"; - /* Normalize path, removing extraneous /s + /** + Normalize path, removing extraneous /s - Type: normalizePath :: string -> string - Example: - normalizePath "/a//b///c/" - => "/a/b/c/" + # Inputs + + `s` + : 1\. Function argument + + # Type + + ``` + normalizePath :: string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.normalizePath` usage example + + ```nix + normalizePath "/a//b///c/" + => "/a/b/c/" + ``` + + ::: */ normalizePath = s: warnIf @@ -313,37 +640,75 @@ rec { (stringToCharacters s) ); - /* Depending on the boolean `cond', return either the given string - or the empty string. Useful to concatenate against a bigger string. + /** + Depending on the boolean `cond', return either the given string + or the empty string. Useful to concatenate against a bigger string. - Type: optionalString :: bool -> string -> string - Example: - optionalString true "some-string" - => "some-string" - optionalString false "some-string" - => "" + # Inputs + + `cond` + : Condition + + `string` + : String to return if condition is true + + # Type + + ``` + optionalString :: bool -> string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.optionalString` usage example + + ```nix + optionalString true "some-string" + => "some-string" + optionalString false "some-string" + => "" + ``` + + ::: */ optionalString = - # Condition cond: - # String to return if condition is true string: if cond then string else ""; - /* Determine whether a string has given prefix. + /** + Determine whether a string has given prefix. - Type: hasPrefix :: string -> string -> bool - Example: - hasPrefix "foo" "foobar" - => true - hasPrefix "foo" "barfoo" - => false + # Inputs + + `pref` + : Prefix to check for + + `str` + : Input string + + # Type + + ``` + hasPrefix :: string -> string -> bool + ``` + + # Examples + :::{.example} + ## `lib.strings.hasPrefix` usage example + + ```nix + hasPrefix "foo" "foobar" + => true + hasPrefix "foo" "barfoo" + => false + ``` + + ::: */ hasPrefix = - # Prefix to check for pref: - # Input string str: # Before 23.05, paths would be copied to the store before converting them # to strings and comparing. This was surprising and confusing. @@ -357,20 +722,39 @@ rec { You might want to use `lib.path.hasPrefix` instead, which correctly supports paths.'' (substring 0 (stringLength pref) str == pref); - /* Determine whether a string has given suffix. + /** + Determine whether a string has given suffix. - Type: hasSuffix :: string -> string -> bool - Example: - hasSuffix "foo" "foobar" - => false - hasSuffix "foo" "barfoo" - => true + # Inputs + + `suffix` + : Suffix to check for + + `content` + : Input string + + # Type + + ``` + hasSuffix :: string -> string -> bool + ``` + + # Examples + :::{.example} + ## `lib.strings.hasSuffix` usage example + + ```nix + hasSuffix "foo" "foobar" + => false + hasSuffix "foo" "barfoo" + => true + ``` + + ::: */ hasSuffix = - # Suffix to check for suffix: - # Input string content: let lenContent = stringLength content; @@ -390,19 +774,40 @@ rec { && substring (lenContent - lenSuffix) lenContent content == suffix ); - /* Determine whether a string contains the given infix + /** + Determine whether a string contains the given infix - Type: hasInfix :: string -> string -> bool - Example: - hasInfix "bc" "abcd" - => true - hasInfix "ab" "abcd" - => true - hasInfix "cd" "abcd" - => true - hasInfix "foo" "abcd" - => false + # Inputs + + `infix` + : 1\. Function argument + + `content` + : 2\. Function argument + + # Type + + ``` + hasInfix :: string -> string -> bool + ``` + + # Examples + :::{.example} + ## `lib.strings.hasInfix` usage example + + ```nix + hasInfix "bc" "abcd" + => true + hasInfix "ab" "abcd" + => true + hasInfix "cd" "abcd" + => true + hasInfix "foo" "abcd" + => false + ``` + + ::: */ hasInfix = infix: content: # Before 23.05, paths would be copied to the store before converting them @@ -416,35 +821,74 @@ rec { This behavior is deprecated and will throw an error in the future.'' (builtins.match ".*${escapeRegex infix}.*" "${content}" != null); - /* Convert a string to a list of characters (i.e. singleton strings). - This allows you to, e.g., map a function over each character. However, - note that this will likely be horribly inefficient; Nix is not a - general purpose programming language. Complex string manipulations - should, if appropriate, be done in a derivation. - Also note that Nix treats strings as a list of bytes and thus doesn't - handle unicode. + /** + Convert a string `s` to a list of characters (i.e. singleton strings). + This allows you to, e.g., map a function over each character. However, + note that this will likely be horribly inefficient; Nix is not a + general purpose programming language. Complex string manipulations + should, if appropriate, be done in a derivation. + Also note that Nix treats strings as a list of bytes and thus doesn't + handle unicode. - Type: stringToCharacters :: string -> [string] - Example: - stringToCharacters "" - => [ ] - stringToCharacters "abc" - => [ "a" "b" "c" ] - stringToCharacters "🦄" - => [ "�" "�" "�" "�" ] + # Inputs + + `s` + : 1\. Function argument + + # Type + + ``` + stringToCharacters :: string -> [string] + ``` + + # Examples + :::{.example} + ## `lib.strings.stringToCharacters` usage example + + ```nix + stringToCharacters "" + => [ ] + stringToCharacters "abc" + => [ "a" "b" "c" ] + stringToCharacters "🦄" + => [ "�" "�" "�" "�" ] + ``` + + ::: */ stringToCharacters = s: genList (p: substring p 1 s) (stringLength s); - /* Manipulate a string character by character and replace them by - strings before concatenating the results. + /** + Manipulate a string character by character and replace them by + strings before concatenating the results. - Type: stringAsChars :: (string -> string) -> string -> string - Example: - stringAsChars (x: if x == "a" then "i" else x) "nax" - => "nix" + # Inputs + + `f` + : Function to map over each individual character + + `s` + : Input string + + # Type + + ``` + stringAsChars :: (string -> string) -> string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.stringAsChars` usage example + + ```nix + stringAsChars (x: if x == "a" then "i" else x) "nax" + => "nix" + ``` + + ::: */ stringAsChars = # Function to map over each individual character @@ -454,51 +898,126 @@ rec { map f (stringToCharacters s) ); - /* Convert char to ascii value, must be in printable range + /** + Convert char to ascii value, must be in printable range - Type: charToInt :: string -> int - Example: - charToInt "A" - => 65 - charToInt "(" - => 40 + # Inputs + `c` + : 1\. Function argument + + # Type + + ``` + charToInt :: string -> int + ``` + + # Examples + :::{.example} + ## `lib.strings.charToInt` usage example + + ```nix + charToInt "A" + => 65 + charToInt "(" + => 40 + ``` + + ::: */ charToInt = c: builtins.getAttr c asciiTable; - /* Escape occurrence of the elements of `list` in `string` by - prefixing it with a backslash. + /** + Escape occurrence of the elements of `list` in `string` by + prefixing it with a backslash. - Type: escape :: [string] -> string -> string - Example: - escape ["(" ")"] "(foo)" - => "\\(foo\\)" + # Inputs + + `list` + : 1\. Function argument + + `string` + : 2\. Function argument + + # Type + + ``` + escape :: [string] -> string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.escape` usage example + + ```nix + escape ["(" ")"] "(foo)" + => "\\(foo\\)" + ``` + + ::: */ escape = list: replaceStrings list (map (c: "\\${c}") list); - /* Escape occurrence of the element of `list` in `string` by - converting to its ASCII value and prefixing it with \\x. - Only works for printable ascii characters. + /** + Escape occurrence of the element of `list` in `string` by + converting to its ASCII value and prefixing it with \\x. + Only works for printable ascii characters. - Type: escapeC = [string] -> string -> string - Example: - escapeC [" "] "foo bar" - => "foo\\x20bar" + # Inputs + `list` + : 1\. Function argument + + `string` + : 2\. Function argument + + # Type + + ``` + escapeC = [string] -> string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.escapeC` usage example + + ```nix + escapeC [" "] "foo bar" + => "foo\\x20bar" + ``` + + ::: */ escapeC = list: replaceStrings list (map (c: "\\x${ toLower (lib.toHexString (charToInt c))}") list); - /* Escape the string so it can be safely placed inside a URL - query. + /** + Escape the `string` so it can be safely placed inside a URL + query. - Type: escapeURL :: string -> string + # Inputs - Example: - escapeURL "foo/bar baz" - => "foo%2Fbar%20baz" + `string` + : 1\. Function argument + + # Type + + ``` + escapeURL :: string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.escapeURL` usage example + + ```nix + escapeURL "foo/bar baz" + => "foo%2Fbar%20baz" + ``` + + ::: */ escapeURL = let unreserved = [ "A" "B" "C" "D" "E" "F" "G" "H" "I" "J" "K" "L" "M" "N" "O" "P" "Q" "R" "S" "T" "U" "V" "W" "X" "Y" "Z" "a" "b" "c" "d" "e" "f" "g" "h" "i" "j" "k" "l" "m" "n" "o" "p" "q" "r" "s" "t" "u" "v" "w" "x" "y" "z" "0" "1" "2" "3" "4" "5" "6" "7" "8" "9" "-" "_" "." "~" ]; @@ -506,55 +1025,129 @@ rec { in replaceStrings (builtins.attrNames toEscape) (lib.mapAttrsToList (_: c: "%${fixedWidthString 2 "0" (lib.toHexString c)}") toEscape); - /* Quote string to be used safely within the Bourne shell. + /** + Quote `string` to be used safely within the Bourne shell. - Type: escapeShellArg :: string -> string - Example: - escapeShellArg "esc'ape\nme" - => "'esc'\\''ape\nme'" + # Inputs + + `string` + : 1\. Function argument + + # Type + + ``` + escapeShellArg :: string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.escapeShellArg` usage example + + ```nix + escapeShellArg "esc'ape\nme" + => "'esc'\\''ape\nme'" + ``` + + ::: */ escapeShellArg = arg: "'${replaceStrings ["'"] ["'\\''"] (toString arg)}'"; - /* Quote all arguments to be safely passed to the Bourne shell. + /** + Quote all arguments to be safely passed to the Bourne shell. - Type: escapeShellArgs :: [string] -> string + # Inputs - Example: - escapeShellArgs ["one" "two three" "four'five"] - => "'one' 'two three' 'four'\\''five'" + `args` + : 1\. Function argument + + # Type + + ``` + escapeShellArgs :: [string] -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.escapeShellArgs` usage example + + ```nix + escapeShellArgs ["one" "two three" "four'five"] + => "'one' 'two three' 'four'\\''five'" + ``` + + ::: */ escapeShellArgs = concatMapStringsSep " " escapeShellArg; - /* Test whether the given name is a valid POSIX shell variable name. + /** + Test whether the given `name` is a valid POSIX shell variable name. - Type: string -> bool - Example: - isValidPosixName "foo_bar000" - => true - isValidPosixName "0-bad.jpg" - => false + # Inputs + + `name` + : 1\. Function argument + + # Type + + ``` + string -> bool + ``` + + # Examples + :::{.example} + ## `lib.strings.isValidPosixName` usage example + + ```nix + isValidPosixName "foo_bar000" + => true + isValidPosixName "0-bad.jpg" + => false + ``` + + ::: */ isValidPosixName = name: match "[a-zA-Z_][a-zA-Z0-9_]*" name != null; - /* Translate a Nix value into a shell variable declaration, with proper escaping. + /** + Translate a Nix value into a shell variable declaration, with proper escaping. - The value can be a string (mapped to a regular variable), a list of strings - (mapped to a Bash-style array) or an attribute set of strings (mapped to a - Bash-style associative array). Note that "string" includes string-coercible - values like paths or derivations. + The value can be a string (mapped to a regular variable), a list of strings + (mapped to a Bash-style array) or an attribute set of strings (mapped to a + Bash-style associative array). Note that "string" includes string-coercible + values like paths or derivations. - Strings are translated into POSIX sh-compatible code; lists and attribute sets - assume a shell that understands Bash syntax (e.g. Bash or ZSH). + Strings are translated into POSIX sh-compatible code; lists and attribute sets + assume a shell that understands Bash syntax (e.g. Bash or ZSH). - Type: string -> (string | listOf string | attrsOf string) -> string - Example: - '' - ${toShellVar "foo" "some string"} - [[ "$foo" == "some string" ]] - '' + # Inputs + + `name` + : 1\. Function argument + + `value` + : 2\. Function argument + + # Type + + ``` + string -> ( string | [string] | { ${name} :: string; } ) -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.toShellVar` usage example + + ```nix + '' + ${toShellVar "foo" "some string"} + [[ "$foo" == "some string" ]] + '' + ``` + + ::: */ toShellVar = name: value: lib.throwIfNot (isValidPosixName name) "toShellVar: ${name} is not a valid shell variable name" ( @@ -570,65 +1163,154 @@ rec { "${name}=${escapeShellArg value}" ); - /* Translate an attribute set into corresponding shell variable declarations - using `toShellVar`. + /** + Translate an attribute set `vars` into corresponding shell variable declarations + using `toShellVar`. - Type: attrsOf (string | listOf string | attrsOf string) -> string - Example: - let - foo = "value"; - bar = foo; - in '' - ${toShellVars { inherit foo bar; }} - [[ "$foo" == "$bar" ]] - '' + # Inputs + + `vars` + : 1\. Function argument + + # Type + + ``` + toShellVars :: { + ${name} :: string | [ string ] | { ${key} :: string; }; + } -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.toShellVars` usage example + + ```nix + let + foo = "value"; + bar = foo; + in '' + ${toShellVars { inherit foo bar; }} + [[ "$foo" == "$bar" ]] + '' + ``` + + ::: */ toShellVars = vars: concatStringsSep "\n" (lib.mapAttrsToList toShellVar vars); - /* Turn a string into a Nix expression representing that string + /** + Turn a string `s` into a Nix expression representing that string - Type: string -> string + # Inputs - Example: - escapeNixString "hello\${}\n" - => "\"hello\\\${}\\n\"" + `s` + : 1\. Function argument + + # Type + + ``` + escapeNixString :: string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.escapeNixString` usage example + + ```nix + escapeNixString "hello\${}\n" + => "\"hello\\\${}\\n\"" + ``` + + ::: */ escapeNixString = s: escape ["$"] (toJSON s); - /* Turn a string into an exact regular expression + /** + Turn a string `s` into an exact regular expression - Type: string -> string + # Inputs - Example: - escapeRegex "[^a-z]*" - => "\\[\\^a-z]\\*" + `s` + : 1\. Function argument + + # Type + + ``` + escapeRegex :: string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.escapeRegex` usage example + + ```nix + escapeRegex "[^a-z]*" + => "\\[\\^a-z]\\*" + ``` + + ::: */ escapeRegex = escape (stringToCharacters "\\[{()^$?*+|."); - /* Quotes a string if it can't be used as an identifier directly. + /** + Quotes a string `s` if it can't be used as an identifier directly. - Type: string -> string - Example: - escapeNixIdentifier "hello" - => "hello" - escapeNixIdentifier "0abc" - => "\"0abc\"" + # Inputs + + `s` + : 1\. Function argument + + # Type + + ``` + escapeNixIdentifier :: string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.escapeNixIdentifier` usage example + + ```nix + escapeNixIdentifier "hello" + => "hello" + escapeNixIdentifier "0abc" + => "\"0abc\"" + ``` + + ::: */ escapeNixIdentifier = s: # Regex from https://github.com/NixOS/nix/blob/d048577909e383439c2549e849c5c2f2016c997e/src/libexpr/lexer.l#L91 if match "[a-zA-Z_][a-zA-Z0-9_'-]*" s != null then s else escapeNixString s; - /* Escapes a string such that it is safe to include verbatim in an XML - document. + /** + Escapes a string `s` such that it is safe to include verbatim in an XML + document. - Type: string -> string + # Inputs - Example: - escapeXML ''"test" 'test' < & >'' - => ""test" 'test' < & >" + `s` + : 1\. Function argument + + # Type + + ``` + escapeXML :: string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.escapeXML` usage example + + ```nix + escapeXML ''"test" 'test' < & >'' + => ""test" 'test' < & >" + ``` + + ::: */ escapeXML = builtins.replaceStrings ["\"" "'" "<" ">" "&"] @@ -641,49 +1323,144 @@ rec { lowerChars = stringToCharacters "abcdefghijklmnopqrstuvwxyz"; upperChars = stringToCharacters "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - /* Converts an ASCII string to lower-case. + /** + Converts an ASCII string `s` to lower-case. - Type: toLower :: string -> string + # Inputs - Example: - toLower "HOME" - => "home" + `s` + : The string to convert to lower-case. + + # Type + + ``` + toLower :: string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.toLower` usage example + + ```nix + toLower "HOME" + => "home" + ``` + + ::: */ toLower = replaceStrings upperChars lowerChars; - /* Converts an ASCII string to upper-case. + /** + Converts an ASCII string `s` to upper-case. - Type: toUpper :: string -> string + # Inputs - Example: - toUpper "home" - => "HOME" + `s` + : The string to convert to upper-case. + + + # Type + + ``` + toUpper :: string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.toUpper` usage example + + ```nix + toUpper "home" + => "HOME" + ``` + + ::: */ toUpper = replaceStrings lowerChars upperChars; - /* Appends string context from another string. This is an implementation - detail of Nix and should be used carefully. + /** + Appends string context from string like object `src` to `target`. - Strings in Nix carry an invisible `context` which is a list of strings - representing store paths. If the string is later used in a derivation - attribute, the derivation will properly populate the inputDrvs and - inputSrcs. + :::{.warning} + This is an implementation + detail of Nix and should be used carefully. + ::: - Example: - pkgs = import { }; - addContextFrom pkgs.coreutils "bar" - => "bar" + Strings in Nix carry an invisible `context` which is a list of strings + representing store paths. If the string is later used in a derivation + attribute, the derivation will properly populate the inputDrvs and + inputSrcs. + + + # Inputs + + `src` + : The string to take the context from. If the argument is not a string, + it will be implicitly converted to a string. + + `target` + : The string to append the context to. If the argument is not a string, + it will be implicitly converted to a string. + + # Type + + ``` + addContextFrom :: string -> string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.addContextFrom` usage example + + ```nix + pkgs = import { }; + addContextFrom pkgs.coreutils "bar" + => "bar" + ``` + + The context can be displayed using the `toString` function: + + ```nix + nix-repl> builtins.getContext (lib.strings.addContextFrom pkgs.coreutils "bar") + { + "/nix/store/m1s1d2dk2dqqlw3j90jl3cjy2cykbdxz-coreutils-9.5.drv" = { ... }; + } + ``` + + ::: */ - addContextFrom = a: b: substring 0 0 a + b; + addContextFrom = src: target: substring 0 0 src + target; - /* Cut a string with a separator and produces a list of strings which - were separated by this separator. + /** + Cut a string with a separator and produces a list of strings which + were separated by this separator. - Example: - splitString "." "foo.bar.baz" - => [ "foo" "bar" "baz" ] - splitString "/" "/usr/local/bin" - => [ "" "usr" "local" "bin" ] + # Inputs + + `sep` + : 1\. Function argument + + `s` + : 2\. Function argument + + # Type + + ``` + splitString :: string -> string -> [string] + ``` + + # Examples + :::{.example} + ## `lib.strings.splitString` usage example + + ```nix + splitString "." "foo.bar.baz" + => [ "foo" "bar" "baz" ] + splitString "/" "/usr/local/bin" + => [ "" "usr" "local" "bin" ] + ``` + + ::: */ splitString = sep: s: let @@ -691,20 +1468,39 @@ rec { in map (addContextFrom s) splits; - /* Return a string without the specified prefix, if the prefix matches. - Type: string -> string -> string + /** + Return a string without the specified prefix, if the prefix matches. - Example: - removePrefix "foo." "foo.bar.baz" - => "bar.baz" - removePrefix "xxx" "foo.bar.baz" - => "foo.bar.baz" + # Inputs + + `prefix` + : Prefix to remove if it matches + + `str` + : Input string + + # Type + + ``` + removePrefix :: string -> string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.removePrefix` usage example + + ```nix + removePrefix "foo." "foo.bar.baz" + => "bar.baz" + removePrefix "xxx" "foo.bar.baz" + => "foo.bar.baz" + ``` + + ::: */ removePrefix = - # Prefix to remove if it matches prefix: - # Input string str: # Before 23.05, paths would be copied to the store before converting them # to strings and comparing. This was surprising and confusing. @@ -724,20 +1520,39 @@ rec { else str); - /* Return a string without the specified suffix, if the suffix matches. + /** + Return a string without the specified suffix, if the suffix matches. - Type: string -> string -> string - Example: - removeSuffix "front" "homefront" - => "home" - removeSuffix "xxx" "homefront" - => "homefront" + # Inputs + + `suffix` + : Suffix to remove if it matches + + `str` + : Input string + + # Type + + ``` + removeSuffix :: string -> string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.removeSuffix` usage example + + ```nix + removeSuffix "front" "homefront" + => "home" + removeSuffix "xxx" "homefront" + => "homefront" + ``` + + ::: */ removeSuffix = - # Suffix to remove if it matches suffix: - # Input string str: # Before 23.05, paths would be copied to the store before converting them # to strings and comparing. This was surprising and confusing. @@ -757,37 +1572,103 @@ rec { else str); - /* Return true if string v1 denotes a version older than v2. + /** + Return true if string `v1` denotes a version older than `v2`. - Example: - versionOlder "1.1" "1.2" - => true - versionOlder "1.1" "1.1" - => false + + # Inputs + + `v1` + : 1\. Function argument + + `v2` + : 2\. Function argument + + # Type + + ``` + versionOlder :: String -> String -> Bool + ``` + + # Examples + :::{.example} + ## `lib.strings.versionOlder` usage example + + ```nix + versionOlder "1.1" "1.2" + => true + versionOlder "1.1" "1.1" + => false + ``` + + ::: */ versionOlder = v1: v2: compareVersions v2 v1 == 1; - /* Return true if string v1 denotes a version equal to or newer than v2. + /** + Return true if string v1 denotes a version equal to or newer than v2. - Example: - versionAtLeast "1.1" "1.0" - => true - versionAtLeast "1.1" "1.1" - => true - versionAtLeast "1.1" "1.2" - => false + + # Inputs + + `v1` + : 1\. Function argument + + `v2` + : 2\. Function argument + + # Type + + ``` + versionAtLeast :: String -> String -> Bool + ``` + + # Examples + :::{.example} + ## `lib.strings.versionAtLeast` usage example + + ```nix + versionAtLeast "1.1" "1.0" + => true + versionAtLeast "1.1" "1.1" + => true + versionAtLeast "1.1" "1.2" + => false + ``` + + ::: */ versionAtLeast = v1: v2: !versionOlder v1 v2; - /* This function takes an argument that's either a derivation or a - derivation's "name" attribute and extracts the name part from that - argument. + /** + This function takes an argument `x` that's either a derivation or a + derivation's "name" attribute and extracts the name part from that + argument. - Example: - getName "youtube-dl-2016.01.01" - => "youtube-dl" - getName pkgs.youtube-dl - => "youtube-dl" + # Inputs + + `x` + : 1\. Function argument + + # Type + + ``` + getName :: String | Derivation -> String + ``` + + + # Examples + :::{.example} + ## `lib.strings.getName` usage example + + ```nix + getName "youtube-dl-2016.01.01" + => "youtube-dl" + getName pkgs.youtube-dl + => "youtube-dl" + ``` + + ::: */ getName = let parse = drv: (parseDrvName drv).name; @@ -796,15 +1677,35 @@ rec { then parse x else x.pname or (parse x.name); - /* This function takes an argument that's either a derivation or a - derivation's "name" attribute and extracts the version part from that - argument. + /** + This function takes an argument `x` that's either a derivation or a + derivation's "name" attribute and extracts the version part from that + argument. - Example: - getVersion "youtube-dl-2016.01.01" - => "2016.01.01" - getVersion pkgs.youtube-dl - => "2016.01.01" + + # Inputs + + `x` + : 1\. Function argument + + # Type + + ``` + getVersion :: String | Derivation -> String + ``` + + # Examples + :::{.example} + ## `lib.strings.getVersion` usage example + + ```nix + getVersion "youtube-dl-2016.01.01" + => "2016.01.01" + getVersion pkgs.youtube-dl + => "2016.01.01" + ``` + + ::: */ getVersion = let parse = drv: (parseDrvName drv).version; @@ -813,14 +1714,38 @@ rec { then parse x else x.version or (parse x.name); - /* Extract name with version from URL. Ask for separator which is - supposed to start extension. + /** + Extract name and version from a URL as shown in the examples. - Example: - nameFromURL "https://nixos.org/releases/nix/nix-1.7/nix-1.7-x86_64-linux.tar.bz2" "-" - => "nix" - nameFromURL "https://nixos.org/releases/nix/nix-1.7/nix-1.7-x86_64-linux.tar.bz2" "_" - => "nix-1.7-x86" + Separator `sep` is used to determine the end of the extension. + + + # Inputs + + `url` + : 1\. Function argument + + `sep` + : 2\. Function argument + + # Type + + ``` + nameFromURL :: String -> String + ``` + + # Examples + :::{.example} + ## `lib.strings.nameFromURL` usage example + + ```nix + nameFromURL "https://nixos.org/releases/nix/nix-1.7/nix-1.7-x86_64-linux.tar.bz2" "-" + => "nix" + nameFromURL "https://nixos.org/releases/nix/nix-1.7/nix-1.7-x86_64-linux.tar.bz2" "_" + => "nix-1.7-x86" + ``` + + ::: */ nameFromURL = url: sep: let @@ -829,21 +1754,40 @@ rec { name = head (splitString sep filename); in assert name != filename; name; - /* Create a "-D:=" string that can be passed to typical - CMake invocations. + /** + Create a `"-D:="` string that can be passed to typical + CMake invocations. - Type: cmakeOptionType :: string -> string -> string -> string + # Inputs - @param feature The feature to be set - @param type The type of the feature to be set, as described in - https://cmake.org/cmake/help/latest/command/set.html - the possible values (case insensitive) are: - BOOL FILEPATH PATH STRING INTERNAL - @param value The desired value + `feature` + : The feature to be set - Example: - cmakeOptionType "string" "ENGINE" "sdl2" - => "-DENGINE:STRING=sdl2" + `type` + : The type of the feature to be set, as described in + https://cmake.org/cmake/help/latest/command/set.html + the possible values (case insensitive) are: + BOOL FILEPATH PATH STRING INTERNAL + + `value` + : The desired value + + # Type + + ``` + cmakeOptionType :: string -> string -> string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.cmakeOptionType` usage example + + ```nix + cmakeOptionType "string" "ENGINE" "sdl2" + => "-DENGINE:STRING=sdl2" + ``` + + ::: */ cmakeOptionType = let types = [ "BOOL" "FILEPATH" "PATH" "STRING" "INTERNAL" ]; @@ -853,158 +1797,373 @@ rec { assert (isString value); "-D${feature}:${toUpper type}=${value}"; - /* Create a -D={TRUE,FALSE} string that can be passed to typical - CMake invocations. + /** + Create a -D={TRUE,FALSE} string that can be passed to typical + CMake invocations. - Type: cmakeBool :: string -> bool -> string - @param condition The condition to be made true or false - @param flag The controlling flag of the condition + # Inputs - Example: - cmakeBool "ENABLE_STATIC_LIBS" false - => "-DENABLESTATIC_LIBS:BOOL=FALSE" + `condition` + : The condition to be made true or false + + `flag` + : The controlling flag of the condition + + # Type + + ``` + cmakeBool :: string -> bool -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.cmakeBool` usage example + + ```nix + cmakeBool "ENABLE_STATIC_LIBS" false + => "-DENABLESTATIC_LIBS:BOOL=FALSE" + ``` + + ::: */ cmakeBool = condition: flag: assert (lib.isString condition); assert (lib.isBool flag); cmakeOptionType "bool" condition (lib.toUpper (lib.boolToString flag)); - /* Create a -D:STRING= string that can be passed to typical - CMake invocations. - This is the most typical usage, so it deserves a special case. + /** + Create a -D:STRING= string that can be passed to typical + CMake invocations. + This is the most typical usage, so it deserves a special case. - Type: cmakeFeature :: string -> string -> string - @param condition The condition to be made true or false - @param flag The controlling flag of the condition + # Inputs - Example: - cmakeFeature "MODULES" "badblock" - => "-DMODULES:STRING=badblock" + `feature` + : The feature to be set + + `value` + : The desired value + + + # Type + + ``` + cmakeFeature :: string -> string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.cmakeFeature` usage example + + ```nix + cmakeFeature "MODULES" "badblock" + => "-DMODULES:STRING=badblock" + ``` + + ::: */ cmakeFeature = feature: value: assert (lib.isString feature); assert (lib.isString value); cmakeOptionType "string" feature value; - /* Create a -D= string that can be passed to typical Meson - invocations. + /** + Create a -D= string that can be passed to typical Meson + invocations. - Type: mesonOption :: string -> string -> string - @param feature The feature to be set - @param value The desired value + # Inputs - Example: - mesonOption "engine" "opengl" - => "-Dengine=opengl" + `feature` + : The feature to be set + + `value` + : The desired value + + # Type + + ``` + mesonOption :: string -> string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.mesonOption` usage example + + ```nix + mesonOption "engine" "opengl" + => "-Dengine=opengl" + ``` + + ::: */ mesonOption = feature: value: assert (lib.isString feature); assert (lib.isString value); "-D${feature}=${value}"; - /* Create a -D={true,false} string that can be passed to typical - Meson invocations. + /** + Create a -D={true,false} string that can be passed to typical + Meson invocations. - Type: mesonBool :: string -> bool -> string - @param condition The condition to be made true or false - @param flag The controlling flag of the condition + # Inputs - Example: - mesonBool "hardened" true - => "-Dhardened=true" - mesonBool "static" false - => "-Dstatic=false" + `condition` + : The condition to be made true or false + + `flag` + : The controlling flag of the condition + + # Type + + ``` + mesonBool :: string -> bool -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.mesonBool` usage example + + ```nix + mesonBool "hardened" true + => "-Dhardened=true" + mesonBool "static" false + => "-Dstatic=false" + ``` + + ::: */ mesonBool = condition: flag: assert (lib.isString condition); assert (lib.isBool flag); mesonOption condition (lib.boolToString flag); - /* Create a -D={enabled,disabled} string that can be passed to - typical Meson invocations. + /** + Create a -D={enabled,disabled} string that can be passed to + typical Meson invocations. - Type: mesonEnable :: string -> bool -> string - @param feature The feature to be enabled or disabled - @param flag The controlling flag + # Inputs - Example: - mesonEnable "docs" true - => "-Ddocs=enabled" - mesonEnable "savage" false - => "-Dsavage=disabled" + `feature` + : The feature to be enabled or disabled + + `flag` + : The controlling flag + + # Type + + ``` + mesonEnable :: string -> bool -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.mesonEnable` usage example + + ```nix + mesonEnable "docs" true + => "-Ddocs=enabled" + mesonEnable "savage" false + => "-Dsavage=disabled" + ``` + + ::: */ mesonEnable = feature: flag: assert (lib.isString feature); assert (lib.isBool flag); mesonOption feature (if flag then "enabled" else "disabled"); - /* Create an --{enable,disable}- string that can be passed to - standard GNU Autoconf scripts. + /** + Create an --{enable,disable}- string that can be passed to + standard GNU Autoconf scripts. - Example: - enableFeature true "shared" - => "--enable-shared" - enableFeature false "shared" - => "--disable-shared" + + # Inputs + + `flag` + : 1\. Function argument + + `feature` + : 2\. Function argument + + # Type + + ``` + enableFeature :: bool -> string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.enableFeature` usage example + + ```nix + enableFeature true "shared" + => "--enable-shared" + enableFeature false "shared" + => "--disable-shared" + ``` + + ::: */ enableFeature = flag: feature: assert lib.isBool flag; assert lib.isString feature; # e.g. passing openssl instead of "openssl" "--${if flag then "enable" else "disable"}-${feature}"; - /* Create an --{enable-=,disable-} string that can be passed to - standard GNU Autoconf scripts. + /** + Create an --{enable-=,disable-} string that can be passed to + standard GNU Autoconf scripts. - Example: - enableFeatureAs true "shared" "foo" - => "--enable-shared=foo" - enableFeatureAs false "shared" (throw "ignored") - => "--disable-shared" + + # Inputs + + `flag` + : 1\. Function argument + + `feature` + : 2\. Function argument + + `value` + : 3\. Function argument + + # Type + + ``` + enableFeatureAs :: bool -> string -> string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.enableFeatureAs` usage example + + ```nix + enableFeatureAs true "shared" "foo" + => "--enable-shared=foo" + enableFeatureAs false "shared" (throw "ignored") + => "--disable-shared" + ``` + + ::: */ enableFeatureAs = flag: feature: value: enableFeature flag feature + optionalString flag "=${value}"; - /* Create an --{with,without}- string that can be passed to - standard GNU Autoconf scripts. + /** + Create an --{with,without}- string that can be passed to + standard GNU Autoconf scripts. - Example: - withFeature true "shared" - => "--with-shared" - withFeature false "shared" - => "--without-shared" + + # Inputs + + `flag` + : 1\. Function argument + + `feature` + : 2\. Function argument + + + # Type + + ``` + withFeature :: bool -> string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.withFeature` usage example + + ```nix + withFeature true "shared" + => "--with-shared" + withFeature false "shared" + => "--without-shared" + ``` + + ::: */ withFeature = flag: feature: assert isString feature; # e.g. passing openssl instead of "openssl" "--${if flag then "with" else "without"}-${feature}"; - /* Create an --{with-=,without-} string that can be passed to - standard GNU Autoconf scripts. + /** + Create an --{with-=,without-} string that can be passed to + standard GNU Autoconf scripts. - Example: - withFeatureAs true "shared" "foo" - => "--with-shared=foo" - withFeatureAs false "shared" (throw "ignored") - => "--without-shared" + + # Inputs + + `flag` + : 1\. Function argument + + `feature` + : 2\. Function argument + + `value` + : 3\. Function argument + + # Type + + ``` + withFeatureAs :: bool -> string -> string -> string + ``` + + + # Examples + :::{.example} + ## `lib.strings.withFeatureAs` usage example + + ```nix + withFeatureAs true "shared" "foo" + => "--with-shared=foo" + withFeatureAs false "shared" (throw "ignored") + => "--without-shared" + ``` + + ::: */ withFeatureAs = flag: feature: value: withFeature flag feature + optionalString flag "=${value}"; - /* Create a fixed width string with additional prefix to match - required width. + /** + Create a fixed width string with additional prefix to match + required width. - This function will fail if the input string is longer than the - requested length. + This function will fail if the input string is longer than the + requested length. - Type: fixedWidthString :: int -> string -> string -> string - Example: - fixedWidthString 5 "0" (toString 15) - => "00015" + # Inputs + + `width` + : 1\. Function argument + + `filler` + : 2\. Function argument + + `str` + : 3\. Function argument + + # Type + + ``` + fixedWidthString :: int -> string -> string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.fixedWidthString` usage example + + ```nix + fixedWidthString 5 "0" (toString 15) + => "00015" + ``` + + ::: */ fixedWidthString = width: filler: str: let @@ -1017,23 +2176,67 @@ rec { toString strw})"; if strw == width then str else filler + fixedWidthString reqWidth filler str; - /* Format a number adding leading zeroes up to fixed width. + /** + Format a number adding leading zeroes up to fixed width. - Example: - fixedWidthNumber 5 15 - => "00015" + + # Inputs + + `width` + : 1\. Function argument + + `n` + : 2\. Function argument + + # Type + + ``` + fixedWidthNumber :: int -> int -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.fixedWidthNumber` usage example + + ```nix + fixedWidthNumber 5 15 + => "00015" + ``` + + ::: */ fixedWidthNumber = width: n: fixedWidthString width "0" (toString n); - /* Convert a float to a string, but emit a warning when precision is lost - during the conversion + /** + Convert a float to a string, but emit a warning when precision is lost + during the conversion - Example: - floatToString 0.000001 - => "0.000001" - floatToString 0.0000001 - => trace: warning: Imprecise conversion from float to string 0.000000 - "0.000000" + + # Inputs + + `float` + : 1\. Function argument + + + # Type + + ``` + floatToString :: float -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.floatToString` usage example + + ```nix + floatToString 0.000001 + => "0.000001" + floatToString 0.0000001 + => trace: warning: Imprecise conversion from float to string 0.000000 + "0.000000" + ``` + + ::: */ floatToString = float: let result = toString float; @@ -1041,16 +2244,45 @@ rec { in lib.warnIf (!precise) "Imprecise conversion from float to string ${result}" result; - /* Soft-deprecated function. While the original implementation is available as - isConvertibleWithToString, consider using isStringLike instead, if suitable. */ + /** + Check whether a value `val` can be coerced to a string. + + :::{.warning} + Soft-deprecated function. While the original implementation is available as + `isConvertibleWithToString`, consider using `isStringLike` instead, if suitable. + ::: + + # Inputs + + `val` + : 1\. Function argument + + # Type + + ``` + isCoercibleToString :: a -> bool + ``` + */ isCoercibleToString = lib.warnIf (lib.isInOldestRelease 2305) "lib.strings.isCoercibleToString is deprecated in favor of either isStringLike or isConvertibleWithToString. Only use the latter if it needs to return true for null, numbers, booleans and list of similarly coercibles." isConvertibleWithToString; - /* Check whether a list or other value can be passed to toString. + /** + Check whether a list or other value `x` can be passed to toString. - Many types of value are coercible to string this way, including int, float, - null, bool, list of similarly coercible values. + Many types of value are coercible to string this way, including `int`, `float`, + `null`, `bool`, `list` of similarly coercible values. + + # Inputs + + `val` + : 1\. Function argument + + # Type + + ``` + isConvertibleWithToString :: a -> bool + ``` */ isConvertibleWithToString = let types = [ "null" "int" "float" "bool" ]; @@ -1059,29 +2291,62 @@ rec { elem (typeOf x) types || (isList x && lib.all isConvertibleWithToString x); - /* Check whether a value can be coerced to a string. - The value must be a string, path, or attribute set. + /** + Check whether a value can be coerced to a string. + The value must be a string, path, or attribute set. - String-like values can be used without explicit conversion in - string interpolations and in most functions that expect a string. - */ + String-like values can be used without explicit conversion in + string interpolations and in most functions that expect a string. + + + # Inputs + + `x` + : 1\. Function argument + + # Type + + ``` + isStringLike :: a -> bool + ``` + */ isStringLike = x: isString x || isPath x || x ? outPath || x ? __toString; - /* Check whether a value is a store path. + /** + Check whether a value `x` is a store path. - Example: - isStorePath "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11/bin/python" - => false - isStorePath "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11" - => true - isStorePath pkgs.python - => true - isStorePath [] || isStorePath 42 || isStorePath {} || … - => false + + # Inputs + + `x` + : 1\. Function argument + + # Type + + ``` + isStorePath :: a -> bool + ``` + + # Examples + :::{.example} + ## `lib.strings.isStorePath` usage example + + ```nix + isStorePath "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11/bin/python" + => false + isStorePath "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11" + => true + isStorePath pkgs.python + => true + isStorePath [] || isStorePath 42 || isStorePath {} || … + => false + ``` + + ::: */ isStorePath = x: if isStringLike x then @@ -1091,27 +2356,43 @@ rec { else false; - /* Parse a string as an int. Does not support parsing of integers with preceding zero due to - ambiguity between zero-padded and octal numbers. See toIntBase10. + /** + Parse a string as an int. Does not support parsing of integers with preceding zero due to + ambiguity between zero-padded and octal numbers. See toIntBase10. - Type: string -> int + # Inputs - Example: + `str` + : A string to be interpreted as an int. - toInt "1337" - => 1337 + # Type - toInt "-4" - => -4 + ``` + toInt :: string -> int + ``` - toInt " 123 " - => 123 + # Examples + :::{.example} + ## `lib.strings.toInt` usage example - toInt "00024" - => error: Ambiguity in interpretation of 00024 between octal and zero padded integer. + ```nix + toInt "1337" + => 1337 - toInt "3.14" - => error: floating point JSON numbers are not supported + toInt "-4" + => -4 + + toInt " 123 " + => 123 + + toInt "00024" + => error: Ambiguity in interpretation of 00024 between octal and zero padded integer. + + toInt "3.14" + => error: floating point JSON numbers are not supported + ``` + + ::: */ toInt = let @@ -1146,25 +2427,42 @@ rec { else parsedInput; - /* Parse a string as a base 10 int. This supports parsing of zero-padded integers. + /** + Parse a string as a base 10 int. This supports parsing of zero-padded integers. - Type: string -> int + # Inputs - Example: - toIntBase10 "1337" - => 1337 + `str` + : A string to be interpreted as an int. - toIntBase10 "-4" - => -4 + # Type - toIntBase10 " 123 " - => 123 + ``` + toIntBase10 :: string -> int + ``` - toIntBase10 "00024" - => 24 + # Examples + :::{.example} + ## `lib.strings.toIntBase10` usage example - toIntBase10 "3.14" - => error: floating point JSON numbers are not supported + ```nix + toIntBase10 "1337" + => 1337 + + toIntBase10 "-4" + => -4 + + toIntBase10 " 123 " + => 123 + + toIntBase10 "00024" + => 24 + + toIntBase10 "3.14" + => error: floating point JSON numbers are not supported + ``` + + ::: */ toIntBase10 = let @@ -1199,20 +2497,48 @@ rec { # Return result. else parsedInput; - /* Read a list of paths from `file`, relative to the `rootPath`. - Lines beginning with `#` are treated as comments and ignored. - Whitespace is significant. + /** + Read a list of paths from `file`, relative to the `rootPath`. + Lines beginning with `#` are treated as comments and ignored. + Whitespace is significant. - NOTE: This function is not performant and should be avoided. + :::{.warning} + This function is deprecated and should be avoided. + ::: - Example: - readPathsFromFile /prefix - ./pkgs/development/libraries/qt-5/5.4/qtbase/series - => [ "/prefix/dlopen-resolv.patch" "/prefix/tzdir.patch" - "/prefix/dlopen-libXcursor.patch" "/prefix/dlopen-openssl.patch" - "/prefix/dlopen-dbus.patch" "/prefix/xdg-config-dirs.patch" - "/prefix/nix-profiles-library-paths.patch" - "/prefix/compose-search-path.patch" ] + :::{.note} + This function is not performant and should be avoided. + ::: + + # Inputs + + `rootPath` + : 1\. Function argument + + `file` + : 2\. Function argument + + # Type + + ``` + readPathsFromFile :: string -> string -> [string] + ``` + + # Examples + :::{.example} + ## `lib.strings.readPathsFromFile` usage example + + ```nix + readPathsFromFile /prefix + ./pkgs/development/libraries/qt-5/5.4/qtbase/series + => [ "/prefix/dlopen-resolv.patch" "/prefix/tzdir.patch" + "/prefix/dlopen-libXcursor.patch" "/prefix/dlopen-openssl.patch" + "/prefix/dlopen-dbus.patch" "/prefix/xdg-config-dirs.patch" + "/prefix/nix-profiles-library-paths.patch" + "/prefix/compose-search-path.patch" ] + ``` + + ::: */ readPathsFromFile = lib.warn "lib.readPathsFromFile is deprecated, use a list instead." (rootPath: file: @@ -1224,30 +2550,65 @@ rec { in absolutePaths); - /* Read the contents of a file removing the trailing \n + /** + Read the contents of a file removing the trailing \n - Type: fileContents :: path -> string - Example: - $ echo "1.0" > ./version + # Inputs - fileContents ./version - => "1.0" + `file` + : 1\. Function argument + + # Type + + ``` + fileContents :: path -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.fileContents` usage example + + ```nix + $ echo "1.0" > ./version + + fileContents ./version + => "1.0" + ``` + + ::: */ fileContents = file: removeSuffix "\n" (readFile file); - /* Creates a valid derivation name from a potentially invalid one. + /** + Creates a valid derivation name from a potentially invalid one. - Type: sanitizeDerivationName :: String -> String + # Inputs - Example: - sanitizeDerivationName "../hello.bar # foo" - => "-hello.bar-foo" - sanitizeDerivationName "" - => "unknown" - sanitizeDerivationName pkgs.hello - => "-nix-store-2g75chlbpxlrqn15zlby2dfh8hr9qwbk-hello-2.10" + `string` + : 1\. Function argument + + # Type + + ``` + sanitizeDerivationName :: String -> String + ``` + + # Examples + :::{.example} + ## `lib.strings.sanitizeDerivationName` usage example + + ```nix + sanitizeDerivationName "../hello.bar # foo" + => "-hello.bar-foo" + sanitizeDerivationName "" + => "unknown" + sanitizeDerivationName pkgs.hello + => "-nix-store-2g75chlbpxlrqn15zlby2dfh8hr9qwbk-hello-2.10" + ``` + + ::: */ sanitizeDerivationName = let okRegex = match "[[:alnum:]+_?=-][[:alnum:]+._?=-]*"; @@ -1274,19 +2635,41 @@ rec { (x: if stringLength x == 0 then "unknown" else x) ]; - /* Computes the Levenshtein distance between two strings. - Complexity O(n*m) where n and m are the lengths of the strings. - Algorithm adjusted from https://stackoverflow.com/a/9750974/6605742 + /** + Computes the Levenshtein distance between two strings `a` and `b`. - Type: levenshtein :: string -> string -> int + Complexity O(n*m) where n and m are the lengths of the strings. + Algorithm adjusted from https://stackoverflow.com/a/9750974/6605742 - Example: - levenshtein "foo" "foo" - => 0 - levenshtein "book" "hook" - => 1 - levenshtein "hello" "Heyo" - => 3 + + # Inputs + + `a` + : 1\. Function argument + + `b` + : 2\. Function argument + + # Type + + ``` + levenshtein :: string -> string -> int + ``` + + # Examples + :::{.example} + ## `lib.strings.levenshtein` usage example + + ```nix + levenshtein "foo" "foo" + => 0 + levenshtein "book" "hook" + => 1 + levenshtein "hello" "Heyo" + => 3 + ``` + + ::: */ levenshtein = a: b: let # Two dimensional array with dimensions (stringLength a + 1, stringLength b + 1) @@ -1307,7 +2690,23 @@ rec { ( d (i - 1) (j - 1) + c ); in d (stringLength a) (stringLength b); - /* Returns the length of the prefix common to both strings. + /** + Returns the length of the prefix that appears in both strings `a` and `b`. + + + # Inputs + + `a` + : 1\. Function argument + + `b` + : 2\. Function argument + + # Type + + ``` + commonPrefixLength :: string -> string -> int + ``` */ commonPrefixLength = a: b: let @@ -1315,7 +2714,23 @@ rec { go = i: if i >= m then m else if substring i 1 a == substring i 1 b then go (i + 1) else i; in go 0; - /* Returns the length of the suffix common to both strings. + /** + Returns the length of the suffix common to both strings `a` and `b`. + + + # Inputs + + `a` + : 1\. Function argument + + `b` + : 2\. Function argument + + # Type + + ``` + commonSuffixLength :: string -> string -> int + ``` */ commonSuffixLength = a: b: let @@ -1323,23 +2738,46 @@ rec { go = i: if i >= m then m else if substring (stringLength a - i - 1) 1 a == substring (stringLength b - i - 1) 1 b then go (i + 1) else i; in go 0; - /* Returns whether the levenshtein distance between two strings is at most some value - Complexity is O(min(n,m)) for k <= 2 and O(n*m) otherwise + /** + Returns whether the levenshtein distance between two strings `a` and `b` is at most some value `k`. - Type: levenshteinAtMost :: int -> string -> string -> bool + Complexity is O(min(n,m)) for k <= 2 and O(n*m) otherwise - Example: - levenshteinAtMost 0 "foo" "foo" - => true - levenshteinAtMost 1 "foo" "boa" - => false - levenshteinAtMost 2 "foo" "boa" - => true - levenshteinAtMost 2 "This is a sentence" "this is a sentense." - => false - levenshteinAtMost 3 "This is a sentence" "this is a sentense." - => true + # Inputs + `k` + : Distance threshold + + `a` + : String `a` + + `b` + : String `b` + + # Type + + ``` + levenshteinAtMost :: int -> string -> string -> bool + ``` + + # Examples + :::{.example} + ## `lib.strings.levenshteinAtMost` usage example + + ```nix + levenshteinAtMost 0 "foo" "foo" + => true + levenshteinAtMost 1 "foo" "boa" + => false + levenshteinAtMost 2 "foo" "boa" + => true + levenshteinAtMost 2 "This is a sentence" "this is a sentense." + => false + levenshteinAtMost 3 "This is a sentence" "this is a sentense." + => true + ``` + + ::: */ levenshteinAtMost = let infixDifferAtMost1 = x: y: stringLength x <= 1 && stringLength y <= 1; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 864367a22444..d5e0e9468be9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -822,6 +822,12 @@ githubId = 20405311; name = "Aksh Gupta"; }; + akssri = { + email = "akssri@vakra.xyz"; + github = "akssri"; + githubId = 108771991; + name = "Akṣaya Śrīnivāsan"; + }; aktaboot = { email = "akhtaboo@protonmail.com"; github = "aktaboot"; @@ -2369,6 +2375,13 @@ githubId = 164148; name = "Ben Darwin"; }; + bchmnn = { + email = "jacob.bachmann@posteo.de"; + matrix = "@trilloyd:matrix.tu-berlin.de"; + github = "bchmnn"; + githubId = 34620799; + name = "Jacob Bachmann"; + }; bdd = { email = "bdd@mindcast.org"; github = "bdd"; @@ -7353,7 +7366,7 @@ }; getpsyched = { name = "Priyanshu Tripathi"; - email = "priyanshu@getpsyched.dev"; + email = "nixos@getpsyched.dev"; matrix = "@getpsyched:matrix.org"; github = "getpsyched"; githubId = 43472218; @@ -20101,6 +20114,12 @@ githubId = 29044; name = "Jacek Galowicz"; }; + tfkhdyt = { + email = "tfkhdyt@proton.me"; + name = "Taufik Hidayat"; + github = "tfkhdyt"; + githubId = 47195537; + }; tfmoraes = { name = "Thiago Franco de Moraes"; github = "tfmoraes"; diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 4aaec6406458..7fb67789265f 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -16,6 +16,8 @@ - `hardware.display` is a new module implementing workarounds for misbehaving monitors through setting up custom EDID files and forcing kernel/framebuffer modes. +- NixOS now has support for *automatic boot assessment* (see [here](https://systemd.io/AUTOMATIC_BOOT_ASSESSMENT/)) for detailed description of the feature) for `systemd-boot` users. Available as [boot.loader.systemd-boot.bootCounting](#opt-boot.loader.systemd-boot.bootCounting.enable). + ## New Services {#sec-release-24.11-new-services} - [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr), proxy server to bypass Cloudflare protection. Available as [services.flaresolverr](#opt-services.flaresolverr.enable) service. diff --git a/nixos/modules/services/backup/restic-rest-server.nix b/nixos/modules/services/backup/restic-rest-server.nix index 935907643bd2..eb7b57800333 100644 --- a/nixos/modules/services/backup/restic-rest-server.nix +++ b/nixos/modules/services/backup/restic-rest-server.nix @@ -15,7 +15,7 @@ in default = "8000"; example = "127.0.0.1:8080"; type = types.str; - description = "Listen on a specific IP address and port."; + description = "Listen on a specific IP address and port or unix socket."; }; dataDir = mkOption { diff --git a/nixos/modules/services/games/archisteamfarm.nix b/nixos/modules/services/games/archisteamfarm.nix index 7062332db34a..630329175968 100644 --- a/nixos/modules/services/games/archisteamfarm.nix +++ b/nixos/modules/services/games/archisteamfarm.nix @@ -164,11 +164,8 @@ in }; config = lib.mkIf cfg.enable { - services.archisteamfarm = { - # TODO: drop with 24.11 - dataDir = lib.mkIf (lib.versionAtLeast config.system.stateVersion "24.05") (lib.mkDefault "/var/lib/asf"); - settings.IPC = lib.mkIf (!cfg.web-ui.enable) false; - }; + # TODO: drop with 24.11 + services.archisteamfarm.dataDir = lib.mkIf (lib.versionAtLeast config.system.stateVersion "24.05") (lib.mkDefault "/var/lib/asf"); users = { users.archisteamfarm = { diff --git a/nixos/modules/services/misc/radicle.nix b/nixos/modules/services/misc/radicle.nix index 7d7804c6eadd..3a393bf0f1f2 100644 --- a/nixos/modules/services/misc/radicle.nix +++ b/nixos/modules/services/misc/radicle.nix @@ -119,7 +119,8 @@ in enable = mkEnableOption "Radicle Seed Node"; package = mkPackageOption pkgs "radicle-node" { }; privateKeyFile = mkOption { - type = types.path; + # Note that a key encrypted by systemd-creds is not a path but a str. + type = with types; either path str; description = '' Absolute file path to an SSH private key, usually generated by `rad auth`. diff --git a/nixos/modules/system/boot/loader/systemd-boot/boot-counting.md b/nixos/modules/system/boot/loader/systemd-boot/boot-counting.md new file mode 100644 index 000000000000..743584b52591 --- /dev/null +++ b/nixos/modules/system/boot/loader/systemd-boot/boot-counting.md @@ -0,0 +1,38 @@ +# Automatic boot assessment with systemd-boot {#sec-automatic-boot-assessment} + +## Overview {#sec-automatic-boot-assessment-overview} + +Automatic boot assessment (or boot-counting) is a feature of `systemd-boot` that allows for automatically detecting invalid boot entries. +When the feature is active, each boot entry has an associated counter with a user defined number of trials. Whenever `systemd-boot` boots an entry, its counter is decreased by one, ultimately being marked as *bad* if the counter ever reaches zero. However, if an entry is successfully booted, systemd will permanently mark it as *good* and remove the counter altogether. Whenever an entry is marked as *bad*, it is sorted last in the `systemd-boot` menu. +A complete explanation of how that feature works can be found [here](https://systemd.io/AUTOMATIC_BOOT_ASSESSMENT/). + +## Enabling the feature {#sec-automatic-boot-assessment-enable} + +The feature can be enabled by toogling the [boot.loader.systemd-boot.bootCounting](#opt-boot.loader.systemd-boot.bootCounting.enable) option. + +## The boot-complete.target unit {#sec-automatic-boot-assessment-boot-complete-target} + +A *successful boot* for an entry is defined in terms of the `boot-complete.target` synchronisation point. It is up to the user to schedule all necessary units for the machine to be considered successfully booted before that synchronisation point. +For example, if you are running `docker` on a machine and you want to be sure that a *good* entry is an entry where docker is started successfully. +A configuration for that NixOS machine could look like that: + +``` +boot.loader.systemd-boot.bootCounting.enable = true; +services.docker.enable = true; + +systemd.services.docker = { + before = [ "boot-complete.target" ]; + wantedBy = [ "boot-complete.target" ]; + unitConfig.FailureAction = "reboot"; +}; +``` + +The systemd service type must be of type `notify` or `oneshot` for systemd to dectect the startup error properly. + +## Interaction with specialisations {#sec-automatic-boot-assessment-specialisations} + +When the boot-counting feature is enabled, `systemd-boot` will still try the boot entries in the same order as they are displayed in the boot menu. This means that the specialisations of a given generation will be tried directly after that generation, but that behavior is customizable with the [boot.loader.systemd-boot.sortKey](#opt-boot.loader.systemd-boot.sortKey) option. + +## Limitations {#sec-automatic-boot-assessment-limitations} + +This feature has to be used wisely to not risk any data integrity issues. Rollbacking into past generations can sometimes be dangerous, for example if some of the services may have undefined behaviors in the presence of unrecognized data migrations from future versions of themselves. 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 0d8763e97154..87ea569bdb74 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 @@ -12,8 +12,9 @@ import subprocess import sys import warnings import json -from typing import NamedTuple, Any +from typing import NamedTuple, Any, Type from dataclasses import dataclass +from pathlib import Path # These values will be replaced with actual values during the package build EFI_SYS_MOUNT_POINT = "@efiSysMountPoint@" @@ -32,6 +33,8 @@ CAN_TOUCH_EFI_VARIABLES = "@canTouchEfiVariables@" GRACEFUL = "@graceful@" COPY_EXTRA_FILES = "@copyExtraFiles@" CHECK_MOUNTPOINTS = "@checkMountpoints@" +BOOT_COUNTING_TRIES = "@bootCountingTries@" +BOOT_COUNTING = "@bootCounting@" == "True" @dataclass class BootSpec: @@ -46,6 +49,104 @@ class BootSpec: sortKey: str # noqa: N815 initrdSecrets: str | None = None # noqa: N815 +@dataclass +class Entry: + profile: str | None + generation_number: int + specialisation: str | None + + @classmethod + def from_path(cls: Type["Entry"], path: Path) -> "Entry": + filename = path.name + # Matching nixos-$profile-generation-*.conf + rex_profile = re.compile(r"^nixos-(.*)-generation-.*\.conf$") + # Matching nixos*-generation-$number*.conf + rex_generation = re.compile(r"^nixos.*-generation-([0-9]+).*\.conf$") + # Matching nixos*-generation-$number-specialisation-$specialisation_name*.conf + rex_specialisation = re.compile(r"^nixos.*-generation-([0-9]+)-specialisation-([a-zA-Z0-9]+).*\.conf$") + profile = rex_profile.sub(r"\1", filename) if rex_profile.match(filename) else None + specialisation = rex_specialisation.sub(r"\2", filename) if rex_specialisation.match(filename) else None + try: + generation_number = int(rex_generation.sub(r"\1", filename)) + except ValueError: + raise + return cls(profile, generation_number, specialisation) + +@dataclass +class DiskEntry: + entry: Entry + default: bool + counters: str | None + title: str | None + description: str | None + kernel: str + initrd: str + kernel_params: str | None + machine_id: str | None + sort_key: str + + @classmethod + def from_path(cls: Type["DiskEntry"], path: Path) -> "DiskEntry": + entry = Entry.from_path(path) + data = path.read_text().splitlines() + if '' in data: + data.remove('') + entry_map = dict(lines.split(' ', 1) for lines in data) + assert "linux" in entry_map + assert "initrd" in entry_map + filename = path.name + # Matching nixos*-generation-*$counters.conf + rex_counters = re.compile(r"^nixos.*-generation-.*(\+\d(-\d)?)\.conf$") + counters = rex_counters.sub(r"\1", filename) if rex_counters.match(filename) else None + disk_entry = cls( + entry=entry, + default=(entry_map.get("sort-key") == "default"), + counters=counters, + title=entry_map.get("title"), + description=entry_map.get("version"), + kernel=entry_map["linux"], + initrd=entry_map["initrd"], + kernel_params=entry_map.get("options"), + machine_id=entry_map.get("machine-id"), + sort_key=entry_map.get("sort_key", "nixos")) + return disk_entry + + def write(self, sorted_first: str) -> None: + # Compute a sort-key sorted before sorted_first + # This will compute something like: nixos -> nixor-default to make sure we come before other nixos entries, + # while allowing users users can pre-pend their own entries before. + default_sort_key = sorted_first[:-1] + chr(ord(sorted_first[-1])-1) + "-default" + tmp_path = self.path.with_suffix(".tmp") + with tmp_path.open('w') as f: + # We use "sort-key" to sort the default generation first. + # The "default" string is sorted before "non-default" (alphabetically) + boot_entry = [ + f"title {self.title}" if self.title is not None else None, + f"version {self.description}" if self.description is not None else None, + f"linux {self.kernel}", + f"initrd {self.initrd}", + f"options {self.kernel_params}" if self.kernel_params is not None else None, + f"machine-id {self.machine_id}" if self.machine_id is not None else None, + f"sort-key {default_sort_key if self.default else self.sort_key}" + ] + + f.write("\n".join(filter(None, boot_entry))) + f.flush() + os.fsync(f.fileno()) + tmp_path.rename(self.path) + + + @property + def path(self) -> Path: + pieces = [ + "nixos", + self.entry.profile or None, + "generation", + str(self.entry.generation_number), + f"specialisation-{self.entry.specialisation}" if self.entry.specialisation else None, + ] + prefix = "-".join(p for p in pieces if p) + return Path(f"{BOOT_MOUNT_POINT}/loader/entries/{prefix}{self.counters if self.counters else ''}.conf") libc = ctypes.CDLL("libc.so.6") @@ -78,30 +179,14 @@ def system_dir(profile: str | None, generation: int, specialisation: str | None) else: return d -BOOT_ENTRY = """title {title} -sort-key {sort_key} -version Generation {generation} {description} -linux {kernel} -initrd {initrd} -options {kernel_params} -""" - -def generation_conf_filename(profile: str | None, generation: int, specialisation: str | None) -> str: - pieces = [ - "nixos", - profile or None, - "generation", - str(generation), - f"specialisation-{specialisation}" if specialisation else None, - ] - return "-".join(p for p in pieces if p) + ".conf" - - -def write_loader_conf(profile: str | None, generation: int, specialisation: str | None) -> None: - with open(f"{LOADER_CONF}.tmp", 'w') as f: +def write_loader_conf(profile: str | None) -> None: + with open(f"{EFI_SYS_MOUNT_POINT}/loader/loader.conf.tmp", 'w') as f: if TIMEOUT != "": f.write(f"timeout {TIMEOUT}\n") - f.write("default %s\n" % generation_conf_filename(profile, generation, specialisation)) + if profile: + f.write("default nixos-%s-generation-*\n" % profile) + else: + f.write("default nixos-generation-*\n") if not EDITOR: f.write("editor 0\n") f.write(f"console-mode {CONSOLE_MODE}\n") @@ -109,6 +194,19 @@ def write_loader_conf(profile: str | None, generation: int, specialisation: str os.fsync(f.fileno()) os.rename(f"{LOADER_CONF}.tmp", LOADER_CONF) +def scan_entries() -> list[DiskEntry]: + """ + Scan all entries in $ESP/loader/entries/* + Does not support Type 2 entries as we do not support them for now. + Returns a generator of Entry. + """ + entries = [] + for path in Path(f"{EFI_SYS_MOUNT_POINT}/loader/entries/").glob("nixos*-generation-[1-9]*.conf"): + try: + entries.append(DiskEntry.from_path(path)) + except ValueError: + continue + return entries def get_bootspec(profile: str | None, generation: int) -> BootSpec: system_directory = system_dir(profile, generation, None) @@ -151,8 +249,14 @@ def copy_from_file(file: str, dry_run: bool = False) -> str: copy_if_not_exists(store_file_path, f"{BOOT_MOUNT_POINT}{efi_file_path}") return efi_file_path -def write_entry(profile: str | None, generation: int, specialisation: str | None, - machine_id: str, bootspec: BootSpec, current: bool) -> None: +def write_entry(profile: str | None, + generation: int, + specialisation: str | None, + machine_id: str, + bootspec: BootSpec, + entries: list[DiskEntry], + sorted_first: str, + current: bool) -> None: if specialisation: bootspec = bootspec.specialisations[specialisation] kernel = copy_from_file(bootspec.kernel) @@ -175,29 +279,32 @@ def write_entry(profile: str | None, generation: int, specialisation: str | None f'for "{title} - Configuration {generation}", an older generation', file=sys.stderr) print("note: this is normal after having removed " "or renamed a file in `boot.initrd.secrets`", file=sys.stderr) - entry_file = f"{BOOT_MOUNT_POINT}/loader/entries/%s" % ( - generation_conf_filename(profile, generation, specialisation)) - tmp_path = "%s.tmp" % (entry_file) kernel_params = "init=%s " % bootspec.init - kernel_params = kernel_params + " ".join(bootspec.kernelParams) build_time = int(os.path.getctime(system_dir(profile, generation, specialisation))) build_date = datetime.datetime.fromtimestamp(build_time).strftime('%F') + counters = f"+{BOOT_COUNTING_TRIES}" if BOOT_COUNTING else "" + entry = Entry(profile, generation, specialisation) + # We check if the entry we are writing is already on disk + # and we update its "default entry" status + for entry_on_disk in entries: + if entry == entry_on_disk.entry: + entry_on_disk.default = current + entry_on_disk.write(sorted_first) + return - with open(tmp_path, 'w') as f: - f.write(BOOT_ENTRY.format(title=title, - sort_key=bootspec.sortKey, - generation=generation, - kernel=kernel, - initrd=initrd, - kernel_params=kernel_params, - description=f"{bootspec.label}, built on {build_date}")) - if machine_id is not None: - f.write("machine-id %s\n" % machine_id) - f.flush() - os.fsync(f.fileno()) - os.rename(tmp_path, entry_file) - + DiskEntry( + entry=entry, + title=title, + kernel=kernel, + initrd=initrd, + counters=counters, + kernel_params=kernel_params, + machine_id=machine_id, + description=f"Generation {generation} {bootspec.label}, built on {build_date}", + sort_key=bootspec.sortKey, + default=current + ).write(sorted_first) def get_generations(profile: str | None = None) -> list[SystemIdentifier]: gen_list = run( @@ -225,30 +332,19 @@ def get_generations(profile: str | None = None) -> list[SystemIdentifier]: return configurations[-configurationLimit:] -def remove_old_entries(gens: list[SystemIdentifier]) -> None: - rex_profile = re.compile(r"^" + re.escape(BOOT_MOUNT_POINT) + r"/loader/entries/nixos-(.*)-generation-.*\.conf$") - rex_generation = re.compile(r"^" + re.escape(BOOT_MOUNT_POINT) + r"/loader/entries/nixos.*-generation-([0-9]+)(-specialisation-.*)?\.conf$") +def remove_old_entries(gens: list[SystemIdentifier], disk_entries: list[DiskEntry]) -> None: known_paths = [] for gen in gens: bootspec = get_bootspec(gen.profile, gen.generation) known_paths.append(copy_from_file(bootspec.kernel, True)) known_paths.append(copy_from_file(bootspec.initrd, True)) - for path in glob.iglob(f"{BOOT_MOUNT_POINT}/loader/entries/nixos*-generation-[1-9]*.conf"): - if rex_profile.match(path): - prof = rex_profile.sub(r"\1", path) - else: - prof = None - try: - gen_number = int(rex_generation.sub(r"\1", path)) - except ValueError: - continue - if (prof, gen_number, None) not in gens: - os.unlink(path) - for path in glob.iglob(f"{BOOT_MOUNT_POINT}/{NIXOS_DIR}/*"): + for disk_entry in disk_entries: + if (disk_entry.entry.profile, disk_entry.entry.generation_number, None) not in gens: + os.unlink(disk_entry.path) + for path in glob.iglob(f"{EFI_SYS_MOUNT_POINT}/efi/nixos/*"): if path not in known_paths and not os.path.isdir(path): os.unlink(path) - def cleanup_esp() -> None: for path in glob.iglob(f"{EFI_SYS_MOUNT_POINT}/loader/entries/nixos*"): os.unlink(path) @@ -267,7 +363,7 @@ def get_profiles() -> list[str]: def install_bootloader(args: argparse.Namespace) -> None: try: with open("/etc/machine-id") as machine_file: - machine_id = machine_file.readlines()[0] + machine_id = machine_file.readlines()[0].strip() except IOError as e: if e.errno != errno.ENOENT: raise @@ -351,18 +447,32 @@ def install_bootloader(args: argparse.Namespace) -> None: gens = get_generations() for profile in get_profiles(): gens += get_generations(profile) - - remove_old_entries(gens) + entries = scan_entries() + remove_old_entries(gens, entries) + # Compute the sort-key that will be sorted first. + sorted_first = "" + for gen in gens: + try: + bootspec = get_bootspec(gen.profile, gen.generation) + if bootspec.sortKey < sorted_first or sorted_first == "": + sorted_first = bootspec.sortKey + except OSError as e: + # See https://github.com/NixOS/nixpkgs/issues/114552 + if e.errno == errno.EINVAL: + profile = f"profile '{gen.profile}'" if gen.profile else "default profile" + print("ignoring {} in the list of boot entries because of the following error:\n{}".format(profile, e), file=sys.stderr) + else: + raise e for gen in gens: try: bootspec = get_bootspec(gen.profile, gen.generation) is_default = os.path.dirname(bootspec.init) == args.default_config - write_entry(*gen, machine_id, bootspec, current=is_default) + write_entry(*gen, machine_id, bootspec, entries, sorted_first, current=is_default) for specialisation in bootspec.specialisations.keys(): - write_entry(gen.profile, gen.generation, specialisation, machine_id, bootspec, current=is_default) + write_entry(gen.profile, gen.generation, specialisation, machine_id, bootspec, entries, sorted_first, current=(is_default and bootspec.specialisations[specialisation].sortKey == bootspec.sortKey)) if is_default: - write_loader_conf(*gen) + write_loader_conf(gen.profile) except OSError as e: # See https://github.com/NixOS/nixpkgs/issues/114552 if e.errno == errno.EINVAL: 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 0a27237e18fd..b1b2b02e6d04 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -80,6 +80,8 @@ let ${pkgs.coreutils}/bin/install -D $empty_file "${bootMountPoint}/${nixosDir}/.extra-files/loader/entries/"${escapeShellArg n} '') cfg.extraEntries)} ''; + bootCountingTries = cfg.bootCounting.tries; + bootCounting = if cfg.bootCounting.enable then "True" else "False"; }; finalSystemdBootBuilder = pkgs.writeScript "install-systemd-boot.sh" '' @@ -89,7 +91,10 @@ let ''; in { - meta.maintainers = with lib.maintainers; [ julienmalka ]; + meta = { + maintainers = with lib.maintainers; [ julienmalka ]; + doc = ./boot-counting.md; + }; imports = [ (mkRenamedOptionModule [ "boot" "loader" "gummiboot" "enable" ] [ "boot" "loader" "systemd-boot" "enable" ]) @@ -319,6 +324,15 @@ in { ''; }; + bootCounting = { + enable = mkEnableOption "automatic boot assessment"; + tries = mkOption { + default = 3; + type = types.int; + description = "number of tries each entry should start with"; + }; + }; + }; config = mkIf cfg.enable { diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 76a6751b0570..c81811f70dff 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -105,6 +105,10 @@ let "systemd-rfkill.service" "systemd-rfkill.socket" + # Boot counting + "boot-complete.target" + ] ++ lib.optional config.boot.loader.systemd-boot.bootCounting.enable "systemd-bless-boot.service" ++ [ + # Hibernate / suspend. "hibernate.target" "suspend.target" diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index e22c7d735a23..f26038c443e2 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -23,7 +23,7 @@ let assert "${linuxPackages.kernel.modDirVersion}" in machine.succeed("uname -a") ''; }) args); - kernels = (removeAttrs pkgs.linuxKernel.vanillaPackages ["__attrsFailEvaluation"]) // { + kernels = pkgs.linuxKernel.vanillaPackages // { inherit (pkgs.linuxKernel.packages) linux_4_19_hardened linux_5_4_hardened diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix index d2a4a009af53..9806a1e3052e 100644 --- a/nixos/tests/pantheon.nix +++ b/nixos/tests/pantheon.nix @@ -96,9 +96,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : cmd = "dbus-send --session --dest=org.pantheon.gala --print-reply /org/pantheon/gala org.pantheon.gala.PerformAction int32:1" env = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${toString user.uid}/bus DISPLAY=:0" machine.succeed(f"su - ${user.name} -c '{env} {cmd}'") - machine.sleep(3) + machine.sleep(5) machine.screenshot("multitasking") - machine.succeed(f"su - ${user.name} -c '{env} {cmd}'") with subtest("Check if gala has ever coredumped"): machine.fail("coredumpctl --json=short | grep gala") diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix index a7b220d11168..eb85b25b158b 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -13,6 +13,8 @@ let boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; environment.systemPackages = [ pkgs.efibootmgr ]; + # Needed for machine-id to be persisted between reboots + environment.etc."machine-id".text = "00000000000000000000000000000000"; }; commonXbootldr = { config, lib, pkgs, ... }: @@ -81,7 +83,7 @@ let os.environ['NIX_DISK_IMAGE'] = tmp_disk_image.name ''; in -{ +rec { basic = makeTest { name = "systemd-boot"; meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer julienmalka ]; @@ -93,7 +95,8 @@ in machine.wait_for_unit("multi-user.target") machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf") - machine.succeed("grep 'sort-key nixos' /boot/loader/entries/nixos-generation-1.conf") + # our sort-key will uses r to sort before nixos + machine.succeed("grep 'sort-key nixor-default' /boot/loader/entries/nixos-generation-1.conf") # Ensure we actually booted using systemd-boot # Magic number is the vendor UUID used by systemd-boot. @@ -399,15 +402,15 @@ in ''; }; - garbage-collect-entry = makeTest { - name = "systemd-boot-garbage-collect-entry"; + garbage-collect-entry = { withBootCounting ? false, ... }: makeTest { + name = "systemd-boot-garbage-collect-entry" + optionalString withBootCounting "-with-boot-counting"; meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; nodes = { inherit common; machine = { pkgs, nodes, ... }: { imports = [ common ]; - + boot.loader.systemd-boot.bootCounting.enable = withBootCounting; # These are configs for different nodes, but we'll use them here in `machine` system.extraDependencies = [ nodes.common.system.build.toplevel @@ -422,8 +425,12 @@ in '' machine.succeed("nix-env -p /nix/var/nix/profiles/system --set ${baseSystem}") machine.succeed("nix-env -p /nix/var/nix/profiles/system --delete-generations 1") + # At this point generation 1 has already been marked as good so we reintroduce counters artificially + ${optionalString withBootCounting '' + machine.succeed("mv /boot/loader/entries/nixos-generation-1.conf /boot/loader/entries/nixos-generation-1+3.conf") + ''} machine.succeed("${baseSystem}/bin/switch-to-configuration boot") - machine.fail("test -e /boot/loader/entries/nixos-generation-1.conf") + machine.fail("test -e /boot/loader/entries/nixos-generation-1*") machine.succeed("test -e /boot/loader/entries/nixos-generation-2.conf") ''; }; @@ -443,4 +450,138 @@ in machine.wait_for_unit("multi-user.target") ''; }; + + # Check that we are booting the default entry and not the generation with largest version number + defaultEntry = { withBootCounting ? false, ... }: makeTest { + name = "systemd-boot-default-entry" + optionalString withBootCounting "-with-boot-counting"; + meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; + + nodes = { + machine = { pkgs, lib, nodes, ... }: { + imports = [ common ]; + system.extraDependencies = [ nodes.other_machine.system.build.toplevel ]; + boot.loader.systemd-boot.bootCounting.enable = withBootCounting; + }; + + other_machine = { pkgs, lib, ... }: { + imports = [ common ]; + boot.loader.systemd-boot.bootCounting.enable = withBootCounting; + environment.systemPackages = [ pkgs.hello ]; + }; + }; + testScript = { nodes, ... }: + let + orig = nodes.machine.system.build.toplevel; + other = nodes.other_machine.system.build.toplevel; + in + '' + orig = "${orig}" + other = "${other}" + + def check_current_system(system_path): + machine.succeed(f'test $(readlink -f /run/current-system) = "{system_path}"') + + check_current_system(orig) + + # Switch to other configuration + machine.succeed("nix-env -p /nix/var/nix/profiles/system --set ${other}") + machine.succeed(f"{other}/bin/switch-to-configuration boot") + # Rollback, default entry is now generation 1 + machine.succeed("nix-env -p /nix/var/nix/profiles/system --rollback") + machine.succeed(f"{orig}/bin/switch-to-configuration boot") + machine.shutdown() + machine.start() + machine.wait_for_unit("multi-user.target") + # Check that we booted generation 1 (default) + # even though generation 2 comes first in alphabetical order + check_current_system(orig) + ''; + }; + + + bootCounting = + let + baseConfig = { pkgs, lib, ... }: { + imports = [ common ]; + boot.loader.systemd-boot.bootCounting.enable = true; + boot.loader.systemd-boot.bootCounting.trials = 2; + }; + in + makeTest { + name = "systemd-boot-counting"; + meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; + + nodes = { + machine = { pkgs, lib, nodes, ... }: { + imports = [ baseConfig ]; + system.extraDependencies = [ nodes.bad_machine.system.build.toplevel ]; + }; + + bad_machine = { pkgs, lib, ... }: { + imports = [ baseConfig ]; + + systemd.services."failing" = { + script = "exit 1"; + requiredBy = [ "boot-complete.target" ]; + before = [ "boot-complete.target" ]; + serviceConfig.Type = "oneshot"; + }; + }; + }; + testScript = { nodes, ... }: + let + orig = nodes.machine.system.build.toplevel; + bad = nodes.bad_machine.system.build.toplevel; + in + '' + orig = "${orig}" + bad = "${bad}" + + def check_current_system(system_path): + machine.succeed(f'test $(readlink -f /run/current-system) = "{system_path}"') + + # Ensure we booted using an entry with counters enabled + machine.succeed( + "test -e /sys/firmware/efi/efivars/LoaderBootCountPath-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f" + ) + + # systemd-bless-boot should have already removed the "+2" suffix from the boot entry + machine.wait_for_unit("systemd-bless-boot.service") + machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf") + check_current_system(orig) + + # Switch to bad configuration + machine.succeed("nix-env -p /nix/var/nix/profiles/system --set ${bad}") + machine.succeed(f"{bad}/bin/switch-to-configuration boot") + + # Ensure new bootloader entry has initialized counter + machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf") + machine.succeed("test -e /boot/loader/entries/nixos-generation-2+2.conf") + machine.shutdown() + + machine.start() + machine.wait_for_unit("multi-user.target") + check_current_system(bad) + machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf") + machine.succeed("test -e /boot/loader/entries/nixos-generation-2+1-1.conf") + machine.shutdown() + + machine.start() + machine.wait_for_unit("multi-user.target") + check_current_system(bad) + machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf") + machine.succeed("test -e /boot/loader/entries/nixos-generation-2+0-2.conf") + machine.shutdown() + + # Should boot back into original configuration + machine.start() + check_current_system(orig) + machine.wait_for_unit("multi-user.target") + machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf") + machine.succeed("test -e /boot/loader/entries/nixos-generation-2+0-2.conf") + machine.shutdown() + ''; + }; + defaultEntryWithBootCounting = defaultEntry { withBootCounting = true; }; + garbageCollectEntryWithBootCounting = garbage-collect-entry { withBootCounting = true; }; } diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index 92ee1de47e7c..e01a29f30816 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -19,6 +19,7 @@ , pango , pipewire , pulseaudio +, vulkan-loader , wrapGAppsHook3 , xdg-utils , xorg @@ -27,11 +28,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "5.1.9"; + version = "5.2"; src = fetchurl { url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/"; - hash = "sha256-J5kLqXCMnGb0ZMhES6PQIPjN51ptlBGj4Fy8qSzJ6Qg="; + hash = "sha256:0cnjwgjbpyrb4pd0841zbhy84ps7gkmq3j148ga826nrxnw082pi"; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ]; @@ -66,6 +67,7 @@ stdenv.mkDerivation rec { pipewire pulseaudio stdenv.cc.cc.lib + vulkan-loader xcbutil xcbutilwm zlib diff --git a/pkgs/applications/audio/jacktrip/default.nix b/pkgs/applications/audio/jacktrip/default.nix index afa5f592bf14..e54828e3cdcf 100644 --- a/pkgs/applications/audio/jacktrip/default.nix +++ b/pkgs/applications/audio/jacktrip/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation rec { - version = "2.3.0"; + version = "2.3.1"; pname = "jacktrip"; src = fetchFromGitHub { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { repo = "jacktrip"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-MUP+8Hjrj95D5SONIEsweB5j+kgEhLEWTKWBlEWLt94="; + hash = "sha256-p5NXGmWIzi8M177bPzMKfXMmyMgS1qZuWHdCtBBLeDA="; }; preConfigure = '' diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix index 4f9b5c68c859..11fb94dc0815 100644 --- a/pkgs/applications/audio/jamesdsp/default.nix +++ b/pkgs/applications/audio/jamesdsp/default.nix @@ -11,6 +11,7 @@ , qmake , qtbase , qtsvg +, qtwayland , stdenv , usePipewire ? true , usePulseaudio ? false @@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { libarchive qtbase qtsvg + qtwayland ] ++ lib.optionals usePipewire [ pipewire ] ++ lib.optionals usePulseaudio [ diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 3352135d28cc..728b8dea2470 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , callPackage +, fetchpatch # Required build tools , cmake @@ -69,9 +70,16 @@ in stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; + patches = [ + # Hardcode system installed banks & presets + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/zynaddsubfx/zynaddsubfx/pull/295.patch"; + hash = "sha256-UN62i9/JBs7uWTmHDKk3lkAxUXsVmIs6+6avOcL1NBg="; + }) + ]; + postPatch = '' patchShebangs rtosc/test/test-port-checker.rb src/Tests/check-ports.rb - substituteInPlace src/Misc/Config.cpp --replace /usr $out ''; nativeBuildInputs = [ cmake makeWrapper pkg-config ]; @@ -87,7 +95,11 @@ in stdenv.mkDerivation rec { ++ lib.optionals (guiModule == "ntk") [ ntk cairo libXpm ] ++ lib.optionals (guiModule == "zest") [ libGL libX11 ]; - cmakeFlags = [ "-DGuiModule=${guiModule}" ] + cmakeFlags = + [ + "-DGuiModule=${guiModule}" + "-DZYN_DATADIR=${placeholder "out"}/share/zynaddsubfx" + ] # OSS library is included in glibc. # Must explicitly disable if support is not wanted. ++ lib.optional (!ossSupport) "-DOssEnable=OFF" diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json index bc7c30838722..e9c011490ae4 100644 --- a/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/pkgs/applications/editors/vim/plugins/deprecated.json @@ -12,7 +12,7 @@ "new": "vim-fern" }, "gina-vim": { - "date": "2024-07-18", + "date": "2024-07-27", "new": "vim-gina" }, "gist-vim": { @@ -60,7 +60,7 @@ "new": "vim-suda" }, "vim-fsharp": { - "date": "2024-07-18", + "date": "2024-07-27", "new": "zarchive-vim-fsharp" }, "vim-jade": { diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 114952110ef7..e5cc57ada897 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -65,12 +65,12 @@ final: prev: CopilotChat-nvim = buildVimPlugin { pname = "CopilotChat.nvim"; - version = "2024-07-17"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "CopilotC-Nvim"; repo = "CopilotChat.nvim"; - rev = "92bc7b5e564c23b12b2ed41dd7657fdafe39d95f"; - sha256 = "05qb3817bp7mmqvaqhcy3cffqfbcmryymjd357vxqaw30b44rxmz"; + rev = "f20a0425b33c1704133bdef5ec10c4e94f6efdc6"; + sha256 = "0mqxhrc3bhw98dxqji3qpm7z1aqsi9zdlsm5mj9qkc1qn37af4m3"; }; meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/"; }; @@ -185,24 +185,24 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2024-07-18"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "d2483f19cee5234db1e010e6560d9aa9bb60bb30"; - sha256 = "19rshs3zbmm8p76w4yzy426g2mw746qs5xs8aw9f5xvgkc90b0ri"; + rev = "12818a6cb499456f4903c5d8e68af43753ebc869"; + sha256 = "16zdahzb3mfjpr3s6lk9754a6nqq1kjcw5p3f0qh12h6zkb2w8v4"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2024-07-12"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "feb7ca9c6281ee6d2954d8de3455879a31389767"; - sha256 = "1nk3dn4i0d6k52l823h3c9rj4gjg3wa2f2dhzs8fv8ywcz64kgh2"; + rev = "b5f1990bd06dd376e46a906d383d1b8dc436b3fd"; + sha256 = "0x6lycyy5184cq5ppw9a9923d208mxa0qchpiyjbyxlh0d5hlfm8"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -329,12 +329,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-07-17"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "57116dd9fd9ee4d73c1e9a1335d92b4c71851cf7"; - sha256 = "1sms1wgxmsidrb5isxkn9wig0a9aa3ipl7zl9babs1adnbgkf8l8"; + rev = "6eb8cee613518fb065d23a81d01eeb42365d59c1"; + sha256 = "1cnd2wp67r71wkxf90hwiw0x9i27ap57wxihngasvnqn2swslm31"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -401,12 +401,12 @@ final: prev: SpaceVim = buildVimPlugin { pname = "SpaceVim"; - version = "2024-07-09"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "c11f86991cd935d79b46819a15c3569c48c22da4"; - sha256 = "0wz5gdfj9nacf26435z412j1fys0fqxkdpiqpp4cp9a7i0zkqray"; + rev = "28c3ff61930700f66e6865179cfade5dc78b5d1f"; + sha256 = "1k4f9fkp5c6i2fhsjlxipdwgmqp6ifqvwgnjhicsn404b6ywgdxs"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -558,12 +558,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2024-07-16"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "4e77964569ef47a70f9bb76c668dcfea2d089d5a"; - sha256 = "0dbcks0v8awrpl1fbnk4zrkhsrvm8c8h6jfyphgj2vi37x72r5lz"; + rev = "e75a3df2c20b3a98c786f5e61587d74a7a6b61d6"; + sha256 = "06jg1z0lyvyq1k7hai059jj7h19r2psrya1n035ricj5j39n8i3x"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -739,12 +739,12 @@ final: prev: astrotheme = buildVimPlugin { pname = "astrotheme"; - version = "2024-07-15"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrotheme"; - rev = "c52dad31bb0000524ca4003222c9ed0f4e8c3058"; - sha256 = "1y3ak78663iv838la2cj0jv8lj0j8qf27fz7558008w88hlvcjmn"; + rev = "41b7d8430a55fd771e41bd763af4c3fd1c2fc0b5"; + sha256 = "0lp8wym0ck7jfdrhwymhh1g9cas5ljmlydggy0c9qa64ildyr5ab"; }; meta.homepage = "https://github.com/AstroNvim/astrotheme/"; }; @@ -847,12 +847,12 @@ final: prev: asyncrun-vim = buildVimPlugin { pname = "asyncrun.vim"; - version = "2024-07-01"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "b0987750dddf0ee678d160fe50e3d5397cd0c9e9"; - sha256 = "0ifnfif65ykpkavaajwiqc8pi38c0x7b709kx1gvn0z7nr8gxf7p"; + rev = "641de260966924a8ddd280af1b30209408497b52"; + sha256 = "1r5mz66qqq05wfrqg3jfd050j7flwg7gqwd03bxj4hr4dbvv0n4r"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; @@ -883,12 +883,12 @@ final: prev: aurora = buildVimPlugin { pname = "aurora"; - version = "2024-07-04"; + version = "2024-07-21"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "a5337b52ab8c72ebba7785787b9eb0e66f887da1"; - sha256 = "0yzf3nvx10f69mfjhpy7cxg310hj1843bqi1jfm8fcj6f0fkaajd"; + rev = "af3e80a8ca4f9a6e3bd40e2ba12073c1d0041a81"; + sha256 = "0kg6v5jg3am5www5pawv4y5m2h40njsi7mk8407alix2z19kp27n"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -943,24 +943,24 @@ final: prev: auto-session = buildVimPlugin { pname = "auto-session"; - version = "2024-07-15"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "08c279882d4117a3e6ade1a014f7cf4af7c34fec"; - sha256 = "03pyg708b3ad7kqc2m0nnvavbind245c4yzi01c1fpl420cdccfj"; + rev = "d5553e7e0fc83a7296847ef8009b9b93a4191cdb"; + sha256 = "18vqz7iiz8xqzbwmsxylhkm4j0f64dyqzxz0j17fsirysj29rvf5"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; autoclose-nvim = buildVimPlugin { pname = "autoclose.nvim"; - version = "2024-02-23"; + version = "2024-07-21"; src = fetchFromGitHub { owner = "m4xshen"; repo = "autoclose.nvim"; - rev = "dc42806540dcf448ecb2bad6b67204410cfbe629"; - sha256 = "03l4az5xccx941sbw2qx7s8aziydiad2pc75jki1mlbgs7sdbhwi"; + rev = "b2077aa2c83df7ebc19b2a20a3a0654b24ae9c8f"; + sha256 = "0qsaiwn3fznzzda9xw0v4ss6cyhladiwikslbnh0w29qz732g0lq"; }; meta.homepage = "https://github.com/m4xshen/autoclose.nvim/"; }; @@ -1051,12 +1051,12 @@ final: prev: baleia-nvim = buildVimPlugin { pname = "baleia.nvim"; - version = "2024-05-31"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "m00qek"; repo = "baleia.nvim"; - rev = "4d3b27dbec65a44ceecd9306f605a980bcf4e9b1"; - sha256 = "095jjam8x5xpr2q8xnvl479i4hc2s7zz2vqcgfk5mv60f52k35h0"; + rev = "1b25eac3ac03659c3d3af75c7455e179e5f197f7"; + sha256 = "194hg3habfymcbv8sg8pzv8ajniwaqc77kf6a128hz81f11mskdp"; fetchSubmodules = true; }; meta.homepage = "https://github.com/m00qek/baleia.nvim/"; @@ -1124,12 +1124,12 @@ final: prev: base46 = buildVimPlugin { pname = "base46"; - version = "2024-07-07"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "b17df65f6d423055e9fdfa4e7f55967c03862f29"; - sha256 = "13ic9gpqfllyac4q9yxc9giq5djxfdxm22v4ljx7i1p7w05fxxfx"; + rev = "89cb656606a2f47ae9f814530c961be4cdb6e117"; + sha256 = "06621y5ak8dzq1g6wcg32vbgirjn9qz8zml6l3k5irry83h1ayx4"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1172,12 +1172,12 @@ final: prev: better-escape-nvim = buildVimPlugin { pname = "better-escape.nvim"; - version = "2024-07-12"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "max397574"; repo = "better-escape.nvim"; - rev = "62015330fc831306f5229f24b2db981d07f816c1"; - sha256 = "0m0bg2d8b95mq665zab30kqvy70q9x2brfyrj1jbhqsx8q6dflkl"; + rev = "f45b52f8f87792e8659526f23261ffe278a54be5"; + sha256 = "1ddp41ydclihz2mgcxdv5dq0b4hng46az50hqwfr8ilvv7i3nwbk"; }; meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; @@ -1232,12 +1232,12 @@ final: prev: bluloco-nvim = buildVimPlugin { pname = "bluloco.nvim"; - version = "2024-07-09"; + version = "2024-07-18"; src = fetchFromGitHub { owner = "uloco"; repo = "bluloco.nvim"; - rev = "d5c046b705e9485737ebfca40824a8baca0d4e4c"; - sha256 = "1ccyqxid41zvc83mjjb9la29pa27izhvr4hbj4lghbywb9glb021"; + rev = "07f4b5cca8cfe31aad69ab5c1be0f6a0715a8d2e"; + sha256 = "1z998g3b2gffbq1ykialcfc7w9giyljdnsxrm4ylifr0b0312sfg"; }; meta.homepage = "https://github.com/uloco/bluloco.nvim/"; }; @@ -1328,12 +1328,12 @@ final: prev: bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "2024-07-17"; + version = "2024-07-18"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "2e3c8cc5a57ddd32f1edd2ffd2ccb10c09421f6c"; - sha256 = "14n1pv8svb22hvcan8yyzqn8pgmf50yn47xmp98m05ap5zf42rj1"; + rev = "0b2fd861eee7595015b6561dade52fb060be10c4"; + sha256 = "068gg98w88q0j3c1wrlggsp0986yppa8vlbnzy7wy4g7kn0aqfsn"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1412,12 +1412,12 @@ final: prev: chadtree = buildVimPlugin { pname = "chadtree"; - version = "2024-07-15"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "2416f72fb17834a0dd0fe4ab8ccb0a1c1b6aaf0b"; - sha256 = "0p8r5g77qd1riml9w4dwzk6lq9xx6w9yp8yp43221avj7imi35dn"; + rev = "7334155c68acd932e275fbf203f05eebf7f741ed"; + sha256 = "15ddriks3ffyz8q0g8nkb35dmm2apclw04dkivjbbm21dg5nym11"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1460,12 +1460,12 @@ final: prev: cinnamon-nvim = buildVimPlugin { pname = "cinnamon.nvim"; - version = "2024-07-17"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "declancm"; repo = "cinnamon.nvim"; - rev = "d097999fb4230ead4774bee0f0542cac6d7bd94e"; - sha256 = "0jy1p5axmdjq171ylqfvlnyrm4yri9zqflza5725zvs6d0nrycxz"; + rev = "ecd211e46a1d4fb0efffbdb2c2bbd59785605870"; + sha256 = "0pf9bx2xrv8kkg4339w7cqns4v8gkg4jppsccbymhbp4gj9xhw7s"; }; meta.homepage = "https://github.com/declancm/cinnamon.nvim/"; }; @@ -1604,12 +1604,12 @@ final: prev: cmp-ai = buildVimPlugin { pname = "cmp-ai"; - version = "2024-06-02"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-ai"; - rev = "2b787129314c5fb8bfd41a6919d4889210e6b265"; - sha256 = "sha256-ul2X6kIdreJ9dCQERw7C3l2dss7Mtcwtm7CGhAxjjvY="; + rev = "18bbd723a45b3f84bad8be58b86d8433e53f81c6"; + sha256 = "0h5d16591x553vkj62l1s5cq7mklmcnpp1rj1kw7zfgnhgfn64cc"; }; meta.homepage = "https://github.com/tzachar/cmp-ai/"; }; @@ -1747,12 +1747,12 @@ final: prev: cmp-dictionary = buildVimPlugin { pname = "cmp-dictionary"; - version = "2024-07-15"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "42866957964aa698d53f222395dbd1e334e77fdd"; - sha256 = "01p2xj1m6p18f40i8h88kcrmzzswrg1cr03p0wmsq9lmjnic6782"; + rev = "c5ffc6afb7f3a68da981ed9c56f3d9d8f3d907b7"; + sha256 = "1shxx5h0y7rjh6bam1cckrrrqjhb2mwr85pja39p9s4zpvj0r0am"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -2179,12 +2179,12 @@ final: prev: cobalt2-nvim = buildVimPlugin { pname = "cobalt2.nvim"; - version = "2024-04-01"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "lalitmee"; repo = "cobalt2.nvim"; - rev = "5ee85e0722ccdd8253b6119e7cdd9055010093d0"; - sha256 = "0vxkdys6af38shv75laya871jb3jinhrfsdjm5wdxbxyl4lp39bx"; + rev = "e55066223f56f864775832325d2f325ec9b083c9"; + sha256 = "19n9l2xcn0sis5bs0rw9p4ivgfhsm830mjfs32r0wdn1pnm320xh"; }; meta.homepage = "https://github.com/lalitmee/cobalt2.nvim/"; }; @@ -2587,12 +2587,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2024-07-18"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "acc7d93f4a080fec587a99fcb36cffa29adc4bad"; - sha256 = "1qja8r6643kgj4x0rjbddkkfsrkhnv3361s8w7amkcv8qkm2s2m3"; + rev = "25d48271e3d4404ba017cb92a37d3a681c1ad149"; + sha256 = "0dbw1b25g83iy6yvc725k7il0l7yli4qd9s4wylcbqgacss2nz3h"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2600,24 +2600,24 @@ final: prev: conjure = buildVimPlugin { pname = "conjure"; - version = "2024-06-21"; + version = "2024-07-19"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "a81977726f726b21d4bd75cea5bbbb7022005507"; - sha256 = "154bkh2cxar7ajyi8y4ym6ckp48b333cml73a52g6qfiggql5r33"; + rev = "1157614e1c757cdbe062b08d617d162fb34ed3a3"; + sha256 = "03rrfba6z47sy4x1a7wrmnlfysz20zn8z1wxinbf60dkaiyjsfgp"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; context-vim = buildVimPlugin { pname = "context.vim"; - version = "2024-07-10"; + version = "2024-07-19"; src = fetchFromGitHub { owner = "wellle"; repo = "context.vim"; - rev = "a021ba7030ccb1ef6be774f41bbf32b10605a949"; - sha256 = "06bvzs9ykyakak7dw2xh9rlrrn8vz1y9w4y85gc8kh7qhhw1j64x"; + rev = "82eb26de265292808917b82f3eda2725b53d785c"; + sha256 = "0p4pwh3riyf5h57j05rkazzf5j2xd14mlsp3ifryw35irhm4ivwd"; }; meta.homepage = "https://github.com/wellle/context.vim/"; }; @@ -2684,12 +2684,12 @@ final: prev: coq-thirdparty = buildVimPlugin { pname = "coq.thirdparty"; - version = "2024-04-18"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "5f45777bcb0c14266a7e07ed474cb70c4e8b6397"; - sha256 = "0h2rq7aqxrf58cgwh6iwm2gs2fghkipyz20gdwqcy5hqmy2l0mi1"; + rev = "6a53363555bd483818ef2a3103db8ddc8d98a41d"; + sha256 = "0c5l8zwrcyab36l3diwb6zpncisl0nn0d993vwrzf2430nak59cy"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2708,12 +2708,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2024-06-26"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "6b35465a58052f06b5ee0ca63606439ea7c862e8"; - sha256 = "162xqsrdv9zpqhr723z5b4m1154ryvddbj5kyxsrwccgxj6q5irv"; + rev = "bdcc65c4636a8894ad4c66aec3192d9da4ee760f"; + sha256 = "0arq12fcr3yfnl8smk2klv3wf81bq4l8ban5rr0acsh03skpwajl"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2756,12 +2756,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2024-07-01"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "c3fd47391de6999f4c939af89494d08443f71916"; - sha256 = "0vw47mbx7pw4zzrj70yli86nk407j05ll1lq7d4nb41vii3lnlyb"; + rev = "a8f1f05fae1d0b74dd07d61a1f8eb023a67a3af4"; + sha256 = "1p7j85zl77d9m2kfqjmlbcgsvazyf90b4rv2p9x41ac0ydr8hsa9"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2852,12 +2852,12 @@ final: prev: cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2024-07-12"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "d96290af1c2cffcfdadb266144097e5496d08fd3"; - sha256 = "0h40diq1klsd96120ncg9w5h0p79gvczl4x74mjgd8b22gcx7m52"; + rev = "f4551361685342cddea419c96eaa04fecb36ac57"; + sha256 = "00qz8b1cjn20fnfjb3i9302s7sb9558v43xmjyvh2r8aw5xyj32j"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; @@ -3008,12 +3008,12 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2024-06-28"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "09e64956c2946bba0a060d0a0aaddde106753bd9"; - sha256 = "128z109hixhbn50aqgcdihdjc0i94sgqm95l8ra81cskhz1y00cc"; + rev = "8c920ec6f190c5c77287f802884bc2004799d062"; + sha256 = "1df2ifhrjjg9fl2vvfkky63l1vy8qw6ijlk2md6l95fnym4vapx5"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; @@ -3406,12 +3406,12 @@ final: prev: dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2024-07-10"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "cab5e0226bc4f90a28cadcb0dc7341d550f1bdf0"; - sha256 = "14548km67rn8rgpy529iihry8sh03wrl1j8pricqy94a1fjlmghh"; + rev = "aa4c0ab1ade45ff9a3c5d4c06365c9b119f32d36"; + sha256 = "0awd7qjnx6gnvisjagsm25fg5wl5kfzcxiqf2jvfs8i550rd54rk"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3454,12 +3454,12 @@ final: prev: edgy-nvim = buildVimPlugin { pname = "edgy.nvim"; - version = "2024-07-15"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "edgy.nvim"; - rev = "0e8bbab4eba9dab6c237e4a2e146dc0466897be6"; - sha256 = "0qw0pm7rpd5g6lhmfkpbyjlg7rrwycqwzs73k7j0bdlz84v72zky"; + rev = "ebb77fde6f5cb2745431c6c0fe57024f66471728"; + sha256 = "1psavlldajgfvwx0jjhwdilccrhz38p880jsrddmrmfx9yq3yl5s"; }; meta.homepage = "https://github.com/folke/edgy.nvim/"; }; @@ -3600,12 +3600,12 @@ final: prev: executor-nvim = buildVimPlugin { pname = "executor.nvim"; - version = "2024-04-29"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "google"; repo = "executor.nvim"; - rev = "cb60faf7486cd6edae884a58fb9c2793bc4e75ea"; - sha256 = "0ifzy31m11spjkdi3xc42r1zp9si38zgmp43a0bdxznbm6ka5hm5"; + rev = "5f3d7f9a986826f399128892f9519cc9507f419a"; + sha256 = "0r2pjlzv1xldxsf40bs94xlr4mvbgjcncx45sjqjdgfgfqkbir5v"; }; meta.homepage = "https://github.com/google/executor.nvim/"; }; @@ -3781,12 +3781,12 @@ final: prev: flash-nvim = buildVimPlugin { pname = "flash.nvim"; - version = "2024-07-15"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "flash.nvim"; - rev = "25ba3f4d1e0b080213b39518ebcfbb693a23c957"; - sha256 = "08qzxzxjr3v4djhrmgrfqsm9nznsq81p78001s1mlcbh9679qkpd"; + rev = "34c7be146a91fec3555c33fe89c7d643f6ef5cf1"; + sha256 = "04iqz3dlhpgqmnl31z8m4zpj6s2y51a2k8ji693s9d9fzj9y3kbl"; }; meta.homepage = "https://github.com/folke/flash.nvim/"; }; @@ -3949,12 +3949,12 @@ final: prev: fugitive-gitlab-vim = buildVimPlugin { pname = "fugitive-gitlab.vim"; - version = "2024-03-18"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "shumphrey"; repo = "fugitive-gitlab.vim"; - rev = "e8dd4c9dfe8ce43503dd81286d4e80f65a978e71"; - sha256 = "0g0mq8k8014slh9326c37fkhyx5ajmm3gzlf7aln6krqb6nh8vj5"; + rev = "838d3a110836f511be099002ce1a71493c042615"; + sha256 = "0v7x5df4w95qpxshbv81dglnhqgw0ind3c9zxzxf75ir8ry94g5n"; }; meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/"; }; @@ -4033,24 +4033,24 @@ final: prev: fzf-lua = buildNeovimPlugin { pname = "fzf-lua"; - version = "2024-07-17"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "023b95078f9cc28ce67d7a7a6b4ea1bc7cfa488d"; - sha256 = "159xkgrvgp34446nyq5k8ngymk36mxdgrk0xy5yybbdxy90akmld"; + rev = "769b6636af07ea4587e6c06067d8fe9fb0629390"; + sha256 = "1q64s38vjsifc99vaa8la48wr9wd4w1gsmb2zgskpygha8fsgr1q"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; fzf-vim = buildVimPlugin { pname = "fzf.vim"; - version = "2024-06-06"; + version = "2024-07-19"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "279e1ec068f526e985ee7e3f62a71f083bbe0196"; - sha256 = "11gxry27alq4fzynmzw0h2q3vjx5jc2krj1pq9q9xs7yc5fj46y5"; + rev = "f7c7b44764a601e621432b98c85709c9a53a7be8"; + sha256 = "11fq1c9lgkgzxxg70qd6jy8735dvbfcq9gc5bsn9xwy9yjjy03il"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -4225,12 +4225,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2024-07-16"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "f4928ba14eb6c667786ac7d69927f6aee6719f1e"; - sha256 = "1pgj1dn4xdsf4rgv44n3j8rcg5rxp2f45sidzlmdrqnfp5vm6mc8"; + rev = "f074844b60f9e151970fbcdbeb8a2cd52b6ef25a"; + sha256 = "07q5mh82p9y6h047xifj0fpan6ny6cb56y4ghymrvq1ziahi0xcw"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4405,12 +4405,12 @@ final: prev: grug-far-nvim = buildVimPlugin { pname = "grug-far.nvim"; - version = "2024-07-22"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "MagicDuck"; repo = "grug-far.nvim"; - rev = "f9a8592b037b761fac6a327bc314e9e3eb47401e"; - sha256 = "13aa8s9lxdjiyifj9vmbph6hl9px0spfm36my1j2h41biq5nsx5q"; + rev = "6eb9d2a0621d6e2090de39c6f3305031d7029b93"; + sha256 = "0dld4cbdn0y227ldrd3n2rhw1b3zm8ds84rkgxw3qqwndgh42qdl"; }; meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/"; }; @@ -4501,12 +4501,12 @@ final: prev: guard-nvim = buildVimPlugin { pname = "guard.nvim"; - version = "2024-06-05"; + version = "2024-07-21"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard.nvim"; - rev = "b066152fe06122b047a6b3ce427a19d8b6e628ce"; - sha256 = "0qcq5acnq6hgxpi9f3qsixsgvlzlaq1nmizwbanzkqgcj6ac4bzj"; + rev = "29344aa846c793982c6fe29eee85137e3ca2c38b"; + sha256 = "0bzglcfls8973zsip9jcfhqid0kjp1s0b03s5bdl3wqza5sac29m"; }; meta.homepage = "https://github.com/nvimdev/guard.nvim/"; }; @@ -4561,12 +4561,12 @@ final: prev: hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "2024-06-10"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "9a4e24fb40482dc85a93bf6cf344a030b9bf9a39"; - sha256 = "01b34bmyw236xr8bcwwn40s6360ybmrd9lpbw0hnvkn4nsml6hi6"; + rev = "91c6be1a54fa057002e21ae209a49436bd215355"; + sha256 = "0i3ih3i162v6lkm9l3406j5322vyjilvhl1qvpc9d67ajs355cm4"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; @@ -4618,18 +4618,6 @@ final: prev: meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/"; }; - haskell-tools-nvim = buildNeovimPlugin { - pname = "haskell-tools.nvim"; - version = "2024-07-14"; - src = fetchFromGitHub { - owner = "MrcJkb"; - repo = "haskell-tools.nvim"; - rev = "b003e20e99aa79bfec7c632e5ab817e1c10c8036"; - sha256 = "18gjqnf66nxq76bcb0icihyplmzs0nwav6qpxmszqm05cm1m8l30"; - }; - meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; - }; - haskell-vim = buildVimPlugin { pname = "haskell-vim"; version = "2021-01-19"; @@ -5377,24 +5365,24 @@ final: prev: lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2024-07-17"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "6ca90a21202808796418e46d3cebfbb5a44e54a2"; - sha256 = "1xf02z09ah023yhzh4nzj7pvfhp5rbdyxw1zgidjyzs9yjr8xjyh"; + rev = "077102c5bfc578693f12377846d427f49bc50076"; + sha256 = "0yj0z62cr5ddzdl4ba2ppj1j102qfx1qfbwbh1z84p8x0zn6ppj5"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; lazydev-nvim = buildVimPlugin { pname = "lazydev.nvim"; - version = "2024-07-15"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "folke"; repo = "lazydev.nvim"; - rev = "02f1055a777264d4b65896051ec28d0f322f7932"; - sha256 = "0ic2ycmshr6gbl82sd0ccpnn9hkj3bi1isbyyzzncqrfsk3pkdyh"; + rev = "491452cf1ca6f029e90ad0d0368848fac717c6d2"; + sha256 = "1yc87wv6g19yj1gypfy4nl9irpb7zfqlw98vyaf8aqjgnpd0z60g"; }; meta.homepage = "https://github.com/folke/lazydev.nvim/"; }; @@ -5413,12 +5401,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2024-07-10"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "182703184edb866d7bfe878be358295e189c8223"; - sha256 = "0ymkhg3hdk26i0if61l6vdmb3fy6xa7q635x8lnxi4a59f52bin8"; + rev = "39f263d03812f557d34e00f0d64263a0b9cb9dd5"; + sha256 = "1q8gjggxdikkm0gifvzdsnqa7qh45hixnglccvvvkzd44jxxi1y8"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5449,24 +5437,24 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2024-07-09"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "c099aecaf858574909bd38cbadb8543c4dd16611"; - sha256 = "14yxi5axkgylrwkxfhfjcfvr3zy1vwa16pxafwa6mrampjqj6s68"; + rev = "3b1d76ee9cd5a12a8f7a42f0e91124332860205c"; + sha256 = "081ihmjqvc862hw8z2rgbj22hvm26fpigvm99f7f90si6swp1w29"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2024-07-15"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "0705f207ba79ee3c687fc77c451faeeb4828d5ad"; - sha256 = "1szbymmh232fgrpccrjrjb5rzkhdg5lfigvxswhpw7b4nafvizky"; + rev = "543bbbba4e7b54222362f312e1d2e3dac1eaae75"; + sha256 = "0s85jl37znfc281fncsqrlrasbb121hzfqz89xi5ld46303rqzn6"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5809,12 +5797,12 @@ final: prev: lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; - version = "2024-06-29"; + version = "2024-07-21"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "87701af045b3032515776abeb47eb8c2ddb5e679"; - sha256 = "0ik2q2jz4ldyql3z64zr5dyi8i6qja6xsczv966fkdmsckk7r1zh"; + rev = "56db3d5ce5476b183783160e6045f7337ba12b83"; + sha256 = "0drk31bkws1bhjl0l2z7vmcqjn3y1bvhic78dr63j5j9wiyaxzvq"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5868,12 +5856,12 @@ final: prev: lspkind-nvim = buildVimPlugin { pname = "lspkind-nvim"; - version = "2024-01-11"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "onsails"; repo = "lspkind.nvim"; - rev = "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf"; - sha256 = "0sjd244122q7hs3xaxzxhfcfpnzjz082rbnishq6khnr9w2xs0px"; + rev = "cff4ae321a91ee3473a92ea1a8c637e3a9510aec"; + sha256 = "0l66zyawfjy0r7rhi80skk6x156ybr72jlh4qxk0xd0l2hkbm8nl"; }; meta.homepage = "https://github.com/onsails/lspkind.nvim/"; }; @@ -5953,12 +5941,12 @@ final: prev: lush-nvim = buildNeovimPlugin { pname = "lush.nvim"; - version = "2024-07-09"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "1b66ab197b177aabc2270a2c9cb8019fa5a367df"; - sha256 = "13718awdgxas1rgxpipqk6ckjd41jf6s36f8sxn2kmqz8d07fcdd"; + rev = "6a254139d077ad53be7e4f3602c8da0c84447fd9"; + sha256 = "0skbhprgxc8mpny0gc6c97gz9ng65y6kcqv4qr1lnil9lpgnpsw2"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -6062,12 +6050,12 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2024-06-12"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "37a336b653f8594df75c827ed589f1c91d91ff6c"; - sha256 = "1xiv4km5m3y8znqq2a5f31fqw5aygcdr11lwpg0xrvf359z41g7i"; + rev = "ba9c2f0b93deb48d0a99ae0e8d8dd36f7cc286d6"; + sha256 = "1lmbd9zjc8l3210j3aq2vbqnbijydvdv8a4a85ml8f6xkzs98wz7"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -6218,12 +6206,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-07-15"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "f20d8cd3a116ef65f022797de064a044b217ff53"; - sha256 = "0caksw966j73dabxx97hyb1spfadkprc5ixrpg035i96d2hjk4m9"; + rev = "e24ec1fcf885990fec1a993fe8304a033fd1806d"; + sha256 = "10r0yl3gcvpa4bjb9f9r4wszf1nhf2mgarlgw4y270jvslgm2iwg"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -6650,12 +6638,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-07-18"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "9c9a02271a7ee2564a565a0459d5d6265fa63ade"; - sha256 = "17x2f4w8qcdhgf521qg1s67z2626g2s37rjb60ndxhwidrylggch"; + rev = "fa73db350690ede9ed0dab1a3d803d7d0406aa0e"; + sha256 = "0lj79zykph3bmck0hw7bajvwkijy82k1r86xlvcx2ml1xfa39vw0"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -6698,36 +6686,36 @@ final: prev: neoformat = buildVimPlugin { pname = "neoformat"; - version = "2024-05-30"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "82864d6c7926c4f3b535a2fd7eab919b116fc969"; - sha256 = "069bd2jh6z1yg14134s7rssnqhf5xii1knfzfn0jsd9riga5329h"; + rev = "3d7718451514e068ae15c0fe3f6cf94ecf7fd0a4"; + sha256 = "1bvybczfypaj74s9v8zb5qqnynanihkwiq5fy4g04q98yllajl9f"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogen = buildVimPlugin { pname = "neogen"; - version = "2024-05-13"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "danymat"; repo = "neogen"; - rev = "6de0add4805165317ab7d3d36b5cef48b1b865f3"; - sha256 = "080pwb0bwnd12ypwaa5hsy7sf8ha791gic5wnq8nm8pzyxz2nbiv"; + rev = "4a2f68d3eae0018b04132f1d4590e51484043354"; + sha256 = "0bd6dy1fv2b18ckdvp6drlxgsdg6v5a1jwvcjwwi412ivj2jnc08"; }; meta.homepage = "https://github.com/danymat/neogen/"; }; neogit = buildVimPlugin { pname = "neogit"; - version = "2024-07-17"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "af1d8d88f426a4da63c913f3b81a37350dbe8d02"; - sha256 = "0210kgcdi9xpnbpmw7b6r26nhpjvj8qh4ml8w6kmswqj75vg7dqf"; + rev = "2b74a777b963dfdeeabfabf84d5ba611666adab4"; + sha256 = "1kbzw9z83rh210r7kgx9r6q0phji539zvrdj963g4gf438nrplib"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6794,12 +6782,12 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2024-07-17"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "b04570a1bbbe80d226e459ed5f27f30fa1e2cd11"; - sha256 = "1j3p371fcp4xvq91akwdmncmyrjwyjxp7ljnhg9p5yvcg15x9nwp"; + rev = "1985f2d6f152622b0066f48ba8e39d157635dd38"; + sha256 = "0r9v7djqhafnb638j5q49c9ff0b9ynsrijsxhk4zx6xrizl91jil"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -6915,12 +6903,12 @@ final: prev: neotest-dotnet = buildVimPlugin { pname = "neotest-dotnet"; - version = "2024-06-01"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "neotest-dotnet"; - rev = "caeb52b602fa8a5855c5839c338fb65b50a40ab3"; - sha256 = "1w73kzljwkxdanvdqig96jmkfd2v2hjwbqn2h095dkwf71pygnbb"; + rev = "03509791912eaeac9f993f7cf49e170eca06a8bc"; + sha256 = "0kz7k26047mzyzsldm8ai1i4wyr7wx0rwpfqj3zh3nncns40b4nl"; }; meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/"; }; @@ -6964,12 +6952,12 @@ final: prev: neotest-golang = buildVimPlugin { pname = "neotest-golang"; - version = "2024-07-17"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "fredrikaverpil"; repo = "neotest-golang"; - rev = "f6657d875e9046e2f215c5480c62105dd8002f94"; - sha256 = "1xsizbmryhac8iw7r8zs4mjycakzanq5bfdpfcl289d52rl92y0l"; + rev = "41cf5e59ca132a5cad599867de3f154429e5c148"; + sha256 = "18gd2ai0fnj4wvxqhik4j19fvg0ss3cwnrqx12djwpmf078cs6p0"; }; meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/"; }; @@ -7001,12 +6989,12 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2024-07-01"; + version = "2024-07-21"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "f5614c9cf7a056f791565183f216401b28438818"; - sha256 = "0jli4pp124ils5kxrzdba7w49jsw823rqvkjib382xa2mp5n9f3i"; + rev = "2ba3ed5f053694e5c831922b58abec412b22539a"; + sha256 = "1czk8m62ww8vw397dk6cz18426ibbgv56qybh34vnl9s5pqkxddd"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -7181,12 +7169,12 @@ final: prev: neovim-ayu = buildVimPlugin { pname = "neovim-ayu"; - version = "2024-06-30"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "d64a8b7e8730095ff634e6586584e8543043e986"; - sha256 = "0ikam4lmbi1541sy8sqbc4psblhizf40mspnwcag6q4w7g5pswh4"; + rev = "6993189dd0ee38299879a1a0064718a8392e8713"; + sha256 = "1fj0k6fkyk73jdjps8660nsvplwj2wasf302rbwbpbzmdvw46q6v"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -7241,12 +7229,12 @@ final: prev: nerdtree = buildVimPlugin { pname = "nerdtree"; - version = "2024-05-14"; + version = "2024-07-20"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "fbb71fcd90602e3ec77f40b864b5f9b437c496c5"; - sha256 = "1x6gixsq9yn3afsj05wacxgh6ih00mdimjhlx8jn9cwjaxmg70v5"; + rev = "9b465acb2745beb988eff3c1e4aa75f349738230"; + sha256 = "1j9b7f1b1pdb2v7z0b4mnfvcir4z1ycs3l2xh4rvrl7gzhlc56y5"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -7301,12 +7289,12 @@ final: prev: nfnl = buildVimPlugin { pname = "nfnl"; - version = "2024-06-22"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "Olical"; repo = "nfnl"; - rev = "9f8fb93c70e9d759d849b45859f017b348618299"; - sha256 = "03bhns205gd4hwwzcs094fczxwf9bzixn15lixw257579s1bh6hn"; + rev = "608d39bb102e6bdda76ee450b042f74668184ad7"; + sha256 = "07k0z08gq7pyadqxh2lwk3zgvxwnr7m4mgag9z2ys25449c18qkp"; }; meta.homepage = "https://github.com/Olical/nfnl/"; }; @@ -7337,12 +7325,12 @@ final: prev: nightfox-nvim = buildVimPlugin { pname = "nightfox.nvim"; - version = "2024-04-28"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "df75a6a94910ae47854341d6b5a6fd483192c0eb"; - sha256 = "0x58pn7lg2l1nm24ry3a42l6vpi6inf1srbanwya01x0yrm74bwp"; + rev = "d3e8b1acc095baf57af81bb5e89fe7c4359eb619"; + sha256 = "0z81af970w1rllh2abdvlyx63z4xkcf5jw3wy4xv99gvqa1fxryr"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -7385,12 +7373,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2024-07-16"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "8d4d994fde7d2645d74be0ed3a7411d9270d0eb4"; - sha256 = "1fcsbmr1xw7fdgkgri890v414wpl1xy4a4hif6gjhbzl9wirg3hs"; + rev = "46fdb3cd2dfed2b640fe3885f1fe83d91f5b0302"; + sha256 = "07sbrr6c41dclgrqgfd1bxrzb5zjxxacmpy1qddhkv86qjn3r4rj"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -7409,12 +7397,12 @@ final: prev: no-clown-fiesta-nvim = buildVimPlugin { pname = "no-clown-fiesta.nvim"; - version = "2024-07-09"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "aktersnurra"; repo = "no-clown-fiesta.nvim"; - rev = "b164c148d497b843ad7c5255fee58ea8b6c5dd41"; - sha256 = "0dfxksaj0gn7x84nb4aqk0fvlb2j5wf5zxr310idsflhr10a35gi"; + rev = "b63937a5ebba1ece32f56256c46d166e62aca7fc"; + sha256 = "07h118j4y34bb8hpljrd9n6v2iz0n0vp8ijy2vfpkm4jnm1bh02b"; }; meta.homepage = "https://github.com/aktersnurra/no-clown-fiesta.nvim/"; }; @@ -7445,24 +7433,24 @@ final: prev: noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2024-07-17"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "daa5f6908e97c89ca3e9861e03bdf356ea48cc72"; - sha256 = "0qfzkpwxlzb87h4nnl5i90039dip576pz3j4wb127f30f3dh8yfg"; + rev = "448bb9c524a7601035449210838e374a30153172"; + sha256 = "1pxnfgcqh6b14z699akvzbq2vcvk4glfjpk5d5hybfn6fnbidapk"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2024-07-17"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "8b5d4170a602d7b257704eef77b0539ddfd02589"; - sha256 = "0n99bi5pvc4jlij21nf2mlq4bv87mmfs2lyygpifxfplsikdhswl"; + rev = "a8594ef3dabb484adabc0ebbf5800be1b807c9e7"; + sha256 = "0gvay7gq5579iwsqd30lh38l4vyzxn5wmsprg10dpq9j3ghs4rma"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -7553,12 +7541,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2024-07-16"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "b657b0ef84a6aa9a86ac05341d1bc1ab5f037ee7"; - sha256 = "18vdqfs36cpbrjr53khx4d118i6b9f19dqhhwpnawx6fkpl5vwfs"; + rev = "85b9f5686991a8b98c4980747f484ce155c959d0"; + sha256 = "1kvz89x58yh10dab890bw9w6kpg9jx27b9zwljylcdkf72gp4sdj"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -7601,12 +7589,12 @@ final: prev: nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2024-07-07"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d"; - sha256 = "1fdk1l449hsshj9g02kqw30rv4ab664prnhcc9gnr6zsad65cprg"; + rev = "e38c5d837e755ce186ae51d2c48e1b387c4425c6"; + sha256 = "16wm535ihr8gxngx6a5xj4phz6qjshxi4nrcx2ks4bmd815gdsnv"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -7709,12 +7697,12 @@ final: prev: nvim-colorizer-lua = buildVimPlugin { pname = "nvim-colorizer.lua"; - version = "2024-07-16"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvim-colorizer.lua"; - rev = "08bd34bf0ed79723f62764c7f9ca70516d461d0d"; - sha256 = "11shpnmnlsawmqwszbdqravp9yg20hd6yid9mjnf8njdh78rzk6x"; + rev = "194ec600488f7c7229668d0e80bd197f3a2b84ff"; + sha256 = "19142fnhvmdaasmxjgh9bksg6c5kq71w816zjzkfwdrpydqwh3j3"; }; meta.homepage = "https://github.com/nvchad/nvim-colorizer.lua/"; }; @@ -7805,12 +7793,12 @@ final: prev: nvim-dap-go = buildVimPlugin { pname = "nvim-dap-go"; - version = "2024-07-04"; + version = "2024-07-19"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "3999f0744e80d2dba5775189fc7c7a5e9846053e"; - sha256 = "1m77vqhpd0q3nqia42i3j7cpzjp83hr5fg46mqb3apak6b0mwmlq"; + rev = "5030d53097fed7b75524a04048d8dbf417fa0140"; + sha256 = "1s1g9s2gyfy3s4xnrzd980qpjigzdf4l9dp11kzlk7h26h5mhmqr"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; @@ -7853,12 +7841,12 @@ final: prev: nvim-dbee = buildVimPlugin { pname = "nvim-dbee"; - version = "2024-07-06"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "kndndrj"; repo = "nvim-dbee"; - rev = "5062efbe5dfa3c0c6a51f5112c671f6625053f39"; - sha256 = "1d90f9562n9yv71xwksfy6rq4qasgbsmrh11pym264bzv7a2jjkr"; + rev = "21d2cc0844a16262bb6ea93ab3d0a0f20bd87853"; + sha256 = "10xplksglyd8af8q1cl2lxcpn52b766g87gva9fd3l66idxsds00"; }; meta.homepage = "https://github.com/kndndrj/nvim-dbee/"; }; @@ -7925,12 +7913,12 @@ final: prev: nvim-genghis = buildVimPlugin { pname = "nvim-genghis"; - version = "2024-07-09"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-genghis"; - rev = "8b10f06735e1ecef93be61347e6c083d5263b331"; - sha256 = "1kgaf7knjjgjnx9sgnhcgc8bdcp5kjcmqgjzs7k4flc3n740bh9j"; + rev = "8df00d9ec00e31a2280a3cfb795a30f85d1a5c2e"; + sha256 = "0synn533v1zy87gk8762p8j9hdica9jyg9rgmwamx5yd5zg8xgcb"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/"; }; @@ -7961,12 +7949,12 @@ final: prev: nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2024-07-09"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "83a6fcc41eb55db93eee37199600b547638d3a28"; - sha256 = "0bc5i88ggpr92ar6rz352psbf9xn3n87qm3yp650yssgyg8x0sqz"; + rev = "31f52d52a618aa16d2576da85992ee9b2d10babb"; + sha256 = "10hm4xv9kds9sxz9302mg6ik4dhsxfzvhwm0w2qqq0y8smrnjgy7"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -8116,12 +8104,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-07-16"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "01e08d4bf1c35e5126b2ad5209725e4c552289ab"; - sha256 = "1h7cri2jprb8y8hr5lrl4rqyjj02zzjhf64wfgn752dq3iwbrrwn"; + rev = "f95d371c1a274f60392edfd8ea5121b42dca736e"; + sha256 = "0h93s14vqrwg7gkqji1pc3p3h72niy1hdjd387mz5j62h7k6h74h"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -8380,12 +8368,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2024-07-06"; + version = "2024-07-21"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "afc67708a5a5585553dee132ffbc4761bb135faf"; - sha256 = "14qb97g5zcdvby9w8i0mqmnhcxx23d82kjf0r6hrkmpmfwxkrhnv"; + rev = "401c0498689dcaa54b2e7483d823e33cdc051e72"; + sha256 = "1j6y0mv56ykip6cf9n4pragqxbcb73p3zmj6n7h3ppsncs5993ma"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -8464,12 +8452,12 @@ final: prev: nvim-spider = buildVimPlugin { pname = "nvim-spider"; - version = "2024-07-09"; + version = "2024-07-21"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "c0f757f63da340636ff2be53e39eabc42f5fa727"; - sha256 = "1wf43gzp2z6i42v14mhqx9yqlj1qml2n1la9y4c8sfkahdp3xxdx"; + rev = "508b3504a350fb9a93bd0b7c0d41b8b5fc732b5e"; + sha256 = "0bgz7jgjwv08c48fb3blzqxi68lhhj8qpw60pipcapzjhv6qxds5"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; @@ -8524,24 +8512,24 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-07-11"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "f9ff00bc06d7cb70548a3847d7a2a05e928bc988"; - sha256 = "10vvshhl3c9vda8giqlsz3jqzn7xx8ca9c698h7q4rnbbz7s97nj"; + rev = "82ba116bbd0cc5f0482783d67ea969595e2b381b"; + sha256 = "0wkvzasa2bhy2wymc7v419nlz5wdsf96scnd2c3ksxgrfjq42jsc"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-07-17"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "0758155d4dfacfa959ad82ffa3879cb69c82e719"; - sha256 = "04x3da891mdv5bf5nq17lwd3j8bprfj4j1q88l9hb4gydabjxzni"; + rev = "2b4881286ad73c9ece7e5e4da130b2e4726c09fc"; + sha256 = "0phg5vmgaiig8y15gnlklvrsfafrldsa3g84ahd0927a4yb52rw0"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -8620,12 +8608,12 @@ final: prev: nvim-ts-autotag = buildVimPlugin { pname = "nvim-ts-autotag"; - version = "2024-07-16"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "1624866a1379fc1861797f0ed05899a9c1d2ff61"; - sha256 = "1fi5df9qml6kxkv8hx2i88b9365m4r3zj7vbnml3p7qdry99yb9a"; + rev = "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3"; + sha256 = "0x39c86cf84ap4zmk5lb1bflcrq2zqr2p3pcfd2mjbslzcdqkasp"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; @@ -8668,12 +8656,12 @@ final: prev: nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2024-06-09"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "c0cfc1738361b5da1cd0a962dd6f774cc444f856"; - sha256 = "1fwc0xrg07cr7x8cgksckqlkwbjl3nh0qvailp89zd35al9pzw4g"; + rev = "a2af6aa13a2ad3ad361d562a319a91bcd68c43a4"; + sha256 = "12q6cinxavsspc3xpir5dd6nxl7r3pqw7krpnv4i79ji1imsfq26"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -8752,12 +8740,12 @@ final: prev: obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2024-07-17"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "epwalsh"; repo = "obsidian.nvim"; - rev = "ee298fd2136612a4ca6a745a4aec3f49ce6f94b0"; - sha256 = "12r068x6llcf3nwwn7kwab61ihlxbc7746bw1455za2lrmbhj47g"; + rev = "c87db615d1bcf298848a25571a659283595c62c1"; + sha256 = "0sapas3br40vx5xbfxsps2acfhyi3w1njpi22bfjrgwg079bsdaq"; }; meta.homepage = "https://github.com/epwalsh/obsidian.nvim/"; }; @@ -8800,12 +8788,12 @@ final: prev: oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-07-15"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "9e5eb2fcd1dfee2ff30c89273ffff179e42034b9"; - sha256 = "0887k1sk74mgcsr5kdbn19bl8s3slyf918684mbsl0qrsnd1m1sm"; + rev = "71c972fbd218723a3c15afcb70421f67340f5a6d"; + sha256 = "0cap7h95qkf34bq2abjl4l6ai28c1lwqc7g1qplga72hd1c1l48z"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8981,12 +8969,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-07-14"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "85c1b443387ec4dd4eee5f7e2d837c13dd82d452"; - sha256 = "14kwq9bll98nvmbd5mjy5rqjicjlzq1hpnrx1jrjafbvqj810qp1"; + rev = "ab24c847538f3c36cbc0da33210cb3eba32e69b9"; + sha256 = "15mvvi0l6cxjyy74rdkpnb1hpv21204slz11vp8g89pfvis4h38d"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -9005,12 +8993,12 @@ final: prev: otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2024-07-16"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "0cd6d5a3c04a2aec73899f68fb75dfee3225499a"; - sha256 = "087f465szjag0vp3ws97q36hw1y9bp29qbq58xdl05l38dr3v6l6"; + rev = "837f258040d0174ff8495584088046f98499b1ac"; + sha256 = "00hfsnpzc9lkxb35grlxf7xzh4m3v83n8am32g2mb8qn1xa9l1cy"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; @@ -9029,12 +9017,12 @@ final: prev: overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2024-07-15"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "87526babdb563b9e2f0646b420359389732326dc"; - sha256 = "1n1g0smrv07vr91j6ldzl3pi3gw42009276knrygs4qxsbbcfald"; + rev = "cbcdcbae3704c21d3ff96a1927d952b8a966b08a"; + sha256 = "0fn57csqmj946rjr5dypcngbpbjh0pay1b1ncc7ij310invgf7kq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -9174,12 +9162,12 @@ final: prev: persistence-nvim = buildVimPlugin { pname = "persistence.nvim"; - version = "2024-07-15"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "persistence.nvim"; - rev = "40a137dd9240c9c6760c53df48d2b155f52c252b"; - sha256 = "0ygr5f3zj1gmmr50aagr88hd46jr22bz4b3dhz6bfgv1pa60bgyw"; + rev = "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d"; + sha256 = "01sm0dyq3k939qf91hx8nldpj9kik4s6s2z6mahmqjh5ghday6a1"; }; meta.homepage = "https://github.com/folke/persistence.nvim/"; }; @@ -9246,12 +9234,12 @@ final: prev: plantuml-syntax = buildVimPlugin { pname = "plantuml-syntax"; - version = "2024-06-24"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "1592944444513c208ab5a087397ba987932af750"; - sha256 = "0j45p1f8kxgmbw8kmcvvyby082vk8dgyb2q7vscsy8zvmqszcm24"; + rev = "8fb95a3ae4354ca2322ef24803d8960fce519eb0"; + sha256 = "1wgr7847fhhq5m062cprdxpnbq3ldsywysa3hbsrvs36r63cxvm5"; }; meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; @@ -9560,23 +9548,23 @@ final: prev: rainbow = buildVimPlugin { pname = "rainbow"; - version = "2022-10-08"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "luochen1990"; repo = "rainbow"; - rev = "61f719aebe0dc5c3048330c50db72cfee1afdd34"; - sha256 = "0q6ynkv08b4rlns6gzrkwxrihykpadcrln8ckbcwmsv97injhxws"; + rev = "76ca1a20aa42edb5c65c19029968aad4625790dc"; + sha256 = "0wa4ayv7j68mighx9gacqrmxv131c21cqngr4f0qffnxrl0y04bl"; }; meta.homepage = "https://github.com/luochen1990/rainbow/"; }; rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2024-07-07"; + version = "2024-07-25"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "b29da4a6061a88270e875b38367d82c04c856128"; - sha256 = "0iy1vjp2a9w46q5cwswv8j5j06fz8898f2bh4zc8n14i2acxp1w1"; + rev = "960cce4eba798748baff3892a62f2c2b210fb76b"; + sha256 = "0zc59s3sviskzjym9pxjirahjy92mb2amx2maili2sy5x9b7r46f"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -9655,12 +9643,12 @@ final: prev: refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "2024-07-05"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "d07218748c48e756c27aa6859bfa6e62a3d271af"; - sha256 = "14ckyn81czdiymsk8gvjjpaz10ny9232qb118fdl311q1ln794fk"; + rev = "274fdd505ea19a10d14b7564b6d293408845091b"; + sha256 = "0qwj904137qmiwzbyx73h45hhdi4yb5164a40jdysxz50nkch8fb"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -10064,12 +10052,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-07-15"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "44145a4b37217348293fe457992cc38cf3b19f33"; - sha256 = "1xaycgpfq5l3bfks7fw1s5cci9raaama3jj3dfgym4qslff7iykn"; + rev = "209c136a5bee236094245196986ce94920dd3fdf"; + sha256 = "1iwmadjdp0h8j32dh16qz95mhphs095h5q2jbr7r88i5gdhhfn3r"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -10280,12 +10268,12 @@ final: prev: splitjoin-vim = buildVimPlugin { pname = "splitjoin.vim"; - version = "2024-03-17"; + version = "2024-07-19"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "9b0c30f61f13ba4800a11107648bdd748ad511ba"; - sha256 = "15a3ib947yihdbc9i2i1a8ml4vhfff26lj5y0z7192g8qhw58qlh"; + rev = "dfd979d34d29e49478562f599609a12ae3b15fd4"; + sha256 = "0h882vg2qq66lnr6cz8kdh3f3sfzjf58c2phwvzy5wl933wh41sl"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -10425,12 +10413,12 @@ final: prev: styler-nvim = buildVimPlugin { pname = "styler.nvim"; - version = "2024-07-15"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "styler.nvim"; - rev = "6a119fa1104b5fb1d6f768e2d4b5d10efb3ee3e5"; - sha256 = "1wb06dypm85l15ybfmp4vxwi7qjpk64yjyns2mjwbg43ki22jyy5"; + rev = "cd616580f206d929a319987f8f9aa7e0bd6f11ef"; + sha256 = "1m2g22csdz89l1yz1wjralrd9dljmms0zjwvan9ib1dil54l82jg"; }; meta.homepage = "https://github.com/folke/styler.nvim/"; }; @@ -10691,12 +10679,12 @@ final: prev: tagbar = buildVimPlugin { pname = "tagbar"; - version = "2024-06-06"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "0815b5455c792a610d28ff3e7981642c9cf05d62"; - sha256 = "1vdj7ardgbmpj9qjfb5r2yp5avscny6v14p6552jphbyqkczd9pb"; + rev = "1690b19ea62a8c9fef68a2c35896910338a1dfe5"; + sha256 = "0w0z2wxcskxqkikml7667qx8pqnm3ggrvf3r1gwkg7rkvwnacm3j"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -10824,24 +10812,24 @@ final: prev: telescope-file-browser-nvim = buildVimPlugin { pname = "telescope-file-browser.nvim"; - version = "2024-06-09"; + version = "2024-07-21"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "a7ab9a957b17199183388c6f357d614fcaa508e5"; - sha256 = "0g3wh4bspjwmzrd0gl5wwkm6lscbaih8jqzhxzlnbbxk8aky75fr"; + rev = "8574946bf6d0d820d7f600f3db808f5900a2ae23"; + sha256 = "145jssc1agd8cw49p3l781lsphym74gn3kjlfl35c6j7bhkhmyvc"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2024-07-15"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "bb2c63ee5375ede81c1945b58638412af42b2d62"; - sha256 = "0slkmdwqrfmzg1n6xfbnac9xglbqi6bkp3fwm70sr12nsmkph3qv"; + rev = "cef01dee8bd07540216c4e4bf429565a86f68d6d"; + sha256 = "0wx1kmdxpfy6iyypq4pjig4bsq8vmjkzvax4l23mwz4h9nr7kj84"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -10921,12 +10909,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2024-07-01"; + version = "2024-07-21"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "d2c8fee183d6b414128acf376f5c8d3c250ae225"; - sha256 = "1awha1dscjjxf10nha3i8mmmv44m1b99k77ap9p33s4whrmxfd2h"; + rev = "836c9690b1ec6b09d0eebc43e2f2b88561191648"; + sha256 = "1ydvlvvr0ph1qd8lad41gw8dcm769wsa65gyy1ybsys92yzlbn2q"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -11078,12 +11066,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2024-07-01"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a"; - sha256 = "1ysbn67rlf2p63pp8155198a5v0hv5cn2bbhdjz9r5255y5f19sk"; + rev = "10b8a82b042caf50b78e619d92caf0910211973d"; + sha256 = "0i6znzbcv5m87nakhqdqn5cfkghdhbfww5avd0x8m25a2lkgl77g"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -11198,12 +11186,12 @@ final: prev: text-case-nvim = buildVimPlugin { pname = "text-case.nvim"; - version = "2024-07-16"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "johmsalas"; repo = "text-case.nvim"; - rev = "13daf28a829e6d0646904c94214cb289bb0c6f34"; - sha256 = "15i74y64vdr6q5jq40p8n0mfp5xacb8dc9ar51vfcmzv6m3awv42"; + rev = "629d4a2f8377505ebc75a275d6319202c0b74385"; + sha256 = "15dcf2rpgc0hpnjd9n5qy5i98nabn3nk5j4y7r3zhdiap675y24k"; }; meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; }; @@ -11306,12 +11294,12 @@ final: prev: todo-comments-nvim = buildVimPlugin { pname = "todo-comments.nvim"; - version = "2024-07-15"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "96fee098a90e7c09c9811aa7df71d773ba8b9b53"; - sha256 = "1xc4y7fa8ax1affyqkdil2lbdhbwvfnfpv3ykjcdzcgy23i13n8g"; + rev = "8f45f353dc3649cb9b44cecda96827ea88128584"; + sha256 = "0f6ranmfx33cvymigxyvrz4f8jb8k2k9mhlq7fqi5bl1ash0add7"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -11343,12 +11331,12 @@ final: prev: tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2024-07-18"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "2e41c5fe8a399868b73080d0efa15af2836fcaf7"; - sha256 = "1w5sqs7fg6i93j9qb4kk6g99w1yj8ax832g63i5973ix8c0k2pq8"; + rev = "b0e7c7382a7e8f6456f2a95655983993ffda745e"; + sha256 = "0l61q9mardc0p0pg6vrmp08man2mah385ldq1kpkc19y7s9s85hp"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -11440,12 +11428,12 @@ final: prev: trouble-nvim = buildVimPlugin { pname = "trouble.nvim"; - version = "2024-07-15"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "bf99ea71a39e322336b7f8be965f86dbf5c65540"; - sha256 = "0s3y90pvf1k6zkvar9rc7276h1ic6400ziry9dnmzdqxm1ay1y26"; + rev = "6efc446226679fda0547c0fd6a7892fd5f5b15d8"; + sha256 = "0s0b462qzhsamnhvxnzm9lj1fxp0q28w94aa34hf9ayarn4fpgvm"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -11476,12 +11464,12 @@ final: prev: ts-comments-nvim = buildVimPlugin { pname = "ts-comments.nvim"; - version = "2024-07-15"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "folke"; repo = "ts-comments.nvim"; - rev = "80eec3b9663ac3c4743b584f361099b061d0a9e5"; - sha256 = "0ax5sgpqimsnh852y0g8v870kvwdra369nsb7p4xzsja4wyjyddl"; + rev = "98d7d4dec0af1312d38e288f800bbf6ff562b6ab"; + sha256 = "12g6rwrj67wk4fxxl31rsras5jw6a73xngrazlw095xhz6sd9l71"; }; meta.homepage = "https://github.com/folke/ts-comments.nvim/"; }; @@ -11512,12 +11500,12 @@ final: prev: twilight-nvim = buildVimPlugin { pname = "twilight.nvim"; - version = "2024-07-15"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "twilight.nvim"; - rev = "38dc017474ef05605ca14a2577e01e09f0db7133"; - sha256 = "1vrwh70jz0f0rxb4i2wfmjdhb3xpc4bhqxivld8q6cp2x3k4k2vf"; + rev = "1584c0b0a979b71fd86b18d302ba84e9aba85b1b"; + sha256 = "16j4psdap33dlamnjn8895bqn92rlbzm1c9gpv3yihqh15546bxh"; }; meta.homepage = "https://github.com/folke/twilight.nvim/"; }; @@ -11572,12 +11560,12 @@ final: prev: ultimate-autopair-nvim = buildVimPlugin { pname = "ultimate-autopair.nvim"; - version = "2024-06-10"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "altermo"; repo = "ultimate-autopair.nvim"; - rev = "035d92eab05ac1390afef7204e3fcad9a50fa443"; - sha256 = "086lmfrllhnlx5c6ksi0lx287zfi86vlazy69sqb0876d0lfn2gs"; + rev = "0a501a22b587cc98531fcb617bf8cda29cb2dc11"; + sha256 = "1c58y7w6wils78lqf3csgghdkhh5249zgri3n9cicdm8f499zgl6"; }; meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim/"; }; @@ -11608,24 +11596,24 @@ final: prev: unicode-vim = buildVimPlugin { pname = "unicode.vim"; - version = "2023-09-20"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "bc20d0fb3331a7b41708388c56bb8221c2104da7"; - sha256 = "1nrx791gj66sky9bb039n7hwkvcic7wr1nrrb1vrx1sgqmwfpy6f"; + rev = "9da92ffe08b90200dcb499fdfecb234326f5514c"; + sha256 = "0bnnhbf006jwzzn9j08swgn16sd8qh669kzm7272mywl60s0q3hx"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; unison = buildVimPlugin { pname = "unison"; - version = "2024-07-16"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "525e923467a7ce0c3cd07bc1341e093ddf44f053"; - sha256 = "1ljclhw5imhjxwzrgiw8yipfmc8bc1fi3rh0705rv3mrn5bxky91"; + rev = "f5595763db4bc931f851a8139009009a1ffd04b1"; + sha256 = "1937mziylksh6fnisk0hq07d4570fyimhj0czf6pm10dxm19d74a"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -11740,12 +11728,12 @@ final: prev: vim-CtrlXA = buildVimPlugin { pname = "vim-CtrlXA"; - version = "2024-06-07"; + version = "2024-07-21"; src = fetchFromGitHub { owner = "Konfekt"; repo = "vim-CtrlXA"; - rev = "afab3d2479bcf97f4c4cadf72db7e28a4db56873"; - sha256 = "1bfwggqm33a9jg8q2yzljjcjypgwpwkf3v0ip96m7q4hg65wvbma"; + rev = "084d00284f532eab511a771f21a184d2024a9e46"; + sha256 = "197a13nnvq4w81l0c2bimfgwxdxxsqjzghmh901z1665y919fc5m"; }; meta.homepage = "https://github.com/Konfekt/vim-CtrlXA/"; }; @@ -12076,12 +12064,12 @@ final: prev: vim-airline = buildVimPlugin { pname = "vim-airline"; - version = "2024-06-16"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "02894b6ef4752afd8579fc837aec5fb4f62409f7"; - sha256 = "07jxqibg8zdir3w5lq2ibjvf6zw9b9386y9pwybgzg91c9pvd9xk"; + rev = "d25c049e617775eb2eb26c580e5dec591c94d480"; + sha256 = "0pq63f30cqsbq4q669h6ps64hxz05a2b7z3i09lfj0fpa1a27p0h"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -12796,24 +12784,24 @@ final: prev: vim-dadbod-completion = buildVimPlugin { pname = "vim-dadbod-completion"; - version = "2024-07-15"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "c3a56c652af9367c5a7b658ed7ed4dc494f430b0"; - sha256 = "02h30qsciyb2slsff4zyddgzskccai9afrg0sx67pkbbhsf90nmm"; + rev = "7204845f9c4bbd60a77ae40375661819b764020b"; + sha256 = "0cyin1p0n8m3qlhz3w7c60sh8x4pwpza5ff6zmkrgf1r75ksqy7c"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2024-07-15"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "954877c3396ad4bf5624fcbe7b5673ac43cd0928"; - sha256 = "1hd0ckq5rq28i1fi0wl0vf1an8am6wvv538bbp86bwi4a9qrcflc"; + rev = "0f51d8de368c8c6220973e8acd156d17da746f4c"; + sha256 = "1pb61wwm7vma4dilxryyf1bzq05yh35chlnqfng0wxr9b9hj8r7r"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -13036,12 +13024,12 @@ final: prev: vim-elixir = buildVimPlugin { pname = "vim-elixir"; - version = "2024-07-09"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "84a0de7f53d80dc01f63fd6819e412d061e6a67c"; - sha256 = "1zv3xy3p0315nwnliyr06p03ghpmygf5af5n6psrz57m7czlb2s7"; + rev = "753fc863e488bd09580221d7829c3e4735a99fdb"; + sha256 = "0bzhbsnpabln2p6r1ns6dmxb6x01jy002y60w8ah49qjn6qnmk1n"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -13204,12 +13192,12 @@ final: prev: vim-fetch = buildVimPlugin { pname = "vim-fetch"; - version = "2023-05-29"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "wsdjeg"; repo = "vim-fetch"; - rev = "bbb75c3172f766d1a62832df0ec7674c69a560ad"; - sha256 = "1mcn4a7n1318sgi3dd062sh1sy2b8sa4inwklcz2gh095lr9i323"; + rev = "db3fd95eb0cf7e7e9effa1338b286db33e4a36c1"; + sha256 = "1br13ih1ybx5dnj8aax6lf0s970vy43s9swwrxqn411ihcrclqz6"; }; meta.homepage = "https://github.com/wsdjeg/vim-fetch/"; }; @@ -13300,12 +13288,12 @@ final: prev: vim-flog = buildVimPlugin { pname = "vim-flog"; - version = "2024-06-13"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "255631abf7ea132393fc7dd745d6911c37ac6a4c"; - sha256 = "0k92fs7wq1yhbwgf29awv70k06nb36x375b4rjwc4sf559i223mc"; + rev = "83cd74b03d1b2a7122334e277b7a3a188686a59c"; + sha256 = "04s4zhnls4v0dj7njg8mr73ln5kiv48whrbf865kq71kfvmjcjqd"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -13360,12 +13348,12 @@ final: prev: vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2024-07-05"; + version = "2024-07-18"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc"; - sha256 = "1njc46mdvpipci7l2gcljsi0nxxjzwjr7s8pfkvr2l25bi3irz09"; + rev = "0444df68cd1cdabc7453d6bd84099458327e5513"; + sha256 = "0sx67lwz1f6kd2751qbbzpgq0hjik1g8x4svp788yvzbjdgdmc9l"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -13552,12 +13540,12 @@ final: prev: vim-graphql = buildVimPlugin { pname = "vim-graphql"; - version = "2024-07-11"; + version = "2024-07-18"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "278526b656404903d64d39f129284e421cc1bdad"; - sha256 = "0rsgmpimcbm6f9cp113acvfz0wg4ignyc2ayllr11668k9naqndr"; + rev = "e1576c481d3102d7d30e131c73d15c4baac2cfa2"; + sha256 = "0v9piz33p336rk9lar4ghlphwxan71ibsxdrbc20b4r1vhfcivpf"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -14118,12 +14106,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2024-07-15"; + version = "2024-07-18"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "5dd22247ea21fa0d7d7bc258ade827c5c777b716"; - sha256 = "1m8m01gc19rm2bjfwg1svx9xahx2g9kd93qlrdh5qxf6vilhg41g"; + rev = "3143de2ee5b784d99e5322fd3382823ce8eb845c"; + sha256 = "1fykswvc2qparxzyvyikm7px6z5k1nppp40jwx1zlmc2q11sjpjf"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -14346,12 +14334,12 @@ final: prev: vim-lsp = buildVimPlugin { pname = "vim-lsp"; - version = "2024-06-20"; + version = "2024-07-20"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "a8f244a4e9527992acd89c578933ad1d3940d276"; - sha256 = "1xxgyawfr3lw5qqgkalajmnanz4n1dmbw1fyv362b72jg7h19fh5"; + rev = "6b7aabde99c409a3c04e1a7d80bbd1b0000c4158"; + sha256 = "0zz9g1wbz6391ilr7xdpknn132p9vx7nyn6pp89jg8h6jr8f44lv"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -14382,12 +14370,12 @@ final: prev: vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2024-07-14"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "4bb4c92db42ff9f96868578195af6726c92d5126"; - sha256 = "14ysapcq9bnv6k4qhcz31zfra41c0s89xm7lx4ymr3h9ymdj2sgb"; + rev = "65749446c8c8556d0c287bcd724084a625913d02"; + sha256 = "1lzxbb8yz92h3fkbsc9ccim6pdnjfj4hdxs6b0iiqi8qq7a87wf1"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; }; @@ -15007,12 +14995,12 @@ final: prev: vim-pandoc = buildVimPlugin { pname = "vim-pandoc"; - version = "2023-12-18"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "fae27ec62606b6b914de5270985a69d1b5da1287"; - sha256 = "139lg369mrh0zkk3bh1fgp2iz54m8fjp7rgyy3j25ivylna5lzn8"; + rev = "bd11902651edc18076f90ed291581d785be52311"; + sha256 = "0aj0gsn2q5dqx9faky7fpqz93h6yih46dn7mn9gm80sdlv575gix"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -15595,12 +15583,12 @@ final: prev: vim-sentence-chopper = buildVimPlugin { pname = "vim-sentence-chopper"; - version = "2024-03-08"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "Konfekt"; repo = "vim-sentence-chopper"; - rev = "b1394d3dbc3675324b2735c12f0df99395d9d7ba"; - sha256 = "12llyn54qmbwzvn3m08r8k1fp6xwqp71sbbkp9j587kd4d6y5kps"; + rev = "0657aaa3f3b1acffde94f6eb6b08b106d8cf8162"; + sha256 = "1yk56gnljl7356m3vi6r0vvxzs0clpivdhs7kbc3x982jhm96vv2"; }; meta.homepage = "https://github.com/Konfekt/vim-sentence-chopper/"; }; @@ -16544,12 +16532,12 @@ final: prev: vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; - version = "2024-04-29"; + version = "2024-07-20"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "3cb40867cb5a3120f9bef76eff88edc7f1dc1a23"; - sha256 = "0cikyb55z31jnh3zvm3xf8skfqdvdg3ihhb1z8xc1cxhx9gyc4hz"; + rev = "53bba6bb8342de9cbdafc82142a9b5e82008d858"; + sha256 = "02q2fyinapfr8y0fndv3q7x6ri42nlvpy6qc7cklszx77q4y0a89"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -16856,12 +16844,12 @@ final: prev: vimspector = buildVimPlugin { pname = "vimspector"; - version = "2024-06-09"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "ee3bd0120525978521168eda1c3a64ef24e3cb86"; - sha256 = "0g2zxgafxr90cmc8anvr0d5wkvzbpba8b6jblsdnq93648p38qx8"; + rev = "5b98bc8cf8341bf18c553cdfe71a711f900009ab"; + sha256 = "1z1hhdvnw6ny87hz9xpl66nb9lz2ggw9dwqr4gv01b38wpkwysm8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -16869,12 +16857,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-07-12"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "80c9bc179784c30192d482741a43f176c859daa1"; - sha256 = "0kkmyh51x5rfi1yrdl7cw5b4g3y6066kb01kjqmq08wf22zlldk3"; + rev = "5ac62e0315c6f54f53a7d6da7c485cf8e9cf7240"; + sha256 = "0kj1nc86qib6n58ds18aiszbnfgqbjk92d5lcpypf1fcfjvyvv84"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -17013,12 +17001,12 @@ final: prev: which-key-nvim = buildVimPlugin { pname = "which-key.nvim"; - version = "2024-07-17"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "ed5f7622771d0b5c0ac3a5e286ec6cd17b6be131"; - sha256 = "0qas00zikybrkp0js9r4vgx7p2znpilsflfjy144baw9fh44bij6"; + rev = "6c1584eb76b55629702716995cca4ae2798a9cca"; + sha256 = "0qwwj4r5hvsmsjz352aqa4hv3f9pms6r67c4yh5imn5iyvinrzwy"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -17049,12 +17037,12 @@ final: prev: wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2024-07-10"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "d65fcef243d273787106a1328ff5cad5b1e2a918"; - sha256 = "0lmz6q9h68zsbgz8nmmlkhbdvhxcdcki8hmk75mzcj7w20vdy6p4"; + rev = "574f3a3075aa7013160bef3e44489454ce768ba7"; + sha256 = "1q0dyrx8scpgaibi65dfl3d0zq4wpjgz9kkjacwqwsaziiyjxf1i"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -17242,13 +17230,12 @@ final: prev: yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "2024-07-17"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "6d572672311e612a982e95617e6f507b6ec11555"; - sha256 = "020avafa96rqgakk85nbq5zjg7yc1pgmrgdlgmkhm0z4ny3b4miz"; - fetchSubmodules = true; + rev = "3a556935ed83de2a9e5a9c81446c7983b9248f9a"; + sha256 = "1nmg6mnp7xj9zwss3qyhjrqw60cxivj5v8rs1g48l0ls9yqmlrz1"; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; }; @@ -17303,12 +17290,12 @@ final: prev: zen-mode-nvim = buildVimPlugin { pname = "zen-mode.nvim"; - version = "2024-07-15"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "zen-mode.nvim"; - rev = "a31cf7113db34646ca320f8c2df22cf1fbfc6f2a"; - sha256 = "0g862r4k0qqb5h8gxd9ys1n2ksdzwg375l6p69qw4h3k17f7dbzc"; + rev = "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6"; + sha256 = "0cbdj5wwx582yqlpjdfg1snxxx3z2wn6v2gzvyling5ma6faqwc8"; }; meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; @@ -17351,24 +17338,24 @@ final: prev: zig-vim = buildVimPlugin { pname = "zig.vim"; - version = "2023-10-10"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "54c216e5306a5c3878a60596aacb94dca8652ab9"; - sha256 = "1nxwjyn3ps3c2abffai5cql3czl4kah4cin0g30damy1k99ypncb"; + rev = "ad75bb5752f3556d8bde5b0e69cb69a98058030e"; + sha256 = "0wgjasakkcdzr5zv553gc2x2kzg0778y6qi7rswqbfxxadlkl5xj"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; zk-nvim = buildVimPlugin { pname = "zk-nvim"; - version = "2024-06-27"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "zk-org"; repo = "zk-nvim"; - rev = "15e24e96cb90889ebd12b5dbe800a958c716f520"; - sha256 = "1sjnwjv4spa2cn54mv2cndirypkzhm81zxjz0v7kb5pf39rlq03c"; + rev = "dbf4eeab55b08856c9d6b6722dbff39630bb35eb"; + sha256 = "1d6qz2yi4d0ccpibjh3c366qh32hd9r646m1b99vy16r27ydffcs"; }; meta.homepage = "https://github.com/zk-org/zk-nvim/"; }; @@ -17399,12 +17386,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2024-07-11"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "7946d1a195c66fed38b3e34f9fa8e0c5a2da0700"; - sha256 = "15cpz3jy97lkpdq32ypbk6wa29vplx9y42ic35ygc15ikxp470s7"; + rev = "10eda02ea4faa7d1f94e77a3410a4ae91c25c5f5"; + sha256 = "1isl44p5z8ynmc7v75154wxc3xkk7i351k4164br6gpm49dwlvp3"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -17423,12 +17410,12 @@ final: prev: dracula-vim = buildVimPlugin { pname = "dracula-vim"; - version = "2024-06-13"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "ada471d684d4acfe803c4e033d7c3ae5d7252db6"; - sha256 = "1w1bxg532l1khgb285xs4y6l40bj4dq0kdh6iwfihw6x0mqsrv1j"; + rev = "65f4225e0526516a67d56c8ac09925a209138e53"; + sha256 = "0jp54l8k40mij0mkavsxzv2kipvzzvy211d6hyvq6ry9liqkl7b8"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -17495,12 +17482,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2024-07-08"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "17016f9e7d2cfb64e94e091d4748463b09936d7a"; - sha256 = "05kvnx4c5sm80l5qs2lhcgi9f5zs8g9kz7zw8bjjcr8h5ij7jw9n"; + rev = "19efaf31cbe15a429cb3ca6ac9c9fce13275045b"; + sha256 = "1kpg8bkjdcna8327pb212dgh5rxij0ahvc30qn7bb5cwjcrfzbp5"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; @@ -17519,12 +17506,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2024-07-17"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "e03c638950dbc31fa0dd65c3b56495976d8420a4"; - sha256 = "15cnyz3x989djxhr98vnh95xid5vsvf11myz1p71ifb0ngkfyyxs"; + rev = "7c5aa0a71d1d782d1cc80b130603b7e6bf8d2fd9"; + sha256 = "1yz6mrq591bq6wjihglaj9p9jhpibwb361n0kf68glb2qv70aiw0"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -17555,12 +17542,12 @@ final: prev: render-markdown = buildVimPlugin { pname = "render-markdown"; - version = "2024-07-17"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "MeanderingProgrammer"; repo = "markdown.nvim"; - rev = "4ab835985de62b46b6785ae160f5f709b77a0f92"; - sha256 = "08awhqsvjmq6hnlk0367817wxv6f2i8xf8dawd0n4z4pl5xmcrf6"; + rev = "b75f681d675e21b5a09909997e9fffa6313c946e"; + sha256 = "1g129sl3v13i2lnrvhagpf5nc99yi3wxy41x5797il06w08cis2j"; }; meta.homepage = "https://github.com/MeanderingProgrammer/markdown.nvim/"; }; @@ -17579,12 +17566,12 @@ final: prev: rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2024-07-15"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "9e4320d0bab7f261921d6af7d1c1bbc1a1e3dc67"; - sha256 = "11ksc6k5fg8nxb3sk40d06lrk8ycsss76q2w4lba6b6bph7b6l21"; + rev = "e4b08d74b7272cb21e4e9c71b8b9e0830fd722fe"; + sha256 = "1wlr2hm8818f5cdy757kir6vwnh777vrji4hsnzhbbdj3zk9w115"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 58692ae3bd97..de27c70d1f90 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -27,12 +27,12 @@ }; angular = buildGrammar { language = "angular"; - version = "0.0.0+rev=b96a0d1"; + version = "0.0.0+rev=31182d4"; src = fetchFromGitHub { owner = "dlvandenberg"; repo = "tree-sitter-angular"; - rev = "b96a0d1605da3492f6474245098b6f0c503e596d"; - hash = "sha256-M2eDOlxHb0bjm3SfjE84M9ByVevApMqfoauKYdDG6s4="; + rev = "31182d43b062a350d4bd2449f2fc0d5654972be9"; + hash = "sha256-E+MrOQJIUsAGPMIIM43gROs1yIiokCHXJB2pmWGe0i0="; }; meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular"; }; @@ -127,12 +127,12 @@ }; beancount = buildGrammar { language = "beancount"; - version = "0.0.0+rev=c25f803"; + version = "0.0.0+rev=384c55e"; src = fetchFromGitHub { owner = "polarmutex"; repo = "tree-sitter-beancount"; - rev = "c25f8034c977681653a8acd541c8b4877a58f474"; - hash = "sha256-j+TyGT5FycEj+E6si7GSKUauvXNvl1L2NEw98jU7jns="; + rev = "384c55ede2a1f13e83d8e18dbef8f11304c379c2"; + hash = "sha256-OEfiJWF3+wxwaqk4kyMSvJG9c6NbyphHG2hnf7fCiOQ="; }; meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount"; }; @@ -193,12 +193,12 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=deca017"; + version = "0.0.0+rev=be23d2c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "deca017a554045b4c203e7ddff39ae64ff05e071"; - hash = "sha256-uvvARjD4729GO8vpmrhAzheEQ3oz7LYmF8awdyS2/Rw="; + rev = "be23d2c9d8e5b550e713ef0f86126a248462ca6e"; + hash = "sha256-6R9bx0UMjln8W1DrHG1AyA+Ziq9XGuLti2m/bC6lPgg="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; @@ -325,12 +325,12 @@ }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=7ce8946"; + version = "0.0.0+rev=0b4aa47"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "7ce8946cae4bb25adebe5b50394f702beb007026"; - hash = "sha256-haU0fXNwYh3YaP8VMY1krRHxrGvNkDV4hMcxp5z9TVA="; + rev = "0b4aa47f07d958a49260aadc87e8474b03897c23"; + hash = "sha256-z2cG/woWbpvLJdmlN7ZuPiDwWhHnmwr3speMDFz3cEk="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -359,12 +359,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=b93070b"; + version = "0.0.0+rev=07f2f15"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "b93070b5a91ee9537d45e59d741737b1289c5dcc"; - hash = "sha256-IINYPEysz5bI2cmFY6eNCR86b0OfBIqws5a61UxCfg4="; + rev = "07f2f157d484a27dc91c04cc116f94f6fd4fc654"; + hash = "sha256-GWiSQzMHtXd0EESjC1a0l0O8Q7zx3gjvNy8YZw/U/Bk="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -447,12 +447,12 @@ }; djot = buildGrammar { language = "djot"; - version = "0.0.0+rev=87bf828"; + version = "0.0.0+rev=886601b"; src = fetchFromGitHub { owner = "treeman"; repo = "tree-sitter-djot"; - rev = "87bf82874c86dcf563f5521069d603ed50e5f0cc"; - hash = "sha256-abAEVbS9hqc1uHx6NxXRBA2SLrCL3gBBPLgAK9Tz3G4="; + rev = "886601b67d1f4690173a4925c214343c30704d32"; + hash = "sha256-uh41umECO8mIgML4JV5yz2iaNy6h5uLQWodcXvhI/MM="; }; meta.homepage = "https://github.com/treeman/tree-sitter-djot"; }; @@ -526,12 +526,12 @@ }; editorconfig = buildGrammar { language = "editorconfig"; - version = "0.0.0+rev=c5f8368"; + version = "0.0.0+rev=fd0d64d"; src = fetchFromGitHub { owner = "ValdezFOmar"; repo = "tree-sitter-editorconfig"; - rev = "c5f83685a64117872ae750ce14333a7a1dddcf0b"; - hash = "sha256-kmQ3+QTwWd/92wL6YS6UchI819eLnD9YfT5TPANvCXA="; + rev = "fd0d64d2fc91eab903bed4c11ce280b62e46f16e"; + hash = "sha256-7Q8+XEGWqOnkLW7b9Vnubr2LhvdTK48at45k/Gsm9Us="; }; meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig"; }; @@ -614,12 +614,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=19ca500"; + version = "0.0.0+rev=8f41b58"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "19ca500fa5a17ab58dc18aa03b50e2db305e7a8a"; - hash = "sha256-5WUuy8+O9yujzoAjO2sNGM1+IEnaS7HEphTKcvFJJNo="; + rev = "8f41b588fe38b981156651ef56b192ed3d158efd"; + hash = "sha256-B/SF86W+0t6rVzo/QpQ6QQPsD7pH5dHGLCqxzoIhNTg="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -713,12 +713,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "0.0.0+rev=dde9829"; + version = "0.0.0+rev=6b63343"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "dde9829554b831cf6cbf927294f22dfb9a8f0419"; - hash = "sha256-QvEKisBE4Qrnv1CjeCMhIt/L1BdXEJLCprw/hJoAE20="; + rev = "6b633433fb3f132f21250cf8e8be76d5a6389b7e"; + hash = "sha256-0P3fY7DVnBqzBIg+e5E5i80jZl/GEYO8SIdxf/ZdkfI="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -790,12 +790,12 @@ }; git_rebase = buildGrammar { language = "git_rebase"; - version = "0.0.0+rev=274e27e"; + version = "0.0.0+rev=bff4b66"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-git-rebase"; - rev = "274e27ea0f09371122ab55b8a812a32d6ef644e8"; - hash = "sha256-W0aDOZ2uPXHGAbt/p3slyotw4dPsmgADnRAH3e9NT1Y="; + rev = "bff4b66b44b020d918d67e2828eada1974a966aa"; + hash = "sha256-k4C7dJUkvQxIxcaoVmG2cBs/CeYzVqrip2+2mRvHtZc="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-rebase"; }; @@ -834,12 +834,12 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=02a17bf"; + version = "0.0.0+rev=426e670"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "02a17bf9d0553406268cdbf466d57808ae712bf3"; - hash = "sha256-rZPe7rrnPa4QGnFUjwoaj/7HJzNDSigc7w4gJEFXZD4="; + rev = "426e67087fd62be5f4533581b5916b2cf010fb5b"; + hash = "sha256-SI3/gUksiRgUpCabsll6g0mUcm5iiNMTzxlxQxCujpY="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; @@ -856,12 +856,12 @@ }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=3736dfc"; + version = "0.0.0+rev=ddc3137"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "3736dfc811c07fa749ca818f94c9a3977734dd26"; - hash = "sha256-BIEM9i7GItQZmOcJDMHm2yY+4xeL5x9BzZORtYOxr28="; + rev = "ddc3137a2d775aca93084ff997fa13cc1691058a"; + hash = "sha256-q1xL3/4W442z1wjYL0HQNdz4sPZqqEijyLSvECHugXw="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -988,12 +988,12 @@ }; groovy = buildGrammar { language = "groovy"; - version = "0.0.0+rev=f361500"; + version = "0.0.0+rev=3912291"; src = fetchFromGitHub { owner = "murtaza64"; repo = "tree-sitter-groovy"; - rev = "f3615006429251a966d7452bd46a0171364bcb7b"; - hash = "sha256-n3haDlldeFk9FzHY7k5zhzDNHA6TzjncZpsQuHl/Q00="; + rev = "391229139d9f79879ccc84cb271889c9240c28a1"; + hash = "sha256-AtA6249CHaOYQGgYfaECFESmJi9Wq+iFC58rHSh5x9M="; }; meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy"; }; @@ -1065,12 +1065,12 @@ }; heex = buildGrammar { language = "heex"; - version = "0.0.0+rev=b5ad6e3"; + version = "0.0.0+rev=6dd0303"; src = fetchFromGitHub { owner = "connorlay"; repo = "tree-sitter-heex"; - rev = "b5ad6e34eea18a15bbd1466ca707a17f9bff7b93"; - hash = "sha256-o0ArFfBJTrEQVXVet+AIDPCB/b9KKvOYrrtMGyLgtM8="; + rev = "6dd0303acf7138dd2b9b432a229e16539581c701"; + hash = "sha256-VakMZtWQ/h7dNy5ehk2Bh14a5s878AUgwY3Ipq8tPec="; }; meta.homepage = "https://github.com/connorlay/tree-sitter-heex"; }; @@ -1198,12 +1198,12 @@ }; idl = buildGrammar { language = "idl"; - version = "0.0.0+rev=556f287"; + version = "0.0.0+rev=1a6683f"; src = fetchFromGitHub { owner = "cathaysia"; repo = "tree-sitter-idl"; - rev = "556f2878db1c26da33a921df8226f3268fadef75"; - hash = "sha256-WXF+Opb5GrMqRErJvmPgzTrVnHfstfZKZ+4tWbULLGo="; + rev = "1a6683f6809f7bc630f10fcad7d9ac6471deb706"; + hash = "sha256-eDoERNfSMzpbccX438H2c1AWQMXNm9tJBnCREYqMvic="; }; meta.homepage = "https://github.com/cathaysia/tree-sitter-idl"; }; @@ -1242,12 +1242,12 @@ }; janet_simple = buildGrammar { language = "janet_simple"; - version = "0.0.0+rev=3b08641"; + version = "0.0.0+rev=ea842cb"; src = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-janet-simple"; - rev = "3b08641373cb3e37bc531e6e3cdb85d02b454702"; - hash = "sha256-0bCagqSY/MFAqJNajkaR8Y6J2YiXzOF249cm0pFjTfs="; + rev = "ea842cb57a90865c8f50bcb4499de1a94860f3a4"; + hash = "sha256-0gy4kylOoaC5BigpppAN1va3eRZaS6UmxNcQkbxz1Ag="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple"; }; @@ -1429,12 +1429,12 @@ }; latex = buildGrammar { language = "latex"; - version = "0.0.0+rev=08d8b88"; + version = "0.0.0+rev=f074e14"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "08d8b885a3fa67a6e8aa8edd8988eaa55db46ba4"; - hash = "sha256-QOlnE5JnJHdupL12YMT6cIRcP/2GKsewPkRuWwAwliI="; + rev = "f074e142ade9cdc292346d0484be27f9ebdbc4ea"; + hash = "sha256-t6P+5RW426enWVFB/SPFHIIhXqshjKzmKQpOWfu0eQg="; }; generate = true; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; @@ -1551,12 +1551,12 @@ }; m68k = buildGrammar { language = "m68k"; - version = "0.0.0+rev=9e082a2"; + version = "0.0.0+rev=e128454"; src = fetchFromGitHub { owner = "grahambates"; repo = "tree-sitter-m68k"; - rev = "9e082a2253c50eb3d80e84bbd635e57cfb1476a2"; - hash = "sha256-QJZDozY0UO7tWemKGk3MjDrM/bjpbwCJbWXY0fTL9fQ="; + rev = "e128454c2210c0e0c10b68fe45ddb8fee80182a3"; + hash = "sha256-g7SZ/TrTaaeGDNOqId4eom9R/5gOyXcmmhWY4WW0fF4="; }; meta.homepage = "https://github.com/grahambates/tree-sitter-m68k"; }; @@ -1597,12 +1597,12 @@ }; matlab = buildGrammar { language = "matlab"; - version = "0.0.0+rev=2825fb5"; + version = "0.0.0+rev=821f7bd"; src = fetchFromGitHub { owner = "acristoffers"; repo = "tree-sitter-matlab"; - rev = "2825fb578325ac308945318881445a89ea06e0f6"; - hash = "sha256-M7dECDfpRZHlkjCNvQcAneKR9KHf6HwtoHADZRjIB/Y="; + rev = "821f7bdf9d922822302a0170c2f157e36ffb7a94"; + hash = "sha256-oaq1b/yBH+EOQZ8IW7j2f1nz66RFjXT45IGXz7B8pnY="; }; meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab"; }; @@ -1876,35 +1876,35 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=309cb8d"; + version = "0.0.0+rev=7581cbf"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-perl"; - rev = "309cb8d33bcfd0a81050b21be08f9eb3f2fe2138"; - hash = "sha256-eMmU6qkg9ZVjtxaW1tSPhqsPe2WX3/frPfqMxXCziyo="; + rev = "7581cbf8fb793bce94d0241c89fe49b01b1477f9"; + hash = "sha256-iBr2KbfJWohjHXlFUGvVMg3xUAy78zPk2Kr3UsqXtUs="; }; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl"; }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=575a080"; + version = "0.0.0+rev=c07d697"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "575a0801f430c8672db70b73493c033a9dcfc328"; - hash = "sha256-lvgxProv6EYBSFqMuQZh3nzC9ayjBQeafOECrRHzYtU="; + rev = "c07d69739ba71b5a449bdbb7735991f8aabf8546"; + hash = "sha256-It3UC98PZn1jXJ/LQfPdJ5e/dRdADPMgAawBzvlJfQE="; }; location = "php"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; php_only = buildGrammar { language = "php_only"; - version = "0.0.0+rev=575a080"; + version = "0.0.0+rev=c07d697"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "575a0801f430c8672db70b73493c033a9dcfc328"; - hash = "sha256-lvgxProv6EYBSFqMuQZh3nzC9ayjBQeafOECrRHzYtU="; + rev = "c07d69739ba71b5a449bdbb7735991f8aabf8546"; + hash = "sha256-It3UC98PZn1jXJ/LQfPdJ5e/dRdADPMgAawBzvlJfQE="; }; location = "php_only"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; @@ -1975,6 +1975,17 @@ }; meta.homepage = "https://github.com/amaanq/tree-sitter-pony"; }; + powershell = buildGrammar { + language = "powershell"; + version = "0.0.0+rev=804d86f"; + src = fetchFromGitHub { + owner = "airbus-cert"; + repo = "tree-sitter-powershell"; + rev = "804d86fd4ad286bd0cc1c1f0f7b28bd7af6755ad"; + hash = "sha256-W+v+Gj1KViIF+8wd9auy448hyxz0Uam5FpIpdjCzF/k="; + }; + meta.homepage = "https://github.com/airbus-cert/tree-sitter-powershell"; + }; printf = buildGrammar { language = "printf"; version = "0.0.0+rev=0e0acea"; @@ -2376,12 +2387,12 @@ }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=599d12b"; + version = "0.0.0+rev=a13f2d1"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "599d12b59fed092f5a3d4a7019fd85d90cb39ec1"; - hash = "sha256-OIMrIuN5lE1VBGRhIb2B52VYaihQ/sjYkf8oiqpsXCw="; + rev = "a13f2d1ee9609cc5c4c8ffce9640c353b77a24d8"; + hash = "sha256-KaELrU+4XMHsSacNZnPlWvfNcQRZizQNhxfbsFpsBdw="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -2432,12 +2443,12 @@ }; slint = buildGrammar { language = "slint"; - version = "0.0.0+rev=d82ab8c"; + version = "0.0.0+rev=4a0558c"; src = fetchFromGitHub { owner = "slint-ui"; repo = "tree-sitter-slint"; - rev = "d82ab8c19ea1b60ff570256eaef7d137cc5ecb63"; - hash = "sha256-NFKh3Z9vU1KImjU4Yd/Bnxq3E8kz8k/w2TzEvAtffnY="; + rev = "4a0558cc0fcd7a6110815b9bbd7cc12d7ab31e74"; + hash = "sha256-F+DtGNXc00lv08EnR6sQgTQVYkttgf/xw3bq3IdsQMA="; }; meta.homepage = "https://github.com/slint-ui/tree-sitter-slint"; }; @@ -2465,12 +2476,12 @@ }; snakemake = buildGrammar { language = "snakemake"; - version = "0.0.0+rev=5a7b140"; + version = "0.0.0+rev=46d4de8"; src = fetchFromGitHub { owner = "osthomas"; repo = "tree-sitter-snakemake"; - rev = "5a7b14074bca95b25935e865ca8f1efad32317e4"; - hash = "sha256-mYqftgJOnlWgQZrXaNtFXvjRQgC14PXYyruTVw5J8Zg="; + rev = "46d4de8e6cfca8a97c0489aea936bb15beeaf666"; + hash = "sha256-MNJLveFI5oybM9QE8wgYT7k3GK1E4lIOm3xWJmJazls="; }; meta.homepage = "https://github.com/osthomas/tree-sitter-snakemake"; }; @@ -2511,12 +2522,12 @@ }; sourcepawn = buildGrammar { language = "sourcepawn"; - version = "0.0.0+rev=645d093"; + version = "0.0.0+rev=6b9bf9c"; src = fetchFromGitHub { owner = "nilshelmig"; repo = "tree-sitter-sourcepawn"; - rev = "645d093763bcaaf7535edbdf6575a5c978b16491"; - hash = "sha256-P5l0jaDsPXFenVaoLeeGSp6firHpeNM4/v93eshd8l0="; + rev = "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"; + hash = "sha256-2DjGCZ701c2rMxQZM4YF61rZokZUov4ECb0gwAmyuVk="; }; meta.homepage = "https://github.com/nilshelmig/tree-sitter-sourcepawn"; }; @@ -2533,12 +2544,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=89fd00d"; + version = "0.0.0+rev=a966446"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "89fd00d0aff3bc9985ac37caf362ec4fd9b2ba1d"; - hash = "sha256-QTKggsvVWhszlcYS/WOPkykUyTDgwV1yVJ7jADA/5SM="; + rev = "a9664463580473e92d8f5e29fa06fb1be88752af"; + hash = "sha256-0SY6dOofB+zv4xa7oXabEoUZd5NUV1NHhB+Jx6m137I="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -2621,23 +2632,23 @@ }; svelte = buildGrammar { language = "svelte"; - version = "0.0.0+rev=7218cf6"; + version = "0.0.0+rev=7ab8221"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-svelte"; - rev = "7218cf622b057ae9c530e1f0a7a3ce49806ca55e"; - hash = "sha256-mS4KxJXXb/EzQB5H+Pj+/SEbCTerGFjKiJah8oAGA8c="; + rev = "7ab8221e3f378a3b04b4b488f07c1f408c5bd0d8"; + hash = "sha256-ooeQNwFgDZrn+Vj6nFOS8TJMknl/DgbEghfm0e1EJDE="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-svelte"; }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=9653f29"; + version = "0.0.0+rev=b3dc8cc"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "9653f291ab2179185dc3703672d9fbbd29e80cfb"; - hash = "sha256-apboik9JCxFFvPu6wjZnwm2K21KLvmhm8iesDMbsBl4="; + rev = "b3dc8cc5c266effd7bcfde01aa086b83927f2eda"; + hash = "sha256-GtOE80hjFsyFEVkpuxbpNt9vCHrbw2+WnQgyCKAU0jQ="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2666,12 +2677,12 @@ }; systemverilog = buildGrammar { language = "systemverilog"; - version = "0.0.0+rev=a478beb"; + version = "0.0.0+rev=4f897d5"; src = fetchFromGitHub { owner = "zhangwwpeng"; repo = "tree-sitter-systemverilog"; - rev = "a478beb76be72fa8f305f5fe9cc6141ac91b91a4"; - hash = "sha256-pgZDu2tSgTtE80VXL1T+zAq2dl3B1DoEY/zzxLvqNvM="; + rev = "4f897d5e3f0e38bf8fbb55e8f39dc97d2bc2229e"; + hash = "sha256-guNdS07QqbqegFICNHP1ECX9bc+ZCW9li3ILIZVHRwM="; }; meta.homepage = "https://github.com/zhangwwpeng/tree-sitter-systemverilog"; }; @@ -2845,12 +2856,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "0.0.0+rev=e45cb32"; + version = "0.0.0+rev=198d035"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "e45cb3225bf47a04da827e4575b9791523d953fd"; - hash = "sha256-7xP8ufPV/ndKmi8gfDYpHSY6D6lfsR0/YXfq3/RT8x0="; + rev = "198d03553f43a45b92ac5d0ee167db3fec6a6fd6"; + hash = "sha256-U597+o8gakd4nU9H2FE2aVhGqSG/eRh6BUhtEmwMzrU="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -2879,12 +2890,12 @@ }; typescript = buildGrammar { language = "typescript"; - version = "0.0.0+rev=e45cb32"; + version = "0.0.0+rev=198d035"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "e45cb3225bf47a04da827e4575b9791523d953fd"; - hash = "sha256-7xP8ufPV/ndKmi8gfDYpHSY6D6lfsR0/YXfq3/RT8x0="; + rev = "198d03553f43a45b92ac5d0ee167db3fec6a6fd6"; + hash = "sha256-U597+o8gakd4nU9H2FE2aVhGqSG/eRh6BUhtEmwMzrU="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -2913,12 +2924,12 @@ }; typst = buildGrammar { language = "typst"; - version = "0.0.0+rev=90f6af2"; + version = "0.0.0+rev=abe60cb"; src = fetchFromGitHub { owner = "uben0"; repo = "tree-sitter-typst"; - rev = "90f6af21271dee246a9cafe109e2b456c5bc10a6"; - hash = "sha256-53BCAdQLpeV2l6kmfllrCU186svZ4RE/2+VVrWuFV8Y="; + rev = "abe60cbed7986ee475d93f816c1be287f220c5d8"; + hash = "sha256-hwM1oEzABe9sqY0mpDXSfwT+tQsLV5ZNSG8yJhES6Qg="; }; meta.homepage = "https://github.com/uben0/tree-sitter-typst"; }; @@ -3023,6 +3034,17 @@ }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-verilog"; }; + vhdl = buildGrammar { + language = "vhdl"; + version = "0.0.0+rev=4ab3e25"; + src = fetchFromGitHub { + owner = "jpt13653903"; + repo = "tree-sitter-vhdl"; + rev = "4ab3e251eae8890a020d083d00acd1b8c2653c07"; + hash = "sha256-egNgZ1GgRNvIdH08cf6V83bMeOECs23yiV5RzcXZENg="; + }; + meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl"; + }; vhs = buildGrammar { language = "vhs"; version = "0.0.0+rev=90028bb"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index b4826109a7dd..06c1f10142a8 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -15,7 +15,8 @@ , python3 , rustPlatform , # Misc dependencies - Cocoa + arrow-cpp +, Cocoa , code-minimap , dasht , deno @@ -844,6 +845,8 @@ dependencies = with self; [ nvim-treesitter ]; }; + haskell-tools-nvim = neovimUtils.buildNeovimPlugin { luaAttr = "haskell-tools-nvim"; }; + hex-nvim = super.hex-nvim.overrideAttrs { postPatch = '' substituteInPlace lua/hex.lua --replace xxd ${xxd}/bin/xxd @@ -1198,8 +1201,11 @@ dbee-go = buildGoModule { name = "nvim-dbee"; src = "${oa.src}/dbee"; - vendorHash = "sha256-AItvgOehVskGLARJWDnJLtWM5YHKN/zn/FnZQ0evAtI="; - buildInputs = [ duckdb ]; + vendorHash = "sha256-U/3WZJ/+Bm0ghjeNUILsnlZnjIwk3ySaX3Rd4L9Z62A="; + buildInputs = [ + arrow-cpp + duckdb + ]; }; in { dependencies = [ self.nui-nvim ]; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 6e9e858c56d1..c9224e059be6 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -386,7 +386,6 @@ https://github.com/ThePrimeagen/harpoon/,master, https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2 https://github.com/kiyoon/haskell-scope-highlighting.nvim/,HEAD, https://github.com/mrcjkb/haskell-snippets.nvim/,HEAD, -https://github.com/MrcJkb/haskell-tools.nvim/,HEAD, https://github.com/neovimhaskell/haskell-vim/,, https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD, https://github.com/travitch/hasksyn/,, diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 518dee06aaef..0d19158f4476 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -56,12 +56,12 @@ }: stdenv.mkDerivation rec { - version = "4.8.0"; + version = "4.8.1"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "sha256-QZhJ6QFScOQHXyNBxrVTLT0czMz6jxlZLLLqOtF/klU="; + sha256 = "sha256-kBsOLK7Tb7hhn99MYO37jTETS5R9MFS1xm/VXDivWZE="; }; nativeBuildInputs = [ cmake ninja llvmPackages.llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook3 ]; diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index ee6a830246d7..5daaf0e10ef1 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -12,6 +12,9 @@ , Cocoa , OpenGL , python3Packages +, opencascade-occt +, assimp +, fontconfig , withManual ? !stdenv.isDarwin , withPythonBinding ? false }: @@ -42,6 +45,9 @@ stdenv.mkDerivation rec { buildInputs = [ vtk_9 + opencascade-occt + assimp + fontconfig ] ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL @@ -58,6 +64,8 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_BINDIR=bin" "-DF3D_MODULE_EXTERNAL_RENDERING=ON" + "-DF3D_PLUGIN_BUILD_ASSIMP=ON" + "-DF3D_PLUGIN_BUILD_OCCT=ON" ] ++ lib.optionals withManual [ "-DF3D_LINUX_GENERATE_MAN=ON" ] ++ lib.optionals withPythonBinding [ diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index 365996aaf591..c7e7b7d07f5e 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + perl ]; buildInputs = [ libjpeg libpng libtiff - perl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Carbon ]; diff --git a/pkgs/applications/kde/kdenlive/default.nix b/pkgs/applications/kde/kdenlive/default.nix index d5d465b8c4fe..13a208fd9971 100644 --- a/pkgs/applications/kde/kdenlive/default.nix +++ b/pkgs/applications/kde/kdenlive/default.nix @@ -82,7 +82,6 @@ mkDerivation { kpurpose kdeclarative wrapGAppsHook3 - glaxnimate ]; # Both MLT and FFMpeg paths must be set or Kdenlive will complain that it diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index ce23bd8ee3f1..bc2b92843c36 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "6.0.3.4"; + version = "6.0.4.4"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-qYB94SJYCwcUrXdKtD+ZdiPRpwXg3rOHVmFWD+Y1ZXg="; + hash = "sha256-5jV+EJDZ90qtYF8w7RW8jGiy36nPYsLfoOVM35ilVvw="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 79ed6cdf624a..170e10fbeb01 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -2,153 +2,147 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "AngleSharp"; version = "1.1.2"; sha256 = "0rfild46lmqhxkfh6nhy7a9m8zzv25lj29riav5j6dmzw07l7wif"; }) - (fetchNuGet { pname = "AngleSharp.XPath"; version = "2.0.4"; sha256 = "0cqgabpjc7pwhlix5j43x6ppj21qnsc7nswn3zm6z004vcggfwf3"; }) - (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; sha256 = "01llfwhra5m3jj1qpa4rj1hbh01drirakzjc2963vkl9iwrzscyl"; }) - (fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; sha256 = "0nikzb92z4a2n969sz747ginwxsbrap5741bcwwxr4r6m2na9jz7"; }) - (fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; }) - (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) - (fetchNuGet { pname = "Humanizer.Core.af"; version = "2.14.1"; sha256 = "197lsky6chbmrixgsg6dvxbdbbpis0an8mn6vnwjcydhncis087h"; }) - (fetchNuGet { pname = "Humanizer.Core.ar"; version = "2.14.1"; sha256 = "03rz12mxrjv5afm1hn4rrpimkkb8wdzp17634dcq10fhpbwhy6i5"; }) - (fetchNuGet { pname = "Humanizer.Core.az"; version = "2.14.1"; sha256 = "138kdhy86afy5n72wy12qlb25q4034z73lz5nbibmkixxdnj9g5r"; }) - (fetchNuGet { pname = "Humanizer.Core.bg"; version = "2.14.1"; sha256 = "0scwzrvv8332prijkbp4y11n172smjb4sf7ygia6bi3ibhzq7zjy"; }) - (fetchNuGet { pname = "Humanizer.Core.bn-BD"; version = "2.14.1"; sha256 = "1322kn7ym46mslh32sgwkv07l3jkkx7cw5wjphql2ziphxw536p8"; }) - (fetchNuGet { pname = "Humanizer.Core.cs"; version = "2.14.1"; sha256 = "1zl3vsdd2pw3nm05qpnr6c75y7gacgaghg9sj07ksvsjmklgqqih"; }) - (fetchNuGet { pname = "Humanizer.Core.da"; version = "2.14.1"; sha256 = "10rmrvzwp212fpxv0sdq8f0sjymccsdn71k99f845kz0js83r70s"; }) - (fetchNuGet { pname = "Humanizer.Core.de"; version = "2.14.1"; sha256 = "0j7kld0jdiqwin83arais9gzjj85mpshmxls64yi58qhl7qjzk0j"; }) - (fetchNuGet { pname = "Humanizer.Core.el"; version = "2.14.1"; sha256 = "143q1321qh5506wwvcpy0fj7hpbd9i1k75247mqs2my05x9vc8n0"; }) - (fetchNuGet { pname = "Humanizer.Core.es"; version = "2.14.1"; sha256 = "011kscy671mgyx412h55b0x9a1ngmdsgqzqq1w0l10xhf90y4hc8"; }) - (fetchNuGet { pname = "Humanizer.Core.fa"; version = "2.14.1"; sha256 = "184dxwkf251c27h7gg9y5zciixgcwy1cmdrs0bqrph7gg69kp6yq"; }) - (fetchNuGet { pname = "Humanizer.Core.fi-FI"; version = "2.14.1"; sha256 = "144jlnlipr3pnbcyhbgrd2lxibx8vy00lp2zn60ihxppgbisircc"; }) - (fetchNuGet { pname = "Humanizer.Core.fr"; version = "2.14.1"; sha256 = "0klnfy8n659sp8zngd87gy7qakd56dwr1axjjzk0zph1zvww09jq"; }) - (fetchNuGet { pname = "Humanizer.Core.fr-BE"; version = "2.14.1"; sha256 = "0b70illi4m58xvlqwcvar0smh6292zadzk2r8c25ryijh6d5a9qv"; }) - (fetchNuGet { pname = "Humanizer.Core.he"; version = "2.14.1"; sha256 = "08xkiv88qqd1b0frpalb2npq9rvz2q1yz48k6dikrjvy6amggirh"; }) - (fetchNuGet { pname = "Humanizer.Core.hr"; version = "2.14.1"; sha256 = "12djmwxfg03018j2bqq5ikwkllyma8k7zmvpw61vxs7cv4izc6wh"; }) - (fetchNuGet { pname = "Humanizer.Core.hu"; version = "2.14.1"; sha256 = "0lw13p9b2kbqf96lif5kx59axxiahd617h154iswjfka9kxdw65x"; }) - (fetchNuGet { pname = "Humanizer.Core.hy"; version = "2.14.1"; sha256 = "1bgm0yabhvsv70amzmkvf3mls32lvd7yyr59yxf3xc96msqczgjh"; }) - (fetchNuGet { pname = "Humanizer.Core.id"; version = "2.14.1"; sha256 = "1w0bnyac46f2321l09ckb6vz66s1bxl27skfww1iwrmf03i7m2cw"; }) - (fetchNuGet { pname = "Humanizer.Core.is"; version = "2.14.1"; sha256 = "10w1fprlhxm1qy3rh0qf6z86ahrv8fcza3wrsx55idlmar1x9jyz"; }) - (fetchNuGet { pname = "Humanizer.Core.it"; version = "2.14.1"; sha256 = "1msrmih8cp7r4yj7r85kr0l5h4yln80450mivliy1x322dav8xz2"; }) - (fetchNuGet { pname = "Humanizer.Core.ja"; version = "2.14.1"; sha256 = "04ry6z0v85y4y5vzbqlbxppfdm04i02dxbxaaykbps09rwqaa250"; }) - (fetchNuGet { pname = "Humanizer.Core.ko-KR"; version = "2.14.1"; sha256 = "156641v0ilrpbzprscvbzfha57pri4y1i66n9v056nc8bm10ggbg"; }) - (fetchNuGet { pname = "Humanizer.Core.ku"; version = "2.14.1"; sha256 = "1scz21vgclbm1xhaw89f0v8s0vx46yv8yk3ij0nr6shsncgq9f7h"; }) - (fetchNuGet { pname = "Humanizer.Core.lv"; version = "2.14.1"; sha256 = "1909dsbxiv2sgj6myfhn8lbbmvkp2hjahj0knawypyq3jw9sq86g"; }) - (fetchNuGet { pname = "Humanizer.Core.ms-MY"; version = "2.14.1"; sha256 = "1dmjrxb0kb297ycr8xf7ni3l7y4wdqrdhqbhy8xnm8dx90nmj9x5"; }) - (fetchNuGet { pname = "Humanizer.Core.mt"; version = "2.14.1"; sha256 = "0b183r1apzfa1hasimp2f27yfjkfp87nfbd8qdyrqdigw6nzcics"; }) - (fetchNuGet { pname = "Humanizer.Core.nb"; version = "2.14.1"; sha256 = "12rd75f83lv6z12b5hbwnarv3dkk29pvc836jpg2mzffm0g0kxj2"; }) - (fetchNuGet { pname = "Humanizer.Core.nb-NO"; version = "2.14.1"; sha256 = "1n033yfw44sjf99mv51c53wggjdffz8b9wv7gwm3q7i6g7ck4vv1"; }) - (fetchNuGet { pname = "Humanizer.Core.nl"; version = "2.14.1"; sha256 = "0q4231by40bsr6mjy93n0zs365pz6da32pwkxcz1cc2hfdlkn0vd"; }) - (fetchNuGet { pname = "Humanizer.Core.pl"; version = "2.14.1"; sha256 = "0h2wbwrlcmjk8b2mryyd8rbb1qmripvg0zyg61gg0hifiqfg3cr2"; }) - (fetchNuGet { pname = "Humanizer.Core.pt"; version = "2.14.1"; sha256 = "0pg260zvyhqz8h1c96px1vs9q5ywvd0j2ixsq21mj96dj7bl5fay"; }) - (fetchNuGet { pname = "Humanizer.Core.ro"; version = "2.14.1"; sha256 = "04mr28bjcb9hs0wmpb4nk2v178i0fjr0ymc78dv9bbqkmrzfsmcn"; }) - (fetchNuGet { pname = "Humanizer.Core.ru"; version = "2.14.1"; sha256 = "060abvk7mrgawipjgw0h4hrvizby7acmj58w2g35fv54g43isgcl"; }) - (fetchNuGet { pname = "Humanizer.Core.sk"; version = "2.14.1"; sha256 = "182xiqf71kiqp42b8yqrag6z57wzqraqi10bnhx0crrc1gxq8v0j"; }) - (fetchNuGet { pname = "Humanizer.Core.sl"; version = "2.14.1"; sha256 = "12ygvzyqa0km7a0wz42zssq8qqakvghh96x1ng7qvwcrna3v2rdi"; }) - (fetchNuGet { pname = "Humanizer.Core.sr"; version = "2.14.1"; sha256 = "1ggj15qksyr16rilq2w76x38bxp6a6z75b30c9b7w5ni88nkgc7x"; }) - (fetchNuGet { pname = "Humanizer.Core.sr-Latn"; version = "2.14.1"; sha256 = "0lwr0gnashirny8lgaw0qnbb7x0qrjg8fs11594x8l7li3mahzz3"; }) - (fetchNuGet { pname = "Humanizer.Core.sv"; version = "2.14.1"; sha256 = "1c7yx59haikdqx7k7vqll6223jjmikgwbl3dzmrcs3laywgfnmgn"; }) - (fetchNuGet { pname = "Humanizer.Core.th-TH"; version = "2.14.1"; sha256 = "0kyyi5wc23i2lcag3zvrhga9gsnba3ahl4kdlaqvvg2jhdfarl4m"; }) - (fetchNuGet { pname = "Humanizer.Core.tr"; version = "2.14.1"; sha256 = "0rdvp0an263b2nj3c5v11hvdwgmj86ljf2m1h3g1x28pygbcx6am"; }) - (fetchNuGet { pname = "Humanizer.Core.uk"; version = "2.14.1"; sha256 = "0a2p6mhh0ajn0y7x98zbfasln1l04iiknd50sgf3svna99wybnxd"; }) - (fetchNuGet { pname = "Humanizer.Core.uz-Cyrl-UZ"; version = "2.14.1"; sha256 = "1jfzfgnk6wz5na2md800vq0djm6z194x618yvwxbnk2c7wikbjj2"; }) - (fetchNuGet { pname = "Humanizer.Core.uz-Latn-UZ"; version = "2.14.1"; sha256 = "0vimhw500rq60naxfari8qm6gjmjm8h9j6c04k67fs447djy8ndi"; }) - (fetchNuGet { pname = "Humanizer.Core.vi"; version = "2.14.1"; sha256 = "1yr0l73cy2qypkssmmjwfbbqgdplam62dqnzk9vx6x47dzpys077"; }) - (fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "2.14.1"; sha256 = "1k6nnawd016xpwgzdzy84z1lcv2vc1cygcksw19wbgd8dharyyk7"; }) - (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; }) - (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; sha256 = "0vp4mpn6gfckn8grzjm1jxlbqiq2fglm2rk9wq787adw7rxs8k7w"; }) - (fetchNuGet { pname = "Markdig.Signed"; version = "0.37.0"; sha256 = "0pcysg74pvhqs13087dh5r90xnixklmnz7bwv02304927mkv5345"; }) - (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.22.0"; sha256 = "0h5qkhmazlvwvjmxxj9pp2404rmvk55yf6npwcmlskv9mgfkli4r"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.0"; sha256 = "05y1xb5fw8lzvb4si77a5qwfwfz1855crqbphrwky6x9llivbhkx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.0"; sha256 = "18zdbcb2bn7wy1dp14z5jyqiiwr9rkad1lcb158r5ikjfq1rg5iw"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.0"; sha256 = "1nbxzmj6cnccylxis67c54c0ik38ma4rwdvgg6sxd6r04219maqm"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.0"; sha256 = "1wqkbjd1ywv9w397l7rsb89mijc5n0hv7jq9h09xfz6wn9qsp152"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.10.0"; sha256 = "0s0v7jmrq85n356xv7zixvwa4z94fszjcr5vll8x4im1a2lp00f9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; sha256 = "080kab87qgq2kh0ijry5kfdiq9afyzb8s0k3jqi5zbbi540yq4zl"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; sha256 = "1m0gawiz8f5hc3li9vd5psddlygwgkiw13d7div87kmkf4idza8r"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; sha256 = "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; sha256 = "15m4j6w9n8h0mj7hlfzb83hd3wn7aq1s7fxbicm16slsjfwzj82i"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; sha256 = "1idq65fxwcn882c06yci7nscy9i0rgw6mqjrl7362prvvsd9f15r"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; sha256 = "00d5dwmzw76iy8z40ly01hy9gly49a7rpf7k7m99vrid1kxp346h"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; sha256 = "0nppj34nmq25gnrg0wh1q22y4wdqbih4ax493f226azv8mkp9s1i"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "8.0.0"; sha256 = "1d9b734vnll935661wqkgl7ry60rlh5p876l2bsa930mvfsaqfcv"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; sha256 = "04nm8v5a3zp0ill7hjnwnja3s2676b4wffdri8hdk2341p7mp403"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.6.0"; sha256 = "18g4j9n47387k4ym3kl2dzhhhs6fs5rq96757fc4lcdql2rpkmp0"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.6.0"; sha256 = "11znwbbg44hhz3ly6j6q81qz83yqf97jj5zhpldng5zq0h791srl"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.6.0"; sha256 = "1slkzygcn4abpqip4rmi73h9096ihjkkaiwgmkaiba9pidn9lzlx"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.6.0"; sha256 = "1blj1ayw9qpjpsnb4k95s03pdkin0032mxgznfaw1z1qhhiqdnsi"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.10.0"; sha256 = "13g8fwl09li8fc71nk13dgkb7gahd4qhamyg2xby7am63nlchhdf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.0"; sha256 = "0gwqmkmr7jy3sjh9gha82amlry41gp8nwswy2iqfw54f28db63n7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.0"; sha256 = "042cjvnwrrjs3mw5q8q5kinh0cwkks33i3n1vyifaid2jbr3wlc0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.0"; sha256 = "06ndp4wh1cap01dql3nixka4g56bf6ipmqys7xaxvg4xisf79x8d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.0"; sha256 = "1kh5bnaf6h9mr4swcalrp304625frjiw6mlz1052rxwzsdq98a96"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.6.14"; sha256 = "1wr8crmjg4gznm3jqgz9s9p285vrwb8a6baqc6gz3b58rn4m88km"; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.2.1"; sha256 = "1a6hyd3szjjpjkbr0ncfria0x2qijv3lwr4drhxm15xamfy23azw"; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.2.1"; sha256 = "19309m0b9cjy1642m99ipjvr6gxq6qb008bam3l10m1mz8m81j31"; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.2.1"; sha256 = "1bly8375zng21yjbfdi08c14lgapngv06p1dlzbryimxicqzxixx"; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.2.1"; sha256 = "0zlbqmvdb1vxnvmxh6lk65mz57c7mz6dqb1s8in0cfww8kxg058k"; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.2.1"; sha256 = "07674xnhc84h36pvzswx6ibjy0bgfi2bxhqm1zyq9fidmim0ch07"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.10.0"; sha256 = "07j69cw8r39533w4p39mnj00kahazz38760in3jfc45kmlcdb26x"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.10.0"; sha256 = "1bl471s7fx9jycr0cc8rylwf34mrvlg9qn1an6l86nisavfcyb7v"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "MSTest"; version = "3.4.3"; sha256 = "070avma2zdxdpn23a9chgz9n1kglxh8nbb1g2ggzk3xxi5sdjj0n"; }) - (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.4.3"; sha256 = "14a6rzh4cvaf9bw63qlxw242fbmk4agyx9qgl19swpciqcaq7pxi"; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.4.3"; sha256 = "0hsslndnfyb6shgkmgy10f1c9p6b47ry20zr2l1msagmkrk49s5q"; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.4.3"; sha256 = "0hviglzfv16dd3aczny455sy1k0rikzd5w34smfpjyxc0wqx6xvp"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) - (fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; sha256 = "0sxvmqnv8a94k3pq1w3lh1vgjb8l62h1qamxcjl3pkq634h2fwrl"; }) - (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) - (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) - (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "5.3.2"; sha256 = "01qnzmwvc93yywhvy5g29fb8jnalfi82az7296nblyqjalhbzz3g"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.11"; sha256 = "0j276q0a14qk9nc3f03265jl5wp38bnm7dyyx0s4kxkyb3kx3z8c"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.11"; sha256 = "17xvaj54liyk9zq0f80z1ai6wq4rgj6xy93znvsdcnldmin1icz9"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) - (fetchNuGet { pname = "OpenTelemetry"; version = "1.7.0-rc.1"; sha256 = "0y16qp3xrypk48f27pfvccic47p9wpl4qx8mar4rf2b78ca21c9p"; }) - (fetchNuGet { pname = "OpenTelemetry"; version = "1.8.1"; sha256 = "1slyjdzbiv179sq91bq6bhbqw20jmk6j9x1g5fhvnqsymfqmnmq2"; }) - (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.7.0-rc.1"; sha256 = "1i09vjjrimg0bwraamsjdqx886apscwj72skds3ysvc9c7n0hpl2"; }) - (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.8.0"; sha256 = "0s402mz4gz1chlg29159awawpi6ms4ln5gdds01y38wx6cia6lb9"; }) - (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.8.1"; sha256 = "0c2dvnnnizn5g50js336lkgfxh6klcdb0h8pppf68v3liwlhxly5"; }) - (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.7.0-rc.1"; sha256 = "1ayy2q9cg6482ahvz3cx7a3cikjrnmr5kr7yk9qnbbwy0wfmb6gw"; }) - (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.8.0"; sha256 = "1vhl02w068ynhpak0pyjn2xmrnisl9m73lmsckwkncrhinplw7hz"; }) - (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.8.1"; sha256 = "0lys1l0qsna2h82j2rbxi5fc8barrq43fs0lradr85r7sy3x91cg"; }) - (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.7.0-rc.1"; sha256 = "1777nbj78yppmqmwvv0bsl4l0vp8lfc5fpsdmknf6wl354f0z1f8"; }) - (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.8.1"; sha256 = "01vi9sqb2j25i6926c581w067nadf4q4hs0hkwjg8wpzhxz0n3xq"; }) - (fetchNuGet { pname = "OpenTelemetry.Instrumentation.AspNetCore"; version = "1.8.1"; sha256 = "0s5kxqjhmwm2p2sblmmsavvmknqb8yr0b07ngq8hk0w8b48kyc0h"; }) - (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Http"; version = "1.8.1"; sha256 = "0p3mw08vi9ljf06239n8b1hfj0cqqb198qn89sf39mdjsy13ca95"; }) - (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.8.1"; sha256 = "0j2i01378848nvib1krk948lp74x8ykgspka05g37a3s284p1nyd"; }) - (fetchNuGet { pname = "protobuf-net"; version = "3.2.30"; sha256 = "08bjdn8dbqpzn5c9fw89y5766irwplgyzhyxcrjzpywkwpj75r4i"; }) - (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.30"; sha256 = "01mgw4s0b2vxf55v6fa3n5l9jwk6bkl60aaqv7azl198wwslkjhq"; }) - (fetchNuGet { pname = "SteamKit2"; version = "3.0.0-alpha.1"; sha256 = "01lrbkbpfqdkhba9hsfg9fqyh1sa9r2cp54r2wlb83zfr3f5q8l8"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.6.2"; sha256 = "0lq774iggpvsmykbrplvv2a5z2ylsslv5wynmvpnlznd4lvgxb4h"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.6.2"; sha256 = "1snz71ws87kr8pz4c3zcla51mqbly015ib6b0y20xvkj25qx7gl8"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.6.2"; sha256 = "0j93y0krn5fzvji0k7g4cxi22b7j8n3brxw4698pjq2pqqf2d8qy"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.6.2"; sha256 = "00lar7246mncidflm15xz5b9hpni9bf8wj37dc0l2sj3hhv9nvwj"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.6.2"; sha256 = "0w0h2cs8n5avczzm5plzmkvkc6xn0pj425f4400fk21h8ysvhg8h"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) - (fetchNuGet { pname = "System.Composition"; version = "8.0.0"; sha256 = "0y7rp5qwwvh430nr0r15zljw01gny8yvr0gg6w5cmsk3q7q7a3dc"; }) - (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "8.0.0"; sha256 = "16j61piz1jf8hbh14i1i4m2r9vw79gdqhjr4f4i588h52249fxlz"; }) - (fetchNuGet { pname = "System.Composition.Convention"; version = "8.0.0"; sha256 = "10fwp7692a6yyw1p8b923k061zh95a6xs3vzfdmdv5pmf41cxlb7"; }) - (fetchNuGet { pname = "System.Composition.Hosting"; version = "8.0.0"; sha256 = "1gbfimhxx6v6073pblv4rl5shz3kgx8lvfif5db26ak8pl5qj4kb"; }) - (fetchNuGet { pname = "System.Composition.Runtime"; version = "8.0.0"; sha256 = "0snljpgfmg0wlkwilkvn9qjjghq1pjdfgdpnwhvl2qw6vzdij703"; }) - (fetchNuGet { pname = "System.Composition.TypedParts"; version = "8.0.0"; sha256 = "0skwla26d8clfz3alr8m42qbzsrbi7dhg74z6ha832b6730mm4pr"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "5.0.0"; sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; sha256 = "0nzra1i0mljvmnj1qqqg37xs7bl71fnpl68nwmdajchh65l878zr"; }) - (fetchNuGet { pname = "System.IO.Hashing"; version = "8.0.0"; sha256 = "1hg5i9hiihj9x4d0mlvhfddmivzrhzz83dyh26fqw1nd8jvqccxk"; }) - (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; sha256 = "1ysjx3b5ips41s32zacf4vs7ig41906mxrsbmykdzi0hvdmjkgbx"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; sha256 = "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y"; }) + (fetchNuGet { pname = "AngleSharp"; version = "1.1.2"; hash = "sha256-LvJDD+C/NiPLVjEnIWkR+39UkzoeWgPd7BBXakij0WU="; }) + (fetchNuGet { pname = "AngleSharp.XPath"; version = "2.0.4"; hash = "sha256-w3H3HtsEgG/qH5Zre5i2OAh5r+mDyNIjhfweJu9SDzM="; }) + (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; hash = "sha256-1DP9M4+Jzj1MEkz+qXLMLQC4YJCZqIuDlKMWlSF3lAY="; }) + (fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; hash = "sha256-58ukrKgmk9w5ZyuQU67KS3du4zvkfJ1MskKRL9L6M1o="; }) + (fetchNuGet { pname = "Humanizer"; version = "3.0.0-beta.54"; hash = "sha256-QIQFZYsW58l1xi9iw5VyAzo9bCCAojHQKXi0+dMH86Y="; }) + (fetchNuGet { pname = "Humanizer.Core"; version = "3.0.0-beta.54"; hash = "sha256-KQdtkJ1uqstncqPmvWNW/PwMenyw1bW54P9unDVtO0Y="; }) + (fetchNuGet { pname = "Humanizer.Core.af"; version = "3.0.0-beta.54"; hash = "sha256-b2F23Ntez1spMh+H90P1yIMzTghyLSw6SoQgSoH7MGI="; }) + (fetchNuGet { pname = "Humanizer.Core.ar"; version = "3.0.0-beta.54"; hash = "sha256-deIHuegZjN178w9bHU3QgG5wUSm3ZeepyHihBdiXbtQ="; }) + (fetchNuGet { pname = "Humanizer.Core.az"; version = "3.0.0-beta.54"; hash = "sha256-jFMlxjSVIz2Qiv4DSHK2U8OqyBWL9juQOlB2xrC84YE="; }) + (fetchNuGet { pname = "Humanizer.Core.bg"; version = "3.0.0-beta.54"; hash = "sha256-MfCHFo3SjU3QScfD/TQuV7FdR18i6EQVb/ophQY/6Yk="; }) + (fetchNuGet { pname = "Humanizer.Core.bn-BD"; version = "3.0.0-beta.54"; hash = "sha256-lBSo0VFbuIagbznWWK7U+ecr3jz7dBGwFvCx3ligXsk="; }) + (fetchNuGet { pname = "Humanizer.Core.cs"; version = "3.0.0-beta.54"; hash = "sha256-mhD6davLTy+v1tatG7wBYQdpo204hTKureuVpx8E7MA="; }) + (fetchNuGet { pname = "Humanizer.Core.da"; version = "3.0.0-beta.54"; hash = "sha256-5mE9JXGhBichj39Ds8ue4NOymzUQIjjJnSO84fZKK+c="; }) + (fetchNuGet { pname = "Humanizer.Core.de"; version = "3.0.0-beta.54"; hash = "sha256-AknBQzk94LVu2NY2QYJqjCI11pfpLXi2pLgelZCpvds="; }) + (fetchNuGet { pname = "Humanizer.Core.el"; version = "3.0.0-beta.54"; hash = "sha256-O8XR1zUP1lk3OFFI1vtwvzXOoLQfN7LxQlR6MEumPKM="; }) + (fetchNuGet { pname = "Humanizer.Core.es"; version = "3.0.0-beta.54"; hash = "sha256-Mp5SZwO5TOhK+wghOxEoKySlH19xx2Vs80pD8zJuWQU="; }) + (fetchNuGet { pname = "Humanizer.Core.fa"; version = "3.0.0-beta.54"; hash = "sha256-ONY2tAvoVpGbR3rFUsNfN3ldkjb9okH6GNTN72P983Y="; }) + (fetchNuGet { pname = "Humanizer.Core.fi-FI"; version = "3.0.0-beta.54"; hash = "sha256-NgdDNR8qtQYFx8qBcy3ybPqWRBqKy4w7xrL4F/79SvI="; }) + (fetchNuGet { pname = "Humanizer.Core.fr"; version = "3.0.0-beta.54"; hash = "sha256-/aGQGAB4FIZ9P6ah+weq39XOC0MZMGOvhgainLIYvk4="; }) + (fetchNuGet { pname = "Humanizer.Core.fr-BE"; version = "3.0.0-beta.54"; hash = "sha256-bLNidoLR5tZASSP85DCX2QjTPTgqoFZDLsZXov3ec8Q="; }) + (fetchNuGet { pname = "Humanizer.Core.he"; version = "3.0.0-beta.54"; hash = "sha256-Ef0yaO9mbcHqpUhruZpWZgGcLtEZEu4yRC0nvujTOKQ="; }) + (fetchNuGet { pname = "Humanizer.Core.hr"; version = "3.0.0-beta.54"; hash = "sha256-Loifax8U+8ho/Gyw2NcwNFywleKYNB1Hr9waTHGjmrg="; }) + (fetchNuGet { pname = "Humanizer.Core.hu"; version = "3.0.0-beta.54"; hash = "sha256-tPgZGD2AE68c67Rrpo5PK15q9ZXP7RwttaGwGfUp4lU="; }) + (fetchNuGet { pname = "Humanizer.Core.hy"; version = "3.0.0-beta.54"; hash = "sha256-YWwDuwrilm22gzCMui+u71Q+FVg/kMxVa8xCX2v+isU="; }) + (fetchNuGet { pname = "Humanizer.Core.id"; version = "3.0.0-beta.54"; hash = "sha256-SZYleWmQ10OguOylRlgct7TVN8Sc2vrs4g492fteghM="; }) + (fetchNuGet { pname = "Humanizer.Core.is"; version = "3.0.0-beta.54"; hash = "sha256-7xIFwbQqqcFZhJFgQGgcDj0aS9GCkzk5hoxpUSPVfG0="; }) + (fetchNuGet { pname = "Humanizer.Core.it"; version = "3.0.0-beta.54"; hash = "sha256-ckKN4D4Ae/TsxytAeqznNMgzT+Jv82x2MQSnZJMios4="; }) + (fetchNuGet { pname = "Humanizer.Core.ja"; version = "3.0.0-beta.54"; hash = "sha256-kHZAfhn8FXJTND/09ue7wpD7WpGxCWHHpn0CgypJLqw="; }) + (fetchNuGet { pname = "Humanizer.Core.ko-KR"; version = "3.0.0-beta.54"; hash = "sha256-zLT2nlRba85r85s2Bt9WSJwuueYSr3xLwJHOW8Soy20="; }) + (fetchNuGet { pname = "Humanizer.Core.ku"; version = "3.0.0-beta.54"; hash = "sha256-Ef+QUC0b3kE6HmTa8CQinsHyd+ehpFlFxtmr5A/E9dE="; }) + (fetchNuGet { pname = "Humanizer.Core.lb"; version = "3.0.0-beta.54"; hash = "sha256-5hP1M9H+6uo7inDJMYNAjo0r/V3lIPb3mnmUKFe+CCw="; }) + (fetchNuGet { pname = "Humanizer.Core.lt"; version = "3.0.0-beta.54"; hash = "sha256-SVDSW5CLqGL0SzqIJF+LbPuKmD/92CA/xjgsDXucNc8="; }) + (fetchNuGet { pname = "Humanizer.Core.lv"; version = "3.0.0-beta.54"; hash = "sha256-idNNH20jP++HlWli9FAcNoDsGz4Tc5UST4gxlb/ZvJA="; }) + (fetchNuGet { pname = "Humanizer.Core.ms-MY"; version = "3.0.0-beta.54"; hash = "sha256-aOrRmEDXCbN9Fmf0uUFn2zFePDT1uC6/gvqEThH4Frg="; }) + (fetchNuGet { pname = "Humanizer.Core.mt"; version = "3.0.0-beta.54"; hash = "sha256-B5mZrT0iTnfcxAOWNXt+SOXYi1klCqjPiP58p05gfFs="; }) + (fetchNuGet { pname = "Humanizer.Core.nb"; version = "3.0.0-beta.54"; hash = "sha256-+vGxff/C9l6P40MCy24ZEcS+GwlYQoBCjOv1TgX7ZZ0="; }) + (fetchNuGet { pname = "Humanizer.Core.nb-NO"; version = "3.0.0-beta.54"; hash = "sha256-PdAieSuOp883+5fQY4OQYhMXgclTaX7RYSRQgmJcuWM="; }) + (fetchNuGet { pname = "Humanizer.Core.nl"; version = "3.0.0-beta.54"; hash = "sha256-hwpUHNioWLXOAPePZ6atdfm9B2mrv3YDUinxtp5l5cQ="; }) + (fetchNuGet { pname = "Humanizer.Core.pl"; version = "3.0.0-beta.54"; hash = "sha256-MTxJ+XGfR/ShDV5HlI5iOQ8fJpwhLuk+ELwipgz/SYM="; }) + (fetchNuGet { pname = "Humanizer.Core.pt"; version = "3.0.0-beta.54"; hash = "sha256-cshgIqnIU+28cIKiGX4aojdDdAVu0Y3oTo9LPfuuxmk="; }) + (fetchNuGet { pname = "Humanizer.Core.ro"; version = "3.0.0-beta.54"; hash = "sha256-1RsFju1P3XCi+12zWH9jVhp3iQ1htPCq4A3DIE/dErI="; }) + (fetchNuGet { pname = "Humanizer.Core.ru"; version = "3.0.0-beta.54"; hash = "sha256-c5Ll2kUZm1vhDfkIblW2yi+MmQTSCrDmjaS9FkC63nc="; }) + (fetchNuGet { pname = "Humanizer.Core.sk"; version = "3.0.0-beta.54"; hash = "sha256-MeFFOBinomAJ1aooldh2BfFi2jKl4gsf3rF6sqHiRRE="; }) + (fetchNuGet { pname = "Humanizer.Core.sl"; version = "3.0.0-beta.54"; hash = "sha256-ggOLhhI8RcjmG4nG6vJVK4EbubN/Mw1l1n8CchgMZJc="; }) + (fetchNuGet { pname = "Humanizer.Core.sr"; version = "3.0.0-beta.54"; hash = "sha256-05yA3P0VMmRFfq0v0hCItNuYt++LDkBCk7ScYa3UOXw="; }) + (fetchNuGet { pname = "Humanizer.Core.sr-Latn"; version = "3.0.0-beta.54"; hash = "sha256-62kozBOCEdLM1W1AzqsoMHGtU3S3msK2uGTm7qxCf5Q="; }) + (fetchNuGet { pname = "Humanizer.Core.sv"; version = "3.0.0-beta.54"; hash = "sha256-g+t6p+0AqyptEHkc+a1HKm77vBggMTNeqQf6KjeuygU="; }) + (fetchNuGet { pname = "Humanizer.Core.th-TH"; version = "3.0.0-beta.54"; hash = "sha256-mGYaSb8TaThiJc+iJ1mj6zjzQOjQSbTlaGs4mZyAiQA="; }) + (fetchNuGet { pname = "Humanizer.Core.tr"; version = "3.0.0-beta.54"; hash = "sha256-NOeZorj9vNpsImBcUjqlc7bN1bugS1rS1/4QVV8oYMk="; }) + (fetchNuGet { pname = "Humanizer.Core.uk"; version = "3.0.0-beta.54"; hash = "sha256-fY/xIRXhIWofcCQg3aBJ9Jue0A8p1K7qEZjwGsJKpQ4="; }) + (fetchNuGet { pname = "Humanizer.Core.uz-Cyrl-UZ"; version = "3.0.0-beta.54"; hash = "sha256-vnFy9SKfYZXM0o824X1/bgoux+r0zCbblcYx7yj0PQU="; }) + (fetchNuGet { pname = "Humanizer.Core.uz-Latn-UZ"; version = "3.0.0-beta.54"; hash = "sha256-5xUO7jqWUeq5OSNiiORBf/5Wa9faV8e0D0NQahGn4S4="; }) + (fetchNuGet { pname = "Humanizer.Core.vi"; version = "3.0.0-beta.54"; hash = "sha256-rcCMfEmpjuUTF5rOG0mAoq8JtV5Rk4QNxAvaW+TD9O4="; }) + (fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "3.0.0-beta.54"; hash = "sha256-fh4CRrhOAkuY89dtwHCkbclG8AxjizRQSJCLJvpRGyo="; }) + (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "3.0.0-beta.54"; hash = "sha256-0BXsdNBRWTqaloHdCCpVjAyU9IHz5FtweHjqvzpwW4Q="; }) + (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "3.0.0-beta.54"; hash = "sha256-lemSDWy2Jz6gg8+ObqC3uyw846yghzmVUeakNZj7prg="; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; hash = "sha256-/Eykez68qYMO5mlmUelzAke8aJehyp8fspO5Z+yt5G4="; }) + (fetchNuGet { pname = "Markdig.Signed"; version = "0.37.0"; hash = "sha256-hYyyZz0iETAE2HydbyudPdoOUi6wHQRG0BjuS87Tnl0="; }) + (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.22.0"; hash = "sha256-mUQ63atpT00r49ca50uZu2YCiLg3yd6r3HzTryqcuEA="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.10.0"; hash = "sha256-yQFwqVChRtIRpbtkJr92JH2i+O7xn91NGbYgnKs8G2g="; }) + (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; hash = "sha256-RJjBWz+UHxkQE2s7CeGYdTZ218mCufrxl0eBykZdIt4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; hash = "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; hash = "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; hash = "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; hash = "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; hash = "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; hash = "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; hash = "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; hash = "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; hash = "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "8.0.0"; hash = "sha256-mzmstNsVjKT0EtQcdAukGRifD30T82BMGYlSu8k4K7U="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.6.2"; hash = "sha256-Ipd8+JFpj44vqouRGO8YvxzVyjKOeFXczTeKguxdcgs="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.6.2"; hash = "sha256-lHzkMQIlbSwmetyGLbtuptHZP+HgG8n2aLtBDqDr1S4="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.6.2"; hash = "sha256-hNIbOZ6leANvh+i1I2ZXS35+yXUmhTlyomkA8PbF++w="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.6.2"; hash = "sha256-P0lN2+Die2ftnJh43A3X3CR207vvzfCCJjlow6yweVs="; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.10.0"; hash = "sha256-rkHIqB2mquNXF89XBTFpUL2z5msjTBsOcyjSBCh36I0="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; }) + (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.6.14"; hash = "sha256-dSJUic2orPGfYVgto9DieRckbtLpPyxHtf+RJ2tmKPM="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.2.1"; hash = "sha256-/KshvKuql1A7zI1kTseWEYsOVMyOWZDXlFfKr0fz0Kg="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.2.1"; hash = "sha256-YciAKvo1VBDoqGohABY2uD+Tt7wxpSqICV6ytEBNYKQ="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.2.1"; hash = "sha256-vcf+MYu9Rp/Xpy1cA/azVz1KAkMgNrekD+LZX85Anq4="; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.2.1"; hash = "sha256-ExXw+kScOwZsRDos3Myvh53yazGTGtjrtn2H1XbFi34="; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.2.1"; hash = "sha256-B0AGaqwtuoT9DxXDvkR0bwEvVzSd67+vGZAgBm0nxxw="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.10.0"; hash = "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; hash = "sha256-mj5UH+aqVk7f3Uu0+L47aqZUudJNCx3Lk7cbP4fzcmI="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.10.0"; hash = "sha256-+yzP3FY6WoOosSpYnB7duZLhOPUZMQYy8zJ1d3Q4hK4="; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; }) + (fetchNuGet { pname = "MSTest"; version = "3.4.3"; hash = "sha256-FkjZdIm9j/nfEy+sZRHs9M1g03+QJTWEva23L1TdChw="; }) + (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.4.3"; hash = "sha256-sd+DFcORXa5ToA+n7p8isy4niOCd4mH4Sk5tRuDPRpE="; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.4.3"; hash = "sha256-uOhEZp71KV0DFfkD4fMhy9zEggPBvzof1GZ5Z5ulWkM="; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.4.3"; hash = "sha256-d3fTMQese3ld1WTw0v6MGczgdSnE28/UaM2E7T59cUM="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) + (fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; hash = "sha256-NHMnIBkGzzuoZL0qHKAwFC35doB08IDvmCQptC2uu2s="; }) + (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; hash = "sha256-W5jxZZ0pbPHte6TkWTq4FDtHOejvlrdyb1Inw+Yhl4c="; }) + (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; hash = "sha256-6Pmz6XQ+rY32O21Z3cUDVQsLH+i53LId18UCPTAxRZQ="; }) + (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; hash = "sha256-FKDLUWysqroSHLU2kLjK1m0g417AAPh6n2TIkwiapcM="; }) + (fetchNuGet { pname = "NLog"; version = "5.3.2"; hash = "sha256-b/y/IFUSe7qsSeJ8JVB0VFmJlkviFb8h934ktnn9Fgc="; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.11"; hash = "sha256-DP3R51h+9kk06N63U+1C4/JCZTFiADeYTROToAA2R0g="; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.11"; hash = "sha256-6bMYbKyNWtb0tn8k3418mWBuogofIAfwT9NHSopUu58="; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; hash = "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM="; }) + (fetchNuGet { pname = "OpenTelemetry"; version = "1.7.0-rc.1"; hash = "sha256-N7EgFENnCZdJVhV1TOjl6R7CImPb3SMcIvP63MfFJng="; }) + (fetchNuGet { pname = "OpenTelemetry"; version = "1.9.0"; hash = "sha256-QVV6ecnVk73bvi4Lw1RnTsaEUH/6CT0/zIJkYdg6CGg="; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.7.0-rc.1"; hash = "sha256-gl4I7GGJbe2HblOLIznTVxmEOm5SV6UyX+DVmKXcCcQ="; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.9.0"; hash = "sha256-raXpHi2DZ3mSLn9dnJYF64XaP23epdfu8zgagSpm8+4="; }) + (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.7.0-rc.1"; hash = "sha256-/JlVHQeer2Vxmv7kWXK1Wc7Ihjqdjb+hEoiYxxIW3qs="; }) + (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.9.0"; hash = "sha256-Yy3EcKBW7XH7nhLcvwQB0NIfxiGChuy6UPc7MJpxEbE="; }) + (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.7.0-rc.1"; hash = "sha256-yIUPHCmDcuPsrE1fV5ij6G5ACdUL7M0rrvd6dOSy55w="; }) + (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.9.0"; hash = "sha256-vvIrTeDGzgz8dI7/SkLL0ZrV+9u3e9uhvW6VVdsd6Ps="; }) + (fetchNuGet { pname = "OpenTelemetry.Instrumentation.AspNetCore"; version = "1.9.0"; hash = "sha256-XYqa7kV4rhHPCgHsjQtMvyKCemW1OvQd/23QhjquYR4="; }) + (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Http"; version = "1.9.0"; hash = "sha256-y/UbDt6n6heD+ayzv0xPurXLFNL+eSldwqoyGpvCg7o="; }) + (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.9.0"; hash = "sha256-Xov89h4Py7MCz6SAOjV0tjtZvvjHbx7NyPXZsY1PZhk="; }) + (fetchNuGet { pname = "protobuf-net"; version = "3.2.30"; hash = "sha256-keRy5OWT+/tlZt3D7x+9PEdjTvEJcZdYsf/i1ZBtciE="; }) + (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.30"; hash = "sha256-GMpJNecoBfrV2VgpYOhcZnKZaLFDObNLcX2LBTThrwY="; }) + (fetchNuGet { pname = "SteamKit2"; version = "3.0.0-alpha.1"; hash = "sha256-iCJc3MjuD7QoF5mUy0ROSgfosUvPaZjUgrNhd9dcmQY="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.6.2"; hash = "sha256-kKz+NiXNfmrvrtbzsqnW1ItflNib3rymr3rf9yI5B1M="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.6.2"; hash = "sha256-iL7TcRFy7g6EB8usWALwdOEaiqLsD0b+RXkepHk43+o="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.6.2"; hash = "sha256-HqMmHMZXYHlRMoT3vIZF8iwhYmfknQmi3N8VmyfwI0k="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.6.2"; hash = "sha256-km+bNoRDakEBa2dIjtxK0V6YVvm9hEpdi8xWQ8TJigI="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.6.2"; hash = "sha256-ED24tUcwiOkAIMQVQeQFths296yf3lL/Z1sVizQTEHA="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; hash = "sha256-WMMAUqoxT3J1gW9DI8v31VAuhwqTc4Posose5jq1BNo="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; }) + (fetchNuGet { pname = "System.Composition"; version = "8.0.0"; hash = "sha256-rA118MFj6soKN++BvD3y9gXAJf0lZJAtGARuznG5+Xg="; }) + (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "8.0.0"; hash = "sha256-n3aXiBAFIlQicSRLiNtLh++URSUxRBLggsjJ8OMNRpo="; }) + (fetchNuGet { pname = "System.Composition.Convention"; version = "8.0.0"; hash = "sha256-Z9HOAnH1lt1qc38P3Y0qCf5gwBwiLXQD994okcy53IE="; }) + (fetchNuGet { pname = "System.Composition.Hosting"; version = "8.0.0"; hash = "sha256-axKJC71oKiNWKy66TVF/c3yoC81k03XHAWab3mGNbr0="; }) + (fetchNuGet { pname = "System.Composition.Runtime"; version = "8.0.0"; hash = "sha256-AxwZ29+GY0E35Pa255q8AcMnJU52Txr5pBy86t6V1Go="; }) + (fetchNuGet { pname = "System.Composition.TypedParts"; version = "8.0.0"; hash = "sha256-+ZJawThmiYEUNJ+cB9uJK+u/sCAVZarGd5ShZoSifGo="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "5.0.0"; hash = "sha256-6mW3N6FvcdNH/pB58pl+pFSCGWgyaP4hfVtC/SMWDV4="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; hash = "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="; }) + (fetchNuGet { pname = "System.IO.Hashing"; version = "8.0.0"; hash = "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE="; }) + (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; hash = "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; hash = "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; hash = "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; hash = "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="; }) ] diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 004aadbe781e..b1da7708bfe9 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -2,7 +2,7 @@ buildNpmPackage rec { pname = "asf-ui"; - version = "78188871dfce90fb04096e9fd0b6ce2411312dae"; + version = "3ae4df4206a3f5fbbe582403403df848fd29847f"; src = fetchFromGitHub { owner = "JustArchiNET"; @@ -10,10 +10,10 @@ buildNpmPackage rec { # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version rev = version; - hash = "sha256-NBxN3pQFiDsRYp2Ro0WwWdGzKVjPTKx4/xWQrMNuv0M="; + hash = "sha256-81PESllqRmtfdYFda1fBRZMczlWQq2xSPWELIOIpi3s="; }; - npmDepsHash = "sha256-9pLbSOMfKwkWtzmKNmeKNrgdtzh3riWWJlrbuoDRUrw="; + npmDepsHash = "sha256-OIkT5XMWcVRbCemaC+hkHkZACCzNedJKHLvGmNXEye4="; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/minigalaxy/default.nix b/pkgs/applications/misc/minigalaxy/default.nix index b8cdab22e824..6ddef51e3e6d 100644 --- a/pkgs/applications/misc/minigalaxy/default.nix +++ b/pkgs/applications/misc/minigalaxy/default.nix @@ -1,14 +1,13 @@ { lib , fetchFromGitHub -, docutils -, gettext , glibcLocales , glib-networking , gobject-introspection , gtk3 -, python3 +, libnotify , python3Packages , steam-run +, substituteAll , unzip , webkitgtk , wrapGAppsHook3 @@ -16,23 +15,29 @@ python3Packages.buildPythonApplication rec { pname = "minigalaxy"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "sharkwouter"; - repo = pname; + repo = "minigalaxy"; rev = "refs/tags/${version}"; - sha256 = "sha256-bpNtdMYBl2dJ4PQsxkhm/Y+3A0dD/Y2XC0VaUYyRhvM="; + hash = "sha256-CMPBKnNrcjHVpsbBjY97FiygEJNG9jKHR/LoVMfuxG4="; }; - checkPhase = '' - runHook preCheck - env HOME=$PWD LC_ALL=en_US.UTF-8 pytest - runHook postCheck + patches = [ + (substituteAll { + src = ./inject-launcher-steam-run.diff; + steamrun = lib.getExe steam-run; + }) + ]; + + postPatch = '' + substituteInPlace minigalaxy/installer.py \ + --replace-fail '"unzip"' "\"${lib.getExe unzip}\"" \ + --replace-fail "'unzip'" "\"${lib.getExe unzip}\"" ''; nativeBuildInputs = [ - gettext wrapGAppsHook3 gobject-introspection ]; @@ -40,29 +45,29 @@ python3Packages.buildPythonApplication rec { buildInputs = [ glib-networking gtk3 + libnotify ]; nativeCheckInputs = with python3Packages; [ glibcLocales - pytest - tox + pytestCheckHook + simplejson ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + pythonPath = [ - docutils - python3.pkgs.pygobject3 - python3.pkgs.requests - python3.pkgs.setuptools - python3.pkgs.simplejson - steam-run - unzip + python3Packages.pygobject3 + python3Packages.requests webkitgtk ]; - # Run Linux games using the Steam Runtime by using steam-run in the wrapper - # FIXME: not working with makeBinaryWrapper - postFixup = '' - sed -e 's#exec -a "$0"#exec -a "$0" ${steam-run}/bin/steam-run#' -i $out/bin/minigalaxy + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; meta = with lib; { diff --git a/pkgs/applications/misc/minigalaxy/inject-launcher-steam-run.diff b/pkgs/applications/misc/minigalaxy/inject-launcher-steam-run.diff new file mode 100644 index 000000000000..44850e9fbcea --- /dev/null +++ b/pkgs/applications/misc/minigalaxy/inject-launcher-steam-run.diff @@ -0,0 +1,32 @@ +diff --git a/minigalaxy/launcher.py b/minigalaxy/launcher.py +index 641db77..712c55b 100644 +--- a/minigalaxy/launcher.py ++++ b/minigalaxy/launcher.py +@@ -77,6 +77,7 @@ def get_execute_command(game) -> list: + if game.get_info("use_mangohud") is True: + exe_cmd.insert(0, "mangohud") + exe_cmd.insert(1, "--dlsym") ++ exe_cmd.insert(0, "@steamrun@") + exe_cmd = get_exe_cmd_with_var_command(game, exe_cmd) + logger.info("Launch command for %s: %s", game.name, " ".join(exe_cmd)) + return exe_cmd +diff --git a/tests/test_installer.py b/tests/test_installer.py +index 8e6cb76..a9d9f46 100644 +--- a/tests/test_installer.py ++++ b/tests/test_installer.py +@@ -296,13 +296,13 @@ def test_get_exec_line(self, mock_list_dir, mock_which): + mock_list_dir.return_value = ["data", "docs", "scummvm", "support", "beneath.ini", "gameinfo", "start.sh"] + + result1 = installer.get_exec_line(game1) +- self.assertEqual(result1, "scummvm -c beneath.ini") ++ self.assertEqual(result1, "@steamrun@ scummvm -c beneath.ini") + + game2 = Game("Blocks That Matter", install_dir="/home/test/GOG Games/Blocks That Matter", platform="linux") + mock_list_dir.return_value = ["data", "docs", "support", "gameinfo", "start.sh"] + + result2 = installer.get_exec_line(game2) +- self.assertEqual(result2, "./start.sh") ++ self.assertEqual(result2, "@steamrun@ ./start.sh") + + @mock.patch('os.path.getsize') + @mock.patch('os.listdir') diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index f752052da2c8..dc2de8b0cd73 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { gettext perl pkg-config + wxGTK32 zip ]; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 9432bdd29fc5..f52622591763 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.11.5"; + version = "2.11.7"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-0Td4TMi9HTvf+GeW2f/ufRW0Y3KBrBSDWhgPW4noXi4="; + hash = "sha256-/gbclPcYSDobwftFi0CECgBp6PNqxHW9svP3A5y8eEY="; }; proxyVendor = true; # darwin/linux hash mismatch diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/applications/networking/cluster/kn/default.nix index 5f7f7ad160b9..8fbf21bb2d94 100644 --- a/pkgs/applications/networking/cluster/kn/default.nix +++ b/pkgs/applications/networking/cluster/kn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kn"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "knative"; repo = "client"; rev = "knative-v${version}"; - sha256 = "sha256-sUMQrBAOhpMxMawOdvLFSUrcU9od6pmT7NabSywoQn8="; + sha256 = "sha256-bXICU1UBNPVIumzRPSOWa1I5hUYWEvo6orBpUvbPEvg="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index 658423019156..bcfbf11b0d15 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "roxctl"; - version = "4.4.4"; + version = "4.5.0"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-1eu7khgs6nzp+d1Gtz2DggD2Gie08auw1XxSZsnRdaM="; + sha256 = "sha256-DX7q8TgCJuM4G/gYnh+ZhbaGFO4BezRShZyNqZ2VRMg="; }; - vendorHash = "sha256-j/ouxh4nMg5hyzT2RuP+hJrAeK7+PleT2W0DWxxjOfA="; + vendorHash = "sha256-K1jtwrfzRpzMApDW0WPmIZaJ5hADlMjEkFDWFmzmDc0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix index f00d66ed14f9..b98e308f6b72 100644 --- a/pkgs/applications/networking/coreth/default.nix +++ b/pkgs/applications/networking/coreth/default.nix @@ -5,19 +5,19 @@ buildGoModule rec { pname = "coreth"; - version = "0.13.5"; + version = "0.13.7"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-cnxNIFf0zCpbUg9G+bHNoApxB31O7RH5BVgprYN2GYk="; + hash = "sha256-ZWM45RoGfGd9mRQkQ/Hz7MGlYq4X26J/QV7FWDjMVrk="; }; # go mod vendor has a bug, see: golang/go#57529 proxyVendor = true; - vendorHash = "sha256-IVmz+2pWHsiZOhHKEK9GW9zZq8m1IH5lpfKeClnmc3o="; + vendorHash = "sha256-KSBoqp56n/b9zk5elEWsv7EAv3oyVhmc7hjyudicTWs="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/ids/zeek/broker/default.nix b/pkgs/applications/networking/ids/zeek/broker/default.nix index 4c0b673c098a..49a13cdb2623 100644 --- a/pkgs/applications/networking/ids/zeek/broker/default.nix +++ b/pkgs/applications/networking/ids/zeek/broker/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { substituteInPlace bindings/python/CMakeLists.txt --replace " -u -r" "" ''; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake python3 ]; buildInputs = [ openssl python3.pkgs.pybind11 ]; propagatedBuildInputs = [ caf' ]; diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 6beba3f4c6b9..e1ac462330c2 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { file flex python + swig ]; buildInputs = [ @@ -55,7 +56,6 @@ stdenv.mkDerivation rec { libpcap ncurses openssl - swig zlib python ] ++ lib.optionals stdenv.isLinux [ diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 0f14d131ac98..6826a5f834bc 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ let versions = if stdenv.isLinux then { - stable = "0.0.60"; + stable = "0.0.61"; ptb = "0.0.95"; canary = "0.0.455"; development = "0.0.24"; @@ -17,7 +17,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-hu1+/z/ZtHoobjHF+pgNm040r4LQJUTnpZ06RNERFr8="; + hash = "sha256-jJapVZ67nqLSNhti7LkfsGNV3JzglZjQkHhTwJvPO98="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; diff --git a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix index a27296711906..11336d70eff7 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix @@ -1,32 +1,32 @@ -{ lib -, makeDesktopItem -, copyDesktopItems -, stdenvNoCC -, fetchurl -, appimageTools -, makeWrapper +{ + lib, + makeDesktopItem, + copyDesktopItems, + stdenvNoCC, + fetchurl, + appimageTools, + makeWrapper, }: let - version = "1.11.5"; + version = "1.12.5"; pname = "session-desktop"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - hash = "sha256-Sma8e3A1tf7JmnlS4mbtlF98Ow5aRPqw+aUoitzCjmk="; - }; - appimage = appimageTools.wrapType2 { - inherit version pname src; - }; - appimage-contents = appimageTools.extractType2 { - inherit version pname src; + hash = "sha256-5lE2jab9AK40j2rKYE8zFJr3a+drwCKnVmIZoihhJv8="; }; + appimage = appimageTools.wrapType2 { inherit version pname src; }; + appimage-contents = appimageTools.extractType2 { inherit version pname src; }; in stdenvNoCC.mkDerivation { inherit version pname; src = appimage; - nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 808fc1941822..0706ce657383 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.13.4"; + version = "0.13.5"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - hash = "sha256-R+ylymM0k9wvK12qo+S1Ezu2kheH1x4Ll3VFR7HKVXo="; + hash = "sha256-MWQz/+eusZpXUlpPemLf8Y2nOsh2lv0+Ilf/w+7na+k="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/pkgs/applications/networking/sync/lcsync/default.nix b/pkgs/applications/networking/sync/lcsync/default.nix index 9ba34ab6319c..a71514516eb9 100644 --- a/pkgs/applications/networking/sync/lcsync/default.nix +++ b/pkgs/applications/networking/sync/lcsync/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "lcsync"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "librecast"; repo = "lcsync"; rev = "v${finalAttrs.version}"; - hash = "sha256-eiYbS/LYnM2ZjDHO9KhBp1rrovbhm+OVVfmLtjxAE+Y="; + hash = "sha256-x8KjvUtn00g+zxDfSWZq4WgALDKRgbCF9rtipdOMbpc="; }; buildInputs = [ lcrq librecast libsodium ]; configureFlags = [ "SETCAP_PROGRAM=true" ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 8b063ad6c70e..d5d48219beb7 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -200,9 +200,8 @@ let }) // { inherit (x) md5name md5; }) srcsAttributes.deps; - } // optionalAttrs (variant != "collabora") { - translations = fetchurl srcsAttributes.translations; - help = fetchurl srcsAttributes.help; + translations = srcsAttributes.translations { inherit fetchurl fetchgit; }; + help = srcsAttributes.help { inherit fetchurl fetchgit; }; }; qtMajor = lib.versions.major qtbase.version; @@ -235,14 +234,17 @@ in stdenv.mkDerivation (finalAttrs: { ln -sfv ${f} $sourceRoot/${tarballPath}/${f.md5name} ln -sfv ${f} $sourceRoot/${tarballPath}/${f.name} '')} - '' + optionalString (variant != "collabora") '' + '' + (if (variant != "collabora") then '' ln -sv ${srcs.help} $sourceRoot/${tarballPath}/${srcs.help.name} ln -svf ${srcs.translations} $sourceRoot/${tarballPath}/${srcs.translations.name} tar -xf ${srcs.help} tar -xf ${srcs.translations} - ''; + '' else '' + cp -r --no-preserve=mode ${srcs.help}/. $sourceRoot/helpcontent2/ + cp -r --no-preserve=mode ${srcs.translations}/. $sourceRoot/translations/ + ''); patches = [ # Skip some broken tests: diff --git a/pkgs/applications/office/libreoffice/src-collabora/help.nix b/pkgs/applications/office/libreoffice/src-collabora/help.nix new file mode 100644 index 000000000000..fc5d4a3fa2a0 --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-collabora/help.nix @@ -0,0 +1,6 @@ +{ fetchgit, ... }: +fetchgit { + url = "https://gerrit.libreoffice.org/help"; + rev = "27f62cdb52fe23f6090a3249fcd1433777b2598d"; + hash = "sha256-lyBuj7FI1jwVLLBkB6JJcmQVtm1FKExYWvRUoGqRbJ0="; +} diff --git a/pkgs/applications/office/libreoffice/src-collabora/main.nix b/pkgs/applications/office/libreoffice/src-collabora/main.nix index 7e4bf5f4fdd0..ef4d5d77bfc1 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/main.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/main.nix @@ -2,6 +2,6 @@ fetchgit { url = "https://gerrit.libreoffice.org/core"; rev = "refs/tags/cp-24.04.5-4"; - hash = "sha256-27uLK1u8XWNigxZUCUu8nNZP3p5eFUsS2gCcfSYJK2k="; - fetchSubmodules = true; + hash = "sha256-OJ3R8qs8/R8QnXGCRgn/ZJK7Nn8cWwYbZxjEWg0VpBc="; + fetchSubmodules = false; } diff --git a/pkgs/applications/office/libreoffice/src-collabora/translations.nix b/pkgs/applications/office/libreoffice/src-collabora/translations.nix new file mode 100644 index 000000000000..06f5fe5a3624 --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-collabora/translations.nix @@ -0,0 +1,6 @@ +{ fetchgit, ... }: +fetchgit { + url = "https://gerrit.libreoffice.org/translations"; + rev = "5fd34a953e6861cb8e392363c0a3500059ed6b01"; + hash = "sha256-1j0kTvPbytsCWszXz+xFE+n53zPkR8gNgVaawn+rjfI="; +} diff --git a/pkgs/applications/office/libreoffice/src-fresh/help.nix b/pkgs/applications/office/libreoffice/src-fresh/help.nix index 164121f06165..0f9f54905270 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/help.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/help.nix @@ -1,4 +1,5 @@ -{ +{ fetchurl, ... }: +fetchurl { sha256 = "090pi8dnj5izpvng94hgmjid14n7xvy3rlqqvang3pqdn35xnpsl"; url = "https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-help-24.2.5.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/translations.nix b/pkgs/applications/office/libreoffice/src-fresh/translations.nix index 82291fab8326..b96943060182 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/translations.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/translations.nix @@ -1,4 +1,5 @@ -{ +{ fetchurl, ... }: +fetchurl { sha256 = "0fri41y59zhm8lq0kh6hvf5rpdjdqx0lg1sl40mhh1d6lf1izc1w"; url = "https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-translations-24.2.5.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/help.nix b/pkgs/applications/office/libreoffice/src-still/help.nix index f9e71ea79936..8bdc4617e148 100644 --- a/pkgs/applications/office/libreoffice/src-still/help.nix +++ b/pkgs/applications/office/libreoffice/src-still/help.nix @@ -1,4 +1,5 @@ -{ +{ fetchurl, ... }: +fetchurl { sha256 = "1l543k603mbr3rnwlnv9j52mblmvkgj9y49w4v7w3xm8b15331rs"; url = "https://download.documentfoundation.org/libreoffice/src/7.6.7/libreoffice-help-7.6.7.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/translations.nix b/pkgs/applications/office/libreoffice/src-still/translations.nix index 9604ad622e21..fffb89108f09 100644 --- a/pkgs/applications/office/libreoffice/src-still/translations.nix +++ b/pkgs/applications/office/libreoffice/src-still/translations.nix @@ -1,4 +1,5 @@ -{ +{ fetchurl, ... }: +fetchurl { sha256 = "1bzmpa04bv8afhl3p68dlicamh0zyckmbdgqb3v72fjmx2h8i64a"; url = "https://download.documentfoundation.org/libreoffice/src/7.6.7/libreoffice-translations-7.6.7.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/update.sh b/pkgs/applications/office/libreoffice/update.sh index 6f9612dd7090..9f7a580ad56e 100755 --- a/pkgs/applications/office/libreoffice/update.sh +++ b/pkgs/applications/office/libreoffice/update.sh @@ -47,7 +47,8 @@ case $variant in echo \"$full_version\" > version.nix for t in help translations; do - echo "{" > $t.nix + echo "{ fetchurl, ... }:" > $t.nix + echo "fetchurl {" >> $t.nix echo " sha256 = "\"$(nix-prefetch-url $baseurl/libreoffice-$t-$full_version.tar.xz)'";' >> $t.nix echo " url = "\"$baseurl/libreoffice-$t-$full_version.tar.xz'";' >> $t.nix echo "}" >> $t.nix @@ -56,7 +57,7 @@ case $variant in # Out of loop nix-prefetch-url, because there is no $t, and we want the output # path as well, to get the download.lst file from there afterwards. main_path_hash=($(nix-prefetch-url --print-path $baseurl/libreoffice-$full_version.tar.xz)) - echo "{ fetchurl, ...}:" > main.nix + echo "{ fetchurl, ... }:" > main.nix echo "fetchurl {" >> main.nix echo " sha256 = "\"${main_path_hash[0]}'";' >> main.nix echo " url = "\"$baseurl/libreoffice-$full_version.tar.xz'";' >> main.nix @@ -78,27 +79,41 @@ case $variant in ;; (collabora) - full_version=$(git ls-remote --tags --sort -v:refname https://gerrit.libreoffice.org/core | grep -Pom1 'refs/tags/cp-\K\d+\.\d+\.\d+-\d+$') + all_tags=$(git ls-remote --tags --sort -v:refname https://gerrit.libreoffice.org/core) + rev=$(grep --perl-regexp --only-matching --max-count=1 \ + '\Krefs/tags/cp-\d+\.\d+\.\d+-\d+$' <<< "$all_tags") + full_version=${rev#refs/tags/cp-} echoerr full version is $full_version echo \"$full_version\" > version.nix - rev="refs/tags/cp-$full_version" + # The full checkout including the submodules is too big for Hydra, so we fetch + # submodules separately. + declare -A dirnames=([help]=helpcontent2 [translations]=translations) + for t in help translations; do + sub_rev=$(curl --silent "https://git.libreoffice.org/core/+/$rev/${dirnames[$t]}" |\ + pup '.gitlink-detail text{}' |\ + sed -n 's/^Submodule link to \([0-9a-f]\{40\}\) of .*/\1/p') + echoerr got rev $sub_rev for $t + prefetch_output=$(nix-prefetch-git "https://gerrit.libreoffice.org/$t" --rev "$sub_rev") + echo "{ fetchgit, ... }:" > $t.nix + echo "fetchgit {" >> $t.nix + echo " url = \"$(jq -r '.url' <<< "$prefetch_output")\";" >> $t.nix + echo " rev = \"$rev\";" >> $t.nix + echo " hash = \"$(jq -r '.hash' <<< "$prefetch_output")\";" >> $t.nix + echo "}" + done - prefetch_output=$(nix-prefetch-git https://gerrit.libreoffice.org/core --rev "$rev" --fetch-submodules) - fetched_git_path=$(echo "$prefetch_output" | jq -r '.path') - hash=$(echo "$prefetch_output" | jq -r '.hash') - - # Generate main.nix + local prefetch_output=$(nix-prefetch-git "https://gerrit.libreoffice.org/core" --rev "$rev") echo "{ fetchgit, ... }:" > main.nix echo "fetchgit {" >> main.nix - echo " url = \"https://gerrit.libreoffice.org/core\";" >> main.nix + echo " url = \"$(jq -r '.url' <<< "$prefetch_output")\";" >> main.nix echo " rev = \"$rev\";" >> main.nix - echo " hash = \"$hash\";" >> main.nix - echo " fetchSubmodules = true;" >> main.nix + echo " hash = \"$(jq -r '.hash' <<< "$prefetch_output")\";" >> main.nix + echo " fetchSubmodules = false;" >> main.nix echo "}" >> main.nix # Environment variable required by ../generate-libreoffice-srcs.py - export downloadList="$fetched_git_path/download.lst" + export downloadList=$(jq -r '.path' <<< "$prefetch_output")/download.lst esac cd .. diff --git a/pkgs/applications/radio/qdmr/default.nix b/pkgs/applications/radio/qdmr/default.nix index 4096b648ec1e..2ebc0d30ff6c 100644 --- a/pkgs/applications/radio/qdmr/default.nix +++ b/pkgs/applications/radio/qdmr/default.nix @@ -21,13 +21,13 @@ in stdenv.mkDerivation rec { pname = "qdmr"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "hmatuschek"; repo = "qdmr"; rev = "v${version}"; - hash = "sha256-YLGsKGcKIPd0ihd5IzlT71dYkxZfeH7BpnKQMEyY8dI="; + hash = "sha256-8NV0+M9eMcvkP3UERDkaimbapTKxB4rYRLbHZjzG4Ws="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 3347fa5356b5..2d227389d429 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "https://celestia.space/"; + homepage = "https://celestiaproject.space/"; description = "Real-time 3D simulation of space"; mainProgram = "celestia"; changelog = "https://github.com/CelestiaProject/Celestia/releases/tag/${version}"; diff --git a/pkgs/applications/science/electronics/flopoco/default.nix b/pkgs/applications/science/electronics/flopoco/default.nix index cf0ebf18ff75..e15ef3277a66 100644 --- a/pkgs/applications/science/electronics/flopoco/default.nix +++ b/pkgs/applications/science/electronics/flopoco/default.nix @@ -54,12 +54,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison cmake + flex installShellFiles ]; buildInputs = [ boost - flex gmp libxml2 mpfi diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index b3ddbd5b604f..3d66c909036e 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,23 +3,23 @@ { "kicad" = { kicadVersion = { - version = "8.0.3"; + version = "8.0.4"; src = { - rev = "8ba5ba46af8502ea7a7d2a9754363167c2742399"; - sha256 = "0hafvcjjwylgcpgyyasmb2q210k82wvcswvgjvwwh76bwshwcpwa"; + rev = "5609722002776982320b6a8fbe6d096bbccf469b"; + sha256 = "03971przr1kzmkr302qzx30mmp92mkwg29dwjvzayc522iskxcbx"; }; }; libVersion = { - version = "8.0.3"; + version = "8.0.4"; libSources = { - symbols.rev = "2bc103c46a8daacbba2cded8b9f095b330ba928d"; - symbols.sha256 = "1za0spq09bbj7xwfwr1abmwjnqfd3zx0crayaz7915ja0ifi75hd"; - templates.rev = "0f57b59d365d1f8b8fdd0745e10beb035e88ba37"; + symbols.rev = "967a2828636d21f90ccc28dcfdc0e48508101c9d"; + symbols.sha256 = "1s8mkxb3ncb0w8z5q8jzhryb0yri7g51vx29qykqwv4ksra1f07i"; + templates.rev = "9c51a73b2e2fc4ea75d8b8be0a78bc9fb1785433"; templates.sha256 = "03idwrk3vj9h2az8j8lqpbdbnfxdbkzh4db68kq3644yj3cnlcza"; - footprints.rev = "539ffd8c0898ad8c8c51c2ab85ba56bfd77271c7"; - footprints.sha256 = "0ik4hjl5m65wnpaymg58zbvsfvchhyq5x3psvj6005mgv2hrican"; - packages3d.rev = "3172a1cc0931c1734efad68623374d5277f8ab60"; - packages3d.sha256 = "1yjlg7cxwhlzcdbxjqyqamr140sz8gvzi63k2401mhdbh88c9kii"; + footprints.rev = "a2aa9b5aea64c0efad9a31bc9ca88d48c0203752"; + footprints.sha256 = "1aqdb7mamz8xzz1qrw3qnvnaj97asb8z37w1cjz6y06sjcznlihn"; + packages3d.rev = "5430edd57b3a66fe69288aa8fda714f9732a7f52"; + packages3d.sha256 = "0vixdcldvnl8lr8bq3rc748q3vhx1lr2a0i071w914xyn983z9vz"; }; }; }; diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix index 6f8fbc6d6db3..0cfaa3161347 100644 --- a/pkgs/applications/science/electronics/nvc/default.nix +++ b/pkgs/applications/science/electronics/nvc/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-mM2TkNXZSTr6fo8FxqDYbRlKw4dsADddS+VUEeeH3h8="; + hash = "sha256-mi/ruW+KLOeT6QpyRr+ZRtyOAyXsoKiO5WKAuXz5Wc4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/sapling/Cargo.lock b/pkgs/applications/version-management/sapling/Cargo.lock index 7b3f1c7d58c4..ad2ee2de79d0 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.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -44,9 +44,9 @@ checksum = "0453232ace82dee0dd0b4c87a59bd90f7b53b314f3e0f61fe2ee7c8a16482289" [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if 1.0.0", "once_cell", @@ -56,9 +56,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -80,9 +80,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -110,47 +110,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -158,9 +159,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" dependencies = [ "backtrace", ] @@ -173,15 +174,15 @@ checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" @@ -191,11 +192,10 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "assert-json-diff" -version = "1.1.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4259cbe96513d2f1073027a259fc2ca917feb3026a5a8d984e3628e490255cc0" +checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" dependencies = [ - "extend", "serde", "serde_json", ] @@ -208,9 +208,9 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-compression" -version = "0.4.6" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" +checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" dependencies = [ "brotli", "bzip2", @@ -265,13 +265,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -284,9 +284,12 @@ dependencies = [ [[package]] name = "atomic" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" +dependencies = [ + "bytemuck", +] [[package]] name = "atomicfile" @@ -314,7 +317,7 @@ dependencies = [ "anyhow", "chrono", "configmodel", - "indexmap 2.1.0", + "indexmap 2.2.6", "once_cell", "pem", "simple_asn1", @@ -327,21 +330,20 @@ dependencies = [ [[package]] name = "auto_impl" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89" +checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backingstore" @@ -384,9 +386,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -409,6 +411,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "bindag" version = "0.1.0" @@ -439,6 +447,7 @@ dependencies = [ "pycliparser", "pyconchparser", "pyconfigloader", + "pycontext", "pycopytrace", "pydag", "pydiffhelpers", @@ -447,17 +456,18 @@ dependencies = [ "pydrawdag", "pyeagerepo", "pyedenapi", - "pyedenclient", "pyerror", "pyexchange", "pyfail", "pyfs", + "pygitcompat", "pygitstore", "pyhgmetrics", "pyhgtime", "pyidentity", "pyindexedlog", "pyio", + "pyjournal", "pylinelog", "pylock", "pylz4", @@ -489,6 +499,7 @@ dependencies = [ "pywebview", "pyworker", "pyworkingcopy", + "pyworkingcopyclient", "pyxdiff", "pyzstd", "pyzstore", @@ -498,8 +509,8 @@ dependencies = [ name = "bindings-lib" version = "0.1.0" dependencies = [ + "commands", "cpython", - "hgcommands", ] [[package]] @@ -525,9 +536,12 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +dependencies = [ + "serde", +] [[package]] name = "bitmaps" @@ -564,7 +578,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "digest 0.10.7", + "digest", ] [[package]] @@ -578,16 +592,7 @@ dependencies = [ "cc", "cfg-if 1.0.0", "constant_time_eq", - "digest 0.10.7", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", + "digest", ] [[package]] @@ -601,9 +606,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.4.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -612,9 +617,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.1" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -622,9 +627,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "serde", @@ -641,9 +646,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" [[package]] name = "byteorder" @@ -653,9 +664,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" dependencies = [ "serde", ] @@ -681,6 +692,16 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "cas-client" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "configmodel", + "types", +] + [[package]] name = "cassowary" version = "0.3.0" @@ -693,7 +714,7 @@ version = "0.1.0" dependencies = [ "anyhow", "configmodel", - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", "serde_json", "thiserror", @@ -703,9 +724,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" dependencies = [ "jobserver", "libc", @@ -723,19 +744,29 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "checkout" version = "0.1.0" dependencies = [ "anyhow", + "async-runtime", "async-trait", "atexit", "configmodel", + "context", "crossbeam", + "dag", "edenfs-client", "fail", "fs-err", "hg-metrics", + "hook", "manifest", "manifest-tree", "minibytes", @@ -744,8 +775,7 @@ dependencies = [ "progress-model", "quickcheck", "repo", - "repolock", - "serde_json", + "serde", "spawn-ext", "status", "storemodel", @@ -759,20 +789,21 @@ dependencies = [ "util", "vfs", "walkdir", + "watchman_client", "workingcopy", ] [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -806,30 +837,30 @@ dependencies = [ "strsim 0.10.0", "termcolor", "terminal_size 0.2.6", - "textwrap 0.16.0", + "textwrap 0.16.1", "unicase", ] [[package]] name = "clap" -version = "4.4.18" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3" dependencies = [ "clap_builder", - "clap_derive 4.4.7", + "clap_derive 4.5.11", ] [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa" dependencies = [ "anstream", "anstyle", - "clap_lex 0.6.0", - "strsim 0.10.0", + "clap_lex 0.7.2", + "strsim 0.11.1", "terminal_size 0.3.0", "unicase", "unicode-width", @@ -850,14 +881,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -871,9 +902,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clidispatch" @@ -884,7 +915,10 @@ dependencies = [ "cliparser", "configloader", "configmodel", + "context", + "gitcompat", "hgplain", + "hook", "hostname 0.1.0", "identity", "indexedlog", @@ -928,7 +962,7 @@ version = "0.1.0" dependencies = [ "anyhow", "cpython", - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", "shlex", "thiserror", @@ -939,25 +973,465 @@ name = "clone" version = "0.1.0" dependencies = [ "anyhow", - "async-runtime", "checkout", "configmodel", - "manifest-tree", + "context", "repo", "tempfile", - "termlogger", "thiserror", "tracing", - "treestate", "types", "util", - "vfs", ] [[package]] name = "cloned" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" + +[[package]] +name = "cmdclone" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "clidispatch", + "clone", + "cmdpy", + "cmdutil", + "configloader", + "configmodel", + "eagerepo", + "exchange", + "fail", + "hgplain", + "identity", + "metalog", + "migration", + "repo", + "repo_name", + "tracing", + "types", + "url", + "util", +] + +[[package]] +name = "cmdconfig" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cmdutil", + "configloader", + "configmodel", + "formatter", + "minibytes", + "serde", +] + +[[package]] +name = "cmdconfigfile" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cliparser", + "cmdutil", + "identity", +] + +[[package]] +name = "cmddebugargs" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", +] + +[[package]] +name = "cmddebugcas" +version = "0.1.0" +dependencies = [ + "async-runtime", + "cas-client", + "clidispatch", + "cmdutil", + "manifest", + "repo", + "types", + "util", + "workingcopy", +] + +[[package]] +name = "cmddebugconfigtree" +version = "0.1.0" +dependencies = [ + "cmdutil", +] + +[[package]] +name = "cmddebugcurrentexe" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", +] + +[[package]] +name = "cmddebugdumpindexedlog" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "indexedlog", +] + +[[package]] +name = "cmddebugdumpinternalconfig" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "configloader", +] + +[[package]] +name = "cmddebugfsync" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "fsyncglob", + "repo", +] + +[[package]] +name = "cmddebughttp" +version = "0.1.0" +dependencies = [ + "async-runtime", + "clidispatch", + "cmdutil", + "edenapi", + "repo", +] + +[[package]] +name = "cmddebugmergestate" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cliparser", + "cmdutil", + "repo", + "repostate", + "workingcopy", +] + +[[package]] +name = "cmddebugmetrics" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "hg-metrics", + "repo", + "tracing", +] + +[[package]] +name = "cmddebugnetworkdoctor" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "configloader", + "network-doctor", +] + +[[package]] +name = "cmddebugpython" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", +] + +[[package]] +name = "cmddebugracyoutput" +version = "0.1.0" +dependencies = [ + "async-runtime", + "clidispatch", + "cliparser", + "cmdutil", + "progress-model", + "rand 0.8.5", +] + +[[package]] +name = "cmddebugrefreshconfig" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "configloader", + "repo-minimal-info", +] + +[[package]] +name = "cmddebugrevsets" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cliparser", + "cmdutil", + "repo", + "workingcopy", +] + +[[package]] +name = "cmddebugrunlog" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cliparser", + "repo", + "runlog", + "serde_json", +] + +[[package]] +name = "cmddebugscmstore" +version = "0.1.0" +dependencies = [ + "async-runtime", + "clidispatch", + "cmdutil", + "manifest", + "repo", + "revisionstore", + "serde", + "types", +] + +[[package]] +name = "cmddebugscmstorereplay" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "repo", + "revisionstore", + "types", +] + +[[package]] +name = "cmddebugsegmentclone" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "clidispatch", + "cliparser", + "cmdutil", + "dag", + "edenapi", + "identity", + "progress-model", +] + +[[package]] +name = "cmddebugsegmentgraph" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cliparser", + "cmdutil", + "dag", + "repo", +] + +[[package]] +name = "cmddebugsegmentpull" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "clidispatch", + "cliparser", + "cmdutil", + "dag", + "edenapi", + "repo", + "types", +] + +[[package]] +name = "cmddebugstore" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "configloader", + "repo", + "revisionstore", + "types", +] + +[[package]] +name = "cmddebugstructuredprogress" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cliparser", + "progress-model", +] + +[[package]] +name = "cmddebugtestcommand" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", +] + +[[package]] +name = "cmddebugtop" +version = "0.1.0" +dependencies = [ + "chrono", + "clidispatch", + "cliparser", + "cmdutil", + "comfy-table", + "debugtop", + "repo", + "runlog", +] + +[[package]] +name = "cmddebugwait" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cmdutil", + "edenfs-client", + "repo", + "tracing", + "treestate", + "workingcopy", +] + +[[package]] +name = "cmdgoto" +version = "0.1.0" +dependencies = [ + "anyhow", + "checkout", + "clidispatch", + "cliparser", + "cmdutil", + "configmodel", + "fs-err", + "repo", + "repostate", + "tracing", + "util", + "workingcopy", +] + +[[package]] +name = "cmdpy" +version = "0.1.0" +dependencies = [ + "bindings", + "clidispatch", + "commandserver", + "configmodel", + "context", + "cpython", + "cpython_ext", + "libc", + "nodeipc", + "pycontext", + "pyio", + "pymodules", + "python3-sys", + "tracing", +] + +[[package]] +name = "cmdroot" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "repo", + "util", +] + +[[package]] +name = "cmdstatus" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cmdutil", + "configloader", + "formatter", + "hgplain", + "pathmatcher", + "repo", + "serde", + "status", + "tracing", + "types", + "util", + "workingcopy", +] + +[[package]] +name = "cmdutil" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cliparser", + "configmodel", + "configset", + "formatter", + "hgplain", + "repo", + "termstyle", +] + +[[package]] +name = "cmdversion" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "identity", + "version", +] + +[[package]] +name = "cmdwhereami" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cmdutil", + "repo", + "treestate", + "types", +] [[package]] name = "codegen" @@ -969,7 +1443,7 @@ dependencies = [ [[package]] name = "codegen_includer_proc_macro" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "quote", ] @@ -986,26 +1460,25 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "colored" -version = "1.9.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f741c91823341bebf717d4c71bda820630ce065443b58bd1b7451af008355" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" dependencies = [ - "is-terminal", "lazy_static", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] name = "comfy-table" -version = "6.2.0" +version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e959d788268e3bf9d35ace83e81b124190378e4c91c9067524675e33394b8ba" +checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7" dependencies = [ "crossterm", "strum", @@ -1013,6 +1486,86 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "commands" +version = "0.1.0" +dependencies = [ + "anyhow", + "atexit", + "blackbox", + "clidispatch", + "cmdclone", + "cmdconfig", + "cmdconfigfile", + "cmddebugargs", + "cmddebugcas", + "cmddebugconfigtree", + "cmddebugcurrentexe", + "cmddebugdumpindexedlog", + "cmddebugdumpinternalconfig", + "cmddebugfsync", + "cmddebughttp", + "cmddebugmergestate", + "cmddebugmetrics", + "cmddebugnetworkdoctor", + "cmddebugpython", + "cmddebugracyoutput", + "cmddebugrefreshconfig", + "cmddebugrevsets", + "cmddebugrunlog", + "cmddebugscmstore", + "cmddebugscmstorereplay", + "cmddebugsegmentclone", + "cmddebugsegmentgraph", + "cmddebugsegmentpull", + "cmddebugstore", + "cmddebugstructuredprogress", + "cmddebugtestcommand", + "cmddebugtop", + "cmddebugwait", + "cmdgoto", + "cmdpy", + "cmdroot", + "cmdstatus", + "cmdversion", + "cmdwhereami", + "commandserver", + "configloader", + "configmodel", + "constructors", + "ctrlc", + "fail", + "flate2", + "hg-http", + "hg-metrics", + "hgplain", + "hostname 0.3.1", + "identity", + "libc", + "metrics-render", + "mincode", + "nodeipc", + "parking_lot", + "procinfo", + "progress-model", + "progress-render", + "pycheckout", + "pytracing", + "pyworkingcopy", + "pyworkingcopyclient", + "repo", + "revisionstore", + "runlog", + "sampling", + "tracing", + "tracing-collector", + "tracing-reload", + "tracing-sampler", + "tracing-subscriber", + "version", + "zstd", +] + [[package]] name = "commandserver" version = "0.1.0" @@ -1030,7 +1583,6 @@ dependencies = [ "procutil", "serde", "spawn-ext", - "system-command", "tracing", "udsipc", "version", @@ -1059,6 +1611,28 @@ dependencies = [ "tokio", ] +[[package]] +name = "commits" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "commits-trait", + "dag", + "edenapi", + "factory", + "fs-err", + "futures 0.3.30", + "minibytes", + "parking_lot", + "revlogindex", + "storemodel", + "streams", + "tracing", + "types", + "zstore", +] + [[package]] name = "commits-git" version = "0.1.0" @@ -1113,11 +1687,11 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ - "crossbeam-utils 0.8.19", + "crossbeam-utils 0.8.20", ] [[package]] @@ -1125,67 +1699,46 @@ name = "config" version = "0.1.0" dependencies = [ "anyhow", - "async-trait", "codegen_includer_proc_macro", - "config_types", - "const-cstr", "fbthrift", "futures 0.3.30", + "once_cell", "ref-cast", + "serde", + "serde_derive", "thiserror", "thrift_compiler", - "tracing", - "tracing-futures", ] [[package]] name = "config_thrift" version = "0.1.0" +dependencies = [ + "anyhow", + "codegen_includer_proc_macro", + "fbthrift", + "futures 0.3.30", + "once_cell", + "ref-cast", + "serde", + "serde_derive", + "thiserror", + "thrift_compiler", +] + +[[package]] +name = "config_thrift_clients" +version = "0.1.0" dependencies = [ "anyhow", "async-trait", "codegen_includer_proc_macro", - "config_thrift_types", + "config_thrift", "const-cstr", "fbthrift", "futures 0.3.30", - "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.30", - "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.30", - "once_cell", - "ref-cast", - "serde", - "serde_derive", - "thiserror", - "thrift_compiler", ] [[package]] @@ -1198,6 +1751,7 @@ dependencies = [ "configset", "dirs 2.0.2", "filetime", + "gitcompat", "hgplain", "hgtime", "hostcaps", @@ -1208,10 +1762,12 @@ dependencies = [ "minibytes", "once_cell", "regex", + "repo-minimal-info", "serde", "serde_json", - "serde_urlencoded 0.7.1", - "sha2 0.10.8", + "serde_urlencoded", + "sha2", + "spawn-ext", "staticconfig", "tempfile", "testutil", @@ -1232,6 +1788,7 @@ dependencies = [ "auto_impl", "minibytes", "thiserror", + "twox-hash", "util", ] @@ -1241,7 +1798,7 @@ version = "0.1.0" dependencies = [ "configmodel", "hgrc-parser", - "indexmap 2.1.0", + "indexmap 2.2.6", "minibytes", "tempfile", "tracing", @@ -1276,15 +1833,24 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" name = "constructors" version = "0.1.0" dependencies = [ + "commits", "commits-git", "eagerepo", "edenapi", "gitstore", - "hgcommits", "manifest-tree", "once_cell", ] +[[package]] +name = "context" +version = "0.1.0" +dependencies = [ + "configmodel", + "io", + "termlogger", +] + [[package]] name = "control-point" version = "0.1.0" @@ -1300,9 +1866,9 @@ dependencies = [ [[package]] name = "cookie" -version = "0.16.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" dependencies = [ "percent-encoding", "time", @@ -1311,12 +1877,12 @@ dependencies = [ [[package]] name = "cookie_store" -version = "0.16.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d606d0fba62e13cf04db20536c05cb7f13673c161cb47a47a82b9b9e7d3f1daa" +checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6" dependencies = [ "cookie", - "idna 0.2.3", + "idna 0.3.0", "log", "publicsuffix", "serde", @@ -1335,7 +1901,6 @@ dependencies = [ "async-trait", "configmodel", "dag", - "git2", "hg-metrics", "lru-cache", "manifest", @@ -1380,9 +1945,9 @@ dependencies = [ [[package]] name = "cpython" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3052106c29da7390237bc2310c1928335733b286287754ea85e6093d2495280e" +checksum = "43b398a2c65baaf5892f10bb69b52508bf7a993380cc4ecd3785aaebb5c79389" dependencies = [ "libc", "num-traits", @@ -1423,9 +1988,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if 1.0.0", ] @@ -1436,11 +2001,11 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" dependencies = [ - "crossbeam-channel 0.5.11", + "crossbeam-channel 0.5.13", "crossbeam-deque", "crossbeam-epoch", "crossbeam-queue", - "crossbeam-utils 0.8.19", + "crossbeam-utils 0.8.20", ] [[package]] @@ -1454,11 +2019,11 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ - "crossbeam-utils 0.8.19", + "crossbeam-utils 0.8.20", ] [[package]] @@ -1468,7 +2033,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ "crossbeam-epoch", - "crossbeam-utils 0.8.19", + "crossbeam-utils 0.8.20", ] [[package]] @@ -1477,7 +2042,7 @@ version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "crossbeam-utils 0.8.19", + "crossbeam-utils 0.8.20", ] [[package]] @@ -1486,7 +2051,7 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "crossbeam-utils 0.8.19", + "crossbeam-utils 0.8.20", ] [[package]] @@ -1501,23 +2066,20 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crossterm" -version = "0.26.1" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" +checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "crossterm_winapi", "libc", - "mio", "parking_lot", - "signal-hook 0.3.17", - "signal-hook-mio", "winapi 0.3.9", ] @@ -1547,7 +2109,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" dependencies = [ "lab", - "phf 0.11.2", + "phf", ] [[package]] @@ -1562,34 +2124,34 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.2" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b" +checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" dependencies = [ - "nix 0.27.1", + "nix 0.28.0", "windows-sys 0.52.0", ] [[package]] name = "curl" -version = "0.4.44" +version = "0.4.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" +checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6" dependencies = [ "curl-sys", "libc", "openssl-probe", "openssl-sys", "schannel", - "socket2 0.4.10", - "winapi 0.3.9", + "socket2 0.5.7", + "windows-sys 0.52.0", ] [[package]] name = "curl-sys" -version = "0.4.70+curl-8.5.0" +version = "0.4.73+curl-8.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c0333d8849afe78a4c8102a429a446bfdd055832af071945520e835ae2d841e" +checksum = "450ab250ecf17227c39afb9a2dd9261dc0035cb80f2612472fc0c4aac2dcb84d" dependencies = [ "cc", "libc", @@ -1598,14 +2160,14 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "cxx" -version = "1.0.115" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de00f15a6fa069c99b88c5c78c4541d0e7899a33b86f7480e23df2431fce0bc" +checksum = "273dcfd3acd4e1e276af13ed2a43eea7001318823e7a726a6b3ed39b4acc0b82" dependencies = [ "cc", "cxxbridge-flags", @@ -1615,9 +2177,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.115" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a71e1e631fa2f2f5f92e8b0d860a00c198c6771623a6cefcc863e3554f0d8d6" +checksum = "d8b2766fbd92be34e9ed143898fce6c572dc009de39506ed6903e5a05b68914e" dependencies = [ "cc", "codespan-reporting", @@ -1625,24 +2187,24 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "cxxbridge-flags" -version = "1.0.115" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3fed61d56ba497c4efef9144dfdbaa25aa58f2f6b3a7cf441d4591c583745c" +checksum = "839fcd5e43464614ffaa989eaf1c139ef1f0c51672a1ed08023307fa1b909ccd" [[package]] name = "cxxbridge-macro" -version = "1.0.115" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8908e380a8efd42150c017b0cfa31509fc49b6d47f7cb6b33e93ffb8f4e3661e" +checksum = "4b2c1c1776b986979be68bb2285da855f8d8a35851a769fca8740df7c3d07877" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -1651,7 +2213,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "bitflags 2.4.2", + "bitflags 2.6.0", "byteorder", "dag-types", "dev-logger", @@ -1660,7 +2222,7 @@ dependencies = [ "fs2", "futures 0.3.30", "indexedlog", - "indexmap 2.1.0", + "indexmap 2.2.6", "mincode", "minibytes", "nonblocking", @@ -1708,7 +2270,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -1755,28 +2317,13 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" -[[package]] -name = "difference" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - -[[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", "subtle", ] @@ -1825,10 +2372,10 @@ name = "drawdag" version = "0.1.0" [[package]] -name = "dtoa" -version = "0.4.8" +name = "dunce" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "eagerepo" @@ -1848,6 +2395,7 @@ dependencies = [ "manifest-tree", "metalog", "minibytes", + "mutationstore", "nonblocking", "parking_lot", "storemodel", @@ -1869,7 +2417,7 @@ dependencies = [ "pretty_assertions", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "structopt", ] @@ -1950,7 +2498,6 @@ name = "edenapi_types" version = "0.1.0" dependencies = [ "anyhow", - "blake2", "blake3", "bytes", "dag-types", @@ -1965,7 +2512,6 @@ dependencies = [ "serde_derive", "serde_json", "sha1", - "sha2 0.10.8", "thiserror", "type_macros", "types", @@ -1980,6 +2526,7 @@ dependencies = [ "clientinfo", "fbthrift_socket", "fs-err", + "hg-metrics", "identity", "serde", "thrift-types", @@ -1997,6 +2544,7 @@ dependencies = [ "async-runtime", "cxx", "cxx-build", + "fbinit", "identity", "manifest", "once_cell", @@ -2004,14 +2552,16 @@ dependencies = [ "pathmatcher", "repo", "sparse", + "stats", + "tracing", "types", ] [[package]] name = "either" -version = "1.9.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encode_unicode" @@ -2030,23 +2580,23 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "enum_dispatch" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" +checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -2080,23 +2630,33 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erased-serde" -version = "0.4.2" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55d05712b2d8d88102bc9868020c9e5c7a1f5527c452b9b97450a1d006140ba7" +checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" dependencies = [ "serde", + "typeid", ] [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", ] +[[package]] +name = "euclid" +version = "0.22.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20" +dependencies = [ + "num-traits", +] + [[package]] name = "event-listener" version = "2.5.3" @@ -2109,27 +2669,15 @@ version = "0.1.0" dependencies = [ "anyhow", "async-runtime", + "commits", "dag", "edenapi", - "hgcommits", "metalog", "refencode", "tracing", "types", ] -[[package]] -name = "extend" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f47da3a72ec598d9c8937a7ebca8962a5c7a1f28444e38c2b33c771ba3f55f05" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "factory" version = "0.1.0" @@ -2159,6 +2707,16 @@ dependencies = [ "regex", ] +[[package]] +name = "fancy-regex" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" +dependencies = [ + "bit-set", + "regex", +] + [[package]] name = "faster-hex" version = "0.6.1" @@ -2176,33 +2734,14 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fb303_core" version = "0.0.0" -source = "git+https://github.com/facebook/fb303.git?branch=main#1dd3544a29690edacb8da2910cd6e788a9f6c66b" -dependencies = [ - "anyhow", - "async-trait", - "codegen_includer_proc_macro", - "const-cstr", - "fb303_core_types", - "fbthrift", - "futures 0.3.30", - "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#1dd3544a29690edacb8da2910cd6e788a9f6c66b" +source = "git+https://github.com/facebook/fb303.git?branch=main#0fdcfa63be9071ba9ba34c59b484417f2bb7564b" dependencies = [ "anyhow", "codegen_includer_proc_macro", @@ -2216,10 +2755,25 @@ dependencies = [ "thrift_compiler", ] +[[package]] +name = "fb303_core_clients" +version = "0.0.0" +source = "git+https://github.com/facebook/fb303.git?branch=main#0fdcfa63be9071ba9ba34c59b484417f2bb7564b" +dependencies = [ + "anyhow", + "async-trait", + "codegen_includer_proc_macro", + "fb303_core", + "fbthrift", + "futures 0.3.30", + "thrift_compiler", + "tracing", +] + [[package]] name = "fbinit" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "fbinit_macros", "quickcheck", @@ -2228,17 +2782,17 @@ dependencies = [ [[package]] name = "fbinit_macros" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] name = "fbthrift" version = "0.0.1+unstable" -source = "git+https://github.com/facebook/fbthrift.git?branch=main#f0eefaa2734bce13d861e0182b90a98d13250f17" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#f5a5f5ab0de99eeeece67521eb816032c199cc3f" dependencies = [ "anyhow", "async-trait", @@ -2249,7 +2803,7 @@ dependencies = [ "ghost", "num-derive", "num-traits", - "ordered-float", + "ordered-float 3.9.2", "panic-message", "serde_json", "thiserror", @@ -2258,17 +2812,17 @@ dependencies = [ [[package]] name = "fbthrift_framed" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "byteorder", "bytes", - "tokio-util 0.7.10", + "tokio-util 0.7.11", ] [[package]] name = "fbthrift_socket" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "anyhow", "bytes", @@ -2278,14 +2832,14 @@ dependencies = [ "futures 0.3.30", "tokio", "tokio-tower", - "tokio-util 0.7.10", + "tokio-util 0.7.11", "tower-service", ] [[package]] name = "fbthrift_util" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "tokio", ] @@ -2320,7 +2874,7 @@ checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.4.1", "windows-sys 0.52.0", ] @@ -2338,9 +2892,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -2354,7 +2908,7 @@ checksum = "2cd66269887534af4b0c3e3337404591daa8dc8b9b2b3db71f9523beb4bafb41" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -2529,7 +3083,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -2595,9 +3149,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if 1.0.0", "libc", @@ -2612,14 +3166,14 @@ checksum = "b0e085ded9f1267c32176b40921b9754c474f7dd96f7e808d4a982e48aa1e854" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "git2" @@ -2636,6 +3190,21 @@ dependencies = [ "url", ] +[[package]] +name = "gitcompat" +version = "0.1.0" +dependencies = [ + "anyhow", + "configmodel", + "filetime", + "fs-err", + "identity", + "spawn-ext", + "tracing", + "treestate", + "types", +] + [[package]] name = "gitdag" version = "0.1.0" @@ -2645,6 +3214,7 @@ dependencies = [ "git2", "nonblocking", "parking_lot", + "phf", "tracing", ] @@ -2654,11 +3224,16 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", + "configmodel", "factory", "fs-err", "git2", + "gitcompat", "minibytes", + "progress-model", + "spawn-ext", "storemodel", + "tracing", "types", ] @@ -2677,16 +3252,16 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", "serde", ] [[package]] name = "h2" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -2694,18 +3269,18 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.1.0", + "indexmap 2.2.6", "slab", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.11", "tracing", ] [[package]] name = "half" -version = "1.8.2" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" [[package]] name = "hashbrown" @@ -2724,11 +3299,11 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.11", "allocator-api2", ] @@ -2747,6 +3322,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -2758,9 +3339,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.4" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -2791,114 +3372,6 @@ dependencies = [ "parking_lot", ] -[[package]] -name = "hgcommands" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-runtime", - "atexit", - "bindings", - "blackbox", - "checkout", - "chrono", - "clidispatch", - "cliparser", - "clone", - "comfy-table", - "commandserver", - "configloader", - "configmodel", - "constructors", - "cpython", - "cpython_ext", - "ctrlc", - "dag", - "debugtop", - "eagerepo", - "edenapi", - "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", - "parking_lot", - "pathmatcher", - "procinfo", - "progress-model", - "progress-render", - "pycheckout", - "pyconfigloader", - "pyedenclient", - "pyio", - "pymodules", - "python3-sys", - "pytracing", - "pyworkingcopy", - "rand 0.8.5", - "repo", - "repo_name", - "repostate", - "revisionstore", - "runlog", - "sampling", - "serde", - "serde_json", - "status", - "termstyle", - "tracing", - "tracing-collector", - "tracing-reload", - "tracing-sampler", - "tracing-subscriber", - "treestate", - "types", - "url", - "util", - "version", - "workingcopy", - "zstd", -] - -[[package]] -name = "hgcommits" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "commits-trait", - "dag", - "edenapi", - "factory", - "fs-err", - "futures 0.3.30", - "minibytes", - "parking_lot", - "revlogindex", - "storemodel", - "streams", - "tracing", - "types", - "zstore", -] - [[package]] name = "hgmain" version = "0.1.0" @@ -2906,10 +3379,10 @@ dependencies = [ "anyhow", "atexit", "clidispatch", + "commands", "configloader", "dirs 2.0.2", "encoding", - "hgcommands", "identity", "libc", "pyblackbox", @@ -2955,10 +3428,24 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "hook" +version = "0.1.0" +dependencies = [ + "anyhow", + "clientinfo", + "configmodel", + "identity", + "io", + "minibytes", + "spawn-ext", + "tracing", +] + [[package]] name = "hostcaps" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "once_cell", ] @@ -2966,7 +3453,7 @@ dependencies = [ [[package]] name = "hostname" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "anyhow", "hostname 0.3.1", @@ -2985,13 +3472,13 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", - "itoa 1.0.10", + "itoa", ] [[package]] @@ -3036,7 +3523,7 @@ dependencies = [ "structopt", "thiserror", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.11", "tracing", "url", "zstd", @@ -3044,9 +3531,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -3062,9 +3549,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -3075,9 +3562,9 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.10", + "itoa", "pin-project-lite", - "socket2 0.5.5", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -3113,9 +3600,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.59" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -3146,17 +3633,6 @@ dependencies = [ "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" @@ -3187,7 +3663,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.7", "same-file", "walkdir", "winapi-util", @@ -3244,29 +3720,30 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "arbitrary", "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "rayon", "serde", ] [[package]] name = "insta" -version = "1.34.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" dependencies = [ "console", + "globset", "lazy_static", "linked-hash-map", "serde", "similar", - "yaml-rust", + "walkdir", ] [[package]] @@ -3278,9 +3755,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if 1.0.0", ] @@ -3294,8 +3771,10 @@ dependencies = [ "once_cell", "parking_lot", "pipe", + "spawn-ext", "streampager", "terminal_size 0.3.0", + "termios", "termwiz", "time-interval", ] @@ -3306,7 +3785,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.4", + "hermit-abi 0.3.9", "libc", "windows-sys 0.48.0", ] @@ -3328,12 +3807,12 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi 0.3.4", - "rustix 0.38.30", + "hermit-abi 0.3.9", + "libc", "windows-sys 0.52.0", ] @@ -3347,6 +3826,12 @@ dependencies = [ "once_cell", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" version = "0.11.0" @@ -3358,30 +3843,35 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] +[[package]] +name = "journal" +version = "0.1.0" +dependencies = [ + "anyhow", + "hgtime", + "repolock", + "types", + "util", +] + [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -3404,9 +3894,9 @@ checksum = "bf36173d4167ed999940f804952e6b08197cae5ad5d572eb4db150ce8ad5d58f" [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazystr" @@ -3427,9 +3917,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.152" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libgit2-sys" @@ -3447,9 +3937,9 @@ dependencies = [ [[package]] name = "libnghttp2-sys" -version = "0.1.9+1.58.0" +version = "0.1.10+1.61.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b57e858af2798e167e709b9d969325b6d8e9d50232fcbc494d7d54f976854a64" +checksum = "959c25552127d2e1fa72f0e52548ec04fc386e827ba71a7bd01db46a447dc135" dependencies = [ "cc", "libc", @@ -3457,13 +3947,12 @@ dependencies = [ [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "libc", - "redox_syscall", ] [[package]] @@ -3482,9 +3971,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.14" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "295c17e837573c8c821dbaeb3cceb3d745ad082f7572191409e69cbc1b3fd050" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" dependencies = [ "cc", "libc", @@ -3492,15 +3981,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - [[package]] name = "linelog" version = "0.1.0" @@ -3532,9 +4012,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "local-encoding" @@ -3549,9 +4029,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -3559,20 +4039,20 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" dependencies = [ "value-bag", ] [[package]] name = "lru" -version = "0.11.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -3597,14 +4077,24 @@ dependencies = [ [[package]] name = "lz4-sys" -version = "1.9.4" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" +checksum = "109de74d5d2353660401699a4174a4ff23fcc649caf553df71933c7fb45ad868" dependencies = [ "cc", "libc", ] +[[package]] +name = "mac_address" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8836fae9d0d4be2c8b4efcdd79e828a2faa058a90d005abf42f91cac5493a08e" +dependencies = [ + "nix 0.28.0", + "winapi 0.3.9", +] + [[package]] name = "manifest" version = "0.1.0" @@ -3612,7 +4102,6 @@ dependencies = [ "anyhow", "pathmatcher", "quickcheck", - "quickcheck_arbitrary_derive", "types", ] @@ -3661,17 +4150,11 @@ dependencies = [ "regex-automata 0.1.10", ] -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -3690,18 +4173,18 @@ checksum = "a64a92489e2744ce060c349162be1c5f33c6969234104dbd99ddb5feb08b8c15" [[package]] name = "memoffset" -version = "0.6.5" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ "autocfg", ] [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -3720,6 +4203,7 @@ dependencies = [ "quickcheck", "rand_chacha 0.3.1", "rand_core 0.6.4", + "refencode", "serde", "serde_json", "tempfile", @@ -3763,9 +4247,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -3806,24 +4290,30 @@ dependencies = [ ] [[package]] -name = "miniz_oxide" -version = "0.7.1" +name = "minimal-lexical" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.10" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi 0.3.9", "libc", - "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3837,26 +4327,27 @@ dependencies = [ "identity", "libc", "serde", - "sha2 0.10.8", + "sha2", "toml", ] [[package]] name = "mockito" -version = "0.25.3" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3ae325bcceb48a24302ac57e1055f9173f5fd53be535603ea0ed41dea92db5" +checksum = "d2f6e023aa5bdf392aa06c78e4a4e6d498baab5138d0c993503350ebbc37bf1e" dependencies = [ "assert-json-diff", "colored", - "difference", - "httparse", - "lazy_static", + "futures-core", + "hyper", "log", - "rand 0.7.3", + "rand 0.8.5", "regex", "serde_json", - "serde_urlencoded 0.6.1", + "serde_urlencoded", + "similar", + "tokio", ] [[package]] @@ -3879,7 +4370,7 @@ name = "mutationstore" version = "0.1.0" dependencies = [ "anyhow", - "bitflags 2.4.2", + "bitflags 2.6.0", "dag", "drawdag", "futures 0.3.30", @@ -3893,11 +4384,10 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -3927,25 +4417,28 @@ dependencies = [ [[package]] name = "nix" -version = "0.24.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if 1.0.0", "libc", - "memoffset 0.6.5", + "memoffset 0.7.1", + "pin-utils", ] [[package]] name = "nix" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if 1.0.0", + "cfg_aliases", "libc", + "memoffset 0.9.1", ] [[package]] @@ -3980,12 +4473,12 @@ dependencies = [ [[package]] name = "nom" -version = "5.1.3" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", - "version_check", + "minimal-lexical", ] [[package]] @@ -4007,15 +4500,20 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.3.3" @@ -4029,19 +4527,18 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -4052,24 +4549,24 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.4", + "hermit-abi 0.3.9", "libc", ] [[package]] name = "num_threads" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ "libc", ] [[package]] name = "object" -version = "0.32.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" dependencies = [ "memchr", ] @@ -4080,12 +4577,6 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - [[package]] name = "open" version = "4.2.0" @@ -4099,11 +4590,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.62" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if 1.0.0", "foreign-types", "libc", @@ -4120,7 +4611,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -4131,9 +4622,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.98" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -4152,6 +4643,15 @@ dependencies = [ "serde", ] +[[package]] +name = "ordered-float" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ff2cf528c6c03d9ed653d6c4ce1dc0582dc4af309790ad92f07c1cd551b0be" +dependencies = [ + "num-traits", +] + [[package]] name = "ordered-multimap" version = "0.3.1" @@ -4188,9 +4688,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -4198,22 +4698,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.5.3", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pathdiff" @@ -4244,8 +4744,8 @@ name = "pathmatcher" version = "0.1.0" dependencies = [ "anyhow", - "bitflags 2.4.2", - "fancy-regex", + "bitflags 2.6.0", + "fancy-regex 0.10.0", "fs-err", "glob", "globset", @@ -4261,11 +4761,11 @@ dependencies = [ [[package]] name = "pem" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "serde", ] @@ -4278,13 +4778,13 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "perthread" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" [[package]] name = "pest" -version = "2.7.6" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f200d8d83c44a45b21764d1916299752ca035d15ecd46faca3e9a2a2bf6ad06" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" dependencies = [ "memchr", "thiserror", @@ -4293,9 +4793,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.6" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcd6ab1236bbdb3a49027e920e693192ebfe8913f6d60e294de57463a493cfde" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" dependencies = [ "pest", "pest_generator", @@ -4303,35 +4803,26 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.6" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a31940305ffc96863a735bef7c7994a00b325a7138fdbc5bda0f1a0476d3275" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "pest_meta" -version = "2.7.6" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ff62f5259e53b78d1af898941cdcdccfae7385cf7d793a6e55de5d05bb4b7d" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" dependencies = [ "once_cell", "pest", - "sha2 0.10.8", -] - -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_shared 0.10.0", + "sha2", ] [[package]] @@ -4341,7 +4832,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_macros", - "phf_shared 0.11.2", + "phf_shared", ] [[package]] @@ -4351,7 +4842,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" dependencies = [ "phf_generator", - "phf_shared 0.11.2", + "phf_shared", ] [[package]] @@ -4360,7 +4851,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared 0.11.2", + "phf_shared", "rand 0.8.5", ] @@ -4371,19 +4862,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator", - "phf_shared 0.11.2", + "phf_shared", "proc-macro2", "quote", - "syn 2.0.48", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", + "syn 2.0.72", ] [[package]] @@ -4406,11 +4888,11 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ - "pin-project-internal 1.1.3", + "pin-project-internal 1.1.5", ] [[package]] @@ -4426,20 +4908,20 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -4458,19 +4940,18 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ - "base64 0.21.7", - "indexmap 2.1.0", - "line-wrap", + "base64 0.22.1", + "indexmap 2.2.6", "quick-xml", "serde", "time", @@ -4548,9 +5029,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -4750,9 +5231,22 @@ dependencies = [ "configloader", "cpython", "cpython_ext", + "repo-minimal-info", "util", ] +[[package]] +name = "pycontext" +version = "0.1.0" +dependencies = [ + "configset", + "context", + "cpython", + "cpython_ext", + "io", + "pyconfigloader", +] + [[package]] name = "pycopytrace" version = "0.1.0" @@ -4763,9 +5257,8 @@ dependencies = [ "cpython", "cpython_ext", "dag", - "parking_lot", + "pypathmatcher", "storemodel", - "types", ] [[package]] @@ -4774,17 +5267,19 @@ version = "0.1.0" dependencies = [ "anyhow", "async-runtime", + "commits", + "configmodel", "cpython", "cpython_ext", "dag", "futures 0.3.30", - "hgcommits", "minibytes", "parking_lot", "pyedenapi", "pyio", "pymetalog", "storemodel", + "types", ] [[package]] @@ -4855,16 +5350,7 @@ dependencies = [ "pyconfigloader", "pyrevisionstore", "revisionstore", - "types", -] - -[[package]] -name = "pyedenclient" -version = "0.1.0" -dependencies = [ - "cpython", - "cpython_ext", - "edenfs-client", + "sha1", "types", ] @@ -4873,6 +5359,7 @@ name = "pyerror" version = "0.1.0" dependencies = [ "auth", + "checkout", "configmodel", "cpython", "cpython_ext", @@ -4921,14 +5408,28 @@ dependencies = [ "fsinfo", ] +[[package]] +name = "pygitcompat" +version = "0.1.0" +dependencies = [ + "configmodel", + "cpython", + "cpython_ext", + "gitcompat", + "pyprocess", + "types", +] + [[package]] name = "pygitstore" version = "0.1.0" dependencies = [ + "configmodel", "cpython", "cpython_ext", "gitstore", "storemodel", + "types", ] [[package]] @@ -4980,6 +5481,17 @@ dependencies = [ "termstyle", ] +[[package]] +name = "pyjournal" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "hgtime", + "journal", + "types", +] + [[package]] name = "pylinelog" version = "0.1.0" @@ -5039,6 +5551,7 @@ dependencies = [ "minibytes", "pybytes", "python-modules", + "tracing", ] [[package]] @@ -5165,7 +5678,9 @@ dependencies = [ name = "pyrepo" version = "0.1.0" dependencies = [ + "checkout", "configmodel", + "context", "cpython", "cpython_ext", "parking_lot", @@ -5179,6 +5694,7 @@ dependencies = [ "repo", "repolock", "revisionstore", + "types", "util", "workingcopy", ] @@ -5238,15 +5754,15 @@ version = "0.1.0" dependencies = [ "codegen", "once_cell", - "phf 0.11.2", + "phf", "zstdelta", ] [[package]] name = "python3-sys" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f8b50d72fb3015735aa403eebf19bbd72c093bfeeae24ee798be5f2f1aab52" +checksum = "0f53ef6740367a09718d2cd21ba15b0d7972342a38e554736bcee7773e45c9f5" dependencies = [ "libc", "regex", @@ -5352,20 +5868,29 @@ name = "pyworkingcopy" version = "0.1.0" dependencies = [ "anyhow", + "context", "cpython", "cpython_ext", "fs-err", - "io", "parking_lot", "pathmatcher", - "pyconfigloader", - "pyedenclient", "pypathmatcher", "pystatus", "pytreestate", + "pyworkingcopyclient", "repostate", "sparse", - "termlogger", + "types", + "workingcopy", +] + +[[package]] +name = "pyworkingcopyclient" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "edenfs-client", "types", "workingcopy", ] @@ -5401,9 +5926,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" dependencies = [ "memchr", ] @@ -5422,12 +5947,12 @@ dependencies = [ [[package]] name = "quickcheck_arbitrary_derive" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "proc-macro2", "quickcheck", "quote", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] @@ -5443,9 +5968,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -5549,7 +6074,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.15", "serde", ] @@ -5573,9 +6098,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -5588,7 +6113,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", - "crossbeam-utils 0.8.19", + "crossbeam-utils 0.8.20", ] [[package]] @@ -5610,34 +6135,43 @@ dependencies = [ ] [[package]] -name = "redox_users" -version = "0.4.4" +name = "redox_syscall" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "getrandom 0.2.12", + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom 0.2.15", "libredox", "thiserror", ] [[package]] name = "ref-cast" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f" +checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" +checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -5649,14 +6183,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -5681,13 +6215,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.4", ] [[package]] @@ -5704,9 +6238,9 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "remove_dir_all" @@ -5721,7 +6255,7 @@ dependencies = [ name = "renderdag" version = "0.1.0" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "dag", "itertools", "nonblocking", @@ -5750,6 +6284,7 @@ dependencies = [ "once_cell", "parking_lot", "refencode", + "repo-minimal-info", "repolock", "revisionstore", "revsets", @@ -5763,6 +6298,19 @@ dependencies = [ "workingcopy", ] +[[package]] +name = "repo-minimal-info" +version = "0.1.0" +dependencies = [ + "anyhow", + "fs-err", + "gitcompat", + "identity", + "phf", + "tempfile", + "util", +] + [[package]] name = "repo_name" version = "0.1.0" @@ -5780,6 +6328,7 @@ dependencies = [ "fs-err", "fs2", "parking_lot", + "progress-model", "tempfile", "thiserror", "tracing", @@ -5803,9 +6352,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.23" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "base64 0.21.7", "bytes", @@ -5834,12 +6383,13 @@ dependencies = [ "rustls-pemfile", "serde", "serde_json", - "serde_urlencoded 0.7.1", + "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls", - "tokio-util 0.7.10", + "tokio-util 0.7.11", "tower-service", "url", "wasm-bindgen", @@ -5877,6 +6427,7 @@ dependencies = [ "http", "http-client", "indexedlog", + "itertools", "lfs_protocol", "lz4-pyframe", "manifest-tree", @@ -5900,7 +6451,7 @@ dependencies = [ "serde_derive", "serde_json", "sha1", - "sha2 0.10.8", + "sha2", "stats", "storemodel", "tempfile", @@ -5956,6 +6507,7 @@ dependencies = [ "configmodel", "dag", "edenapi", + "hgplain", "metalog", "refencode", "thiserror", @@ -5963,18 +6515,40 @@ dependencies = [ "types", ] +[[package]] +name = "rewrite-macros" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "tree-pattern-match", +] + +[[package]] +name = "rich-cas-client" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "cas-client", + "configmodel", + "fbinit", + "types", +] + [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", - "getrandom 0.2.12", + "cfg-if 1.0.0", + "getrandom 0.2.15", "libc", "spin", "untrusted", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -6009,9 +6583,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustix" @@ -6029,22 +6603,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.30" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring", @@ -6085,21 +6659,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -6146,6 +6714,38 @@ dependencies = [ "toml", ] +[[package]] +name = "scope" +version = "0.0.1+unstable" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#f5a5f5ab0de99eeeece67521eb816032c199cc3f" +dependencies = [ + "anyhow", + "codegen_includer_proc_macro", + "fbthrift", + "futures 0.3.30", + "once_cell", + "ref-cast", + "serde", + "serde_derive", + "thiserror", + "thrift_compiler", +] + +[[package]] +name = "scope_clients" +version = "0.0.1+unstable" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#f5a5f5ab0de99eeeece67521eb816032c199cc3f" +dependencies = [ + "anyhow", + "async-trait", + "codegen_includer_proc_macro", + "fbthrift", + "futures 0.3.30", + "scope", + "thrift_compiler", + "tracing", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -6170,11 +6770,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -6183,9 +6783,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -6211,9 +6811,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.195" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] @@ -6224,8 +6824,8 @@ version = "0.1.0" [[package]] name = "serde_bser" -version = "0.3.1" -source = "git+https://github.com/facebook/watchman.git?branch=main#d52738785ded4c290fb08adcb244e4c34ef1ffdd" +version = "0.4.0" +source = "git+https://github.com/facebook/watchman.git?branch=main#b53ca70cc37496cfd5924eacf2cef8a271ee6ae9" dependencies = [ "anyhow", "byteorder", @@ -6237,9 +6837,9 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ "serde", ] @@ -6256,13 +6856,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.195" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -6276,36 +6876,24 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ - "itoa 1.0.10", + "itoa", "ryu", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] -[[package]] -name = "serde_urlencoded" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" -dependencies = [ - "dtoa", - "itoa 0.4.8", - "serde", - "url", -] - [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -6313,7 +6901,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.10", + "itoa", "ryu", "serde", ] @@ -6326,27 +6914,14 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] name = "sha1_smol" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] +checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" [[package]] name = "sha2" @@ -6356,7 +6931,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -6368,6 +6943,12 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "shell-escape" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" + [[package]] name = "shellexpand" version = "2.1.2" @@ -6379,19 +6960,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" - -[[package]] -name = "signal-hook" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729" -dependencies = [ - "libc", - "signal-hook-registry", -] +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook" @@ -6403,31 +6974,20 @@ dependencies = [ "signal-hook-registry", ] -[[package]] -name = "signal-hook-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio", - "signal-hook 0.3.17", -] - [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] [[package]] name = "similar" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" +checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" [[package]] name = "simple_asn1" @@ -6478,9 +7038,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" @@ -6494,18 +7054,18 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "sorted_vector_map" -version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +version = "0.2.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "itertools", "quickcheck", @@ -6521,7 +7081,7 @@ dependencies = [ "once_cell", "pathmatcher", "regex", - "syncify", + "rewrite-macros", "thiserror", "tokio", "tracing", @@ -6534,6 +7094,7 @@ version = "0.1.0" dependencies = [ "libc", "tempfile", + "tracing", "winapi 0.3.9", ] @@ -6554,7 +7115,7 @@ name = "staticconfig" version = "0.1.0" dependencies = [ "configmodel", - "phf 0.11.2", + "phf", "staticconfig_macros", ] @@ -6563,13 +7124,13 @@ name = "staticconfig_macros" version = "0.1.0" dependencies = [ "hgrc-parser", - "indexmap 2.1.0", + "indexmap 2.2.6", ] [[package]] name = "stats" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "fbinit", "futures 0.3.30", @@ -6583,7 +7144,7 @@ dependencies = [ [[package]] name = "stats_traits" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "auto_impl", "dashmap", @@ -6608,8 +7169,10 @@ dependencies = [ "edenapi_types", "factory", "futures 0.3.30", + "metalog", "minibytes", "once_cell", + "parking_lot", "serde", "types", ] @@ -6621,7 +7184,7 @@ dependencies = [ "bit-set", "dirs 2.0.2", "enum_dispatch", - "indexmap 2.1.0", + "indexmap 2.2.6", "lazy_static", "lru", "memmap2", @@ -6662,6 +7225,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "structopt" version = "0.3.26" @@ -6688,40 +7257,40 @@ dependencies = [ [[package]] name = "strum" -version = "0.24.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" [[package]] name = "strum_macros" -version = "0.24.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sval" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1604e9ab506f4805bc62d2868c6d20f23fa6ced4c7cfe695a1d20589ba5c63d0" +checksum = "53eb957fbc79a55306d5d25d87daf3627bc3800681491cda0709eef36c748bfe" [[package]] name = "sval_buffer" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2831b6451148d344f612016d4277348f7721b78a0869a145fd34ef8b06b3fa2e" +checksum = "96e860aef60e9cbf37888d4953a13445abf523c534640d1f6174d310917c410d" dependencies = [ "sval", "sval_ref", @@ -6729,40 +7298,40 @@ dependencies = [ [[package]] name = "sval_dynamic" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238ac5832a23099a413ffd22e66f7e6248b9af4581b64c758ca591074be059fc" +checksum = "ea3f2b07929a1127d204ed7cb3905049381708245727680e9139dac317ed556f" dependencies = [ "sval", ] [[package]] name = "sval_fmt" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8474862431bac5ac7aee8a12597798e944df33f489c340e17e886767bda0c4e" +checksum = "c4e188677497de274a1367c4bda15bd2296de4070d91729aac8f0a09c1abf64d" dependencies = [ - "itoa 1.0.10", + "itoa", "ryu", "sval", ] [[package]] name = "sval_json" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f348030cc3d2a11eb534145600601f080cf16bf9ec0783efecd2883f14c21e" +checksum = "32f456c07dae652744781f2245d5e3b78e6a9ebad70790ac11eb15dbdbce5282" dependencies = [ - "itoa 1.0.10", + "itoa", "ryu", "sval", ] [[package]] name = "sval_nested" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6659c3f6be1e5e99dc7c518877f48a8a39088ace2504b046db789bd78ce5969d" +checksum = "886feb24709f0476baaebbf9ac10671a50163caa7e439d7a7beb7f6d81d0a6fb" dependencies = [ "sval", "sval_buffer", @@ -6771,18 +7340,18 @@ dependencies = [ [[package]] name = "sval_ref" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829ad319bd82d0da77be6f3d547623686c453502f8eebdeb466cfa987972bd28" +checksum = "be2e7fc517d778f44f8cb64140afa36010999565528d48985f55e64d45f369ce" dependencies = [ "sval", ] [[package]] name = "sval_serde" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9da6c3efaedf8b8c0861ec5343e8e8c51d838f326478623328bd8728b79bca" +checksum = "79bf66549a997ff35cd2114a27ac4b0c2843280f2cfa84b240d169ecaa0add46" dependencies = [ "serde", "sval", @@ -6802,9 +7371,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -6812,11 +7381,10 @@ dependencies = [ ] [[package]] -name = "syncify" -version = "0.1.0" -dependencies = [ - "tree-pattern-match", -] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "synstructure" @@ -6830,10 +7398,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "system-command" -version = "0.1.0" - [[package]] name = "system-configuration" version = "0.5.1" @@ -6867,14 +7431,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.0.1", - "redox_syscall", - "rustix 0.38.30", + "fastrand 2.1.0", + "rustix 0.38.34", "windows-sys 0.52.0", ] @@ -6903,20 +7466,20 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.30", + "rustix 0.38.34", "windows-sys 0.48.0", ] [[package]] name = "terminfo" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da31aef70da0f6352dbcb462683eb4dd2bfad01cf3fc96cf204547b9a839a585" +checksum = "666cd3a6681775d22b200409aad3b089c5b99fb11ecdd8a204d9d62f8148498f" dependencies = [ "dirs 4.0.0", "fnv", "nom", - "phf 0.11.2", + "phf", "phf_codegen", ] @@ -6952,15 +7515,15 @@ dependencies = [ [[package]] name = "termwiz" -version = "0.18.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25e302bfaa2555ca7fb55eee19051ad43e510153b19cb880d6da5acb65a72ab9" +checksum = "5a75313e21da5d4406ea31402035b3b97aa74c04356bdfafa5d1043ab4e551d1" dependencies = [ "anyhow", - "base64 0.13.1", - "bitflags 1.3.2", + "base64 0.21.7", + "bitflags 2.6.0", "cassowary", - "cfg-if 1.0.0", + "fancy-regex 0.11.0", "filedescriptor 0.8.2", "finl_unicode", "fixedbitset", @@ -6970,18 +7533,18 @@ dependencies = [ "libc", "log", "memmem", - "nix 0.24.3", + "nix 0.26.4", "num-derive", "num-traits", - "ordered-float", + "ordered-float 4.2.1", "pest", "pest_derive", - "phf 0.10.1", - "regex", + "phf", "semver", - "sha2 0.9.9", - "signal-hook 0.1.17", + "sha2", + "signal-hook", "siphasher", + "tempfile", "terminfo", "termios", "thiserror", @@ -6989,8 +7552,10 @@ dependencies = [ "unicode-segmentation", "vtparse", "wezterm-bidi", + "wezterm-blob-leases", "wezterm-color-types", "wezterm-dynamic", + "wezterm-input-types", "winapi 0.3.9", ] @@ -7013,39 +7578,51 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" dependencies = [ "terminal_size 0.2.6", "unicode-width", ] +[[package]] +name = "thin-cas-client" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "cas-client", + "configmodel", + "fbinit", + "types", +] + [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if 1.0.0", "once_cell", @@ -7053,52 +7630,24 @@ dependencies = [ [[package]] name = "thrift" -version = "0.1.0" +version = "0.0.1+unstable" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#f5a5f5ab0de99eeeece67521eb816032c199cc3f" dependencies = [ "anyhow", - "async-trait", "codegen_includer_proc_macro", - "config_thrift", - "const-cstr", - "fb303_core", "fbthrift", "futures 0.3.30", + "once_cell", "ref-cast", - "sorted_vector_map", + "scope", + "serde", + "serde_derive", "thiserror", "thrift_compiler", - "thrift_types", - "tracing", - "tracing-futures", ] [[package]] -name = "thrift-types" -version = "0.1.0" -dependencies = [ - "anyhow", - "config", - "config_thrift", - "fb303_core", - "fbthrift", - "futures 0.3.30", - "thiserror", - "thrift", -] - -[[package]] -name = "thrift_compiler" -version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" -dependencies = [ - "anyhow", - "clap 4.4.18", - "serde", - "which", -] - -[[package]] -name = "thrift_types" +name = "thrift" version = "0.1.0" dependencies = [ "anyhow", @@ -7113,18 +7662,85 @@ dependencies = [ "serde_derive", "sorted_vector_map", "thiserror", + "thrift 0.0.1+unstable", "thrift_compiler", ] +[[package]] +name = "thrift-types" +version = "0.1.0" +dependencies = [ + "anyhow", + "config", + "config_thrift", + "fb303_core", + "fbthrift", + "futures 0.3.30", + "thiserror", + "thrift 0.1.0", + "thrift_clients 0.1.0", +] + +[[package]] +name = "thrift_clients" +version = "0.0.1+unstable" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#f5a5f5ab0de99eeeece67521eb816032c199cc3f" +dependencies = [ + "anyhow", + "async-trait", + "codegen_includer_proc_macro", + "fbthrift", + "futures 0.3.30", + "scope", + "scope_clients", + "thrift 0.0.1+unstable", + "thrift_compiler", + "tracing", +] + +[[package]] +name = "thrift_clients" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "codegen_includer_proc_macro", + "config_thrift", + "config_thrift_clients", + "const-cstr", + "fb303_core", + "fb303_core_clients", + "fbthrift", + "futures 0.3.30", + "thrift 0.0.1+unstable", + "thrift 0.1.0", + "thrift_clients 0.0.1+unstable", + "thrift_compiler", + "tracing", +] + +[[package]] +name = "thrift_compiler" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" +dependencies = [ + "anyhow", + "clap 4.5.11", + "dunce", + "serde", + "which", +] + [[package]] name = "time" -version = "0.3.31" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", - "itoa 1.0.10", + "itoa", "libc", + "num-conv", "num_threads", "powerfmt", "serde", @@ -7144,10 +7760,11 @@ version = "0.1.0" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -7163,9 +7780,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -7178,33 +7795,32 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2 0.5.7", "tokio-macros", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -7229,14 +7845,14 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.11", ] [[package]] @@ -7249,7 +7865,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "pin-project 1.1.3", + "pin-project 1.1.5", "tokio", "tower", "tower-service", @@ -7259,7 +7875,7 @@ dependencies = [ [[package]] name = "tokio-uds-compat" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "async-io", "futures 0.3.30", @@ -7286,27 +7902,26 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", "futures-util", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "pin-project-lite", "slab", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.8" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "81967dd0dd2c1ab0bc3468bd7caecc32b8a4aa47d0c8c695d8c2b2108168d62c" dependencies = [ "serde", "serde_spanned", @@ -7316,20 +7931,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "f8fb9f64314842840f1d940ac544da178732128f1c78c21772e876579e0da1db" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.22.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "8d9f8729f5aea9562aac1cc0441f5d6de3cff1ee0c5d67293eeca5eb36ee7c16" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -7390,14 +8005,14 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "tracing-collector" version = "0.1.0" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "libc", "parking_lot", "serde", @@ -7417,18 +8032,6 @@ dependencies = [ "valuable", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "futures 0.3.30", - "futures-task", - "pin-project 1.1.3", - "tracing", -] - [[package]] name = "tracing-log" version = "0.2.0" @@ -7507,11 +8110,10 @@ dependencies = [ [[package]] name = "tracing-test" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a2c0ff408fe918a94c428a3f2ad04e4afd5c95bbc08fcf868eff750c15728a4" +checksum = "557b891436fe0d5e0e363427fc7f217abf9ccd510d5136549847bdcbcd011d68" dependencies = [ - "lazy_static", "tracing-core", "tracing-subscriber", "tracing-test-macro", @@ -7519,18 +8121,20 @@ dependencies = [ [[package]] name = "tracing-test-macro" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bc1c4f8e2e73a977812ab339d503e6feeb92700f6d07a6de4d321522d5c08" +checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" dependencies = [ - "lazy_static", "quote", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] name = "tree-pattern-match" version = "0.1.0" +dependencies = [ + "bitflags 2.6.0", +] [[package]] name = "treestate" @@ -7538,7 +8142,7 @@ version = "0.1.0" dependencies = [ "anyhow", "atomicfile", - "bitflags 2.4.2", + "bitflags 2.6.0", "byteorder", "fs-err", "fs2", @@ -7549,7 +8153,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "repolock", - "sha2 0.10.8", + "sha2", "tempfile", "thiserror", "tracing", @@ -7586,6 +8190,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "typeid" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf" + [[package]] name = "typenum" version = "1.17.0" @@ -7597,8 +8207,13 @@ name = "types" version = "0.1.0" dependencies = [ "anyhow", + "assert_matches", + "base64 0.13.1", + "bitflags 2.6.0", + "blake3", "byteorder", "lazy_static", + "minibytes", "quickcheck", "quickcheck_arbitrary_derive", "rand 0.8.5", @@ -7626,7 +8241,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.0", + "memoffset 0.9.1", "tempfile", "winapi 0.3.9", ] @@ -7665,24 +8280,24 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" @@ -7695,7 +8310,7 @@ name = "unionconfig" version = "0.1.0" dependencies = [ "configmodel", - "indexmap 2.1.0", + "indexmap 2.2.6", "staticconfig", ] @@ -7707,9 +8322,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna 0.5.0", @@ -7718,9 +8333,9 @@ dependencies = [ [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "util" @@ -7731,12 +8346,12 @@ dependencies = [ "dirs 2.0.2", "fn-error-context", "fs2", - "hostname 0.3.1", "lazystr", "libc", "memmap2", "once_cell", "rand 0.8.5", + "shell-escape", "shellexpand", "tempfile", "thiserror", @@ -7746,12 +8361,12 @@ dependencies = [ [[package]] name = "uuid" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "atomic", - "getrandom 0.2.12", + "getrandom 0.2.15", "serde", "sha1_smol", ] @@ -7764,9 +8379,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cdbaf5e132e593e9fc1de6a15bbec912395b11fb9719e061cf64f804524c503" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" dependencies = [ "value-bag-serde1", "value-bag-sval2", @@ -7774,9 +8389,9 @@ dependencies = [ [[package]] name = "value-bag-serde1" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92cad98b1b18d06b6f38b3cd04347a9d7a3a0111441a061f71377fb6740437e4" +checksum = "ccacf50c5cb077a9abb723c5bcb5e0754c1a433f1e1de89edc328e2760b6328b" dependencies = [ "erased-serde", "serde", @@ -7785,9 +8400,9 @@ dependencies = [ [[package]] name = "value-bag-sval2" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dc7271d6b3bf58dd2e610a601c0e159f271ffdb7fbb21517c40b52138d64f8e" +checksum = "1785bae486022dfb9703915d42287dcb284c1ee37bd1080eeba78cc04721285b" dependencies = [ "sval", "sval_buffer", @@ -7816,9 +8431,9 @@ version = "0.1.0" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vfs" @@ -7864,15 +8479,15 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -7900,10 +8515,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasm-bindgen" -version = "0.2.90" +name = "wasite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -7911,24 +8532,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.40" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -7938,9 +8559,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7948,28 +8569,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -7980,8 +8601,8 @@ dependencies = [ [[package]] name = "watchman_client" -version = "0.8.0" -source = "git+https://github.com/facebook/watchman.git?branch=main#d52738785ded4c290fb08adcb244e4c34ef1ffdd" +version = "0.9.0" +source = "git+https://github.com/facebook/watchman.git?branch=main#b53ca70cc37496cfd5924eacf2cef8a271ee6ae9" dependencies = [ "anyhow", "bytes", @@ -7997,9 +8618,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -8007,9 +8628,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webview-app" @@ -8036,19 +8657,33 @@ dependencies = [ [[package]] name = "wezterm-bidi" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1560382cf39b0fa92473eae4d5b3772f88c63202cbf5a72c35db72ba99e66c36" +checksum = "0c0a6e355560527dd2d1cf7890652f4f09bb3433b6aadade4c9b5ed76de5f3ec" dependencies = [ "log", "wezterm-dynamic", ] [[package]] -name = "wezterm-color-types" -version = "0.2.0" +name = "wezterm-blob-leases" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6e7a483dd2785ba72705c51e8b1be18300302db2a78368dac9bc8773857777" +checksum = "8e5a5e0adf7eed68976410def849a4bdab6f6e9f6163f152de9cb89deea9e60b" +dependencies = [ + "getrandom 0.2.15", + "mac_address", + "once_cell", + "sha2", + "thiserror", + "uuid", +] + +[[package]] +name = "wezterm-color-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7de81ef35c9010270d63772bebef2f2d6d1f2d20a983d27505ac850b8c4b4296" dependencies = [ "csscolorparser", "deltae", @@ -8058,12 +8693,12 @@ dependencies = [ [[package]] name = "wezterm-dynamic" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75e78c0cc60a76de5d93f9dad05651105351e151b6446ab305514945d7588aa" +checksum = "dfb128bacfa86734e07681fb6068e34c144698e84ee022d6e009145d1abb77b5" dependencies = [ "log", - "ordered-float", + "ordered-float 4.2.1", "strsim 0.10.0", "thiserror", "wezterm-dynamic-derive", @@ -8080,6 +8715,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "wezterm-input-types" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7012add459f951456ec9d6c7e6fc340b1ce15d6fc9629f8c42853412c029e57e" +dependencies = [ + "bitflags 1.3.2", + "euclid", + "lazy_static", + "wezterm-dynamic", +] + [[package]] name = "which" version = "4.4.2" @@ -8089,14 +8736,25 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.30", + "rustix 0.38.34", +] + +[[package]] +name = "whoami" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" +dependencies = [ + "redox_syscall 0.4.1", + "wasite", + "web-sys", ] [[package]] name = "widestring" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "winapi" @@ -8128,11 +8786,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi 0.3.9", + "windows-sys 0.52.0", ] [[package]] @@ -8147,7 +8805,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -8165,7 +8823,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -8185,17 +8843,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -8206,9 +8865,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -8218,9 +8877,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -8230,9 +8889,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -8242,9 +8907,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -8254,9 +8919,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -8266,9 +8931,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -8278,15 +8943,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.34" +version = "0.6.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +checksum = "b480ae9340fc261e6be3e95a1ba86d54ae3f9171132a73ce8d4bbaf68339507c" dependencies = [ "memchr", ] @@ -8308,19 +8973,24 @@ dependencies = [ "anyhow", "async-runtime", "async-trait", - "bitflags 2.4.2", + "bitflags 2.6.0", "configloader", "configmodel", + "context", "crossbeam", "edenfs-client", "fs-err", + "gitcompat", "hgtime", "identity", + "journal", "manifest", "manifest-tree", + "once_cell", "parking_lot", "pathmatcher", "progress-model", + "regex", "repolock", "repostate", "serde", @@ -8338,6 +9008,7 @@ dependencies = [ "util", "vfs", "watchman_client", + "whoami", ] [[package]] @@ -8355,15 +9026,6 @@ dependencies = [ "cc", ] -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "yansi" version = "0.5.1" @@ -8372,47 +9034,47 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "zstd" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "7.0.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" +checksum = "fa556e971e7b568dc775c136fc9de8c779b1c2fc3a63defaafadffdbd3181afa" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.12+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "0a4e40c320c3cb459d9a9ff6de98cff88f4751ee9275d140e2be94a2b74e4c13" dependencies = [ "cc", "pkg-config", diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 714cd4e67e2c..f1536e8c54b2 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -47,7 +47,7 @@ let owner = "facebook"; repo = "sapling"; rev = version; - hash = "sha256-uzev4x9jY6foop35z4dvUMIfjRtRqhNFDVFpagOosAc"; + hash = "sha256-4pOpJ91esTSH90MvvMu74CnlLULLUawqxcniUeqnLwA="; }; addonsSrc = "${src}/addons"; @@ -55,7 +55,7 @@ let # Fetches the Yarn modules in Nix to to be used as an offline cache yarnOfflineCache = fetchYarnDeps { yarnLock = "${addonsSrc}/yarn.lock"; - sha256 = "sha256-3JFrVk78EiNVLLXkCFbuRnXwYHNfVv1pBPBS1yCHtPU"; + sha256 = "sha256-jCtrflwDrwql6rY1ff1eXLKdwmnXhg5bCJPlCczBCIk="; }; # Builds the NodeJS server that runs with `sl web` @@ -78,11 +78,11 @@ let yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress patchShebangs node_modules + patchShebangs isl/node_modules + + substituteInPlace build-tar.py \ + --replace-fail 'run(yarn + ["--cwd", src_join(), "install", "--prefer-offline"])' 'pass' - # 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' @@ -112,10 +112,10 @@ python3Packages.buildPythonApplication { lockFile = ./Cargo.lock; outputHashes = { "abomonation-0.7.3+smallvec1" = "sha256-AxEXR6GC8gHjycIPOfoViP7KceM29p2ZISIt4iwJzvM="; - "cloned-0.1.0" = "sha256-mzAqjM8qovZAd4ZF0GDuD0Ns/UztAO1pAJhukuKc5a0="; - "fb303_core-0.0.0" = "sha256-x8I0Lty+sRclpkNMqTMc29J46z/vMsVwOUS3EX7Shes="; - "fbthrift-0.0.1+unstable" = "sha256-yTS1wkh8tETZ4K43V0G+TbkN5jgSlXT0endDPBHa1Ps="; - "serde_bser-0.3.1" = "sha256-vvMCa6mlcr+xazxZVl2bcF8/r+ufzZmiQ79KofZGWrA="; + "cloned-0.1.0" = "sha256-2BaNR/pQmR7pHtRf6VBQLcZgLHbj2JCxeX4auAB0efU="; + "fb303_core-0.0.0" = "sha256-PDGdKjR6KPv1uH1JSTeoG5Rs0ZkmNJLqqSXtvV3RWic="; + "fbthrift-0.0.1+unstable" = "sha256-J4REXGuLjHyN3SHilSWhMoqpRcn1QnEtsTsZF4Z3feU="; + "serde_bser-0.4.0" = "sha256-Su1IP3NzQu/87p/+uQaG8JcICL9hit3OV1O9oFiACsQ="; }; }; postPatch = '' diff --git a/pkgs/applications/version-management/sapling/deps.json b/pkgs/applications/version-management/sapling/deps.json index adad0c94afbe..ed3c327ecfbd 100644 --- a/pkgs/applications/version-management/sapling/deps.json +++ b/pkgs/applications/version-management/sapling/deps.json @@ -1,5 +1,5 @@ { "links": [], - "version": "0.2.20240116-133042+8acecb66", - "versionHash": "11094621090461381576" + "version": "0.2.20240718-145624+f4e9df48", + "versionHash": "7014953821350190751" } diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index df5e36228290..43a14907633c 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -116,7 +116,7 @@ let # We need to replace the ssh-askpass-sublime executable because the default one # will not function properly, in order to work it needs to pass an argv[0] to - # the sublime_merge binary, and the built-in version will will try to call the + # the sublime_merge binary, and the built-in version will try to call the # sublime_merge wrapper script which cannot pass through the original argv[0] to # the sublime_merge binary. Thankfully the ssh-askpass-sublime functionality is # very simple and can be replaced with a simple wrapper script. diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix index 6a686d9d2c2a..fb10bff45e33 100644 --- a/pkgs/applications/video/plex-media-player/default.nix +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -7,7 +7,7 @@ let # sandboxed builds, we manually download them and save them so these files # are fetched ahead-of-time instead of during the CMake build. To update # plex-media-player use the update.sh script, so the versions and hashes - # for these files are are also updated! + # for these files are also updated! depSrcs = import ./deps.nix { inherit fetchurl; }; in mkDerivation rec { pname = "plex-media-player"; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index f42eb36e4016..e1540b12b2d4 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -49,7 +49,7 @@ let helpersBin = symlinkJoin { name = "podman-helper-binary-wrapper"; - # this only works for some binaries, others may need to be be added to `binPath` or in the modules + # this only works for some binaries, others may need to be added to `binPath` or in the modules paths = [ gvproxy ] ++ lib.optionals stdenv.isLinux [ diff --git a/pkgs/by-name/ar/arcan/package.nix b/pkgs/by-name/ar/arcan/package.nix index d3eeec5c5838..d472b9f13228 100644 --- a/pkgs/by-name/ar/arcan/package.nix +++ b/pkgs/by-name/ar/arcan/package.nix @@ -41,6 +41,7 @@ valgrind, wayland, wayland-protocols, + wayland-scanner, xcbutil, xcbutilwm, xz, @@ -63,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: { cmake makeWrapper pkg-config + wayland-scanner ] ++ lib.optionals buildManPages [ ruby ]; buildInputs = [ diff --git a/pkgs/by-name/ar/arduino-cli/package.nix b/pkgs/by-name/ar/arduino-cli/package.nix new file mode 100644 index 000000000000..9d887c5f200b --- /dev/null +++ b/pkgs/by-name/ar/arduino-cli/package.nix @@ -0,0 +1,113 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + buildFHSEnv, + installShellFiles, + go-task, +}: + +let + + pkg = buildGoModule rec { + pname = "arduino-cli"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "arduino"; + repo = pname; + rev = "v${version}"; + hash = "sha256-/2GtWiks/d8sTJ6slX2nQtFpGkqm4PSfgDd0uVG+qN8="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + nativeCheckInputs = [ go-task ]; + + subPackages = [ "." ]; + + vendorHash = "sha256-OkilZMDTueHfn6T5Af8e+CVersSPDMcAUUB2o1ny6nc="; + + postPatch = + let + skipTests = [ + # tries to "go install" + "TestDummyMonitor" + # try to Get "https://downloads.arduino.cc/libraries/library_index.tar.bz2" + "TestDownloadAndChecksums" + "TestParseArgs" + "TestParseReferenceCores" + "TestPlatformSearch" + "TestPlatformSearchSorting" + ]; + in + '' + substituteInPlace Taskfile.yml \ + --replace-fail "go test" "go test -p $NIX_BUILD_CORES -skip '(${lib.concatStringsSep "|" skipTests})'" + ''; + + doCheck = stdenv.isLinux; + + checkPhase = '' + runHook preCheck + task go:test + runHook postCheck + ''; + + ldflags = [ + "-s" + "-w" + "-X github.com/arduino/arduino-cli/version.versionString=${version}" + "-X github.com/arduino/arduino-cli/version.commit=unknown" + ] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + export HOME="$(mktemp -d)" + installShellCompletion --cmd arduino-cli \ + --bash <($out/bin/arduino-cli completion bash) \ + --zsh <($out/bin/arduino-cli completion zsh) \ + --fish <($out/bin/arduino-cli completion fish) + unset HOME + ''; + + meta = with lib; { + inherit (src.meta) homepage; + description = "Arduino from the command line"; + mainProgram = "arduino-cli"; + changelog = "https://github.com/arduino/arduino-cli/releases/tag/${version}"; + license = [ + licenses.gpl3Only + licenses.asl20 + ]; + maintainers = with maintainers; [ + ryantm + sfrijters + ]; + }; + + }; + +in +if stdenv.isLinux then + # buildFHSEnv is needed because the arduino-cli downloads compiler + # toolchains from the internet that have their interpreters pointed at + # /lib64/ld-linux-x86-64.so.2 + buildFHSEnv { + inherit (pkg) name meta; + + runScript = "${pkg.outPath}/bin/arduino-cli"; + + extraInstallCommands = + '' + mv $out/bin/$name $out/bin/arduino-cli + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + cp -r ${pkg.outPath}/share $out/share + ''; + passthru.pureGoPkg = pkg; + + targetPkgs = pkgs: with pkgs; [ zlib ]; + } +else + pkg diff --git a/pkgs/by-name/ar/argc/package.nix b/pkgs/by-name/ar/argc/package.nix index 8c286ebff9e6..4e98fd790039 100644 --- a/pkgs/by-name/ar/argc/package.nix +++ b/pkgs/by-name/ar/argc/package.nix @@ -4,6 +4,7 @@ pkgsCross, rustPlatform, stdenv, + glibcLocales, fetchFromGitHub, installShellFiles, }: @@ -13,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "argc"; - version = "1.14.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "argc"; rev = "v${version}"; - hash = "sha256-Li/K5/SLG6JuoRJDz2DQoj1Oi9LQgZWHNvtZ1HVbj88="; + hash = "sha256-I5dx0/aHCGmzgAEBL9gZcG7DFWCkSpndGvv2enQIZGU="; }; - cargoHash = "sha256-D1T9FWTvwKtAYoqFlR2OmLRLGWhPJ9D8J7lq/QKcBoM="; + cargoHash = "sha256-30BY6ceJj0UeZE30O/LovR+YXSd7jIxFo6ojKFuecFM="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional (!canExecuteHost) buildPackages.argc; @@ -37,6 +38,14 @@ rustPlatform.buildRustPackage rec { disallowedReferences = lib.optional (!canExecuteHost) buildPackages.argc; + env = + { + LANG = "C.UTF-8"; + } + // lib.optionalAttrs (glibcLocales != null) { + LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; + }; + passthru = { tests = { cross = diff --git a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix index 0f7ce4b43d11..d55574c0629e 100644 --- a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix @@ -85,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ dbus + dbus-test-runner (python3.withPackages (ps: with ps; [ python-dbusmock ])) diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index 1258e8dc71bd..88b8a4b9fc3a 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -6,7 +6,7 @@ cargo-shear, }: let - version = "1.1.0"; + version = "1.1.1"; in rustPlatform.buildRustPackage { pname = "cargo-shear"; @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage { owner = "Boshen"; repo = "cargo-shear"; rev = "v${version}"; - hash = "sha256-D6O8raELxmcv47vaIa7XSmnPNhrsEx8fIpt/n1dp+8Y="; + hash = "sha256-4HGI0G3fOzj787fXyUMt4XK4KMtrilOJUw1DqRpUoYY="; }; - cargoHash = "sha256-GpEG6yoRTmnjeC74tz6mq6vbG4hnIWbbijIIos7Ng3Y="; + cargoHash = "sha256-sQiWd8onSJMo7+ouCPye7IaGzYp0N3rMC4PZv+/DPt4="; # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23 SHEAR_VERSION = version; diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix index 259e2fe18967..6a1e0b50d893 100644 --- a/pkgs/by-name/ce/cemu/package.nix +++ b/pkgs/by-name/ce/cemu/package.nix @@ -73,6 +73,7 @@ in stdenv.mkDerivation (finalAttrs: { nasm ninja pkg-config + wxGTK32 ]; buildInputs = [ diff --git a/pkgs/by-name/cj/cjs/package.nix b/pkgs/by-name/cj/cjs/package.nix index bb7ab672dbf0..867b6941d5ae 100644 --- a/pkgs/by-name/cj/cjs/package.nix +++ b/pkgs/by-name/cj/cjs/package.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + strictDeps = true; + nativeBuildInputs = [ meson ninja @@ -56,6 +58,10 @@ stdenv.mkDerivation rec { "-Dprofiler=disabled" ]; + postPatch = '' + patchShebangs --build build/choose-tests-locale.sh + ''; + meta = with lib; { homepage = "https://github.com/linuxmint/cjs"; description = "JavaScript bindings for Cinnamon"; diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix index c8414276f3f8..cf13173519ac 100644 --- a/pkgs/by-name/du/dust/package.nix +++ b/pkgs/by-name/du/dust/package.nix @@ -5,13 +5,13 @@ rustPlatform.buildRustPackage rec { # Since then, `dust` has been freed up, allowing this package to take that attribute. # However in order for tools like `nix-env` to detect package updates, keep `du-dust` for pname. pname = "du-dust"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - hash = "sha256-ERcXVLzgurY6vU+exZ5IcM0rPbWrpghDO1m2XwE5i38="; + hash = "sha256-oaDJLDFI193tSzUDqQI/Lvrks0FLYTMLrrwigXwJ+rY="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-ubcfLNiLQ71QcD5YneMD5N1ipsR1GK5GJQ0PrJyv6qI="; + cargoHash = "sha256-o9ynFkdx6a8kHS06NQN7BzWrOIxvdVwnUHmxt4cnmQU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 6f6886fd3847..2e04cd6625a1 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.18.22"; + version = "0.18.23"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-AZTfFMovNZao/zYzXkVZFGuxUnWz41PmJhuzcIPmwZc="; + hash = "sha256-Zwi6YfYhOLZ+RcIH/u1IeUn4Ty9jOvv9R0RTLO8Yi8Q="; }; - cargoHash = "sha256-c35CscrsKrzOpzP00K63VUtNcQOzEvS2412s16O4wHw="; + cargoHash = "sha256-6g9EtHJaUAoIyjiklX/FxlGNZMzh6/mN9Yug35svfrE="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index b5e985b3d45b..0552d7fa16d4 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/pkgs/by-name/fw/fwupd/package.nix @@ -120,7 +120,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "1.9.21"; + version = "1.9.22"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; rev = finalAttrs.version; - hash = "sha256-V3v3lTz3KUt/zEv5BuUcN7S2ZXHPbhYN5vsFPNuxbFY="; + hash = "sha256-skmfTejj9cPdihwPIbsyoSI8ekVNcUXUNMcpPs9uSNo="; }; patches = [ diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix index 4508d30e0407..2733b9231f11 100644 --- a/pkgs/by-name/fz/fzf/package.nix +++ b/pkgs/by-name/fz/fzf/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "fzf"; - version = "0.54.1"; + version = "0.54.2"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf"; rev = "v${version}"; - hash = "sha256-nE4ibYAOH3fgZbpf/tPocXFH6GfialYk/gvLltO8x/w="; + hash = "sha256-9vuz18rosYpkBmJc37CNXEry4OWMSQ03atdCiwY+KYY="; }; vendorHash = "sha256-uhjJPB/jfRPAu9g41vWFnSBIN9TIZW3s6BGz0fA2ygE="; diff --git a/pkgs/applications/audio/g4music/default.nix b/pkgs/by-name/ga/gapless/package.nix similarity index 86% rename from pkgs/applications/audio/g4music/default.nix rename to pkgs/by-name/ga/gapless/package.nix index cbf5aef45c27..9852ab96a125 100644 --- a/pkgs/applications/audio/g4music/default.nix +++ b/pkgs/by-name/ga/gapless/package.nix @@ -14,15 +14,15 @@ , wrapGAppsHook4 }: stdenv.mkDerivation (finalAttrs: { - pname = "g4music"; - version = "3.7.2"; + pname = "gapless"; + version = "3.8"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "neithern"; repo = "g4music"; rev = "v${finalAttrs.version}"; - hash = "sha256-fG8OBAzdCdr3Yo8Vei93HlNa2TIL5gxWG+0jFYjSDZ8="; + hash = "sha256-AZoMAbQ3foW2jx+mBam925a8ykMtGvaiVg9N8/Ggny0="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "g4music"; homepage = "https://gitlab.gnome.org/neithern/g4music"; license = licenses.gpl3Only; - maintainers = with maintainers; [ magnouvean ]; + maintainers = with maintainers; [ aleksana ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index 36df8a7ceac5..ac691786cd1f 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -11,6 +11,7 @@ pam, wayland, wayland-protocols, + wayland-scanner, cairo, file, libjpeg, @@ -37,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config + wayland-scanner ]; buildInputs = [ diff --git a/pkgs/by-name/is/isisdl/package.nix b/pkgs/by-name/is/isisdl/package.nix new file mode 100644 index 000000000000..fc5286e99cad --- /dev/null +++ b/pkgs/by-name/is/isisdl/package.nix @@ -0,0 +1,58 @@ +{ + lib, + fetchPypi, + python3Packages, + util-linux, +}: +python3Packages.buildPythonApplication rec { + pname = "isisdl"; + version = "1.3.20"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-s0vGCJVSa6hf6/sIhzmaxpziP4izoRwcZfxvm//5inY="; + }; + + pyproject = true; + + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ + cryptography + requests + pyyaml + packaging + colorama + pyinotify + distro + psutil + ]; + + pythonRelaxDeps = [ + "cryptography" + "requests" + "packaging" + "distro" + "psutil" + ]; + + buildInputs = [ + util-linux # for runtime dependency `lsblk` + ]; + + # disable tests since they require valid login credentials + doCheck = false; + + meta = { + homepage = "https://github.com/Emily3403/isisdl"; + description = "Downloader for ISIS of TU-Berlin"; + longDescription = '' + A downloading utility for ISIS of TU-Berlin. + Download all your files and videos from ISIS. + ''; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ bchmnn ]; + mainProgram = "isisdl"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix new file mode 100644 index 000000000000..b7c1152d6a56 --- /dev/null +++ b/pkgs/by-name/li/live-server/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + darwin, + openssl, + pkg-config, +}: + +rustPlatform.buildRustPackage rec { + pname = "live-server"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "lomirus"; + repo = "live-server"; + rev = "v${version}"; + hash = "sha256-BSAsD9nRlHaTDbBpLBxN9OOQ9SekRwQeYUWV1CZO4oY="; + }; + + cargoHash = "sha256-RwueYpa/CMriSOWwGZhkps6jHmqOdRuz+ECRq/ThPs0="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + CoreServices + SystemConfiguration + ] + ); + + meta = with lib; { + description = "Local network server with live reload feature for static pages"; + downloadPage = "https://github.com/lomirus/live-server/releases"; + homepage = "https://github.com/lomirus/live-server"; + license = licenses.mit; + mainProgram = "live-server"; + maintainers = [ maintainers.philiptaron ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 210df98acce3..69ee327cae06 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -23,6 +23,7 @@ , metalSupport ? stdenv.isDarwin && stdenv.isAarch64 && !openclSupport , vulkanSupport ? false , rpcSupport ? false +, shaderc , vulkan-headers , vulkan-loader , ninja @@ -61,6 +62,7 @@ let ]; vulkanBuildInputs = [ + shaderc vulkan-headers vulkan-loader ]; diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 65476444794d..29ccfb28358c 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -21,7 +21,8 @@ let qtbase qtmultimedia qtwayland - wrapQtAppsHook; + wrapQtAppsHook + ; in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; @@ -40,38 +41,45 @@ stdenv.mkDerivation (finalAttrs: { wrapQtAppsHook ]; - buildInputs = [ - SDL2 - extra-cmake-modules - libarchive - libslirp - libGL - qtbase - qtmultimedia - zstd - ] ++ lib.optionals stdenv.isLinux [ - wayland - qtwayland - ]; + buildInputs = + [ + SDL2 + extra-cmake-modules + libarchive + libslirp + libGL + qtbase + qtmultimedia + zstd + ] + ++ lib.optionals stdenv.isLinux [ + wayland + qtwayland + ]; - cmakeFlags = [ - (lib.cmakeBool "USE_QT6" true) - ]; + cmakeFlags = [ (lib.cmakeBool "USE_QT6" true) ]; strictDeps = true; - qtWrapperArgs = lib.optionals stdenv.isLinux [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}" - ] ++ lib.optionals stdenv.isDarwin [ - "--prefix DYLD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}" - ]; + qtWrapperArgs = + lib.optionals stdenv.isLinux [ + "--prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + libpcap + wayland + ] + }" + ] + ++ lib.optionals stdenv.isDarwin [ + "--prefix DYLD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}" + ]; installPhase = lib.optionalString stdenv.isDarwin '' runHook preInstall mkdir -p $out/Applications cp -r melonDS.app $out/Applications/ runHook postInstall - ''; + ''; passthru = { updateScript = unstableGitUpdater { }; diff --git a/pkgs/by-name/mo/mouse_m908/package.nix b/pkgs/by-name/mo/mouse_m908/package.nix index e41e9de62cbf..905b8fb1ef1e 100644 --- a/pkgs/by-name/mo/mouse_m908/package.nix +++ b/pkgs/by-name/mo/mouse_m908/package.nix @@ -4,14 +4,12 @@ , installShellFiles , fetchFromGitHub , pkg-config -}: stdenv.mkDerivation (finalAttrs: { - name = "mouse_m908"; +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mouse_m908"; version = "3.4"; - nativeBuildInputs = [ pkg-config installShellFiles ]; - - buildInputs = [ libusb1.dev ]; - src = fetchFromGitHub { owner = "dokutan"; repo = "mouse_m908"; @@ -19,6 +17,10 @@ sha256 = "sha256-sCAvjNpJYkp4G0KkDJtHOBR1vc80DZJtWR2W9gakkzQ="; }; + nativeBuildInputs = [ pkg-config installShellFiles ]; + + buildInputs = [ libusb1 ]; + # Uses proper nix directories rather than the ones specified in the makefile installPhase = '' runHook preInstall @@ -28,11 +30,11 @@ $out/share/doc/mouse_m908 \ $out/lib/udev/rules.d - cp mouse_m908 $out/bin/mouse_m908 && \ - cp mouse_m908.rules $out/lib/udev/rules.d && \ - cp examples/* $out/share/doc/mouse_m908 && \ - cp README.md $out/share/doc/mouse_m908 && \ - cp keymap.md $out/share/doc/mouse_m908 && \ + cp mouse_m908 $out/bin/mouse_m908 + cp mouse_m908.rules $out/lib/udev/rules.d + cp examples/* $out/share/doc/mouse_m908 + cp README.md $out/share/doc/mouse_m908 + cp keymap.md $out/share/doc/mouse_m908 installManPage mouse_m908.1 runHook postInstall diff --git a/pkgs/by-name/ne/nextpnr/package.nix b/pkgs/by-name/ne/nextpnr/package.nix index 49c86cfc2ab3..9b00d388b578 100644 --- a/pkgs/by-name/ne/nextpnr/package.nix +++ b/pkgs/by-name/ne/nextpnr/package.nix @@ -40,10 +40,10 @@ stdenv.mkDerivation rec { sourceRoot = main_src.name; nativeBuildInputs - = [ cmake ] + = [ cmake python3 ] ++ (lib.optional enableGui wrapQtAppsHook); buildInputs - = [ boostPython python3 eigen python3Packages.apycula ] + = [ boostPython eigen python3Packages.apycula ] ++ (lib.optional enableGui qtbase) ++ (lib.optional stdenv.cc.isClang llvmPackages.openmp); diff --git a/pkgs/by-name/no/nomnatong/package.nix b/pkgs/by-name/no/nomnatong/package.nix index 5f2b3f69b719..f0107ff16bf8 100644 --- a/pkgs/by-name/no/nomnatong/package.nix +++ b/pkgs/by-name/no/nomnatong/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "nomnatong"; - version = "5.10"; + version = "5.11"; src = fetchFromGitHub { owner = "nomfoundation"; repo = "font"; rev = "v${finalAttrs.version}"; - hash = "sha256-e7LT6lwm4jbqL+mtvfZsCC7F6KOVYD/lAGRPAgyyMxc="; + hash = "sha256-LaMggMZIehQynA6tokOte28bbV3H0kagJRsbE8ZczsM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/nr/nrr/package.nix b/pkgs/by-name/nr/nrr/package.nix index 5585d081322e..e92704479ac7 100644 --- a/pkgs/by-name/nr/nrr/package.nix +++ b/pkgs/by-name/nr/nrr/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "nrr"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "ryanccn"; repo = "nrr"; rev = "v${version}"; - hash = "sha256-P1LJFVe2MUkvKFP4XJvuFup9JKPv9Y2uWfoi8/N7JUo="; + hash = "sha256-X1zgQvgjWbTQAOHAZ+G2u0yO+qeiU0hamTLM39VOK20="; }; - cargoHash = "sha256-owj5rzqtlbMMc84u5so0QbEzd2vnWk3KyM/A9ChxoVw="; + cargoHash = "sha256-NpvYN68l5wibrFxST35sWDBbUG1mauNszA8NYIWGGa0="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation diff --git a/pkgs/by-name/op/opencomposite/package.nix b/pkgs/by-name/op/opencomposite/package.nix index cc9929d392ba..db42ea0f9f78 100644 --- a/pkgs/by-name/op/opencomposite/package.nix +++ b/pkgs/by-name/op/opencomposite/package.nix @@ -1,37 +1,35 @@ -{ lib -, stdenv -, fetchFromGitLab - -, cmake - -, glm -, libGL -, openxr-loader -, python3 -, vulkan-headers -, vulkan-loader -, xorg - -, unstableGitUpdater +{ + cmake, + fetchFromGitLab, + glm, + jsoncpp, + lib, + libGL, + openxr-loader, + python3, + stdenv, + unstableGitUpdater, + vulkan-headers, + vulkan-loader, + xorg, }: stdenv.mkDerivation { pname = "opencomposite"; - version = "0-unstable-2024-06-12"; + version = "0-unstable-2024-07-23"; src = fetchFromGitLab { owner = "znixian"; repo = "OpenOVR"; - rev = "de1658db7e2535fd36c2e37fa8dd3d756280c86f"; - hash = "sha256-xyEiuEy3nt2AbF149Pjz5wi/rkTup2SgByR4DrNOJX0="; + rev = "632e5cc50b913e93194ca2970e6f13021182579f"; + hash = "sha256-KQmNyGRlbUrntTPNn5rzTyyR+Bvh3EfSqBgyNGGDo04="; }; - nativeBuildInputs = [ - cmake - ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ glm + jsoncpp libGL openxr-loader python3 @@ -41,19 +39,11 @@ stdenv.mkDerivation { ]; cmakeFlags = [ + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-error=format-security") (lib.cmakeBool "USE_SYSTEM_OPENXR" true) (lib.cmakeBool "USE_SYSTEM_GLM" true) ]; - # NOTE: `cmakeFlags` will get later tokenized by bash and there is no way - # of inserting a flag value with a space in it (inserting `"` or `'` won't help). - # https://discourse.nixos.org/t/cmakeflags-and-spaces-in-option-values/20170/2 - preConfigure = '' - cmakeFlagsArray+=( - "-DCMAKE_CXX_FLAGS=-DGLM_ENABLE_EXPERIMENTAL -Wno-error=format-security" - ) - ''; - installPhase = '' runHook preInstall mkdir -p $out/lib/opencomposite @@ -66,10 +56,10 @@ stdenv.mkDerivation { branch = "openxr"; }; - meta = with lib; { + meta = { description = "Reimplementation of OpenVR, translating calls to OpenXR"; homepage = "https://gitlab.com/znixian/OpenOVR"; - license = with licenses; [ gpl3Only ]; - maintainers = with maintainers; [ Scrumplex ]; + license = with lib.licenses; [ gpl3Only ]; + maintainers = with lib.maintainers; [ Scrumplex ]; }; } diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix index 09514490ebf9..b0881fe10e05 100644 --- a/pkgs/by-name/op/openscad-unstable/package.nix +++ b/pkgs/by-name/op/openscad-unstable/package.nix @@ -41,15 +41,16 @@ let # get cccl from source to avoid license issues nvidia-cccl = clangStdenv.mkDerivation { pname = "nvidia-cccl"; - # note that v2.2.0 has some cmake issues - version = "2.2.0-unstable-2024-01-26"; + # note, after v2.2.0, manifold dependency fails with some swap() ambiguities + version = "2.2.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "cccl"; fetchSubmodules = true; - rev = "0c9d03276206a5f59368e908e3d643610f9fddcd"; - hash = "sha256-f11CNfa8jF9VbzvOoX1vT8zGIJL9cZ/VBpiklUn0YdU="; + rev = "v2.2.0"; + hash = "sha256-azHDAuK0rAHrH+XkN3gHDrbwZOclP3zbEMe8VRpMjDQ="; }; + patches = [ ./thrust-cmake.patch ]; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ tbb_2021_11 ]; cmakeFlags = [ @@ -81,12 +82,12 @@ in # clang consume much less RAM than GCC clangStdenv.mkDerivation rec { pname = "openscad-unstable"; - version = "2024-03-10"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "db167b1df31fbd8a2101cf3a13dac148b0c2165d"; - hash = "sha256-i2ZGYsNfMLDi3wRd/lohs9BuO2KuQ/7kJIXGtV65OQU="; + rev = "48f4430b12c29a95ab89ffdd8307205d7189421c"; + hash = "sha256-A75JHmWVNlgURb5one5JFkztCrVff2RbyaDaObUp4ZY="; fetchSubmodules = true; }; patches = [ ./test.diff ]; diff --git a/pkgs/by-name/op/openscad-unstable/thrust-cmake.patch b/pkgs/by-name/op/openscad-unstable/thrust-cmake.patch new file mode 100644 index 000000000000..56422f099218 --- /dev/null +++ b/pkgs/by-name/op/openscad-unstable/thrust-cmake.patch @@ -0,0 +1,13 @@ +diff --git a/thrust/thrust/cmake/thrust-header-search.cmake.in b/thrust/thrust/cmake/thrust-header-search.cmake.in +index 8529d89fe..94879ee01 100644 +--- a/thrust/thrust/cmake/thrust-header-search.cmake.in ++++ b/thrust/thrust/cmake/thrust-header-search.cmake.in +@@ -7,7 +7,6 @@ set(from_install_prefix "@from_install_prefix@") + find_path(_THRUST_VERSION_INCLUDE_DIR thrust/version.h + NO_CMAKE_FIND_ROOT_PATH # Don't allow CMake to re-root the search + NO_DEFAULT_PATH # Only search explicit paths below: +- PATHS +- "${CMAKE_CURRENT_LIST_DIR}/${from_install_prefix}/@CMAKE_INSTALL_INCLUDEDIR@" ++ PATHS "@CMAKE_INSTALL_INCLUDEDIR@" + ) + set_property(CACHE _THRUST_VERSION_INCLUDE_DIR PROPERTY TYPE INTERNAL) diff --git a/pkgs/by-name/op/opentelemetry-cpp/package.nix b/pkgs/by-name/op/opentelemetry-cpp/package.nix index 5efc256b5467..97a7af508fb6 100644 --- a/pkgs/by-name/op/opentelemetry-cpp/package.nix +++ b/pkgs/by-name/op/opentelemetry-cpp/package.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "opentelemetry-cpp"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-rMqNz8F/ahgDtQiLsswckd2jQPR9FTeSZKRFz2jWVoo="; + hash = "sha256-31zwIZ4oehhfn+oCyg8VQTurPOmdgp72plH1Pf/9UKQ="; }; patches = [ diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index 9e2b4d5f490d..58d26335599a 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -8,11 +8,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-pass"; - version = "1.20.1"; + version = "1.20.2"; src = fetchurl { url = "https://proton.me/download/PassDesktop/linux/x64/ProtonPass_${finalAttrs.version}.deb"; - hash = "sha256-G14/gVevvccV8ILPr701IP8krR2/mOnRn0icCP1Hi4s="; + hash = "sha256-4QSBKVnEH7yDXwqY+29/a+yWv89i/TVCYO26V95KA4s="; }; dontConfigure = true; diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index 8d53e6cd0a38..f9d8679b2104 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -1,13 +1,13 @@ { lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }: let - version = "1.1.370"; + version = "1.1.373"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; rev = "${version}"; - hash = "sha256-IYQ6HUEaT3KjMcFeWal4Ru2A/Kxf7sAMZ1p48l9RQ2o="; + hash = "sha256-TMQ9ttWUDwf7Lp2JOwpIu4Bn3TbioXxkCPpEZiPDPyk="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -37,7 +37,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-P57+FEyjsHXwZ3A91bfecCuXvkrrwqsRHMjV3oGt1Nw="; + npmDepsHash = "sha256-BsfhbfhjHIlip3IiOJewjVD6Eq4bgr+Yo81rvIrJr7E="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -51,7 +51,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-tLRSGuJMKAKvTsmERI7SyQXamAJPi/h4P/wQEo4HdtY="; + npmDepsHash = "sha256-cZhNkQjO1dAghXNoVCF0NQEi9QjXci626Ck9PXntoYA="; postPatch = '' chmod +w ../../ diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/by-name/re/remind/package.nix similarity index 55% rename from pkgs/tools/misc/remind/default.nix rename to pkgs/by-name/re/remind/package.nix index 51448931dcfb..52d4336e7006 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/by-name/re/remind/package.nix @@ -1,32 +1,41 @@ -{ lib -, stdenv -, fetchurl -, tk -, tcllib -, tcl -, tkremind ? true +{ + lib, + stdenv, + fetchurl, + tk, + tcllib, + tcl, + tkremind ? null, + withGui ? + if tkremind != null then + lib.warn "tkremind is deprecated and should be removed; use withGui instead." tkremind + else + true, }: tcl.mkTclDerivation rec { pname = "remind"; - version = "05.00.01"; + version = "05.00.02"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - hash = "sha256-tj36/lLn67/hkNMrRVGXRLqQ9Sx6oDKZHeajiSYn97c="; + hash = "sha256-XxVjAV3TGDPI8XaFXXSminsMffq8m8ljw68YMIC2lYg="; }; - propagatedBuildInputs = lib.optionals tkremind [ tcllib tk ]; + propagatedBuildInputs = lib.optionals withGui [ + tcllib + tk + ]; - postPatch = lib.optionalString tkremind '' + postPatch = lib.optionalString withGui '' # NOTA BENE: The path to rem2pdf is replaced in tkremind for future use # as rem2pdf is currently not build since it requires the JSON::MaybeXS, # Pango and Cairo Perl modules. substituteInPlace scripts/tkremind \ - --replace-fail "exec wish" "exec ${lib.getBin tk}/bin/wish" \ - --replace-fail 'set Remind "remind"' "set Remind \"$out/bin/remind\"" \ - --replace-fail 'set Rem2PS "rem2ps"' "set Rem2PS \"$out/bin/rem2ps\"" \ - --replace-fail 'set Rem2PDF "rem2pdf"' "set Rem2PDF \"$out/bin/rem2pdf\"" + --replace-fail "exec wish" "exec ${lib.getExe' tk "wish"}" \ + --replace-fail 'set Remind "remind"' 'set Remind "$out/bin/remind"' \ + --replace-fail 'set Rem2PS "rem2ps"' 'set Rem2PS "$out/bin/rem2ps"' \ + --replace-fail 'set Rem2PDF "rem2pdf"' 'set Rem2PDF "$out/bin/rem2pdf"' ''; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [ @@ -42,7 +51,10 @@ tcl.mkTclDerivation rec { homepage = "https://dianne.skoll.ca/projects/remind/"; description = "Sophisticated calendar and alarm program for the console"; license = licenses.gpl2Only; - maintainers = with maintainers; [ raskin kovirobi ]; + maintainers = with maintainers; [ + raskin + kovirobi + ]; mainProgram = "remind"; platforms = platforms.unix; }; diff --git a/pkgs/by-name/re/resticprofile/package.nix b/pkgs/by-name/re/resticprofile/package.nix new file mode 100644 index 000000000000..2903a9987833 --- /dev/null +++ b/pkgs/by-name/re/resticprofile/package.nix @@ -0,0 +1,91 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + restic, + bash, + testers, + resticprofile, +}: + +buildGoModule rec { + pname = "resticprofile"; + version = "0.27.0"; + + src = fetchFromGitHub { + owner = "creativeprojects"; + repo = "resticprofile"; + rev = "refs/tags/v${version}"; + hash = "sha256-CUTDlSpP0ztr3sEKT0ppFnWx/bcVuY1oIKWJNZylDoM="; + }; + + postPatch = '' + substituteInPlace schedule_jobs.go \ + --replace-fail "os.Executable()" "\"$out/bin/resticprofile\", nil" + + substituteInPlace shell/command.go \ + --replace-fail '"bash"' '"${lib.getExe bash}"' + + substituteInPlace filesearch/filesearch.go \ + --replace-fail 'paths := getSearchBinaryLocations()' 'return "${lib.getExe restic}", nil; paths := getSearchBinaryLocations()' + + ''; + + vendorHash = "sha256-t2R5uNsliSn+rIvRM0vT6lQJY62DhhozXnONiCJ9CMc="; + + ldflags = [ + "-X main.commit=${src.rev}" + "-X main.date=unknown" + "-X main.builtBy=nixpkgs" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + preCheck = '' + rm battery_test.go # tries to get battery data + rm update_test.go # tries to use network + rm lock/lock_test.go # needs ping + rm preventsleep/caffeinate_test.go # tries to communicate with dbus + rm priority/ioprio_test.go # tries to set nice(2) IO priority + rm restic/downloader_test.go # tries to use network + rm schedule/schedule_test.go # tries to use systemctl + + # `config/path_test.go` expects `$HOME` to be the same as `~nixbld` which is `$NIX_BUILD_TOP` + export HOME="$NIX_BUILD_TOP" + # `util/tempdir_test.go` expects `$HOME/.cache` to exist + mkdir "$HOME/.cache" + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 $GOPATH/bin/resticprofile -t $out/bin + + installShellCompletion --cmd resticprofile \ + --bash <($out/bin/resticprofile generate --bash-completion) \ + --zsh <($out/bin/resticprofile generate --zsh-completion) + + runHook postInstall + ''; + + passthru = { + tests.version = testers.testVersion { + package = resticprofile; + command = "resticprofile version"; + }; + }; + + meta = { + changelog = "https://github.com/creativeprojects/resticprofile/releases/tag/v${version}"; + description = "Configuration profiles manager for restic backup"; + homepage = "https://creativeprojects.github.io/resticprofile/"; + license = with lib.licenses; [ + gpl3Only + lgpl3 # bash shell completion + ]; + mainProgram = "resticprofile"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/ri/ricochet-refresh/package.nix b/pkgs/by-name/ri/ricochet-refresh/package.nix index e0e55bb8c515..8bbc781bb4f5 100644 --- a/pkgs/by-name/ri/ricochet-refresh/package.nix +++ b/pkgs/by-name/ri/ricochet-refresh/package.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config + protobuf cmake qt5.wrapQtAppsHook ]; diff --git a/pkgs/by-name/ti/tippecanoe/package.nix b/pkgs/by-name/ti/tippecanoe/package.nix index c0da90796860..b588212f6f73 100644 --- a/pkgs/by-name/ti/tippecanoe/package.nix +++ b/pkgs/by-name/ti/tippecanoe/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.56.0"; + version = "2.57.0"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-n1ZhOlhrI1cSOwv7NP2VDAPC/2HmMJBkNLH6NPY3BnM="; + hash = "sha256-IFyewy/is5BNJ7/LzhHXLwLaSrMAJ6II1aSY9AspEk4="; }; buildInputs = [ sqlite zlib ]; diff --git a/pkgs/by-name/to/toolong/package.nix b/pkgs/by-name/to/toolong/package.nix new file mode 100644 index 000000000000..264aa4f7dfaf --- /dev/null +++ b/pkgs/by-name/to/toolong/package.nix @@ -0,0 +1,45 @@ +{ + lib, + python311Packages, + fetchFromGitHub, + testers, + toolong, +}: + +python311Packages.buildPythonApplication rec { + pname = "toolong"; + version = "1.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Textualize"; + repo = "toolong"; + rev = "refs/tags/v${version}"; + hash = "sha256-Zd6j1BIrsLJqptg7BXb67qY3DaeHRHieWJoYYCDHaoc="; + }; + + build-system = [ python311Packages.poetry-core ]; + dependencies = with python311Packages; [ + click + textual + typing-extensions + ]; + + pythonRelaxDeps = [ "textual" ]; + + pythonImportsCheck = [ "toolong" ]; + doCheck = false; # no tests + + passthru.tests.version = testers.testVersion { + package = toolong; + command = "${lib.getExe toolong} --version"; + }; + + meta = with lib; { + description = "Terminal application to view, tail, merge, and search log files (plus JSONL)"; + license = licenses.mit; + homepage = "https://github.com/textualize/toolong"; + maintainers = with maintainers; [ sigmanificient ]; + mainProgram = "tl"; + }; +} diff --git a/pkgs/by-name/tt/ttf-indic/package.nix b/pkgs/by-name/tt/ttf-indic/package.nix new file mode 100644 index 000000000000..52c980660c89 --- /dev/null +++ b/pkgs/by-name/tt/ttf-indic/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenvNoCC, + fetchurl, +}: + +stdenvNoCC.mkDerivation rec { + pname = "ttf-indic"; + version = "0.2"; + + src = fetchurl { + url = "https://www.indlinux.org/downloads/files/indic-otf-${version}.tar.gz"; + hash = "sha256-ZFmg1JanAf3eeF7M+yohrXYSUb0zLgNSFldEMzkhXnI="; + }; + + installPhase = '' + runHook preInstall + + install -m444 -Dt $out/share/fonts/truetype OpenType/*.ttf + + runHook postInstall + ''; + + meta = { + homepage = "https://www.indlinux.org/wiki/index.php/Downloads"; + description = "Indic Opentype Fonts collection"; + license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.akssri ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/ur/urban-cli/package.nix b/pkgs/by-name/ur/urban-cli/package.nix new file mode 100644 index 000000000000..fb05c8e7686e --- /dev/null +++ b/pkgs/by-name/ur/urban-cli/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "urban-cli"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "tfkhdyt"; + repo = "urban-cli"; + rev = "v${version}"; + hash = "sha256-URTEhtOiwb3IDyjRUtUmVTaeDXw4Beg0woWdGxeq098="; + }; + + vendorHash = "sha256-fEZzX+ecSWKITXczcwm5BGw5OWuixa4XKrEx8z0pxXQ="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "Blazingly fast command line interface for Urban Dictionary"; + homepage = "https://github.com/tfkhdyt/urban-cli"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ tfkhdyt ]; + mainProgram = "urban-cli"; + }; +} diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index 0c6f291835a5..72ad80374b96 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 = "1.0-unstable-2024-06-15"; + version = "1.0-unstable-2024-07-26"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "1c74aa173147b19135f1bf21af5fb30f9b76e02d"; - hash = "sha256-xhMXDAc/laQKZtYBFvFSyVtJv5AkvugV8olHmB6Mt4g="; + rev = "bf10311d5aad4184098c84a96845e30b1f53634d"; + hash = "sha256-OVITP8AbWchcFaVOHkck8hwGlEl/TgtbtkApoKex4ig="; }; outputs = [ "out" "projects" ]; diff --git a/pkgs/by-name/wi/wiremock/package.nix b/pkgs/by-name/wi/wiremock/package.nix index bd8300483052..75e4c30f64b4 100644 --- a/pkgs/by-name/wi/wiremock/package.nix +++ b/pkgs/by-name/wi/wiremock/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "wiremock"; - version = "3.8.0"; + version = "3.9.1"; src = fetchurl { url = "mirror://maven/org/wiremock/wiremock-standalone/${finalAttrs.version}/wiremock-standalone-${finalAttrs.version}.jar"; - hash = "sha256-cEsa2xg8ZDb5/LQO5Gj+LCuV18D+LbEK7nrGT+cm158="; + hash = "sha256-cjqIDVDTsKFFrw3wfleMLLhed/6yIx5pkcmhNmkmkSw="; }; dontUnpack = true; diff --git a/pkgs/by-name/xm/xmldiff/package.nix b/pkgs/by-name/xm/xmldiff/package.nix index 1cacb6ac278c..dc0885a71f3f 100644 --- a/pkgs/by-name/xm/xmldiff/package.nix +++ b/pkgs/by-name/xm/xmldiff/package.nix @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication { computer readable data, it is also often used as a format for hierarchical data that can be rendered into human readable formats. A traditional diff on such a format would tell you line by line the differences, but this - would not be be readable by a human. xmldiff provides tools to make human + would not be readable by a human. xmldiff provides tools to make human readable diffs in those situations. ''; license = lib.licenses.mit; diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix index 587bbccdbacc..08960e07be13 100644 --- a/pkgs/by-name/ya/yamlscript/package.nix +++ b/pkgs/by-name/ya/yamlscript/package.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "yamlscript"; - version = "0.1.66"; + version = "0.1.68"; src = fetchurl { url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar"; - hash = "sha256-FsSMH4kdfMjWe3sMsCkdTf5bhYX0abqGOQvNdHYBu80="; + hash = "sha256-NeiG8o5Le549kYILw9vA1EmQ1PcHjCAdwQAnKdYNMwk="; }; executable = "ys"; diff --git a/pkgs/data/fonts/font-awesome/default.nix b/pkgs/data/fonts/font-awesome/default.nix index 8705a07d2593..f0622f56cd95 100644 --- a/pkgs/data/fonts/font-awesome/default.nix +++ b/pkgs/data/fonts/font-awesome/default.nix @@ -1,35 +1,48 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: let - font-awesome = { version, hash, rev ? version }: stdenvNoCC.mkDerivation { - pname = "font-awesome"; - inherit version; + font-awesome = + { + version, + hash, + rev ? version, + }: + stdenvNoCC.mkDerivation { + pname = "font-awesome"; + inherit version; - src = fetchFromGitHub { - owner = "FortAwesome"; - repo = "Font-Awesome"; - inherit rev hash; - }; + src = fetchFromGitHub { + owner = "FortAwesome"; + repo = "Font-Awesome"; + inherit rev hash; + }; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - install -m444 -Dt $out/share/fonts/opentype {fonts,otfs}/*.otf + install -m444 -Dt $out/share/fonts/opentype {fonts,otfs}/*.otf - runHook postInstall - ''; - - meta = with lib; { - description = "Font Awesome - OTF font"; - longDescription = '' - Font Awesome gives you scalable vector icons that can instantly be customized. - This package includes only the OTF font. For full CSS etc. see the project website. + runHook postInstall ''; - homepage = "https://fontawesome.com/"; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ abaldeau johnazoidberg ]; + + meta = with lib; { + description = "Font Awesome - OTF font"; + longDescription = '' + Font Awesome gives you scalable vector icons that can instantly be customized. + This package includes only the OTF font. For full CSS etc. see the project website. + ''; + homepage = "https://fontawesome.com/"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ + abaldeau + johnazoidberg + ]; + }; }; - }; in { # Keeping version 4 and 5 because version 6 is incompatible for some icons. That @@ -48,7 +61,7 @@ in hash = "sha256-gd23ZplNY56sm1lfkU3kPXUOmNmY5SRnT0qlQZRNuBo="; }; v6 = font-awesome { - version = "6.5.2"; - hash = "sha256-kUa/L/Krxb5v8SmtACCSC6CI3qTTOTr4Ss/FMRBlKuw="; + version = "6.6.0"; + hash = "sha256-tQ9Hxph5YiPZMiO9gs2HCkRJ8cdECa2swgS++cytEnM="; }; } diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index baf96a2a795b..944c92c0506c 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "30.3.2"; + version = "30.3.3"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index f6c92246baf9..40487bceb6b9 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,93 +1,93 @@ # This file was autogenerated. DO NOT EDIT! { - Iosevka = "1d8ial7bmqwg7msmz5gqfddfp0dnqck9v02h8ghjnkf3gwc1myn1"; - IosevkaAile = "1wl05qa21rzbir80ig4li7mym9w8gbx7fnxi3mm4g6r32a397p4v"; - IosevkaCurly = "1anyvcixknxf9vld83yv7w2mn63rvmanq1a1hy3kgjyk9d67gxfi"; - IosevkaCurlySlab = "01byfnvyypacwk5mmlhzz769d6l81z4px5ywn2m9zrphcfvvy42k"; - IosevkaEtoile = "1k6s4x7j9yiv62lc4bxp122x13b126xgy0d8jz4fyawnzzcqwadq"; - IosevkaSlab = "0rq1gdrz89vlvk41wmlghfnlkmfrwl18lh1glki87wkpyc303wnz"; - IosevkaSS01 = "1yfbangcfqmf8k5iw7if9zgb4f4rxr60wyi2gah79bab4aamqifd"; - IosevkaSS02 = "1qpdkr9qw0n04j80gi8x6w0qn7z3s71lg1asxpg11jpba6hqb57y"; - IosevkaSS03 = "12jwd3falkl58dhn2bdr01s08s9cxff20apfz2p29245arb7gppz"; - IosevkaSS04 = "1k4kq83cnxm3sprzrx8gbqf7vhlrs8hcaby7iw5llzrf3nyh7ipq"; - IosevkaSS05 = "0bfr9ngicz01jlmcrcsw173h33bp2xc9c7p6bcb86gf6fgqq38rw"; - IosevkaSS06 = "13whqch4mf5zznq30xya240qsi8zsd2s56zl4df86vfzv4l5yr4v"; - IosevkaSS07 = "19q0pi54ch3bsw3h5bngk57rj8p6pm4h6zzq08avcwzid3cz4rik"; - IosevkaSS08 = "0j7lrj3hzcc7j3hz6p2pnh5fjf5ajgmsmbzac7fa23j5mhg71vi6"; - IosevkaSS09 = "143gj6mzwn7267h8dp8p8cm0yqq2kjm8gdyf6v9pdr3yq3g0dmwy"; - IosevkaSS10 = "1v94gf7rbapf7rp2r9yb11k2qqxn4p5cdb0fbws0wshhjd2akb09"; - IosevkaSS11 = "049z96078fl98kidp6mm3535d9fq53jmipz51hsz64ba91azj82l"; - IosevkaSS12 = "0f827rvzndzkb5w69piydd6vygmzj7gkaffk0wnh1ksz561x4nmc"; - IosevkaSS13 = "1mrrl8szsmnxyys9r5y6a6ziagrcrvgikw845whs25p6v2vrz7ag"; - IosevkaSS14 = "088sga3clabsffwd2asdxcn0nzn2jm4njp3sf7rfi9xrcy4nvwrr"; - IosevkaSS15 = "08p7zaj977yssn2x7rd00ij9j53jg1322ni36a4narhsbikms32j"; - IosevkaSS16 = "12zbdlpnvp9cx2x0x7xr929z0qxk3w4waam5m54ycrkjkx5qbjzb"; - IosevkaSS17 = "1b57w2zqplrfjhxd4ylwl6gbzza3msyccm843v90yhzyazdhbl30"; - IosevkaSS18 = "1wi65nlw0ag2haqcjikvw2vzgpy7n60cqnh0c06dfvvv8b499k3i"; - SGr-Iosevka = "01hisr1h4ipxhcaqbvyq1cbwmwi5l74q8k0k3smc0b66icar3yqx"; - SGr-IosevkaCurly = "166mhny2kl4cfpaiid1dqmjr6pm9di1cf7n1v998ddzdz8i4jnyi"; - SGr-IosevkaCurlySlab = "0c3argr2dsg9z9xjpl6rhnvarz6mbhi8ar1d0w937l1sj4rnqs7w"; - SGr-IosevkaFixed = "0wrw3swn07w907x7hwq0mciki07dhqzr0zdkirq2f61a87hdfkl8"; - SGr-IosevkaFixedCurly = "12nycck76j9aj6n052f2s2ygfhvn3r2xscnpl757klhfvzfcdvjy"; - SGr-IosevkaFixedCurlySlab = "032jax5aj0k0qdqa3184xqnczsvsqkw15z5dpygxbnrz6s0s7999"; - SGr-IosevkaFixedSlab = "1lv6ys56m5fry5ngzn1gjipi75a1ivcszlx4dywriasmqg84b16x"; - SGr-IosevkaFixedSS01 = "1cbjx7a721a7vinrrz7wcq2hzkqjhwwvipny061p6m6fsci5pnzz"; - SGr-IosevkaFixedSS02 = "02rqfz0b8pfny2np4cv9ba4f1bv1ciplxhpjf67c3q80vlgljmcr"; - SGr-IosevkaFixedSS03 = "089w4r5xv4xvcr4id2nl78syak83zx7qzbg7kl4bm50n7xfm794w"; - SGr-IosevkaFixedSS04 = "0cgadjx4gxlhqd93lnq87y201qpcf1v6v8sqnkwv0az5biil7pbc"; - SGr-IosevkaFixedSS05 = "146v7y49gg0jb5x6isqsmjandq5ya4nil0zcmiadqxrmyhx40lvh"; - SGr-IosevkaFixedSS06 = "1x9lykvkhjzz084i7ndq5gpd2hy2s19vqyvrgja79qddifir3k3k"; - SGr-IosevkaFixedSS07 = "1b0m46c4kq639y0csckd5f6hcl9d9i6b0745i8aynfhla2wva3j9"; - SGr-IosevkaFixedSS08 = "0ysy7xiismi3pr7sk3b9nn4nh1dw6jr5l0wllvj30f8rh8z05a0s"; - SGr-IosevkaFixedSS09 = "1b36n1lv6c5k2asv4xrcmgyc09n704slfbzsi4g2q20c032nax1l"; - SGr-IosevkaFixedSS10 = "1f1gscpfzqghmmdygvy5v39vj38rsi4k1hx3dp4zl08nbvfic0rb"; - SGr-IosevkaFixedSS11 = "1vxy002j4vqi8xqpm551kw804j8vllsw1hs3p4xfqn8qfkqklb3v"; - SGr-IosevkaFixedSS12 = "1w4r2w60d962f48xlyg3yfl6q4fn90cwmfjpgf1nlhnpalcpqq99"; - SGr-IosevkaFixedSS13 = "16bh6wa06nybqg017hp2k35dphxh1sqzzqnspqkkkssp0pqrljl3"; - SGr-IosevkaFixedSS14 = "15jwzgjcsy6agvacn4xz46ijkkwxsgsr5nbvsbhxa3al0yhbkl89"; - SGr-IosevkaFixedSS15 = "036aph9qixsrb657n6qzckcbcpf6rswyc945j8m94rx4lar6k10r"; - SGr-IosevkaFixedSS16 = "0hx2vz7lpfbxhvs3g8psmlfywzmjksxr5s0d36m4mnga90scwjiw"; - SGr-IosevkaFixedSS17 = "1s5hl874bskix5vdxz0w37wmqf5yj633k779gccyq5mlwy9yjmrl"; - SGr-IosevkaFixedSS18 = "1zbmpkm17vcrg53qv8sqcpasc97hlz4lh2i0pjz58qsidfsqhcgr"; - SGr-IosevkaSlab = "1lhfhag73bhpfzr5fapgcn68awjzk960dc08481p3qb4aphqczlw"; - SGr-IosevkaSS01 = "15j23226497zvsk8s9dkgh1dbxjxcc1mdqpc9p7868vl4qjgcyg6"; - SGr-IosevkaSS02 = "0cr4h84w9429ypwf1i8h289gfv3k2ls9lfyxgqhdy99ckqgmy8gz"; - SGr-IosevkaSS03 = "0am1lck3l2m7pw7nwv62xjcvi5yz94hpx3rmzj4ji22qn6l633zq"; - SGr-IosevkaSS04 = "1ggjsdczpjqnhikbp88kch7sai29r4m557y4f9xr7njfzwqkssdy"; - SGr-IosevkaSS05 = "0s3iwasn8p72snyp9r4c7bwzxwg5lh6sj2vvwv48clp0aynqj9nm"; - SGr-IosevkaSS06 = "1yh2qh718w94dsvm4bf6j4lqbamc0p8054f71kmk4d8zj9iijjy5"; - SGr-IosevkaSS07 = "0njr2mgr5gpa5yiymzg3n52xw6zi5zpswmsfhlq3gxw5xgjfv4q9"; - SGr-IosevkaSS08 = "0kf3p5yf202s45vkxn6zjk5im2rlmqpqcwn2p6vwanj2r4c0mq6j"; - SGr-IosevkaSS09 = "15zvggmz43fq9p9jqp40f7s7sa63sk8ss6qk5hpj7661lmw95cli"; - SGr-IosevkaSS10 = "1fnkrklrk6rz6nl0l9xwbz5rpjsizfan0rw3b1ylzbv7s6hjm3z6"; - SGr-IosevkaSS11 = "06j98fzfi3wqsm1vsc6b3prascfh9ycrfgg240471qx7fyynsnzs"; - SGr-IosevkaSS12 = "1a689igs4ygqq87g1yx2v0h29hvv69n78a3dlnyab2p9likidzhi"; - SGr-IosevkaSS13 = "124v6asig6in0vwh513yk9a93sl3j3vbnbgx85zk24601r6j4sgd"; - SGr-IosevkaSS14 = "017pjpj9m9l8hgpy5d801kdy1xvsyddyb0lzizqj0wlwgwafgayh"; - SGr-IosevkaSS15 = "1wf7wvcxfjcywaxjjwa97iy103vfihgmap585kkmjsign72gvhnd"; - SGr-IosevkaSS16 = "0069a898ba44460j94jbyiah5i0k8frr84njp75dhm3rbx9xrqh3"; - SGr-IosevkaSS17 = "0yqb51y1zfxbzvpmvy08r9q1al4gvmwsnbsj5b5ixspmvda475rn"; - SGr-IosevkaSS18 = "1ss8b6dn08a8ch3qcjqrnmh3v205nrr3q7727zvl0xcv47l54kr0"; - SGr-IosevkaTerm = "1hygc8cq3qlw5yc2399g6h95bgkwniy3wmcmppr5dd72mhr5ghvn"; - SGr-IosevkaTermCurly = "0cyfbmp7ns2jjzcgi1xw92cip3gk7j5imzx1846xdjdb2xima806"; - SGr-IosevkaTermCurlySlab = "1vqlqphj860bzs90jci8kmd8dvpd9ggl97r5dwfb3jh8nshyi56c"; - SGr-IosevkaTermSlab = "1n61lybs2v9n61mrdg1s7a9yy0ai5p1qqsgj16rh05k72zan66mn"; - SGr-IosevkaTermSS01 = "1cgqcz318dl85y8mmqrlr946c7w686bfgbankyqbkda7503xl18c"; - SGr-IosevkaTermSS02 = "0yb5c0iphlcwv8k4bh3p6vk2yk8gpyy213vsvb95sxa6838x27pp"; - SGr-IosevkaTermSS03 = "0b00s45xfg25ffnfylkiz4ba6acn8b4p64c5q4pans8gfjfnb275"; - SGr-IosevkaTermSS04 = "0icmi402xwrd1qn35qpacqzvcxgj42imm1kgixjgmnvbzs508h6a"; - SGr-IosevkaTermSS05 = "0qd7jrfgj5niaw8a8l3qf3z4m87hvb3wwcy3fndg1zlmwlbg2cfd"; - SGr-IosevkaTermSS06 = "0pg13v5q22k5hfy8vwk1hwh28v52wnfc28amgbkjxgcjyvd5m2xl"; - SGr-IosevkaTermSS07 = "0vww5dwpakmwhq5l0g371ha3hy1p0arnfp0f47lw9qsahyl0hhw2"; - SGr-IosevkaTermSS08 = "0y3gvmh4fyx2xxyn008i873m3fjwssalg8ib10zjj6mbz767az3l"; - SGr-IosevkaTermSS09 = "10jkdw8i4jz16x2kfsh7cmg1s6si3n3d5n65yr9n9ipmgdk2qj2r"; - SGr-IosevkaTermSS10 = "0wp9f6982dqha5dwyb4r09bm4fg690pqmb337i9237vzp6q6w0lq"; - SGr-IosevkaTermSS11 = "00qqyi4xxgfhcyr2qf5jn42rmnhdn0fpn66qh99v15fa7b8r7iz7"; - SGr-IosevkaTermSS12 = "0pz3c13zzvpxd2v2vlvgwk0j4fki1yfd95kycgafrijk2s2g9684"; - SGr-IosevkaTermSS13 = "1l5d59vh9ji0rmdixinix10nxcglbll55ad2syra5hvb9rfb6q2q"; - SGr-IosevkaTermSS14 = "0nqp05vhjjjg4aci5gaf6zf4w1z973y3wzxv3ndwkagn4gzq7y15"; - SGr-IosevkaTermSS15 = "019nzx7azrkgxvlrj2f3gfxjhjdf4ywy2gwan7fwj3kv983s4s6f"; - SGr-IosevkaTermSS16 = "16j3v6sbvav27p3i8q2qz76sw5i8bqr6i08khjc5cfx9pf9kfh2f"; - SGr-IosevkaTermSS17 = "0gd32ddi0q60scvv10qx5fwmgwwdjrx6j0ymsimmnd4gi3n3ylbr"; - SGr-IosevkaTermSS18 = "04j17062cs4h7dcrqb2qzx94wkq8n633j63vdqk72las513535xa"; + Iosevka = "0mma97rhjpfq20mq6dji50mxbdgaz72ccfqhrqim6hj5x5pkc2w2"; + IosevkaAile = "1frmm1q57xqsxqvz1vmz5fzammpgkgk2lspnkilb1adavla5a5j6"; + IosevkaCurly = "0zq07z1nx6b52mxh9kqr880p9aw10whjs0qgwzlyyij7jnk4mx2l"; + IosevkaCurlySlab = "0g6p9gpjqmdan81cv9rg2bppcdg7s8iiyn8whxqmxf0prbsyxcw6"; + IosevkaEtoile = "1sh3d69m0p8glr8szjd1cyxzsi66qsbmasjlmkwc1fhbw9w5kb5c"; + IosevkaSlab = "0sk90cq1zl4d0yjh0p78idjpi2hmr0hy4c4650xls9js0nzszjyj"; + IosevkaSS01 = "10f63fkyfcr0mngjql69zsfmy2wffbdzxkacw5jwlcnnpw6lwrz2"; + IosevkaSS02 = "0ydmp0mp5n6rh9s48pixrk41vdai3ys4q2wz60rpp8pl2sl7l58f"; + IosevkaSS03 = "0k2k54jh2w1pf2hhdx5m1bkk4pj9p541ddnvkw8jxdc30ab9pg0x"; + IosevkaSS04 = "12j2d7h1hp1m16m893rn79v56a13kvsz2vabp395fdhjswffpjly"; + IosevkaSS05 = "1cvl4hg058675h9amvvjw2qkjk7fs9zs3prdqvllpch77fkznbv3"; + IosevkaSS06 = "19cvfxrgqwyaan8xdyfrz1wsnr7cd43szcq0ijwsjxv0afvadp03"; + IosevkaSS07 = "1kd3s41nqiihl2wf0944mw7x1gq7xa5jfgis0z23snb9p25gyzli"; + IosevkaSS08 = "02yd5s4gvvl2xg68cznj00giqzngmdhmjz290q5d7kkzgzf8v6d4"; + IosevkaSS09 = "13hd8f38b0882paqr4pw2wx6raqr9m5d9ndphs8fvyadhsh70xaf"; + IosevkaSS10 = "1j0lbwvzqx0lmj3irf01aywqny94sidz8m06xl8vrljczhhz619w"; + IosevkaSS11 = "19kndxn9lynx3ambah3gn63d8fdqq5p7i5yxjlsn7g0d5vgvaa9h"; + IosevkaSS12 = "0jbsmsh6c2kzrn4kbkj4klc2pk1z54c1pf3c7y1vr8xyqkg43bjs"; + IosevkaSS13 = "0jgf400xl1hnd78vi3vdvxmax415rq475v1shfrf0ms3hm0kbrp0"; + IosevkaSS14 = "0acrv8frx88292iw55944mfp814iskafyknymiayxnpmmppn078g"; + IosevkaSS15 = "18jzzd5jsb9yvv5gcybnn8gcp03x7rhl2z40d16ln9cx150336sx"; + IosevkaSS16 = "0405qngdwkxxzyjxx9qy18p37jz1sc5f32ynaiiif0zg0c8bbsrb"; + IosevkaSS17 = "0f8is0b4rvy8n2fnydc9f2g958y9xnrww44fhb28vglgwil6pvya"; + IosevkaSS18 = "12hz34zfvdlw0dxni23j5knsxcrkvnpvankidkd0y500zisx4i46"; + SGr-Iosevka = "1izcklbrm8f993vhdqvyiy9c33d7aykvj4vv2sqwvwid2mv0rvdn"; + SGr-IosevkaCurly = "1r7cy3scf8gjp7hp3q80xf28d3px9vmsis8g0a8nr0vrg7wvc0p7"; + SGr-IosevkaCurlySlab = "0ja6i81fnz8kvzlfasvm5gx5c7l2hkvl1qfdan9knj6p5390rp25"; + SGr-IosevkaFixed = "1gcd6jms5z6pgclr8lgb0ip6z0y6vx9c79wvf0w7ixjcyafb1aq4"; + SGr-IosevkaFixedCurly = "1q415xikr2ihrxl3xvpfj7ix1kn1sva089abpjf0yp76rjfx5v9x"; + SGr-IosevkaFixedCurlySlab = "1cfii72ci508m7lrv701hsz5bzphjswdpcaccyhzkjqyjbajgvj4"; + SGr-IosevkaFixedSlab = "128rcxi2zjaxcbi7a6w739lvxcbaw6ph8q6a1gy20pgapna1l9xf"; + SGr-IosevkaFixedSS01 = "0pbv1x4mm7h43sz4r7rb0hkhsm6g7i4pkpi0lbnx2awiafzzlg3s"; + SGr-IosevkaFixedSS02 = "11d0si4bmgvz3pl43qbpszj9h9x4g53r29359y2mi5rmw5jym01l"; + SGr-IosevkaFixedSS03 = "1nmw3g30hm2rgy0lji0lbihi08iphy943pkrs5fl2c36yf9qxl0d"; + SGr-IosevkaFixedSS04 = "18jhd61d4vrmq9ck3wass07ph8frxnq8knl0cdpgqx6izk3fk0ss"; + SGr-IosevkaFixedSS05 = "0x9q7jvzsrs71frx662cb4872z9alc2y0r7cjaxpaifc420826z6"; + SGr-IosevkaFixedSS06 = "17f9c4cwi46c5jlrj6r6xw6gwjq2cmkjm4832cyjw9fqh4kpb0ih"; + SGr-IosevkaFixedSS07 = "1x3j7lp88zrxkmak3fnglin2sp450lmlyv92n56dz2a7gvw0nbs9"; + SGr-IosevkaFixedSS08 = "03m7wmwlajhjw3ifhmxl4cxkjjfyldw0bbybhk4cdsw9qni0cbhi"; + SGr-IosevkaFixedSS09 = "127466bq6m3k7is2jh45j9c3iik2ckgajhrkhgmhk3fr272ip00z"; + SGr-IosevkaFixedSS10 = "1qczqa9lv0hlqjhh5n3j32ampflriwyhp7cvk8vraxp8w01f20vv"; + SGr-IosevkaFixedSS11 = "0pm10asyl566l9s00hxb1r43yvhb24hqn3z5akirfxxp5klp9hf3"; + SGr-IosevkaFixedSS12 = "0lsy3097aid17hqxljkxj9lpswxvlmk5gv047dh7m6m8vxm3dzcy"; + SGr-IosevkaFixedSS13 = "1h5bv9c6yvbvfslx3wm5657f982f17pb2q8j2hl5c50114dbkdib"; + SGr-IosevkaFixedSS14 = "1lglsqhcy22hf4zbczpwc7pkmyaglknqpkv9bgckphpzaqgmavln"; + SGr-IosevkaFixedSS15 = "18hc5kfj4m57k8p90jc2fnr89ji6q34q6v3b1xkyb0lv9bagq2nl"; + SGr-IosevkaFixedSS16 = "0k4nrdqnh6jg40q5xvkrm1jx0iplwybhxy8bn3q7k461d3rn9smv"; + SGr-IosevkaFixedSS17 = "02higr5lxiyi6z8b916pkgch2dq0si7m7bf0vxb86daplgljbrna"; + SGr-IosevkaFixedSS18 = "0b4ljypil31n0861k43k0dxrmj9djgy8qffwy5vv856lcrdipy8h"; + SGr-IosevkaSlab = "18y0j05jjkdkavidrn2bpfd1319yzxp7m0zyhn08394d4m74m8w2"; + SGr-IosevkaSS01 = "0k9l74q9lijhxq1slxxkq7wb71nsrdv2bkqsbdxxb5gypqjh136y"; + SGr-IosevkaSS02 = "1gzjf6j6ljxnqi3xzcs1q1qzazyzw9d4az4l1nmsbkk5nfw3skbi"; + SGr-IosevkaSS03 = "1d8ihwf8m47lvlyyar4wd2xqjn4g5qmy1pp81dd2p999j47fzz84"; + SGr-IosevkaSS04 = "0dwhmlsv4x3z2xmnqwdciys0j22z25vcwqrb7wmy7c5sdhfkd4pn"; + SGr-IosevkaSS05 = "02nid5vi8q71lcaxwllyaa7j2qdb8hycw5k3b9fiw9bvliip7bwl"; + SGr-IosevkaSS06 = "1vx6nqv2m1f32xqgv6px2r0rr60rb8rns6f2y2dmnz1b55j4ap84"; + SGr-IosevkaSS07 = "0rgk9z2mrz990szq1m5664x1jq3056df9warjpj0nnr0d3a8406q"; + SGr-IosevkaSS08 = "1sv09fsd3xwwjdkiw93v7pvs3a1r7mbxqgyw73l4v8k5c8f16q14"; + SGr-IosevkaSS09 = "1hrk9pn407f57bx6zjc9mxzr7286vz2llyrkn808q1dlvisp3gc9"; + SGr-IosevkaSS10 = "1sk339gl5r004pd52daclk2zl5zybcfra2hdafvrmc81fkd2pz7b"; + SGr-IosevkaSS11 = "0rp7488skw396qdw8lyv69fgkz3b5i5nbjzkbrlfjasp2sgyg1i9"; + SGr-IosevkaSS12 = "04446s3bjdpvk25361n88xmcc3ylh9frabb11wgs79brm2i8qf57"; + SGr-IosevkaSS13 = "1xsdp07272bmp6fj68ky40hs53lhsm9y9c6fpk2cqvm25mv5w7fn"; + SGr-IosevkaSS14 = "1r3d7g4kqrj6zwpivzsjvhvv9q4gysb6a8s0m1fvaarsxhcrvkf1"; + SGr-IosevkaSS15 = "0cy8jg4g95zxbcq8y6bksmjbfz5dbp3c7qv16z533n2b5fn5h912"; + SGr-IosevkaSS16 = "05rs3hkv92h2s3p3v4v33jrfx5b6vk5v5d8kbwg989y8azzsj52m"; + SGr-IosevkaSS17 = "1i28qsazi4q51x1rk9p6h6zvk6pbbm9g5fs567a5wwlhagjha2cd"; + SGr-IosevkaSS18 = "0ghs5b6zg1jmibgypqwgnl8vpvzhj5c8di4izp5rgw8lzsi5n9yb"; + SGr-IosevkaTerm = "1vxs9sxc8q54cg4ydln1zqqwj8rs7x87xn3yz7nhgswk2zdyfxnr"; + SGr-IosevkaTermCurly = "1v4hwghycmlzi57m7qnp60v618x4wkqg3pbzpvm80v528lvrsrsh"; + SGr-IosevkaTermCurlySlab = "0z2z117saryawik1xnklzn8schgy4q10yqax1ypl1sj0lq80b6dm"; + SGr-IosevkaTermSlab = "04qbdia36haqisrm8z4waknpfvgrxb2cymjk6pwdqgk4jbfd6yh8"; + SGr-IosevkaTermSS01 = "1y3ggssvk39kv4igli2q7qy35spj5vddngsn4izh089a4irr7462"; + SGr-IosevkaTermSS02 = "06ddjjfj2h83ya4hw4yla6fzd3kpv3q6fnscx2aydxc4qjryqws7"; + SGr-IosevkaTermSS03 = "03jjlllq4x9h6pkg67vfivvc3p0swawah94yi10ar1hbgaljqhn4"; + SGr-IosevkaTermSS04 = "0n36y3pz660j0rv1zhyjrahcz87a65fw59s9x320aix502msaqn2"; + SGr-IosevkaTermSS05 = "0h71560ln3my53giyw75mq9cynjnnj6dkvdd4anbkvyw2j133497"; + SGr-IosevkaTermSS06 = "0fhmzjzxy8hjcdk3rjl9igykfmlgji7v5lyzm1p04fs4wa289bh6"; + SGr-IosevkaTermSS07 = "0girzhdwgwsjqqrhz0bky81rrqj62hxgkqy3sklr1w55snhq9yb4"; + SGr-IosevkaTermSS08 = "08rz3bjimxmn6xp4dqv9177bhyyqv10rdfxz697fkajq0wxvy4xc"; + SGr-IosevkaTermSS09 = "095bzk8ir4zxmrikr48fbfhsdhhnrcwg3xrkvqxhqancgqj4rzsz"; + SGr-IosevkaTermSS10 = "0kb3nhdy1pilhvdyfb3igaalf888qx55vhigvail05dnkp23iyaw"; + SGr-IosevkaTermSS11 = "1sxihqvswi66pbjnixfv1f4gv08x6n28qfzyj03lzw1d7sz3m1gp"; + SGr-IosevkaTermSS12 = "0w2sh563azjam2fcdbpxh466ddlc4h6vpc2xlawl78w5n63wsnys"; + SGr-IosevkaTermSS13 = "00h1kq3a2kbippqcy49jiagh6zl01qb40489njdg1vpd6s04x50c"; + SGr-IosevkaTermSS14 = "0k97x43appi5azlnghinwmyq13h5fqkj0p2rysnz28v5r6razikm"; + SGr-IosevkaTermSS15 = "1ziqhmp9af9b0djm9mhh2yy5f85rwwk82xhwsd84y9bl3mwil5cr"; + SGr-IosevkaTermSS16 = "00lyihlkv7h5pr2w74rb56kwzjqwh1kh7cp7dfzhwhwicy5bxc50"; + SGr-IosevkaTermSS17 = "03zgm0qsw5p8i1567ghslgb3cqwxznc9rbwnx9xiwv4972lbad6w"; + SGr-IosevkaTermSS18 = "1dmvvn1ny1bym8k32nvp2qzrzmy0qy4l6w1clfza4g6c23k6d4dd"; } diff --git a/pkgs/desktops/gnome/extensions/systemd-manager/default.nix b/pkgs/desktops/gnome/extensions/systemd-manager/default.nix index 0b8e52af802b..a11186dc0d3a 100644 --- a/pkgs/desktops/gnome/extensions/systemd-manager/default.nix +++ b/pkgs/desktops/gnome/extensions/systemd-manager/default.nix @@ -18,7 +18,7 @@ assert lib.elem allowPolkitPolicy [ stdenvNoCC.mkDerivation rec { pname = "gnome-shell-extension-systemd-manager"; - version = "16"; + version = "17"; # Upstream doesn't post new versions in extensions.gnome.org anymore, see also: # https://github.com/hardpixel/systemd-manager/issues/19 @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec { owner = "hardpixel"; repo = "systemd-manager"; rev = "v${version}"; - hash = "sha256-JecSIRj582jJWdrCQYBWFRkIhosxRhD3BxSAy8/0nVw="; + hash = "sha256-3cKjjKXc7lLG7PB8+8ExTRmC23uPRONUI3eEx+jTUVA="; }; nativeBuildInputs = [ glib ]; diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix index 3025e86f6a70..6179fc5a59c5 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix @@ -127,6 +127,7 @@ stdenv.mkDerivation (finalAttrs: { glib # glib-compile-schemas intltool pkg-config + qtdeclarative validatePkgConfig ]; diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/plugins/lomiri-system-settings-security-privacy.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/plugins/lomiri-system-settings-security-privacy.nix index 29a10f12a829..981ad79f8683 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-system-settings/plugins/lomiri-system-settings-security-privacy.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/plugins/lomiri-system-settings-security-privacy.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config python3 + qtdeclarative ]; buildInputs = [ diff --git a/pkgs/desktops/lomiri/applications/lomiri/default.nix b/pkgs/desktops/lomiri/applications/lomiri/default.nix index 8d6b3884ad37..e34eaf265b78 100644 --- a/pkgs/desktops/lomiri/applications/lomiri/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri/default.nix @@ -155,8 +155,6 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs tests/whitespace/check_whitespace.py ''; - strictDeps = true; - nativeBuildInputs = [ cmake glib # populates GSETTINGS_SCHEMAS_PATH diff --git a/pkgs/desktops/lomiri/data/lomiri-session/default.nix b/pkgs/desktops/lomiri/data/lomiri-session/default.nix index 351aed9de824..3a9d4fb5a105 100644 --- a/pkgs/desktops/lomiri/data/lomiri-session/default.nix +++ b/pkgs/desktops/lomiri/data/lomiri-session/default.nix @@ -150,8 +150,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { --replace-fail '/usr/libexec/Xwayland.lomiri' '${lib.getBin lomiri}/libexec/Xwayland.lomiri' ''; - strictDeps = true; - nativeBuildInputs = [ cmake makeWrapper diff --git a/pkgs/desktops/lomiri/development/lomiri-api/default.nix b/pkgs/desktops/lomiri/development/lomiri-api/default.nix index 9f699bbd715a..491b95d22a45 100644 --- a/pkgs/desktops/lomiri/development/lomiri-api/default.nix +++ b/pkgs/desktops/lomiri/development/lomiri-api/default.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { doxygen graphviz pkg-config + qtdeclarative ]; buildInputs = [ diff --git a/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix b/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix index ea44e6babb64..ab19623356bd 100644 --- a/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix +++ b/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix @@ -76,6 +76,7 @@ stdenv.mkDerivation (finalAttrs: { cmake dpkg # for setting LOMIRI_APP_LAUNCH_ARCH gobject-introspection + lttng-ust pkg-config validatePkgConfig ] ++ lib.optionals withDocumentation [ diff --git a/pkgs/desktops/lomiri/development/qtmir/default.nix b/pkgs/desktops/lomiri/development/qtmir/default.nix index 88ac0b69de9c..4cc4f3bb1fef 100644 --- a/pkgs/desktops/lomiri/development/qtmir/default.nix +++ b/pkgs/desktops/lomiri/development/qtmir/default.nix @@ -96,6 +96,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake glib # glib-compile-schemas + lttng-ust pkg-config validatePkgConfig wrapQtAppsHook diff --git a/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix b/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix index d3d23c68f8bf..35eccd897157 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config + qtdeclarative validatePkgConfig ]; diff --git a/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix b/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix index 854615512d67..8da32d4b1581 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config + qtdeclarative ]; buildInputs = [ diff --git a/pkgs/desktops/lomiri/services/hfd-service/default.nix b/pkgs/desktops/lomiri/services/hfd-service/default.nix index cdffee5edaef..ff5f34abc294 100644 --- a/pkgs/desktops/lomiri/services/hfd-service/default.nix +++ b/pkgs/desktops/lomiri/services/hfd-service/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config + qtdeclarative ]; buildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 24deffaa01ec..43a49528df08 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -5,7 +5,6 @@ , meson , ninja , pkg-config -, python3 , vala , wrapGAppsHook3 , clutter @@ -24,20 +23,19 @@ stdenv.mkDerivation rec { pname = "elementary-calendar"; - version = "7.0.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "calendar"; rev = version; - sha256 = "sha256-qZvSzhLGr4Gg9DSJ638IQRLlPiZkbJUCJ7tZ8ZFZZ1E="; + sha256 = "sha256-gBQfrRSaw3TKcsSAQh/hcTpBoEQstGdLbppoZ1/Z1q8="; }; nativeBuildInputs = [ meson ninja pkg-config - python3 vala wrapGAppsHook3 ]; @@ -57,11 +55,6 @@ stdenv.mkDerivation rec { libportal-gtk3 ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index 258ff8e2dadb..49cc2c2e42bc 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -5,7 +5,6 @@ , meson , ninja , pkg-config -, python3 , vala , wrapGAppsHook4 , elementary-gtk-theme @@ -14,24 +13,24 @@ , granite7 , gst_all_1 , gtk4 +, libadwaita }: stdenv.mkDerivation rec { pname = "elementary-music"; - version = "7.1.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "music"; rev = version; - sha256 = "sha256-L+E5gDtIgVkfmOIhzS7x8vtyMJYqx/UQpYMChrt2Tgo="; + sha256 = "sha256-pqOAeHTFWSoJqXE9UCUkVIy5T7EoYsieJ4PMU1oX9ko="; }; nativeBuildInputs = [ meson ninja pkg-config - python3 vala wrapGAppsHook4 ]; @@ -41,6 +40,7 @@ stdenv.mkDerivation rec { glib granite7 gtk4 + libadwaita ] ++ (with gst_all_1; [ gst-plugins-bad gst-plugins-base @@ -49,11 +49,6 @@ stdenv.mkDerivation rec { gstreamer ]); - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - preFixup = '' gappsWrapperArgs+=( # The GTK theme is hardcoded. diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix index f8ca0fe62cd7..9325f5740bcb 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix @@ -6,7 +6,6 @@ , meson , ninja , vala -, python3 , desktop-file-utils , gtk3 , granite @@ -18,13 +17,13 @@ stdenv.mkDerivation rec { pname = "elementary-screenshot"; - version = "6.0.4"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "screenshot"; rev = version; - sha256 = "sha256-xG67a19ySuYc5IXlEkaqhnDpDa2krF2y6PnhJkd/rOg="; + sha256 = "sha256-z7FP+OZYF/9YLXYCQF/ElihKjKHVfeHc38RHdPb2aIE="; }; nativeBuildInputs = [ @@ -32,7 +31,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 vala wrapGAppsHook3 ]; @@ -45,11 +43,6 @@ stdenv.mkDerivation rec { libhandy ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 7fb642ce7b7d..9b16c90e0c89 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -1,28 +1,30 @@ -{ lib -, stdenv -, fetchFromGitHub -, nix-update-script -, pkg-config -, meson -, ninja -, vala -, gtk3 -, granite -, libgee -, libhandy -, gst_all_1 -, wrapGAppsHook3 +{ + stdenv, + lib, + fetchFromGitHub, + nix-update-script, + meson, + ninja, + pkg-config, + vala, + wrapGAppsHook4, + gdk-pixbuf, + granite7, + gst_all_1, + gtk4, + libadwaita, + libgee, }: stdenv.mkDerivation rec { pname = "elementary-videos"; - version = "3.0.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "videos"; rev = version; - sha256 = "sha256-O98478E3NlY2NYqjyy8mcXZ3lG+wIV+VrPzdzOp44yA="; + hash = "sha256-GfTYwnNZg8/cmJMzLDfYpulG7K4SMYK2H+SXtiS3TCg="; }; nativeBuildInputs = [ @@ -30,23 +32,24 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook3 + wrapGAppsHook4 ]; buildInputs = [ - granite - gtk3 - libgee - libhandy - ] ++ (with gst_all_1; [ - gst-libav - gst-plugins-bad - gst-plugins-base + gdk-pixbuf + granite7 + gst_all_1.gst-libav + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base # https://github.com/elementary/videos/issues/356 - (gst-plugins-good.override { gtkSupport = true; }) - gst-plugins-ugly - gstreamer - ]); + (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) + gst_all_1.gst-plugins-rs # GTK 4 Sink + gst_all_1.gst-plugins-ugly + gst_all_1.gstreamer + gtk4 + libadwaita + libgee + ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index ed9da1181514..d2780cdcfe65 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -5,31 +5,33 @@ , meson , ninja , pkg-config -, python3 , vala , accountsservice , dbus , desktop-file-utils , fwupd +, gdk-pixbuf , geoclue2 +, gexiv2 , glib , gobject-introspection , gtk3 , granite , libgee +, packagekit , systemd , wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "elementary-settings-daemon"; - version = "1.3.1"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "settings-daemon"; rev = version; - sha256 = "sha256-mEmc9uLwUTObsP70P0G2vcRdQF6do/wMTQjvfLUU//o="; + sha256 = "sha256-e70OVdvyKzzF+W7epzj23/Q1lsJiSJd7z1fj41sWfWU="; }; nativeBuildInputs = [ @@ -38,7 +40,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 vala wrapGAppsHook3 ]; @@ -47,19 +48,17 @@ stdenv.mkDerivation rec { accountsservice dbus fwupd + gdk-pixbuf geoclue2 + gexiv2 glib gtk3 granite libgee + packagekit systemd ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix index 14c2244a760a..d26723aefdfd 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix @@ -8,7 +8,6 @@ , libXfixes , libXtst , libxml2 -, libsoup_3 , libxfce4ui , libxfce4util , wayland @@ -24,10 +23,10 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-screenshooter"; - version = "1.10.6"; + version = "1.11.0"; odd-unstable = false; - sha256 = "sha256-g3wYIyJEnYCFhCs6YXzfEe5lnvIY8ACN/m7He+ww3mA="; + sha256 = "sha256-DMLGaDHmwDDHvOMev/QKvmDr6AQ6Qnzxf3YCbf0/nXg="; nativeBuildInputs = [ wayland-scanner @@ -41,7 +40,6 @@ mkXfceDerivation { libXfixes libXtst libxml2 - libsoup_3 libxfce4ui libxfce4util wayland diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 8542fd52d04f..d6c1442a8b8b 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 = "117"; + version = "118"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - hash = "sha256-QYJkrvwcUWbFV5oQdP11JuVmfOTYaFWGQGksboQ1d58="; + hash = "sha256-akMW3S2/qUyLK8F77EtnaXPDXvIMpkGfNB2jOD6hQho="; }; nativeBuildInputs = [ cmake python3 ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/WebAssembly/binaryen"; description = "Compiler infrastructure and toolchain library for WebAssembly, in C++"; platforms = platforms.all; - maintainers = with maintainers; [ asppsa ]; + maintainers = with maintainers; [ asppsa willcohen ]; license = licenses.asl20; }; diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index aaf560ba4e85..2fb6c21fff10 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.78.1"; + version = "1.79"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-MV70tU9orK46IXM46HUuxgAuSP4JerXdKpOyPiMfsUE="; + hash = "sha256-/PEny7+E/s1Y08NigO22uDnhFfMBtccqaI8hsBOO2fI="; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 2919a305e428..2d94880976d7 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.55"; + version = "3.1.64"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { name = "emscripten-node-modules-${version}"; inherit pname version src; - npmDepsHash = "sha256-7tZEZ7NN1jJBHa9G5sRz/ZpWJvgnTJj4i5EvQMsGQH4="; + npmDepsHash = "sha256-2dsIuB6P+Z3wflIsn6QaZvjHeHHGzsFAI3GcP3SfiP4="; dontBuild = true; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - hash = "sha256-3SqbkXI8xn4Zj3bDLCegxslYH5m/PkF6n/pPfm5z5VA="; + hash = "sha256-AbO1b4pxZ7I6n1dRzxhLC7DnXIUnaCK9SbLy96Qxqr0="; rev = version; }; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./0001-emulate-clang-sysroot-include-logic.patch; - resourceDir = "${llvmEnv}/lib/clang/18/"; + resourceDir = "${llvmEnv}/lib/clang/${lib.versions.major llvmPackages.llvm.version}/"; }) ]; @@ -51,9 +51,6 @@ stdenv.mkDerivation rec { patchShebangs . - # emscripten 3.1.55 requires LLVM tip-of-tree instead of LLVM 18 - sed -i -e "s/EXPECTED_LLVM_VERSION = 19/EXPECTED_LLVM_VERSION = 18/g" tools/shared.py - # fixes cmake support sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 02bc670f26cd..27cd6acc3f17 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -31,13 +31,13 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.16695.4"; + version = "1.0.17193.4"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - hash = "sha256-XgQ2Gk3HDKBpsfomlpRUt8WybEIoHfKlyuWJCwCnmDA="; + hash = "sha256-OOKj3kfl+0/dgeICFtbiOVE0nsYYvI4v97BLjcExAmc="; }; nativeBuildInputs = [ bison cmake flex (python3.withPackages (ps : with ps; [ mako ])) ]; diff --git a/pkgs/development/compilers/p4c/default.nix b/pkgs/development/compilers/p4c/default.nix index 54d2875d1bc3..060e29809823 100644 --- a/pkgs/development/compilers/p4c/default.nix +++ b/pkgs/development/compilers/p4c/default.nix @@ -76,6 +76,8 @@ stdenv.mkDerivation (finalAttrs: { bison flex cmake + protobuf + python3 ] ++ lib.optionals enableDocumentation [ doxygen graphviz ] ++ lib.optionals enableBPF [ libllvm libbpf ]; @@ -86,7 +88,6 @@ stdenv.mkDerivation (finalAttrs: { boehmgc gmp flex - python3 ]; meta = { diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 6676a7ce6c2e..f52393961665 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -10,12 +10,12 @@ let versionMap = { - "2.4.5" = { - sha256 = "sha256-TfaOkMkDGAdkK0t2GYjetb9qG9FSxHI0goNO+nNae9E="; - }; "2.4.6" = { sha256 = "sha256-pImQeELa4JoXJtYphb96VmcKrqLz7KH7cCO8pnw/MJE="; }; + "2.4.7" = { + sha256 = "sha256-aFRNJQNjWs0BXVNMzJsq6faJltQptakGP9Iv8JJQEdI="; + }; }; # Collection of pre-built SBCL binaries for platforms that need them for # bootstrapping. Ideally these are to be avoided. If ECL (or any other diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index 3e2ef4532c11..6321b6940ec7 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -32,9 +32,9 @@ let rev = "v${version}"; hash = "sha256-OsDohXRxovtEXaWiRGp8gJ0dXmoALyO+ZimeSO8aPVI="; } else if llvmMajor == "14" then { - version = "14.0.0+unstable-2024-02-14"; - rev = "2221771c28dc224d5d560faf6a2cd73f8ecf713d"; - hash = "sha256-J4qOgDdcsPRU1AXXXWN+qe4c47uMCrjmtM8MSrl9NjE="; + version = "14.0.0+unstable-2024-05-27"; + rev = "62f5b09b11b1da42274371b1f7535f6f2ab11485"; + hash = "sha256-lEOdWHyq9hEyBZPz9z1LxUAZqNub+mZFHHWMlzh3HaI="; } else if llvmMajor == "11" then { version = "11.0.0+unstable-2022-05-04"; rev = "4ef524240833abfeee1c5b9fff6b1bd53f4806b3"; # 267 commits ahead of v11.0.0 diff --git a/pkgs/development/embedded/arduino/arduino-cli/default.nix b/pkgs/development/embedded/arduino/arduino-cli/default.nix deleted file mode 100644 index 9e1325a43457..000000000000 --- a/pkgs/development/embedded/arduino/arduino-cli/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, buildFHSEnv, installShellFiles, go-task }: - -let - - pkg = buildGoModule rec { - pname = "arduino-cli"; - version = "1.0.2"; - - src = fetchFromGitHub { - owner = "arduino"; - repo = pname; - rev = "v${version}"; - hash = "sha256-lRCkUF0BBX0nej/HxfV9u8NIuA5W0aBKP2xPR8C61NY="; - }; - - nativeBuildInputs = [ - installShellFiles - ]; - - nativeCheckInputs = [ - go-task - ]; - - subPackages = [ "." ]; - - vendorHash = "sha256-lB/PfUZFL5+YBcAhrMMV2ckAHPhtW2SL3/zM3L4XGVc="; - - postPatch = let - skipTests = [ - # tries to "go install" - "TestDummyMonitor" - # try to Get "https://downloads.arduino.cc/libraries/library_index.tar.bz2" - "TestDownloadAndChecksums" - "TestParseArgs" - "TestParseReferenceCores" - "TestPlatformSearch" - "TestPlatformSearchSorting" - ]; - in '' - substituteInPlace Taskfile.yml \ - --replace-fail "go test" "go test -p $NIX_BUILD_CORES -skip '(${lib.concatStringsSep "|" skipTests})'" - ''; - - doCheck = stdenv.isLinux; - - checkPhase = '' - runHook preCheck - task go:test - runHook postCheck - ''; - - ldflags = [ - "-s" "-w" "-X github.com/arduino/arduino-cli/version.versionString=${version}" "-X github.com/arduino/arduino-cli/version.commit=unknown" - ] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ]; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - export HOME="$(mktemp -d)" - installShellCompletion --cmd arduino-cli \ - --bash <($out/bin/arduino-cli completion bash) \ - --zsh <($out/bin/arduino-cli completion zsh) \ - --fish <($out/bin/arduino-cli completion fish) - unset HOME - ''; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Arduino from the command line"; - mainProgram = "arduino-cli"; - changelog = "https://github.com/arduino/arduino-cli/releases/tag/${version}"; - license = [ licenses.gpl3Only licenses.asl20 ]; - maintainers = with maintainers; [ ryantm sfrijters ]; - }; - - }; - -in -if stdenv.isLinux then -# buildFHSEnv is needed because the arduino-cli downloads compiler -# toolchains from the internet that have their interpreters pointed at -# /lib64/ld-linux-x86-64.so.2 - buildFHSEnv - { - inherit (pkg) name meta; - - runScript = "${pkg.outPath}/bin/arduino-cli"; - - extraInstallCommands = '' - mv $out/bin/$name $out/bin/arduino-cli - '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - cp -r ${pkg.outPath}/share $out/share - ''; - passthru.pureGoPkg = pkg; - - targetPkgs = pkgs: with pkgs; [ - zlib - ]; - } -else - pkg diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index 9779277b5e7c..cbf3100347ef 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "standard-library"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - hash = "sha256-TjGvY3eqpF+DDwatT7A78flyPcTkcLHQ1xcg+MKgCoE="; + hash = "sha256-tv/Fj8ZJgSvieNLlXBjyIR7MSmDp0e2QbN1d/0xBpFg="; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index b2b1e40576ea..213c49357c91 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , meson , mesonEmulatorHook +, appstream , ninja , pkg-config , cmake @@ -80,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: { gperf ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook + appstream ]; buildInputs = [ diff --git a/pkgs/development/libraries/blst/default.nix b/pkgs/development/libraries/blst/default.nix index e5eb5b64aa9f..128318480853 100644 --- a/pkgs/development/libraries/blst/default.nix +++ b/pkgs/development/libraries/blst/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation ( finalAttrs: { pname = "blst"; - version = "0.3.12"; + version = "0.3.13"; src = fetchFromGitHub { owner = "supranational"; repo = "blst"; rev = "v${finalAttrs.version}"; - hash = "sha256-z/xnttMuAOfoKn/yCBwdYbgcd6cDLD6tZxInAWn8XIk="; + hash = "sha256-+Ae2cCVVEXnV/ftVOApxDcXM3COf/4DXXd1AOuGS5uc="; }; buildPhase = '' diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix index 718c73fd3f5f..86aa687aaa71 100644 --- a/pkgs/development/libraries/cppcms/default.nix +++ b/pkgs/development/libraries/cppcms/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-aXAxx9FB/dIVxr5QkLZuIQamO7PlLwnugSDo78bAiiE="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ pcre zlib python3 openssl ]; + nativeBuildInputs = [ cmake python3 ]; + buildInputs = [ pcre zlib openssl ]; strictDeps = true; diff --git a/pkgs/development/libraries/crocoddyl/default.nix b/pkgs/development/libraries/crocoddyl/default.nix index 8b5c057b8bae..046a6a014d1a 100644 --- a/pkgs/development/libraries/crocoddyl/default.nix +++ b/pkgs/development/libraries/crocoddyl/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + ] ++ lib.optionals pythonSupport [ + python3Packages.python ]; propagatedBuildInputs = lib.optionals (!pythonSupport) [ diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index d0a8bdbafb24..0821488c1652 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.16.5"; + version = "1.16.6"; src = fetchFromGitHub { owner = "canonical"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dk4OEQuADPMfdfAmrgA36Bdzo6qm5Ak4/Rw/L9C75a0="; + hash = "sha256-NtBEhtK6PysRqCUNcbFvPMBEmDR9WWJkWdFdzTOKt/8="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index bcc5e8dacfe9..fa86bc4a18c9 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.4.19"; + version = "1.4.22"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - hash = "sha256-kK65g8NLMT+dxJTaAFviJNToS9EZ/rKlsey3OpQon5U="; + hash = "sha256-qafyTwp6hxYX526MxuZVaueIBC8cAGGVZlUFSZsjNLE="; }; buildInputs = [ diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index bdfa576f23df..cacfb778c7bc 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { "TestFind" "gdcmscu-echo-dicomserver" "gdcmscu-find-dicomserver" - # seemingly ought to be be disabled when the test data submodule is not present: + # seemingly ought to be disabled when the test data submodule is not present: "TestvtkGDCMImageReader2_3" "TestSCUValidation" # errors because 3 classes not wrapped: diff --git a/pkgs/development/libraries/hpp-fcl/default.nix b/pkgs/development/libraries/hpp-fcl/default.nix index ea8c89f53eea..430e1bf16322 100644 --- a/pkgs/development/libraries/hpp-fcl/default.nix +++ b/pkgs/development/libraries/hpp-fcl/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake doxygen + ] ++ lib.optionals pythonSupport [ + python3Packages.numpy ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/libgssglue/default.nix b/pkgs/development/libraries/libgssglue/default.nix index 0d01b05e223b..ef9b3d282156 100644 --- a/pkgs/development/libraries/libgssglue/default.nix +++ b/pkgs/development/libraries/libgssglue/default.nix @@ -1,15 +1,27 @@ -{ lib, stdenv, fetchurl, libkrb5 }: +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + libkrb5, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgssglue"; - version = "0.4"; + version = "0.9"; - src = fetchurl { - url = "http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/${pname}-${version}.tar.gz"; - sha256 = "0fh475kxzlabwz30wz3bf7i8kfqiqzhfahayx3jj79rba1sily9z"; + src = fetchFromGitLab { + owner = "gsasl"; + repo = "libgssglue"; + rev = "tags/libgssglue-${finalAttrs.version}"; + hash = "sha256-p9dujLklv2ZC1YA1gKGCRJf9EvF3stv5v4Z/5m1nSeM="; }; + nativeBuildInputs = [ autoreconfHook ]; + postPatch = '' + touch ChangeLog + sed s:/etc/gssapi_mech.conf:$out/etc/gssapi_mech.conf: -i src/g_initialize.c ''; @@ -27,4 +39,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ corngood ]; }; -} +}) diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index c4b792e673fc..a4a1e03e93ef 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation rec { jsoncpp libxml2 - (python3.withPackages (ps: [ ps.pystache ps.six ])) sqlite xercesc zxing-cpp @@ -68,6 +67,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake doxygen + (python3.withPackages (ps: [ ps.pystache ps.six ])) ]; strictDeps = true; diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix index 1c90cc386733..44315ed898ee 100644 --- a/pkgs/development/libraries/opencl-clang/default.nix +++ b/pkgs/development/libraries/opencl-clang/default.nix @@ -54,26 +54,20 @@ let }; }; - version = "unstable-2023-06-12"; + version = "unstable-2024-06-06"; src = applyPatches { src = fetchFromGitHub { owner = "intel"; repo = "opencl-clang"; # https://github.com/intel/opencl-clang/compare/ocl-open-140 - rev = "cf95b338d14685e4f3402ab1828bef31d48f1fd6"; - hash = "sha256-To1RlQX9IJ+1zAwEXaW7ua3VNfjK9mu7pgsRPsfa8g8="; + rev = "66a54cbef6726c4e791986779a60d7a45b09c9c9"; + hash = "sha256-vM2IlF/e3b2GIXMaHYre+iQn4WKsFIU3x90Ee5KVHtI="; }; patches = [ # Build script tries to find Clang OpenCL headers under ${llvm} # Work around it by specifying that directory manually. ./opencl-headers-dir.patch - - # fix CMake throwing errors - (fetchpatch { - url = "https://github.com/intel/opencl-clang/commit/321e3b99c1a8d54c8475f5ae998452069cc5eb71.patch"; - hash = "sha256-cATbH+AMVtcabhl3EkzAH7w3wGreUV53hQYHVUUEP4g="; - }) ]; postPatch = '' diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index a567612fae4f..05c8abfafb2a 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { unzip cmake doxygen + python3 ]; buildInputs = [ @@ -38,7 +39,6 @@ stdenv.mkDerivation rec { swig xorg.libXi xorg.libXmu - python3 ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.GLUT diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix index e5ad0e3e63d9..910c40a4e0c0 100644 --- a/pkgs/development/libraries/science/math/clblas/default.nix +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -42,10 +42,9 @@ stdenv.mkDerivation rec { "-DBUILD_TEST=OFF" ]; - nativeBuildInputs = [ cmake gfortran ]; + nativeBuildInputs = [ cmake gfortran python3 ]; buildInputs = [ blas - python3 boost ] ++ lib.optionals (!stdenv.isDarwin) [ ocl-icd diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index 9b7b4d268197..ac19356d1a73 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -63,6 +63,15 @@ stdenv.mkDerivation { }) ]; + postPatch = '' + # Remove the following substituteInPlace when updating + # to a release that contains change from PR + # https://github.com/facebookresearch/faiss/issues/3239 + # that fixes building faiss with swig 4.2.x + substituteInPlace faiss/python/swigfaiss.swig \ + --replace-fail '#ifdef SWIGWORDSIZE64' '#if (__SIZEOF_LONG__ == 8)' + ''; + buildInputs = [ blas swig diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index b19c2f826eab..6bf15fc6f83a 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -620,14 +620,14 @@ buildLuarocksPackage { haskell-tools-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "haskell-tools.nvim"; - version = "3.1.10-1"; + version = "4.0.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/haskell-tools.nvim-3.1.10-1.rockspec"; - sha256 = "0s7haq3l29b26x9yj88j4xh70gm9bnnqn4q7qnkrwand3bj9m48q"; + url = "mirror://luarocks/haskell-tools.nvim-4.0.0-1.rockspec"; + sha256 = "1iz7bgy7a0zclsg31rmf6hcrjxnikhqwzh5blirif3m9bdi9mv6v"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/3.1.10.zip"; - sha256 = "1cxfv2f4vvkqmx1k936k476mxsy1yn85blg0qyfsjfagca25ymmv"; + url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/4.0.0.zip"; + sha256 = "0k6kw42n4c2hc7mqjv8ahwcwqia7wdgmszy1np96sc9dd0bkiqx9"; }; disabled = luaOlder "5.1"; diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 0bc7ec6c36b7..42ee799db75a 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -6,8 +6,6 @@ pkgs: lib: self: super: ### Use `./remove-attr.py [attrname]` in this directory to remove your alias ### from the `nodePackages` set without regenerating the entire file. -with self; - let # Removing recurseForDerivation prevents derivations of aliased attribute # set to appear while listing all the packages available. @@ -113,7 +111,7 @@ mapAliases { inherit (pkgs) jake; # added 2023-08-19 inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19 karma = pkgs.karma-runner; # added 2023-07-29 - leetcode-cli = vsc-leetcode-cli; # added 2023-08-31 + leetcode-cli = self.vsc-leetcode-cli; # added 2023-08-31 inherit (pkgs) lv_font_conv; # added 2024-06-28 manta = pkgs.node-manta; # Added 2023-05-06 inherit (pkgs) markdown-link-check; # added 2024-06-28 @@ -128,7 +126,7 @@ mapAliases { inherit (pkgs) nodemon; # added 2024-06-28 inherit (pkgs) npm-check-updates; # added 2023-08-22 ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04 - parcel-bundler = parcel; # added 2023-09-04 + parcel-bundler = self.parcel; # added 2023-09-04 pkg = pkgs.vercel-pkg; # added 2023-10-04 inherit (pkgs) pm2; # added 2024-01-22 inherit (pkgs) pnpm; # added 2024-06-26 diff --git a/pkgs/development/php-packages/spx/default.nix b/pkgs/development/php-packages/spx/default.nix index 5fa060223d02..caab4d59335a 100644 --- a/pkgs/development/php-packages/spx/default.nix +++ b/pkgs/development/php-packages/spx/default.nix @@ -6,7 +6,7 @@ }: let - version = "0.4.15"; + version = "0.4.16"; in buildPecl { inherit version; @@ -16,7 +16,7 @@ buildPecl { owner = "NoiseByNorthwest"; repo = "php-spx"; rev = "v${version}"; - hash = "sha256-gw6wbPt1Qy0vNfT0flq7bxpnGU3SgJvPVhk8H0Imvx4="; + hash = "sha256-1HOLMbCuV1bxi4DV26QOhi93VsBF3NJymk4SMn2ze4g="; }; configureFlags = [ "--with-zlib-dir=${zlib.dev}" ]; diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index fcee1327c2a2..dbf0cc5e5534 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "accelerate"; - version = "0.31.0"; + version = "0.32.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "accelerate"; rev = "refs/tags/v${version}"; - hash = "sha256-1iLTmSyZzOHGeAr2xBW4mebbq1FZdNfJb8blCtbSqsI="; + hash = "sha256-/Is5aKTYHxvgUJSkF7HxMbEA6dgn/y5F1B3D6qSCSaE="; }; buildInputs = [ llvmPackages.openmp ]; diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index 34a10cb96cde..c4421a071f5a 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "1.0.5"; + version = "1.0.6"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-95cCfmaYe8RgmkzqPlV4cufNS6Eb01304S2sSliRpQ0="; + hash = "sha256-DA949hZogSY3KkLSeILvB5Ay6rXZoLe8ndbOtagTtvM="; }; build-system = [ setuptools ]; @@ -40,8 +40,8 @@ buildPythonPackage rec { meta = with lib; { description = "Module for local communication with LIFX devices over a LAN"; - homepage = "https://github.com/frawau/aiolifx"; - changelog = "https://github.com/frawau/aiolifx/releases/tag/${version}"; + homepage = "https://github.com/aiolifx/aiolifx"; + changelog = "https://github.com/aiolifx/aiolifx/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ netixx ]; mainProgram = "aiolifx"; diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index e079703d17a0..76396668aec9 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "apprise"; - version = "1.8.0"; + version = "1.8.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6PWM6/6ho09WnLTGiAmjF1voDsBvCi7Ec1IrkgIyEsU="; + hash = "sha256-CKIP5yZyt+kPeWnVuHnWV8Li2zhaiowQ9Uy6VlvyN/I="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index 1d54f0895933..f893d2297503 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "7.1.3"; + version = "7.1.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; rev = "refs/tags/v${version}"; - hash = "sha256-4TiLncVxDxGB8YSgeEvXGb3kY2tjfYYmBAleJeaiPWU="; + hash = "sha256-l1FrhQ82+0g/ivm2K2yXJ5EZNDGM3Olcj1AxiQc8cZI="; }; pythonRelaxDeps = [ "tenacity" ]; diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix index 6728f39269ec..2c878ac8798a 100644 --- a/pkgs/development/python-modules/atomman/default.nix +++ b/pkgs/development/python-modules/atomman/default.nix @@ -1,6 +1,5 @@ { lib, - ase, buildPythonPackage, cython, datamodeldict, @@ -11,35 +10,31 @@ pandas, phonopy, potentials, - pymatgen, pytestCheckHook, pythonOlder, requests, scipy, setuptools, toolz, - wheel, xmltodict, }: -buildPythonPackage { +buildPythonPackage rec { pname = "atomman"; - version = "1.4.6-unstable-2023-07-28"; + version = "1.4.11"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "usnistgov"; repo = "atomman"; - rev = "b8af21a9285959d38ee26173081db1b4488401bc"; - hash = "sha256-WfB+OY61IPprT6OCVHl8VA60p7lLVkRGuyYX+nm7bbA="; + rev = "refs/tags/v${version}"; + hash = "sha256-2yxHv9fSgLM5BeUkXV9NX+xyplXtyfWodwS9sVUVzqU="; }; - build-system = [ setuptools - wheel numpy cython ]; @@ -57,7 +52,7 @@ buildPythonPackage { xmltodict ]; - pythonRelaxDeps = [ "potentials" ]; + pythonRelaxDeps = [ "atomman" ]; preCheck = '' # By default, pytestCheckHook imports atomman from the current directory @@ -68,9 +63,7 @@ buildPythonPackage { ''; nativeCheckInputs = [ - ase phonopy - pymatgen pytestCheckHook ]; @@ -81,6 +74,7 @@ buildPythonPackage { pythonImportsCheck = [ "atomman" ]; meta = with lib; { + changelog = "https://github.com/usnistgov/atomman/blob/${src.rev}/UPDATES.rst"; description = "Atomistic Manipulation Toolkit"; homepage = "https://github.com/usnistgov/atomman/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index 12f4549bbe43..b2766add2dd6 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "awswrangler"; - version = "3.8.0"; + version = "3.9.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-sdk-pandas"; rev = "refs/tags/${version}"; - hash = "sha256-2eF8WDhWfYgR3Ce/ehzCBtUdGUFzNmrTNfnatDpCg7Q="; + hash = "sha256-XhTRnQ2wsCD2jiiRFHDagmMB26lZ8Oj+tscgVypN0+c="; }; pythonRelaxDeps = [ "packaging" ]; diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index f0b12aed9cb0..4213abd86353 100644 --- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -4,23 +4,26 @@ azure-mgmt-core, buildPythonPackage, fetchPypi, + setuptools, isodate, pythonOlder, }: buildPythonPackage rec { pname = "azure-mgmt-keyvault"; - version = "10.3.0"; - format = "setuptools"; + version = "10.3.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-GDtBZM8YaLjqfv6qmO2tfSpOFKm9l3woGLErdRUM0qI="; + hash = "sha256-NLkpVq773VccrloD9weOA32Ah7LADPpnSINdxzq7WjA="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ azure-common azure-mgmt-core isodate @@ -28,6 +31,8 @@ buildPythonPackage rec { pythonNamespaces = [ "azure.mgmt" ]; + pythonImportsCheck = [ "azure.mgmt.keyvault" ]; + # Module has no tests doCheck = false; @@ -36,8 +41,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-keyvault_${version}/sdk/keyvault/azure-mgmt-keyvault/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ - maxwilson - ]; + maintainers = with maintainers; [ maxwilson ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 8a10fd41f108..8490dd288880 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-netapp"; - version = "13.0.0"; + version = "13.1.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-R322hzij1kcnrwxMClOzta40cMnd4w6bGnp5+p2pMQ8="; + hash = "sha256-8JzJFZTplNGo74wBelP8Geo7+FQ7WYmAOAef4jv533M="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index 1f47df6c9e73..12d69e33acb6 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.16.0"; + version = "12.17.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-QS+35sPCj29yKvmBlapZQHqqMjI6+hOkoB9i0Lh3TrM="; + hash = "sha256-97LGz8G3y4AJelOx7S76nlRbSaKRQw02nNtJ+vvIQdY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix index 50f5d701138b..c6fcce00fddd 100644 --- a/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "azure-storage-queue"; - version = "12.10.0"; + version = "12.11.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dnuj1czNtPcJdOXOYdFkx6t0cyz7K0Qd2HN2aaIRbag="; + hash = "sha256-Cox3eDnbpcUIJMrEivo8xWvgRPqkXKYbcmnrMZ6/AXE="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/babelfont/default.nix b/pkgs/development/python-modules/babelfont/default.nix index afc75992a9a5..cc64639537e1 100644 --- a/pkgs/development/python-modules/babelfont/default.nix +++ b/pkgs/development/python-modules/babelfont/default.nix @@ -13,6 +13,7 @@ setuptools, setuptools-scm, ufolib2, + vfblib, }: buildPythonPackage rec { @@ -41,6 +42,7 @@ buildPythonPackage rec { openstep-plist orjson ufolib2 + vfblib ]; nativeCheckInputs = [ @@ -48,6 +50,15 @@ buildPythonPackage rec { pytestCheckHook ]; + # Want non exsiting test data + disabledTests = [ + "test_rename" + "test_rename_nested" + "test_rename_contextual" + ]; + + disabledTestPaths = [ "tests/test_glyphs3_roundtrip.py" ]; + meta = with lib; { description = "Python library to load, examine, and save fonts in a variety of formats"; mainProgram = "babelfont"; diff --git a/pkgs/development/python-modules/beziers/default.nix b/pkgs/development/python-modules/beziers/default.nix index e132936a1c39..2af89a69c9fd 100644 --- a/pkgs/development/python-modules/beziers/default.nix +++ b/pkgs/development/python-modules/beziers/default.nix @@ -6,11 +6,12 @@ matplotlib, pyclipper, unittestCheckHook, + gitUpdater, }: buildPythonPackage rec { pname = "beziers"; - version = "0.5.0"; + version = "0.6.0"; format = "setuptools"; # PyPI doesn't have a proper source tarball, fetch from Github instead @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "simoncozens"; repo = "beziers.py"; rev = "v${version}"; - hash = "sha256-4014u7s47Tfdpa2Q9hKAoHg7Ebcs1/DVW5TpEmoh2bc="; + hash = "sha256-NjmWsRz/NPPwXPbiSaOeKJMrYmSyNTt5ikONyAljgvM="; }; propagatedBuildInputs = [ pyclipper ]; @@ -35,6 +36,8 @@ buildPythonPackage rec { "-v" ]; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + meta = with lib; { description = "Python library for manipulating Bezier curves and paths in fonts"; homepage = "https://github.com/simoncozens/beziers.py"; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index faffe2d1749e..bdd5665f5922 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -47,14 +47,14 @@ buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "3.4.1"; + version = "3.5.0"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-2CSWHkJlNnsHUM5YsH5WStC4PKZLM1UhzTQh6bnxDYk="; + hash = "sha256-Zeia3b6QDDevJaIFKuF0ttO6HvCMkf1att/XEuGEw5k="; }; src_test = fetchFromGitHub { diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index bb464cf3e572..b68f49c2af5a 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.147"; + version = "1.34.149"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-Okg9KlWyRwKdbl4EACFTmENTwMGYgmB69+NwOKfOcrA="; + hash = "sha256-PetZsY/HPE++MyT8tSzDx9DMeJM41D4H4O/R7xvA2Yw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 705f6072b2ba..c749c865f59f 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.147"; + version = "1.34.149"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-1px1txwv4UVrckZT9YatzVv2YP9tEE7LasXvtA/PNjs="; + hash = "sha256-DXtB2XIGpZV+vJXjP3qGXTOMRARTWqpaHTLNP6XR6og="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix index 06f0922af4b1..9a5d003475aa 100644 --- a/pkgs/development/python-modules/botorch/default.nix +++ b/pkgs/development/python-modules/botorch/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { wheel ]; - dependenciess = [ + dependencies = [ gpytorch linear-operator multipledispatch diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix index 89b05b5f3408..17047a321389 100644 --- a/pkgs/development/python-modules/cgroup-utils/default.nix +++ b/pkgs/development/python-modules/cgroup-utils/default.nix @@ -2,25 +2,13 @@ lib, buildPythonPackage, fetchFromGitHub, - pep8, - nose, + setuptools, }: buildPythonPackage rec { - version = "0.8"; - format = "setuptools"; pname = "cgroup-utils"; - - buildInputs = [ - pep8 - nose - ]; - # Pep8 tests fail... - doCheck = false; - - postPatch = '' - sed -i -e "/argparse/d" setup.py - ''; + version = "0.8"; + pyproject = true; src = fetchFromGitHub { owner = "peo3"; @@ -29,11 +17,25 @@ buildPythonPackage rec { sha256 = "0qnbn8cnq8m14s8s1hcv25xjd55dyb6yy54l5vc7sby5xzzp11fq"; }; - meta = with lib; { + postPatch = '' + sed -i -e "/argparse/d" setup.py + ''; + + build-system = [ setuptools ]; + + # Upon running `from cgutils import cgroup`, it attempts to read a file in `/sys`. + # Due to the Nix build sandbox, this is disallowed, and so all possible tests fail, + # so we don't run them. Plain `import cgutils` works, so we run pythonImportsCheck below. + doCheck = false; + + pythonImportsCheck = [ "cgutils" ]; + + meta = { description = "Utility tools for control groups of Linux"; + homepage = "https://github.com/peo3/cgroup-utils"; mainProgram = "cgutil"; - maintainers = with maintainers; [ layus ]; - platforms = platforms.linux; - license = licenses.gpl2; + maintainers = with lib.maintainers; [ layus ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix index 18a0d4aaf67d..bf887f347bfb 100644 --- a/pkgs/development/python-modules/conda/default.nix +++ b/pkgs/development/python-modules/conda/default.nix @@ -27,7 +27,7 @@ }: buildPythonPackage rec { pname = "conda"; - version = "24.5.0"; + version = "24.7.0"; pyproject = true; src = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "conda"; repo = "conda"; rev = "refs/tags/${version}"; - hash = "sha256-DbgdTaCMWf0d3MLEMGoWxN3x37tAtoW8T7mm5279yqk="; + hash = "sha256-5Zj27rqULUThbLb5lbb4oynAYoqsDa0mTkNH9sLM3VU="; }; diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index b92c7cc2ecd3..00f59b7990e6 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "croniter"; - version = "2.0.5"; + version = "2.0.7"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8fjKCvZCEvvpmxvuEl7lobU6nBtDOWjYvKiBe3nSN/M="; + hash = "sha256-EEG5ErSx4DdRoJk1Mb7Pd4Ua5uizNMnHb/7/uPBV9T8="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/datauri/default.nix b/pkgs/development/python-modules/datauri/default.nix index 58fec0584968..4bf82cf464ca 100644 --- a/pkgs/development/python-modules/datauri/default.nix +++ b/pkgs/development/python-modules/datauri/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "datauri"; - version = "2.1.1"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fcurella"; repo = "python-datauri"; rev = "refs/tags/v${version}"; - hash = "sha256-+R1J4IjJ+Vf/+V2kiZyIyAqTAgGLTMJjGePyVRuO5rs="; + hash = "sha256-9BCYC8PW44pB348kkH7aB1YqXXN1VNcBHphlN503M6g="; }; build-system = [ setuptools ]; @@ -34,11 +34,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "datauri" ]; - disabledTests = [ - # Test is incompatible with pydantic >=2 - "test_pydantic" - ]; - meta = with lib; { description = "Module for Data URI manipulation"; homepage = "https://github.com/fcurella/python-datauri"; diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index 4b002da52acf..ed70dd98468c 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "deebot-client"; - version = "8.1.1"; + version = "8.2.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; rev = "refs/tags/${version}"; - hash = "sha256-q52dMygpBzL92yW8DFIKpjxykGqW86CNM1xqxGf/JJ0="; + hash = "sha256-foIRWZcv+i/UZMMr1LjNiUpvJVD9UOWHPKHpcGHXfxQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index 759e96b34ad5..95ec86ff5eb3 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -3,6 +3,7 @@ stdenv, anytree, buildPythonPackage, + setuptools, cached-property, cgen, click, @@ -26,7 +27,7 @@ buildPythonPackage rec { pname = "devito"; version = "4.8.11"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -37,15 +38,18 @@ buildPythonPackage rec { hash = "sha256-c8/b2dRwfH4naSVRaRon6/mBDva7RSDmi/TJUJp26g0="; }; - pythonRemoveDeps = [ - "codecov" - "flake8" - "pytest-runner" - "pytest-cov" - ]; + # packaging.metadata.InvalidMetadata: 'python_version_3.8_' is invalid for 'provides-extra' + postPatch = '' + substituteInPlace requirements-testing.txt \ + --replace-fail 'pooch; python_version >= "3.8"' "pooch" + ''; + + pythonRemoveDeps = [ "pip" ]; pythonRelaxDeps = true; + build-system = [ setuptools ]; + dependencies = [ anytree cached-property diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index c53e939a66b6..73085f92bb69 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.21.8"; + version = "0.21.9"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "refs/tags/v${version}"; - hash = "sha256-ffKteff4Xsg9kxJukVlSnwmKowRN35bMfDJo/9mV6s8="; + hash = "sha256-397YJotA5PxyrOU+xwaOakPHf6Hynd7bdro/HIBDPHo="; }; build-system = [ diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 1c5823e8f917..c8e4bde9c55d 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.5.54"; + version = "1.5.55"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "fastcore"; rev = "refs/tags/${version}"; - hash = "sha256-42HEyxufJrzc5T6t6ixA5I0n8rh8wZ8MTfsjnmhbUfk="; + hash = "sha256-PjJYlOXiH9PBjv9mNe3PuXC7S95JXqOHQtrYFezGBpk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index cf5e161f9ae3..98eb55379493 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -48,18 +48,18 @@ buildPythonPackage rec { pname = "flask-security-too"; - version = "5.4.3"; + version = "5.5.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { - pname = "Flask-Security-Too"; + pname = "flask_security_too"; inherit version; - hash = "sha256-YrGTl+jXGo1MuNwNRAnMehSXmCVJAwOWlgruUYdV5YM="; + hash = "sha256-nuYOqKgH3Wfk2IFEDUhWUB6aP1xZ+c4DK7n0zB01TSk="; }; - build-system = [ setuptools ]; + build-system = [ setuptools ]; # flask-login>=0.6.2 not satisfied by version 0.7.0.dev0 pythonRelaxDeps = [ "flask-login" ]; diff --git a/pkgs/development/python-modules/glueviz/default.nix b/pkgs/development/python-modules/glueviz/default.nix index 1db27a1d7282..4f13f73214e7 100644 --- a/pkgs/development/python-modules/glueviz/default.nix +++ b/pkgs/development/python-modules/glueviz/default.nix @@ -3,69 +3,66 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - dill, astropy, + dill, + echo, + fast-histogram, + h5py, + ipython, + matplotlib, + mpl-scatter-density, numpy, + openpyxl, pandas, - qt6, - pyqt6, pyqt-builder, - qtconsole, + pytestCheckHook, + qt6, + scipy, setuptools, setuptools-scm, - scipy, - ipython, - ipykernel, - h5py, - matplotlib, + shapely, xlrd, - mpl-scatter-density, - pvextractor, - openpyxl, - echo, - pytest, - pytest-flakes, - pytest-cov, }: buildPythonPackage rec { pname = "glueviz"; - version = "1.21.0"; - format = "setuptools"; + version = "1.21.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "glue-viz"; repo = "glue"; rev = "refs/tags/v${version}"; - sha256 = "sha256-C9UqDdhPcaznidiDlQO27Vgct2MT9gVlH740hoYg3Bc="; + hash = "sha256-/awIgfKbDFKM2WFlfpo5f/Px/N1aMXkV9eSTXts0aGo="; }; buildInputs = [ pyqt-builder ]; - nativeBuildInputs = [ + + nativeBuildInputs = [ qt6.wrapQtAppsHook ]; + + build-system = [ setuptools setuptools-scm - qt6.wrapQtAppsHook ]; - propagatedBuildInputs = [ + + dependencies = [ astropy dill - setuptools - scipy - numpy - matplotlib - pandas - pyqt6 - qtconsole - ipython - ipykernel - h5py - xlrd - mpl-scatter-density - pvextractor - openpyxl echo + fast-histogram + h5py + ipython + matplotlib + mpl-scatter-density + numpy + openpyxl + pandas + scipy + setuptools + shapely + xlrd ]; dontConfigure = true; @@ -74,14 +71,12 @@ buildPythonPackage rec { # qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it was found. doCheck = false; - nativeCheckInputs = [ - pytest - pytest-flakes - pytest-cov - ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "glue" ]; + dontWrapQtApps = true; + preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; diff --git a/pkgs/development/python-modules/gstools/default.nix b/pkgs/development/python-modules/gstools/default.nix new file mode 100644 index 000000000000..e11048953986 --- /dev/null +++ b/pkgs/development/python-modules/gstools/default.nix @@ -0,0 +1,64 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + setuptools-scm, + numpy, + cython, + extension-helpers, + hankel, + emcee, + meshio, + pyevtk, + scipy, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "gstools"; + version = "1.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "GeoStat-Framework"; + repo = "GSTools"; + rev = "refs/tags/v${version}"; + hash = "sha256-QpdOARzcSRVFl/DbnE2JLBFZmTSh/fBOmzweuf+zfEs="; + }; + + build-system = [ + setuptools + setuptools-scm + numpy + cython + extension-helpers + ]; + + dependencies = [ + emcee + hankel + meshio + numpy + pyevtk + scipy + ]; + + # scipy derivation dont support numpy_2 and is patched to use version 1 + # Using numpy_2 in the derivation will cause a clojure duplicate error + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'numpy>=2.0.0rc1,' 'numpy' \ + ''; + + pythonImportsCheck = [ "gstools" ]; + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Geostatistical toolbox"; + homepage = "https://github.com/GeoStat-Framework/GSTools"; + changelog = "https://github.com/GeoStat-Framework/GSTools/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/hankel/default.nix b/pkgs/development/python-modules/hankel/default.nix new file mode 100644 index 000000000000..ae04ed26f3c9 --- /dev/null +++ b/pkgs/development/python-modules/hankel/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + setuptools-scm, + mpmath, + numpy, + scipy, + pytestCheckHook, + pytest-xdist, +}: + +buildPythonPackage rec { + pname = "hankel"; + version = "1.2.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "steven-murray"; + repo = "hankel"; + rev = "refs/tags/v${version}"; + hash = "sha256-/5PvbH8zz2siLS1YJYRSrl/Cpi0WToBu1TJhlek8VEE="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + dependencies = [ + mpmath + numpy + scipy + ]; + + pythonImportsCheck = [ "hankel" ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + ]; + + meta = { + description = "Implementation of Ogata's (2005) method for Hankel transforms"; + homepage = "https://github.com/steven-murray/hankel"; + changelog = "https://github.com/steven-murray/hankel/${src.rev}/CHANGELOG.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index e6439ea0f730..a97b3f055325 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "hcloud"; - version = "2.0.1"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Nf4rkVkXPEPPZ+xBCnfKfYeggBfhsgijnAIJzByR46A="; + hash = "sha256-cDyy2x1JINthvhuzQdwgMcykGrypnTkk4rJBk1WQ1HQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/knx-frontend/default.nix b/pkgs/development/python-modules/knx-frontend/default.nix index 060062891d9a..2ef44b3cfcfb 100644 --- a/pkgs/development/python-modules/knx-frontend/default.nix +++ b/pkgs/development/python-modules/knx-frontend/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "knx-frontend"; - version = "2024.1.20.105944"; + version = "2024.7.25.204106"; format = "pyproject"; # TODO: source build, uses yarn.lock src = fetchPypi { pname = "knx_frontend"; inherit version; - hash = "sha256-5u+BaZjbGpIpQd3k+u5NC099TQuiwGKdE/EoIWny01I="; + hash = "sha256-uy5by/abVeYTLpZM4fh1+3AUxhnkFtzcabf86LnC9SY="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index 27faa7f1e706..04e18825cf7f 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.10.7"; + version = "1.10.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; rev = "refs/tags/v${version}"; - hash = "sha256-n2aEKTOPztrWV9/qxRzk5G/9I2JBSHa2I4JZWWMR3wA="; + hash = "sha256-LErxBhTajXHPDC2oZqygKRs6MLp6PLq4XoaluCeadcQ="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index 011442e70f2a..b15b9a728d1f 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.25.1"; + version = "0.25.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "mkdocstrings"; rev = "refs/tags/${version}"; - hash = "sha256-Z4mX6EXEFmNd/CNa39hN9mwJSv9OkqwEmWMzJ9r+EBM="; + hash = "sha256-720qF1t/xl2voOMtkOR7U3lFXia4nI0VirgEFHpb39k="; }; postPatch = '' diff --git a/pkgs/development/python-modules/multiscale-spatial-image/default.nix b/pkgs/development/python-modules/multiscale-spatial-image/default.nix new file mode 100644 index 000000000000..41b4a720fc50 --- /dev/null +++ b/pkgs/development/python-modules/multiscale-spatial-image/default.nix @@ -0,0 +1,81 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + hatchling, + dask, + numpy, + python-dateutil, + spatial-image, + xarray, + xarray-datatree, + zarr, + dask-image, + fsspec, + jsonschema, + nbmake, + pooch, + pytestCheckHook, + pytest-mypy, + urllib3, +}: + +buildPythonPackage rec { + pname = "multiscale-spatial-image"; + version = "1.0.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "spatial-image"; + repo = "multiscale-spatial-image"; + rev = "refs/tags/v${version}"; + hash = "sha256-s/88N8IVkj+9MZYAtEJSpmmDdjIxf4S6U5gYr86Ikrw="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + dask + numpy + python-dateutil + spatial-image + xarray + xarray-datatree + zarr + ]; + + optional-dependencies = { + dask-image = [ dask-image ]; + #itk = [ + # itk-filtering # not in nixpkgs yet + #]; + test = [ + dask-image + fsspec + #ipfsspec # not in nixpkgs + #itk-filtering # not in nixpkgs + jsonschema + nbmake + pooch + pytest-mypy + urllib3 + ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.test; + + doCheck = false; # all test files try to download data + + pythonImportsCheck = [ "multiscale_spatial_image" ]; + + meta = { + description = "Generate a multiscale, chunked, multi-dimensional spatial image data structure that can serialized to OME-NGFF"; + homepage = "https://github.com/spatial-image/multiscale-spatial-image"; + changelog = "https://github.com/spatial-image/multiscale-spatial-image/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/nbdev/default.nix b/pkgs/development/python-modules/nbdev/default.nix index dc60601b7e6c..4186fae9f7e6 100644 --- a/pkgs/development/python-modules/nbdev/default.nix +++ b/pkgs/development/python-modules/nbdev/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "nbdev"; - version = "2.3.25"; + version = "2.3.26"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MntVdZ6LazdFCm+h5FaTxvzEwCtoJjrW/EJPTt2fdnU="; + hash = "sha256-PmLY2JQuVOl3NyWxwLewsEr7VKSdcWq7t0nNOHP9/8A="; }; diff --git a/pkgs/development/python-modules/nose-pattern-exclude/default.nix b/pkgs/development/python-modules/nose-pattern-exclude/default.nix deleted file mode 100644 index 62fc26fe7b7a..000000000000 --- a/pkgs/development/python-modules/nose-pattern-exclude/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - nose, -}: - -buildPythonPackage rec { - pname = "nose-pattern-exclude"; - version = "0.1.3"; - format = "setuptools"; - - propagatedBuildInputs = [ nose ]; - - src = fetchPypi { - inherit pname version; - sha256 = "0apzxx8lavsdlxlpaxqw1snx5p7q8v5dfbip6v32f9pj2vyain1i"; - }; - - # There are no tests - doCheck = false; - - meta = with lib; { - description = "Exclude specific files and directories from nosetests runs"; - homepage = "https://github.com/jakubroztocil/nose-pattern-exclude"; - license = licenses.bsd3; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/development/python-modules/nose-warnings-filters/default.nix b/pkgs/development/python-modules/nose-warnings-filters/default.nix deleted file mode 100644 index 39ad8c46f723..000000000000 --- a/pkgs/development/python-modules/nose-warnings-filters/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - isPy3k, - nose, -}: - -buildPythonPackage rec { - pname = "nose-warnings-filters"; - version = "0.1.5"; - format = "setuptools"; - - src = fetchPypi { - pname = "nose_warnings_filters"; - inherit version; - sha256 = "17dvfqfy2fm7a5cmiffw2dc3064kpx72fn5mlw01skm2rhn5nv25"; - }; - - disabled = !isPy3k; - - propagatedBuildInputs = [ nose ]; - - nativeCheckInputs = [ nose ]; - checkPhase = '' - nosetests -v - ''; - - meta = { - description = "Allow injecting warning filters during nosetest"; - homepage = "https://github.com/Carreau/nose_warnings_filters"; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/objexplore/default.nix b/pkgs/development/python-modules/objexplore/default.nix index cb92538340f6..02d4ceeb2142 100644 --- a/pkgs/development/python-modules/objexplore/default.nix +++ b/pkgs/development/python-modules/objexplore/default.nix @@ -10,9 +10,9 @@ pandas }: -buildPythonPackage rec { +buildPythonPackage { pname = "objexplore"; - version = "1.5.4"; + version = "1.6.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,8 +20,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kylepollina"; repo = "objexplore"; - rev = "refs/tags/v${version}"; - hash = "sha256-FFQIiip7pk9fQhjGLxMSMakwoXbzaUjXcbQgDX52dnI="; + # tags for >1.5.4 are not availables on github + # see: https://github.com/kylepollina/objexplore/issues/25 + rev = "3c2196d26e5a873eed0a694cddca66352ea7c81e"; + hash = "sha256-BgeuRRuvbB4p99mwCjNxm3hYEZuGua8x2GdoVssQ7eI="; }; pythonRelaxDeps = [ "blessed" "rich" ]; diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index 39fb0bf3a4bc..438078c56e73 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "oelint-parser"; - version = "3.5.4"; + version = "3.5.5"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_parser"; - hash = "sha256-2ZGzGJaVChd7XQM45qQF4vDw70iCEqxrVQP8lhGNfUg="; + hash = "sha256-4x7OgC5UKhAII2S1kDu+1RZyusr9F5cZDaRG9HFyhkA="; }; buildInputs = [ pip ]; diff --git a/pkgs/development/python-modules/okta/default.nix b/pkgs/development/python-modules/okta/default.nix index b97c8580125d..6a0331c36a17 100644 --- a/pkgs/development/python-modules/okta/default.nix +++ b/pkgs/development/python-modules/okta/default.nix @@ -5,10 +5,12 @@ buildPythonPackage, fetchPypi, flatdict, + jwcrypto, pycryptodome, pycryptodomex, pydash, pyfakefs, + pyjwt, pytest-asyncio, pytest-mock, pytest-recording, @@ -36,9 +38,11 @@ buildPythonPackage rec { aenum aiohttp flatdict + jwcrypto pycryptodome pycryptodomex pydash + pyjwt python-jose pyyaml xmltodict diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 77ae8d099276..3085a7ea72b2 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.35.14"; + version = "1.37.0"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Kxaf5bOFvvX6qoCyCIyGaL8eDp3C7MXQdSziiCDrfRs="; + hash = "sha256-hvzXOMEBDYVhmAJQDKYLO6HZMoRbGPTkXfoHdjysvlQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/peft/default.nix b/pkgs/development/python-modules/peft/default.nix index 76eaac3b2df2..73a1d47855d3 100644 --- a/pkgs/development/python-modules/peft/default.nix +++ b/pkgs/development/python-modules/peft/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "peft"; - version = "0.11.1"; + version = "0.12.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FV/S/N9wA+rUos/uQIzvPWmWCIFi8wi2Tt6jMzvYfYQ="; + hash = "sha256-7LYlqWiOPTvQyJgpUZeZ5Wl17RswhYyit0/MaHyN5Ak="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index d3f8f3f43b14..0fc5fe5648c0 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/pkgs/development/python-modules/pipx/default.nix @@ -41,7 +41,10 @@ buildPythonPackage rec { userpath ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + argcomplete + ]; nativeCheckInputs = [ pytestCheckHook @@ -95,9 +98,9 @@ buildPythonPackage rec { postInstall = '' installShellCompletion --cmd pipx \ - --bash <(${argcomplete}/bin/register-python-argcomplete pipx --shell bash) \ - --zsh <(${argcomplete}/bin/register-python-argcomplete pipx --shell zsh) \ - --fish <(${argcomplete}/bin/register-python-argcomplete pipx --shell fish) + --bash <(register-python-argcomplete pipx --shell bash) \ + --zsh <(register-python-argcomplete pipx --shell zsh) \ + --fish <(register-python-argcomplete pipx --shell fish) ''; meta = with lib; { diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 784ba319a271..4e2c4a884e73 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.25.8"; + version = "1.25.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-KuhcAhnpvM9pEzqr7Ke7aFuQ3WLbaAHEzThr5Idl+zU="; + hash = "sha256-p/Zy4roRG0xdk2w5O0CdYIr15D+wumiuGlCNxrHHWdw="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 98ade26c7694..8c7751b766b5 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -2,29 +2,37 @@ lib, buildPythonPackage, fetchPypi, - pytz, - requests, - six, + setuptools, + packaging, tenacity, }: buildPythonPackage rec { pname = "plotly"; - version = "5.22.0"; - format = "setuptools"; + version = "5.23.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-hZ/a29hrV3CuJGblQrdhskfRxrSdrtdluVu4xwY+dGk="; + hash = "sha256-ieV9ADoRYwOjTeZwCGI5E2fdVkIiq3H4Ux33Ann8AZM="; }; - propagatedBuildInputs = [ - pytz - requests - six + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "\"jupyterlab~=3.0;python_version>='3.6'\"," "" + ''; + + env.SKIP_NPM = true; + + build-system = [ setuptools ]; + + dependencies = [ + packaging tenacity ]; + pythonImportsCheck = [ "plotly" ]; + # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/preggy/default.nix b/pkgs/development/python-modules/preggy/default.nix index 5c4241a6477e..4281e6de0edf 100644 --- a/pkgs/development/python-modules/preggy/default.nix +++ b/pkgs/development/python-modules/preggy/default.nix @@ -4,8 +4,7 @@ fetchPypi, six, unidecode, - nose, - yanc, + pytestCheckHook, }: buildPythonPackage rec { @@ -17,20 +16,13 @@ buildPythonPackage rec { six unidecode ]; - nativeCheckInputs = [ - nose - yanc - ]; + nativeCheckInputs = [ pytestCheckHook ]; src = fetchPypi { inherit pname version; sha256 = "25ba803afde4f35ef543a60915ced2e634926235064df717c3cb3e4e3eb4670c"; }; - checkPhase = '' - nosetests . - ''; - meta = with lib; { description = "Assertion library for Python"; homepage = "http://heynemann.github.io/preggy/"; diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index cd640d600c57..56096db576e8 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pyaml"; - version = "24.4.0"; + version = "24.7.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Dkg9kokBDnR6Ml3EMXG8w51lYt0d1HGejMfnyWyZ/OY="; + hash = "sha256-XQ/fnmgQNvsmOng9Apj8OvWApuKmzxozFP/EjcPZHMs="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyevtk/default.nix b/pkgs/development/python-modules/pyevtk/default.nix new file mode 100644 index 000000000000..16081d1cc613 --- /dev/null +++ b/pkgs/development/python-modules/pyevtk/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + numpy, + pytestCheckHook, + pytest-cov, +}: + +buildPythonPackage rec { + pname = "pyevtk"; + version = "1.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pyscience-projects"; + repo = "pyevtk"; + rev = "refs/tags/v${version}"; + hash = "sha256-HrodoVxjREZiutgRJ3ZUrART29+gAZfpR9f4A4SRh4Q="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace-fail 'setup_requires=["pytest-runner"],' 'setup_requires=[],' + ''; + + build-system = [ setuptools ]; + dependencies = [ numpy ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov + ]; + + pythonImportsCheck = [ "pyevtk" ]; + + meta = { + description = "Exports data to binary VTK files for visualization/analysis"; + homepage = "https://github.com/pyscience-projects/pyevtk"; + changelog = "https://github.com/pyscience-projects/pyevtk/blob/${src.rev}/CHANGES.txt"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/pygogo/default.nix b/pkgs/development/python-modules/pygogo/default.nix deleted file mode 100644 index 889e2c7b06c3..000000000000 --- a/pkgs/development/python-modules/pygogo/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - pythonOlder, - buildPythonPackage, - fetchFromGitHub, - pkutils, - # Check Inputs - nose, -}: - -buildPythonPackage rec { - pname = "pygogo"; - version = "0.13.2"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "reubano"; - repo = "pygogo"; - rev = "v${version}"; - sha256 = "19rdf4sjrm5lp1vq1bki21a9lrkzz8sgrfwgjdkq4sgy90hn1jn9"; - }; - - nativeBuildInputs = [ pkutils ]; - - nativeCheckInputs = [ nose ]; - - postPatch = '' - substituteInPlace dev-requirements.txt \ - --replace "pkutils>=1.0.0,<2.0.0" "pkutils>=1.0.0" - ''; - - checkPhase = '' - runHook preCheck - nosetests - runHook postCheck - ''; - - pythonImportsCheck = [ "pygogo" ]; - - meta = with lib; { - description = "Python logging library"; - homepage = "https://github.com/reubano/pygogo/"; - license = licenses.mit; - maintainers = with maintainers; [ drewrisinger ]; - }; -} diff --git a/pkgs/development/python-modules/pyinstaller/default.nix b/pkgs/development/python-modules/pyinstaller/default.nix index 2c8fc65ebd28..c8b4d4697202 100644 --- a/pkgs/development/python-modules/pyinstaller/default.nix +++ b/pkgs/development/python-modules/pyinstaller/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "pyinstaller"; - version = "6.8.0"; + version = "6.9.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-P0tlIPRCP+GbzC/WOrcjiFGuK9y8mPJbxdL5fMYgEuk="; + hash = "sha256-9KdcVS+swuKjcPHkIrlxteXNtAWP84zqAjWqIfwLN48="; }; diff --git a/pkgs/development/python-modules/pylacrosse/default.nix b/pkgs/development/python-modules/pylacrosse/default.nix index ec7977b5a042..0bd6c7f0b977 100644 --- a/pkgs/development/python-modules/pylacrosse/default.nix +++ b/pkgs/development/python-modules/pylacrosse/default.nix @@ -2,8 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, mock, - nose, pyserial, pytestCheckHook, pythonOlder, @@ -23,6 +23,14 @@ buildPythonPackage rec { hash = "sha256-jrkehoPLYbutDfxMBO/vlx4nMylTNs/gtvoBTFHFsDw="; }; + patches = [ + # Migrate to pytest, https://github.com/hthiery/python-lacrosse/pull/17 + (fetchpatch2 { + url = "https://github.com/hthiery/python-lacrosse/commit/cc2623c667bc252360a9b5ccb4fc05296cf23d9c.patch?full_index=1"; + hash = "sha256-LKryLnXMKj1lVClneyHNVOWM5KPPhOGy0/FX/7Qy/jU="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "version = version," "version = '${version}'," @@ -30,11 +38,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyserial ]; - doCheck = pythonOlder "3.12"; - nativeCheckInputs = [ mock - nose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pymee/default.nix b/pkgs/development/python-modules/pymee/default.nix new file mode 100644 index 000000000000..7c07ff13e5fc --- /dev/null +++ b/pkgs/development/python-modules/pymee/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + aiohttp, + websockets, +}: + +buildPythonPackage rec { + pname = "pymee"; + version = "2.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "FreshlyBrewedCode"; + repo = "pymee"; + rev = "refs/tags/v${version}"; + hash = "sha256-4XKd0lZ6RAsG2zXjKMUeST6cNcg+SjT371gxLIhxkAA="; + }; + + build-system = [ setuptools ]; + dependencies = [ + aiohttp + websockets + ]; + + pythonImportsCheck = [ "pymee" ]; + + # no tests + doCheck = false; + + meta = { + description = "Python library to interact with homee"; + homepage = "https://github.com/FreshlyBrewedCode/pymee"; + changelog = "https://github.com/FreshlyBrewedCode/pymee/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix index 345f3cec3353..7082611f6716 100644 --- a/pkgs/development/python-modules/pyngrok/default.nix +++ b/pkgs/development/python-modules/pyngrok/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyngrok"; - version = "7.1.6"; + version = "7.2.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-BcD8pjQJE2WKvdxiOgpTknrO2T4n/++AHSSBS8sYDqo="; + hash = "sha256-TkOvmy8hzu2NITeXAo/ogjAD8YW0l5Lk04MwI2XIFRU="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pynws/default.nix b/pkgs/development/python-modules/pynws/default.nix index a9e5e959e53d..444b28ddbb4d 100644 --- a/pkgs/development/python-modules/pynws/default.nix +++ b/pkgs/development/python-modules/pynws/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pynws"; - version = "1.8.2"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "MatthewFlamm"; repo = "pynws"; rev = "refs/tags/v${version}"; - hash = "sha256-3QKdZ7hg7HfQ56xHbkhXCtlBq4JCwfXdZiTctI3OVl0="; + hash = "sha256-eAXIlX/K7Cpq+aiPHiRGqhtSHQDtbHONYP0AjRW8JjY="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyrfc3339/default.nix b/pkgs/development/python-modules/pyrfc3339/default.nix index ccfca503e786..bf2abeb811d6 100644 --- a/pkgs/development/python-modules/pyrfc3339/default.nix +++ b/pkgs/development/python-modules/pyrfc3339/default.nix @@ -2,16 +2,12 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, # build-system setuptools, # dependencies pytz, - - # tests - nose, }: buildPythonPackage rec { @@ -29,9 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytz ]; - doCheck = pythonOlder "3.12"; - - nativeCheckInputs = [ nose ]; + doCheck = false; # tests are not including in PyPI tarball meta = with lib; { description = "Generate and parse RFC 3339 timestamps"; diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix index d94e1fec3a74..9be5028a8787 100644 --- a/pkgs/development/python-modules/pysrt/default.nix +++ b/pkgs/development/python-modules/pysrt/default.nix @@ -2,14 +2,16 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, chardet, - nose, + pytestCheckHook, + fetchpatch2, }: buildPythonPackage rec { pname = "pysrt"; version = "1.1.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "byroot"; @@ -18,16 +20,22 @@ buildPythonPackage rec { sha256 = "1f5hxyzlh5mdvvi52qapys9qcinffr6ghgivb6k4jxa92cbs3mfg"; }; - nativeCheckInputs = [ nose ]; - checkPhase = '' - nosetests -v - ''; + patches = [ + (fetchpatch2 { + url = "https://github.com/byroot/pysrt/commit/93f52f6d4f70f4e18dc71deeaae0ec1e9100a50f.patch?full_index=1"; + hash = "sha256-nikMPwj3OHvl6LunAfRk6ZbFUvVgPwF696Dt8R7BY4U="; + }) + ]; + + build-system = [ setuptools ]; propagatedBuildInputs = [ chardet ]; + nativeCheckInputs = [ pytestCheckHook ]; + meta = with lib; { homepage = "https://github.com/byroot/pysrt"; - license = licenses.gpl3; + license = licenses.gpl3Only; description = "Python library used to edit or create SubRip files"; mainProgram = "srt"; }; diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 571ce5d5148d..7eb173f6c4a4 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "4.7.0"; + version = "4.8.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "python_gitlab"; inherit version; - hash = "sha256-t5jN29nRZreVcebWyXVCl40KOV3lcWnHCX0JIQp2am0="; + hash = "sha256-wsTXsc1QPZBa/l38Dz9mGZNDYfdq6FXGzsmmZoZNN88="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytimeparse/default.nix b/pkgs/development/python-modules/pytimeparse/default.nix index 87a1d9c6f1b3..f18cd6df1d1f 100644 --- a/pkgs/development/python-modules/pytimeparse/default.nix +++ b/pkgs/development/python-modules/pytimeparse/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - nose, + pytestCheckHook, pythonOlder, setuptools, }: @@ -21,10 +21,8 @@ buildPythonPackage rec { build-system = [ setuptools ]; - # tests rely on nose - doCheck = pythonOlder "3.12"; - - nativeCheckInputs = [ nose ]; + nativeCheckInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "pytimeparse/tests/testtimeparse.py" ]; pythonImportsCheck = [ "pytimeparse" ]; diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix index 6a55316e99c0..39da7959de59 100644 --- a/pkgs/development/python-modules/qtile-extras/default.nix +++ b/pkgs/development/python-modules/qtile-extras/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "qtile-extras"; - version = "0.27.0"; + version = "0.27.0.post1"; pyproject = true; src = fetchFromGitHub { owner = "elParaguayo"; repo = "qtile-extras"; rev = "refs/tags/v${version}"; - hash = "sha256-2HpiUnFfGP3XNe6vFQyXMUxwqdXxFulm919t3o8a/ys="; + hash = "sha256-c5MCcpU6g95DMycSgOaUdpvPUtgVV/zUSdKVDbZWZGM="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix index aae91c7567e0..eef3e3b975ce 100644 --- a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix +++ b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix @@ -19,13 +19,13 @@ onnxruntime, }: let - version = "1.3.22"; + version = "1.3.24"; src = fetchFromGitHub { owner = "RapidAI"; repo = "RapidOCR"; - rev = "v${version}"; - hash = "sha256-8h4DFhnI9imr+bYQZdlrl8UKUdpwnGK+SGxLXSMmcag="; + rev = "refs/tags/v${version}"; + hash = "sha256-+iY+/IdOgsn+LPZQ4Kdzxuh31csQ7dyh5Zf552ne3N0="; }; models = fetchzip { diff --git a/pkgs/development/python-modules/rio-tiler/default.nix b/pkgs/development/python-modules/rio-tiler/default.nix index 757dd7c5e174..008fb69e8aa7 100644 --- a/pkgs/development/python-modules/rio-tiler/default.nix +++ b/pkgs/development/python-modules/rio-tiler/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, pytestCheckHook, pythonOlder, @@ -33,6 +34,14 @@ buildPythonPackage rec { hash = "sha256-MR6kyoGM3uXt6JiIEfGcsmTmxqlLxUF9Wn+CFuK5LtQ="; }; + patches = [ + # fix xarray tests, remove on next release + (fetchpatch { + url = "https://github.com/cogeotiff/rio-tiler/commit/7a36ed58b649d2f4d644f280b54851ecb7ffa4e9.patch"; + hash = "sha256-QlX5ZKpjSpXevi76gx39dXok0aClApkLU0cAVpCuYYs="; + }) + ]; + build-system = [ hatchling ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rioxarray/default.nix b/pkgs/development/python-modules/rioxarray/default.nix index d270fb5049ec..3de4fe980bf3 100644 --- a/pkgs/development/python-modules/rioxarray/default.nix +++ b/pkgs/development/python-modules/rioxarray/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "rioxarray"; - version = "0.15.7"; + version = "0.17.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "corteva"; repo = "rioxarray"; rev = "refs/tags/${version}"; - hash = "sha256-x5+T1ITZ6t+08s+WpSiqbohiKVfigREn63+5pJYHkxc="; + hash = "sha256-mOXyfkreQ55vWmPCG2U/ijcKZqzHoQQLfKArSh2fDmA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sampledata/default.nix b/pkgs/development/python-modules/sampledata/default.nix deleted file mode 100644 index 4583375eea00..000000000000 --- a/pkgs/development/python-modules/sampledata/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - nose, - pytz, - six, - versiontools, -}: - -buildPythonPackage rec { - pname = "sampledata"; - version = "0.3.7"; - format = "setuptools"; - - meta = { - description = "Sample Data generator for Python"; - homepage = "https://github.com/jespino/sampledata"; - license = lib.licenses.bsd3; - }; - - src = fetchPypi { - inherit pname version; - sha256 = "1kx2j49lag30d32zhzsr50gl5b949wa4lcdap2filg0d07picsdh"; - }; - - buildInputs = [ - nose - versiontools - ]; - propagatedBuildInputs = [ - pytz - six - ]; - - # ERROR: test_image_path_from_directory (tests.tests.TestImageHelpers) - # ERROR: test_image_stream (tests.tests.TestImageHelpers) - doCheck = false; - - checkPhase = '' - nosetests -e "TestImageHelpers" - ''; -} diff --git a/pkgs/development/python-modules/selectors2/default.nix b/pkgs/development/python-modules/selectors2/default.nix deleted file mode 100644 index b2b79711c259..000000000000 --- a/pkgs/development/python-modules/selectors2/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - nose, - psutil, - mock, -}: - -buildPythonPackage rec { - version = "2.0.2"; - format = "setuptools"; - pname = "selectors2"; - - src = fetchPypi { - inherit pname version; - sha256 = "1f1bbaac203a23fbc851dc1b5a6e92c50698cc8cefa5873eb5b89eef53d1d82b"; - }; - - patches = [ ./mapping-import.patch ]; - - nativeCheckInputs = [ - nose - psutil - mock - ]; - - checkPhase = '' - # https://github.com/NixOS/nixpkgs/pull/46186#issuecomment-419450064 - # Trick to disable certain tests that depend on timing which - # will always fail on hydra - export TRAVIS="" - nosetests tests/test_selectors2.py \ - --exclude=test_above_fd_setsize - ''; - - meta = with lib; { - homepage = "https://www.github.com/SethMichaelLarson/selectors2"; - description = "Back-ported, durable, and portable selectors"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/selectors2/mapping-import.patch b/pkgs/development/python-modules/selectors2/mapping-import.patch deleted file mode 100644 index 64f74a5ce29b..000000000000 --- a/pkgs/development/python-modules/selectors2/mapping-import.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/selectors2.py b/selectors2.py -index 1625a30..c4a1231 100644 ---- a/selectors2.py -+++ b/selectors2.py -@@ -22,7 +22,8 @@ - # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - # SOFTWARE. - --from collections import namedtuple, Mapping -+from collections import namedtuple -+from collections.abc import Mapping - import errno - import math - import platform diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 4bfd35cae5ad..38200db6976f 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -63,14 +63,14 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "2.10.0"; + version = "2.11.0"; pyproject = true; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-python"; rev = version; - hash = "sha256-sK3jd26zfGp707GXZEU9RwB1aFuqfTGl8rGfGreuj38="; + hash = "sha256-ajinOND8MC9Z69WPxF65wjOmJfU5CZUzTRWJwLLh/OQ="; }; postPatch = '' @@ -187,6 +187,8 @@ buildPythonPackage rec { # assert count_item_types["sessions"] == 1 # assert 0 == 1 "test_auto_session_tracking_with_aggregates" + # timing sensitive + "test_profile_captured" ]; pythonImportsCheck = [ "sentry_sdk" ]; diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index cfc61601b34d..736612551ccd 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "3.11.0"; + version = "3.12.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "snowflake_connector_python"; inherit version; - hash = "sha256-MWnAFKA+X1hVESYF45OJelUuVYlTxp8loC4zsZmIZNA="; + hash = "sha256-Mg4Lb4zYVW4ZyLhySckxcAI4spWDE6/HozEI1n2ofYI="; }; build-system = [ diff --git a/pkgs/development/python-modules/sphinx-autoapi/default.nix b/pkgs/development/python-modules/sphinx-autoapi/default.nix index 6dba44b5cace..0baa5c7d6591 100644 --- a/pkgs/development/python-modules/sphinx-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinx-autoapi/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "3.1.2"; + version = "3.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sphinx_autoapi"; inherit version; - hash = "sha256-+l6xiPZ6454ZsufSUnx10GTg8Lmsf3ejVY7CbMtzHCY="; + hash = "sha256-+AWA/1DseoZA3J0MPEDqrNOnFbtyx6t4Dk5QTB0HWfs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix b/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix index d3b4bf7f4104..863f93848846 100644 --- a/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix +++ b/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix @@ -2,8 +2,7 @@ buildPythonPackage, fetchFromGitHub, lib, - pythonOlder, - nose, + pytestCheckHook, setuptools, sphinx, sphinx-rtd-theme, @@ -25,21 +24,12 @@ buildPythonPackage rec { dependencies = [ sphinx-rtd-theme ]; - # tests rely on nose - doCheck = pythonOlder "3.12"; - nativeCheckInputs = [ - nose + pytestCheckHook sphinx ]; - checkPhase = '' - runHook preCheck - - nosetests tests - - runHook postCheck - ''; + pytestFlagsArray = [ "tests/build.py" ]; pythonImportsCheck = [ "sphinx_rtd_dark_mode" ]; diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 08a23ed4f273..239ac5a0149a 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.8.5"; + version = "1.8.7.post1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ADs0Tfd8iR1OSGkV7pFdRw0RDHbxk6Ztje1AvSIdWqI="; + hash = "sha256-rycF/D6knpOHlmTZBVysq9DMqCadwv1eq8vkuhpZ2hQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index dba3b101142f..05a7f8fc4003 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.235.1"; + version = "0.236.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-jfV1/n5YbVn658PF7PTIWV17UwEglFjszZufb+yy5ug="; + hash = "sha256-k5BzU2VQ5r5nPduJL8DKQSOFYqfgFECtkkEzQB01sq4="; }; patches = [ diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index c30512d1171d..52f4a122bc04 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -33,14 +33,14 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.36.0"; + version = "1.37.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-oSr58Othq1gy9DgzYlex7CDrKdjg4Ma0CnkRa6k5vJw="; + hash = "sha256-Rj73KLoh504FEi43BOivZEp727WCLigbja9KCkh2GHk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index adeb9d61198e..a06f880b8cc7 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.7.2"; + version = "0.7.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; rev = "refs/tags/v${version}"; - hash = "sha256-BvKFRJS/0xvk++HP5Ovpzb1+phGAyTHgByqwTNwS3nQ="; + hash = "sha256-P5cU5TZ2zWVIkFp4USjofA6mOshG9IdjhYLXnY2z9fY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tissue/default.nix b/pkgs/development/python-modules/tissue/default.nix deleted file mode 100644 index f716c1b715f8..000000000000 --- a/pkgs/development/python-modules/tissue/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - nose, - pep8, -}: - -buildPythonPackage rec { - pname = "tissue"; - version = "0.9.2"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "7e34726c3ec8fae358a7faf62de172db15716f5582e5192a109e33348bd76c2e"; - }; - - buildInputs = [ nose ]; - propagatedBuildInputs = [ pep8 ]; - - meta = with lib; { - homepage = "https://github.com/WoLpH/tissue"; - description = "Tissue - automated pep8 checker for nose"; - license = licenses.lgpl2; - maintainers = with maintainers; [ domenkozar ]; - }; -} diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 78080fd1e9cb..8a2bdcfd5d8a 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "7.2.5"; + version = "7.2.6"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ph3S7lwilGMk9tXxmZDIglpLfGmGHV1Dhj4oA8FLjws="; + hash = "sha256-Vz1bYIwhvH8SHZnmv9ZuaoOnNe378gtIWK2UQDBQxas="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 9fdcd16b0059..0e2954f89525 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.32.0.20240622"; + version = "2.32.0.20240712"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-7V6KQS/MORWdYxk4XACdZChF8lDGOQJxj2Bc2Q+q3jE="; + hash = "sha256-kMB5/wXlSfa/UOAukQIQuYuP8evdGOGchzzSN3N8E1g="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/unicode-slugify/default.nix b/pkgs/development/python-modules/unicode-slugify/default.nix index 47a91979bf43..32e7a66db70a 100644 --- a/pkgs/development/python-modules/unicode-slugify/default.nix +++ b/pkgs/development/python-modules/unicode-slugify/default.nix @@ -2,10 +2,10 @@ lib, buildPythonPackage, fetchPypi, - nose, + fetchpatch, + pytestCheckHook, six, unidecode, - unittestCheckHook, }: buildPythonPackage rec { @@ -18,15 +18,23 @@ buildPythonPackage rec { sha256 = "25f424258317e4cb41093e2953374b3af1f23097297664731cdb3ae46f6bd6c3"; }; + patches = [ + ./use_pytest_instead_of_nose.patch + # mozilla/unicode-slugify#41: Fix Python 3.12 SyntaxWarning + (fetchpatch { + url = "https://github.com/mozilla/unicode-slugify/commit/a18826f440d0b74e536f5e32ebdcf30e720f20d8.patch"; + hash = "sha256-B27psp0XI5GhoR0l5lFpUOh88hHzjJYzJS5PnIkfFws="; + }) + ]; + propagatedBuildInputs = [ six unidecode ]; - nativeCheckInputs = [ - nose - unittestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "slugify/tests.py" ]; meta = with lib; { description = "Generates unicode slugs"; diff --git a/pkgs/development/python-modules/unicode-slugify/use_pytest_instead_of_nose.patch b/pkgs/development/python-modules/unicode-slugify/use_pytest_instead_of_nose.patch new file mode 100644 index 000000000000..4aea175ffa4a --- /dev/null +++ b/pkgs/development/python-modules/unicode-slugify/use_pytest_instead_of_nose.patch @@ -0,0 +1,69 @@ +diff --git a/slugify/tests.py b/slugify/tests.py +index 9f636c4..5562e87 100644 +--- a/slugify/tests.py ++++ b/slugify/tests.py +@@ -3,7 +3,7 @@ from __future__ import unicode_literals + + import six + import unittest +-from nose.tools import eq_, raises ++import pytest + + from slugify import slugify, smart_text, SLUG_OK + +@@ -13,31 +13,31 @@ def test_slugify(): + x = '-'.join([u, u]) + y = ' - '.join([u, u]) + +- @raises(ValueError) + def test_incoherent_ok_and_only_ascii_raises_an_error(): + """Checks that only_ascii=True with non ascii "ok" chars actually raises an error.""" +- slugify('angry smiley !', ok='è_é', only_ascii=True) ++ with pytest.raises(ValueError): ++ slugify('angry smiley !', ok='è_é', only_ascii=True) + + def check(x, y): +- eq_(slugify(x), y) ++ assert slugify(x) == y + + def check_only_ascii(x, y): +- eq_(slugify(x, only_ascii=True), y) ++ assert slugify(x, only_ascii=True) == y + + def check_only_ascii_capital(x, y): +- eq_(slugify(x, lower=False, only_ascii=True), y) ++ assert slugify(x, lower=False, only_ascii=True) == y + + def check_only_ascii_lower_nospaces(x, y): +- eq_(slugify(x, lower=True, spaces=False, only_ascii=True), y) ++ assert slugify(x, lower=True, spaces=False, only_ascii=True) == y + + def check_ok_chars(x, y): +- eq_(slugify(x, ok='-♰é_è'), y) ++ assert slugify(x, ok='-♰é_è') == y + + def check_empty_ok_chars(x, y): +- eq_(slugify(x, ok=''), y) ++ assert slugify(x, ok='') == y + + def check_limited_ok_chars_only_ascii(x, y): +- eq_(slugify(x, ok='-', only_ascii=True), y) ++ assert slugify(x, ok='-', only_ascii=True) == y + + s = [('xx x - "#$@ x', 'xx-x-x'), + ('Bän...g (bang)', 'bäng-bang'), +@@ -112,11 +112,11 @@ def test_slugify(): + + #Test custom space replacement + x, y = ('-☀- pretty waves under the sunset 😎', '--~pretty~waves~under~the~sunset') +- eq_(slugify(x, space_replacement='~'), y) ++ assert slugify(x, space_replacement='~') == y + + #Test default auto space replacement + x, y = ('-☀- pretty waves under the sunset 😎', 'pretty~waves~under~the~sunset') +- eq_(slugify(x, ok='~'), y) ++ assert slugify(x, ok='~') == y + + + class SmartTextTestCase(unittest.TestCase): + diff --git a/pkgs/development/python-modules/uxsim/default.nix b/pkgs/development/python-modules/uxsim/default.nix index 675e92a1de31..f75a620ec5a1 100644 --- a/pkgs/development/python-modules/uxsim/default.nix +++ b/pkgs/development/python-modules/uxsim/default.nix @@ -17,14 +17,14 @@ }: buildPythonPackage rec { pname = "uxsim"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; src = fetchFromGitHub { owner = "toruseo"; repo = "UXsim"; rev = "refs/tags/v${version}"; - hash = "sha256-2lN2Cu0XXiYdLiE7phpGqhkBDjkmxLJt4ILb6ORWdCI="; + hash = "sha256-74iNsRtEmpE+i4FeKCXrqczdMP9u4mVt6eyF/4RXZfU="; }; patches = [ ./add-qt-plugin-path-to-env.patch ]; diff --git a/pkgs/development/python-modules/vfblib/default.nix b/pkgs/development/python-modules/vfblib/default.nix new file mode 100644 index 000000000000..81f0ac7c95fe --- /dev/null +++ b/pkgs/development/python-modules/vfblib/default.nix @@ -0,0 +1,49 @@ +{ + lib, + fetchFromGitHub, + gitUpdater, + buildPythonPackage, + pytestCheckHook, + setuptools, + fonttools, + typing-extensions, + ufonormalizer, + ufolib2, + defcon, +}: + +buildPythonPackage rec { + pname = "vfblib"; + version = "0.7.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "LucasFonts"; + repo = "vfbLib"; + rev = "v${version}"; + hash = "sha256-1F7Em3qX5QKHaGDYVfEOHwYu3PxZUWboe67Hgitvebc="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + fonttools + typing-extensions + ufonormalizer + ufolib2 + defcon + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "vfbLib" ]; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = with lib; { + description = "Converter and deserializer for FontLab Studio 5 VFB files"; + homepage = "https://github.com/LucasFonts/vfbLib"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/development/python-modules/vxi11/default.nix b/pkgs/development/python-modules/vxi11/default.nix index 0b3debdd5dd6..f68979cf2fea 100644 --- a/pkgs/development/python-modules/vxi11/default.nix +++ b/pkgs/development/python-modules/vxi11/default.nix @@ -2,7 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, - nose, + pytestCheckHook, + fetchpatch2, }: buildPythonPackage rec { @@ -17,10 +18,23 @@ buildPythonPackage rec { sha256 = "1xv7chp7rm0vrvbz6q57fpwhlgjz461h08q9zgmkcl2l0w96hmsn"; }; - nativeCheckInputs = [ nose ]; - checkPhase = '' - nosetests - ''; + patches = [ + # set of patches from python-ivi/python-vxi11#47 + + # Fix deprecation warning + (fetchpatch2 { + url = "https://github.com/python-ivi/python-vxi11/commit/00722b1b8810ac38bfb47e8c49437055b600dfff.patch?full_index=1"; + hash = "sha256-fZDhg578UY/Q/2li1EmL5WTPx1OUfyebzvvBVK/IyDU="; + }) + + # Removes nose dependency + (fetchpatch2 { + url = "https://github.com/python-ivi/python-vxi11/commit/a8ad324d645d6f7215f207f2cc2988dc49859698.patch?full_index=1"; + hash = "sha256-nkH6ww4jBypEmZeatEb8fpFTB7x/AMppeEmuH9a4v6I="; + }) + ]; + + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "VXI-11 driver for controlling instruments over Ethernet"; diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index c1b509b924dd..6b01ac4147ff 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "wagtail"; - version = "6.1.2"; + version = "6.1.3"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-/bgsbNb2rlwfeyMSFmlp2GAQFbZcuymtEg76xyfTmcE="; + hash = "sha256-j0kIqxtrljqKp6348OxzjNHcebmBbG1fWQGPYApAQ3g="; }; postPatch = '' diff --git a/pkgs/development/python-modules/whool/default.nix b/pkgs/development/python-modules/whool/default.nix new file mode 100644 index 000000000000..60cb6bf111f9 --- /dev/null +++ b/pkgs/development/python-modules/whool/default.nix @@ -0,0 +1,49 @@ +{ + buildPythonPackage, + fetchFromGitHub, + git, + hatch-vcs, + lib, + manifestoo-core, + pytestCheckHook, + pythonOlder, + tomli, + wheel, +}: + +buildPythonPackage rec { + pname = "whool"; + version = "1.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "sbidoul"; + repo = "whool"; + rev = "refs/tags/v${version}"; + hash = "sha256-skJoMDIgZgRjfp4tsc6TKYVe09XBvg8Fk2BQfqneCYI="; + }; + + build-system = [ hatch-vcs ]; + + dependencies = [ + manifestoo-core + wheel + ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + + pythonImportsCheck = [ "whool" ]; + + nativeCheckInputs = [ + pytestCheckHook + git + ]; + + setupHook = ./setup-hook.sh; + + meta = { + description = "Standards-compliant Python build backend to package Odoo addons"; + homepage = "https://github.com/sbidoul/whool"; + changelog = "https://github.com/sbidoul/whool/blob/${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.yajo ]; + }; +} diff --git a/pkgs/development/python-modules/whool/setup-hook.sh b/pkgs/development/python-modules/whool/setup-hook.sh new file mode 100644 index 000000000000..1c8ecdf2c663 --- /dev/null +++ b/pkgs/development/python-modules/whool/setup-hook.sh @@ -0,0 +1,16 @@ +# Avoid using git to auto-bump the addon version +# DOCS https://github.com/sbidoul/whool/?tab=readme-ov-file#configuration +whool-post-version-strategy-hook() { + # DOCS https://stackoverflow.com/a/13864829/1468388 + if [ -z ${WHOOL_POST_VERSION_STRATEGY_OVERRIDE+x} ]; then + echo Setting WHOOL_POST_VERSION_STRATEGY_OVERRIDE to none + export WHOOL_POST_VERSION_STRATEGY_OVERRIDE=none + fi + + # Make sure you can import the built addon + for manifest in $(find -L . -name __manifest__.py); do + export pythonImportsCheck="$pythonImportsCheck odoo.addons.$(basename $(dirname $(realpath $manifest)))" + done +} + +preBuildHooks+=(whool-post-version-strategy-hook) diff --git a/pkgs/development/python-modules/xarray-datatree/default.nix b/pkgs/development/python-modules/xarray-datatree/default.nix new file mode 100644 index 000000000000..1d99f300cb7b --- /dev/null +++ b/pkgs/development/python-modules/xarray-datatree/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + check-manifest, + setuptools, + setuptools-scm, + packaging, + pytestCheckHook, + xarray, + zarr, +}: + +buildPythonPackage rec { + pname = "datatree"; + version = "0.0.14"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "xarray-contrib"; + repo = "datatree"; + rev = "refs/tags/v${version}"; + hash = "sha256-C6+WcHc2+sftJ5Yyh/9TTIHhAEwhAqSsSkaDwtq7J90="; + }; + + build-system = [ + check-manifest + setuptools + setuptools-scm + ]; + + dependencies = [ + packaging + xarray + ]; + + nativeCheckInputs = [ + pytestCheckHook + zarr + ]; + + pythonImportsCheck = [ "datatree" ]; + + disabledTests = [ + # output formatting issue, likely due to underlying library version difference: + "test_diff_node_data" + ]; + + meta = with lib; { + description = "Tree-like hierarchical data structure for xarray"; + homepage = "https://xarray-datatree.readthedocs.io"; + changelog = "https://github.com/xarray-contrib/datatree/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/yanc/default.nix b/pkgs/development/python-modules/yanc/default.nix deleted file mode 100644 index 30d0e302cd43..000000000000 --- a/pkgs/development/python-modules/yanc/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - buildPythonPackage, - pythonOlder, - fetchPypi, - nose, -}: - -buildPythonPackage rec { - pname = "yanc"; - version = "0.3.3"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "0z35bkk9phs40lf5061k1plhjdl5fskm0dmdikrsqi1bjihnxp8w"; - }; - - # Tests fail on Python>=3.5. See: https://github.com/0compute/yanc/issues/10 - doCheck = pythonOlder "3.5"; - - nativeCheckInputs = [ nose ]; - - checkPhase = '' - nosetests . - ''; - - meta = with lib; { - description = "Yet another nose colorer"; - homepage = "https://github.com/0compute/yanc"; - license = licenses.gpl3; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/development/python-modules/yt-dlp-dearrow/default.nix b/pkgs/development/python-modules/yt-dlp-dearrow/default.nix new file mode 100644 index 000000000000..ae182ce79a47 --- /dev/null +++ b/pkgs/development/python-modules/yt-dlp-dearrow/default.nix @@ -0,0 +1,32 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: + +buildPythonPackage { + pname = "yt-dlp-dearrow"; + version = "2023.01.01-unstable-2024-01-13"; # setup.cfg + pyproject = true; + + src = fetchFromGitHub { + owner = "QuantumWarpCode"; + repo = "yt-dlp-dearrow"; + rev = "2e46eca7b2242d8c9765bf2d12f92270b694be64"; # no tags + hash = "sha256-Ubi1kn/1FqkuwnxToBuSsAfCYWiNCTl/EUD8eeG3MSY="; + }; + + build-system = [ setuptools ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ "yt_dlp_plugins" ]; + + meta = { + description = "Post-processor plugin to use DeArrow video titles in YT-DLP"; + homepage = "https://github.com/QuantumWarpCode/yt-dlp-dearrow"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index 676c8eebb07b..743aa87325f3 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.4.0", + "version": "1.4.1", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "1k9yc868lh7yjvxf81pg9n1sdyb2c566i6qwrf7kxczn0s9sa12h" + "sha256": "08w3xvh62faiaw5ma5nwayf5j0382llmaq9kn9xvxc9csnpwmn6m" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "08chhm364m5lbl1wr5xiww3mmm8d31hfw07s4jdsrmpjvxx0yrhg" + "sha256": "000k2nxh9qa20l5xblrawqmy6qf5i0ad59g2l4iblplflzw6lv8h" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "1a1ng800aaydvp83wrvxdxw3x6zcdgl2g7fa3zz5h2ba208xjv62" + "sha256": "1p7krdi3p0n82f27ap7scy7ka42xbvzqb3kk88lghdkcrlwvwdyp" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "1cav0c0bhag64mic1c37l9zb21zyasshcyl3r12y939fmc9icnww" + "sha256": "02zxn516v507r9hyglb6cmd3l9lmgy7pqrwgxqgmckibnghgxbqz" } } } diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/development/tools/buildah/wrapper.nix index b5042ae1b827..60670791827d 100644 --- a/pkgs/development/tools/buildah/wrapper.nix +++ b/pkgs/development/tools/buildah/wrapper.nix @@ -32,7 +32,7 @@ let helpersBin = symlinkJoin { name = "${buildah-unwrapped.pname}-helper-binary-wrapper-${buildah-unwrapped.version}"; - # this only works for some binaries, others may need to be be added to `binPath` or in the modules + # this only works for some binaries, others may need to be added to `binPath` or in the modules paths = [ ] ++ lib.optionals stdenv.isLinux [ aardvark-dns diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 5e6b58286557..98051df100a7 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "conftest"; - version = "0.54.0"; + version = "0.55.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "refs/tags/v${version}"; - hash = "sha256-YZ5IAQAzfynXYAZadUp18+hfwCVxRDkT5OOMHQm2h3A="; + hash = "sha256-cJY3NmZa+IBmadTAusvzHKXeGsnsKpRqvJwYPVnU68A="; }; - vendorHash = "sha256-9vP+PgXWySjKCFbshaV27fG+UDYWSVP48HDvpKzp82Q="; + vendorHash = "sha256-iPTyDqaodTFhnGRLEbEFpQjfz9r4DsFdue7fQNwq/pU="; ldflags = [ "-s" diff --git a/pkgs/development/tools/dyff/default.nix b/pkgs/development/tools/dyff/default.nix index a4d29757aea5..02c5d2bfcc23 100644 --- a/pkgs/development/tools/dyff/default.nix +++ b/pkgs/development/tools/dyff/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dyff"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "homeport"; repo = "dyff"; rev = "v${version}"; - sha256 = "sha256-RRLIogNOvbXylmdR59anMVSYCILdVr0Xeot21HqXlXU="; + sha256 = "sha256-EidlGr8gWeq2CvO2HJApGigD8eC1xWLE1heA7rC4ZT4="; }; - vendorHash = "sha256-BLwdNBthYTMSNDcT5Cf8IcAr4uUmpewLdZRgIvq5htE="; + vendorHash = "sha256-sWOlqgrvWFa6GIhUgBEMPJw7iqfu0ltFGXYSqvLxioM="; subPackages = [ "cmd/dyff" diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index be6719c3512c..1a5f173317d1 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromSavannah, python3 }: +{ lib, stdenv, fetchFromSavannah, python3, perl }: stdenv.mkDerivation rec { pname = "gnulib"; @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs gnulib-tool.py + substituteInPlace build-aux/{prefix-gnulib-mk,useless-if-before-free,update-copyright,gitlog-to-changelog,announce-gen} \ + --replace-fail 'exec perl' 'exec ${lib.getExe perl}' ''; buildInputs = [ python3 ]; diff --git a/pkgs/development/tools/grpc-gateway/default.nix b/pkgs/development/tools/grpc-gateway/default.nix index 39621abf85eb..040bad3269b9 100644 --- a/pkgs/development/tools/grpc-gateway/default.nix +++ b/pkgs/development/tools/grpc-gateway/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpc-gateway"; - version = "2.20.0"; + version = "2.21.0"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-gateway"; rev = "v${version}"; - sha256 = "sha256-CnnJRgEGarwIaE2LkphN3gogzIhwQ5hAaUZFpLR/HxU="; + sha256 = "sha256-vdKGHcJazT6aVPMdUpvaheGPb50DNhj+DyzXhaJE63I="; }; - vendorHash = "sha256-aNOWu+TXbXn3jZ29BwU+x+vWMtL76NZoPElFuUwcHiI="; + vendorHash = "sha256-3x85PA6QAChHkjAohHWjFwrDGjacKRFzg/cJfoDqP3A="; ldflags = [ "-X=main.version=${version}" diff --git a/pkgs/development/tools/legitify/default.nix b/pkgs/development/tools/legitify/default.nix index 24ef9d6a6dc0..4759f9f19967 100644 --- a/pkgs/development/tools/legitify/default.nix +++ b/pkgs/development/tools/legitify/default.nix @@ -5,29 +5,33 @@ buildGoModule rec { pname = "legitify"; - version = "0.1.5"; + version = "1.0.11"; src = fetchFromGitHub { owner = "Legit-Labs"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Sr6P5S5+DqbP0ihCj97l84739/NRAlYJLnXp4B5gHNE="; + repo = "legitify"; + rev = "refs/tags/v${version}"; + hash = "sha256-ijW0vvamuqcN6coV5pAtmjAUjzNXxiqr2S9EwrNlrJc="; }; - vendorHash = "sha256-EJMXzWrOXFl7JFYBp/XAcHLcNyWCKbOBAyo/Yf2mh5s="; + vendorHash = "sha256-QwSh7+LuwdbBtrIGk3ZK6cMW9h7wzNArPT/lVZgUGBU="; ldflags = [ "-w" "-s" - "-X github.com/Legit-Labs/legitify/internal/version.Version=${version}" + "-X=github.com/Legit-Labs/legitify/internal/version.Version=${version}" ]; + preCheck = '' + rm e2e/e2e_test.go # tests requires network + ''; + meta = with lib; { description = "Tool to detect and remediate misconfigurations and security risks of GitHub assets"; - mainProgram = "legitify"; homepage = "https://github.com/Legit-Labs/legitify"; changelog = "https://github.com/Legit-Labs/legitify/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; + mainProgram = "legitify"; }; } diff --git a/pkgs/development/tools/misc/swig/4.nix b/pkgs/development/tools/misc/swig/4.nix index 6b6d1bc02db9..bae53ad42f9d 100644 --- a/pkgs/development/tools/misc/swig/4.nix +++ b/pkgs/development/tools/misc/swig/4.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "swig"; - version = "4.0.2"; + version = "4.2.1"; src = fetchFromGitHub { owner = "swig"; repo = "swig"; - rev = "rel-${version}"; - sha256 = "12vlps766xvwck8q0i280s8yx21qm2dxl34710ybpmz3c1cfdjsc"; + rev = "v${finalAttrs.version}"; + hash = "sha256-VlUsiRZLScmbC7hZDzKqUr9481YXVwo0eXT/jy6Fda8="; }; - PCRE_CONFIG = "${pcre.dev}/bin/pcre-config"; + PCRE_CONFIG = "${pcre2.dev}/bin/pcre-config"; nativeBuildInputs = [ autoconf automake libtool bison ]; - buildInputs = [ pcre ]; + buildInputs = [ pcre2 ]; configureFlags = [ "--without-tcl" ]; @@ -26,12 +26,14 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with lib; { - description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; + meta = { + changelog = "https://github.com/swig/swig/blob/${finalAttrs.src.rev}/CHANGES.current"; + description = "Interface compiler that connects C/C++ code to higher-level languages"; homepage = "https://swig.org/"; - # Different types of licenses available: http://www.swig.org/Release/LICENSE . - license = licenses.gpl3Plus; - maintainers = with maintainers; [ orivej ]; - platforms = with platforms; linux ++ darwin; + # Different types of licenses available: https://www.swig.org/Release/LICENSE . + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ orivej ]; + mainProgram = "swig"; + platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index e8aca09b1829..4c224be33ddf 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "okteto"; - version = "2.27.4"; + version = "2.29.3"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-FctWmYGOdmGqjHGlsi3k+RUmU35ufzpMh7Eh88GZiUc="; + hash = "sha256-aU2yH33HVg9CHA5+NOWZUmhRC7W6yMjKIwyDM8E4e2g="; }; - vendorHash = "sha256-RpkKWz/cJ1StbpVydqpSfA6uwIYgKa1YOCJVXZRer6k="; + vendorHash = "sha256-7XZImCS9hv8ILYfGcoY3tMk0grswWbfpQrBKhghTfsY="; postPatch = '' # Disable some tests that need file system & network access. @@ -35,9 +35,21 @@ buildGoModule rec { export HOME="$(mktemp -d)" ''; - checkFlags = [ - "-skip=TestCreateDockerfile" # Skip flaky test - ]; + checkFlags = + let + skippedTests = [ + # require network access + "TestCreateDockerfile" + + # access file system + "Test_translateDeployment" + "Test_translateStatefulSet" + "Test_translateJobWithoutVolumes" + "Test_translateJobWithVolumes" + "Test_translateService" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; postInstall = '' installShellCompletion --cmd okteto \ diff --git a/pkgs/development/tools/parsing/spicy/default.nix b/pkgs/development/tools/parsing/spicy/default.nix index 9738ffb41bca..f9ef5f37df24 100644 --- a/pkgs/development/tools/parsing/spicy/default.nix +++ b/pkgs/development/tools/parsing/spicy/default.nix @@ -24,13 +24,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + bison cmake + flex makeWrapper python3 ]; buildInputs = [ - bison flex zlib ]; diff --git a/pkgs/development/tools/protoc-gen-entgrpc/default.nix b/pkgs/development/tools/protoc-gen-entgrpc/default.nix index 3fbd49679225..2dec619fdc98 100644 --- a/pkgs/development/tools/protoc-gen-entgrpc/default.nix +++ b/pkgs/development/tools/protoc-gen-entgrpc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protoc-gen-entgrpc"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ent"; repo = "contrib"; rev = "v${version}"; - sha256 = "sha256-fXvpPH4b1JG++z0KEm9BNu5pGkneefNVvi9R5R3FqB4="; + sha256 = "sha256-8BQXjoVTasCReAc3XWBgeoYmL9zLj+uvf9TRKBYaAr4="; }; - vendorHash = "sha256-SdUs2alcc4rA6CGIrnaLO7KCseP4a0v6WE58JcRGr0k="; + vendorHash = "sha256-jdjcnDfEAP33oQSn5nqgFqE+uwKBXp3gJWTNiiH/6iw="; subPackages = [ "entproto/cmd/protoc-gen-entgrpc" ]; diff --git a/pkgs/development/tools/pyenv/default.nix b/pkgs/development/tools/pyenv/default.nix index edbf8a5dfdd2..c7658d2fe749 100644 --- a/pkgs/development/tools/pyenv/default.nix +++ b/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.4.7"; + version = "2.4.8"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-DrLma9gR9wy0IULtCoD/gTHMFPVyxijGACqcoQnYUHY="; + hash = "sha256-JXNEAgppFbeNKxjvrI/jUyHmN6pSWUFGSrxeVZi5pHw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/revive/default.nix b/pkgs/development/tools/revive/default.nix index 8acdef07d2fe..e08e2876c8fa 100644 --- a/pkgs/development/tools/revive/default.nix +++ b/pkgs/development/tools/revive/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "revive"; - version = "1.3.7"; + version = "1.3.9"; src = fetchFromGitHub { owner = "mgechev"; repo = pname; rev = "v${version}"; - hash = "sha256-Z5areIRlCyjUbusAdfL49mm5+J0UryWrS5/9Ttw16Po="; + hash = "sha256-ZfZNqr7zeMrLjSS1h3ZbjiXNjX1UiqldtrEFth2Z4f0="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -18,7 +18,7 @@ buildGoModule rec { rm -rf $out/.git ''; }; - vendorHash = "sha256-JYZdV6CefCB7/WzeZqUhIsK3PKo9KJG15dinN3S+1xw="; + vendorHash = "sha256-iIAKPCE06lhAf/4f4TRVO51RdlvuXNA7yMlGVPGrIeo="; ldflags = [ "-s" @@ -35,7 +35,7 @@ buildGoModule rec { # The following tests fail when built by nix: # - # $ nix log /nix/store/build-revive.1.3.7.drv | grep FAIL + # $ nix log /nix/store/build-revive.1.3.9.drv | grep FAIL # # --- FAIL: TestAll (0.01s) # --- FAIL: TestTimeEqual (0.00s) diff --git a/pkgs/development/tools/rojo/default.nix b/pkgs/development/tools/rojo/default.nix index 746d269f76a2..3ba5c839c5b5 100644 --- a/pkgs/development/tools/rojo/default.nix +++ b/pkgs/development/tools/rojo/default.nix @@ -12,17 +12,17 @@ let in rustPlatform.buildRustPackage rec { pname = "rojo"; - version = "7.4.1"; + version = "7.4.2"; src = fetchFromGitHub { owner = "rojo-rbx"; repo = "rojo"; rev = "v${version}"; - hash = "sha256-7fnzNYAbsZW/48C4dwpMXXQy2ZgxbYFSs85wNKGcu/4="; + hash = "sha256-T4a54JiCGKfXvt80rCRZbS/zqV3gomzG0IwAQRxcQo8="; fetchSubmodules = true; }; - cargoHash = "sha256-9kmSNWsZY0OcqaYOCblMwkXTdGXhj7f/2pUDx/L/o2o="; + cargoHash = "sha256-hXEz7u6dT2LRcQDYNjK4yxSHA1lxXZwNP98r0NT6mgA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock index 17b61df9f335..c072bcac5584 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -1866,6 +1866,7 @@ dependencies = [ "ruff_python_ast", "rustc-hash 2.0.0", "salsa", + "tempfile", "tracing", "tracing-subscriber", "tracing-tree", @@ -1897,6 +1898,7 @@ version = "0.0.0" dependencies = [ "anyhow", "bitflags 2.6.0", + "countme", "hashbrown", "ordermap", "red_knot_module_resolver", @@ -1904,7 +1906,6 @@ dependencies = [ "ruff_index", "ruff_python_ast", "ruff_python_parser", - "ruff_python_trivia", "ruff_text_size", "rustc-hash 2.0.0", "salsa", @@ -1992,7 +1993,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.5.4" +version = "0.5.5" dependencies = [ "anyhow", "argfile", @@ -2091,6 +2092,7 @@ dependencies = [ "ruff_notebook", "ruff_python_ast", "ruff_python_parser", + "ruff_python_trivia", "ruff_source_file", "ruff_text_size", "rustc-hash 2.0.0", @@ -2176,7 +2178,7 @@ dependencies = [ [[package]] name = "ruff_linter" -version = "0.5.4" +version = "0.5.5" dependencies = [ "aho-corasick", "annotate-snippets 0.9.2", @@ -2491,7 +2493,7 @@ dependencies = [ [[package]] name = "ruff_wasm" -version = "0.5.4" +version = "0.5.5" dependencies = [ "console_error_panic_hook", "console_log", @@ -2910,9 +2912,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "2.0.71" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -3000,18 +3002,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.62" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.62" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", @@ -3075,9 +3077,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" dependencies = [ "serde", "serde_spanned", @@ -3096,9 +3098,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.14" +version = "0.22.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" dependencies = [ "indexmap", "serde", @@ -3183,9 +3185,9 @@ dependencies = [ [[package]] name = "tracing-tree" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b56c62d2c80033cb36fae448730a2f2ef99410fe3ecbffc916681a32f6807dbe" +checksum = "f459ca79f1b0d5f71c54ddfde6debfc59c8b6eeb46808ae492077f739dc7b49c" dependencies = [ "nu-ansi-term 0.50.0", "tracing-core", @@ -3338,9 +3340,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", "rand", @@ -3350,9 +3352,9 @@ dependencies = [ [[package]] name = "uuid-macro-internal" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ff64d5cde1e2cb5268bdb497235b6bd255ba8244f910dbc3574e59593de68c" +checksum = "ee1cd046f83ea2c4e920d6ee9f7c3537ef928d75dce5d84a87c2c5d6b3999a3a" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index f88778924613..499c3c8819c2 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/${version}"; - hash = "sha256-dvvhd84T2YaNR5yu1uYcqwHjVzcWXvlXthyMBf8qZzE="; + hash = "sha256-dqfK6YdAV4cdUYB8bPE9I5FduBJ90RxUA7TMvcVq6Zw="; }; cargoLock = { @@ -53,6 +53,25 @@ rustPlatform.buildRustPackage rec { version = testers.testVersion { package = ruff; }; }; + # Failing on darwin for an unclear reason. + # According to the maintainers, those tests are from an experimental crate that isn't actually + # used by ruff currently and can thus be safely skipped. + checkFlags = lib.optionals stdenv.isDarwin [ + "--skip=changed_file" + "--skip=changed_metadata" + "--skip=deleted_file" + "--skip=directory_deleted" + "--skip=directory_moved_to_trash" + "--skip=directory_moved_to_workspace" + "--skip=directory_renamed" + "--skip=move_file_to_trash" + "--skip=move_file_to_workspace" + "--skip=new_file" + "--skip=new_ignored_file" + "--skip=rename_file" + "--skip=search_path" + ]; + meta = { description = "Extremely fast Python linter"; homepage = "https://github.com/astral-sh/ruff"; diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index 6509fa381c88..aa55cac49d75 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.36.0"; + version = "0.37.0"; src = fetchCrate { inherit pname version; - hash = "sha256-Umxkm+GCXsb60l9Gq417cynoy7D30Hlh6r04HoWGVPA="; + hash = "sha256-BwCqGQJpFjrZtQpjZ7FIIUfIaIXBTJWDzjZoktSa2Zg="; }; - cargoHash = "sha256-Aj9SykzdAZJSw8wQ5QHLhtWaxo2tnjjdJZnPIp3fsVw="; + cargoHash = "sha256-McqRVfTX8z3NkkIvp3jqJlhtOhOGdcahTghDCMY2E6c="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index 42ba68c851ed..016705ec962a 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -7,22 +7,22 @@ let pname = "osu-lazer-bin"; - version = "2024.726.0"; + version = "2024.727.0"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-XsgKTBXfGFxbWyBdr/1BNP58p6VwMiTo3gblSkrilbY="; + hash = "sha256-yoNtCfL0wrwAUrwYTZLDsR7udUa82Jh1CIcgVQ8TBX4="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-eeLrbaS/IiwLaRymwpQrHVDirCWcUBmVLHxA/K4V2SM="; + hash = "sha256-rdRGwD9tDxZFR8Qbd1bVG/YsbuMGZAj0roA9vRO+wQE="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-GhX0qSicoRbmHvtyAB37AGr2dWh4OCDJApi9RcUVzwY="; + hash = "sha256-wRahb7XvhdfP42iwyVsDGR8gFdsK9G8vDANS6Q3RySM="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 392836f9cfa8..831cb35bea64 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2024.726.0"; + version = "2024.727.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - hash = "sha256-SakrmL8Cx+r2C1cNV0ZARwsdC2D8saO1TibDJbAyzxI="; + hash = "sha256-pw1UkP3VktQ2xFTBOcFAOGQuAOF+uGiU7rZsxKBQ10w="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/kde/gear/kdenlive/default.nix b/pkgs/kde/gear/kdenlive/default.nix index 059ed9456f18..cee597bce71f 100644 --- a/pkgs/kde/gear/kdenlive/default.nix +++ b/pkgs/kde/gear/kdenlive/default.nix @@ -36,7 +36,6 @@ mkKdeDerivation { mlt shared-mime-info libv4l - glaxnimate ]; qtWrapperArgs = [ diff --git a/pkgs/os-specific/bsd/freebsd/package-set.nix b/pkgs/os-specific/bsd/freebsd/package-set.nix index e9f45ed64c70..b222bc362f40 100644 --- a/pkgs/os-specific/bsd/freebsd/package-set.nix +++ b/pkgs/os-specific/bsd/freebsd/package-set.nix @@ -21,7 +21,9 @@ lib.packagesFromDirectoryRecursive { patches = ./patches + "/${self.versionData.revision}"; # Keep the crawled portion of Nixpkgs finite. - buildFreebsd = lib.dontRecurseIntoAttrs buildFreebsd; + buildFreebsd = lib.dontRecurseIntoAttrs buildFreebsd // { + __attrsFailEvaluation = true; + }; ports = fetchzip { url = "https://cgit.freebsd.org/ports/snapshot/ports-dde3b2b456c3a4bdd217d0bf3684231cc3724a0a.tar.gz"; diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index bc585f07c021..3506d0937af8 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,39 +4,39 @@ "hash": "sha256:0i29ga9lzqd4zcsbr4bbb122i8nyfhcalihnq3bgsg04dwb36s19" }, "6.1": { - "version": "6.1.101", - "hash": "sha256:0k5kjb2n78dcfpqqj8n76fxqbmifs2gqd2z1g9had7s2d2m9yigi" + "version": "6.1.102", + "hash": "sha256:1v4p4i8pfg4i6v90dr7m65npkxjnqv3fxcj8zs3pbb8y84xzk98v" }, "5.15": { - "version": "5.15.163", - "hash": "sha256:00mkipkhz0i5xld7kyaxcj8cj8faw4gmjl5fribg832nn7ccfpq2" + "version": "5.15.164", + "hash": "sha256:11linb9jzarr8wz0vim3g9gkhi5ldqm82bkpl5xs9f34xpx9hq7c" }, "5.10": { - "version": "5.10.222", - "hash": "sha256:1jshn64g165rdshyjvq38ni6pkbskp50048pbz407fss7f00cbbv" + "version": "5.10.223", + "hash": "sha256:189b3yl4lsjzh6qpza0phj8hgsvnyh38cgrd70rnqw3rddmdh2fa" }, "5.4": { - "version": "5.4.280", - "hash": "sha256:0hix0dywf2ybvzxkijjsjmkrj7sx61hwq6mg1wqsq317p1zccxm9" + "version": "5.4.281", + "hash": "sha256:1ckja83km101h2dwlp86xrnnlzdzvjly48iywhy53xric3kw7824" }, "4.19": { - "version": "4.19.318", - "hash": "sha256:14vl0288apl76rvxa9yxfggrc4600bjsn4gw097m4gy5ldiaapqd" + "version": "4.19.319", + "hash": "sha256:0c7bhb31hpbbw1is1ykppk9lm0x025yyd4hrmlg1s6yg75rxqkal" }, "6.6": { - "version": "6.6.42", - "hash": "sha256:10z6fjvpiv3l11rpsd6fgi7dr6a3d38c6zlp8ihffx6pjz1ch0c8" + "version": "6.6.43", + "hash": "sha256:0pha226h5011kl5r2iiddxi0rib3xraslmcdjjnil2kq38d3pn0a" }, "6.8": { "version": "6.8.12", "hash": "sha256:0fb0m0fv4521g63gq04d7lm6hy8169s1rykiav5bkd99s9b1kcqr" }, "6.9": { - "version": "6.9.11", - "hash": "sha256:1q8kyn9cxc1ykf3cvifmfqk2p2p4x53l7h704hh92gichgh89pyy" + "version": "6.9.12", + "hash": "sha256:08ngskni7d9wi93vlwcmbdg7sb2jl1drhhzn62k9nsrg1r7crrss" }, "6.10": { - "version": "6.10.1", - "hash": "sha256:0szpkhrwfqwj068vz032daf3zycv5c93gjxiisjziifi3kyrs43h" + "version": "6.10.2", + "hash": "sha256:0w4vsb0c8bp34j90l89qms50nx6r6mmyf23jbvyar9fbv46m5n3k" } } diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix index 127d7e663513..070a5714ee83 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.15.160-rt77"; # updated by ./update-rt.sh + version = "5.15.163-rt78"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -19,14 +19,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "018v19a7rhzc4szybzzn86jlnk42x7jm6xkadfd2d3xq6f7727pl"; + sha256 = "00mkipkhz0i5xld7kyaxcj8cj8faw4gmjl5fribg832nn7ccfpq2"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0id4m1k1xq84bxgnchm8r2iwfqw6nacv5n1ksgyzj6q6v66ik3wk"; + sha256 = "030aycnrcnjhylkqj0wrfi992v2l26v17rgvxl16514zpdjmiv1x"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/update-mainline.py b/pkgs/os-specific/linux/kernel/update-mainline.py index bf5001ee378a..79ac283faab6 100755 --- a/pkgs/os-specific/linux/kernel/update-mainline.py +++ b/pkgs/os-specific/linux/kernel/update-mainline.py @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i python3 -p "python3.withPackages (ps: [ ps.beautifulsoup4 ps.lxml ps.packaging ])" +from itertools import groupby import json import os import pathlib @@ -11,7 +12,7 @@ from enum import Enum from bs4 import BeautifulSoup, NavigableString, Tag from packaging.version import parse as parse_version, Version -from typing import List + HERE = pathlib.Path(__file__).parent ROOT = HERE.parent.parent.parent.parent @@ -41,7 +42,7 @@ def parse_release(release: Tag) -> KernelRelease | None: except KeyError: return None - version = columns[1].get_text().rstrip(" [EOL]") + version = parse_version(columns[1].get_text().rstrip(" [EOL]")) date = columns[2].get_text() link = columns[3].find("a") if link is not None and isinstance(link, Tag): @@ -59,13 +60,12 @@ def parse_release(release: Tag) -> KernelRelease | None: ) -def get_branch(version: str): +def get_branch(version: Version): # This is a testing kernel. - if "rc" in version: + if version.is_prerelease: return "testing" else: - major, minor, *_ = version.split(".") - return f"{major}.{minor}" + return f"{version.major}.{version.minor}" def get_hash(kernel: KernelRelease): @@ -113,11 +113,11 @@ def main(): oldest_branch = get_oldest_branch() - for kernel in parsed_releases: - branch = get_branch(kernel.version) + for (branch, kernels) in groupby(parsed_releases, lambda kernel: get_branch(kernel.version)): + kernel = max(kernels, key=lambda kernel: kernel.version) nixpkgs_branch = branch.replace(".", "_") - old_version = all_kernels.get(branch, {}).get("version") + old_version = parse_version(all_kernels.get(branch, {}).get("version")) if old_version == kernel.version: print(f"linux_{nixpkgs_branch}: {kernel.version} is latest, skipping...") continue @@ -144,7 +144,7 @@ def main(): print(message, file=sys.stderr) all_kernels[branch] = { - "version": kernel.version, + "version": str(kernel.version), "hash": get_hash(kernel), } diff --git a/pkgs/os-specific/linux/oxtools/default.nix b/pkgs/os-specific/linux/oxtools/default.nix index fcb5d17dee15..f0a2e1b3740b 100644 --- a/pkgs/os-specific/linux/oxtools/default.nix +++ b/pkgs/os-specific/linux/oxtools/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "0xtools"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "tanelpoder"; repo = "0xtools"; rev = "v${finalAttrs.version}"; - hash = "sha256-S2jGF6wyjE9okbren/+p37zDr+eHUE8gJe/sbsXX4f4="; + hash = "sha256-QWH3sKYFiEWuexZkMlyWQPHmKJpcaiWI5szhdx5yKtM="; }; postPatch = '' diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix index 17d7339fdb0d..f98bc20a707a 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix @@ -5,18 +5,18 @@ buildNpmPackage rec { pname = "android-tv-card"; - version = "3.8.2"; + version = "3.9.0"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-jGcicGeELUge1s92Gz6dHvQ2bzmk0sx1bmiQOiiP2Xo="; + hash = "sha256-/g86D00Z9iI2F3RWawKBhI/Si8hApSegCmyFni+Lqas="; }; patches = [ ./dont-call-git.patch ]; - npmDepsHash = "sha256-kkwr4G+xyccr38ppXkiwfokOQL86mSDx+7DVKlzB9ww="; + npmDepsHash = "sha256-tdxpWUDVRW7YSXsGoS1s5xuvDZ/YaP6qWPImvgrgyAA="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 07c45ac177c6..4893d3ccbbaa 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "evcc"; - version = "0.128.3"; + version = "0.128.4"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-85ViDQeGybR2GQm9qaBl0K/xOVF4E8YxIKTdkStaPew="; + hash = "sha256-lYOqsAtqqKGD4/eeg+PiPc6g1UCwLvZkkasJTQbEP4A="; }; vendorHash = "sha256-xrpa5pfeWpBwS9QL/78JixDpenDGM/331vWBIwsuP2M="; @@ -79,6 +79,7 @@ buildGoModule rec { "TestTemplates/elering" "TestTemplates/energinet" "TestTemplates/grünstromindex" + "TestTemplates/keba-modbus" "TestTemplates/pun" "TestTemplates/entsoe" "TestTemplates/ngeso" diff --git a/pkgs/servers/komga/default.nix b/pkgs/servers/komga/default.nix index bfe3f14f51b4..de6594a992b9 100644 --- a/pkgs/servers/komga/default.nix +++ b/pkgs/servers/komga/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar"; - sha256 = "sha256-L6fdR8j60x2YL5S5g6THN1LL+dy6kzHijjNR47Kuylo="; + sha256 = "sha256-gbn0vhk+lYBPnAPwWwbAd+2AQKOkYW+akal/9tUVKVI="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/mautrix-discord/default.nix b/pkgs/servers/mautrix-discord/default.nix index bd1e72c579cf..dc3bbcff8a0c 100644 --- a/pkgs/servers/mautrix-discord/default.nix +++ b/pkgs/servers/mautrix-discord/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "mautrix-discord"; - version = "0.6.5"; + version = "0.7.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "discord"; rev = "v${version}"; - hash = "sha256-kjIBjkRI0BrbMNkb1Tdv7d+ZFOKRkUL9KxtQMtvxpIM="; + hash = "sha256-N6CepP+P63TIKKi6FQLJEuV5hFtiv1CcBM+1Y/QPZrI="; }; - vendorHash = "sha256-qRIgdkDp1pd/bA/AIU4PvoXcvrQam0kmr0hu4yAl+IY="; + vendorHash = "sha256-QdH98NA5Y9YKkvL8Gq8ChgvHFOyOBFXDDulxwql6v5c="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index ad285956866a..a26d3418e075 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -6,19 +6,9 @@ , faketty }: -let - # Grafana seems to just set it to the latest version available - # nowadays. - patchGoVersion = '' - substituteInPlace go.{mod,work} pkg/build/wire/go.mod \ - --replace-fail "go 1.22.4" "go 1.22.3" - substituteInPlace Makefile \ - --replace-fail "GO_VERSION = 1.22.4" "GO_VERSION = 1.22.3" - ''; -in buildGoModule rec { pname = "grafana"; - version = "11.1.0"; + version = "11.1.3"; subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ]; @@ -26,7 +16,7 @@ buildGoModule rec { owner = "grafana"; repo = "grafana"; rev = "v${version}"; - hash = "sha256-iTTT10YN8jBT4/ukGXNK1QHcyzXnAqg2LiFtNiwnENw="; + hash = "sha256-PfkKBKegMk+VjVJMocGj+GPTuUJipjD8+857skwmoco="; }; # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22 @@ -46,9 +36,6 @@ buildGoModule rec { jq moreutils python3 # @esfx/equatable@npm:1.0.2 fails to build on darwin as it requires `xcbuild` ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ]; - postPatch = '' - ${patchGoVersion} - ''; buildPhase = '' runHook preBuild export HOME="$(mktemp -d)" @@ -73,17 +60,13 @@ buildGoModule rec { disallowedRequisites = [ offlineCache ]; - vendorHash = "sha256-Ny/SoelFVPvBBn50QpHcLTuVY3ynKbCegM1uQkJzB9Y="; + vendorHash = "sha256-vd3hb7+lmhQPTZO/Xqi59XSPGj5sd218xQAD1bRbUz8="; proxyVendor = true; nativeBuildInputs = [ wire yarn jq moreutils removeReferencesTo python3 faketty ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ]; - postPatch = '' - ${patchGoVersion} - ''; - postConfigure = '' # Generate DI code that's required to compile the package. # From https://github.com/grafana/grafana/blob/v8.2.3/Makefile#L33-L35 diff --git a/pkgs/servers/web-apps/galene/default.nix b/pkgs/servers/web-apps/galene/default.nix index d8742978d073..6bc8b9fdc23f 100644 --- a/pkgs/servers/web-apps/galene/default.nix +++ b/pkgs/servers/web-apps/galene/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "galene"; - version = "0.9"; + version = "0.9.1"; src = fetchFromGitHub { owner = "jech"; repo = "galene"; rev = "galene-${version}"; - hash = "sha256-wklWAs5Ag9FZu85vLPNXoiS7TVQe98fLbRiMIp2OsaI="; + hash = "sha256-Ky38PM9HX1jV1LTMUeqaY8fUjZAxe4uK52YKQF8WOMA="; }; vendorHash = "sha256-U8DH3b2KbFQbEV+7suVsBiTA42FEl6DebH+GJDaH6aE="; diff --git a/pkgs/servers/web-apps/phylactery/default.nix b/pkgs/servers/web-apps/phylactery/default.nix index 2dfccdabbb98..43c6032f101f 100644 --- a/pkgs/servers/web-apps/phylactery/default.nix +++ b/pkgs/servers/web-apps/phylactery/default.nix @@ -1,22 +1,16 @@ -{ lib, buildGoModule, fetchFromSourcehut, nixosTests }: +{ lib, buildGoModule, fetchzip, nixosTests }: buildGoModule rec { pname = "phylactery"; - version = "0.1.2"; + version = "0.2.0"; - src = fetchFromSourcehut { - owner = "~cnx"; - repo = pname; - rev = version; - hash = "sha256-HQN6wJ/4YeuQaDcNgdHj0RgYnn2NxXGRfxybmv60EdQ="; + src = fetchzip { + url = "https://trong.loang.net/phylactery/snapshot/phylactery-${version}.tar.gz"; + hash = "sha256-UokK6rVjpzbcKOkZteo5kU7rFMm1meBUM4bkYAYM8rI="; }; vendorHash = null; - preBuild = '' - cp ${./go.mod} go.mod - ''; - ldflags = [ "-s" "-w" ]; passthru.tests.phylactery = nixosTests.phylactery; @@ -24,7 +18,7 @@ buildGoModule rec { meta = with lib; { description = "Old school comic web server"; mainProgram = "phylactery"; - homepage = "https://git.sr.ht/~cnx/phylactery"; + homepage = "https://trong.loang.net/phylactery/about"; license = licenses.agpl3Plus; maintainers = with maintainers; [ McSinyx ]; platforms = platforms.all; diff --git a/pkgs/servers/web-apps/phylactery/go.mod b/pkgs/servers/web-apps/phylactery/go.mod deleted file mode 100644 index 4ec9652e23fe..000000000000 --- a/pkgs/servers/web-apps/phylactery/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module git.sr.ht/~cnx/phylactery - -go 1.18 diff --git a/pkgs/servers/wishlist/default.nix b/pkgs/servers/wishlist/default.nix index 4471e10ad9ed..f2a291264996 100644 --- a/pkgs/servers/wishlist/default.nix +++ b/pkgs/servers/wishlist/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wishlist"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "wishlist"; rev = "v${version}"; - sha256 = "sha256-B4p2j/U+vTiku7rTj5Ho6BY84kjrNHLDIkI9pZZdmHI="; + sha256 = "sha256-LozGwgm/LGOzCa+zKC77NX40etzT4PDeuw3yh1QMmMY="; }; - vendorHash = "sha256-kfeIEpe6g4T9joAZesgqdE5dd9UD9+a0nALceKq1/zc="; + vendorHash = "sha256-QdMS1C8I3Ul5q6HQOw7+alinPo0yIZ4s7yIxQ/poEik="; doCheck = false; diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 34bdab129b23..c94c7861a3f3 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -21,7 +21,7 @@ }: let - version = "0.95.0"; + version = "0.96.0"; in rustPlatform.buildRustPackage { @@ -32,10 +32,10 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; rev = version; - hash = "sha256-NxdqQ5sWwDptX4jyQCkNX2pVCua5nN4v/VYHZ/Q1LpQ="; + hash = "sha256-FHTOibm8p8hFvopFgBO3yWBSc9Gk8WroraxV/1Jhar0="; }; - cargoHash = "sha256-PNZPljUDXqkyQicjwjaZsiSltxgO6I9/9VJDWKkvUFA="; + cargoHash = "sha256-/saQSOBAAxkvtxsboFpEYUNCUzTgMRbLS1B2wZgX6oY="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] @@ -49,6 +49,8 @@ rustPlatform.buildRustPackage { buildNoDefaultFeatures = !withDefaultFeatures; buildFeatures = additionalFeatures [ ]; + doCheck = ! stdenv.isDarwin; # Skip checks on darwin. Failing tests since 0.96.0 + checkPhase = '' runHook preCheck ( diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index a4e3b5dfc451..0f78b0f3e8c9 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; - cargoHash = "sha256-DI49nEm7CSoXGspTNvzzR7GsXAbMLcozsLd8d3KsEcQ="; + cargoHash = "sha256-VaRaoDKZzCOxNlRWaipoh5oSX8cDJfQfhdXfArJgYt8="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index f1f59e66e2b5..530cceae6c76 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; - cargoHash = "sha256-stbW+XJvVOMcf93BpcaD1/yFwPioLKvxVQe6kRlJuJ4="; + cargoHash = "sha256-GHZW0FdGnaY+4mLADJSLzwMliYnRJCtbRA0aaaj6ZbY="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; diff --git a/pkgs/shells/nushell/plugins/polars.nix b/pkgs/shells/nushell/plugins/polars.nix index f014c4a939e0..1b07fccd76ed 100644 --- a/pkgs/shells/nushell/plugins/polars.nix +++ b/pkgs/shells/nushell/plugins/polars.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_polars"; inherit (nushell) version src; - cargoHash = "sha256-OgrJNUVVyoqjRT0SPoX3PGRksLiAz254piw08k3gibo="; + cargoHash = "sha256-VLWLAVoCHLPgUcD+/5Ty3LSLndSt/7VjwbVmrcDMC70="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index f9d573f41348..6de95c60f858 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -5,15 +5,19 @@ , IOKit , CoreFoundation , nix-update-script +, pkg-config +, openssl }: rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; inherit (nushell) version src; - cargoHash = "sha256-zFkq+rx1GN6TQvm5jK8O2ocR0pUbtVFk051IlwCu100="; + cargoHash = "sha256-z4heSGHWWhzvFyFcITwSfETPeFNXCaH7Eg8Ij9Zihzw="; - nativeBuildInputs = lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; + nativeBuildInputs = [ pkg-config ] + ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; cargoBuildFlags = [ "--package nu_plugin_query" ]; checkPhase = '' diff --git a/pkgs/test/check-by-name/pinned-version.txt b/pkgs/test/check-by-name/pinned-version.txt index 17e51c385ea3..d917d3e26adc 100644 --- a/pkgs/test/check-by-name/pinned-version.txt +++ b/pkgs/test/check-by-name/pinned-version.txt @@ -1 +1 @@ -0.1.1 +0.1.2 diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index acbc464663dd..ac1a5cc4e25e 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.21.0"; + version = "1.21.2"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - hash = "sha256-8r+Gu36zAmNTZb6xA5iS0+smkmJ7UrdGi9TaUXUr5aQ="; + hash = "sha256-uerQwznpezbNnPj5U/IjMxoqRMJQhhje8oRwJTDimFY="; }; vendorHash = "sha256-TuxYJ3u4/5PJYRoRgom+M1au9XerZ+vj9X3jUWTPM58="; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index c5979437f429..52c69c1577d0 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2024.06.18"; + version = "2024.07.26"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-QxIbA/rQ4Sk4XFZ1XR3CAOt3L3xwxFFrDQK8B22egwY="; + hash = "sha256-LOCr1EwEUY+Nwr+bgxpVq2fUn+SfGTPlEYUPhzlpUEM="; }; meta = with lib; { diff --git a/pkgs/tools/backup/restic/rest-server.nix b/pkgs/tools/backup/restic/rest-server.nix index 547f3775b289..8d8cedb339be 100644 --- a/pkgs/tools/backup/restic/rest-server.nix +++ b/pkgs/tools/backup/restic/rest-server.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "restic-rest-server"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "restic"; repo = "rest-server"; rev = "v${version}"; - hash = "sha256-0zmUI7LUKVXUdPsNxY7RQxbsAraY0GrTMAS3kORIU6I="; + hash = "sha256-o55y+g9XklKghVK1c6MTRI8EHLplTv5YKUWGRyyvmtk="; }; - vendorHash = "sha256-tD5ffIYULMBqu99l1xCL0RnLB9zNpwNPs1qVFqezUc8="; + vendorHash = "sha256-MBkh61vFogf0su/mP3b2J8t/LTtfVzLlpa9MSzAq6Tw="; passthru.tests.restic = nixosTests.restic-rest-server; diff --git a/pkgs/tools/misc/cmdpack/default.nix b/pkgs/tools/misc/cmdpack/default.nix index 0fe2c75d1ea0..22402098e6cd 100644 --- a/pkgs/tools/misc/cmdpack/default.nix +++ b/pkgs/tools/misc/cmdpack/default.nix @@ -13,7 +13,7 @@ let buildPhase = '' runHook preBuild - gcc -o ${pname} src/${pname}.c + $CC -o "$pname" "src/$pname.c" runHook postBuild ''; @@ -21,8 +21,7 @@ let installPhase = '' runHook preInstall - mkdir -p $out/bin - cp ${pname} $out/bin + install -Dm555 -t "$out/bin" "$pname" runHook postInstall ''; diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index 8d184d4fe149..cd6872235cfe 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moar"; - version = "1.24.6"; + version = "1.25.1"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-LD1jekBKNOc8mQbr+E98JdZBracsS+QAN2T9neOV3NM="; + hash = "sha256-ZwrAduIKQkjjL0dOHitdOLCuWa1WAZ1UvXayU9lOrfo="; }; vendorHash = "sha256-1u/2OlMX2FuZaxWnpU4n5r/4xKe+rK++GoCJiSq/BdE="; diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index b068c8303a82..bc5ac22b4f65 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pgmetrics"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8pF3E0Zh/SsH6+5iXt1KFwud2ijoisYfcu+QHRM9x9s="; + sha256 = "sha256-P0IUMYALCy1upd+JLnNqDlNKMAEccfwjc3s8Rn7xI4k="; }; - vendorHash = "sha256-KIMnvGMIipuIFPTSeERtCfvlPuvHvEHdjBJ1TbT2d1s="; + vendorHash = "sha256-GOKgGONoM2q4doMoQwCLnHQjnB2QpPS3cxNnwzzz9ZU="; doCheck = false; diff --git a/pkgs/tools/misc/sqlite3-to-mysql/default.nix b/pkgs/tools/misc/sqlite3-to-mysql/default.nix index f2bc903d3d58..feacf796caaa 100644 --- a/pkgs/tools/misc/sqlite3-to-mysql/default.nix +++ b/pkgs/tools/misc/sqlite3-to-mysql/default.nix @@ -9,23 +9,23 @@ python3Packages.buildPythonApplication rec { pname = "sqlite3-to-mysql"; - version = "2.2.0"; + version = "2.2.1"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { owner = "techouse"; - repo = pname; + repo = "sqlite3-to-mysql"; rev = "refs/tags/v${version}"; - hash = "sha256-oav5HJdTmSAKk1b0wpzU2UOoY53zh5BrQ3Q0N360NeQ="; + hash = "sha256-pdPKP6Z4rOHUzxrfTft7ykWpCQBHN+FfndafXHyL+0Y="; }; - nativeBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ hatchling ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ click mysql-connector pytimeparse2 @@ -39,6 +39,8 @@ python3Packages.buildPythonApplication rec { unidecode packaging mysql80 + python-dateutil + types-python-dateutil ]; pythonRelaxDeps = [ @@ -57,11 +59,11 @@ python3Packages.buildPythonApplication rec { }; }; - meta = with lib; { + meta = { description = "Simple Python tool to transfer data from SQLite 3 to MySQL"; homepage = "https://github.com/techouse/sqlite3-to-mysql"; - license = licenses.mit; - maintainers = with maintainers; [ gador ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gador ]; mainProgram = "sqlite3mysql"; }; } diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index f7abf34490da..e322e03ed3e2 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.20.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "starship"; repo = "starship"; rev = "v${version}"; - hash = "sha256-TJU/pojUE+uwyZlqzJ4ULt9r+3bZpetwfaXK8kBtEG8="; + hash = "sha256-Y7jX0XXrSMEex1HG0o69Q1rTtnFL0UuIEgfa1e7D1Nc="; }; nativeBuildInputs = [ installShellFiles cmake ]; @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { cp docs/public/presets/toml/*.toml $presetdir ''; - cargoHash = "sha256-A4SipsaMjVkG7ImN1aK34ZGJxlPld9NE9IjffI0+eDA="; + cargoHash = "sha256-yJ32HFaRpujJ9mQa+07b5cQcl1ATO/56dpm1IeKcbzs="; nativeCheckInputs = [ git ]; diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index b30d66825cb6..634bdf0eb474 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -24,12 +24,12 @@ let ]; in stdenv.mkDerivation (finalAttrs: { - version = "6.2.1"; + version = "6.2.2"; pname = "staruml"; src = fetchurl { url = "https://files.staruml.io/releases-v6/StarUML_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-azfh27klczMK8m5jeVmJFkwJgN/qh6lzMUyYqkBNca8="; + sha256 = "sha256-1zxrT7phXeQYNbWHWMyPuHiUglrPSMPP0bfAcfvt8dM="; }; nativeBuildInputs = [ wrapGAppsHook3 dpkg ]; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 154156e89463..32600da19da2 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -155,6 +155,8 @@ stdenv.mkDerivation (finalAttrs: { "--without-ca-path" ] ++ lib.optionals (!gnutlsSupport && !opensslSupport && !wolfsslSupport && !rustlsSupport) [ "--without-ssl" + ] ++ lib.optionals (gnutlsSupport && !stdenv.isDarwin) [ + "--with-ca-path=/etc/ssl/certs" ]; CXX = "${stdenv.cc.targetPrefix}c++"; diff --git a/pkgs/tools/networking/grpc_cli/default.nix b/pkgs/tools/networking/grpc_cli/default.nix index cc2239692273..fc5c996a3a18 100644 --- a/pkgs/tools/networking/grpc_cli/default.nix +++ b/pkgs/tools/networking/grpc_cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.65.1"; + version = "1.65.2"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-6/QmOnLDNTSHS0+hBe1LblHMfcpxNwzVPd0iBu1WiGs="; + hash = "sha256-G9Wo5ySqexxn/Od8qPvmHOhW+X/U6/MMZqtZ6uFKifY="; fetchSubmodules = true; }; nativeBuildInputs = [ automake cmake autoconf ]; diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index 47908e95c512..4a866efca13f 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -29,7 +29,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - # With v8 the config tests are are blocking + # With v8 the config tests are blocking doCheck = false; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' diff --git a/pkgs/tools/security/grap/default.nix b/pkgs/tools/security/grap/default.nix index 1d77e9bf99cb..4d8f347e048a 100644 --- a/pkgs/tools/security/grap/default.nix +++ b/pkgs/tools/security/grap/default.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { cmake flex python3 + swig4 ]; buildInputs = [ boost.all libseccomp - swig4 ]; strictDeps = true; diff --git a/pkgs/tools/security/vault-ssh-plus/default.nix b/pkgs/tools/security/vault-ssh-plus/default.nix index a3a92f7c6a4c..908d5abb8eec 100644 --- a/pkgs/tools/security/vault-ssh-plus/default.nix +++ b/pkgs/tools/security/vault-ssh-plus/default.nix @@ -8,16 +8,16 @@ }: buildGoModule rec { pname = "vault-ssh-plus"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "isometry"; repo = pname; rev = "v${version}"; - hash = "sha256-djS50SBR8HTyEd5Ya2I9w5irBrLTqzekEi5ASmkl6yk="; + hash = "sha256-A6kgMQOGtrRf5lSbheyJ41fc5l9VkiPDVDYGHVh9Hic="; }; - vendorHash = "sha256-NndIBvW1/EZJ2KwP6HZ6wvhrgtmhTe97l3VxprtWq30="; + vendorHash = "sha256-FBOmRXD6dW3B9LRKfCa1kzWmds71ndi9go8Lp7lOJlU="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/text/ov/default.nix b/pkgs/tools/text/ov/default.nix index 1556eeabe366..3d900ea7d996 100644 --- a/pkgs/tools/text/ov/default.nix +++ b/pkgs/tools/text/ov/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "ov"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "noborus"; repo = "ov"; rev = "refs/tags/v${version}"; - hash = "sha256-P/GkroAyE2mDEqLIyOqUGvauhPHVvaVRxpDkGv+BCqw="; + hash = "sha256-0dnaZZmciKnN+rVKitqAf3Bt2vtWP+/fB1tuCuMRvio="; }; - vendorHash = "sha256-PDyqscKzL2tGVrUckbedt0offgsCpDjxtnSeqggTM+A="; + vendorHash = "sha256-Ktusm7NldO5dTiLBIZ7fzsQ69kyTmKs9OJXZPP1oSws="; ldflags = [ "-s" diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index de0e562366cf..b04305c90702 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , installShellFiles @@ -30,11 +31,12 @@ buildGoModule rec { installPhase = '' runHook preInstall make install BINDIR=$out/bin - + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' for shell in bash fish zsh; do - $out/bin/crictl completion $shell > crictl.$shell - installShellCompletion crictl.$shell + installShellCompletion --cmd crictl \ + --$shell <($out/bin/crictl completion $shell) done + '' + '' runHook postInstall ''; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b1f936e5ffe8..c657e766e71c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -460,6 +460,7 @@ mapAliases ({ ### G ### + g4music = gapless; # Added 2024-07-26 g4py = python3Packages.geant4; # Added 2020-06-06 garage_0_7 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 garage_0_7_3 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91f48757e5b7..20d5203cabf5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3167,8 +3167,6 @@ with pkgs; arduino-ci = callPackage ../development/embedded/arduino/arduino-ci { }; - arduino-cli = callPackage ../development/embedded/arduino/arduino-cli { }; - arduino-core = callPackage ../development/embedded/arduino/arduino-core/chrootenv.nix { }; arduino-core-unwrapped = callPackage ../development/embedded/arduino/arduino-core { }; @@ -7597,7 +7595,7 @@ with pkgs; easeprobe = callPackage ../tools/misc/easeprobe { }; emscripten = callPackage ../development/compilers/emscripten { - llvmPackages = llvmPackages_18; + llvmPackages = llvmPackages_git; }; emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); @@ -9143,8 +9141,8 @@ with pkgs; jadx = callPackage ../tools/security/jadx { }; - jamesdsp = libsForQt5.callPackage ../applications/audio/jamesdsp { }; - jamesdsp-pulse = libsForQt5.callPackage ../applications/audio/jamesdsp { + jamesdsp = qt6Packages.callPackage ../applications/audio/jamesdsp { }; + jamesdsp-pulse = qt6Packages.callPackage ../applications/audio/jamesdsp { usePipewire = false; usePulseaudio = true; }; @@ -12211,8 +12209,6 @@ with pkgs; relic = callPackage ../development/tools/relic { }; - remind = callPackage ../tools/misc/remind { }; - remmina = darwin.apple_sdk_11_0.callPackage ../applications/networking/remote/remmina { }; rename = callPackage ../tools/misc/rename { }; @@ -24976,17 +24972,17 @@ with pkgs; }; # Steel Bank Common Lisp - sbcl_2_4_5 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.5"; }; - faslExt = "fasl"; - flags = [ "--dynamic-space-size" "3000" ]; - }; sbcl_2_4_6 = wrapLisp { pkg = callPackage ../development/compilers/sbcl { version = "2.4.6"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_4_6; + sbcl_2_4_7 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.7"; }; + faslExt = "fasl"; + flags = [ "--dynamic-space-size" "3000" ]; + }; + sbcl = sbcl_2_4_7; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -30896,8 +30892,6 @@ with pkgs; svox = callPackage ../applications/audio/svox { }; - g4music = callPackage ../applications/audio/g4music { }; - genesys = callPackage ../applications/misc/genesys { }; giada = callPackage ../applications/audio/giada { }; @@ -33217,7 +33211,7 @@ with pkgs; picosnitch = callPackage ../tools/networking/picosnitch { }; - pidginPackages = callPackage ../applications/networking/instant-messengers/pidgin/pidgin-plugins { }; + pidginPackages = recurseIntoAttrs (callPackage ../applications/networking/instant-messengers/pidgin/pidgin-plugins { }); inherit (pidginPackages) pidgin; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 74566d1704f0..2854d32ef167 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -419,8 +419,7 @@ in { nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; - nvidiaPackages = dontRecurseIntoAttrs (lib.makeExtensible (_: callPackage ../os-specific/linux/nvidia-x11 { })) - // { __attrsFailEvaluation = true; }; + nvidiaPackages = dontRecurseIntoAttrs (lib.makeExtensible (_: callPackage ../os-specific/linux/nvidia-x11 { })); nvidia_x11 = nvidiaPackages.stable; nvidia_x11_beta = nvidiaPackages.beta; @@ -631,7 +630,6 @@ in { linux_6_8 = recurseIntoAttrs (packagesFor kernels.linux_6_8); linux_6_9 = recurseIntoAttrs (packagesFor kernels.linux_6_9); linux_6_10 = recurseIntoAttrs (packagesFor kernels.linux_6_10); - __attrsFailEvaluation = true; } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; # Added 2023-10-11 @@ -652,7 +650,6 @@ in { linux_rt_5_15 = packagesFor kernels.linux_rt_5_15; linux_rt_6_1 = packagesFor kernels.linux_rt_6_1; linux_rt_6_6 = packagesFor kernels.linux_rt_6_6; - __attrsFailEvaluation = true; }; rpiPackages = { @@ -660,7 +657,6 @@ in { linux_rpi2 = packagesFor kernels.linux_rpi2; linux_rpi3 = packagesFor kernels.linux_rpi3; linux_rpi4 = packagesFor kernels.linux_rpi4; - __attrsFailEvaluation = true; }; packages = recurseIntoAttrs (vanillaPackages // rtPackages // rpiPackages // { @@ -704,7 +700,7 @@ in { linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; linux_rt_default = packages.linux_rt_5_15; linux_rt_latest = packages.linux_rt_6_6; - } // { __attrsFailEvaluation = true; }; + }; manualConfig = callPackage ../os-specific/linux/kernel/manual-config.nix {}; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 1798f32356a7..c0da332dd264 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -334,7 +334,9 @@ mapAliases ({ nose-cprof = throw "nose-cprof has been removed since it has not been maintained for 7 years and there are no dependent packages"; # added 2024-05-21 nose-exclude = throw "nose-exclude has been removed since it has not been maintained since 2016"; # added 2024-05-21 nose-randomly = throw "nose-randomly has been removed, it was archived and unmaintained since 2019"; # added 2024-05-22 + nose-pattern-exclude = throw "nose-pattern-exclude has been removed as it has been unmaintained since 2014"; # added 2024-07-27 nose_progressive = throw "nose_progressive has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; #added 2023-02-21 + nose-warnings-filters = throw "nose-warnings-filters has been removed as it has been unmaintained since 2016"; # added 2024-07-27 nose_warnings_filters = nose-warnings-filters; # added 2024-01-07 notifymuch = throw "notifymuch has been promoted to a top-level attribute name: `pkgs.notifymuch`"; # added 2022-10-02 Nuitka = nuitka; # added 2023-02-19 @@ -381,6 +383,7 @@ mapAliases ({ pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01 pyjet = throw "pyjet is deprecated, use fastjet instead"; # added 2023-05-10 pygame_sdl2 = pygame-sdl2; # added 2024-01-07 + pygogo = throw "pygogo has been removed, since it is abandoned and had no maintainer"; # added 2024-07-27 pygbm = throw "pygbm has been removed, since it is abandoned and broken"; # added 2023-06-20 PyGithub = pygithub; # added 2023-02-19 pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15 @@ -517,10 +520,12 @@ mapAliases ({ ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01 inherit (super.pkgs) ruff-lsp; # added 2023-06-23 runway-python = throw "SDK has been deprecated and was archived by upstream"; # added 2023-05-03 + sampledata = throw "sampledata has been removed, it was unmaintained since 2017"; # added 2024-07-27 sapi-python-client = kbcstorage; # added 2022-04-20 scikitimage = scikit-image; # added 2023-05-14 scikitlearn = scikit-learn; # added 2021-07-21 scikits-samplerate = throw "scikits-samplerate has been removed, it was unsed and unmaintained since 2015"; # added 2024-05-23 + selectors2 = throw "selectors2 has been removed: archived by upstream."; # added 2024-07-27 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10 sequoia = throw "python3Packages.sequoia was replaced by pysequoia - built from a dedicated repository, with a new API."; # added 2023-06-24 setuptools_dso = setuptools-dso; # added 2024-03-03 @@ -570,6 +575,7 @@ mapAliases ({ theanoWithoutCuda = throw "theano has been removed because it is no longer maintained"; # added 2024-05-20 theano-pymc = throw "theano-pymc has been removed because it is no longer maintained"; # added 2024-05-20 thumborPexif = throw "thumborPexif has been removed, because it was unused."; # added 2024-01-07 + tissue = throw "tissue has been removed, because it is archived since October 2022"; # added 2024-07-27 torchgpipe = throw "torchgpipe has been removed, because it appears unmaintained and Pytorch now includes pipeline parallelism support"; # added 2024-05-18 torrent_parser = torrent-parser; # added 2023-11-04 transip = throw "transip has been removed because it is no longer maintained. TransIP SOAP V5 API was marked as deprecated"; # added 2023-02-27 @@ -613,6 +619,7 @@ mapAliases ({ xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31 XlsxWriter = xlsxwriter; # added 2023-02-19 Yapsy = yapsy; # added 2023-02-19 + yanc = throw "yanc has been removed because it relies on nose"; # added 2024-07-27 z3 = z3-solver; # added 2023-12-03 zake = throw "zake has been removed because it is abandoned"; # added 2023-06-20 zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9759073c4e6e..659d218baf01 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5331,6 +5331,8 @@ self: super: with self; { inherit (pkgs.buildPackages) meson; }; + gstools = callPackage ../development/python-modules/gstools { }; + gtfs-realtime-bindings = callPackage ../development/python-modules/gtfs-realtime-bindings { }; gto = callPackage ../development/python-modules/gto { }; @@ -5421,6 +5423,8 @@ self: super: with self; { handout = callPackage ../development/python-modules/handout { }; + hankel = callPackage ../development/python-modules/hankel { }; + hap-python = callPackage ../development/python-modules/hap-python { }; hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { }; @@ -8017,6 +8021,8 @@ self: super: with self; { multiprocess = callPackage ../development/python-modules/multiprocess { }; + multiscale-spatial-image = callPackage ../development/python-modules/multiscale-spatial-image { }; + multiset = callPackage ../development/python-modules/multiset { }; multitasking = callPackage ../development/python-modules/multitasking { }; @@ -9115,10 +9121,6 @@ self: super: with self; { nose-timer = callPackage ../development/python-modules/nose-timer { }; - nose-pattern-exclude = callPackage ../development/python-modules/nose-pattern-exclude { }; - - nose-warnings-filters = callPackage ../development/python-modules/nose-warnings-filters { }; - nose-xunitmp = callPackage ../development/python-modules/nose-xunitmp { }; notebook = callPackage ../development/python-modules/notebook { }; @@ -11266,6 +11268,8 @@ self: super: with self; { pyevilgenius = callPackage ../development/python-modules/pyevilgenius { }; + pyevtk = callPackage ../development/python-modules/pyevtk { }; + pyexcel = callPackage ../development/python-modules/pyexcel { }; pyexcel-io = callPackage ../development/python-modules/pyexcel-io { }; @@ -11394,8 +11398,6 @@ self: super: with self; { pygobject-stubs = callPackage ../development/python-modules/pygobject-stubs { }; - pygogo = callPackage ../development/python-modules/pygogo { }; - pygpgme = callPackage ../development/python-modules/pygpgme { }; pygraphviz = callPackage ../development/python-modules/pygraphviz { @@ -11648,6 +11650,8 @@ self: super: with self; { pymedio = callPackage ../development/python-modules/pymedio { }; + pymee = callPackage ../development/python-modules/pymee { }; + pymeeus = callPackage ../development/python-modules/pymeeus { }; pymelcloud = callPackage ../development/python-modules/pymelcloud { }; @@ -13880,8 +13884,6 @@ self: super: with self; { samarium = callPackage ../development/python-modules/samarium { }; - sampledata = callPackage ../development/python-modules/sampledata { }; - samplerate = callPackage ../development/python-modules/samplerate { inherit (pkgs) libsamplerate; }; @@ -14056,8 +14058,6 @@ self: super: with self; { inherit (pkgs) cmake ninja; }; - selectors2 = callPackage ../development/python-modules/selectors2 { }; - selenium = callPackage ../development/python-modules/selenium { }; selenium-wire = callPackage ../development/python-modules/selenium-wire { }; @@ -15544,8 +15544,6 @@ self: super: with self; { tinytuya = callPackage ../development/python-modules/tinytuya { }; - tissue = callPackage ../development/python-modules/tissue { }; - titlecase = callPackage ../development/python-modules/titlecase { }; tld = callPackage ../development/python-modules/tld { }; @@ -17039,6 +17037,8 @@ self: super: with self; { veryprettytable = callPackage ../development/python-modules/veryprettytable { }; + vfblib = callPackage ../development/python-modules/vfblib { }; + vg = callPackage ../development/python-modules/vg { }; vharfbuzz = callPackage ../development/python-modules/vharfbuzz { }; @@ -17331,6 +17331,8 @@ self: super: with self; { whoisdomain = callPackage ../development/python-modules/whoisdomain { }; + whool = callPackage ../development/python-modules/whool { }; + whoosh = callPackage ../development/python-modules/whoosh { }; widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { }; @@ -17434,6 +17436,8 @@ self: super: with self; { xarray-dataclasses = callPackage ../development/python-modules/xarray-dataclasses { }; + xarray-datatree = callPackage ../development/python-modules/xarray-datatree { }; + xarray-einstats = callPackage ../development/python-modules/xarray-einstats { }; xattr = callPackage ../development/python-modules/xattr { }; @@ -17576,8 +17580,6 @@ self: super: with self; { yamlordereddictloader = callPackage ../development/python-modules/yamlordereddictloader { }; - yanc = callPackage ../development/python-modules/yanc { }; - yangson = callPackage ../development/python-modules/yangson { }; yapf = callPackage ../development/python-modules/yapf { }; @@ -17648,6 +17650,8 @@ self: super: with self; { python3Packages = self; }); + yt-dlp-dearrow = callPackage ../development/python-modules/yt-dlp-dearrow { }; + youtube-search = callPackage ../development/python-modules/youtube-search { }; youtube-search-python = callPackage ../development/python-modules/youtube-search-python { }; diff --git a/pkgs/top-level/release-attrpaths-superset.nix b/pkgs/top-level/release-attrpaths-superset.nix index e9b13437742a..913cf0e6d7bf 100644 --- a/pkgs/top-level/release-attrpaths-superset.nix +++ b/pkgs/top-level/release-attrpaths-superset.nix @@ -75,11 +75,6 @@ let newScope = true; scope = true; pkgs = true; - test-pkgs = true; - - buildPackages = true; - buildFreebsd = true; - callPackage = true; mkDerivation = true; overrideDerivation = true;