From 93b9cc2e2d0baf65c0f3065f39eaae1448235654 Mon Sep 17 00:00:00 2001 From: Max Guppy Date: Thu, 10 Apr 2025 09:38:34 +1000 Subject: [PATCH 01/65] maintainers: add theonlymrcat --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6588d522f3b6..c445e16ab9b8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -24005,6 +24005,12 @@ githubId = 71843723; keys = [ { fingerprint = "EEFB CC3A C529 CFD1 943D A75C BDD5 7BE9 9D55 5965"; } ]; }; + theonlymrcat = { + name = "Max Guppy"; + email = "theonly@mrcat.au"; + github = "TheOnlyMrCat"; + githubId = 23222857; + }; theoparis = { email = "theo@tinted.dev"; github = "theoparis"; From 59b7e9b9d1b1718d5eabedb13b5a591d39fd1841 Mon Sep 17 00:00:00 2001 From: Lukas Wurzinger Date: Wed, 28 May 2025 05:19:40 +0200 Subject: [PATCH 02/65] mpris-discord-rpc: init at 0.4.0 --- pkgs/by-name/mp/mpris-discord-rpc/package.nix | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 pkgs/by-name/mp/mpris-discord-rpc/package.nix diff --git a/pkgs/by-name/mp/mpris-discord-rpc/package.nix b/pkgs/by-name/mp/mpris-discord-rpc/package.nix new file mode 100644 index 000000000000..8a613bb35d3f --- /dev/null +++ b/pkgs/by-name/mp/mpris-discord-rpc/package.nix @@ -0,0 +1,47 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + dbus, + openssl, + stdenv, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "mpris-discord-rpc"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "patryk-ku"; + repo = "mpris-discord-rpc"; + tag = "v${finalAttrs.version}"; + hash = "sha256-szftij29YTLzqBNirvoTgZfPIRznM1Ax5MPTKqB1nYI="; + }; + + cargoHash = "sha256-/QYeNcmkW6cm1VJkzJfVGvZU79wGswhKUFYc54oQbGw="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + dbus + openssl + ]; + + postInstall = '' + mkdir --parents $out/etc/systemd/user + substitute $src/mpris-discord-rpc.service $out/etc/systemd/user/mpris-discord-rpc.service \ + --replace-fail /usr/bin/mpris-discord-rpc $out/bin/mpris-discord-rpc + ''; + + meta = { + description = "Linux Discord rich presence for music, using MPRIS with album cover and progress bar support"; + homepage = "https://github.com/patryk-ku/mpris-discord-rpc"; + changelog = "https://github.com/patryk-ku/mpris-discord-rpc/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.lukaswrz ]; + mainProgram = "mpris-discord-rpc"; + }; +}) From 8611acd9ba74caf78e60e2cc896220f5ba68afec Mon Sep 17 00:00:00 2001 From: Johan Larsson Date: Thu, 24 Apr 2025 10:56:10 +0200 Subject: [PATCH 03/65] oama: wrap binary with coreutils and keyring manager --- pkgs/by-name/oa/oama/package.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/by-name/oa/oama/package.nix b/pkgs/by-name/oa/oama/package.nix index d68fc20ae775..7a282ca82f88 100644 --- a/pkgs/by-name/oa/oama/package.nix +++ b/pkgs/by-name/oa/oama/package.nix @@ -2,6 +2,12 @@ haskell, lib, stdenv, + coreutils, + libsecret, + gnupg, + makeBinaryWrapper, + withLibsecret ? true, # default oama config uses libsecret + withGpg ? false, }: let inherit (haskell.lib.compose) overrideCabal justStaticExecutables; @@ -12,6 +18,19 @@ let maintainers = with lib.maintainers; [ aidalgol ]; passthru.updateScript = ./update.sh; + + buildDepends = [ + makeBinaryWrapper + ]; + + postInstall = '' + wrapProgram $out/bin/oama \ + --prefix PATH : ${ + lib.makeBinPath ( + [ coreutils ] ++ lib.optional withLibsecret libsecret ++ lib.optional withGpg gnupg + ) + } + ''; }; raw-pkg = haskell.packages.ghc912.callPackage ./generated-package.nix { }; From 4ac2f96ef88b75c8622b2eff2ef915af6557e733 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 1 Jun 2025 16:45:05 +0800 Subject: [PATCH 04/65] gtklock-virtkb-module: init at 0-unstable-2025-02-27 --- .../gt/gtklock-virtkb-module/package.nix | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/gt/gtklock-virtkb-module/package.nix diff --git a/pkgs/by-name/gt/gtklock-virtkb-module/package.nix b/pkgs/by-name/gt/gtklock-virtkb-module/package.nix new file mode 100644 index 000000000000..3ef7add9f382 --- /dev/null +++ b/pkgs/by-name/gt/gtklock-virtkb-module/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + gtk3, + gtklock, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gtklock-virtkb-module"; + version = "0-unstable-2025-02-27"; + + src = fetchFromGitHub { + owner = "progandy"; + repo = "gtklock-virtkb-module"; + rev = "a11c2d8f14a79f271b02711b38220f927bc7fdf8"; + hash = "sha256-+kEv5SlMINCORQQOOZ4Lb1dSJXLCbX2oAsD6NTbuhdE="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + gtk3 + ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + passthru.tests.testModule = gtklock.passthru.testModule finalAttrs.finalPackage; + + meta = { + description = "Gtklock module adding a keyboard to the lockscreen"; + homepage = "https://github.com/progandy/gtklock-virtkb-module"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +}) From 46e19a5d31a89a35279700d7ecac4d2d34eaded4 Mon Sep 17 00:00:00 2001 From: April Schleck Date: Fri, 30 May 2025 20:44:28 -0700 Subject: [PATCH 05/65] anystyle-cli: 1.3.1 -> 1.5.0 Also unbreaks the package --- pkgs/tools/misc/anystyle-cli/Gemfile | 31 +- pkgs/tools/misc/anystyle-cli/Gemfile.lock | 127 +- .../misc/anystyle-cli/anystyle-cli.gemspec | 32 + pkgs/tools/misc/anystyle-cli/anystyle.gemspec | 52 - pkgs/tools/misc/anystyle-cli/default.nix | 10 +- pkgs/tools/misc/anystyle-cli/gemset.nix | 2202 ++--------------- 6 files changed, 295 insertions(+), 2159 deletions(-) create mode 100644 pkgs/tools/misc/anystyle-cli/anystyle-cli.gemspec delete mode 100644 pkgs/tools/misc/anystyle-cli/anystyle.gemspec diff --git a/pkgs/tools/misc/anystyle-cli/Gemfile b/pkgs/tools/misc/anystyle-cli/Gemfile index be47216200d2..8d6364f03b20 100644 --- a/pkgs/tools/misc/anystyle-cli/Gemfile +++ b/pkgs/tools/misc/anystyle-cli/Gemfile @@ -1,37 +1,10 @@ source 'https://rubygems.org' gemspec - group :development, :test do - #gem 'anystyle-data', github: 'inukshuk/anystyle-data' - #gem 'wapiti', github: 'inukshuk/wapiti-ruby' - gem 'bibtex-ruby' - gem 'rake' - gem 'rspec', '~>3.0' - gem 'language_detector', github: 'feedbackmine/language_detector' - gem 'unicode-scripts' - gem 'edtf' - gem 'citeproc' - gem 'unicode_utils' if RUBY_VERSION < '2.4' -end - -group :coverage do - gem 'simplecov', require: false - gem 'coveralls', require: false if ENV['CI'] + gem 'anystyle', github: 'inukshuk/anystyle' end group :debug do - gem 'byebug', require: false -end - -group :profile do - gem 'ruby-prof', require: false - gem 'gnuplot', require: false -end - -group :extra do - gem 'lmdb' - gem 'redis' - gem 'redis-namespace' - gem 'yard' + gem 'debug', require: false end diff --git a/pkgs/tools/misc/anystyle-cli/Gemfile.lock b/pkgs/tools/misc/anystyle-cli/Gemfile.lock index 8d28ef808948..f32ab35dd7c4 100644 --- a/pkgs/tools/misc/anystyle-cli/Gemfile.lock +++ b/pkgs/tools/misc/anystyle-cli/Gemfile.lock @@ -1,99 +1,70 @@ GIT - remote: https://github.com/feedbackmine/language_detector.git - revision: 89102790194150b3a8110ce691f9989b8ce70f8d + remote: https://github.com/inukshuk/anystyle.git + revision: c6f5fb2fa6e8ce9456ad1e1e88d6bba5f3d7731d specs: - language_detector (0.1.2) + anystyle (1.6.0) + anystyle-data (~> 1.3) + bibtex-ruby (~> 6.0) + namae (~> 1.0) + wapiti (~> 2.1) PATH remote: . specs: - anystyle (1.3.10) - anystyle-data (~> 1.2) - bibtex-ruby (~> 5.0) + anystyle-cli (1.5.0) + anystyle (~> 1.6) gli (~> 2.17) - namae (~> 1.0) - wapiti (~> 1.0, >= 1.0.2) GEM remote: https://rubygems.org/ specs: - activesupport (6.0.3.2) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) - anystyle-data (1.2.0) - bibtex-ruby (5.1.4) + anystyle-data (1.3.0) + bibtex-ruby (6.1.0) latex-decode (~> 0.0) - builder (3.2.4) - byebug (11.1.3) - citeproc (1.0.10) - namae (~> 1.0) - concurrent-ruby (1.1.7) - diff-lcs (1.4.4) - docile (1.3.2) - edtf (3.0.5) - activesupport (>= 3.0, < 7.0) - gli (2.19.2) - gnuplot (2.6.2) - i18n (1.8.5) - concurrent-ruby (~> 1.0) - latex-decode (0.3.1) - lmdb (0.5.3) - minitest (5.14.1) - namae (1.0.1) - rake (13.0.1) - redis (4.2.1) - redis-namespace (1.8.0) - redis (>= 3.0.4) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.2) - rspec-support (~> 3.9.3) - rspec-expectations (3.9.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-mocks (3.9.1) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-support (3.9.3) - ruby-prof (1.4.1) - simplecov (0.19.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov-html (0.12.2) - thread_safe (0.3.6) - tzinfo (1.2.7) - thread_safe (~> 0.1) - unicode-scripts (1.6.0) - wapiti (1.0.7) + racc (~> 1.7) + builder (3.3.0) + date (3.4.1) + debug (1.10.0) + irb (~> 1.10) + reline (>= 0.3.8) + erb (5.0.1) + gli (2.22.2) + ostruct + io-console (0.8.0) + irb (1.15.2) + pp (>= 0.6.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + latex-decode (0.4.0) + namae (1.2.0) + racc (~> 1.7) + ostruct (0.6.1) + pp (0.6.2) + prettyprint + prettyprint (0.2.0) + psych (5.2.6) + date + stringio + racc (1.8.1) + rdoc (6.14.0) + erb + psych (>= 4.0.0) + reline (0.6.1) + io-console (~> 0.5) + rexml (3.4.1) + stringio (3.1.7) + wapiti (2.1.0) builder (~> 3.2) - yard (0.9.25) - zeitwerk (2.4.0) + rexml (~> 3.0) PLATFORMS + arm64-darwin-24 ruby DEPENDENCIES anystyle! - bibtex-ruby - byebug - citeproc - edtf - gnuplot - language_detector! - lmdb - rake - redis - redis-namespace - rspec (~> 3.0) - ruby-prof - simplecov - unicode-scripts - yard + anystyle-cli! + debug BUNDLED WITH - 2.1.4 + 2.5.22 diff --git a/pkgs/tools/misc/anystyle-cli/anystyle-cli.gemspec b/pkgs/tools/misc/anystyle-cli/anystyle-cli.gemspec new file mode 100644 index 000000000000..51c9f782a75a --- /dev/null +++ b/pkgs/tools/misc/anystyle-cli/anystyle-cli.gemspec @@ -0,0 +1,32 @@ +# -*- encoding: utf-8 -*- +lib = File.expand_path('../lib/', __FILE__) +$:.unshift lib unless $:.include?(lib) + +require 'anystyle/cli/version' + +Gem::Specification.new do |s| + s.name = 'anystyle-cli' + s.version = AnyStyle::CLI::VERSION.dup + s.platform = Gem::Platform::RUBY + s.authors = ['Sylvester Keil'] + s.email = ['http://sylvester.keil.or.at'] + s.homepage = 'http://anystyle.io' + s.summary = 'AnyStyle CLI' + s.description = 'A command line interface to the AnyStyle Parser and Finder.' + s.license = 'BSD-2-Clause' + s.require_path = 'lib' + s.bindir = 'bin' + s.executables = ['anystyle'] + s.required_ruby_version = '>= 2.3' + + s.add_runtime_dependency('anystyle', '~>1.6') + s.add_runtime_dependency('gli', '~>2.17') + + s.files = `git ls-files`.split("\n") - %w{ + .gitignore + Gemfile + anystyle-cli.gemspec + } +end + +# vim: syntax=ruby diff --git a/pkgs/tools/misc/anystyle-cli/anystyle.gemspec b/pkgs/tools/misc/anystyle-cli/anystyle.gemspec deleted file mode 100644 index 57db427fb024..000000000000 --- a/pkgs/tools/misc/anystyle-cli/anystyle.gemspec +++ /dev/null @@ -1,52 +0,0 @@ -# -*- encoding: utf-8 -*- -lib = File.expand_path('../lib/', __FILE__) -$:.unshift lib unless $:.include?(lib) - -require 'anystyle/version' - -Gem::Specification.new do |s| - s.name = 'anystyle' - s.version = AnyStyle::VERSION.dup - s.platform = Gem::Platform::RUBY - s.authors = ['Sylvester Keil'] - s.email = ['http://sylvester.keil.or.at'] - s.homepage = 'http://anystyle.io' - s.summary = 'Smart and fast bibliography parser.' - s.description = 'A sophisticated parser for academic reference lists and bibliographies based on machine learning algorithms using conditional random fields.' - s.license = 'BSD-2-Clause' - s.executables = [] - s.require_path = 'lib' - - s.required_ruby_version = '>= 2.2' - - s.add_runtime_dependency('bibtex-ruby', '~>5.0') - s.add_runtime_dependency('anystyle-data', '~>1.2') - s.add_runtime_dependency('gli', '~>2.17') - s.add_runtime_dependency('wapiti', '~>1.0', '>=1.0.2') - s.add_runtime_dependency('namae', '~>1.0') - - s.files = - `git ls-files`.split("\n") - `git ls-files spec`.split("\n") - %w{ - .coveralls.yml - .gitignore - .rspec - .simplecov - .travis.yml - Gemfile - Rakefile - appveyor.yml - anystyle.gemspec - res/core.xml - } - - s.rdoc_options = %w{ - --line-numbers - --inline-source - --title "AnyStyle" - --main README.md - } - s.extra_rdoc_files = %w{README.md LICENSE} - -end - -# vim: syntax=ruby diff --git a/pkgs/tools/misc/anystyle-cli/default.nix b/pkgs/tools/misc/anystyle-cli/default.nix index 11fbcbcb1024..f5ae642eaeed 100644 --- a/pkgs/tools/misc/anystyle-cli/default.nix +++ b/pkgs/tools/misc/anystyle-cli/default.nix @@ -9,13 +9,13 @@ let deps = bundlerEnv rec { name = "anystyle-cli-${version}"; source.sha256 = lib.fakeSha256; - version = "1.3.1"; + version = "1.5.0"; inherit ruby; gemdir = ./.; gemset = lib.recursiveUpdate (import ./gemset.nix) { anystyle.source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1w79zcia60nnnyrmyvpd10pmxrpk5c7lj9gmmblhwi8x5mfq9k0n"; + sha256 = "C/OrU7guHzHdY80upEXRfhWmUYDxpI54NIvIjKv0znw="; type = "gem"; }; }; @@ -25,8 +25,8 @@ buildRubyGem rec { inherit ruby; gemName = "anystyle-cli"; pname = gemName; - version = "1.3.1"; - source.sha256 = "1a3ifwxwqkp5dnfk9r8qq8kgfb8k1pl7jjdghbb8ixbxz9ac7awy"; + version = "1.5.0"; + source.sha256 = "Bkk00PBk/6noCXgAbr1XUcdBq5vpdeL0ES02eeNA594="; propagatedBuildInputs = [ deps ]; @@ -41,7 +41,5 @@ buildRubyGem rec { maintainers = with maintainers; [ shamilton ]; mainProgram = "anystyle"; platforms = platforms.unix; - # error: passing argument 2 of 'rb_hash_foreach' from incompatible pointer type [-Wincompatible-pointer-types] - broken = true; }; } diff --git a/pkgs/tools/misc/anystyle-cli/gemset.nix b/pkgs/tools/misc/anystyle-cli/gemset.nix index 9d3377022144..6532e1277684 100644 --- a/pkgs/tools/misc/anystyle-cli/gemset.nix +++ b/pkgs/tools/misc/anystyle-cli/gemset.nix @@ -1,1201 +1,11 @@ { - activesupport = { - dependencies = [ - "concurrent-ruby" - "i18n" - "minitest" - "tzinfo" - "zeitwerk" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "02sh4q8izyfdnh7z2nj5mn5sklfvqgx9rrag5j3l51y8aqkrg2yk"; - type = "gem"; - }; - version = "6.0.3.2"; - }; anystyle = { dependencies = [ "anystyle-data" "bibtex-ruby" - "gli" "namae" "wapiti" ]; - groups = [ "default" ]; - platforms = [ - { - engine = "maglev"; - } - { - engine = "maglev"; - } - { - engine = "maglev"; - version = "1.8"; - } - { - engine = "maglev"; - version = "1.8"; - } - { - engine = "maglev"; - version = "1.9"; - } - { - engine = "maglev"; - version = "1.9"; - } - { - engine = "maglev"; - version = "2.0"; - } - { - engine = "maglev"; - version = "2.0"; - } - { - engine = "maglev"; - version = "2.1"; - } - { - engine = "maglev"; - version = "2.1"; - } - { - engine = "maglev"; - version = "2.2"; - } - { - engine = "maglev"; - version = "2.2"; - } - { - engine = "maglev"; - version = "2.3"; - } - { - engine = "maglev"; - version = "2.3"; - } - { - engine = "maglev"; - version = "2.4"; - } - { - engine = "maglev"; - version = "2.4"; - } - { - engine = "maglev"; - version = "2.5"; - } - { - engine = "maglev"; - version = "2.5"; - } - { - engine = "maglev"; - version = "2.6"; - } - { - engine = "maglev"; - version = "2.6"; - } - { - engine = "rbx"; - } - { - engine = "rbx"; - } - { - engine = "rbx"; - version = "1.8"; - } - { - engine = "rbx"; - version = "1.9"; - } - { - engine = "rbx"; - version = "2.0"; - } - { - engine = "rbx"; - version = "2.1"; - } - { - engine = "rbx"; - version = "2.2"; - } - { - engine = "rbx"; - version = "2.3"; - } - { - engine = "rbx"; - version = "2.4"; - } - { - engine = "rbx"; - version = "2.5"; - } - { - engine = "rbx"; - version = "2.6"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - version = "1.8"; - } - { - engine = "ruby"; - version = "1.8"; - } - { - engine = "ruby"; - version = "1.9"; - } - { - engine = "ruby"; - version = "1.9"; - } - { - engine = "ruby"; - version = "2.0"; - } - { - engine = "ruby"; - version = "2.0"; - } - { - engine = "ruby"; - version = "2.1"; - } - { - engine = "ruby"; - version = "2.1"; - } - { - engine = "ruby"; - version = "2.2"; - } - { - engine = "ruby"; - version = "2.2"; - } - { - engine = "ruby"; - version = "2.3"; - } - { - engine = "ruby"; - version = "2.3"; - } - { - engine = "ruby"; - version = "2.4"; - } - { - engine = "ruby"; - version = "2.4"; - } - { - engine = "ruby"; - version = "2.5"; - } - { - engine = "ruby"; - version = "2.5"; - } - { - engine = "ruby"; - version = "2.6"; - } - { - engine = "ruby"; - version = "2.6"; - } - ]; - source = { - path = ./.; - type = "path"; - }; - version = "1.3.10"; - }; - anystyle-data = { - groups = [ "default" ]; - platforms = [ - { - engine = "maglev"; - } - { - engine = "maglev"; - } - { - engine = "maglev"; - version = "1.8"; - } - { - engine = "maglev"; - version = "1.8"; - } - { - engine = "maglev"; - version = "1.9"; - } - { - engine = "maglev"; - version = "1.9"; - } - { - engine = "maglev"; - version = "2.0"; - } - { - engine = "maglev"; - version = "2.0"; - } - { - engine = "maglev"; - version = "2.1"; - } - { - engine = "maglev"; - version = "2.1"; - } - { - engine = "maglev"; - version = "2.2"; - } - { - engine = "maglev"; - version = "2.2"; - } - { - engine = "maglev"; - version = "2.3"; - } - { - engine = "maglev"; - version = "2.3"; - } - { - engine = "maglev"; - version = "2.4"; - } - { - engine = "maglev"; - version = "2.4"; - } - { - engine = "maglev"; - version = "2.5"; - } - { - engine = "maglev"; - version = "2.5"; - } - { - engine = "maglev"; - version = "2.6"; - } - { - engine = "maglev"; - version = "2.6"; - } - { - engine = "rbx"; - } - { - engine = "rbx"; - } - { - engine = "rbx"; - version = "1.8"; - } - { - engine = "rbx"; - version = "1.9"; - } - { - engine = "rbx"; - version = "2.0"; - } - { - engine = "rbx"; - version = "2.1"; - } - { - engine = "rbx"; - version = "2.2"; - } - { - engine = "rbx"; - version = "2.3"; - } - { - engine = "rbx"; - version = "2.4"; - } - { - engine = "rbx"; - version = "2.5"; - } - { - engine = "rbx"; - version = "2.6"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - version = "1.8"; - } - { - engine = "ruby"; - version = "1.8"; - } - { - engine = "ruby"; - version = "1.9"; - } - { - engine = "ruby"; - version = "1.9"; - } - { - engine = "ruby"; - version = "2.0"; - } - { - engine = "ruby"; - version = "2.0"; - } - { - engine = "ruby"; - version = "2.1"; - } - { - engine = "ruby"; - version = "2.1"; - } - { - engine = "ruby"; - version = "2.2"; - } - { - engine = "ruby"; - version = "2.2"; - } - { - engine = "ruby"; - version = "2.3"; - } - { - engine = "ruby"; - version = "2.3"; - } - { - engine = "ruby"; - version = "2.4"; - } - { - engine = "ruby"; - version = "2.4"; - } - { - engine = "ruby"; - version = "2.5"; - } - { - engine = "ruby"; - version = "2.5"; - } - { - engine = "ruby"; - version = "2.6"; - } - { - engine = "ruby"; - version = "2.6"; - } - ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ry6836mq48d85hjcfp7xiw0yk3ivpiwjvmdwv5jag30ijfyaccy"; - type = "gem"; - }; - version = "1.2.0"; - }; - bibtex-ruby = { - dependencies = [ "latex-decode" ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ - { - engine = "maglev"; - } - { - engine = "maglev"; - } - { - engine = "maglev"; - version = "1.8"; - } - { - engine = "maglev"; - version = "1.8"; - } - { - engine = "maglev"; - version = "1.9"; - } - { - engine = "maglev"; - version = "1.9"; - } - { - engine = "maglev"; - version = "2.0"; - } - { - engine = "maglev"; - version = "2.0"; - } - { - engine = "maglev"; - version = "2.1"; - } - { - engine = "maglev"; - version = "2.1"; - } - { - engine = "maglev"; - version = "2.2"; - } - { - engine = "maglev"; - version = "2.2"; - } - { - engine = "maglev"; - version = "2.3"; - } - { - engine = "maglev"; - version = "2.3"; - } - { - engine = "maglev"; - version = "2.4"; - } - { - engine = "maglev"; - version = "2.4"; - } - { - engine = "maglev"; - version = "2.5"; - } - { - engine = "maglev"; - version = "2.5"; - } - { - engine = "maglev"; - version = "2.6"; - } - { - engine = "maglev"; - version = "2.6"; - } - { - engine = "rbx"; - } - { - engine = "rbx"; - } - { - engine = "rbx"; - version = "1.8"; - } - { - engine = "rbx"; - version = "1.9"; - } - { - engine = "rbx"; - version = "2.0"; - } - { - engine = "rbx"; - version = "2.1"; - } - { - engine = "rbx"; - version = "2.2"; - } - { - engine = "rbx"; - version = "2.3"; - } - { - engine = "rbx"; - version = "2.4"; - } - { - engine = "rbx"; - version = "2.5"; - } - { - engine = "rbx"; - version = "2.6"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - version = "1.8"; - } - { - engine = "ruby"; - version = "1.8"; - } - { - engine = "ruby"; - version = "1.9"; - } - { - engine = "ruby"; - version = "1.9"; - } - { - engine = "ruby"; - version = "2.0"; - } - { - engine = "ruby"; - version = "2.0"; - } - { - engine = "ruby"; - version = "2.1"; - } - { - engine = "ruby"; - version = "2.1"; - } - { - engine = "ruby"; - version = "2.2"; - } - { - engine = "ruby"; - version = "2.2"; - } - { - engine = "ruby"; - version = "2.3"; - } - { - engine = "ruby"; - version = "2.3"; - } - { - engine = "ruby"; - version = "2.4"; - } - { - engine = "ruby"; - version = "2.4"; - } - { - engine = "ruby"; - version = "2.5"; - } - { - engine = "ruby"; - version = "2.5"; - } - { - engine = "ruby"; - version = "2.6"; - } - { - engine = "ruby"; - version = "2.6"; - } - ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "00zwmmmjrbrxhajdvn1d4rnv2qw00arcj021cwyx3hl6dsv22l2w"; - type = "gem"; - }; - version = "5.1.4"; - }; - builder = { - groups = [ "default" ]; - platforms = [ - { - engine = "maglev"; - } - { - engine = "maglev"; - } - { - engine = "maglev"; - version = "1.8"; - } - { - engine = "maglev"; - version = "1.8"; - } - { - engine = "maglev"; - version = "1.9"; - } - { - engine = "maglev"; - version = "1.9"; - } - { - engine = "maglev"; - version = "2.0"; - } - { - engine = "maglev"; - version = "2.0"; - } - { - engine = "maglev"; - version = "2.1"; - } - { - engine = "maglev"; - version = "2.1"; - } - { - engine = "maglev"; - version = "2.2"; - } - { - engine = "maglev"; - version = "2.2"; - } - { - engine = "maglev"; - version = "2.3"; - } - { - engine = "maglev"; - version = "2.3"; - } - { - engine = "maglev"; - version = "2.4"; - } - { - engine = "maglev"; - version = "2.4"; - } - { - engine = "maglev"; - version = "2.5"; - } - { - engine = "maglev"; - version = "2.5"; - } - { - engine = "maglev"; - version = "2.6"; - } - { - engine = "maglev"; - version = "2.6"; - } - { - engine = "rbx"; - } - { - engine = "rbx"; - } - { - engine = "rbx"; - version = "1.8"; - } - { - engine = "rbx"; - version = "1.9"; - } - { - engine = "rbx"; - version = "2.0"; - } - { - engine = "rbx"; - version = "2.1"; - } - { - engine = "rbx"; - version = "2.2"; - } - { - engine = "rbx"; - version = "2.3"; - } - { - engine = "rbx"; - version = "2.4"; - } - { - engine = "rbx"; - version = "2.5"; - } - { - engine = "rbx"; - version = "2.6"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - version = "1.8"; - } - { - engine = "ruby"; - version = "1.8"; - } - { - engine = "ruby"; - version = "1.9"; - } - { - engine = "ruby"; - version = "1.9"; - } - { - engine = "ruby"; - version = "2.0"; - } - { - engine = "ruby"; - version = "2.0"; - } - { - engine = "ruby"; - version = "2.1"; - } - { - engine = "ruby"; - version = "2.1"; - } - { - engine = "ruby"; - version = "2.2"; - } - { - engine = "ruby"; - version = "2.2"; - } - { - engine = "ruby"; - version = "2.3"; - } - { - engine = "ruby"; - version = "2.3"; - } - { - engine = "ruby"; - version = "2.4"; - } - { - engine = "ruby"; - version = "2.4"; - } - { - engine = "ruby"; - version = "2.5"; - } - { - engine = "ruby"; - version = "2.5"; - } - { - engine = "ruby"; - version = "2.6"; - } - { - engine = "ruby"; - version = "2.6"; - } - ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; - type = "gem"; - }; - version = "3.2.4"; - }; - byebug = { - groups = [ "debug" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0nx3yjf4xzdgb8jkmk2344081gqr22pgjqnmjg2q64mj5d6r9194"; - type = "gem"; - }; - version = "11.1.3"; - }; - citeproc = { - dependencies = [ "namae" ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "13vl5sjmksk5a8kjcqnjxh7kn9gn1n4f9p1rvqfgsfhs54p0m6l2"; - type = "gem"; - }; - version = "1.0.10"; - }; - concurrent-ruby = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; - type = "gem"; - }; - version = "1.1.7"; - }; - diff-lcs = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz"; - type = "gem"; - }; - version = "1.4.4"; - }; - docile = { - groups = [ - "coverage" - "default" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif"; - type = "gem"; - }; - version = "1.3.2"; - }; - edtf = { - dependencies = [ "activesupport" ]; - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0xknzamagsx68iq7zdiswr077sxirig77yggbcsw51m8365ajzpc"; - type = "gem"; - }; - version = "3.0.5"; - }; - gli = { - groups = [ "default" ]; - platforms = [ - { - engine = "maglev"; - } - { - engine = "maglev"; - } - { - engine = "maglev"; - version = "1.8"; - } - { - engine = "maglev"; - version = "1.8"; - } - { - engine = "maglev"; - version = "1.9"; - } - { - engine = "maglev"; - version = "1.9"; - } - { - engine = "maglev"; - version = "2.0"; - } - { - engine = "maglev"; - version = "2.0"; - } - { - engine = "maglev"; - version = "2.1"; - } - { - engine = "maglev"; - version = "2.1"; - } - { - engine = "maglev"; - version = "2.2"; - } - { - engine = "maglev"; - version = "2.2"; - } - { - engine = "maglev"; - version = "2.3"; - } - { - engine = "maglev"; - version = "2.3"; - } - { - engine = "maglev"; - version = "2.4"; - } - { - engine = "maglev"; - version = "2.4"; - } - { - engine = "maglev"; - version = "2.5"; - } - { - engine = "maglev"; - version = "2.5"; - } - { - engine = "maglev"; - version = "2.6"; - } - { - engine = "maglev"; - version = "2.6"; - } - { - engine = "rbx"; - } - { - engine = "rbx"; - } - { - engine = "rbx"; - version = "1.8"; - } - { - engine = "rbx"; - version = "1.9"; - } - { - engine = "rbx"; - version = "2.0"; - } - { - engine = "rbx"; - version = "2.1"; - } - { - engine = "rbx"; - version = "2.2"; - } - { - engine = "rbx"; - version = "2.3"; - } - { - engine = "rbx"; - version = "2.4"; - } - { - engine = "rbx"; - version = "2.5"; - } - { - engine = "rbx"; - version = "2.6"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - version = "1.8"; - } - { - engine = "ruby"; - version = "1.8"; - } - { - engine = "ruby"; - version = "1.9"; - } - { - engine = "ruby"; - version = "1.9"; - } - { - engine = "ruby"; - version = "2.0"; - } - { - engine = "ruby"; - version = "2.0"; - } - { - engine = "ruby"; - version = "2.1"; - } - { - engine = "ruby"; - version = "2.1"; - } - { - engine = "ruby"; - version = "2.2"; - } - { - engine = "ruby"; - version = "2.2"; - } - { - engine = "ruby"; - version = "2.3"; - } - { - engine = "ruby"; - version = "2.3"; - } - { - engine = "ruby"; - version = "2.4"; - } - { - engine = "ruby"; - version = "2.4"; - } - { - engine = "ruby"; - version = "2.5"; - } - { - engine = "ruby"; - version = "2.5"; - } - { - engine = "ruby"; - version = "2.6"; - } - { - engine = "ruby"; - version = "2.6"; - } - ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0q598mvl20isn3ja1ya0p72svmqwx3m6fjp5slnv0b2c5mh0ahvv"; - type = "gem"; - }; - version = "2.19.2"; - }; - gnuplot = { - groups = [ "profile" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1cvb84lahhy6qxkkgg0pfk9b85qrb1by2p3jlpqgczl6am58vhnj"; - type = "gem"; - }; - version = "2.6.2"; - }; - i18n = { - dependencies = [ "concurrent-ruby" ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; - type = "gem"; - }; - version = "1.8.5"; - }; - language_detector = { groups = [ "development" "test" @@ -1203,900 +13,304 @@ platforms = [ ]; source = { fetchSubmodules = false; - rev = "89102790194150b3a8110ce691f9989b8ce70f8d"; - sha256 = "0wxs9i0wqmwysrz1c1i85i4f670m217y12rj5slcmd1y4ylsmvyi"; + rev = "c6f5fb2fa6e8ce9456ad1e1e88d6bba5f3d7731d"; + sha256 = "1fshijsay20dqcvjwrdifv6z1w4xyc3j2rn3648cvq57gjrmxwl2"; type = "git"; - url = "https://github.com/feedbackmine/language_detector.git"; + url = "https://github.com/inukshuk/anystyle.git"; }; - version = "0.1.2"; + version = "1.6.0"; + }; + anystyle-cli = { + dependencies = [ + "anystyle" + "gli" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + path = ./.; + type = "path"; + }; + version = "1.5.0"; + }; + anystyle-data = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0l28mxgcfdbcrb4w0vn293spwxff9ahcmxfs5cws2yq0w5x656y4"; + type = "gem"; + }; + version = "1.3.0"; + }; + bibtex-ruby = { + dependencies = [ + "latex-decode" + "racc" + ]; + groups = [ "extra" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ggx2j1gi46f1a6p45l1abk3nryfg1pj0cdlyrnilnqqpr1cfc96"; + type = "gem"; + }; + version = "6.1.0"; + }; + builder = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9"; + type = "gem"; + }; + version = "3.3.0"; + }; + date = { + groups = [ + "debug" + "default" + "extra" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz"; + type = "gem"; + }; + version = "3.4.1"; + }; + debug = { + dependencies = [ + "irb" + "reline" + ]; + groups = [ "debug" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1977s95s9ns6mpbhg68pg6ggnpxxf8wly4244ihrx5vm92kqrqhi"; + type = "gem"; + }; + version = "1.10.0"; + }; + erb = { + groups = [ + "debug" + "default" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "08rc8pzri3g7c85c76x84j05hkk12jvalrm2m3n97k1n7f03j13n"; + type = "gem"; + }; + version = "5.0.1"; + }; + gli = { + dependencies = [ "ostruct" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1c2x5wh3d3mz8vg5bs7c5is0zvc56j6a2b4biv5z1w5hi1n8s3jq"; + type = "gem"; + }; + version = "2.22.2"; + }; + io-console = { + groups = [ + "debug" + "default" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "18pgvl7lfjpichdfh1g50rpz0zpaqrpr52ybn9liv1v9pjn9ysnd"; + type = "gem"; + }; + version = "0.8.0"; + }; + irb = { + dependencies = [ + "pp" + "rdoc" + "reline" + ]; + groups = [ + "debug" + "default" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1fpxa2m83rb7xlzs57daqwnzqjmz6j35xr7zb15s73975sak4br2"; + type = "gem"; + }; + version = "1.15.2"; }; latex-decode = { groups = [ "default" - "development" - "test" - ]; - platforms = [ - { - engine = "maglev"; - } - { - engine = "maglev"; - } - { - engine = "maglev"; - version = "1.8"; - } - { - engine = "maglev"; - version = "1.8"; - } - { - engine = "maglev"; - version = "1.9"; - } - { - engine = "maglev"; - version = "1.9"; - } - { - engine = "maglev"; - version = "2.0"; - } - { - engine = "maglev"; - version = "2.0"; - } - { - engine = "maglev"; - version = "2.1"; - } - { - engine = "maglev"; - version = "2.1"; - } - { - engine = "maglev"; - version = "2.2"; - } - { - engine = "maglev"; - version = "2.2"; - } - { - engine = "maglev"; - version = "2.3"; - } - { - engine = "maglev"; - version = "2.3"; - } - { - engine = "maglev"; - version = "2.4"; - } - { - engine = "maglev"; - version = "2.4"; - } - { - engine = "maglev"; - version = "2.5"; - } - { - engine = "maglev"; - version = "2.5"; - } - { - engine = "maglev"; - version = "2.6"; - } - { - engine = "maglev"; - version = "2.6"; - } - { - engine = "rbx"; - } - { - engine = "rbx"; - } - { - engine = "rbx"; - version = "1.8"; - } - { - engine = "rbx"; - version = "1.9"; - } - { - engine = "rbx"; - version = "2.0"; - } - { - engine = "rbx"; - version = "2.1"; - } - { - engine = "rbx"; - version = "2.2"; - } - { - engine = "rbx"; - version = "2.3"; - } - { - engine = "rbx"; - version = "2.4"; - } - { - engine = "rbx"; - version = "2.5"; - } - { - engine = "rbx"; - version = "2.6"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - version = "1.8"; - } - { - engine = "ruby"; - version = "1.8"; - } - { - engine = "ruby"; - version = "1.9"; - } - { - engine = "ruby"; - version = "1.9"; - } - { - engine = "ruby"; - version = "2.0"; - } - { - engine = "ruby"; - version = "2.0"; - } - { - engine = "ruby"; - version = "2.1"; - } - { - engine = "ruby"; - version = "2.1"; - } - { - engine = "ruby"; - version = "2.2"; - } - { - engine = "ruby"; - version = "2.2"; - } - { - engine = "ruby"; - version = "2.3"; - } - { - engine = "ruby"; - version = "2.3"; - } - { - engine = "ruby"; - version = "2.4"; - } - { - engine = "ruby"; - version = "2.4"; - } - { - engine = "ruby"; - version = "2.5"; - } - { - engine = "ruby"; - version = "2.5"; - } - { - engine = "ruby"; - version = "2.6"; - } - { - engine = "ruby"; - version = "2.6"; - } - ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0dqanr69as05vdyp9gx9737w3g44rhyk7x96bh9x01fnf1yalyzd"; - type = "gem"; - }; - version = "0.3.1"; - }; - lmdb = { - groups = [ "extra" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0qk2ycgyyk052dvbgik35mr4n9im4k1j6v7anbjqhx52y5f07sfg"; - type = "gem"; - }; - version = "0.5.3"; - }; - minitest = { - groups = [ - "default" - "development" - "test" + "extra" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; + sha256 = "1y5xn3zwghpqr6lvs4s0mn5knms8zw3zk7jb58zkkiagb386nq72"; type = "gem"; }; - version = "5.14.1"; + version = "0.4.0"; }; namae = { + dependencies = [ "racc" ]; groups = [ "default" - "development" - "test" - ]; - platforms = [ - { - engine = "maglev"; - } - { - engine = "maglev"; - } - { - engine = "maglev"; - version = "1.8"; - } - { - engine = "maglev"; - version = "1.8"; - } - { - engine = "maglev"; - version = "1.9"; - } - { - engine = "maglev"; - version = "1.9"; - } - { - engine = "maglev"; - version = "2.0"; - } - { - engine = "maglev"; - version = "2.0"; - } - { - engine = "maglev"; - version = "2.1"; - } - { - engine = "maglev"; - version = "2.1"; - } - { - engine = "maglev"; - version = "2.2"; - } - { - engine = "maglev"; - version = "2.2"; - } - { - engine = "maglev"; - version = "2.3"; - } - { - engine = "maglev"; - version = "2.3"; - } - { - engine = "maglev"; - version = "2.4"; - } - { - engine = "maglev"; - version = "2.4"; - } - { - engine = "maglev"; - version = "2.5"; - } - { - engine = "maglev"; - version = "2.5"; - } - { - engine = "maglev"; - version = "2.6"; - } - { - engine = "maglev"; - version = "2.6"; - } - { - engine = "rbx"; - } - { - engine = "rbx"; - } - { - engine = "rbx"; - version = "1.8"; - } - { - engine = "rbx"; - version = "1.9"; - } - { - engine = "rbx"; - version = "2.0"; - } - { - engine = "rbx"; - version = "2.1"; - } - { - engine = "rbx"; - version = "2.2"; - } - { - engine = "rbx"; - version = "2.3"; - } - { - engine = "rbx"; - version = "2.4"; - } - { - engine = "rbx"; - version = "2.5"; - } - { - engine = "rbx"; - version = "2.6"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - version = "1.8"; - } - { - engine = "ruby"; - version = "1.8"; - } - { - engine = "ruby"; - version = "1.9"; - } - { - engine = "ruby"; - version = "1.9"; - } - { - engine = "ruby"; - version = "2.0"; - } - { - engine = "ruby"; - version = "2.0"; - } - { - engine = "ruby"; - version = "2.1"; - } - { - engine = "ruby"; - version = "2.1"; - } - { - engine = "ruby"; - version = "2.2"; - } - { - engine = "ruby"; - version = "2.2"; - } - { - engine = "ruby"; - version = "2.3"; - } - { - engine = "ruby"; - version = "2.3"; - } - { - engine = "ruby"; - version = "2.4"; - } - { - engine = "ruby"; - version = "2.4"; - } - { - engine = "ruby"; - version = "2.5"; - } - { - engine = "ruby"; - version = "2.5"; - } - { - engine = "ruby"; - version = "2.6"; - } - { - engine = "ruby"; - version = "2.6"; - } + "extra" ]; + platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "00w0dgvmdy8lw2b5q9zvhqd5k98a192vdmka96qngi9cvnsh5snw"; + sha256 = "17fmp6p74ai2w984xayv3kz2nh44w81hqqvn4cfrim3g115wwh9m"; type = "gem"; }; - version = "1.0.1"; + version = "1.2.0"; }; - rake = { + ostruct = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9"; + type = "gem"; + }; + version = "0.6.1"; + }; + pp = { + dependencies = [ "prettyprint" ]; groups = [ - "development" - "test" + "debug" + "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; + sha256 = "1zxnfxjni0r9l2x42fyq0sqpnaf5nakjbap8irgik4kg1h9c6zll"; type = "gem"; }; - version = "13.0.1"; + version = "0.6.2"; }; - redis = { - groups = [ "extra" ]; + prettyprint = { + groups = [ + "debug" + "default" + ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19hm66kw5vx1lmlh8bj7rxlddyj0vfp11ajw9njhrmn8173d0vb5"; + sha256 = "14zicq3plqi217w6xahv7b8f7aj5kpxv1j1w98344ix9h5ay3j9b"; type = "gem"; }; - version = "4.2.1"; + version = "0.2.0"; }; - redis-namespace = { - dependencies = [ "redis" ]; - groups = [ "extra" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "05i6s898z5w31z385cba1683pgg5nnmj4m686cbravg7j4pgbcgv"; - type = "gem"; - }; - version = "1.8.0"; - }; - rspec = { + psych = { dependencies = [ - "rspec-core" - "rspec-expectations" - "rspec-mocks" + "date" + "stringio" ]; groups = [ - "development" - "test" + "debug" + "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1hzsig4pi9ybr0xl5540m1swiyxa74c8h09225y5sdh2rjkkg84h"; + sha256 = "0vii1xc7x81hicdbp7dlllhmbw5w3jy20shj696n0vfbbnm2hhw1"; type = "gem"; }; - version = "3.9.0"; + version = "5.2.6"; }; - rspec-core = { - dependencies = [ "rspec-support" ]; + racc = { groups = [ "default" - "development" - "test" + "extra" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xndkv5cz763wh30x7hdqw6k7zs8xfh0f86amra9agwn44pcqs0y"; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "3.9.2"; + version = "1.8.1"; }; - rspec-expectations = { + rdoc = { dependencies = [ - "diff-lcs" - "rspec-support" + "erb" + "psych" ]; groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1bxkv25qmy39jqrdx35bfgw00g24qkssail9jlljm7hywbqvr9bb"; - type = "gem"; - }; - version = "3.9.2"; - }; - rspec-mocks = { - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "19vmdqym1v2g1zbdnq37zwmyj87y9yc9ijwc8js55igvbb9hx0mr"; - type = "gem"; - }; - version = "3.9.1"; - }; - rspec-support = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0dandh2fy1dfkjk8jf9v4azbbma6968bhh06hddv0yqqm8108jir"; - type = "gem"; - }; - version = "3.9.3"; - }; - ruby-prof = { - groups = [ "profile" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "12cd91m08ih0imfpy4k87618hd4mhyz291a6bx2hcskza4nf6d27"; - type = "gem"; - }; - version = "1.4.1"; - }; - simplecov = { - dependencies = [ - "docile" - "simplecov-html" - ]; - groups = [ "coverage" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1b082xrklq6k755cc3rzpnfdjv5338rlky9him36jasw8s9q68mr"; - type = "gem"; - }; - version = "0.19.0"; - }; - simplecov-html = { - groups = [ - "coverage" + "debug" "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1v7b4mf7njw8kv4ghl4q7mwz3q0flbld7v8blp4m4m3n3aq11bn9"; + sha256 = "1nyp5vc9nm46nc3aq58f2lackgbip4ynxmznzi1qg6qjsxcdwiic"; type = "gem"; }; - version = "0.12.2"; + version = "6.14.0"; }; - thread_safe = { + reline = { + dependencies = [ "io-console" ]; groups = [ + "debug" "default" - "development" - "test" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + sha256 = "1yvm0svcdk6377ng6l00g39ldkjijbqg4whdg2zcsa8hrgbwkz0s"; type = "gem"; }; - version = "0.3.6"; + version = "0.6.1"; }; - tzinfo = { - dependencies = [ "thread_safe" ]; + rexml = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; + type = "gem"; + }; + version = "3.4.1"; + }; + stringio = { groups = [ + "debug" "default" - "development" - "test" + "extra" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + sha256 = "1yh78pg6lm28c3k0pfd2ipskii1fsraq46m6zjs5yc9a4k5vfy2v"; type = "gem"; }; - version = "1.2.7"; - }; - unicode-scripts = { - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "04xfy4f61xf7qnbfa68aqscmyxk7wx3swn571cijsfqalhz8swjg"; - type = "gem"; - }; - version = "1.6.0"; + version = "3.1.7"; }; wapiti = { - dependencies = [ "builder" ]; + dependencies = [ + "builder" + "rexml" + ]; groups = [ "default" ]; - platforms = [ - { - engine = "maglev"; - } - { - engine = "maglev"; - } - { - engine = "maglev"; - version = "1.8"; - } - { - engine = "maglev"; - version = "1.8"; - } - { - engine = "maglev"; - version = "1.9"; - } - { - engine = "maglev"; - version = "1.9"; - } - { - engine = "maglev"; - version = "2.0"; - } - { - engine = "maglev"; - version = "2.0"; - } - { - engine = "maglev"; - version = "2.1"; - } - { - engine = "maglev"; - version = "2.1"; - } - { - engine = "maglev"; - version = "2.2"; - } - { - engine = "maglev"; - version = "2.2"; - } - { - engine = "maglev"; - version = "2.3"; - } - { - engine = "maglev"; - version = "2.3"; - } - { - engine = "maglev"; - version = "2.4"; - } - { - engine = "maglev"; - version = "2.4"; - } - { - engine = "maglev"; - version = "2.5"; - } - { - engine = "maglev"; - version = "2.5"; - } - { - engine = "maglev"; - version = "2.6"; - } - { - engine = "maglev"; - version = "2.6"; - } - { - engine = "rbx"; - } - { - engine = "rbx"; - } - { - engine = "rbx"; - version = "1.8"; - } - { - engine = "rbx"; - version = "1.9"; - } - { - engine = "rbx"; - version = "2.0"; - } - { - engine = "rbx"; - version = "2.1"; - } - { - engine = "rbx"; - version = "2.2"; - } - { - engine = "rbx"; - version = "2.3"; - } - { - engine = "rbx"; - version = "2.4"; - } - { - engine = "rbx"; - version = "2.5"; - } - { - engine = "rbx"; - version = "2.6"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - } - { - engine = "ruby"; - version = "1.8"; - } - { - engine = "ruby"; - version = "1.8"; - } - { - engine = "ruby"; - version = "1.9"; - } - { - engine = "ruby"; - version = "1.9"; - } - { - engine = "ruby"; - version = "2.0"; - } - { - engine = "ruby"; - version = "2.0"; - } - { - engine = "ruby"; - version = "2.1"; - } - { - engine = "ruby"; - version = "2.1"; - } - { - engine = "ruby"; - version = "2.2"; - } - { - engine = "ruby"; - version = "2.2"; - } - { - engine = "ruby"; - version = "2.3"; - } - { - engine = "ruby"; - version = "2.3"; - } - { - engine = "ruby"; - version = "2.4"; - } - { - engine = "ruby"; - version = "2.4"; - } - { - engine = "ruby"; - version = "2.5"; - } - { - engine = "ruby"; - version = "2.5"; - } - { - engine = "ruby"; - version = "2.6"; - } - { - engine = "ruby"; - version = "2.6"; - } - ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1aw2l759cfmii9a67pn8pswip11v08nabkzm825mrmxa6r91izqs"; - type = "gem"; - }; - version = "1.0.7"; - }; - yard = { - groups = [ "extra" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "126m49mvh4lbvlvrprq7xj2vjixbq3xqr8dwr089vadvs0rkn4rd"; + sha256 = "19bh7nb05pbkix43i7alfg8pzcqid31q5q0g06x2my7gcj79nhad"; type = "gem"; }; - version = "0.9.25"; - }; - zeitwerk = { - groups = [ - "default" - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k"; - type = "gem"; - }; - version = "2.4.0"; + version = "2.1.0"; }; } From 3dd3d31c10c107e46bbe05f35140dc4b19f7f509 Mon Sep 17 00:00:00 2001 From: April Schleck Date: Mon, 2 Jun 2025 12:45:40 -0700 Subject: [PATCH 06/65] anystyle-cli: add aschleck as a maintainer --- pkgs/tools/misc/anystyle-cli/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/anystyle-cli/default.nix b/pkgs/tools/misc/anystyle-cli/default.nix index f5ae642eaeed..959956bb916e 100644 --- a/pkgs/tools/misc/anystyle-cli/default.nix +++ b/pkgs/tools/misc/anystyle-cli/default.nix @@ -38,7 +38,10 @@ buildRubyGem rec { description = "Command line interface to the AnyStyle Parser and Finder"; homepage = "https://anystyle.io/"; license = licenses.bsd2; - maintainers = with maintainers; [ shamilton ]; + maintainers = with maintainers; [ + aschleck + shamilton + ]; mainProgram = "anystyle"; platforms = platforms.unix; }; From 2e27b439710cdf0a9cf1d58ad3cd56089d34dab0 Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 5 Jun 2025 11:28:24 +0800 Subject: [PATCH 07/65] yokadi: 1.2.0 -> 1.3.0 --- pkgs/applications/misc/yokadi/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/applications/misc/yokadi/default.nix index 84030033ffe0..53d8f84371ae 100644 --- a/pkgs/applications/misc/yokadi/default.nix +++ b/pkgs/applications/misc/yokadi/default.nix @@ -6,31 +6,34 @@ sqlalchemy, setproctitle, icalendar, + colorama, }: buildPythonApplication rec { pname = "yokadi"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { url = "https://yokadi.github.io/download/${pname}-${version}.tar.gz"; - sha256 = "681c8aa52b2e4b5255e1311e76b4b81dcb63ee7f6ca3a47178e684c06baf330f"; + hash = "sha256-zF2ffHeU+i7wzu1u4DhQ5zJXr8AjXboiyFAisXNX6TM="; }; - propagatedBuildInputs = [ + dependencies = [ python-dateutil sqlalchemy setproctitle icalendar + colorama ]; # Yokadi doesn't have any tests doCheck = false; - meta = with lib; { + meta = { description = "Command line oriented, sqlite powered, todo-list"; homepage = "https://yokadi.github.io/index.html"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.nkpvk ]; + mainProgram = "yokadi"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.nkpvk ]; }; } From fc46e308998ddc0b3e57d50622d25c2327c7da90 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 8 Jun 2025 05:18:47 +0200 Subject: [PATCH 08/65] python3Packages.reflex-hosting-cli: 0.1.49 -> 0.1.50 --- .../development/python-modules/reflex-hosting-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reflex-hosting-cli/default.nix b/pkgs/development/python-modules/reflex-hosting-cli/default.nix index f3e3b3ccf8db..aea9e53115d5 100644 --- a/pkgs/development/python-modules/reflex-hosting-cli/default.nix +++ b/pkgs/development/python-modules/reflex-hosting-cli/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "reflex-hosting-cli"; - version = "0.1.49"; + version = "0.1.50"; pyproject = true; # source is not published https://github.com/reflex-dev/reflex/issues/3762 src = fetchPypi { pname = "reflex_hosting_cli"; inherit version; - hash = "sha256-cIU2/hTxXtAsxn5twV8xGwAOcRfqBjeqL4dklXt5fkQ="; + hash = "sha256-1ZTTc09P/0rTNhiqsNDB2RMLcUjKt1rIWtufakkFWkg="; }; pythonRelaxDeps = [ From e5db1dc0d355ababd5601f4b0e6b3b02563817be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 19:29:18 +0000 Subject: [PATCH 09/65] lcalc: 2.1.0 -> 2.1.1 --- pkgs/by-name/lc/lcalc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lc/lcalc/package.nix b/pkgs/by-name/lc/lcalc/package.nix index f8eab9b3edd5..2d5cb74fda4f 100644 --- a/pkgs/by-name/lc/lcalc/package.nix +++ b/pkgs/by-name/lc/lcalc/package.nix @@ -9,14 +9,14 @@ }: stdenv.mkDerivation rec { - version = "2.1.0"; + version = "2.1.1"; pname = "lcalc"; src = fetchFromGitLab { owner = "sagemath"; repo = "lcalc"; tag = version; - hash = "sha256-v+7Uh6tPOfb3E9dqxx//RqD22XM4S/8ejS2v+D5G5pE="; + hash = "sha256-0CYrRGn5YQ07BaGu0Q5otnjwyh3sNq21EXp3M/KlRdw="; }; nativeBuildInputs = [ From f29117ff9a9aa3d7268cb4126b573cf836336ca7 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 11 Jun 2025 10:28:34 -0700 Subject: [PATCH 10/65] s3ql: 5.2.3 -> 5.3.0 Changelog: https://github.com/s3ql/s3ql/releases/tag/s3ql-5.3.0 We patch out all the discovery logic in the build script now. --- .../0001-setup.py-remove-self-reference.patch | 68 +++++++++++++++++++ pkgs/by-name/s3/s3ql/package.nix | 52 ++++++++++---- 2 files changed, 108 insertions(+), 12 deletions(-) create mode 100644 pkgs/by-name/s3/s3ql/0001-setup.py-remove-self-reference.patch diff --git a/pkgs/by-name/s3/s3ql/0001-setup.py-remove-self-reference.patch b/pkgs/by-name/s3/s3ql/0001-setup.py-remove-self-reference.patch new file mode 100644 index 000000000000..6abe6c966bc9 --- /dev/null +++ b/pkgs/by-name/s3/s3ql/0001-setup.py-remove-self-reference.patch @@ -0,0 +1,68 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Philip Taron +Date: Wed, 11 Jun 2025 10:41:42 -0700 +Subject: [PATCH] setup.py: remove self-reference and DEVELOPER_MODE + +Signed-off-by: Philip Taron +--- + setup.py | 33 ++------------------------------- + 1 file changed, 2 insertions(+), 31 deletions(-) + +diff --git a/setup.py b/setup.py +index 00f6e9b120525d63fbc17949b2804785f1286118..b5582bcc366148d9c0a442abade65a6127ef2d3c 100755 +--- a/setup.py ++++ b/setup.py +@@ -26,15 +26,7 @@ from setuptools.command.test import test as TestCommand + + faulthandler.enable() + +-basedir = os.path.abspath(os.path.dirname(sys.argv[0])) +-DEVELOPER_MODE = os.path.exists(os.path.join(basedir, 'MANIFEST.in')) +-if DEVELOPER_MODE: +- print('MANIFEST.in exists, running in developer mode') +- +-# Add S3QL sources +-sys.path.insert(0, os.path.join(basedir, 'src')) +-sys.path.insert(0, os.path.join(basedir, 'util')) +-import s3ql ++basedir = "/build/source" + + + class pytest(TestCommand): +@@ -52,27 +44,6 @@ def main(): + + compile_args = ['-Wall', '-Wextra', '-Wconversion', '-Wsign-compare'] + +- # Enable all fatal warnings only when compiling from Mercurial tip. +- # (otherwise we break forward compatibility because compilation with newer +- # compiler may fail if additional warnings are added) +- if DEVELOPER_MODE: +- if os.environ.get('CI') != 'true': +- compile_args.append('-Werror') +- +- # Value-changing conversions should always be explicit. +- compile_args.append('-Werror=conversion') +- +- # Note that (i > -1) is false if i is unsigned (-1 will be converted to +- # a large positive value). We certainly don't want to do this by +- # accident. +- compile_args.append('-Werror=sign-compare') +- +- # These warnings have always been harmless, and have always been due to +- # issues in Cython code rather than S3QL. Cython itself warns if there +- # are unused variables in .pyx code. +- compile_args.append('-Wno-unused-parameter') +- compile_args.append('-Wno-unused-function') +- + required_pkgs = [ + 'apsw >= 3.42.0', # https://github.com/rogerbinns/apsw/issues/459 + 'cryptography', +@@ -88,7 +59,7 @@ def main(): + setuptools.setup( + name='s3ql', + zip_safe=False, +- version=s3ql.VERSION, ++ version="@version@", + description='a full-featured file system for online data storage', + long_description=long_desc, + author='Nikolaus Rath', diff --git a/pkgs/by-name/s3/s3ql/package.nix b/pkgs/by-name/s3/s3ql/package.nix index 386baa6f4bb3..048b61fecb25 100644 --- a/pkgs/by-name/s3/s3ql/package.nix +++ b/pkgs/by-name/s3/s3ql/package.nix @@ -2,28 +2,56 @@ lib, fetchFromGitHub, python3, + replaceVars, sqlite, which, nix-update-script, + writableTmpDirAsHomeHook, }: -python3.pkgs.buildPythonApplication rec { +let + inherit (python3.pkgs) + buildPythonApplication + setuptools + cython + apsw + cryptography + defusedxml + google-auth + google-auth-oauthlib + pyfuse3 + requests + trio + pytest-trio + pytestCheckHook + python + ; +in + +buildPythonApplication rec { pname = "s3ql"; - version = "5.2.3"; + version = "5.3.0"; pyproject = true; src = fetchFromGitHub { owner = "s3ql"; repo = "s3ql"; tag = "s3ql-${version}"; - hash = "sha256-hNqKLpJd0vj96Jx4YnqYsPLq/iTbvmtvjyLrYozaxpk="; + hash = "sha256-SVB+VB508hGXvdHZo5lt09yssjjwHS1tsDU8M4j+swc="; }; - build-system = with python3.pkgs; [ setuptools ]; + patches = [ + (replaceVars ./0001-setup.py-remove-self-reference.patch { inherit version; }) + ]; - nativeBuildInputs = [ which ] ++ (with python3.pkgs; [ cython ]); + build-system = [ setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ + nativeBuildInputs = [ + which + cython + ]; + + dependencies = [ apsw cryptography defusedxml @@ -35,23 +63,23 @@ python3.pkgs.buildPythonApplication rec { trio ]; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = [ pytest-trio pytestCheckHook + writableTmpDirAsHomeHook ]; preBuild = '' - ${python3.pkgs.python.pythonOnBuildForHost.interpreter} ./setup.py build_cython build_ext --inplace - ''; - - preCheck = '' - export HOME=$(mktemp -d) + ${python.pythonOnBuildForHost.interpreter} ./setup.py build_cython build_ext --inplace ''; pythonImportsCheck = [ "s3ql" ]; pytestFlagsArray = [ "tests/" ]; + # SSL EOF error doesn't match connection reset error. Seems fine. + disabledTests = [ "test_aborted_write2" ]; + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" From 9fad3fd9159881cf768feee6930dde477208ed8a Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 12 Jun 2025 23:46:39 +0200 Subject: [PATCH 11/65] flexget: 3.16.3 -> 3.16.5 Changelog: https://github.com/Flexget/Flexget/releases/tag/v3.16.5 --- pkgs/by-name/fl/flexget/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix index 9a20815265e6..3b76569ea978 100644 --- a/pkgs/by-name/fl/flexget/package.nix +++ b/pkgs/by-name/fl/flexget/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.16.3"; + version = "3.16.5"; pyproject = true; src = fetchFromGitHub { owner = "Flexget"; repo = "Flexget"; tag = "v${version}"; - hash = "sha256-07dCSwRLIf/cmNsFuNHs9XXFGuJvwUNWgLuxRsMOXo4="; + hash = "sha256-tmxVk74eqN4qIe7cJF5IIWe7aXIH3Q2vi1galTF+FbI="; }; pythonRelaxDeps = true; From d99ec37e3da97fafc61b2b5600fda99294cd56b0 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 12 Jun 2025 23:50:38 +0200 Subject: [PATCH 12/65] python3Packages.pygame-ce: add updateScript --- pkgs/development/python-modules/pygame-ce/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix index c677b9a4654a..bd60c9672220 100644 --- a/pkgs/development/python-modules/pygame-ce/default.nix +++ b/pkgs/development/python-modules/pygame-ce/default.nix @@ -12,6 +12,7 @@ ninja, meson-python, pyproject-metadata, + nix-update-script, fontconfig, freetype, @@ -158,6 +159,8 @@ buildPythonPackage rec { "pygame.version" ]; + passthru.updateScript = nix-update-script { }; + passthru.tests = { inherit pygame-gui; }; From 3e0dc9718d33da44130e15d76b58a7f79929af91 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 12 Jun 2025 23:57:32 +0200 Subject: [PATCH 13/65] python3Packages.pygame-ce: 2.5.4 -> 2.5.5 Changelog: https://github.com/pygame-community/pygame-ce/releases/tag/2.5.5 --- pkgs/development/python-modules/pygame-ce/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix index bd60c9672220..9b7a912499e3 100644 --- a/pkgs/development/python-modules/pygame-ce/default.nix +++ b/pkgs/development/python-modules/pygame-ce/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "pygame-ce"; - version = "2.5.4"; + version = "2.5.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "pygame-community"; repo = "pygame-ce"; tag = version; - hash = "sha256-joMc3QaQNbZ65pBJ7r5D6lWAGW9eM+e0k/ozOHfQL4U="; + hash = "sha256-OWC063N7G8t2ai/Qyz8DwP76BrFve5ZCbLD/mQwVbi4="; # Unicode files cause different checksums on HFS+ vs. other filesystems postFetch = "rm -rf $out/docs/reST"; }; From c71a6b140cb9758e5c3284dc6ada6e95826ea427 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jun 2025 03:53:55 +0000 Subject: [PATCH 14/65] python3Packages.google-cloud-network-connectivity: 2.8.0 -> 2.8.1 --- .../google-cloud-network-connectivity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix index b3ea85b95c11..74c9bc3524ac 100644 --- a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix +++ b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-network-connectivity"; - version = "2.8.0"; + version = "2.8.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "google_cloud_network_connectivity"; - hash = "sha256-NHZII5BYlysvlPBxXSu9nN7uqh/Ly3dLtgEuTS9eQOw="; + hash = "sha256-U8czLn5ttFuJ2VynJ0R/fJlK9r0zC43qpP1aU8coorA="; }; build-system = [ setuptools ]; From 258db2f841433a174cda69bd6bc08fd091fb5712 Mon Sep 17 00:00:00 2001 From: Antoine Sauzeau Date: Mon, 16 Jun 2025 19:59:47 +0200 Subject: [PATCH 15/65] dwarf2json: unstable-2021-04-15 -> 0.9.0 Signed-off-by: Antoine Sauzeau --- pkgs/by-name/dw/dwarf2json/package.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/dw/dwarf2json/package.nix b/pkgs/by-name/dw/dwarf2json/package.nix index fce284d28862..8c6fef5fe753 100644 --- a/pkgs/by-name/dw/dwarf2json/package.nix +++ b/pkgs/by-name/dw/dwarf2json/package.nix @@ -2,20 +2,25 @@ lib, fetchFromGitHub, buildGoModule, + versionCheckHook, }: -buildGoModule { +buildGoModule (finalAttrs: { pname = "dwarf2json"; - version = "unstable-2021-04-15"; + version = "0.9.0"; src = fetchFromGitHub { owner = "volatilityfoundation"; repo = "dwarf2json"; - rev = "e8a1ce85dc33bf2039adc7f8a5f47f3016153720"; - sha256 = "sha256-hnS00glAcj78mZp5as63CsEn+dcr+GNEkz8iC3KM0h0="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-M5KKtn5kly23TwbjD5MVLzIum58exXqCFs6jxsg6oGM="; }; - vendorHash = "sha256-tgs0l+sYdAxMHwVTew++keNpDyrHmevpmOBVIiuL+34="; + vendorHash = "sha256-3PnXB8AfZtgmYEPJuh0fwvG38dtngoS/lxyx3H+rvFs="; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; meta = with lib; { homepage = "https://github.com/volatilityfoundation/dwarf2json"; @@ -24,4 +29,4 @@ buildGoModule { maintainers = with maintainers; [ arkivm ]; mainProgram = "dwarf2json"; }; -} +}) From 2f4a719c68ab8c3063779ec517eddf485f67db9d Mon Sep 17 00:00:00 2001 From: Antoine Sauzeau Date: Mon, 16 Jun 2025 20:08:24 +0200 Subject: [PATCH 16/65] dward2json: add myself as maintainer Signed-off-by: Antoine Sauzeau --- pkgs/by-name/dw/dwarf2json/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/dw/dwarf2json/package.nix b/pkgs/by-name/dw/dwarf2json/package.nix index 8c6fef5fe753..7b910440c0ce 100644 --- a/pkgs/by-name/dw/dwarf2json/package.nix +++ b/pkgs/by-name/dw/dwarf2json/package.nix @@ -26,7 +26,10 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/volatilityfoundation/dwarf2json"; description = "Convert ELF/DWARF symbol and type information into vol3's intermediate JSON"; license = licenses.vol-sl; - maintainers = with maintainers; [ arkivm ]; + maintainers = with maintainers; [ + arkivm + asauzeau + ]; mainProgram = "dwarf2json"; }; }) From 59afc7731064b852b73de68cfe289cd13018dc2c Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Mon, 16 Jun 2025 20:57:56 +0200 Subject: [PATCH 17/65] mautrix-gmessages: 0.6.2 -> 0.6.3 --- pkgs/by-name/ma/mautrix-gmessages/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mautrix-gmessages/package.nix b/pkgs/by-name/ma/mautrix-gmessages/package.nix index ddbd96cbabcb..48e41c595bbf 100644 --- a/pkgs/by-name/ma/mautrix-gmessages/package.nix +++ b/pkgs/by-name/ma/mautrix-gmessages/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "mautrix-gmessages"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "mautrix"; repo = "gmessages"; tag = "v${version}"; - hash = "sha256-NzLHCVJaYl8q5meKZDy8St8J9c8oyASLLrXhWG7K+yw="; + hash = "sha256-s6d0fUH0md4oHWDGFDRR3SKbJBCH6qJIk4En6J53yIM="; }; - vendorHash = "sha256-+aX0r7IvsjXwmz5d6X0yzhG28mBYKvyDGoCbKMwkvk8="; + vendorHash = "sha256-d6UVKu9Al445JqwhPXSlQDs0hOTom56p+hVZN2C4S0M="; ldflags = [ "-s" From 08b93683d12ace785f9257a6178c761c6d18380c Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Mon, 16 Jun 2025 20:59:57 +0200 Subject: [PATCH 18/65] mautrix-discord: 0.7.3 -> 0.7.4 --- pkgs/by-name/ma/mautrix-discord/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mautrix-discord/package.nix b/pkgs/by-name/ma/mautrix-discord/package.nix index 79d75916b882..a8aa797982e2 100644 --- a/pkgs/by-name/ma/mautrix-discord/package.nix +++ b/pkgs/by-name/ma/mautrix-discord/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "mautrix-discord"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "mautrix"; repo = "discord"; rev = "v${version}"; - hash = "sha256-q6FpeGWoeIVVeomKMHpXUntMWsMJMV73FDiBfbMQ6Oc="; + hash = "sha256-ygnFZ1I8sPgpKwLK+Zr6ZUStGAH2egVDxS/pXmRqXYI="; }; - vendorHash = "sha256-6R5ryzjAAAI3YtTMlHjrLOXkid2kCe8+ZICnNUjtxaQ="; + vendorHash = "sha256-S3MWJi77TXs7gjPt6O2ruSIUHpsrLPIHQz3rQam1Wsg="; ldflags = [ "-s" From 709daa38fcc91f6c7455f711410a77bc359a54fd Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Mon, 16 Jun 2025 21:05:04 +0200 Subject: [PATCH 19/65] mautrix-meta: 0.4.6 -> 0.5.0 --- pkgs/by-name/ma/mautrix-meta/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix index dc6153bab418..9ac48728885e 100644 --- a/pkgs/by-name/ma/mautrix-meta/package.nix +++ b/pkgs/by-name/ma/mautrix-meta/package.nix @@ -15,7 +15,7 @@ buildGoModule rec { pname = "mautrix-meta"; - version = "0.4.6"; + version = "0.5.0"; subPackages = [ "cmd/mautrix-meta" ]; @@ -23,13 +23,13 @@ buildGoModule rec { owner = "mautrix"; repo = "meta"; rev = "v${version}"; - hash = "sha256-FRK32NBtAro/+StacBa/jMg31xkxOKx791RBmuG61z8="; + hash = "sha256-SM57PLfRVEKspqnAZz1XES6ba9Puuzvx8XZwAWKVRmw="; }; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-nFxWPMNV0La21W03WNDZNktcHYLFVzPY/SkAyp0AVxs="; + vendorHash = "sha256-+gQPlI9DHuY01JlUnEaYctOs+2XFAkw+X9SkvH0xlbc="; passthru = { tests = { From a4b63f46ac7b28924b9c65d76a7c80692e5d4cbc Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Mon, 16 Jun 2025 21:06:58 +0200 Subject: [PATCH 20/65] meowlnir: 0.5.0 -> 0.6.0 --- pkgs/by-name/me/meowlnir/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/meowlnir/package.nix b/pkgs/by-name/me/meowlnir/package.nix index 6c9fda7e91ba..14b662d2dc2a 100644 --- a/pkgs/by-name/me/meowlnir/package.nix +++ b/pkgs/by-name/me/meowlnir/package.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "meowlnir"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "maunium"; repo = "meowlnir"; tag = "v${version}"; - hash = "sha256-1YuSXKRiMUCRbxGIDOQKGKK7CxM3VD0LLEeULQJ/zRo="; + hash = "sha256-TKt6uwj3RdhSEjGnWmYybJFaQ82qf3tXY4PPUAm6juQ="; }; buildInputs = [ olm ]; - vendorHash = "sha256-g0be4ftBRV6Ver1kULfhnVBAF+iL3+/4e25sozpJ7+s="; + vendorHash = "sha256-rFk4QUAI/Brclt/X/T7O0T6v2dTxpqbNLtoi0twYliw="; doCheck = true; doInstallCheck = true; From f05f4c967b2158767bd5d9b3d90dfadf2f435035 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 16 Jun 2025 12:37:46 -0700 Subject: [PATCH 21/65] python312Packages.openai: 1.86.0 -> 1.87.0 Diff: https://github.com/openai/openai-python/compare/refs/tags/v1.86.0...refs/tags/v1.87.0 Changelog: https://github.com/openai/openai-python/blob/v1.87.0/CHANGELOG.md --- pkgs/development/python-modules/openai/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 935447852fa5..243b81ee05b3 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -37,6 +37,7 @@ nest-asyncio, pytest-asyncio, pytest-mock, + pytest-xdist, respx, # optional-dependencies toggle @@ -46,7 +47,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.86.0"; + version = "1.87.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -55,7 +56,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; tag = "v${version}"; - hash = "sha256-PDYyuvCkDfQrbkSz0CPfJr++WUu5mODY2nVzTanwqjo="; + hash = "sha256-KXvtAxkALZd/T5mVLkDemO7qQ7E2CLVmRpAg1+cRcdU="; }; postPatch = ''substituteInPlace pyproject.toml --replace-fail "hatchling==1.26.3" "hatchling"''; @@ -103,14 +104,13 @@ buildPythonPackage rec { nest-asyncio pytest-asyncio pytest-mock + pytest-xdist respx ]; pytestFlagsArray = [ "-W" "ignore::DeprecationWarning" - # snapshot mismatches - "--inline-snapshot=update" ]; disabledTests = From 02571bb5cad40f3bc836fb2262687ffd82cd4af8 Mon Sep 17 00:00:00 2001 From: Vinny Meller Date: Tue, 6 May 2025 04:44:32 +0000 Subject: [PATCH 22/65] htmx-lsp: 0.1.0 -> 0.1.0-unstable-2025-06-14, add updateScript --- pkgs/by-name/ht/htmx-lsp/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ht/htmx-lsp/package.nix b/pkgs/by-name/ht/htmx-lsp/package.nix index 74e67231ee8e..0fbd3545ec61 100644 --- a/pkgs/by-name/ht/htmx-lsp/package.nix +++ b/pkgs/by-name/ht/htmx-lsp/package.nix @@ -2,21 +2,24 @@ lib, rustPlatform, fetchFromGitHub, + unstableGitUpdater, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "htmx-lsp"; - version = "0.1.0"; + version = "0.1.0-unstable-2025-06-14"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "htmx-lsp"; - rev = version; - hash = "sha256-CvQ+vgo3+qUOj0SS6/NrapzXkP98tpiZbGhRHJxEqeo="; + rev = "c45f55b2bf8be2d92489fd6d69a3db07fe5f214b"; + hash = "sha256-7CAlYYwsanlOCGeY7gYE5Fzk5IEO4hThgINiJmXql7s="; }; useFetchCargoVendor = true; - cargoHash = "sha256-EQHNFiyQ7TwY4LldMFOTX0epilU76LPOiHQIIUsNhS8="; + cargoHash = "sha256-/ypaTrctJo88DHtF/hv6B0dqB06axd/qKFnuI8zs8KA="; + + passthru.updateScript = unstableGitUpdater { }; meta = with lib; { description = "Language server implementation for htmx"; From d21dd09d6b920aa77411461f321c091fc4875f54 Mon Sep 17 00:00:00 2001 From: Jonathan Bowman Date: Tue, 17 Jun 2025 18:20:41 -0400 Subject: [PATCH 23/65] goose-cli: 1.0.27 -> 1.0.28 --- pkgs/by-name/go/goose-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/goose-cli/package.nix b/pkgs/by-name/go/goose-cli/package.nix index 07313b8da664..098363f50f5e 100644 --- a/pkgs/by-name/go/goose-cli/package.nix +++ b/pkgs/by-name/go/goose-cli/package.nix @@ -27,17 +27,17 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "goose-cli"; - version = "1.0.27"; + version = "1.0.28"; src = fetchFromGitHub { owner = "block"; repo = "goose"; tag = "v${finalAttrs.version}"; - hash = "sha256-+HNAOw/BJVNHiDHeEBKoAAs66IXCdYhm1VzVFIzk4m8="; + hash = "sha256-ExFVgG05jlcz3nP6n94324sgXbIHpj8L30oNuqKyfto="; }; useFetchCargoVendor = true; - cargoHash = "sha256-v+UQFbFpkwX+7oNFvKf2v2u3OSkPdgOWntXLW6XJibE="; + cargoHash = "sha256-sW4rWLElTPVzD+KCOrikEFcoIRGujMz+wHOWlYBpi0o="; nativeBuildInputs = [ pkg-config From 71d29a1de3640876cce732626292eb61b53fd766 Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 17 Jun 2025 23:31:28 +0000 Subject: [PATCH 24/65] mihomo-party: 1.7.5 -> 1.7.6 --- pkgs/by-name/mi/mihomo-party/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix index 1b907b9473df..b1b410d023ae 100644 --- a/pkgs/by-name/mi/mihomo-party/package.nix +++ b/pkgs/by-name/mi/mihomo-party/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mihomo-party"; - version = "1.7.5"; + version = "1.7.6"; src = let @@ -31,8 +31,8 @@ stdenv.mkDerivation (finalAttrs: { fetchurl { url = "https://github.com/mihomo-party-org/mihomo-party/releases/download/v${finalAttrs.version}/mihomo-party-linux-${finalAttrs.version}-${arch}.deb"; hash = selectSystem { - x86_64-linux = "sha256-Kw7VDyJ07DeinAzsilJU0vBhDLViB8zlpIA+mAPpp2M="; - aarch64-linux = "sha256-OljIM8BI8umkRB1wUqcwQ/H1i1FhYtQ4d5cXMi/Lt9E="; + x86_64-linux = "sha256-83RajPreGieOYBAkoR6FsFREnOGDDuMK6+Qg+R/koac="; + aarch64-linux = "sha256-oWOXLUYWRKRgPtNv9ZvM1ODd44dhymVTKHJBK/xxOOs="; }; }; From 371916a0c325e075c313b563bc1c05e10a3b7ff6 Mon Sep 17 00:00:00 2001 From: kilianar Date: Wed, 18 Jun 2025 10:42:57 +0200 Subject: [PATCH 25/65] wealthfolio: 1.1.3 -> 1.1.4 https://github.com/afadil/wealthfolio/releases/tag/v1.1.4 --- pkgs/by-name/we/wealthfolio/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix index 57397f720158..7940cf360560 100644 --- a/pkgs/by-name/we/wealthfolio/package.nix +++ b/pkgs/by-name/we/wealthfolio/package.nix @@ -18,18 +18,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "wealthfolio"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "afadil"; repo = "wealthfolio"; rev = "v${finalAttrs.version}"; - hash = "sha256-HxzLGo+Tu8r58q7agagapfb69yxmFOLJFqDTQVYhpUE="; + hash = "sha256-NO+cqpEUc1A7Gk0jW5ycHgggYq3hlzf5jJIUTNQD5vA="; }; pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) src pname version; - hash = "sha256-wKj1jy/TDi8Cckx9et2XzX3yPnmfXMDrqv9c4+Yyhu4="; + hash = "sha256-KupqObdNrnWbbt9C4NNmgmQCfJ2O4FjJBwGy6XQhhHg="; }; cargoRoot = "src-tauri"; @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { src cargoRoot ; - hash = "sha256-9qxbgVEOmSaOBL6Vo3ZufNyn9wfs/FI+Pz38BiS91S8="; + hash = "sha256-3f3b4aWUewolUI3kWpKSywvlf5WBBiewHbGK0uzdyXY="; }; nativeBuildInputs = [ From d22ec36762c59a1f45dbcbb00d3f8ae30e641058 Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Tue, 17 Jun 2025 20:23:06 +0530 Subject: [PATCH 26/65] cosmic-session: add orca (screen reader) support The environment variable `ORCA` is used to specify the path to the executable binary of orca. If left empty, it defaults to `/usr/bin/orca` which is not available on NixOS. Setting it to "orca" means that the executable will be picked up from $PATH. We can hardcode the path for `ORCA` like we do with `XDP_COSMIC` but that would introduce an _unnecessary_ dependency, which we would like to avoid. The support for orca in the COSMIC session on NixOS will be handled by the NixOS module. Everyone else (non-NixOS-module users) should have support for orca as long as the executable can be found in their system's $PATH. --- pkgs/by-name/co/cosmic-session/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix index 0f605f183615..13116e329ed9 100644 --- a/pkgs/by-name/co/cosmic-session/package.nix +++ b/pkgs/by-name/co/cosmic-session/package.nix @@ -50,7 +50,10 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; - env.XDP_COSMIC = "${xdg-desktop-portal-cosmic}/libexec/xdg-desktop-portal-cosmic"; + env = { + XDP_COSMIC = lib.getExe xdg-desktop-portal-cosmic; + ORCA = "orca"; # get orca from $PATH + }; passthru = { providedSessions = [ "cosmic" ]; From 5ba14682aea80962c5109a02033611afc7f62510 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Wed, 18 Jun 2025 16:13:01 +0200 Subject: [PATCH 27/65] nixos/tests/bird: migrate to runTest and test both bird2 and bird3 Previously only the default bird package was tested. This corrects that. Inspired by the changes in #417549 from @adamcstephens. --- nixos/tests/all-tests.nix | 9 ++++- nixos/tests/bird.nix | 63 +++++++++++++++---------------- pkgs/by-name/bi/bird2/package.nix | 2 +- pkgs/by-name/bi/bird3/package.nix | 2 +- 4 files changed, 41 insertions(+), 35 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 32982001696b..606b2b090af2 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -247,7 +247,14 @@ in _module.args.compression = "xz"; }; bind = runTest ./bind.nix; - bird = handleTest ./bird.nix { }; + bird2 = import ./bird.nix { + inherit runTest; + package = pkgs.bird2; + }; + bird3 = import ./bird.nix { + inherit runTest; + package = pkgs.bird3; + }; birdwatcher = handleTest ./birdwatcher.nix { }; bitbox-bridge = runTest ./bitbox-bridge.nix; bitcoind = runTest ./bitcoind.nix; diff --git a/nixos/tests/bird.nix b/nixos/tests/bird.nix index d6dccd0f71a3..e036983c6b54 100644 --- a/nixos/tests/bird.nix +++ b/nixos/tests/bird.nix @@ -1,18 +1,9 @@ -# This test does a basic functionality check for all bird variants and demonstrates a use -# of the preCheckConfig option. - { - system ? builtins.currentSystem, - pkgs ? import ../.. { - inherit system; - config = { }; - }, + runTest, + package, }: let - inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; - inherit (pkgs.lib) optionalString; - makeBirdHost = hostId: { pkgs, ... }: @@ -33,6 +24,8 @@ let }; services.bird = { + inherit package; + enable = true; config = '' @@ -106,31 +99,37 @@ let ]; }; in -makeTest { - name = "bird"; +{ + twoNodeOSPF = runTest { + name = "bird-twoNodeOSPF"; - nodes.host1 = makeBirdHost "1"; - nodes.host2 = makeBirdHost "2"; + nodes.host1 = makeBirdHost "1"; + nodes.host2 = makeBirdHost "2"; - testScript = '' - start_all() + testScript = '' + start_all() - host1.wait_for_unit("bird.service") - host2.wait_for_unit("bird.service") - host1.succeed("systemctl reload bird.service") + host1.wait_for_unit("bird.service") + host2.wait_for_unit("bird.service") - with subtest("Waiting for advertised IPv4 routes"): - host1.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.2\")) | any'") - host2.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.1\")) | any'") - with subtest("Waiting for advertised IPv6 routes"): - host1.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::2\")) | any'") - host2.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::1\")) | any'") + host1.succeed("bird --version") + host2.succeed("bird --version") - with subtest("Check fake routes in preCheckConfig do not exists"): - host1.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'") - host2.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'") + host1.succeed("systemctl reload bird.service") - host1.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'") - host2.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'") - ''; + with subtest("Waiting for advertised IPv4 routes"): + host1.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.2\")) | any'") + host2.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.1\")) | any'") + with subtest("Waiting for advertised IPv6 routes"): + host1.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::2\")) | any'") + host2.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::1\")) | any'") + + with subtest("Check fake routes in preCheckConfig do not exists"): + host1.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'") + host2.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'") + + host1.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'") + host2.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'") + ''; + }; } diff --git a/pkgs/by-name/bi/bird2/package.nix b/pkgs/by-name/bi/bird2/package.nix index eb908401a6a7..f38674666305 100644 --- a/pkgs/by-name/bi/bird2/package.nix +++ b/pkgs/by-name/bi/bird2/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { "--runstatedir=/run/bird" ]; - passthru.tests = nixosTests.bird; + passthru.tests = nixosTests.bird2; meta = { changelog = "https://gitlab.nic.cz/labs/bird/-/blob/v${version}/NEWS"; diff --git a/pkgs/by-name/bi/bird3/package.nix b/pkgs/by-name/bi/bird3/package.nix index 39b44aa73bbe..b0ef754298f1 100644 --- a/pkgs/by-name/bi/bird3/package.nix +++ b/pkgs/by-name/bi/bird3/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { "--runstatedir=/run/bird" ]; - passthru.tests = nixosTests.bird; + passthru.tests = nixosTests.bird3; meta = { changelog = "https://gitlab.nic.cz/labs/bird/-/blob/v${version}/NEWS"; From b29257e1f5cbecfd801fe0306d5b7dd382e375fd Mon Sep 17 00:00:00 2001 From: bstanderline <153822813+bstanderline@users.noreply.github.com> Date: Wed, 18 Jun 2025 15:58:19 +0100 Subject: [PATCH 28/65] zabbix70: 7.0.13 -> 7.0.14 --- pkgs/servers/monitoring/zabbix/versions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 4cd732fe12b4..62688d27b2f0 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -4,8 +4,8 @@ generic: { hash = "sha256-DQGzk90isqYLNvs3qY/PEIHGg62Ygyot3YeUOhIAg54="; }; v70 = generic { - version = "7.0.13"; - hash = "sha256-2e9/HPsL3lZY2rsigIIPnOHPMyV/rHn0DwM3Org60Xw="; + version = "7.0.14"; + hash = "sha256-/otU7tnjoF3UXPSxoqpjv9wRR+h0DeioeMyu+tHttv8="; }; v60 = generic { version = "6.0.36"; From c807b6b9fb30b449b454813140858cf27219b76f Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Wed, 18 Jun 2025 21:23:09 +0200 Subject: [PATCH 29/65] readest: 0.9.57 -> 0.9.58 Changelog: https://github.com/readest/readest/releases/tag/v0.9.58 Diff: https://github.com/readest/readest/compare/v0.9.57...v0.9.58 --- pkgs/by-name/re/readest/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index 4ab48050268a..6fb23209872a 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "readest"; - version = "0.9.57"; + version = "0.9.58"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${finalAttrs.version}"; - hash = "sha256-w4DhxjhejJ2Nh/3+/bEBJx3nRyAhr5lyzoPb/AFbVPc="; + hash = "sha256-OXKYPcAugMW55TTID2iHeBPIdRiRzLJQ5pG4/kTIn/4="; fetchSubmodules = true; }; @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-ejA0bUAB1CuPZMPA1a4XlbHR6CTrvKf/rPHolYjpcW8="; + hash = "sha256-Tt1Gm/tlxceQnTd6eStgwboHCDetXdUNtdDShHmB5+M="; }; pnpmRoot = "../.."; From 918d451075e547c4eb60423f7693d854bd6e271e Mon Sep 17 00:00:00 2001 From: Pascal Dietrich Date: Wed, 18 Jun 2025 21:28:57 +0200 Subject: [PATCH 30/65] tauno-monitor: 0.1.28 -> 0.1.29 --- pkgs/by-name/ta/tauno-monitor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ta/tauno-monitor/package.nix b/pkgs/by-name/ta/tauno-monitor/package.nix index f3dd3945357b..c92b1e7d1b5c 100644 --- a/pkgs/by-name/ta/tauno-monitor/package.nix +++ b/pkgs/by-name/ta/tauno-monitor/package.nix @@ -13,14 +13,14 @@ }: python3Packages.buildPythonApplication rec { pname = "tauno-monitor"; - version = "0.1.28"; + version = "0.1.29"; pyproject = false; src = fetchFromGitHub { owner = "taunoe"; repo = "tauno-monitor"; tag = "v${version}"; - hash = "sha256-DxWB69bkDAe35ci/e18Dji0EpZvbz7Y5y+32ZchV/m8="; + hash = "sha256-U7vp0cPIRQeeuLGazoCQAnVQaKxDznC65bE31SwYU3A="; }; nativeBuildInputs = [ From 4470ba7621be01dc5b679a69022b4ae8fd008032 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jun 2025 22:56:37 +0000 Subject: [PATCH 31/65] museeks: 0.20.9 -> 0.21.1 --- pkgs/by-name/mu/museeks/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/museeks/package.nix b/pkgs/by-name/mu/museeks/package.nix index 86d0f0e85459..8ad5aac0f8da 100644 --- a/pkgs/by-name/mu/museeks/package.nix +++ b/pkgs/by-name/mu/museeks/package.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "museeks"; - version = "0.20.9"; + version = "0.21.1"; src = fetchurl { url = "https://github.com/martpie/museeks/releases/download/${finalAttrs.version}/Museeks_${finalAttrs.version}_amd64.deb"; - hash = "sha256-7jRgMpfQTJr3yW3YAPTnPSvtrqumScN3Tr7YXQX3Fi8="; + hash = "sha256-4UHMh8rZUDGNlz59EMGTgV/jfd6K9RyXVpMr2sinPUQ="; }; nativeBuildInputs = [ From a241a34ce25889f2feda3e2099417857d6e0e2f1 Mon Sep 17 00:00:00 2001 From: Omar Jatoi Date: Wed, 18 Jun 2025 20:12:57 -0400 Subject: [PATCH 32/65] scala-next: 3.7.0 -> 3.7.1 --- pkgs/by-name/sc/scala-next/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/scala-next/package.nix b/pkgs/by-name/sc/scala-next/package.nix index ce1a42e76f88..8ddd38f28586 100644 --- a/pkgs/by-name/sc/scala-next/package.nix +++ b/pkgs/by-name/sc/scala-next/package.nix @@ -1,10 +1,10 @@ { scala, fetchurl }: scala.bare.overrideAttrs (oldAttrs: { - version = "3.7.0"; + version = "3.7.1"; pname = "scala-next"; src = fetchurl { inherit (oldAttrs.src) url; - hash = "sha256-T2zGqv2XSjdA3t0FaJvldcthgpgRrMTyiRznlgQOmBE="; + hash = "sha256-XIeG4T7TXPVAEMteD0BSWrAv7V1f7xrkLpbdpHFuWAw="; }; }) From 7e33dcaedc0f759cd28e471967dd688ae4a657de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jun 2025 02:42:14 +0000 Subject: [PATCH 33/65] python3Packages.falconpy: 1.5.2 -> 1.5.3 --- pkgs/development/python-modules/falconpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/falconpy/default.nix b/pkgs/development/python-modules/falconpy/default.nix index b018861f08cf..d45bbc0dded8 100644 --- a/pkgs/development/python-modules/falconpy/default.nix +++ b/pkgs/development/python-modules/falconpy/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "falconpy"; - version = "1.5.2"; + version = "1.5.3"; pyproject = true; src = fetchFromGitHub { owner = "CrowdStrike"; repo = "falconpy"; tag = "v${version}"; - hash = "sha256-neZ0V0OpX1GTchkLdE+hKMRl9jKnJ/OCtXY0q1eAxzA="; + hash = "sha256-yK6delBTDnK5cP8mWIQZRfZClRsM2IeqjqrqOjbrlnc="; }; build-system = [ hatchling ]; From 096b4bf1e48ed317a27cde73dce791cb2a33ee0d Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 19 Jun 2025 13:09:56 +0800 Subject: [PATCH 34/65] casilda: 0.2.0 -> 0.3.0-unstable-2025-06-16 --- pkgs/by-name/ca/casilda/package.nix | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/ca/casilda/package.nix b/pkgs/by-name/ca/casilda/package.nix index 3b702edeb455..9349c1a660b5 100644 --- a/pkgs/by-name/ca/casilda/package.nix +++ b/pkgs/by-name/ca/casilda/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitLab, - fetchpatch, meson, ninja, pkg-config, @@ -19,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "casilda"; - version = "0.2.0"; + version = "0.3.0-unstable-2025-06-16"; outputs = [ "out" @@ -30,22 +29,11 @@ stdenv.mkDerivation (finalAttrs: { domain = "gitlab.gnome.org"; owner = "jpu"; repo = "casilda"; - tag = finalAttrs.version; - hash = "sha256-wTYx4Wj8u52+yNc/A5Lg0zqmhKh8X0q99e+TilpUrC4="; + rev = "5b5933d32f0221341c98a25dea1ce5ef78199a79"; + hash = "sha256-LrXoVK7KMjIko6jUkrKY06QdZMQaVrHhG7/C5ickdJA="; }; - patches = [ - # Fix missing clock_gettime function - # https://gitlab.gnome.org/jpu/casilda/-/merge_requests/4 - (fetchpatch { - url = "https://gitlab.gnome.org/jpu/casilda/-/commit/dcebb8e67d6dc7c47332d1c76a1d5bf60eaee7b1.patch"; - hash = "sha256-l3zu29PPRwzDuoeoqUs4Gi3JziyZ9vDdqvRfz7GQ4Sw="; - }) - ]; - - depsBuildBuild = [ - pkg-config - ]; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson @@ -61,12 +49,10 @@ stdenv.mkDerivation (finalAttrs: { wayland-protocols wayland # for wayland-server libxkbcommon + wlroots_0_18 ]; - propagatedBuildInputs = [ - gtk4 - wlroots_0_18 # todo: move to buildInputs after https://gitlab.gnome.org/jpu/casilda/-/merge_requests/7 - ]; + propagatedBuildInputs = [ gtk4 ]; strictDeps = true; From 3bb86e66136c12cff200f90824941dfe68455634 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jun 2025 05:27:29 +0000 Subject: [PATCH 35/65] python3Packages.paddleocr: 3.0.1 -> 3.0.2 --- pkgs/development/python-modules/paddleocr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/paddleocr/default.nix b/pkgs/development/python-modules/paddleocr/default.nix index 77c35499f537..5ce2aeea652c 100644 --- a/pkgs/development/python-modules/paddleocr/default.nix +++ b/pkgs/development/python-modules/paddleocr/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "paddleocr"; - version = "3.0.1"; + version = "3.0.2"; pyproject = true; src = fetchFromGitHub { owner = "PaddlePaddle"; repo = "PaddleOCR"; tag = "v${version}"; - hash = "sha256-B8zIiRpvT0oa/Gg2dLXTqBZmM+XDH3sOzODvleN638E="; + hash = "sha256-PatqxQQR0uwZwNFYBAeAF5JfsRNhA6fzcy7lufWZARg="; }; patches = [ From a391422dc34de1c824f2ac0b9efd8d7a5a77e695 Mon Sep 17 00:00:00 2001 From: Savyasachee Jha Date: Thu, 19 Jun 2025 07:27:34 +0200 Subject: [PATCH 36/65] matrix-continuwuity: 0.5.0-rc.5 -> 0.5.0-rc.6 --- pkgs/by-name/ma/matrix-continuwuity/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/matrix-continuwuity/package.nix b/pkgs/by-name/ma/matrix-continuwuity/package.nix index 8ace6e4d0edf..67427c3ad2aa 100644 --- a/pkgs/by-name/ma/matrix-continuwuity/package.nix +++ b/pkgs/by-name/ma/matrix-continuwuity/package.nix @@ -31,18 +31,18 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-continuwuity"; - version = "0.5.0-rc.5"; + version = "0.5.0-rc.6"; src = fetchFromGitea { domain = "forgejo.ellis.link"; owner = "continuwuation"; repo = "continuwuity"; tag = "v${finalAttrs.version}"; - hash = "sha256-Oq2scBu3Ewao828BT1QGffqIqF5WoH9HMXEXKg1YU0o="; + hash = "sha256-xK/jTURQzFJ1FkF1E9cItTxXAgXgTwAiA9/8aE51FvU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-bjjGR3++CaDEtlsQj9GgdViCEB5l72sI868uTFBtIwg="; + cargoHash = "sha256-+7k1dtrXdonFDXa2Z/qVo4n1hZRmMWEQKKlffki8+/k="; nativeBuildInputs = [ pkg-config From 7bdbd1bda41e2b3af935cee5c96c332a27a9bafc Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 14 Jun 2025 22:18:28 +0200 Subject: [PATCH 37/65] flint: 3.2.1 -> 3.3.0 --- pkgs/development/libraries/flint/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/flint/3.nix b/pkgs/development/libraries/flint/3.nix index 2c1b5fc9b3dc..1dee646f2a40 100644 --- a/pkgs/development/libraries/flint/3.nix +++ b/pkgs/development/libraries/flint/3.nix @@ -22,11 +22,11 @@ assert stdenv.mkDerivation rec { pname = "flint3"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { url = "https://flintlib.org/download/flint-${version}.tar.gz"; - hash = "sha256-ynvkbXeXInfrb+DE92dUhDL1a7U0qhfW26LXzOFc0j8="; + hash = "sha256-2a4PExglNycGgnDb+jxLVRVeP0t75sqcBW5Y8oOPFbM="; }; nativeBuildInputs = [ From 93decf37a1ed3f0f44f24b7eeaf74c9e71fed864 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 14 Jun 2025 23:00:57 +0200 Subject: [PATCH 38/65] singular: add patch for flint 3.3.0 --- pkgs/by-name/si/singular/package.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/by-name/si/singular/package.nix b/pkgs/by-name/si/singular/package.nix index c71f933edc66..d16b427c282a 100644 --- a/pkgs/by-name/si/singular/package.nix +++ b/pkgs/by-name/si/singular/package.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, + fetchpatch, gmp, bison, perl, @@ -70,6 +71,18 @@ stdenv.mkDerivation rec { patchShebangs . ''; + # Use fq_nmod_mat_entry instead of row pointer (removed in flint 3.3.0) + patches = [ + (fetchpatch { + url = "https://github.com/Singular/Singular/commit/05f5116e13c8a4f5f820c78c35944dd6d197d442.patch"; + hash = "sha256-4l7JaCCFzE+xINU+E92eBN5CJKIdtQHly4Ed3ZwbKTA="; + }) + (fetchpatch { + url = "https://github.com/Singular/Singular/commit/595d7167e6e019d45d9a4f1e18ae741df1f3c41d.patch"; + hash = "sha256-hpTZy/eAiHAaleasWPAenxM35aqeNAZ//o6OqqdGOJ4="; + }) + ]; + # For reference (last checked on commit 75f460d): # https://github.com/Singular/Singular/blob/spielwiese/doc/Building-Singular-from-source.md # https://github.com/Singular/Singular/blob/spielwiese/doc/external-packages-dynamic-modules.md From 9d2af3e6c978e55ae8eb4b274f7d74a099700df2 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 19 Jun 2025 12:39:41 +0200 Subject: [PATCH 39/65] flint: 3.3.0 -> 3.3.1 --- pkgs/development/libraries/flint/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/flint/3.nix b/pkgs/development/libraries/flint/3.nix index 1dee646f2a40..e6566d706a27 100644 --- a/pkgs/development/libraries/flint/3.nix +++ b/pkgs/development/libraries/flint/3.nix @@ -22,11 +22,11 @@ assert stdenv.mkDerivation rec { pname = "flint3"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "https://flintlib.org/download/flint-${version}.tar.gz"; - hash = "sha256-2a4PExglNycGgnDb+jxLVRVeP0t75sqcBW5Y8oOPFbM="; + hash = "sha256-ZNcOUTB2z6lx4EELWMHaXTURKRPppWtE4saBtFnT6vs="; }; nativeBuildInputs = [ From 913a92408df88a7b0213281ad5afb390cb2c4189 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 19 Jun 2025 21:12:13 +0900 Subject: [PATCH 40/65] vassal: add versionCheckHook --- pkgs/by-name/va/vassal/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/va/vassal/package.nix b/pkgs/by-name/va/vassal/package.nix index aa409fef0f06..bc27af3563ea 100644 --- a/pkgs/by-name/va/vassal/package.nix +++ b/pkgs/by-name/va/vassal/package.nix @@ -6,6 +6,7 @@ jre, makeWrapper, wrapGAppsHook3, + versionCheckHook, }: stdenv.mkDerivation rec { @@ -48,6 +49,13 @@ stdenv.mkDerivation rec { "info" ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/vassal"; + versionCheckProgramArg = "--version"; + meta = with lib; { description = "Free, open-source boardgame engine"; homepage = "https://vassalengine.org/"; From 1cf77deaff15a66c4af2c2f03f9835017c3c7080 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 19 Jun 2025 21:33:28 +0900 Subject: [PATCH 41/65] vassal: add desktop entry --- pkgs/by-name/va/vassal/package.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/by-name/va/vassal/package.nix b/pkgs/by-name/va/vassal/package.nix index bc27af3563ea..22e11c5d54a1 100644 --- a/pkgs/by-name/va/vassal/package.nix +++ b/pkgs/by-name/va/vassal/package.nix @@ -6,6 +6,8 @@ jre, makeWrapper, wrapGAppsHook3, + makeDesktopItem, + copyDesktopItems, versionCheckHook, }: @@ -25,6 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper wrapGAppsHook3 + copyDesktopItems ]; installPhase = '' @@ -40,9 +43,23 @@ stdenv.mkDerivation rec { --add-flags "-Duser.dir=$out -cp $out/share/vassal/Vengine.jar \ VASSAL.launch.ModuleManager" + install -Dm444 -t "$out/share/icons/hicolor/scalable/apps/" VASSAL.svg + runHook postInstall ''; + desktopItems = [ + (makeDesktopItem { + name = "VASSAL"; + exec = "vassal"; + icon = "VASSAL"; + desktopName = "VASSAL"; + comment = "The open-source boardgame engine"; + categories = [ "Game" ]; + startupWMClass = "VASSAL-launch-ModuleManager"; + }) + ]; + # Don't move doc to share/, VASSAL expects it to be in the root forceShare = [ "man" From 35bbc83f153a3d1cb51a805d63a77bf9dffbdb1c Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 19 Jun 2025 21:47:29 +0900 Subject: [PATCH 42/65] vassal: correct platforms Upstream also supports Windows --- pkgs/by-name/va/vassal/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/va/vassal/package.nix b/pkgs/by-name/va/vassal/package.nix index 22e11c5d54a1..71ad88b050c2 100644 --- a/pkgs/by-name/va/vassal/package.nix +++ b/pkgs/by-name/va/vassal/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl21Only; maintainers = with maintainers; [ tvestelind ]; - platforms = platforms.unix; + platforms = with lib.platforms; unix ++ windows; mainProgram = "vassal"; }; } From 57ae3a319a1191f445f1afee08a80abf920622ec Mon Sep 17 00:00:00 2001 From: NilaTheDragon Date: Tue, 17 Jun 2025 19:50:40 +0200 Subject: [PATCH 43/65] high-tide: 0.1.5 -> 0.1.7 --- pkgs/by-name/hi/high-tide/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/hi/high-tide/package.nix b/pkgs/by-name/hi/high-tide/package.nix index 7e87e49f879b..88c0abe2c1e9 100644 --- a/pkgs/by-name/hi/high-tide/package.nix +++ b/pkgs/by-name/hi/high-tide/package.nix @@ -17,14 +17,14 @@ python313Packages.buildPythonApplication rec { pname = "high-tide"; - version = "0.1.5"; + version = "0.1.7"; pyproject = false; src = fetchFromGitHub { owner = "Nokse22"; repo = "high-tide"; tag = "v${version}"; - hash = "sha256-HoPyqsLPLfqyQbrhoPzr3n81yX1MHZVUVmq5RKDN5pI="; + hash = "sha256-QFa9K/iSPe3cIx90PzPCkJszrygON9ijukv4px3Rob8="; }; nativeBuildInputs = [ @@ -45,8 +45,6 @@ python313Packages.buildPythonApplication rec { gstreamer gst-plugins-base gst-plugins-good - gst-plugins-ugly - gst-plugins-bad libsecret ]); @@ -55,6 +53,7 @@ python313Packages.buildPythonApplication rec { tidalapi requests mpd2 + pypresence ]; dontWrapGApps = true; From 839a1dc891d9976e45c8d2c981acbea04ddbb4d3 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Thu, 19 Jun 2025 16:40:32 +0200 Subject: [PATCH 44/65] libnghttp2_asio: pin boost This fixes the currently-broken build --- pkgs/by-name/li/libnghttp2_asio/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libnghttp2_asio/package.nix b/pkgs/by-name/li/libnghttp2_asio/package.nix index 74e2ec56c6bb..4fe8889e16b2 100644 --- a/pkgs/by-name/li/libnghttp2_asio/package.nix +++ b/pkgs/by-name/li/libnghttp2_asio/package.nix @@ -5,12 +5,12 @@ cmake, nghttp2, openssl, - boost, + boost186, }: stdenv.mkDerivation { pname = "libnghttp2_asio"; - version = "unstable-2022-08-11"; + version = "0-unstable-2022-08-11"; outputs = [ "out" @@ -30,7 +30,7 @@ stdenv.mkDerivation { ]; buildInputs = [ - boost + boost186 nghttp2 openssl ]; From 3c04ac7e23c56e5cd94dca3c52aca08074604d4c Mon Sep 17 00:00:00 2001 From: Jacob Moody Date: Thu, 19 Jun 2025 09:43:56 -0500 Subject: [PATCH 45/65] drawterm: 0-unstable-2025-05-18 -> 0-unstable-2025-06-13 --- pkgs/by-name/dr/drawterm/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/dr/drawterm/package.nix b/pkgs/by-name/dr/drawterm/package.nix index 4995d8d58b59..835dfea8faac 100644 --- a/pkgs/by-name/dr/drawterm/package.nix +++ b/pkgs/by-name/dr/drawterm/package.nix @@ -13,7 +13,7 @@ wayland, wayland-protocols, libxkbcommon, - wlr-protocols, + libdecor, pulseaudio, nixosTests, withWayland ? false, @@ -23,13 +23,13 @@ let in stdenv.mkDerivation { pname = "drawterm"; - version = "0-unstable-2025-05-18"; + version = "0-unstable-2025-06-13"; src = fetchFrom9Front { owner = "plan9front"; repo = "drawterm"; - rev = "a6c1ce4e0244ca70403dc4e795a9cee548159560"; - hash = "sha256-W9IsFnJE4Bpdc2K9DcRq+zRPMU9Wd4xpM0lHkh5SirQ="; + rev = "4e32a9fa6e58c1474f747a99083303c4a2f14ea7"; + hash = "sha256-j0s6xB8c8vQoOzL34Gu84elec0ig4z75NzlUx6PsW4E="; }; enableParallelBuilding = true; @@ -50,7 +50,7 @@ stdenv.mkDerivation { wayland wayland-protocols libxkbcommon - wlr-protocols + libdecor ] ++ lib.optionals withXorg [ xorg.libX11 From 15e726f54a4126ff3c9eea7df0fc6c0744c8f55d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jun 2025 20:37:14 +0000 Subject: [PATCH 46/65] python3Packages.fastembed: 0.7.0 -> 0.7.1 --- pkgs/development/python-modules/fastembed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastembed/default.nix b/pkgs/development/python-modules/fastembed/default.nix index 8349dc19f326..ea827ad40969 100644 --- a/pkgs/development/python-modules/fastembed/default.nix +++ b/pkgs/development/python-modules/fastembed/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "fastembed"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; src = fetchFromGitHub { owner = "qdrant"; repo = "fastembed"; tag = "v${version}"; - hash = "sha256-CnUg6ZJ3VmKXbeWWsD0j4KTdUhqrgOP5PBnHtghugHQ="; + hash = "sha256-zftNBATvb9iCjEOWIg0Q8/1+VwQ1km/iob3TgOAfJbg="; }; build-system = [ poetry-core ]; From 6300c392279ecdebebf9e2047edcf1f2838773f1 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 24 Mar 2025 16:49:19 +0000 Subject: [PATCH 47/65] nixos/plasma6: make optional wallpapers optional --- nixos/modules/services/desktop-managers/plasma6.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index ef9c66d1336d..c70bb52966c0 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -136,7 +136,6 @@ in breeze-icons breeze-gtk ocean-sound-theme - plasma-workspace-wallpapers pkgs.hicolor-icon-theme # fallback icons qqc2-breeze-style qqc2-desktop-style @@ -158,6 +157,7 @@ in [ aurorae plasma-browser-integration + plasma-workspace-wallpapers konsole kwin-x11 (lib.getBin qttools) # Expose qdbus in PATH From 53aac1d02ac39de3ef099afb0f7f649b1e1e46ef Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Thu, 19 Jun 2025 22:35:36 +0200 Subject: [PATCH 48/65] zfs_{2_3,unstable}: 2.3.2 -> 2.3.3 --- pkgs/os-specific/linux/zfs/2_3.nix | 6 +++--- pkgs/os-specific/linux/zfs/unstable.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/2_3.nix b/pkgs/os-specific/linux/zfs/2_3.nix index e88b4c591594..965f4ee874f3 100644 --- a/pkgs/os-specific/linux/zfs/2_3.nix +++ b/pkgs/os-specific/linux/zfs/2_3.nix @@ -11,10 +11,10 @@ callPackage ./generic.nix args { # this attribute is the correct one for this package. kernelModuleAttribute = "zfs_2_3"; # check the release notes for compatible kernels - kernelCompatible = kernel: kernel.kernelOlder "6.15"; + kernelCompatible = kernel: kernel.kernelOlder "6.16"; # this package should point to the latest release. - version = "2.3.2"; + version = "2.3.3"; tests = { @@ -29,5 +29,5 @@ callPackage ./generic.nix args { amarshall ]; - hash = "sha256-+DqpIgHCVi0fDOqvKwaGXIiiXw8xEnlv2tgRwgLX9G8="; + hash = "sha256-NXAbyGBfpzWfm4NaP1/otTx8fOnoRV17343qUMdQp5U="; } diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index be9ad8b682e7..5bd1412d6c32 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -9,20 +9,20 @@ callPackage ./generic.nix args { # this attribute is the correct one for this package. kernelModuleAttribute = "zfs_unstable"; # check the release notes for compatible kernels - kernelCompatible = kernel: kernel.kernelOlder "6.15"; + kernelCompatible = kernel: kernel.kernelOlder "6.16"; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.3.2"; + version = "2.3.3"; # rev = ""; tests = { inherit (nixosTests.zfs) unstable; }; - hash = "sha256-+DqpIgHCVi0fDOqvKwaGXIiiXw8xEnlv2tgRwgLX9G8="; + hash = "sha256-NXAbyGBfpzWfm4NaP1/otTx8fOnoRV17343qUMdQp5U="; extraLongDescription = '' This is "unstable" ZFS, and will usually be a pre-release version of ZFS. From 49dd486796ea0c45c9a1fd7ab799bd69bb6836f7 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 24 Mar 2025 13:35:31 +0000 Subject: [PATCH 49/65] nixos/installer/plasma6: exclude `kdePackages.plasma-workspace-wallpapers` --- .../cd-dvd/installation-cd-graphical-calamares-plasma6.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix index f71a624156cd..d9fae053e771 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix @@ -24,6 +24,13 @@ pkgs.maliit-keyboard ]; + environment.plasma6.excludePackages = [ + # Optional wallpapers that add 126 MiB to the graphical installer + # closure. They will still need to be downloaded when installing a + # Plasma system, though. + pkgs.kdePackages.plasma-workspace-wallpapers + ]; + system.activationScripts.installerDesktop = let From a7a3457082bd1c942a803e2b1043b4f694ad401c Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 24 Mar 2025 17:28:08 +0000 Subject: [PATCH 50/65] nixos/installer/plasma6: disable KDE PIM --- .../cd-dvd/installation-cd-graphical-calamares-plasma6.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix index d9fae053e771..90683fa088dc 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix @@ -31,6 +31,9 @@ pkgs.kdePackages.plasma-workspace-wallpapers ]; + # Avoid bundling an entire MariaDB installation on the ISO. + programs.kde-pim.enable = false; + system.activationScripts.installerDesktop = let From c51e37181fdb72fc68b8b537d5b1e6d455de35d9 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Fri, 20 Jun 2025 08:20:48 +1000 Subject: [PATCH 51/65] hatch: fix build, disable failing tests --- pkgs/by-name/ha/hatch/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ha/hatch/package.nix b/pkgs/by-name/ha/hatch/package.nix index 2a26b7173f88..da80f9ed5b67 100644 --- a/pkgs/by-name/ha/hatch/package.nix +++ b/pkgs/by-name/ha/hatch/package.nix @@ -129,6 +129,10 @@ python3Packages.buildPythonApplication rec { # Relies on FHS # Could not read ELF interpreter from any of the following paths: /bin/sh, /usr/bin/env, /bin/dash, /bin/ls "test_new_selected_python" + + # https://github.com/pypa/hatch/issues/2006 + "test_project_location_basic_set_first_project" + "test_project_location_complex_set_first_project" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # This test assumes it is running on macOS with a system shell on the PATH. From 0e243d51d12df5dc65ec19ee2df04542f876f423 Mon Sep 17 00:00:00 2001 From: pinage404 Date: Tue, 10 Jun 2025 23:10:48 +0200 Subject: [PATCH 52/65] gk-cli: 2.1.2 -> 3.0.9 Diff: https://github.com/gitkraken/gk-cli/compare/v2.1.2...v3.0.9 Now: * the archive contains a subfolder * the archive doesn't contains the completions files * the completion is now generated with the binary * build for Linux ARMv6 and ARMv7 are not published * build for Windows ARM64 is published * add basic test * add git as runtime dependency --- pkgs/by-name/gk/gk-cli/package.nix | 76 +++++++++++++++++------------- 1 file changed, 44 insertions(+), 32 deletions(-) diff --git a/pkgs/by-name/gk/gk-cli/package.nix b/pkgs/by-name/gk/gk-cli/package.nix index 6ca98ca42863..52083ce92625 100644 --- a/pkgs/by-name/gk/gk-cli/package.nix +++ b/pkgs/by-name/gk/gk-cli/package.nix @@ -5,6 +5,7 @@ coreutils, installShellFiles, makeWrapper, + gitMinimal, writeShellScript, curl, jq, @@ -13,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gk-cli"; - version = "2.1.2"; + version = "3.0.9"; src = ( finalAttrs.passthru.sources.${stdenv.system} @@ -28,18 +29,34 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -Dm555 gk -t $out/bin/ + install -Dm555 gk*/gk -t $out/bin/ - installShellCompletion --bash ./**/gk.bash - installShellCompletion --fish ./**/gk.fish - installShellCompletion --zsh ./**/_gk + wrapProgram $out/bin/gk \ + --prefix PATH : "${lib.makeBinPath [ gitMinimal ]}" runHook postInstall ''; - postFixup = '' - wrapProgram $out/bin/gk \ - --prefix PATH : "${lib.makeBinPath [ coreutils ]}" + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + # Use timeout because gk hangs instead of closing in the sandbox + installShellCompletion --cmd gk \ + --bash <(HOME="$(mktemp --directory)" timeout 3 $out/bin/gk completion bash) \ + --fish <(HOME="$(mktemp --directory)" timeout 3 $out/bin/gk completion fish) \ + --zsh <(HOME="$(mktemp --directory)" timeout 3 $out/bin/gk completion zsh) + ''; + + doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + installCheckPhase = '' + OUTPUT="$( + HOME="$(mktemp --directory)" \ + timeout 3 `# Use timeout because gk hangs instead of closing in the sandbox` \ + $out/bin/gk setup \ + 2>/dev/null \ + || true # Command fails because not logged in + )" + + echo "$OUTPUT" | grep --quiet '^Git binary found: ✓$' + echo "$OUTPUT" | grep --quiet '^CLI version: ${finalAttrs.version}$' ''; passthru = { @@ -48,49 +65,44 @@ stdenv.mkDerivation (finalAttrs: { base_url = "https://github.com/gitkraken/gk-cli/releases/download/v${finalAttrs.version}/gk_${finalAttrs.version}_"; in { - armv6l-linux = fetchzip { - url = "${base_url}Linux_arm6.zip"; - hash = "sha256-pnEFTkx1JSmQlniVCXvIB6xGD8XyDh9OLDU0V9AZBTs="; - stripRoot = false; - }; - armv7l-linux = fetchzip { - url = "${base_url}Linux_arm7.zip"; - hash = "sha256-qj0++i698s4ELKHU9B2sGIqf9hUJip4+2Car+brkRkM="; - stripRoot = false; - }; aarch64-linux = fetchzip { - url = "${base_url}Linux_arm64.zip"; - hash = "sha256-vHGhlRHbk2/s3YmBdOPDbalEydpQVFkHiCkBVywa4N0="; + url = "${base_url}linux_arm64.zip"; + hash = "sha256-aYgHLpG4nX3Op0+j733jYbK4ZwVKkctMkDPweNTJWso="; stripRoot = false; }; x86_32-linux = fetchzip { - url = "${base_url}Linux_i386.zip"; - hash = "sha256-t+P9SpS9u/17kga74kbYjD6nkjiFusyIwCRGDnkP3tU="; + url = "${base_url}linux_386.zip"; + hash = "sha256-lVu25S7e6a/kHmiD5dxGAlHMQ5yN46+SdFpt8lghejM="; stripRoot = false; }; x86_64-linux = fetchzip { - url = "${base_url}Linux_x86_64.zip"; - hash = "sha256-O6T27edHi20ZFHiNaZKdk/5dtCn2Tpxm0PR934SRwFk="; + url = "${base_url}linux_amd64.zip"; + hash = "sha256-/z2G//Zh8lTHkeJPahyld1EEXXhd/cgIvCojUmzFX8E="; stripRoot = false; }; aarch64-darwin = fetchzip { - url = "${base_url}macOS_arm64.zip"; - hash = "sha256-LW2K+aveJiyYqfga2jpF3DvvFeHJuozqbc/afgtq2Oc="; + url = "${base_url}darwin_arm64.zip"; + hash = "sha256-nDVehD0TTNTvhuDU8RB4lZiVcEJpB+l6EGkzckC7JuU="; stripRoot = false; }; x86_64-darwin = fetchzip { - url = "${base_url}macOS_x86_64.zip"; - hash = "sha256-1w8B4YWouVViTGoUh987pPQIoqdzB0S+M2bBiRI6Kfg="; + url = "${base_url}darwin_amd64.zip"; + hash = "sha256-Lhuqb5592T6VcTMVmAdIDfGMXaS4dSu0wbQeHheXXk4="; + stripRoot = false; + }; + aarch64-windows = fetchzip { + url = "${base_url}windows_arm64.zip"; + hash = "sha256-sXHeqR4AW/sRPp74PieXI1n4VGV94CnrcMF1ovAek8E="; stripRoot = false; }; i686-windows = fetchzip { - url = "${base_url}Windows_i386.zip"; - hash = "sha256-t81/wK1weZ/uEZ5TzivylARTUqks9rLIG7WzeoWXb1k="; + url = "${base_url}windows_386.zip"; + hash = "sha256-u6DyHoYIaExS2CHu20odDVJxzI4k9PpdFQf6UDPAzz0="; stripRoot = false; }; x86_64-windows = fetchzip { - url = "${base_url}Windows_x86_64.zip"; - hash = "sha256-9yydDMI9Gz/OswRhJHF+2c3Ia0zDmXMbf7byj6PJe24="; + url = "${base_url}windows_amd64.zip"; + hash = "sha256-nh+JPR95IWLm7CTrS8qK2dP3c4SH/zm1oIS5GNgxcyo="; stripRoot = false; }; }; From f51bd00bfce2d753b78416d4e9df563dab3f4119 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jun 2025 23:37:33 +0000 Subject: [PATCH 53/65] upbound-main: 0.39.0-8.gfb176095 -> 0.39.0-43.g3cca6045 --- pkgs/by-name/up/upbound/sources-main.json | 34 +++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/up/upbound/sources-main.json b/pkgs/by-name/up/upbound/sources-main.json index 215a5d1af933..cbdbbe3b9af6 100644 --- a/pkgs/by-name/up/upbound/sources-main.json +++ b/pkgs/by-name/up/upbound/sources-main.json @@ -8,38 +8,38 @@ "fetchurlAttrSet": { "docker-credential-up": { "aarch64-darwin": { - "hash": "sha256-8VKSDsmuYu/GaKo4JybWEnd+gbW9ZSjEoNlZ7SEans0=", - "url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/docker-credential-up/darwin_arm64.tar.gz" + "hash": "sha256-EPJXlxa4Vx7jzdX5/ekIer/EKTAFuqWBcAp4mYyS+JA=", + "url": "https://cli.upbound.io/main/v0.39.0-43.g3cca6045/bundle/docker-credential-up/darwin_arm64.tar.gz" }, "aarch64-linux": { - "hash": "sha256-WPllvTQJr5S6g2h9fe3qXKL/CH7XzADbNRoy+6rex6A=", - "url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/docker-credential-up/linux_arm64.tar.gz" + "hash": "sha256-cM8F+Qyg34ypdIusI2jFOzoxM3B+tLRyvmqdeUSpz0c=", + "url": "https://cli.upbound.io/main/v0.39.0-43.g3cca6045/bundle/docker-credential-up/linux_arm64.tar.gz" }, "x86_64-darwin": { - "hash": "sha256-bdKjFgJuKbFQDX1dgz6y2Ue6cFnu4Dec+I7FX+fo/pA=", - "url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/docker-credential-up/darwin_amd64.tar.gz" + "hash": "sha256-jvBe0GEDNMj3HlbMBFcwS1CA2y3QnDkYgv943GW0tLs=", + "url": "https://cli.upbound.io/main/v0.39.0-43.g3cca6045/bundle/docker-credential-up/darwin_amd64.tar.gz" }, "x86_64-linux": { - "hash": "sha256-ieP9uiRcgcYqYClB7vGdHF1IpjH61dXD8bqpPPy2Uik=", - "url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/docker-credential-up/linux_amd64.tar.gz" + "hash": "sha256-c/tjuO3j+pYFlyGRAeA3jJLit4sZqreEzMa0LRxnTv0=", + "url": "https://cli.upbound.io/main/v0.39.0-43.g3cca6045/bundle/docker-credential-up/linux_amd64.tar.gz" } }, "up": { "aarch64-darwin": { - "hash": "sha256-YYsgNpNVnTp2bPIp9DD1l0YwHcEpMknu7RrIUQ5scCo=", - "url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/up/darwin_arm64.tar.gz" + "hash": "sha256-ecNGveGSxYsKFGkAqWNkpr8RKquL1k+/8LsZBNEgWq8=", + "url": "https://cli.upbound.io/main/v0.39.0-43.g3cca6045/bundle/up/darwin_arm64.tar.gz" }, "aarch64-linux": { - "hash": "sha256-wone2UA+Z0wCISQ/PsfYdQqNkX5txVVEyx4a8JnLHXo=", - "url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/up/linux_arm64.tar.gz" + "hash": "sha256-70c9eE+SewPICRPzIdOmAj503xB/cL5ud2sQc4uJkJQ=", + "url": "https://cli.upbound.io/main/v0.39.0-43.g3cca6045/bundle/up/linux_arm64.tar.gz" }, "x86_64-darwin": { - "hash": "sha256-hxLZGWq94eHro4G9VJY+FLoz6AHuhm1quP/bhTzBXhE=", - "url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/up/darwin_amd64.tar.gz" + "hash": "sha256-DQZNsUYLM97zo7ua5xmxSqkxbC91qqLe49yI6X9ELbM=", + "url": "https://cli.upbound.io/main/v0.39.0-43.g3cca6045/bundle/up/darwin_amd64.tar.gz" }, "x86_64-linux": { - "hash": "sha256-GwAu6z6A4HUhc6vO6xiKZlITm5xiLas8zffuWnesji8=", - "url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/up/linux_amd64.tar.gz" + "hash": "sha256-WmsFhA5fteS3+12wPAGym0TZHax+v3zicbh+48aaW0Q=", + "url": "https://cli.upbound.io/main/v0.39.0-43.g3cca6045/bundle/up/linux_amd64.tar.gz" } } }, @@ -49,5 +49,5 @@ "x86_64-darwin", "x86_64-linux" ], - "version": "0.39.0-8.gfb176095" + "version": "0.39.0-43.g3cca6045" } From eb553bbd9176bf8b01eb323c328ef21d4401ea4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jun 2025 23:54:48 +0000 Subject: [PATCH 54/65] phpExtensions.relay: 0.10.1 -> 0.11.0 --- .../php-packages/relay/default.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix index c4d7d4e2cea9..58dea5bab480 100644 --- a/pkgs/development/php-packages/relay/default.nix +++ b/pkgs/development/php-packages/relay/default.nix @@ -15,36 +15,36 @@ }: let - version = "0.10.1"; + version = "0.11.0"; hashes = { "aarch64-darwin" = { platform = "darwin-arm64"; hash = { - "8.1" = "sha256-0p24kOzj4l0wBPzmjAzTv1a0EUa4In1pjWHhNhrmsyM="; - "8.2" = "sha256-mgRjWEmtCFg7711RgC2lpSDs5cCcs+ZPqks/uj1mAJo="; - "8.3" = "16nESEzMRDIiVfwjXsGhJsK9UG5UKgfSunHPeyNnyz0="; - "8.4" = "sha256-g8H4vRb1XTnFQo2Db1qvzsENqPYg89/0HSxsW2tDLQQ="; - "8.5" = "6NAzMBqBV0BUI4/KlIbnyz0kcD/hucO4tzbuwPSptig="; + "8.1" = "sha256-/yaUulwiT+y7WZHPTdOWUgMsOnSwGrzMeVuT5W0XFsY="; + "8.2" = "sha256-AFisp5/LsCoVjHQ8VA9d4vUDPutYi26PzsPVton0Gjw="; + "8.3" = "dAJKUU5NED6QHFNrgRTLshkdT6ZtlRlcZh10rGQTON0="; + "8.4" = "sha256-cx2IcRRfD6PyQzZJaWgS4d5Mf70w0uJAwl9hTkr6cDo="; + "8.5" = "8ZfP++7jKcHdm89P+LOQj+ZsXbp2E3b3yuTQx6bOkmE="; }; }; "aarch64-linux" = { platform = "debian-aarch64+libssl3"; hash = { - "8.1" = "sha256-E6GDFgRgm5I1acqLYFs9kw3TAuHq5aq7TatLnPHJseA="; - "8.2" = "sha256-59Un0hAidN/Diu9utUnOgMIdt5ZtOcBFtWrLdHkdME4="; - "8.3" = "sha256-ssqZ85KrQG69fZ39RKceEJPXyGfxxLPI21tnPXtPZDE="; - "8.4" = "JhFUplu9zMgXX2k2RArWWf0pFweAV+1+/T3yUwblJ2A="; - "8.5" = "Ii2bsG4AMMwAKopyOz/qX1RxMaGcstO8kYgup8Vb50w="; + "8.1" = "sha256-VYIWr0PyEzP3HHpnLI1X8NC48Oz9VWi1D70y7xT0WMw="; + "8.2" = "sha256-wF4BiiSRro0R6OUpintAas6WSFuyWiUSVc4yHjBkFRo="; + "8.3" = "sha256-LvIaYShHy4S7McpRX4EoWXpfNSkg2TV587IGbLaeMfg="; + "8.4" = "56Yzuu4JWwnKPabxU0stuLjz3N4AHeRuHeLc8OsdfxU="; + "8.5" = "lcSpj+VgT0soIzN0NX3S9JDO/gHSugKfRL5C3oLvg2w="; }; }; "x86_64-linux" = { platform = "debian-x86-64+libssl3"; hash = { - "8.1" = "sha256-MmRAfRDcG1qV8FrZmhME3UtmXe7Mapk2vSrtE/fQRcE="; - "8.2" = "sha256-2ZRxJJhQaIkWQJX7bdti6+UFk7zY9yCJ9KWTtE3uGAE="; - "8.3" = "sha256-QlUk6q5LQuhWbuqWgb8/JdRfO8V+M6GcTu7rjRqJeiI="; - "8.4" = "V+tl7jTrq8PWEAXXu9IsqIlFiQcZBtMBDTlltWSO9CI="; - "8.5" = "w4Ba1Oh4JDsuZc5nrYH8lITP6Gk4/0i1wwOHmr4BO44="; + "8.1" = "sha256-0gdkrhG/YSl6tjhrQnpIxC6YQj+NJqte6UNDdPv5YvE="; + "8.2" = "sha256-8vQ3Le3ssgb0jTxY2vUmriAHSFJXFlZxcYHcTHFkXDc="; + "8.3" = "sha256-VqtIugl5LZgc/VB7lmXewV3SxagD9l2C966W24sz3Qo="; + "8.4" = "3LjLX+zSjsCmnSWq2xD6wfnHf1dCY/Dl5CXJ3A8DY6Y="; + "8.5" = "TaJQcmxs7baH1pMnSvAoZqPaTiSujFQu1VBTB6h3fA0="; }; }; }; From 1daafc52a341082b4daa7b452afa7e36c8cc7074 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jun 2025 02:32:30 +0000 Subject: [PATCH 55/65] thunderbird-128-unwrapped: 128.11.0esr -> 128.11.1esr --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index becb2c0c6981..95577143cb10 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -106,8 +106,8 @@ rec { thunderbird-128 = common { applicationName = "Thunderbird ESR"; - version = "128.11.0esr"; - sha512 = "33de73db2d5ab5152ff11c1947317081259f4e7644631b5e6b9c3b192b4473a5ae6fe897b27b3c8e240ff8c606ffaa8cc14e169c34a94b8de6e64b0c5f0f6810"; + version = "128.11.1esr"; + sha512 = "8fd99f68895b543bdc5bba38d7720f0e48e2a82c9fe5e8ca15534e3918cc40b5b2911666dbbbda0a7911783a03a0d8f7371ea353fd67416baca1e1dffdd25c44"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-128"; From f723d1207ede4fb94b70cec496bf1be39e5f62eb Mon Sep 17 00:00:00 2001 From: Max Guppy Date: Thu, 19 Jun 2025 15:12:22 +1000 Subject: [PATCH 56/65] annotation-mono: init at 0.2 --- pkgs/by-name/an/annotation-mono/package.nix | 33 +++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/an/annotation-mono/package.nix diff --git a/pkgs/by-name/an/annotation-mono/package.nix b/pkgs/by-name/an/annotation-mono/package.nix new file mode 100644 index 000000000000..23cb7cd7211c --- /dev/null +++ b/pkgs/by-name/an/annotation-mono/package.nix @@ -0,0 +1,33 @@ +{ + lib, + stdenvNoCC, + fetchzip, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "annotation-mono"; + version = "0.2"; + + src = fetchzip { + url = "https://github.com/qwerasd205/AnnotationMono/releases/download/v${finalAttrs.version}/AnnotationMono_v${finalAttrs.version}.zip"; + hash = "sha256-81BcPYE4C9kuetiCzgGPl59WO4QkBML7dwAkD1DCCZo="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/truetype $src/dist/ttf/*.ttf + install -D -m444 -t $out/share/fonts/truetype $src/dist/variable/AnnotationMono-VF.ttf + install -D -m444 -t $out/share/fonts/opentype $src/dist/otf/*.otf + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/qwerasd205/AnnotationMono"; + description = "Lovingly crafted handwriting-style monospace font"; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.theonlymrcat ]; + }; +}) From 83a5712b72c20e5b72b0aa05e5334051aae6687a Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Tue, 17 Jun 2025 20:28:32 +0530 Subject: [PATCH 57/65] nixos/cosmic: add helper function to check for excluded package --- nixos/modules/services/desktop-managers/cosmic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/desktop-managers/cosmic.nix b/nixos/modules/services/desktop-managers/cosmic.nix index 58e4a10177be..99aa66bbf98c 100644 --- a/nixos/modules/services/desktop-managers/cosmic.nix +++ b/nixos/modules/services/desktop-managers/cosmic.nix @@ -13,6 +13,7 @@ let cfg = config.services.desktopManager.cosmic; + notExcluded = pkg: utils.disablePackageByName pkg config.environment.cosmic.excludePackages; excludedCorePkgs = lib.lists.intersectLists corePkgs config.environment.cosmic.excludePackages; # **ONLY ADD PACKAGES WITHOUT WHICH COSMIC CRASHES, NOTHING ELSE** corePkgs = From 4b3f38fb7708baf252e36ffec39d283ecd260be1 Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Thu, 19 Jun 2025 12:11:26 +0530 Subject: [PATCH 58/65] nixos/cosmic: add orca (screen reader) support --- nixos/modules/services/desktop-managers/cosmic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/desktop-managers/cosmic.nix b/nixos/modules/services/desktop-managers/cosmic.nix index 99aa66bbf98c..52cb480a7248 100644 --- a/nixos/modules/services/desktop-managers/cosmic.nix +++ b/nixos/modules/services/desktop-managers/cosmic.nix @@ -163,6 +163,7 @@ in services.avahi.enable = lib.mkDefault true; services.gnome.gnome-keyring.enable = lib.mkDefault true; services.gvfs.enable = lib.mkDefault true; + services.orca.enable = lib.mkDefault (notExcluded pkgs.orca); services.power-profiles-daemon.enable = lib.mkDefault ( !config.hardware.system76.power-daemon.enable ); From aa8481ac52cf22ac0a77bd34c27a24d32497686e Mon Sep 17 00:00:00 2001 From: loner <2788892716@qq.com> Date: Mon, 16 Jun 2025 12:49:32 +0800 Subject: [PATCH 59/65] kapitano: init at 1.1.2 --- pkgs/by-name/ka/kapitano/package.nix | 75 ++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 pkgs/by-name/ka/kapitano/package.nix diff --git a/pkgs/by-name/ka/kapitano/package.nix b/pkgs/by-name/ka/kapitano/package.nix new file mode 100644 index 000000000000..a44ecf34a681 --- /dev/null +++ b/pkgs/by-name/ka/kapitano/package.nix @@ -0,0 +1,75 @@ +{ + lib, + fetchFromGitea, + meson, + ninja, + pkg-config, + glib, + gtk4, + libadwaita, + python3Packages, + clamav, + appstream-glib, + desktop-file-utils, + libxml2, + gobject-introspection, + wrapGAppsHook4, + librsvg, +}: +python3Packages.buildPythonApplication rec { + pname = "kapitano"; + version = "1.1.2"; + pyproject = false; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "zynequ"; + repo = "Kapitano"; + tag = version; + hash = "sha256-914M0VRyuzDiITUT5sjt9vNaqshn4skz/FWWMxgPTdc="; + fetchLFS = true; + }; + + nativeBuildInputs = [ + meson + ninja + desktop-file-utils + libxml2 + pkg-config + appstream-glib + wrapGAppsHook4 + gobject-introspection + ]; + + buildInputs = [ + glib + gtk4 + libadwaita + librsvg + ]; + + dependencies = with python3Packages; [ pygobject3 ]; + + postPatch = '' + substituteInPlace src/config/paths_config.py \ + --replace-fail 'USER_DATA_DIR = GLib.get_user_data_dir()' 'USER_DATA_DIR = os.path.join(GLib.get_user_data_dir(), "kapitano"); os.makedirs(USER_DATA_DIR, exist_ok=True)' + ''; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + ''${gappsWrapperArgs[@]} + --prefix PATH : "${lib.makeBinPath [ clamav ]}" + ) + ''; + + meta = { + description = "Modern ClamAV front-end that uses gtk4/libadwaita"; + homepage = "https://codeberg.org/zynequ/Kapitano"; + mainProgram = "kapitano"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ lonerOrz ]; + }; +} From b097a16254b32599d1ad69d4ac6703b65603a30c Mon Sep 17 00:00:00 2001 From: powwu Date: Mon, 26 May 2025 14:08:06 -0700 Subject: [PATCH 60/65] crc64fast-nvme: init at 1.2.0 Co-authored-by: Aleksana --- pkgs/by-name/cr/crc64fast-nvme/Cargo.lock | 1063 ++++++++++++++++++++ pkgs/by-name/cr/crc64fast-nvme/package.nix | 40 + 2 files changed, 1103 insertions(+) create mode 100644 pkgs/by-name/cr/crc64fast-nvme/Cargo.lock create mode 100644 pkgs/by-name/cr/crc64fast-nvme/package.nix diff --git a/pkgs/by-name/cr/crc64fast-nvme/Cargo.lock b/pkgs/by-name/cr/crc64fast-nvme/Cargo.lock new file mode 100644 index 000000000000..945edce8b524 --- /dev/null +++ b/pkgs/by-name/cr/crc64fast-nvme/Cargo.lock @@ -0,0 +1,1063 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anstream" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" + +[[package]] +name = "anstyle-parse" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6680de5231bd6ee4c6191b8a1325daa282b415391ec9d3a37bd34f2060dc73fa" +dependencies = [ + "anstyle", + "once_cell_polyfill", + "windows-sys", +] + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "bit-set" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" + +[[package]] +name = "bitflags" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" + +[[package]] +name = "bumpalo" +version = "3.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cbindgen" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fce8dd7fcfcbf3a0a87d8f515194b49d6135acab73e18bd380d1d93bb1a15eb" +dependencies = [ + "clap", + "heck", + "indexmap", + "log", + "proc-macro2", + "quote", + "serde", + "serde_json", + "syn", + "tempfile", + "toml", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "clap" +version = "4.5.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.5.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_lex" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" + +[[package]] +name = "colorchoice" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" + +[[package]] +name = "crc" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc64fast-nvme" +version = "1.2.0" +dependencies = [ + "cbindgen", + "crc", + "criterion", + "lazy_static", + "proptest", + "rand", +] + +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "is-terminal", + "itertools", + "num-traits", + "once_cell", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + +[[package]] +name = "crunchy" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" + +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + +[[package]] +name = "equivalent" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" + +[[package]] +name = "errno" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "getrandom" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", +] + +[[package]] +name = "half" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08" + +[[package]] +name = "indexmap" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "is-terminal" +version = "0.4.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys", +] + +[[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.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "js-sys" +version = "0.3.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.172" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" + +[[package]] +name = "linux-raw-sys" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" + +[[package]] +name = "log" +version = "0.4.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "once_cell_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" + +[[package]] +name = "oorandom" +version = "11.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e" + +[[package]] +name = "plotters" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" + +[[package]] +name = "plotters-svg" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" +dependencies = [ + "plotters-backend", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "proc-macro2" +version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proptest" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50" +dependencies = [ + "bit-set", + "bit-vec", + "bitflags", + "lazy_static", + "num-traits", + "rand", + "rand_chacha", + "rand_xorshift", + "regex-syntax", + "rusty-fork", + "tempfile", + "unarray", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r-efi" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.16", +] + +[[package]] +name = "rand_xorshift" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "rustix" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" +dependencies = [ + "bitflags", + "errno", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "rustversion" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" + +[[package]] +name = "rusty-fork" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" +dependencies = [ + "fnv", + "quick-error", + "tempfile", + "wait-timeout", +] + +[[package]] +name = "ryu" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "serde" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +dependencies = [ + "serde", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "2.0.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" +dependencies = [ + "fastrand", + "getrandom 0.3.3", + "once_cell", + "rustix", + "windows-sys", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "toml" +version = "0.8.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "toml_write", + "winnow", +] + +[[package]] +name = "toml_write" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076" + +[[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" + +[[package]] +name = "unicode-ident" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "wait-timeout" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11" +dependencies = [ + "libc", +] + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasi" +version = "0.14.2+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +dependencies = [ + "bumpalo", + "log", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "web-sys" +version = "0.3.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +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" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec" +dependencies = [ + "memchr", +] + +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags", +] + +[[package]] +name = "zerocopy" +version = "0.8.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/pkgs/by-name/cr/crc64fast-nvme/package.nix b/pkgs/by-name/cr/crc64fast-nvme/package.nix new file mode 100644 index 000000000000..32661b4c8b10 --- /dev/null +++ b/pkgs/by-name/cr/crc64fast-nvme/package.nix @@ -0,0 +1,40 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "crc64fast-nvme"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "awesomized"; + repo = "crc64fast-nvme"; + tag = finalAttrs.version; + hash = "sha256-BEFdVspQU2exj6ndULCs0TfH7aIx/NvfUkTSL32bIPk="; + }; + + postPatch = '' + cp -L ${./Cargo.lock} Cargo.lock + ''; + + cargoLock = { + lockFile = ./Cargo.lock; + }; + + postInstall = '' + mv $out/bin/build_table $out/bin/pclmulqdq_build_table + install -Dm644 crc64fast_nvme.h -t $out/include/ + ''; + + meta = { + description = "SIMD accelerated carryless-multiplication CRC-64/NVME checksum computation (based on Intel's PCLMULQDQ paper)"; + homepage = "https://github.com/awesomized/crc64fast-nvme"; + mainProgram = "crc_64_nvme_checksum"; + license = with lib.licenses; [ + asl20 + mit + ]; + maintainers = with lib.maintainers; [ powwu ]; + }; +}) From c0b96fce53b6d93ec90e01e3df927941a6f02fd7 Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Fri, 20 Jun 2025 13:25:56 +0900 Subject: [PATCH 61/65] ocamlPackages.directories: 0.5 -> 0.6 (#414677) * ocamlPackages.directories: 0.5 -> 0.6 Changelog: https://github.com/OCamlPro/directories/releases/tag/0.6 Diff: https://github.com/OCamlPro/directories/compare/0.5...0.6 * ocamlPackages.directories: modernized derivation - Rename: ocamlpro -> OCamlPro - Added: meta.changelog - Change: rev -> tag and sha256 -> hash - Fix: minimalOCamlVersion --- .../ocaml-modules/directories/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/directories/default.nix b/pkgs/development/ocaml-modules/directories/default.nix index e90a1ce19222..158c890aec42 100644 --- a/pkgs/development/ocaml-modules/directories/default.nix +++ b/pkgs/development/ocaml-modules/directories/default.nix @@ -2,24 +2,28 @@ lib, fetchFromGitHub, buildDunePackage, + fpath, }: buildDunePackage rec { pname = "directories"; - version = "0.5"; - useDune2 = true; + version = "0.6"; - minimalOCamlVersion = "4.07"; + minimalOCamlVersion = "4.14"; src = fetchFromGitHub { - owner = "ocamlpro"; + owner = "OCamlPro"; repo = pname; - rev = version; - sha256 = "sha256-31CGhmmfOORJ1ewgp+IU+p1+f2kfX/W+lxK7EGU62vc="; + tag = version; + hash = "sha256-c/9ChiSODD1K7YsMj65tjErAwXeWvEQ8BkAcUvsr19c="; }; + propagatedBuildInputs = [ + fpath + ]; + meta = { - homepage = "https://github.com/ocamlpro/directories"; + homepage = "https://github.com/OCamlPro/directories"; description = "OCaml library that provides configuration, cache and data paths (and more!) following the suitable conventions on Linux, macOS and Windows"; longDescription = '' directories is an OCaml library that provides configuration, cache and @@ -31,6 +35,7 @@ buildDunePackage rec { xdg-user-dirs on Linux, Known Folders on Windows, Standard Directories on macOS. ''; + changelog = "https://raw.githubusercontent.com/OCamlPro/directories/refs/tags/${src.tag}/CHANGES.md"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ bcc32 ]; }; From 23328d1c2378b99b1a82b8a6c5e84d640904e0aa Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 13 Jun 2025 08:04:46 +0200 Subject: [PATCH 62/65] ocamlPackages.janeStreet_0_15: remove --- pkgs/top-level/ocaml-packages.nix | 74 ------------------------------- 1 file changed, 74 deletions(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 0233f6df225a..a3f1cae76728 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -918,80 +918,6 @@ let import ../development/ocaml-modules/janestreet { }; - janeStreet_0_15 = - (lib.makeScope self.newScope ( - self': with self'; { - - # ocamlPackages that janestreet v0.15 packages depend on. - jsDeps = - let - uri-sexp = self.uri-sexp.override { inherit (self') ppx_sexp_conv sexplib0; }; - cohttp = self.cohttp.override { - inherit (self') ppx_sexp_conv; - inherit uri-sexp; - }; - ipaddr-sexp = self.ipaddr-sexp.override { inherit (self') ppx_sexp_conv; }; - conduit = self.conduit.override { - inherit (self') ppx_sexp_conv sexplib; - inherit ipaddr-sexp; - }; - conduit-async = self.conduit-async.override { - inherit (self') - async - ppx_sexp_conv - ppx_here - core - sexplib - async_ssl - ; - inherit conduit ipaddr-sexp; - }; - in - { - inherit (self) - dune-configurator - alcotest - re - num - octavius - uutf - ounit - ctypes - ctypes-foreign - ; - ppxlib = self.ppxlib.override { inherit (self') stdio; }; - cohttp-async = self.cohttp-async.override { - inherit (self') - ppx_sexp_conv - base - async - async_kernel - async_unix - core_unix - sexplib0 - core - ; - inherit uri-sexp cohttp conduit-async; - }; - janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage_0_15.nix { }; - }; - - janeStreet = import ../development/ocaml-modules/janestreet/0.15.nix { - self = self' // jsDeps; - inherit ocaml; - inherit (pkgs) - bash - fetchpatch - fzf - lib - openssl - zstd - ; - }; - } - )).overrideScope - liftJaneStreet; - javalib = callPackage ../development/ocaml-modules/javalib { }; jingoo = callPackage ../development/ocaml-modules/jingoo { }; From 97734f4a9a1197e829a7a99402b76141ed642ecf Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 19 Jun 2025 12:44:29 -0700 Subject: [PATCH 63/65] collectd: fix build and modernize derivation slightly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. I experienced intermittent connection failures to and I suspect it's hosted on hobbyist equipment. This made the `src` derivation flaky, so I switched to the upstream GitHub repository. It seems better to use the actual source instead of a prepared tarball from the release process anyway. 2. When building out of the source instead of the release tarball, we need to run Bison and Flex to generate the parser and lexer, and we need Perl for `pod2man`. 3. As the [build error on Hydra](https://hydra.nixos.org/build/300269816) notes, `src/virt.c` makes use of some token `ATTRIBUTE_UNUSED` but it's not defined anywhere. Define it. 4. Switch all hashes to use the SRI style. 5. Switch to `finalAttrs` fixpoint style for better overriding. 6. Reduce the scope of `with lib;` in the `meta` section. Bit of a smörgåsbord but not too bad. --- pkgs/tools/system/collectd/default.nix | 40 +++++++++++++++++--------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 90645a045a49..bfa1f33c3314 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -1,33 +1,40 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, fetchpatch, callPackage, autoreconfHook, pkg-config, libtool, + bison, + flex, + perl, nixosTests, ... }@args: let plugins = callPackage ./plugins.nix args; in -stdenv.mkDerivation rec { - version = "5.12.0"; +stdenv.mkDerivation (finalAttrs: { pname = "collectd"; + version = "5.12.0"; - src = fetchurl { - url = "https://collectd.org/files/${pname}-${version}.tar.bz2"; - sha256 = "1mh97afgq6qgmpvpr84zngh58m0sl1b4wimqgvvk376188q09bjv"; + src = fetchFromGitHub { + owner = "collectd"; + repo = "collectd"; + tag = "collectd-${finalAttrs.version}"; + hash = "sha256-UTlCY1GPRpbdQFLFUDjNr1PgEdGv4WNtjr8TYbxHK5A="; }; + # All of these are going to be included in the next release patches = [ # fix -t never printing syntax errors # should be included in next release (fetchpatch { + name = "fix-broken-dash-t-option.patch"; url = "https://github.com/collectd/collectd/commit/3f575419e7ccb37a3b10ecc82adb2e83ff2826e1.patch"; - sha256 = "0jwjdlfl0dp7mlbwygp6h0rsbaqfbgfm5z07lr5l26z6hhng2h2y"; + hash = "sha256-XkDxLITmG0FLpgf8Ut1bDqulM4DmPs8Xrec2QB1tkks="; }) (fetchpatch { name = "no_include_longintrepr.patch"; @@ -39,7 +46,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook + bison + flex + perl # for pod2man ]; + buildInputs = [ libtool ] ++ plugins.buildInputs; @@ -52,9 +63,12 @@ stdenv.mkDerivation rec { ++ plugins.configureFlags ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "--with-fp-layout=nothing" ]; + # Used in `src/virt.c` + env.NIX_CFLAGS_COMPILE = "-DATTRIBUTE_UNUSED=__attribute__((unused))"; + # do not create directories in /var during installPhase postConfigure = '' - substituteInPlace Makefile --replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/' '#' + substituteInPlace Makefile --replace-fail '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/' '#' ''; postInstall = '' @@ -69,11 +83,11 @@ stdenv.mkDerivation rec { inherit (nixosTests) collectd; }; - meta = with lib; { + meta = { description = "Daemon which collects system performance statistics periodically"; homepage = "https://collectd.org"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ bjornfor ]; }; -} +}) From 16252c01f03973b5b9c94daccd040205e70c58be Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 19 Jun 2025 13:35:34 -0700 Subject: [PATCH 64/65] libcollectdclient: fix build I unified the `meta` field from `collectd` here too. --- pkgs/by-name/li/libcollectdclient/package.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/li/libcollectdclient/package.nix b/pkgs/by-name/li/libcollectdclient/package.nix index b9247629c574..0d0dac4367b1 100644 --- a/pkgs/by-name/li/libcollectdclient/package.nix +++ b/pkgs/by-name/li/libcollectdclient/package.nix @@ -1,24 +1,26 @@ { lib, collectd }: -collectd.overrideAttrs (oldAttrs: { +collectd.overrideAttrs (prevAttrs: { pname = "libcollectdclient"; + buildInputs = [ ]; - configureFlags = (oldAttrs.configureFlags or [ ]) ++ [ + configureFlags = (prevAttrs.configureFlags or [ ]) ++ [ + "--with-perl-bindings=no" "--disable-daemon" "--disable-all-plugins" ]; postInstall = "rm -rf $out/{bin,etc,sbin,share}"; - meta = with lib; { + meta = { description = "C Library for collectd, a daemon which collects system performance statistics periodically"; - homepage = "http://collectd.org"; - license = licenses.gpl2; - platforms = platforms.linux; # TODO: collectd may be linux but the C client may be more portable? - maintainers = [ - maintainers.sheenobu - maintainers.bjornfor + homepage = "https://collectd.org"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + sheenobu + bjornfor ]; }; }) From 451f48f244841d744c1cdc3b1ce6002eaa08fbc0 Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Fri, 20 Jun 2025 14:08:47 +0900 Subject: [PATCH 65/65] ocamlPackages.eigen: 0.2.0 -> 0.3.3 (#414921) * ocamlPackages.eigen: 0.2.0 -> 0.3.3 Diff: https://github.com/owlbarn/eigen/compare/0.2.0...0.3.3 Changelog: https://github.com/owlbarn/eigen/releases/tag/0.3.3 * ocamlPackages.eigen: modernized derivation - Removed with lib; - Changed rev to tag and sha256 to hash --- .../ocaml-modules/eigen/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/eigen/default.nix b/pkgs/development/ocaml-modules/eigen/default.nix index 73fd08fa6981..b861f555fca2 100644 --- a/pkgs/development/ocaml-modules/eigen/default.nix +++ b/pkgs/development/ocaml-modules/eigen/default.nix @@ -4,19 +4,18 @@ buildDunePackage, fetchFromGitHub, ctypes, + dune-configurator, }: buildDunePackage rec { pname = "eigen"; - version = "0.2.0"; - - useDune2 = true; + version = "0.3.3"; src = fetchFromGitHub { owner = "owlbarn"; repo = pname; - rev = version; - sha256 = "1zaw03as14hyvfpyj6bjrfbcxp2ljdbqcqqgm53kms244mig425f"; + tag = version; + hash = "sha256-8V4DQ+b2rzy58NTenK1BsJEJiJKYV6hIp2fJWqczHRY="; }; minimalOCamlVersion = "4.02"; @@ -25,11 +24,13 @@ buildDunePackage rec { propagatedBuildInputs = [ ctypes ]; - meta = with lib; { + buildInputs = [ dune-configurator ]; + + meta = { inherit (src.meta) homepage; description = "Minimal/incomplete Ocaml interface to Eigen3, mostly for Owl"; - platforms = platforms.x86_64; - maintainers = [ maintainers.bcdarwin ]; - license = licenses.mit; + platforms = lib.platforms.x86_64; + maintainers = with lib.maintainers; [ bcdarwin ]; + license = lib.licenses.mit; }; }