diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml index 0a4f97b1395f..ae95fd0de05f 100644 --- a/.github/workflows/codeowners-v2.yml +++ b/.github/workflows/codeowners-v2.yml @@ -106,6 +106,6 @@ jobs: run: nix-build ci -A requestReviews - name: Request reviews - run: result/bin/request-reviews.sh ${{ github.repository }} ${{ github.event.number }} "$OWNERS_FILE" + run: result/bin/request-code-owner-reviews.sh ${{ github.repository }} ${{ github.event.number }} "$OWNERS_FILE" env: GH_TOKEN: ${{ steps.app-token.outputs.token }} diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 2e99bb17b8bb..72b2103b8720 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -254,7 +254,7 @@ jobs: - name: Build the requestReviews derivation run: nix-build base/ci -A requestReviews - - name: Tagging pull request + - name: Labelling pull request run: | # Get all currently set rebuild labels gh api \ @@ -283,18 +283,18 @@ jobs: -f "labels[]=$toAdd" done < <(comm -13 before after) + env: + GH_TOKEN: ${{ github.token }} + REPOSITORY: ${{ github.repository }} + NUMBER: ${{ github.event.number }} + + - name: Requesting maintainer reviews + run: | # maintainers.json contains GitHub IDs. Look up handles to request reviews from. # There appears to be no API to request reviews based on GitHub IDs jq -r 'keys[]' comparison/maintainers.json \ | while read -r id; do gh api /user/"$id" --jq .login; done \ - | GH_TOKEN=${{ steps.app-token.outputs.token }} result/bin/process-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR" \ - > reviewers.json - - # Request reviewers from maintainers of changed output paths - GH_TOKEN=${{ steps.app-token.outputs.token }} gh api \ - --method POST \ - /repos/"$REPOSITORY"/pulls/"$NUMBER"/requested_reviewers \ - --input reviewers.json + | GH_TOKEN=${{ steps.app-token.outputs.token }} result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR" env: GH_TOKEN: ${{ github.token }} diff --git a/ci/request-reviews/default.nix b/ci/request-reviews/default.nix index f5f8dc1deb00..b180d60be97c 100644 --- a/ci/request-reviews/default.nix +++ b/ci/request-reviews/default.nix @@ -14,9 +14,9 @@ stdenvNoCC.mkDerivation { src = lib.fileset.toSource { root = ./.; fileset = lib.fileset.unions [ - ./get-reviewers.sh - ./process-reviewers.sh - ./request-reviews.sh + ./get-code-owners.sh + ./request-reviewers.sh + ./request-code-owner-reviews.sh ./verify-base-branch.sh ./dev-branches.txt ]; diff --git a/ci/request-reviews/get-reviewers.sh b/ci/request-reviews/get-code-owners.sh similarity index 100% rename from ci/request-reviews/get-reviewers.sh rename to ci/request-reviews/get-code-owners.sh diff --git a/ci/request-reviews/request-reviews.sh b/ci/request-reviews/request-code-owner-reviews.sh similarity index 79% rename from ci/request-reviews/request-reviews.sh rename to ci/request-reviews/request-code-owner-reviews.sh index 986f3684b42a..fefc8c3be3fa 100755 --- a/ci/request-reviews/request-reviews.sh +++ b/ci/request-reviews/request-code-owner-reviews.sh @@ -77,20 +77,6 @@ if ! "$SCRIPT_DIR"/verify-base-branch.sh "$tmp/nixpkgs.git" "$headRef" "$baseRep exit 1 fi -log "Getting code owners to request reviews from" -"$SCRIPT_DIR"/get-reviewers.sh "$tmp/nixpkgs.git" "$ownersFile" "$baseBranch" "$headRef" | \ - "$SCRIPT_DIR"/process-reviewers.sh "$baseRepo" "$prNumber" "$prAuthor" > "$tmp/reviewers.json" - -log "Requesting reviews from: $(<"$tmp/reviewers.json")" - -if ! response=$(effect gh api \ - --method POST \ - -H "Accept: application/vnd.github+json" \ - -H "X-GitHub-Api-Version: 2022-11-28" \ - "/repos/$baseRepo/pulls/$prNumber/requested_reviewers" \ - --input "$tmp/reviewers.json"); then - log "Failed to request reviews: $response" - exit 1 -fi - -log "Successfully requested reviews" +log "Requesting reviews from code owners" +"$SCRIPT_DIR"/get-code-owners.sh "$tmp/nixpkgs.git" "$ownersFile" "$baseBranch" "$headRef" | \ + "$SCRIPT_DIR"/request-reviewers.sh "$baseRepo" "$prNumber" "$prAuthor" diff --git a/ci/request-reviews/process-reviewers.sh b/ci/request-reviews/request-reviewers.sh similarity index 62% rename from ci/request-reviews/process-reviewers.sh rename to ci/request-reviews/request-reviewers.sh index de969c5c9e4f..7bb4d110fe1b 100755 --- a/ci/request-reviews/process-reviewers.sh +++ b/ci/request-reviews/request-reviewers.sh @@ -1,15 +1,26 @@ #!/usr/bin/env bash -# Process reviewers for a PR, reading line-separated usernames on stdin, -# returning a JSON suitable to be consumed by the API endpoint to request reviews: +# Request reviewers for a PR, reading line-separated usernames on stdin, +# filtering for valid reviewers before using the API endpoint to request reviews: # https://docs.github.com/en/rest/pulls/review-requests?apiVersion=2022-11-28#request-reviewers-for-a-pull-request set -euo pipefail +tmp=$(mktemp -d) +trap 'rm -rf "$tmp"' exit + log() { echo "$@" >&2 } +effect() { + if [[ -n "${DRY_MODE:-}" ]]; then + log "Skipping in dry mode:" "${@@Q}" + else + "$@" + fi +} + if (( "$#" < 3 )); then log "Usage: $0 BASE_REPO PR_NUMBER PR_AUTHOR" exit 1 @@ -42,7 +53,7 @@ gh api \ # And we don't want to rerequest reviews from people who already reviewed while read -r user; do if [[ -v users[${user,,}] ]]; then - log "User $user is a code owner but has already left a review, ignoring" + log "User $user is a potential reviewer, but has already left a review, ignoring" unset 'users[${user,,}]' fi done < "$tmp/already-reviewed-by" @@ -57,9 +68,16 @@ for user in "${!users[@]}"; do fi done -# Turn it into a JSON for the GitHub API call to request PR reviewers -jq -n \ - --arg users "${!users[*]}" \ - '{ - reviewers: $users | split(" "), - }' +for user in "${!users[@]}"; do + log "Requesting review from: $user" + + if ! response=$(jq -n --arg user "$user" '{ reviewers: [ $user ] }' | \ + effect gh api \ + --method POST \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + "/repos/$baseRepo/pulls/$prNumber/requested_reviewers" \ + --input -); then + log "Failed to request review from $user: $response" + fi +done diff --git a/nixos/modules/hardware/printers.nix b/nixos/modules/hardware/printers.nix index 6dc8ceec45db..8dbfea78a516 100644 --- a/nixos/modules/hardware/printers.nix +++ b/nixos/modules/hardware/printers.nix @@ -28,6 +28,7 @@ let ); in '' + # shellcheck disable=SC2016 ${pkgs.cups}/bin/lpadmin ${args} -E ''; diff --git a/nixos/modules/services/misc/tzupdate.nix b/nixos/modules/services/misc/tzupdate.nix index 17868e1c1171..188ef95e185d 100644 --- a/nixos/modules/services/misc/tzupdate.nix +++ b/nixos/modules/services/misc/tzupdate.nix @@ -28,7 +28,7 @@ in { wants = [ "network-online.target" ]; after = [ "network-online.target" ]; script = '' - timedatectl set-timezone $(${lib.getExe pkgs.tzupdate} --print-only) + timedatectl set-timezone "$(${lib.getExe pkgs.tzupdate} --print-only)" ''; serviceConfig = { diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix index 447d07b4baf4..b6e43097f2d6 100644 --- a/nixos/modules/services/scheduling/cron.nix +++ b/nixos/modules/services/scheduling/cron.nix @@ -125,7 +125,8 @@ in wantedBy = [ "multi-user.target" ]; preStart = '' - mkdir -m 710 -p /var/cron + (umask 022 && mkdir -p /var) + (umask 067 && mkdir -p /var/cron) # By default, allow all users to create a crontab. This # is denoted by the existence of an empty cron.deny file. diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 6d2afade31a0..3b1c85a44142 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -99,7 +99,7 @@ rec { (onFullSupported "nixos.tests.firewall") (onFullSupported "nixos.tests.fontconfig-default-fonts") - (onSystems [ "x86_64-linux" ] "nixos.tests.gitlab") # we lack energy to really debug aarch64 here + (onFullSupported "nixos.tests.gitlab") (onFullSupported "nixos.tests.gnome") (onFullSupported "nixos.tests.gnome-xorg") (onSystems [ "x86_64-linux" ] "nixos.tests.hibernate") diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 26179445fc7b..674486a23adb 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "grandorgue"; - version = "3.15.3-1"; + version = "3.15.4-1"; src = fetchFromGitHub { owner = "GrandOrgue"; repo = "grandorgue"; rev = version; fetchSubmodules = true; - hash = "sha256-ljPVbbqRy1hlzKaZ6XK99s2EWwITz+P5jETQPb/tyuw="; + hash = "sha256-9H7YpTtv9Y36Nc0WCyRy/ohpOQ3WVUd9gMahnGhANRc="; }; patches = [ ./darwin-fixes.patch ]; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6cbd5af10366..82b430d1bff1 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -10664,6 +10664,18 @@ final: prev: meta.homepage = "https://github.com/ahmedkhalf/project.nvim/"; }; + projections-nvim = buildVimPlugin { + pname = "projections.nvim"; + version = "2023-06-29"; + src = fetchFromGitHub { + owner = "GnikDroy"; + repo = "projections.nvim"; + rev = "f18a8505f84f45a0fe024cafca5b969447f63cd5"; + sha256 = "1yljcd1k8ksjxcs61b20z3rw36960mczi62x07i8z4xrxqrn4k5y"; + }; + meta.homepage = "https://github.com/GnikDroy/projections.nvim/"; + }; + promise-async = buildVimPlugin { pname = "promise-async"; version = "2024-08-04"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 3b6ee922d923..f12314273f58 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -885,6 +885,7 @@ https://github.com/ewilazarus/preto/,HEAD, https://github.com/anuvyklack/pretty-fold.nvim/,HEAD, https://github.com/vim-scripts/prev_indent/,, https://github.com/ahmedkhalf/project.nvim/,, +https://github.com/GnikDroy/projections.nvim/,HEAD, https://github.com/kevinhwang91/promise-async/,HEAD, https://github.com/frigoeu/psc-ide-vim/,, https://github.com/Shougo/pum.vim/,HEAD, diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 5dbc82b991bb..4e8e7fc9b472 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -33,13 +33,13 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { pname = "elinks"; - version = "0.17.1.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "rkd77"; repo = "elinks"; rev = "v${version}"; - hash = "sha256-d5bc6SZ8UQuvVJZjWziy4pi/iIiDAnpU9YTlrlfkdoo="; + hash = "sha256-TTb/v24gIWKiCQCESHo0Pz6rvRtw5anoXK0b35dzfLM="; }; buildInputs = diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index 5f65436b76bc..c311a79f3bdc 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/pkgs/applications/networking/datovka/default.nix @@ -12,11 +12,11 @@ mkDerivation rec { pname = "datovka"; - version = "4.24.2"; + version = "4.25.0"; src = fetchurl { url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz"; - sha256 = "sha256-5wgtL3j/3BdYxHTGrK1KCK1t8GTiERaH2nIlRYm5XQU="; + sha256 = "sha256-Snm9dDtHZQsx4T82tML77auBTb1lvITUOfL+kmhY4es="; }; buildInputs = [ libdatovka qmake qtbase qtsvg libxml2 qtwebsockets ]; diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index 8ed37c9b4b3c..8efcbd3bae83 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Full GPL'd suite of Electronic Design Automation tools"; - homepage = "http://www.geda-project.org/"; + homepage = "https://geda.sourceforge.net/"; maintainers = with maintainers; [ pjones ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/science/machine-learning/openbugs/default.nix b/pkgs/applications/science/machine-learning/openbugs/default.nix index 926188b41815..52055a7b32e3 100644 --- a/pkgs/applications/science/machine-learning/openbugs/default.nix +++ b/pkgs/applications/science/machine-learning/openbugs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Software package for performing Bayesian analysis and simulation using Markov Chain Monte Carlo"; - homepage = "https://www.mrc-bsu.cam.ac.uk/software/bugs/openbugs/"; + homepage = "https://github.com/jsta/openbugs/"; changelog = "https://github.com/jsta/openbugs/blob/master/ChangeLog"; platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.gpl3Only; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 5e5b17ead2ed..082319571f39 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -424,7 +424,7 @@ gem 'snowplow-tracker', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory # Metrics gem 'webrick', '~> 1.8.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory -gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'prometheus-client-mmap', '1.1.2', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory # Event-driven reactor for Ruby # Required manually in config/initializers/require_async_gem diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 2d125ee82500..6f96ec131e56 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1436,7 +1436,8 @@ GEM coderay parser unparser - prometheus-client-mmap (1.1.1) + prometheus-client-mmap (1.1.2) + base64 rb_sys (~> 0.9.86) pry (0.14.2) coderay (~> 1.1) @@ -2226,7 +2227,7 @@ DEPENDENCIES pg_query (~> 5.1.0) png_quantizator (~> 0.2.1) premailer-rails (~> 1.12.0) - prometheus-client-mmap (~> 1.1, >= 1.1.1) + prometheus-client-mmap (= 1.1.2) pry-byebug pry-rails (~> 0.3.9) pry-shell (~> 0.6.4) @@ -2329,4 +2330,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.5.11 + 2.5.22 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index bf1ce4c42b5e..e4d9e1eac00e 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -5063,15 +5063,15 @@ src: version = "0.1.0"; }; prometheus-client-mmap = { - dependencies = ["rb_sys"]; + dependencies = ["base64" "rb_sys"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vg47xx3wgg24snqc6ychb08mbcyrjmvxym9fg69cpa4xvj133fx"; + sha256 = "1dwvpxqj652c8r61q88s336vzf2h2akcijk9hmjp9jzlnhil44n4"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.2"; }; pry = { dependencies = ["coderay" "method_source"]; diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index ee723769b761..b6393ed9093f 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -180,6 +180,12 @@ def update_rubyenv(): cwd=rubyenv_dir, ) + # update to 1.1.2 to fix https://gitlab.com/gitlab-org/ruby/gems/prometheus-client-mmap/-/issues/68 + subprocess.check_output( + ["sed", "-i", "s:'prometheus-client-mmap', '~> 1.1', '>= 1.1.1':'prometheus-client-mmap', '1.1.2':g", "Gemfile"], + cwd=rubyenv_dir, + ) + # Un-vendor sidekiq # # The sidekiq dependency was vendored to maintain compatibility with Redis 6.0 (as diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index cbfeea6c7552..15b5a42f35bf 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -294,13 +294,13 @@ rec { }; docker_27 = callPackage dockerGen rec { - version = "27.4.0"; + version = "27.4.1"; cliRev = "v${version}"; - cliHash = "sha256-q6xKERB5K7idExTrwFfX2ORs2G/55s2pybyhPcV5wuo="; + cliHash = "sha256-/lIp32ArtI8FGPepXnUqmkQ03YTC8SfK44+onAvHFnE="; mobyRev = "v${version}"; - mobyHash = "sha256-AKl06k2ePWOFhL3oH086HcLLYs2Da+wLOcGjGnQ0SXE="; - runcRev = "v1.2.2"; - runcHash = "sha256-hRi7TJP73hRd/v8hisEUx9P2I2J5oF0Wv60NWHORI7Y="; + mobyHash = "sha256-OSkI8F8bUjsCUT/pRWWbfTq9Fno5z35hW9OnLXHrIiQ="; + runcRev = "v1.2.3"; + runcHash = "sha256-SdeCmPttMXQdIn3kGWsIM3dfhQCx1C5bMyAM889VVUc="; containerdRev = "v1.7.24"; containerdHash = "sha256-03vJs61AnTuFAdImZjBfn1izFcoalVJdVs9DZeDcABI="; tiniRev = "v0.19.0"; diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix index 3ab12933a18b..451e243b163b 100644 --- a/pkgs/applications/window-managers/ion-3/default.nix +++ b/pkgs/applications/window-managers/ion-3/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tiling tabbed window manager designed with keyboard users in mind"; - homepage = "https://modeemi.fi/~tuomov/ion"; + homepage = "https://tuomov.iki.fi/software/ion/"; platforms = with platforms; linux; license = licenses.lgpl21; maintainers = [ ]; diff --git a/pkgs/by-name/av/avalanchego/package.nix b/pkgs/by-name/av/avalanchego/package.nix index 9d3d345e81be..3b8b276b850f 100644 --- a/pkgs/by-name/av/avalanchego/package.nix +++ b/pkgs/by-name/av/avalanchego/package.nix @@ -8,19 +8,19 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "ava-labs"; repo = "avalanchego"; tag = "v${version}"; - hash = "sha256-iedhLVNtwU8wSQIaq0r0fAYGH8fNnCRJW69D7wPdyx0="; + hash = "sha256-elbY0KNsOmKSTX61nps2tjIFTJH5Nnqmwq6mWwd88aE="; }; # https://github.com/golang/go/issues/57529 proxyVendor = true; - vendorHash = "sha256-CNwqpRx0HNvYfkowEEZe/Ue6W2FDZVAkUgof5QH9XkI="; + vendorHash = "sha256-HRhgnf6vHBrJTHspH+HwR3g5o63i+dCm7kPuBKdSV8s="; subPackages = [ "main" ]; diff --git a/pkgs/by-name/be/benzene/package.nix b/pkgs/by-name/be/benzene/package.nix index db669662e2d0..cb60bc009a4c 100644 --- a/pkgs/by-name/be/benzene/package.nix +++ b/pkgs/by-name/be/benzene/package.nix @@ -24,6 +24,12 @@ stdenv.mkDerivation { ]; postPatch = '' + # Fixes for boost v1.85.0+ + # https://github.com/cgao3/benzene-vanilla-cmake/issues/18 + substituteInPlace src/util/Misc.cpp \ + --replace-fail '.branch_path()' '.parent_path()' \ + --replace-fail '.normalize()' '.lexically_normal()' + substituteInPlace CMakeLists.txt \ --replace-fail '-DABS_TOP_SRCDIR="''${top_srcdir}"' '-DABS_TOP_SRCDIR="$ENV{out}"' \ --replace-fail '-DDATADIR="''${pkgdatadir}"' '-DDATADIR="$ENV{out}/share"' diff --git a/pkgs/by-name/bt/btar/package.nix b/pkgs/by-name/bt/btar/package.nix index 9c92464bf481..2109d92ab884 100644 --- a/pkgs/by-name/bt/btar/package.nix +++ b/pkgs/by-name/bt/btar/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "Tar-compatible block-based archiver"; mainProgram = "btar"; license = lib.licenses.gpl3Plus; - homepage = "https://viric.name/cgi-bin/btar"; + homepage = "https://briantracy.xyz/writing/btar.html"; platforms = platforms.all; maintainers = [ ]; }; diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix index 158a7562416b..ce320d7d167e 100644 --- a/pkgs/by-name/ch/chawan/package.nix +++ b/pkgs/by-name/ch/chawan/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation { pname = "chawan"; - version = "0-unstable-2024-12-17"; + version = "0-unstable-2024-12-27"; src = fetchFromSourcehut { owner = "~bptato"; repo = "chawan"; - rev = "13f395f20bd786d6c055b59ad19e9018d85bc139"; - hash = "sha256-UnJi2HJQv6PCpBWLka9aIUMYjG0a+tgH6vM4ZZ9gi2E="; + rev = "93033c2c382aaff01b1aba6f5db7652c35708bf3"; + hash = "sha256-MEOIu1CI/VTvd2cixa57Tv1xtBMXiMdD37ZYjAlg5S4="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/co/complgen/package.nix b/pkgs/by-name/co/complgen/package.nix index aab5659855a1..04a46666ea69 100644 --- a/pkgs/by-name/co/complgen/package.nix +++ b/pkgs/by-name/co/complgen/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "complgen"; - version = "0.1.8"; + version = "0.3.0"; src = fetchFromGitHub { owner = "adaszko"; repo = "complgen"; rev = "v${version}"; - hash = "sha256-pcMyI9jK5yyqZ7OlzDuG+9bK9QdZvXAxm4QS9awyqXk="; + hash = "sha256-spyRH3zzuuGZeQ8iFTa+hc/b4nYSiNIMOEWmc8+jJO0="; }; - cargoHash = "sha256-gZoK0EuULoZ5D6YPrjmn0Cv1Wu9t9xzJhP6/3OrBHeY="; + cargoHash = "sha256-ru6rqHqKXFMQUrYmxNHfobLRgx5ij7UvHzXwsaqciZU="; meta = with lib; { description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar"; diff --git a/pkgs/by-name/co/containerlab/package.nix b/pkgs/by-name/co/containerlab/package.nix index 902ff1d1310e..e032779ae925 100644 --- a/pkgs/by-name/co/containerlab/package.nix +++ b/pkgs/by-name/co/containerlab/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "containerlab"; - version = "0.60.1"; + version = "0.61.0"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-VueDf87kruLB1PCzknQO57eHrwJeGUDah1KaXaNsSlY="; + hash = "sha256-VEN2JjgLukE8YQ2nq+qFS2Yq0TdiTyRm2RUm32mJzBM="; }; - vendorHash = "sha256-YX2JDDZ1jx32zfFj/2fY61zqxPIzmwntN+7kiGDxxV4="; + vendorHash = "sha256-PwPih5LuXPBznSvn4L4h8zCiuWP2+u90PdN5+2Il6j0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/db/dbmate/package.nix b/pkgs/by-name/db/dbmate/package.nix index 5cec210701aa..f51232754b24 100644 --- a/pkgs/by-name/db/dbmate/package.nix +++ b/pkgs/by-name/db/dbmate/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dbmate"; - version = "2.23.0"; + version = "2.24.2"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; tag = "v${version}"; - hash = "sha256-xmQS0eBOgll8+AU/kQriClqtwrfIz606/o7jEJlQLV8="; + hash = "sha256-Ot8lHwrI848tI8ZGRmw3StLhB5ypTUWZQRCEpW95zGs="; }; - vendorHash = "sha256-xJIY0vaN7gw/EhqeepKQPhaKISXNNPnaAMbowmHSUz4="; + vendorHash = "sha256-zu9ilKGWVTNJAOtYIUoHC4yXbBgwmmp2Idv8ZKRZ+b8="; doCheck = false; diff --git a/pkgs/by-name/ec/ecs-agent/package.nix b/pkgs/by-name/ec/ecs-agent/package.nix index e1ac1d16a565..7e1763797c12 100644 --- a/pkgs/by-name/ec/ecs-agent/package.nix +++ b/pkgs/by-name/ec/ecs-agent/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.88.0"; + version = "1.89.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-ljTMfucHdcfDrpKKVguFlCM6S4ezBzM67C8SBdulYdY="; + hash = "sha256-Uld8WSN36byx0eDHsdEGVdiV0LFIPomc2eChn1wYC9w="; }; vendorHash = null; diff --git a/pkgs/by-name/el/elf2uf2-rs/package.nix b/pkgs/by-name/el/elf2uf2-rs/package.nix new file mode 100644 index 000000000000..b10158311d34 --- /dev/null +++ b/pkgs/by-name/el/elf2uf2-rs/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + rustPlatform, + fetchCrate, + pkg-config, + udev, +}: + +rustPlatform.buildRustPackage rec { + pname = "elf2uf2-rs"; + version = "2.1.1"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-7RS2OC00tjsSBYFvg0/FQf1HN515FdrmCoKhJBu4fvI="; + }; + + cargoHash = "sha256-oz2XVqDWmv/8HLrIFL+xJinZNUdoWk4KVHDPZr2v+Ls="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = lib.optional stdenv.hostPlatform.isLinux udev; + + meta = with lib; { + description = "Convert ELF files to UF2 for USB Flashing Bootloaders"; + mainProgram = "elf2uf2-rs"; + homepage = "https://github.com/JoNil/elf2uf2-rs"; + license = with licenses; [ bsd0 ]; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ + polygon + moni + ]; + }; +} diff --git a/pkgs/by-name/er/erg/package.nix b/pkgs/by-name/er/erg/package.nix index f5060e6c9770..e1e9b7bc12f2 100644 --- a/pkgs/by-name/er/erg/package.nix +++ b/pkgs/by-name/er/erg/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "erg"; - version = "0.6.48"; + version = "0.6.50"; src = fetchFromGitHub { owner = "erg-lang"; repo = "erg"; rev = "v${version}"; - hash = "sha256-Vf4/7l0W3mSdwMV4pTdp6nDkgSoJKR0fe46jx9sb8LY="; + hash = "sha256-w41HLMWbWYsK+gCFhCCzu5QfHHU5jqNVcKBUvHnvpX4="; }; - cargoHash = "sha256-AOR9LI4V1ajmKdiXmwBWJSG1W+GvGypbm12x7hHAqKM="; + cargoHash = "sha256-zTmU4d1B+T3aERIPcENcEYvtcN6V2Z+N8gxpZeWXwao="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/fa/faustPhysicalModeling/package.nix b/pkgs/by-name/fa/faustPhysicalModeling/package.nix index 09ce68b451c9..a4b3480d2cb8 100644 --- a/pkgs/by-name/fa/faustPhysicalModeling/package.nix +++ b/pkgs/by-name/fa/faustPhysicalModeling/package.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.75.7"; + version = "2.77.3"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-j5Qg/H7aMBZ6A8gh6v6+ICxmCZ7ya2tVF2FjueVtvHo="; + sha256 = "sha256-CADiJXyB4FivQjbh1nhpAVgCkTi1pW/vtXKXfL7o7xU="; }; buildInputs = [ diff --git a/pkgs/by-name/fu/function-runner/package.nix b/pkgs/by-name/fu/function-runner/package.nix index 3a4f233c09be..880ea453dc9c 100644 --- a/pkgs/by-name/fu/function-runner/package.nix +++ b/pkgs/by-name/fu/function-runner/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "function-runner"; - version = "6.4.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4XbwKtxgRVztCIqxj712wlZQpBkK060fltEcNuUVgos="; + sha256 = "sha256-ZdblRMvUeMcuW6Tji2FQe9Nfg1yRMvbeRiPABsQGBcI="; }; - cargoHash = "sha256-Ak32+DudcKD8io89mQHnrzScH+d7MLWGFY0BcIMC3N8="; + cargoHash = "sha256-A30ApbAjPn7d+LzYp+Yms3nydHW9kc7bUmQ3oXMdcyw="; meta = with lib; { description = "CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure"; diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 752a3f0e2017..6f5ce6d8a8c2 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -166,11 +166,11 @@ let linux = stdenv.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "131.0.6778.139"; + version = "131.0.6778.204"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-JEJnOawnz6BIXm+pbjz0u1BQOUwm+2hBCMh5NnN2aII="; + hash = "sha256-vAZUFufRfvkRsbXnqWD4zE3hgTWbhFqDlauXN7m6mIw="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -266,11 +266,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "131.0.6778.140"; + version = "131.0.6778.205"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/ijobeyqsjtnv35wplq3dh5ngae_131.0.6778.140/GoogleChrome-131.0.6778.140.dmg"; - hash = "sha256-LK5OSVxPtqgKMvg+AS2Q36RLBT8C3XRuPelCWTogXgY="; + url = "http://dl.google.com/release2/chrome/adzhzymuuqppdtyulfwtrtnxa2oq_131.0.6778.205/GoogleChrome-131.0.6778.205.dmg"; + hash = "sha256-5YkibnlOv3QLa+Ni8qZG+qvcucpTCilfATcv3wrBPZo="; }; dontPatch = true; diff --git a/pkgs/by-name/gr/gr-framework/package.nix b/pkgs/by-name/gr/gr-framework/package.nix index a6719d56c1ad..51d63e78d187 100644 --- a/pkgs/by-name/gr/gr-framework/package.nix +++ b/pkgs/by-name/gr/gr-framework/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "gr-framework"; - version = "0.73.8"; + version = "0.73.10"; src = fetchFromGitHub { owner = "sciapp"; repo = "gr"; rev = "v${version}"; - hash = "sha256-6RgNFGRprke7AUu24VS9iYUcWMWJ/DQ/LIvleyQgza4="; + hash = "sha256-vCcXWgoaWcaNRgIk9CrXp8eTII/CBOHR1iDncC/Cd4k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gs/gsoap/package.nix b/pkgs/by-name/gs/gsoap/package.nix index 27bdec91f290..ece6659ddc4b 100644 --- a/pkgs/by-name/gs/gsoap/package.nix +++ b/pkgs/by-name/gs/gsoap/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C/C++ toolkit for SOAP web services and XML-based applications"; - homepage = "http://www.cs.fsu.edu/~engelen/soap.html"; + homepage = "https://www.genivia.com/products.html"; # gsoap is dual/triple licensed (see homepage for details): # 1. gSOAP Public License 1.3 (based on Mozilla Public License 1.1). # Components NOT covered by the gSOAP Public License are: diff --git a/pkgs/by-name/gu/guile-lzlib/package.nix b/pkgs/by-name/gu/guile-lzlib/package.nix index faefb69bc265..af6eec44f9ec 100644 --- a/pkgs/by-name/gu/guile-lzlib/package.nix +++ b/pkgs/by-name/gu/guile-lzlib/package.nix @@ -7,6 +7,7 @@ pkg-config, texinfo, lzlib, + fetchpatch, }: stdenv.mkDerivation rec { @@ -31,6 +32,14 @@ stdenv.mkDerivation rec { lzlib ]; + patches = [ + # fix support for gcc14 + (fetchpatch { + url = "https://notabug.org/guile-lzlib/guile-lzlib/commit/3fd524d1f0e0b9beeca53c514620b970a762e3da.patch"; + hash = "sha256-I1SSdygNixjx5LL/UPOgEGLILWWYKKfOGoCvXM5Sp/E="; + }) + ]; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; # tests fail on darwin diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index f48c8c85deae..d55803b46007 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -9,6 +9,7 @@ hyprgraphics, hyprlang, hyprutils, + hyprwayland-scanner, pam, sdbus-cpp_2, systemdLibs, @@ -27,20 +28,19 @@ gcc14Stdenv.mkDerivation (finalAttrs: { pname = "hyprlock"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlock"; rev = "v${finalAttrs.version}"; - hash = "sha256-41/fFxlGCf1q+WJwdzSidr9+xJ7+td91XQ1+kzrZ+ts="; + hash = "sha256-lT6f/5NB73xj9cVesi2SNsL5jVciwZJp8QRohiv+3Hk="; }; - strictDeps = true; - nativeBuildInputs = [ cmake pkg-config + hyprwayland-scanner wayland-scanner ]; diff --git a/pkgs/by-name/hy/hyprpaper/package.nix b/pkgs/by-name/hy/hyprpaper/package.nix index d7c571e781a6..3ce41db29987 100644 --- a/pkgs/by-name/hy/hyprpaper/package.nix +++ b/pkgs/by-name/hy/hyprpaper/package.nix @@ -2,6 +2,7 @@ lib, gcc14Stdenv, fetchFromGitHub, + fetchpatch2, cmake, cairo, expat, @@ -41,6 +42,15 @@ gcc14Stdenv.mkDerivation (finalAttrs: { hash = "sha256-IRZ5NrKFwBVueYrZYUQfpTwp2rZHgAkPwgvdnfVBF8E="; }; + patches = [ + # FIXME: remove in next release + (fetchpatch2 { + name = "fix-hypr-wayland-scanner-0.4.4-build.patch"; + url = "https://github.com/hyprwm/hyprpaper/commit/505e447b6c48e6b49f3aecf5da276f3cc5780054.patch?full_index=1"; + hash = "sha256-Vk2P2O4XQiCYqV0KbK/ADe8KPmaTs3Mg7JRJ3cGW9lM="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/hy/hyprpicker/package.nix b/pkgs/by-name/hy/hyprpicker/package.nix index ecf77813b26b..9b923b52d39d 100644 --- a/pkgs/by-name/hy/hyprpicker/package.nix +++ b/pkgs/by-name/hy/hyprpicker/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, nix-update-script, pkg-config, cmake, @@ -29,6 +30,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-gu26MSYbTlRLMUpZ9PeYXtqqhzPDQXxEDkjiJgwzIIc="; }; + patches = [ + # FIXME: remove in next release + (fetchpatch2 { + name = "fix-hypr-wayland-scanner-0.4.4-build.patch"; + url = "https://github.com/hyprwm/hyprpicker/commit/444c40e5e3dc4058a6a762ba5e73ada6d6469055.patch?full_index=1"; + hash = "sha256-tg+oCUHtQkOXDrUY1w1x8zWWO1v4YV8ZxQKuSWuX/AI="; + }) + ]; + cmakeBuildType = if debug then "Debug" else "Release"; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hyprwayland-scanner/package.nix b/pkgs/by-name/hy/hyprwayland-scanner/package.nix index 35650330b655..ff72717819f7 100644 --- a/pkgs/by-name/hy/hyprwayland-scanner/package.nix +++ b/pkgs/by-name/hy/hyprwayland-scanner/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hyprwayland-scanner"; - version = "0.4.2"; + version = "0.4.4"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprwayland-scanner"; rev = "v${finalAttrs.version}"; - hash = "sha256-HIPEXyRRVZoqD6U+lFS1B0tsIU7p83FaB9m7KT/x6mQ="; + hash = "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4="; }; nativeBuildInputs = [ diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/by-name/io/iosevka-bin/package.nix similarity index 100% rename from pkgs/data/fonts/iosevka/bin.nix rename to pkgs/by-name/io/iosevka-bin/package.nix diff --git a/pkgs/data/fonts/iosevka/update-bin.sh b/pkgs/by-name/io/iosevka-bin/update-bin.sh similarity index 95% rename from pkgs/data/fonts/iosevka/update-bin.sh rename to pkgs/by-name/io/iosevka-bin/update-bin.sh index bfa50e1a6e52..287ca1cdade4 100755 --- a/pkgs/data/fonts/iosevka/update-bin.sh +++ b/pkgs/by-name/io/iosevka-bin/update-bin.sh @@ -14,7 +14,7 @@ if test "$oldVersion" = "$version"; then exit 0 fi -sed -i "s/$oldVersion/$version/" bin.nix +sed -i "s/$oldVersion/$version/" package.nix { echo '# This file was autogenerated. DO NOT EDIT!' diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/by-name/io/iosevka-bin/variants.nix similarity index 100% rename from pkgs/data/fonts/iosevka/variants.nix rename to pkgs/by-name/io/iosevka-bin/variants.nix diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/by-name/io/iosevka/package.nix similarity index 100% rename from pkgs/data/fonts/iosevka/default.nix rename to pkgs/by-name/io/iosevka/package.nix diff --git a/pkgs/by-name/ir/iroh/package.nix b/pkgs/by-name/ir/iroh/package.nix index 18cc539e33b5..eb17a3e5de5e 100644 --- a/pkgs/by-name/ir/iroh/package.nix +++ b/pkgs/by-name/ir/iroh/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "iroh"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-jwAwVoYW8VowhLc5Ac37XpX7WvXOunzMQxaE3BNy9Gw="; + hash = "sha256-9aRb1kMIo/DZOt1pYzXa8dfb3BlhVJ0kvS036jqGcHw="; }; - cargoHash = "sha256-RW3WgdUIdldh5eVF6RuX4MgB653Caye720wy8NqMgsI="; + cargoHash = "sha256-QHysE7TBd619iVUEWmk7OhT4Y6SHmTXUnBkokmbaKRE="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/by-name/ju/juju/package.nix b/pkgs/by-name/ju/juju/package.nix index 5a0981cbd09b..e54327fee545 100644 --- a/pkgs/by-name/ju/juju/package.nix +++ b/pkgs/by-name/ju/juju/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "juju"; - version = "3.5.4"; + version = "3.6.1"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "v${version}"; - hash = "sha256-0vLZfnbLnGESYtdX9QYJhlglIc5UCTwfYnjtKNn92Pc="; + hash = "sha256-eq7C3F/OJWF/HWMO9I+yTlXeskO1xuTKGhmoNNGQcyM="; }; - vendorHash = "sha256-xc+v34GLQ+2nKNJhMX020utObpganRIWjtwOHr5M2dY="; + vendorHash = "sha256-+2MeUq+r0/2I8C/8IVZTxrKIZTS36P/9XHM2X41AZPE="; subPackages = [ "cmd/juju" diff --git a/pkgs/by-name/ka/kando/package.nix b/pkgs/by-name/ka/kando/package.nix index 725f32b1b264..5becb3694d3c 100644 --- a/pkgs/by-name/ka/kando/package.nix +++ b/pkgs/by-name/ka/kando/package.nix @@ -23,16 +23,16 @@ buildNpmPackage rec { pname = "kando"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "kando-menu"; repo = "kando"; tag = "v${version}"; - hash = "sha256-OTNxK2D7lM8IluZa6Rydd3WSP3hPNcT9nkQm1smq4ms="; + hash = "sha256-ihWHyafDU/B2Xb3ezNlC7hB8EhBCQOSuW+ki/V2SIPs="; }; - npmDepsHash = "sha256-1LIfYwhLL8M2A4C6u9l5YUe7Y6xJeir8A5HQ7QghvhA="; + npmDepsHash = "sha256-PnKrTHAo3mKcVBhJQf/273k91UZxlDb3+2iXWGIfPs0="; npmFlags = [ "--ignore-scripts" ]; diff --git a/pkgs/by-name/ki/kimai/package.nix b/pkgs/by-name/ki/kimai/package.nix index c7a203d7b968..aee271d3286a 100644 --- a/pkgs/by-name/ki/kimai/package.nix +++ b/pkgs/by-name/ki/kimai/package.nix @@ -7,13 +7,13 @@ php.buildComposerProject (finalAttrs: { pname = "kimai"; - version = "2.26.0"; + version = "2.27.0"; src = fetchFromGitHub { owner = "kimai"; repo = "kimai"; rev = finalAttrs.version; - hash = "sha256-594oc7vAa5BPnk7RaSbWTFreu/DDIYE1lxpPQ+aZsn0="; + hash = "sha256-CTYmk6QGEd+WKC+Q+odvLF961u61MCaA6VoZlxpo3Gc="; }; php = php.buildEnv { @@ -39,7 +39,7 @@ php.buildComposerProject (finalAttrs: { ''; }; - vendorHash = "sha256-OIIzpdH/kU8l4X3ClYh8lQ/XGh/2/LljSFI03rUjnuI="; + vendorHash = "sha256-DV4yU1PiH2HnAJ2hcVmSkZxTTpjtfqP3dV2d/FL9VHg="; composerNoPlugins = false; composerNoScripts = false; diff --git a/pkgs/by-name/ki/kitsas/package.nix b/pkgs/by-name/ki/kitsas/package.nix index 854c53cc5327..0e0e8f874dd3 100644 --- a/pkgs/by-name/ki/kitsas/package.nix +++ b/pkgs/by-name/ki/kitsas/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "kitsas"; - version = "5.7"; + version = "5.8"; src = fetchFromGitHub { owner = "artoh"; repo = "kitupiikki"; rev = "v${version}"; - hash = "sha256-1TZFw1Q9+FsGHwitErDhwyA941rtb+h9OgJLFLyhV7k="; + hash = "sha256-w4RttQUzCPqqMwNf0P9lThu4JaLD3yEHm3yPLU1P4KA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libbraiding/package.nix b/pkgs/by-name/li/libbraiding/package.nix index da04ca7b5eed..1f25d4b30f74 100644 --- a/pkgs/by-name/li/libbraiding/package.nix +++ b/pkgs/by-name/li/libbraiding/package.nix @@ -3,21 +3,25 @@ stdenv, fetchFromGitHub, autoreconfHook, + pkg-config, }: stdenv.mkDerivation rec { - version = "1.2"; + version = "1.3.1"; pname = "libbraiding"; src = fetchFromGitHub { owner = "miguelmarco"; repo = "libbraiding"; - rev = version; - sha256 = "sha256-cgg6rvlOvFqGjgbw6i7QXS+tqvfFd1MkPCEjnW/FyFs="; + # version 1.3.1 contains a typo in configure.ac, fixed in the next commit. + # TODO: remove if on upgrade + rev = if version == "1.3.1" then "b174832026c2412baec83277c461e4df71d8525c" else version; + hash = "sha256-ar/EiaMZuQRa1lr0sZPLRuk5K00j63TqNf0q0iuiKjw="; }; nativeBuildInputs = [ autoreconfHook + pkg-config ]; # no tests included for now (2018-08-05), but can't hurt to activate diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix index ce83193ca3ec..228a88e97cc5 100644 --- a/pkgs/by-name/li/libmamba/package.nix +++ b/pkgs/by-name/li/libmamba/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmamba"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; rev = "libmamba-${finalAttrs.version}"; - hash = "sha256-UzuWQOFvp6KFDwcjjiwl0ek7pLuPvOijksUxp+hk/NU="; + hash = "sha256-o5shAmsplJS2WZ4HhAt1U27KqUheVxZTkjlyxR7EYxI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix new file mode 100644 index 000000000000..3b534b26453f --- /dev/null +++ b/pkgs/by-name/lo/lockbook-desktop/package.nix @@ -0,0 +1,90 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + gtk3, + glib, + gobject-introspection, + gdk-pixbuf, + libxkbcommon, + vulkan-loader, + makeDesktopItem, + autoPatchelfHook, + copyDesktopItems, +}: +let + desc = "Private, polished note-taking platform"; +in +rustPlatform.buildRustPackage rec { + pname = "lockbook-desktop"; + version = "0.9.15"; + + src = fetchFromGitHub { + owner = "lockbook"; + repo = "lockbook"; + tag = version; + hash = "sha256-hqBjA/6MWlhVjV4m+cIcnoRTApHuzbPzivMsaQHfRcc="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-+M+wL26KDbLKhcujPyWAsTlXwLrQVCUbTnnu/7sXul4="; + + nativeBuildInputs = [ + pkg-config + autoPatchelfHook + copyDesktopItems + ]; + + buildInputs = [ + gtk3 + glib + gobject-introspection + gdk-pixbuf + libxkbcommon + ]; + + runtimeDependencies = [ + vulkan-loader + ]; + + doCheck = false; # there are no cli tests + cargoBuildFlags = [ + "--package" + "lockbook-linux" + ]; + + desktopItems = makeDesktopItem { + desktopName = "Lockbook"; + name = "lockbook-desktop"; + comment = desc; + icon = "lockbook"; + exec = "lockbook-desktop"; + categories = [ + "Office" + "Documentation" + "Utility" + ]; + }; + + postInstall = '' + mv $out/bin/lockbook-linux $out/bin/lockbook-desktop + install -D public_site/favicon.svg $out/share/icons/hicolor/scalable/apps/lockbook.svg + ''; + + meta = { + description = desc; + longDescription = '' + Write notes, sketch ideas, and store files in one secure place. + Share seamlessly, keep data synced, and access it on any + platform—even offline. Lockbook encrypts files so even we + can’t see them, but don’t take our word for it: + Lockbook is 100% open-source. + ''; + homepage = "https://lockbook.net"; + license = lib.licenses.unlicense; + platforms = lib.platforms.linux; + changelog = "https://github.com/lockbook/lockbook/releases/tag/${version}"; + maintainers = [ lib.maintainers.parth ]; + }; +} diff --git a/pkgs/by-name/lu/ludusavi/package.nix b/pkgs/by-name/lu/ludusavi/package.nix index 62a6ac58b7b4..b65b7cb078e4 100644 --- a/pkgs/by-name/lu/ludusavi/package.nix +++ b/pkgs/by-name/lu/ludusavi/package.nix @@ -19,20 +19,27 @@ , wayland , zenity , libsForQt5 +, cairo +, pango +, atkmm +, gdk-pixbuf +, dbus-glib +, gtk3 +, glib }: rustPlatform.buildRustPackage rec { pname = "ludusavi"; - version = "0.25.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "mtkennerly"; repo = "ludusavi"; rev = "v${version}"; - hash = "sha256-GjecssOc5xVni73uNRQ/GaZmIdM9r09I8GpPK+jwoAY="; + hash = "sha256-YMTM0UKDGUiFmwmQXVJe5hccu4A8dhm0OFxTKLUb1jo="; }; - cargoHash = "sha256-9QaQjb7bdDl4NWKbV+dfu9BgFU8NO3CZEvKSXujMUtI="; + cargoHash = "sha256-1IqjoprKwupwJwXyGtMwB7guG3j98ayWmmigY0fY12s="; nativeBuildInputs = [ cmake @@ -48,16 +55,21 @@ rustPlatform.buildRustPackage rec { libXcursor libXrandr libXi + cairo + pango + atkmm + gdk-pixbuf + gtk3 ]; postInstall = '' - install -Dm644 assets/com.github.mtkennerly.ludusavi.metainfo.xml -t \ + install -Dm644 assets/linux/com.mtkennerly.ludusavi.metainfo.xml -t \ "$out/share/metainfo/" install -Dm644 assets/icon.png \ - "$out/share/icons/hicolor/64x64/apps/ludusavi.png" + "$out/share/icons/hicolor/64x64/apps/com.mtkennerly.ludusavi.png" install -Dm644 assets/icon.svg \ - "$out/share/icons/hicolor/scalable/apps/ludusavi.svg" - install -Dm644 "assets/ludusavi.desktop" -t "$out/share/applications/" + "$out/share/icons/hicolor/scalable/apps/com.mtkennerly.ludusavi.svg" + install -Dm644 "assets/linux/com.mtkennerly.ludusavi.desktop" -t "$out/share/applications/" install -Dm644 assets/MaterialIcons-Regular.ttf -t "$out/share/fonts/TTF/" install -Dm644 LICENSE -t "$out/share/licenses/ludusavi/" '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' @@ -81,6 +93,9 @@ rustPlatform.buildRustPackage rec { libxkbcommon vulkan-loader wayland + gtk3 + dbus-glib + glib ]; in '' @@ -94,7 +109,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/mtkennerly/ludusavi"; changelog = "https://github.com/mtkennerly/ludusavi/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ pasqui23 ]; + maintainers = with maintainers; [ pasqui23 megheaiulian]; mainProgram = "ludusavi"; }; } diff --git a/pkgs/by-name/ma/magic-vlsi/package.nix b/pkgs/by-name/ma/magic-vlsi/package.nix index 43c2ff72dbf6..04b5ba2852dc 100644 --- a/pkgs/by-name/ma/magic-vlsi/package.nix +++ b/pkgs/by-name/ma/magic-vlsi/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.505"; + version = "8.3.507"; src = fetchurl { url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "sha256-A0Tw2XJU+X084U8y9ILMN/45GllECvFpdZAICRXc0zI="; + sha256 = "sha256-YSsfCIp3uGYoZkjNNv79nQTZyROYJQABEz+bkl0Nqfg="; }; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/by-name/md/mdbtools/package.nix b/pkgs/by-name/md/mdbtools/package.nix index 1b6184d8f070..381245fef2c7 100644 --- a/pkgs/by-name/md/mdbtools/package.nix +++ b/pkgs/by-name/md/mdbtools/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mdbtools"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "mdbtools"; repo = "mdbtools"; rev = "v${version}"; - sha256 = "sha256-e9rgTWu8cwuccpp/wAfas1ZeQPTpGcgE6YjLz7KRnhw="; + sha256 = "sha256-XWkFgQZKx9/pjVNEqfp9BwgR7w3fVxQ/bkJEYUvCXPs="; }; configureFlags = [ "--disable-scrollkeeper" ]; diff --git a/pkgs/by-name/mi/mitmproxy2swagger/package.nix b/pkgs/by-name/mi/mitmproxy2swagger/package.nix index b127a9aa87dd..6e579bf0f42f 100644 --- a/pkgs/by-name/mi/mitmproxy2swagger/package.nix +++ b/pkgs/by-name/mi/mitmproxy2swagger/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mitmproxy2swagger"; - version = "0.13.0"; + version = "0.14.0"; pyproject = true; src = fetchFromGitHub { owner = "alufers"; repo = "mitmproxy2swagger"; tag = version; - hash = "sha256-VHxqxee5sQWRS13V4SfY4LWaN0oxxWsNVDOEqUyKHfg="; + hash = "sha256-bQ9zjRsMrC/B118iP2hevj2hhSFD7FTnsCe6lUMwYSI="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/nc/ncnn/package.nix b/pkgs/by-name/nc/ncnn/package.nix index b1f819cdee19..ed6f8616bafc 100644 --- a/pkgs/by-name/nc/ncnn/package.nix +++ b/pkgs/by-name/nc/ncnn/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "ncnn"; - version = "20240820"; + version = "20241226"; src = fetchFromGitHub { owner = "Tencent"; repo = pname; rev = version; - hash = "sha256-KFRWpPajSqYeasPKaNMVe0WTIXwCI5v9GLo5ygN/22M="; + hash = "sha256-XmIuXR/uxJbXaB0G+tS9I47Pke20qj8jI1vqnDDgrpE="; }; patches = [ diff --git a/pkgs/by-name/ne/nest-cli/package.nix b/pkgs/by-name/ne/nest-cli/package.nix index 2520eb77407e..5146b532e8af 100644 --- a/pkgs/by-name/ne/nest-cli/package.nix +++ b/pkgs/by-name/ne/nest-cli/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "nest-cli"; - version = "10.4.8"; + version = "10.4.9"; src = fetchFromGitHub { owner = "nestjs"; repo = pname; rev = version; - hash = "sha256-1IS9ZzAaKe+R4PmQWsLR9inz7ZM9N3VK7QSm0olNIag="; + hash = "sha256-dko+hOC3oZToNS+EOqmm+z7DLHfqqKDeQsH2sYxburU="; }; - npmDepsHash = "sha256-2nl/Lyd+K5MN0dtYNBFJOMwSDdt2eFxB7cTfc9543/U="; + npmDepsHash = "sha256-K4M6Jehy1854SuxDiaHQLlvhOecwInZZbOcgMqchiIM="; env = { npm_config_build_from_source = true; diff --git a/pkgs/by-name/ne/networkmanager-l2tp/package.nix b/pkgs/by-name/ne/networkmanager-l2tp/package.nix index f0b9698fa65e..c27d97088518 100644 --- a/pkgs/by-name/ne/networkmanager-l2tp/package.nix +++ b/pkgs/by-name/ne/networkmanager-l2tp/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { name = "${pname}${lib.optionalString withGnome "-gnome"}-${version}"; pname = "NetworkManager-l2tp"; - version = "1.20.16"; + version = "1.20.20"; src = fetchFromGitHub { owner = "nm-l2tp"; repo = "network-manager-l2tp"; rev = version; - hash = "sha256-78TOx3UnAF02UfZ7cWhPKv9bhJCq5UmAMrwd5xUnVrg="; + hash = "sha256-AmbDWBCUG9fvqA6iJopYtbitdRwv2faWvIeKN90p234="; }; patches = [ diff --git a/pkgs/by-name/nu/nullidentdmod/package.nix b/pkgs/by-name/nu/nullidentdmod/package.nix index 347319f6016c..fb7782df00ee 100644 --- a/pkgs/by-name/nu/nullidentdmod/package.nix +++ b/pkgs/by-name/nu/nullidentdmod/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "1.3"; src = fetchFromGitHub { - owner = "Acidhub"; + owner = "Ranthrall"; repo = "nullidentdmod"; rev = "v${version}"; sha256 = "1ahwm5pyidc6m07rh5ls2lc25kafrj233nnbcybprgl7bqdq1b0k"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Simple identd that just replies with a random string or customized userid"; mainProgram = "nullidentdmod"; license = licenses.gpl2Plus; - homepage = "http://acidhub.click/NullidentdMod"; + homepage = "https://github.com/Ranthrall/nullidentdmod"; maintainers = with maintainers; [ das_j ]; platforms = platforms.linux; # Must be run by systemd }; diff --git a/pkgs/by-name/op/openfst/package.nix b/pkgs/by-name/op/openfst/package.nix index 783a20ea10fa..cd7df6534b05 100644 --- a/pkgs/by-name/op/openfst/package.nix +++ b/pkgs/by-name/op/openfst/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "openfst"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz"; - hash = "sha256-B3cUFZ1c8+OKgLbGZW08zCyLi2xQu0G7ZcX+wQeWv1M="; + hash = "sha256-qOu7bz2S0H5nFQBYdHJRjPyHy3m5plSlqKuy0OspgBY="; }; configureFlags = [ diff --git a/pkgs/by-name/ot/ott/package.nix b/pkgs/by-name/ot/ott/package.nix index 12890101e612..a67c9fd0874e 100644 --- a/pkgs/by-name/ot/ott/package.nix +++ b/pkgs/by-name/ot/ott/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "ott"; - version = "0.33"; + version = "0.34"; src = fetchFromGitHub { owner = "ott-lang"; repo = "ott"; rev = version; - hash = "sha256-GzeEiok5kigcmfqf/K/UxvlKkl55zy0vOyiRZ2HyMiE="; + hash = "sha256-S6EMQgEBrtXB9hTM7x6irZPsI9c9JHeuCk/9pcpQMNg="; }; strictDeps = true; diff --git a/pkgs/by-name/pa/parmetis/package.nix b/pkgs/by-name/pa/parmetis/package.nix index a2289eea3069..8419e81b19f5 100644 --- a/pkgs/by-name/pa/parmetis/package.nix +++ b/pkgs/by-name/pa/parmetis/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { recursive-bisection, multilevel k-way, and multi-constraint partitioning schemes ''; - homepage = "http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview"; + homepage = "https://github.com/KarypisLab/ParMETIS"; platforms = platforms.all; license = licenses.unfree; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/by-name/pc/pcb/package.nix b/pkgs/by-name/pc/pcb/package.nix index 1dd1be7f912a..e81c92f9cd56 100644 --- a/pkgs/by-name/pc/pcb/package.nix +++ b/pkgs/by-name/pc/pcb/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Printed Circuit Board editor"; - homepage = "http://pcb.geda-project.org/"; + homepage = "https://sourceforge.net/projects/pcb/"; maintainers = with maintainers; [ mog ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/by-name/pe/peazip/package.nix b/pkgs/by-name/pe/peazip/package.nix index b7770087d7bc..c93f33dfa45b 100644 --- a/pkgs/by-name/pe/peazip/package.nix +++ b/pkgs/by-name/pe/peazip/package.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchFromGitHub, - libsForQt5, + qt6Packages, fpc, lazarus, xorg, @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "peazip"; - version = "10.1.0"; + version = "10.2.0"; src = fetchFromGitHub { owner = "peazip"; repo = pname; rev = version; - hash = "sha256-jYm3Ngwby75eUFM59tCQ7KWVywQOj+IzuPpATD+QhLo="; + hash = "sha256-TyfLqT9VNSViJOWwM3KgL2tvCZE14bLlT/6DgF9IAOE="; }; sourceRoot = "${src.name}/peazip-sources"; @@ -33,15 +33,19 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - libsForQt5.wrapQtAppsHook + qt6Packages.wrapQtAppsHook lazarus fpc ]; - buildInputs = [ - xorg.libX11 - libsForQt5.libqtpas - ]; + buildInputs = + [ + xorg.libX11 + ] + ++ (with qt6Packages; [ + qtbase + libqtpas + ]); NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; @@ -50,8 +54,8 @@ stdenv.mkDerivation rec { export HOME=$(mktemp -d) pushd dev lazbuild --lazarusdir=${lazarus}/share/lazarus --add-package metadarkstyle/metadarkstyle.lpk - lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt5 --build-all project_pea.lpi - lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt5 --build-all project_peach.lpi + lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt6 --build-all project_pea.lpi + lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt6 --build-all project_peach.lpi popd ''; diff --git a/pkgs/by-name/rb/rbw/package.nix b/pkgs/by-name/rb/rbw/package.nix index 31c35734f3ed..e3e6b136fe32 100644 --- a/pkgs/by-name/rb/rbw/package.nix +++ b/pkgs/by-name/rb/rbw/package.nix @@ -24,14 +24,14 @@ rustPlatform.buildRustPackage rec { pname = "rbw"; - version = "1.12.1"; + version = "1.13.0"; src = fetchzip { url = "https://git.tozt.net/rbw/snapshot/rbw-${version}.tar.gz"; - hash = "sha256-+1kalFyhk2UL+iVzuFLDsSSTudrd4QpXw+3O4J+KsLc="; + hash = "sha256-m5Ql4QfPnlJXfDNEw0O5kXnkFH7Z5u0OSbmB1chgPDY="; }; - cargoHash = "sha256-cKbbsDb449WANGT+x8APhzs+hf5SR3RBsCBWDNceRMA="; + cargoHash = "sha256-/6P0LAdYFByryihRcSLn3s3TMzZJjkSMhnZmevP85Ts="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/re/repomix/package.nix b/pkgs/by-name/re/repomix/package.nix index d5c5e01cab0c..0e3405fd8795 100644 --- a/pkgs/by-name/re/repomix/package.nix +++ b/pkgs/by-name/re/repomix/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "repomix"; - version = "0.2.6"; + version = "0.2.15"; src = fetchFromGitHub { owner = "yamadashy"; repo = "repomix"; tag = "v${version}"; - hash = "sha256-ZYU85782Z6O69KkKu4h3OqJqAgaxktEgHkcfs2ms9xg="; + hash = "sha256-mtZkp5GZSI/3N0xe3SLaYyHDM+ncnKDjShUqAoUa13s="; }; - npmDepsHash = "sha256-r+RIa7ACXJv4/CutnN/3S36US6r7w0EkM9dA4ShWPdU="; + npmDepsHash = "sha256-F6XbNIzuRyLMQzlOoaRW/x1N4y5WbXS57zzYfhdK/jU="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/re/resnap/package.nix b/pkgs/by-name/re/resnap/package.nix new file mode 100644 index 000000000000..a276cc4bca2a --- /dev/null +++ b/pkgs/by-name/re/resnap/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + makeWrapper, + ffmpeg, + feh, + imagemagick_light, + lz4, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "resnap"; + version = "2.5.2"; + + src = fetchFromGitHub { + owner = "cloudsftp"; + repo = "resnap"; + rev = "v${finalAttrs.version}"; + hash = "sha256-thVyf1gTDPLQVtZKoWL7SGiWI++ICWqmF/Ar57I3WP8="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + runtimeInputs = [ + ffmpeg + feh + imagemagick_light + lz4 + ]; + + installPhase = '' + runHook preInstall + + install -D reSnap.sh $out/bin/reSnap + + runHook postInstall + ''; + + postFixup = '' + substituteInPlace $out/bin/reSnap \ + --replace-fail "\$0" reSnap + + wrapProgram $out/bin/reSnap \ + --suffix PATH : "${lib.makeBinPath finalAttrs.runtimeInputs}" + ''; + + meta = { + description = "Take screnshots of your reMarkable tablet over SSH"; + homepage = "https://github.com/cloudsftp/reSnap"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ _404wolf ]; + mainProgram = "reSnap"; + }; +}) diff --git a/pkgs/by-name/rs/rsop/package.nix b/pkgs/by-name/rs/rsop/package.nix index 080063968f6c..8138b111ef5a 100644 --- a/pkgs/by-name/rs/rsop/package.nix +++ b/pkgs/by-name/rs/rsop/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "rsop"; - version = "0.3.9"; + version = "0.5.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "heiko"; repo = "rsop"; rev = "rsop/v${version}"; - hash = "sha256-K69vyZFaVvZj4yLaV/zQYoItvcTDuFR4mdmMcfl1UDA="; + hash = "sha256-Jh2SrIyMduODr3e3War0jCwHH6UwfU8764txzrImCaA="; }; - cargoHash = "sha256-DJVgnfPpXf8hGX6Dv6W8GzqspMEFZHc2/Fkn1MZRXd0="; + cargoHash = "sha256-OUJXQr3pQGCao0Ra5o9eZF0Jhp818/u5Pm1KJIoJV5w="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index fd0f0aab7057..223f777357c8 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; tag = version; - hash = "sha256-Y6J7hW+VYePhKH+5YXfuGuVB0WjYjUg8mM3kQBUnv/U="; + hash = "sha256-9YvHmNiKdf5hKqy9tToFSQZM2DNLoIiChcfjQay8wbU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nEpVAdo/awRxwBvYd8EpTzXdWho3+yuItCp8km+s2uM="; + cargoHash = "sha256-aTzTCDCMhG4cKD9wFNHv6A3VBUifnKgI8a6kelc3bAM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sa/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix index d191b4a2ef70..e34dc32019c5 100644 --- a/pkgs/by-name/sa/sage/sage-src.nix +++ b/pkgs/by-name/sa/sage/sage-src.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { # a more conservative version of https://github.com/sagemath/sage/pull/37951 ./patches/gap-element-crash.patch - # https://github.com/sagemath/sage/pull/38940, positively reviewed, to land in 10.6.beta0 + # https://github.com/sagemath/sage/pull/38940, landed in 10.6.beta0 (fetchpatch { name = "simplicial-sets-flaky-test.patch"; url = "https://github.com/sagemath/sage/commit/1830861c5130d30b891e8c643308e1ceb91ce2b5.diff"; @@ -76,6 +76,12 @@ stdenv.mkDerivation rec { # should come from or be proposed to upstream. This list will probably never # be empty since dependencies update all the time. packageUpgradePatches = [ + # https://github.com/sagemath/sage/pull/38887, landed in 10.6.beta0 + (fetchpatch { + name = "libbraiding-1.3-update.patch"; + url = "https://github.com/sagemath/sage/commit/f10a6d04599795732c1d99e2da0a4839ccdcb4f5.diff"; + hash = "sha256-xB0xg8dGLnSMdFK3/B5hkI9yzI5N3lUMhPZ89lDsp3s="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/by-name/sc/schemacrawler/package.nix b/pkgs/by-name/sc/schemacrawler/package.nix index 3564469983e3..a21a5e1525d0 100644 --- a/pkgs/by-name/sc/schemacrawler/package.nix +++ b/pkgs/by-name/sc/schemacrawler/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "schemacrawler"; - version = "16.23.2"; + version = "16.24.3"; src = fetchzip { url = "https://github.com/schemacrawler/SchemaCrawler/releases/download/v${finalAttrs.version}/schemacrawler-${finalAttrs.version}-bin.zip"; - hash = "sha256-fmY65m6Q+nJmhq1IXEeKnsWBH2+0qmdRSINxdJlo3bU="; + hash = "sha256-jTeRvT1MDC48k29rcowJSJWcnBWDwEK93BSp9XbPYUA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/si/sile/package.nix b/pkgs/by-name/si/sile/package.nix index 3407db382801..dd67e16272b9 100644 --- a/pkgs/by-name/si/sile/package.nix +++ b/pkgs/by-name/si/sile/package.nix @@ -29,17 +29,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "sile"; - version = "0.15.8"; + version = "0.15.9"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${finalAttrs.version}/sile-${finalAttrs.version}.tar.zst"; - hash = "sha256-ZMF6uv1bHvMEGagbAAmYhwwbCBtjctVbwx35w7g/D2o="; + hash = "sha256-+9pZUDszPYJmFgHbZH0aKtZ6qLcJjh73jG2CFoRKxWc="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) pname version src; nativeBuildInputs = [ zstd ]; - hash = "sha256-xv411fxOkjsbVNCNEIaopjLHbUCWdw+1JWePXHdrKBc="; + hash = "sha256-qw5XvXFhYLQJalk3fQwKakgBwfWMjhJzHKbqjchE2V0="; }; nativeBuildInputs = [ @@ -167,7 +167,6 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - broken = stdenv.isDarwin; description = "Typesetting system"; longDescription = '' SILE is a typesetting system; its job is to produce beautiful diff --git a/pkgs/by-name/si/simple64-netplay-server/package.nix b/pkgs/by-name/si/simple64-netplay-server/package.nix index 58c0463e4126..d91a8e266dfa 100644 --- a/pkgs/by-name/si/simple64-netplay-server/package.nix +++ b/pkgs/by-name/si/simple64-netplay-server/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "simple64-netplay-server"; - version = "2024.12.2"; + version = "2024.12.3"; src = fetchFromGitHub { owner = "simple64"; repo = "simple64-netplay-server"; tag = "v${version}"; - hash = "sha256-B0elTjklyXGpBAoqPN1HHeC9FIXsggKNKiDVvl8xgeU="; + hash = "sha256-u5KiP9O5wyNuYP1EdWs1xSEaz0Ey9dI9nX+YiavaEdw="; }; vendorHash = "sha256-1gySXbp1N0lnWToVQU3N9zQxl9Z0e9ICCeAIKwSoxaY="; diff --git a/pkgs/by-name/so/solaar/package.nix b/pkgs/by-name/so/solaar/package.nix index aacd8b11e439..7a52a9c948a7 100644 --- a/pkgs/by-name/so/solaar/package.nix +++ b/pkgs/by-name/so/solaar/package.nix @@ -15,13 +15,13 @@ # instead of adding this to `services.udev.packages` on NixOS, python3Packages.buildPythonApplication rec { pname = "solaar"; - version = "1.1.13"; + version = "1.1.14"; src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; tag = version; - hash = "sha256-sYJrVAeZi0a7yD0i/zIIxcu9X/c5HvgoI/n50eXD47s="; + hash = "sha256-cAM4h0OOXxItSf0Gb9PfHn385FXMKwvIUuYTrjgABwA="; }; outputs = [ @@ -49,9 +49,16 @@ python3Packages.buildPythonApplication rec { pygobject3 pyudev pyyaml + typing-extensions xlib ]; + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + pytest-mock + pytest-cov + ]; + # the -cli symlink is just to maintain compabilility with older versions where # there was a difference between the GUI and CLI versions. postInstall = '' @@ -66,10 +73,10 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - # no tests - doCheck = false; - - pythonImportsCheck = [ "solaar" ]; + pythonImportsCheck = [ + "solaar" + "solaar.gtk" + ]; meta = with lib; { description = "Linux devices manager for the Logitech Unifying Receiver"; diff --git a/pkgs/by-name/sq/sqlfluff/package.nix b/pkgs/by-name/sq/sqlfluff/package.nix index 88d36b9006aa..e3ef6f08f1d0 100644 --- a/pkgs/by-name/sq/sqlfluff/package.nix +++ b/pkgs/by-name/sq/sqlfluff/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "3.2.5"; + version = "3.3.0"; pyproject = true; src = fetchFromGitHub { owner = "sqlfluff"; repo = "sqlfluff"; tag = version; - hash = "sha256-jYAzFqHuTpcgmnodt7vuNWTHRP3rd0B/3tp2Q04/N9o="; + hash = "sha256-srsSDMvZ7lDDfDuINB0nXR2u+X+bzMqOZL9tvl9GI/s="; }; build-system = with python3.pkgs; [ setuptools ]; @@ -31,6 +31,7 @@ python3.pkgs.buildPythonApplication rec { jinja2 oyaml pathspec + platformdirs pytest regex tblib diff --git a/pkgs/by-name/ss/sse2neon/package.nix b/pkgs/by-name/ss/sse2neon/package.nix index f7ef8cca1563..fc5ec88908dc 100644 --- a/pkgs/by-name/ss/sse2neon/package.nix +++ b/pkgs/by-name/ss/sse2neon/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sse2neon"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "DLTcollab"; repo = "sse2neon"; rev = "v${finalAttrs.version}"; - hash = "sha256-riFFGIA0H7e5StYSjO0/JDrduzfwS+lOASzk5BRUyo4="; + hash = "sha256-vb9k+KjiGodVngza0R18LjfPTlsqFbzqXZqefm6KHj0="; }; postPatch = '' diff --git a/pkgs/by-name/su/subtitleedit/package.nix b/pkgs/by-name/su/subtitleedit/package.nix index 7de6d0ba2f4a..44c7b67bd88e 100644 --- a/pkgs/by-name/su/subtitleedit/package.nix +++ b/pkgs/by-name/su/subtitleedit/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "subtitleedit"; - version = "4.0.8"; + version = "4.0.10"; src = fetchzip { url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${ lib.replaceStrings [ "." ] [ "" ] version }.zip"; - hash = "sha256-pUCuAxCljRu1fXPQIBDWtkC17RBD+Bv6Nx5Tw/ACuXw="; + hash = "sha256-9T5CiPd90wqgK1s/w1u2doD0lN29u3HTsu+jKRSO9LA="; stripRoot = false; }; diff --git a/pkgs/by-name/te/termshot/go-mod.patch b/pkgs/by-name/te/termshot/go-mod.patch deleted file mode 100644 index 5618ec24f8b2..000000000000 --- a/pkgs/by-name/te/termshot/go-mod.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/go.mod b/go.mod -index 6627fb1..a3397a9 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,6 +1,6 @@ - module github.com/homeport/termshot - --go 1.20 -+go 1.22.0 - - require ( - github.com/creack/pty v1.1.23 diff --git a/pkgs/by-name/te/termshot/package.nix b/pkgs/by-name/te/termshot/package.nix index d3e580ae3244..b2cccc198b77 100644 --- a/pkgs/by-name/te/termshot/package.nix +++ b/pkgs/by-name/te/termshot/package.nix @@ -2,21 +2,22 @@ lib, fetchFromGitHub, buildGoModule, + testers, + termshot, + nix-update-script, }: buildGoModule rec { pname = "termshot"; - version = "0.2.12"; + version = "0.3.0"; src = fetchFromGitHub { owner = "homeport"; repo = "termshot"; - rev = "v${version}"; - hash = "sha256-ua2tFyOjLeqOpipLoSisASqwjqGEFdkxd2qHybZ1VDU="; + tag = "v${version}"; + hash = "sha256-vvSUdXVLuc3GmxPX9SzSeb8vbmqjhSLjXd9nmU7Q46g="; }; - vendorHash = "sha256-JweKjKvShiimFHQwRtoVuongWqqGIPcPz77qEVNec+M="; - - patches = [ ./go-mod.patch ]; + vendorHash = "sha256-nXAIU07SY/GdWZGASHXDg36cSGKw4elLOBDCoJk/xlU="; ldflags = [ "-s" @@ -24,9 +25,15 @@ buildGoModule rec { "-X github.com/homeport/termshot/internal/cmd.version=${version}" ]; + passthru = { + tests.version = testers.testVersion { package = termshot; }; + updateScript = nix-update-script { }; + }; + meta = { description = "Creates screenshots based on terminal command output"; homepage = "https://github.com/homeport/termshot"; + changelog = "https://github.com/homeport/termshot/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ defelo ]; mainProgram = "termshot"; diff --git a/pkgs/by-name/te/terra-station/package.nix b/pkgs/by-name/te/terra-station/package.nix index 7cfc3a97e3d9..9cc16d1e198f 100644 --- a/pkgs/by-name/te/terra-station/package.nix +++ b/pkgs/by-name/te/terra-station/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Terra station is the official wallet of the Terra blockchain"; - homepage = "https://docs.terra.money/docs/learn/terra-station/README.html"; + homepage = "https://station.money/"; license = licenses.isc; maintainers = [ maintainers.peterwilli ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/tu/turn-rs/package.nix b/pkgs/by-name/tu/turn-rs/package.nix index 9e43f62cc310..f15d22117714 100644 --- a/pkgs/by-name/tu/turn-rs/package.nix +++ b/pkgs/by-name/tu/turn-rs/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "turn-rs"; - version = "3.2.0"; + version = "3.3.2"; src = fetchFromGitHub { owner = "mycrl"; repo = "turn-rs"; tag = "v${version}"; - hash = "sha256-4I4mjG/euBL08v4xZdnrI8aTGVo5z2F2FDYtxKW1Qt8="; + hash = "sha256-ITs6kNI1g7k8bcSSG6GwPGY5U+mFGqCTU6JIEj9mH/Q="; }; - cargoHash = "sha256-yRlfqG6WEtF9ebHm8Mh4FtzfoRoaQhBnOQotSpisLck="; + cargoHash = "sha256-bmeTDMa/khX7fTDCGpf3U2LZPnkXL+bi69sv6NPnANI="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/us/usbredir/package.nix b/pkgs/by-name/us/usbredir/package.nix index d6642ad20b01..c8ba1fd31260 100644 --- a/pkgs/by-name/us/usbredir/package.nix +++ b/pkgs/by-name/us/usbredir/package.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "usbredir"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "spice"; repo = "usbredir"; rev = "${pname}-${version}"; - sha256 = "sha256-zehf0DkqSSvmatbk/UB1oySjyqiFUYTuIhqb5xKeK7I="; + sha256 = "sha256-ShxysMoFSGP/dSIPthwb1Q6htotv7BP9jm09p2Nqdus="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix index 9d9313a33ca9..14bc32e5cc2c 100644 --- a/pkgs/by-name/vc/vcpkg/package.nix +++ b/pkgs/by-name/vc/vcpkg/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "vcpkg"; - version = "2024.11.16"; + version = "2024.12.16"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg"; rev = finalAttrs.version; - hash = "sha256-aaR+R4/25dHq7ynuZO8pD61cHNCc9ws1TvEbk66GEcI="; + hash = "sha256-4Xk71JPklq7qwYXPE+EzNvD5rTfPvgyV/O7nSvgjKVo="; leaveDotGit = true; postFetch = '' cd "$out" diff --git a/pkgs/by-name/zc/zchaff/package.nix b/pkgs/by-name/zc/zchaff/package.nix index 4e486c5a9512..c0ffc52641da 100644 --- a/pkgs/by-name/zc/zchaff/package.nix +++ b/pkgs/by-name/zc/zchaff/package.nix @@ -26,7 +26,7 @@ clangStdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://www.princeton.edu/~chaff/zchaf"; + homepage = "https://www.princeton.edu/~chaff/zchaff.html"; description = "Accelerated SAT Solver from Princeton"; mainProgram = "zchaff"; license = licenses.mit; diff --git a/pkgs/by-name/zs/zsh-forgit/package.nix b/pkgs/by-name/zs/zsh-forgit/package.nix index be67560f4c62..9dc1681fc3da 100644 --- a/pkgs/by-name/zs/zsh-forgit/package.nix +++ b/pkgs/by-name/zs/zsh-forgit/package.nix @@ -15,13 +15,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "zsh-forgit"; - version = "24.11.0"; + version = "25.01.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; tag = finalAttrs.version; - hash = "sha256-8BMFL3WktkkB8m6asbNeb9swnLWi3jHo012fBXGa8ls="; + hash = "sha256-x+Y1o+K6I9DWbn202jNAr40vS71ZAXbS7ztsH+bPGBI="; }; strictDeps = true; diff --git a/pkgs/by-name/zx/zx/package.nix b/pkgs/by-name/zx/zx/package.nix index 62087c4b0704..30d9763f4e00 100644 --- a/pkgs/by-name/zx/zx/package.nix +++ b/pkgs/by-name/zx/zx/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "zx"; - version = "8.2.4"; + version = "8.3.0"; src = fetchFromGitHub { owner = "google"; repo = "zx"; rev = version; - hash = "sha256-P2hQ00Q/k9wj/R09DtnRkTOk3t0vSWK8b2J7a01FN4s="; + hash = "sha256-bzsod4kZVffFTVwfU0CvK4L3lYJW9zaP1PUMLTEJflw="; }; - npmDepsHash = "sha256-xxq/LfTXW7UX/CzM8aD59/efEDVykVekNGdCifPWLhU="; + npmDepsHash = "sha256-lYrMcnix1pTG21NKcXe2fPhsSbXfMt1elqBxgfBtdaI="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/development/embedded/elf2uf2-rs/default.nix b/pkgs/development/embedded/elf2uf2-rs/default.nix deleted file mode 100644 index 239ffbbeb96b..000000000000 --- a/pkgs/development/embedded/elf2uf2-rs/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, udev, CoreFoundation, DiskArbitration, Foundation }: - -rustPlatform.buildRustPackage rec { - pname = "elf2uf2-rs"; - version = "2.0.0"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-cmiCOykORue0Cg2uUUWa/nXviX1ddbGNC5gRKe+1kYs="; - }; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = lib.optional stdenv.hostPlatform.isLinux udev - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - DiskArbitration - Foundation - ]; - - cargoHash = "sha256-TBH3pLB6vQVGnfShLtFPNKjciuUIuTkvp3Gayzo+X9E="; - - meta = with lib; { - description = "Convert ELF files to UF2 for USB Flashing Bootloaders"; - mainProgram = "elf2uf2-rs"; - homepage = "https://github.com/JoNil/elf2uf2-rs"; - license = with licenses; [ bsd0 ]; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ polygon moni ]; - }; -} diff --git a/pkgs/development/ocaml-modules/cil/default.nix b/pkgs/development/ocaml-modules/cil/default.nix index 73e37f9281bc..da1c0aa10c2b 100644 --- a/pkgs/development/ocaml-modules/cil/default.nix +++ b/pkgs/development/ocaml-modules/cil/default.nix @@ -39,7 +39,7 @@ else prefixKey = "-prefix="; meta = with lib; { - homepage = "http://kerneis.github.io/cil/"; + homepage = "https://sourceforge.net/projects/cil/"; description = "Front-end for the C programming language that facilitates program analysis and transformation"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/pkgs/development/ocaml-modules/ocaml-version/default.nix index e1839ad42e8c..4744d7b104f3 100644 --- a/pkgs/development/ocaml-modules/ocaml-version/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-version/default.nix @@ -7,11 +7,11 @@ buildDunePackage rec { pname = "ocaml-version"; - version = "3.6.9"; + version = "3.7.2"; src = fetchurl { url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz"; - hash = "sha256-NcelYCcDPooOP7GfWr2m27GDikKiMqezcvRfFmBzlYY="; + hash = "sha256-fTbh4fAJkkQr8Az6Limt5i8/zQnxTZSrhbfK8i08da0="; }; checkInputs = [ alcotest ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index a77a5e07cfbf..1954fe6dd0d5 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.35.91"; + version = "1.35.92"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-eA9xQGFHt4+YYNeJB7XAFYdFN9ghNkWI7IN8TNHuz5E="; + hash = "sha256-8q9GOInTf7qyPHzQj7GwNfEjrWfks+/Eb3cU+avuXlc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 171a03bc1357..0183050890ec 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.35.91"; + version = "1.35.92"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-3hUCkyBdsQlvcNEMAwYHBXm4Jfopg+Axx/3+Z+grxVo="; + hash = "sha256-wCrnBYjiDRWoEAs0waHr+l8I6Fb2BXDbDRaxKNxMXCQ="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index c9cfaeae73fd..5254ba230cda 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -19,21 +19,21 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "2.20.0"; + version = "2.24.0"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "googleapis"; repo = "python-api-core"; - rev = "v${version}"; - hash = "sha256-ccjkGQNaPRefI6+j/O+NwdBGEVNuZ5q5m1d8EAJGcbs="; + tag = "v${version}"; + hash = "sha256-6U5rNhF4AYWae50pNIqDdlMzRhW4iV9vPlMPXN11DqQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ googleapis-common-protos google-auth protobuf @@ -42,6 +42,7 @@ buildPythonPackage rec { ]; optional-dependencies = { + async_rest = [ google-auth ] ++ google-auth.optional-dependencies.aiohttp; grpc = [ grpcio grpcio-status diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index 69165286ba00..a2951074a122 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Toolkit for developing and comparing your reinforcement learning agents"; - homepage = "https://gym.openai.com/"; + homepage = "https://www.gymlibrary.dev/"; license = licenses.mit; maintainers = with maintainers; [ hyphon81 ]; }; diff --git a/pkgs/development/python-modules/llama-index-legacy/default.nix b/pkgs/development/python-modules/llama-index-legacy/default.nix index 43e13c7cedeb..06d32b341bcd 100644 --- a/pkgs/development/python-modules/llama-index-legacy/default.nix +++ b/pkgs/development/python-modules/llama-index-legacy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "LlamaIndex Readers Integration for files"; - homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-legacy"; + homepage = "https://github.com/run-llama/llama_index/tree/v0.9.48"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index f6a56d0717e8..71f98591725a 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -462,8 +462,8 @@ rec { "sha256-K63rvMDWrOWjyizRLwSs5DQn3ysF/VBqK2tVtiINx/0="; mypy-boto3-ecs = - buildMypyBoto3Package "ecs" "1.35.83" - "sha256-ruY2UL5CAnjS04vJAwS1a5tTk34TlOuWubE2PIXb0Y0="; + buildMypyBoto3Package "ecs" "1.35.92" + "sha256-wdAUexTVWFFEdTmy2S5ugCYZKks7VVlIkI/Z/Ce5Q+M="; mypy-boto3-efs = buildMypyBoto3Package "efs" "1.35.65" @@ -1150,8 +1150,8 @@ rec { "sha256-n4arbk3VN6P/7abnM5yhgOQFdLJwioOdyx2ILcc6Mag="; mypy-boto3-route53domains = - buildMypyBoto3Package "route53domains" "1.35.80" - "sha256-2zkKRakpeh2MwVeg3LLJ0QhKt+p4kGBVeUXXueFI5zM="; + buildMypyBoto3Package "route53domains" "1.35.92" + "sha256-5zgrNM8ZEJ/vtpeFrsJwpX6tfIZhPp1IpIJBJpI12IQ="; mypy-boto3-route53resolver = buildMypyBoto3Package "route53resolver" "1.35.63" @@ -1162,8 +1162,8 @@ rec { "sha256-RwPNNFntNChLqbr86wd1bwp6OqWvs3oj3V+4X71J3Hw="; mypy-boto3-s3 = - buildMypyBoto3Package "s3" "1.35.81" - "sha256-/hpoYMDKcBbiQImBlDPA1YNdSldjW7QmKGRbcScblGw="; + buildMypyBoto3Package "s3" "1.35.92" + "sha256-msiNwPbYeJI0TtmbHloohCFVA6//OFlBe2AQsx3nzvY="; mypy-boto3-s3control = buildMypyBoto3Package "s3control" "1.35.73" diff --git a/pkgs/development/python-modules/permissionedforms/default.nix b/pkgs/development/python-modules/permissionedforms/default.nix index 8abf3f5abf99..053786250673 100644 --- a/pkgs/development/python-modules/permissionedforms/default.nix +++ b/pkgs/development/python-modules/permissionedforms/default.nix @@ -31,8 +31,8 @@ buildPythonPackage rec { meta = with lib; { description = "Django extension for creating forms that vary according to user permissions"; - homepage = "https://github.com/wagtail/permissionedforms"; - changelog = "https://github.com/wagtail/permissionedforms/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/wagtail/django-permissionedforms"; + changelog = "https://github.com/wagtail/django-permissionedforms/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ sephi ]; }; diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index ae3cd88eeef7..1652041c7da7 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -1,8 +1,8 @@ { lib, buildPythonPackage, - fetchPypi, - isPy3k, + fetchFromGitHub, + setuptools, protobuf, googleapis-common-protos, pytestCheckHook, @@ -11,16 +11,19 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.24.0"; - format = "setuptools"; - disabled = !isPy3k; + version = "1.25.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-MLcqXsr+RAaw0znbNbVsQFkGTmkie4w72nRiOX+WZEU="; + src = fetchFromGitHub { + owner = "googleapis"; + repo = "proto-plus-python"; + tag = "v${version}"; + hash = "sha256-rRA5t3QPVSeAqy60icrgvYKbvrClv22I3IYxHoMftQ0="; }; - propagatedBuildInputs = [ protobuf ]; + build-system = [ setuptools ]; + + dependencies = [ protobuf ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index ab56391a36f3..61677f36fc54 100644 --- a/pkgs/development/python-modules/pydeps/default.nix +++ b/pkgs/development/python-modules/pydeps/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pydeps"; - version = "2.0.1"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "thebjorn"; repo = "pydeps"; tag = "v${version}"; - hash = "sha256-ZLFcaWzu8iYBnbSh1Ua4fvFyYD5q71R/iIqzRUKRn1E="; + hash = "sha256-0GYqCeEMlLjYVVzoHoe16BAtx4qBZalwsji2v1aUKz0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index 8ed3ea4861e2..ca6db58defda 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pypck"; - version = "0.8.2"; + version = "0.8.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "alengwenus"; repo = "pypck"; tag = version; - hash = "sha256-u3vk8yLP35ZQFajp3ngadNM3KY40zShPMYm9iN5U86Y="; + hash = "sha256-5MfWFtCIGRHO68dGKDmf++2yWA/wcK3JlM+4o5HKuE8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-crfsuite/default.nix b/pkgs/development/python-modules/python-crfsuite/default.nix index 5debefcbb397..ae56a4e20418 100644 --- a/pkgs/development/python-modules/python-crfsuite/default.nix +++ b/pkgs/development/python-modules/python-crfsuite/default.nix @@ -3,16 +3,18 @@ buildPythonPackage, fetchPypi, pytestCheckHook, + cython, }: buildPythonPackage rec { pname = "python-crfsuite"; - version = "0.9.10"; + version = "0.9.11"; format = "setuptools"; src = fetchPypi { - inherit pname version; - hash = "sha256-84UkYx4rUzNB8Q8sd2iScNxuzVmFSV3M96o3sQRbwuU="; + inherit version; + pname = "python_crfsuite"; + hash = "sha256-bv+WXKcFZzltgiyaNep0sPftsn2UcVJJl72r56baX1o="; }; preCheck = '' @@ -20,6 +22,10 @@ buildPythonPackage rec { rm -r pycrfsuite ''; + build-system = [ + cython + ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pycrfsuite" ]; diff --git a/pkgs/development/python-modules/should-dsl/default.nix b/pkgs/development/python-modules/should-dsl/default.nix index 5ff8faa1b862..1760ed454397 100644 --- a/pkgs/development/python-modules/should-dsl/default.nix +++ b/pkgs/development/python-modules/should-dsl/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Should assertions in Python as clear and readable as possible"; - homepage = "http://www.should-dsl.info/"; + homepage = "https://github.com/nsi-iff/should-dsl"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index ce40dc26b26f..4aef55659c6c 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1294"; + version = "3.0.1295"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-6Xuih0E+i5dxTlkYzYa0J3T0aNpCoGnnBo1tpfuzWQM="; + hash = "sha256-mbrOk+aeeVCfNHCMvU9p1/P3X1Z+n8XIsNfKnOOZ0Q4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/thinqconnect/default.nix b/pkgs/development/python-modules/thinqconnect/default.nix index a83a92e75d75..cf908a78d7c0 100644 --- a/pkgs/development/python-modules/thinqconnect/default.nix +++ b/pkgs/development/python-modules/thinqconnect/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "thinqconnect"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "thinq-connect"; repo = "pythinqconnect"; tag = version; - hash = "sha256-Y/L/PhTBTUF8INqLgIi1llRrticlGPb8F/sPq3XWxN4="; + hash = "sha256-p2EY1DeLxmXcfohN4e4I7I+SNkabEr37ZC2ka1CT7/s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/twentemilieu/default.nix b/pkgs/development/python-modules/twentemilieu/default.nix index abef5723d242..f91d96c0658e 100644 --- a/pkgs/development/python-modules/twentemilieu/default.nix +++ b/pkgs/development/python-modules/twentemilieu/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "twentemilieu"; - version = "2.2.0"; + version = "2.2.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-twentemilieu"; tag = "v${version}"; - hash = "sha256-8tYa/fnc8km0Tl0N/OMP8GUUlIjzB8XP1Ivy9jDmY3s="; + hash = "sha256-N6XSf212orMf3vqIjBzu+4fpKX7kFinH180lCWXtjzc="; }; postPatch = '' diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 7509d0d45c5f..fec1ba2f7306 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -321,9 +321,12 @@ in cp -R ext/fast_mmaped_file_rs $out ''; }; - hash = if lib.versionAtLeast attrs.version "1.1.1" - then "sha256-RsN5XWX7Mj2ORccM0eczY+44WXsbXNTnJVcCMvnOATk=" - else "sha256-XuQZPbFWqPHlrJvllkvLl1FjKeoAUbi8oKDrS2rY1KM="; + hash = if lib.versionAtLeast attrs.version "1.1.2" + then "sha256-pNzW2fQZDcuqu8apv3GU7lUC/H1cX5WRifBBQlbE8+s=" + else + if lib.versionAtLeast attrs.version "1.1.1" + then "sha256-RsN5XWX7Mj2ORccM0eczY+44WXsbXNTnJVcCMvnOATk=" + else "sha256-XuQZPbFWqPHlrJvllkvLl1FjKeoAUbi8oKDrS2rY1KM="; }; nativeBuildInputs = [ cargo diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index af1d4e07db6f..c74648165775 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.344"; + version = "3.2.346"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-wmQJSqoFOrWi5ihGFd0PA+hSW/H4si+N6wprFHWDYbM="; + hash = "sha256-hdnS4fCDhLIhMOiIEamncGqDhNcyuoy6FxVfEGIkVpM="; }; patches = [ ./flake8-compat-5.x.patch ]; diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix index 37ca9667833b..4a61021a00ca 100644 --- a/pkgs/development/tools/rbspy/default.nix +++ b/pkgs/development/tools/rbspy/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "rbspy"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "rbspy"; repo = "rbspy"; tag = "v${version}"; - hash = "sha256-K5zDM7HhSNklCMoj3yh5lf0HTITOl2UYXW0QCxDF2GU="; + hash = "sha256-6tCTrplzoiimKvXEIXd2gUOXzcZ/eQ22npBqbVv0Nv0="; }; - cargoHash = "sha256-2yYv7Pp6UqHTPrmG4BM0py3GoPYYJW7e9LQSrgxx/3A="; + cargoHash = "sha256-J+3v7O38+MhCoq1UKf0Sqaomw/SSu+JK3sWWv9rB6FI="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' @@ -35,6 +35,8 @@ rustPlatform.buildRustPackage rec { --replace /usr/bin/which '${which}/bin/which' substituteInPlace src/sampler/mod.rs \ --replace /usr/bin/which '${which}/bin/which' + substituteInPlace src/core/ruby_spy.rs \ + --replace /usr/bin/ruby '${ruby}/bin/ruby' ''; checkFlags = [ @@ -45,10 +47,12 @@ rustPlatform.buildRustPackage rec { "--skip=test_sample_subprocesses" ]; - nativeBuildInputs = [ + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin rustPlatform.bindgenHook; + + nativeCheckInputs = [ ruby which - ] ++ lib.optional stdenv.hostPlatform.isDarwin rustPlatform.bindgenHook; + ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/games/openttd/jgrpp.nix b/pkgs/games/openttd/jgrpp.nix index 6b107fe6db7b..6d76db258254 100644 --- a/pkgs/games/openttd/jgrpp.nix +++ b/pkgs/games/openttd/jgrpp.nix @@ -2,13 +2,13 @@ openttd.overrideAttrs (oldAttrs: rec { pname = "openttd-jgrpp"; - version = "0.63.2"; + version = "0.63.3"; src = fetchFromGitHub rec { owner = "JGRennison"; repo = "OpenTTD-patches"; rev = "jgrpp-${version}"; - hash = "sha256-kf9UGhD0a8lttdL8svvEZSKEFfkAJ2xlaJ9IvO1gR1s="; + hash = "sha256-853LbApHqQn+ucb7xjFDfohB0/T1h11o4voBgvgbpSI="; }; buildInputs = oldAttrs.buildInputs ++ [ zstd ]; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 68530d0c7c4b..31c7108b4805 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -30,16 +30,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2024-12-13T22-19-12Z"; + version = "2024-12-18T13-15-44Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - hash = "sha256-/ntz0N59RPO1mcVWz5y3bzl8JwYsGRzOczo6cMWaqYw="; + hash = "sha256-mnGhO958Q56XuiYhWxrwnmbHeezHofwGpjIxaz+kSg4="; }; - vendorHash = "sha256-HCU4zGlNoGdC2tV6coDWtvf/JYwwSnNxdFSJIv77q/g="; + vendorHash = "sha256-LshfxzHVFB/esukSGdWYjFn47PZ5rjIoZVcqw2IijIc="; doCheck = false; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index c0ef656a3ca4..f1c275ca322e 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -76,13 +76,13 @@ let in buildPythonApplication rec { pname = "xpra"; - version = "6.2.1"; + version = "6.2.2"; src = fetchFromGitHub { owner = "Xpra-org"; repo = "xpra"; rev = "v${version}"; - hash = "sha256-TdRQcl0o9L37JXWxoWkAw9sAH5eWpynWkCwo1tBwa9s="; + hash = "sha256-YLz2Ex3gHabicPbGj5BFP1pwU/8K/bu4R7cWi1Fu2oM="; }; patches = [ diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 9d54bd864820..6cc7a02caade 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -41,11 +41,11 @@ let in (if withQt then mkDerivation else stdenv.mkDerivation) rec { pname = "gnuplot"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${pname}-${version}.tar.gz"; - sha256 = "sha256-6FpmDBoqGAj/JPfmmYH/y6xmpFydz3EbZWELJupxN5o="; + sha256 = "sha256-9oo7C7t7u7Q3ZJZ0EG2UUiwAvy8oXM4MGcMYCx7n5zg="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index 609c75e6c1c8..26e0d03540b9 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "https://niftools.sourceforge.net/wiki/NifSkope"; + homepage = "https://github.com/niftools/nifskope"; description = "Tool for analyzing and editing NetImmerse/Gamebryo '*.nif' files"; maintainers = [ ]; platforms = platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6673f2f0f2df..e9c20f5904ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8029,10 +8029,6 @@ with pkgs; edb = libsForQt5.callPackage ../development/tools/misc/edb { }; - elf2uf2-rs = darwin.apple_sdk_11_0.callPackage ../development/embedded/elf2uf2-rs { - inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation DiskArbitration Foundation; - }; - license_finder = callPackage ../development/tools/license_finder { }; # NOTE: Override and set useIcon = false to use Awk instead of Icon. @@ -12756,8 +12752,6 @@ with pkgs; inherit (plasma5Packages) breeze-icons; }; - iosevka = callPackage ../data/fonts/iosevka { }; - iosevka-bin = callPackage ../data/fonts/iosevka/bin.nix { }; iosevka-comfy = recurseIntoAttrs (callPackages ../data/fonts/iosevka/comfy.nix {}); kde-rounded-corners = kdePackages.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { }; @@ -16205,8 +16199,8 @@ with pkgs; fteqcc; heroic-unwrapped = callPackage ../games/heroic { - # Match the version used by the upstream package. - electron = electron_31; + # Upstream uses EOL Electron 31. Use next oldest version. + electron = electron_32; }; heroic = callPackage ../games/heroic/fhsenv.nix { };