From 44d7f66c40c3315b72a49e8e13d0861433218e3b Mon Sep 17 00:00:00 2001 From: "Bryan T. Richardson" Date: Mon, 25 Mar 2024 21:28:46 -0600 Subject: [PATCH 01/98] citrix_workspace: preload pcsclite lib Fixes issue where Citrix Workspace client cannot load libpcsclite.so. --- .../applications/networking/remote/citrix-workspace/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index f751f3237e41..2dd92d7cc578 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -150,7 +150,7 @@ stdenv.mkDerivation rec { ${lib.optionalString (icaFlag program != null) ''--add-flags "${icaFlag program} $ICAInstDir"''} \ --set ICAROOT "$ICAInstDir" \ --prefix LD_LIBRARY_PATH : "$ICAInstDir:$ICAInstDir/lib" \ - --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set LD_PRELOAD "${libredirect}/lib/libredirect.so ${lib.getLib pcsclite}/lib/libpcsclite.so" \ --set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone" ''; wrapLink = program: '' From 42bf0cb6860f0753f292484d54c7f8a6c2d2ebce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Thu, 18 Apr 2024 11:32:32 +1000 Subject: [PATCH 02/98] fcrackzip: fix clang/darwin build --- pkgs/tools/security/fcrackzip/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/fcrackzip/default.nix b/pkgs/tools/security/fcrackzip/default.nix index 31d0b44fb710..ad5c9e971121 100644 --- a/pkgs/tools/security/fcrackzip/default.nix +++ b/pkgs/tools/security/fcrackzip/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0l1qsk949vnz18k4vjf3ppq8p497966x4c7f2yx18x8pk35whn2a"; }; + CFLAGS = "-std=gnu89"; + # 'fcrackzip --use-unzip' cannot deal with file names containing a single quote # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=430387 patches = [ ./fcrackzip_forkexec.patch ]; From 7612072e80f4f4e082e18e982a734fd4c713acde Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 May 2024 21:03:22 +0000 Subject: [PATCH 03/98] python311Packages.icoextract: 0.1.4 -> 0.1.5 --- pkgs/development/python-modules/icoextract/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/icoextract/default.nix b/pkgs/development/python-modules/icoextract/default.nix index beb39a32aa39..1ee5e5bb582f 100644 --- a/pkgs/development/python-modules/icoextract/default.nix +++ b/pkgs/development/python-modules/icoextract/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "icoextract"; - version = "0.1.4"; + version = "0.1.5"; format = "setuptools"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-x0GEV0PUbkAzoUJgAqup9bHd7iYttGyzIZNdo8KsFyo="; + hash = "sha256-/UxnWNyRNtwI4Rxx97i5QyjeMrUr5Sq+TfLTmU0xWyc="; }; propagatedBuildInputs = [ From 51cd84ba57e5acde737d71919b1728fb309b1296 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 29 Apr 2024 01:41:45 +0200 Subject: [PATCH 04/98] pkgs/README.md: add `meta.mainProgram` to new-package checklist template The document already states that `meta.mainProgram` is mandatory for new packages, this change adds it to the template list of checks during review. --- pkgs/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/README.md b/pkgs/README.md index 5439ad913d18..fd958702fb49 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -748,6 +748,7 @@ Review process: - License must match the upstream license. - Platforms should be set (or the package will not get binary substitutes). - Maintainers must be set. This can be the package submitter or a community member that accepts taking up maintainership of the package. + - The `meta.mainProgram` must be set if a main executable exists. - Report detected typos. - Ensure the package source: - Uses `mirror://` URLs when available. @@ -769,6 +770,7 @@ Sample template for a new package review is provided below. - [ ] `meta.license` fits upstream license - [ ] `meta.platforms` is set - [ ] `meta.maintainers` is set +- [ ] `meta.mainProgram` is set, if applicable. - [ ] build time only dependencies are declared in `nativeBuildInputs` - [ ] source is fetched using the appropriate function - [ ] the list of `phases` is not overridden From 96f889a809190995d45b647200e2e513d93a1aaa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 01:45:10 +0200 Subject: [PATCH 05/98] python311Packages.icoextract: add changelog to meta --- pkgs/development/python-modules/icoextract/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/icoextract/default.nix b/pkgs/development/python-modules/icoextract/default.nix index 1ee5e5bb582f..a676dcd3f0c5 100644 --- a/pkgs/development/python-modules/icoextract/default.nix +++ b/pkgs/development/python-modules/icoextract/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Extract icons from Windows PE files"; homepage = "https://github.com/jlu5/icoextract"; + changelog = "https://github.com/jlu5/icoextract/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ bryanasdev000 donovanglover ]; }; From 8873c2554ee6e6d76396dc0b5d56bcaf37ec4c06 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 01:47:37 +0200 Subject: [PATCH 06/98] python311Packages.icoextract: refactor --- .../python-modules/icoextract/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/icoextract/default.nix b/pkgs/development/python-modules/icoextract/default.nix index a676dcd3f0c5..45991fa8a928 100644 --- a/pkgs/development/python-modules/icoextract/default.nix +++ b/pkgs/development/python-modules/icoextract/default.nix @@ -1,9 +1,18 @@ -{ lib, buildPythonPackage, fetchPypi, pefile, pillow}: +{ lib +, buildPythonPackage +, fetchPypi +, pefile +, pillow +, pythonOlder +, setuptools +}: buildPythonPackage rec { pname = "icoextract"; version = "0.1.5"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; @@ -11,7 +20,11 @@ buildPythonPackage rec { hash = "sha256-/UxnWNyRNtwI4Rxx97i5QyjeMrUr5Sq+TfLTmU0xWyc="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ pefile pillow ]; From 1b897f8741fc1de25a0e25f95ca2c5f0c7785dbd Mon Sep 17 00:00:00 2001 From: ok-nick Date: Tue, 7 May 2024 21:59:36 -0400 Subject: [PATCH 07/98] c2patool: 0.8.2 -> 0.9.0 --- pkgs/by-name/c2/c2patool/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix index d715a062568a..a334b857acc5 100644 --- a/pkgs/by-name/c2/c2patool/package.nix +++ b/pkgs/by-name/c2/c2patool/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "c2patool"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "contentauth"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fVH7itpVPg0vkgKSWa9x61yttLx73gTeLT5+R4aSOFE="; + sha256 = "sha256-yR6VepMZquURDb2SDwx+xE55jo3MTzh6ntSrQln1Xxs="; }; - cargoHash = "sha256-oNNfQIwl7QprrlpIZrTYVGp/UMWANVr3b3ALFKupyy8="; + cargoHash = "sha256-Z4Q/33CwbJXlMZBq4WRT2k78PvaHpNm4pQkiAehCImI="; # use the non-vendored openssl OPENSSL_NO_VENDOR = 1; From 822aa259b4f927d4cc9602c52c0d96ea144e4f0a Mon Sep 17 00:00:00 2001 From: XBagon Date: Sat, 4 May 2024 19:04:28 +0200 Subject: [PATCH 08/98] maintainers: add XBagon maintainers: add email to XBagon --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ff48ec64b1ed..2b2bdec82f10 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21908,6 +21908,12 @@ githubId = 474343; name = "Xavier Zwirtz"; }; + XBagon = { + name = "XBagon"; + email = "xbagon@outlook.de"; + github = "XBagon"; + githubId = 1523292; + }; xbreak = { email = "xbreak@alphaware.se"; github = "xbreak"; From 615655491933397553976b7ac92c74d019c56b40 Mon Sep 17 00:00:00 2001 From: XBagon Date: Sat, 4 May 2024 19:11:19 +0200 Subject: [PATCH 09/98] gate: init at 0.36.7 gate: adjust according to suggestions gate: shorten description and add longDescription gate: converted longDescription into multi-line string --- pkgs/by-name/ga/gate/package.nix | 37 ++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/ga/gate/package.nix diff --git a/pkgs/by-name/ga/gate/package.nix b/pkgs/by-name/ga/gate/package.nix new file mode 100644 index 000000000000..454af42d9bae --- /dev/null +++ b/pkgs/by-name/ga/gate/package.nix @@ -0,0 +1,37 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +let + pname = "gate"; + version = "0.36.7"; +in +buildGoModule { + inherit pname version; + + src = fetchFromGitHub { + owner = "minekube"; + repo = "gate"; + rev = "refs/tags/v${version}"; + hash = "sha256-WHxpx20O/HuCWqbY4zTxcjyIhW3+FQtTz5sUGAda71g="; + }; + + vendorHash = "sha256-dswNJQWqN+u/mnpbj9se2j9uEi0ewNTXVlN3WnNbcyg="; + + ldflags = [ "-s" "-w" ]; + + meta = { + description = "High-Performance, Low-Memory, Lightweight, Extensible Minecraft Reverse Proxy"; + longDescription = '' + Gate is an extensible, high performant & paralleled Minecraft proxy server + with scalability, flexibility & excellent server version support - written in Go + and ready for the cloud! + ''; + homepage = "https://github.com/minekube/gate"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ XBagon ]; + mainProgram = "gate"; + }; +} + From 1d3356ec27a9e02afd25346ae1a55622702c95c5 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 14 May 2024 11:49:24 -0300 Subject: [PATCH 10/98] k3s: k3s_1_29 -> k3s_1_30 Bump k3s (latest) alias from k3s_1_29 to k3s_1_30. https://github.com/k3s-io/k3s/releases/tag/v1.30.0%2Bk3s1 https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.30.md#changelog-since-v1290 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70c7e48a82bb..80e30dbdcd33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32073,7 +32073,7 @@ with pkgs; buildGoModule = buildGo122Module; go = go_1_22; }) k3s_1_30; - k3s = k3s_1_29; + k3s = k3s_1_30; k3sup = callPackage ../applications/networking/cluster/k3sup { }; From ec0c76904bd85ffef8291b034c4203c7e69750f5 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Tue, 14 May 2024 23:10:35 +0000 Subject: [PATCH 11/98] ovn: 24.03.1 -> 24.03.2 https://www.ovn.org/en/releases/24.03/ --- pkgs/by-name/ov/ovn/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix index 0fb24a386c70..a4db76f1cce6 100644 --- a/pkgs/by-name/ov/ovn/package.nix +++ b/pkgs/by-name/ov/ovn/package.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "24.03.1"; - hash = "sha256-BvMbNkNtyIl8xrUUvJhWWXiLaAHFjiwcq8P7/CGGtzA="; + version = "24.03.2"; + hash = "sha256-pO37MfmvlSd/bU9cGngFEJLnXtZFTqyz1zcYLvFLrrQ="; } From df8ea8cdc46757188572936caac181bdbc8a6971 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Tue, 14 May 2024 19:14:05 -0400 Subject: [PATCH 12/98] ovn-lts: 22.03.7 -> 24.03.2 update LTS major version https://www.ovn.org/en/releases/24.03/ --- pkgs/by-name/ov/ovn/lts.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ov/ovn/lts.nix b/pkgs/by-name/ov/ovn/lts.nix index 26ec2fe7a573..42ab99ff7cc0 100644 --- a/pkgs/by-name/ov/ovn/lts.nix +++ b/pkgs/by-name/ov/ovn/lts.nix @@ -1,5 +1,5 @@ import ./generic.nix { - version = "22.03.7"; - hash = "sha256-HzVzJN1QnMTlv39I7clzciJD/Owm93jFO4qfaE1k6e4="; - updateScriptArgs = "--lts=true --regex '22.03.*'"; + version = "24.03.2"; + hash = "sha256-pO37MfmvlSd/bU9cGngFEJLnXtZFTqyz1zcYLvFLrrQ="; + updateScriptArgs = "--lts=true --regex '24.03.*'"; } From 14ec6c7b8628c4c5e4d2fdb70c43f93a0e56bb42 Mon Sep 17 00:00:00 2001 From: Philipp Joram Date: Wed, 15 May 2024 17:53:18 +0300 Subject: [PATCH 13/98] haskellPackages.cornelis: Add malo and phijor as maintainers --- .../haskell-modules/configuration-hackage2nix/main.yaml | 4 ++++ pkgs/development/haskell-modules/hackage-packages.nix | 1 + 2 files changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 2294abaea138..36a457de5fc0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -254,6 +254,8 @@ package-maintainers: - Unique libjared: - sensei + malo: + - cornelis maralorn: - bluefin - cabal-fmt @@ -322,6 +324,8 @@ package-maintainers: - titlecase - xmonad - xmonad-contrib + phijor: + - cornelis poscat: - hinit psibi: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b8e04d8d8650..dddf66298aad 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -75512,6 +75512,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "cornelis"; + maintainers = [ lib.maintainers.malo lib.maintainers.phijor ]; broken = true; }) {}; From 8be493adf288df9878a9c0396ccb0b317003e318 Mon Sep 17 00:00:00 2001 From: Philipp Joram Date: Wed, 15 May 2024 18:02:30 +0300 Subject: [PATCH 14/98] haskellPackages.cornelis: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c07e2faa5596..de346b1aa584 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3093,6 +3093,10 @@ self: super: { # https://github.com/isovector/type-errors/issues/9 type-errors = dontCheck super.type-errors; + # 2024-05-15: Hackage distribution is missing files needed for tests + # https://github.com/isovector/cornelis/issues/150 + cornelis = dontCheck super.cornelis; + cabal-gild = super.cabal-gild.overrideScope (self: super: { tasty = super.tasty_1_5; tasty-quickcheck = super.tasty-quickcheck_0_10_3; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index aaa45de71e21..45c6061f8fd3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1003,7 +1003,6 @@ broken-packages: - core-haskell # failure in job https://hydra.nixos.org/build/233222588 at 2023-09-02 - corenlp-types # failure in job https://hydra.nixos.org/build/243808366 at 2024-01-01 - core-warn # failure in job https://hydra.nixos.org/build/233204404 at 2023-09-02 - - cornelis # failure in job https://hydra.nixos.org/build/259604220 at 2024-05-15 - Coroutine # failure in job https://hydra.nixos.org/build/233211213 at 2023-09-02 - coroutine-object # failure in job https://hydra.nixos.org/build/233220413 at 2023-09-02 - couchdb-conduit # failure in job https://hydra.nixos.org/build/233227244 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index dddf66298aad..561aed3b1017 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -75510,10 +75510,8 @@ self: { vector ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "cornelis"; maintainers = [ lib.maintainers.malo lib.maintainers.phijor ]; - broken = true; }) {}; "coroutine-enumerator" = callPackage From 465ae2d5992534eeac1d90cda289271ab81c97b8 Mon Sep 17 00:00:00 2001 From: Philipp Joram Date: Wed, 10 Apr 2024 15:57:25 +0300 Subject: [PATCH 15/98] cornelis: init at 0.2.0.0 --- pkgs/by-name/co/cornelis/package.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/by-name/co/cornelis/package.nix diff --git a/pkgs/by-name/co/cornelis/package.nix b/pkgs/by-name/co/cornelis/package.nix new file mode 100644 index 000000000000..0ad61b511347 --- /dev/null +++ b/pkgs/by-name/co/cornelis/package.nix @@ -0,0 +1,27 @@ +{ + lib, + haskell, + haskellPackages, + + # Test dependencies + cornelis, + runCommand, +}: +let + inherit (haskell.lib.compose) overrideCabal justStaticExecutables; + overrides = { + description = "agda-mode for Neovim"; + + passthru = { + tests = runCommand "cornelis-tests" { nativeBuildInputs = [ cornelis ]; } '' + cornelis --help > $out + ''; + }; + }; +in +lib.pipe haskellPackages.cornelis [ + (overrideCabal overrides) + + # Reduce closure size + justStaticExecutables +] From 7d40080053f9c235e2128bd5259e9c517536d7f6 Mon Sep 17 00:00:00 2001 From: Philipp Joram Date: Tue, 30 Apr 2024 15:49:48 +0300 Subject: [PATCH 16/98] vimPlugins.cornelis: init at 2024-04-17 --- .../editors/vim/plugins/generated.nix | 12 +++++++ .../editors/vim/plugins/overrides.nix | 13 ++++++++ ...01-Unconditionally-use-global-binary.patch | 31 +++++++++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 4 files changed, 57 insertions(+) create mode 100644 pkgs/applications/editors/vim/plugins/patches/cornelis/0001-Unconditionally-use-global-binary.patch diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 1f59cc3e3541..31e70d7247ad 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2634,6 +2634,18 @@ final: prev: meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; + cornelis = buildVimPlugin { + pname = "cornelis"; + version = "2024-04-17"; + src = fetchFromGitHub { + owner = "isovector"; + repo = "cornelis"; + rev = "c97b4817034a927dcadb22294cf97a88087a935f"; + sha256 = "03wkq7jly9syv7kqsf66hdq8p7fqk6a240azcys9fsak797nbs1a"; + }; + meta.homepage = "https://github.com/isovector/cornelis/"; + }; + cosco-vim = buildVimPlugin { pname = "cosco.vim"; version = "2018-08-07"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index c3711bd412fe..c6425c0a5a9d 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -63,6 +63,8 @@ , # command-t dependencies getconf , ruby +, # cornelis dependencies + cornelis , # cpsm dependencies boost , cmake @@ -462,6 +464,17 @@ patches = [ ./patches/coq_nvim/emulate-venv.patch ]; }; + cornelis = super.cornelis.overrideAttrs { + dependencies = with self; [ vim-textobj-user ]; + opt = with self; [ vim-which-key ]; + # Unconditionally use the cornelis binary provided by the top-level package: + patches = [ ./patches/cornelis/0001-Unconditionally-use-global-binary.patch ]; + postInstall = '' + substituteInPlace $out/ftplugin/agda.vim \ + --subst-var-by CORNELIS "${lib.getBin cornelis}/bin/cornelis" + ''; + }; + cpsm = super.cpsm.overrideAttrs { nativeBuildInputs = [ cmake ]; buildInputs = [ diff --git a/pkgs/applications/editors/vim/plugins/patches/cornelis/0001-Unconditionally-use-global-binary.patch b/pkgs/applications/editors/vim/plugins/patches/cornelis/0001-Unconditionally-use-global-binary.patch new file mode 100644 index 000000000000..67caa386c76c --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/patches/cornelis/0001-Unconditionally-use-global-binary.patch @@ -0,0 +1,31 @@ +From f8e993846551bda77a34a77aad7ad6dcc45b66a7 Mon Sep 17 00:00:00 2001 +From: Philipp Joram +Date: Tue, 16 Apr 2024 12:48:42 +0300 +Subject: [PATCH] Unconditionally use global binary + +--- + ftplugin/agda.vim | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/ftplugin/agda.vim b/ftplugin/agda.vim +index c7dd9d0..6b4aba3 100644 +--- a/ftplugin/agda.vim ++++ b/ftplugin/agda.vim +@@ -11,13 +11,7 @@ if exists("b:cornelis_ftplugin") + endif + let b:cornelis_ftplugin = 1 + +-if exists("g:cornelis_use_global_binary") +- call remote#host#Register('cornelis', '*', rpcstart('cornelis', [])) +-else +- call nvimhs#start(expand(':p:h:h'), 'cornelis', ['-v', 'DEBUG', '-l', '/tmp/cornelis.log']) +-endif +- +-nnoremap :call nvimhs#compileAndRestart('cornelis') ++call remote#host#Register('cornelis', '*', rpcstart('@CORNELIS@', [])) + + runtime agda-input.vim + runtime agda-matchpairs.vim +-- +2.44.0 + diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index acdd809e5438..b9a963e8ab61 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -219,6 +219,7 @@ https://github.com/ms-jpq/coq.artifacts/,HEAD, https://github.com/ms-jpq/coq.thirdparty/,HEAD, https://github.com/jvoorhis/coq.vim/,, https://github.com/ms-jpq/coq_nvim/,, +https://github.com/isovector/cornelis/,HEAD, https://github.com/lfilho/cosco.vim/,, https://github.com/nixprime/cpsm/,, https://github.com/saecki/crates.nvim/,, From 6478f80b178ee2cee3f3a68a126428d715a0cfcf Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Wed, 15 May 2024 17:29:13 +0200 Subject: [PATCH 17/98] nixos/rosenpass: move preStart into script to workaround systemd bug Because of a systemd bug, using both ExecStartPre and ExecStart will fill up the systemd credentials directory, which leads to rosenpass failing to start. This will be fixed in systemd v256, see https://github.com/systemd/systemd/pull/31202 Related issue: https://github.com/NixOS/nixpkgs/issues/258371 --- nixos/modules/services/networking/rosenpass.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/rosenpass.nix b/nixos/modules/services/networking/rosenpass.nix index 373a6c769079..66b6f960a81a 100644 --- a/nixos/modules/services/networking/rosenpass.nix +++ b/nixos/modules/services/networking/rosenpass.nix @@ -225,8 +225,10 @@ in # See environment.CONFIG = "%t/${serviceConfig.RuntimeDirectory}/config.toml"; - preStart = "${getExe pkgs.envsubst} -i ${config} -o \"$CONFIG\""; - script = "rosenpass exchange-config \"$CONFIG\""; + script = '' + ${getExe pkgs.envsubst} -i ${config} -o "$CONFIG" + rosenpass exchange-config "$CONFIG" + ''; }; }; } From daa72d3e4983e92a580de641429dab41d6102dd5 Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Thu, 16 May 2024 18:01:39 +0100 Subject: [PATCH 18/98] age-plugin-fido2-hmac: init at 0.2.3 --- .../ag/age-plugin-fido2-hmac/package.nix | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix diff --git a/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix b/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix new file mode 100644 index 000000000000..209bc1a24728 --- /dev/null +++ b/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix @@ -0,0 +1,35 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, libfido2 +, stdenv +}: + +buildGoModule rec { + pname = "age-plugin-fido2-hmac"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "olastor"; + repo = "age-plugin-fido2-hmac"; + rev = "v${version}"; + hash = "sha256-P2gNOZeuODWEb/puFe6EA1wW3pc0xgM567qe4FKbFXg="; + }; + + vendorHash = "sha256-h4/tyq9oZt41IfRJmmsLHUpJiPJ7YuFu59ccM7jHsFo="; + + ldflags = [ "-s" "-w" ]; + + buildInputs = [ + libfido2 + ]; + + meta = with lib; { + description = "Age plugin to encrypt files with fido2 tokens using the hmac-secret extension and non-discoverable credentials"; + homepage = "https://github.com/olastor/age-plugin-fido2-hmac/"; + license = licenses.mit; + maintainers = with maintainers; [ matthewcroughan ]; + mainProgram = "age-plugin-fido2-hmac"; + broken = stdenv.isDarwin; + }; +} From 1c9bed8a87da2f9b3d48352c764a787a3071c677 Mon Sep 17 00:00:00 2001 From: nzbr Date: Fri, 17 May 2024 21:21:44 +0200 Subject: [PATCH 19/98] nexus: 3.52.0-01 -> 3.68.1-02 --- pkgs/development/tools/repository-managers/nexus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix index 39776ec53288..5f8a751aa0c7 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/development/tools/repository-managers/nexus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nexus"; - version = "3.52.0-01"; + version = "3.68.1-02"; src = fetchurl { url = "https://download.sonatype.com/nexus/3/nexus-${version}-unix.tar.gz"; - hash = "sha256-+Hdmuy7WBtUIjEBZyLgE3a3+L/lANHiy1VRBJ2s686U="; + hash = "sha256-VHS4KDFgU3djteDzDAe43TZIwRG/8bb7u3usoOCJS5M="; }; preferLocalBuild = true; From da4927ffa8771191185eda59d82424939a655e90 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Fri, 17 May 2024 23:08:12 +0200 Subject: [PATCH 20/98] kamailio: fix test src --- pkgs/servers/sip/kamailio/test-kamailio-bin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sip/kamailio/test-kamailio-bin/default.nix b/pkgs/servers/sip/kamailio/test-kamailio-bin/default.nix index 5d6eea600959..7fc6d0fd9b02 100644 --- a/pkgs/servers/sip/kamailio/test-kamailio-bin/default.nix +++ b/pkgs/servers/sip/kamailio/test-kamailio-bin/default.nix @@ -3,8 +3,8 @@ stdenv.mkDerivation { name = "kamailio-bin-test"; meta.timeout = 60; - src = ./.; + dontUnpack = true; dontInstall = true; buildPhase = '' From 4370cb8ab144d238bd4cf4a3d29908f27b70f05c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 May 2024 22:29:25 +0000 Subject: [PATCH 21/98] marcel: 0.22.2 -> 0.27.2 --- pkgs/by-name/ma/marcel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/marcel/package.nix b/pkgs/by-name/ma/marcel/package.nix index d2829f9e241f..9c91553fdf3a 100644 --- a/pkgs/by-name/ma/marcel/package.nix +++ b/pkgs/by-name/ma/marcel/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "marcel"; - version = "0.22.2"; + version = "0.27.2"; pyproject = true; src = fetchFromGitHub { owner = "geophile"; repo = "marcel"; rev = "refs/tags/v${version}"; - hash = "sha256-CiAIY4qXv5V2VOsi+vat7OvFcmeFpIrmHCfqlY+JRXc="; + hash = "sha256-jzb4kSrcN+pLFkWYy0hc7NCCextWgZQuf3P+kiouEfY="; }; nativeBuildInputs = with python3Packages; [ From 7617a60db234a8dc1acae1ef17a95ee120b9bb0c Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 May 2024 08:55:32 +0900 Subject: [PATCH 22/98] python311Packages.anywidget: 0.9.10 -> 0.9.11 Changelog: https://github.com/manzt/anywidget/releases/tag/anywidget%400.9.11 --- pkgs/development/python-modules/anywidget/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/anywidget/default.nix b/pkgs/development/python-modules/anywidget/default.nix index 767fc775851d..51f6131ae5e6 100644 --- a/pkgs/development/python-modules/anywidget/default.nix +++ b/pkgs/development/python-modules/anywidget/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "anywidget"; - version = "0.9.10"; + version = "0.9.11"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OQpigkCYHAmBPHUjJ53cq4L/T9Moet1UM7eLE2kIkGg="; + hash = "sha256-WN3tjobsJ84odgyUVzF2YxE9mvYIlH7mqNDstSiyLNw="; }; # We do not need the jupyterlab build dependency, because we do not need to @@ -48,6 +48,11 @@ buildPythonPackage rec { watchfiles ]; + disabledTests = [ + # requires package.json + "test_version" + ]; + pythonImportsCheck = [ "anywidget" ]; meta = with lib; { From d9f18d92159f1c6670b1b4c0bf58a2c5bd0705df Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 May 2024 08:56:32 +0900 Subject: [PATCH 23/98] python311Packages.jupyterlab: 4.1.8 -> 4.2.0 Changelog: https://github.com/jupyterlab/jupyterlab/blob/v4.2.0/CHANGELOG.md --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 7b9a17d91e2c..dc8c475474aa 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.1.8"; + version = "4.2.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-M4St7YaA585QT9Y7i7iaOd8hycdpTZ59xKaHQs2zD5s="; + hash = "sha256-NW6SBaaiq2icR8j+SRnbpsB243bQPya6rcBXSMJDXdU="; }; nativeBuildInputs = [ From 275b42f8e3b4b80643dc31a9b5fafafde1a8427f Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 May 2024 08:56:37 +0900 Subject: [PATCH 24/98] python311Packages.jupyterlab-git: 0.50.0 -> 0.50.1 Changelog: https://github.com/jupyterlab/jupyterlab-git/blob/v0.50.1/CHANGELOG.md --- pkgs/development/python-modules/jupyterlab-git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index 512c79947457..9377df6d75cf 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "jupyterlab-git"; - version = "0.50.0"; + version = "0.50.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyterlab_git"; inherit version; - hash = "sha256-CYWVRtOQE067kYqWXCw/4mBf6v4yfPYWFb592Qtb37s="; + hash = "sha256-v08Go/vCsquE6l1SMmqg4LjM9OmjNX+jGKEZVg4cak0="; }; nativeBuildInputs = [ From a8b6a40244cd2b7986eb06e4a8d55fe73224be38 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 May 2024 08:56:47 +0900 Subject: [PATCH 25/98] python311Packages.marimo: 0.4.10 -> 0.6.0 Changelog: https://github.com/marimo-team/marimo/releases/tag/0.6.0 --- .../python-modules/marimo/default.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 54f6fd858e35..8b3fd204e54c 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -3,30 +3,32 @@ , fetchPypi , pythonOlder , setuptools +, black , click +, docutils +, itsdangerous , jedi , markdown -, pymdown-extensions +, psutil , pygments +, pymdown-extensions +, starlette , tomlkit , uvicorn -, starlette , websockets -, docutils -, black , pytestCheckHook }: buildPythonPackage rec { pname = "marimo"; - version = "0.4.10"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-F6Hf8KPIkXuRhO/1mVHE1wfU6//vbUK1ghoqANmZjag="; + hash = "sha256-L6ICaaMRrMOr/d8CJGcXxOYCWTVh8ObckW7xNeLRB2Q="; }; build-system = [ @@ -34,17 +36,19 @@ buildPythonPackage rec { ]; dependencies = [ + black click + docutils + itsdangerous jedi markdown - pymdown-extensions + psutil pygments + pymdown-extensions + starlette tomlkit uvicorn - starlette websockets - docutils - black ]; nativeCheckInputs = [ From 2ad6437b10ac9a6618b9dc566044e5e2c3ee25b6 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 May 2024 08:57:02 +0900 Subject: [PATCH 26/98] python311Packages.nbdev: 2.3.21 -> 2.3.22 Changelog: https://github.com/fastai/nbdev/blob/2.3.22/CHANGELOG.md --- pkgs/development/python-modules/nbdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbdev/default.nix b/pkgs/development/python-modules/nbdev/default.nix index 4178f611e43d..02e938ae7ed4 100644 --- a/pkgs/development/python-modules/nbdev/default.nix +++ b/pkgs/development/python-modules/nbdev/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "nbdev"; - version = "2.3.21"; + version = "2.3.22"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-H3KHnVOdy+Hdpka+dxp/qPj1HZSXIbXJshnZuXVo9DQ="; + hash = "sha256-CO88zk4aPoaYokt98IYXpfTrhdVBgCwM9BSiKqWeKm4="; }; nativeBuildInputs = [ From e0e3ea5dfd8f5d04839d2f854e55fa7464673a25 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 18 May 2024 08:57:13 +0900 Subject: [PATCH 27/98] python311Packages.notebook: 7.1.3 -> 7.2.0 Changelog: https://github.com/jupyter/notebook/blob/v7.2.0/CHANGELOG.md --- pkgs/development/python-modules/notebook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 6f09fdae9c67..c1a55c2f0203 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "notebook"; - version = "7.1.3"; + version = "7.2.0"; disabled = pythonOlder "3.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Qfzr/0TPe7k3cYCAi8uuBmYptV2MdyLx6751ykT5z8E="; + hash = "sha256-NKK6SwitXRnskw23SE+3l0aheEvp4aX4IY+a+GVqFB8="; }; postPatch = '' From b6f9a438d719cd4082545511fdb29a5f38f71b63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 00:54:11 +0000 Subject: [PATCH 28/98] limitcpu: 3.0 -> 3.1 --- pkgs/tools/misc/limitcpu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/limitcpu/default.nix b/pkgs/tools/misc/limitcpu/default.nix index f06bd5ff16a9..168abdd56ba8 100644 --- a/pkgs/tools/misc/limitcpu/default.nix +++ b/pkgs/tools/misc/limitcpu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "limitcpu"; - version = "3.0"; + version = "3.1"; src = fetchurl { url = "mirror://sourceforge/limitcpu/cpulimit-${version}.tar.gz"; - sha256 = "sha256-rS9BXrK72j6DqKLZGO9ekPUuvMb+5h6Uv5F7PoTrtJw="; + sha256 = "sha256-lGmU7GDznwMJW4m9dOZguJwUyCq6dUVmk5jjArx7I0w="; }; buildFlags = with stdenv; [ ( From 4cab918466366493e447d8acdf3c16bc66aac01c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 00:54:55 +0000 Subject: [PATCH 29/98] witness: 0.3.1 -> 0.4.0 --- pkgs/tools/security/witness/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/witness/default.nix b/pkgs/tools/security/witness/default.nix index 0b62b31d94e1..2aa26b7e6080 100644 --- a/pkgs/tools/security/witness/default.nix +++ b/pkgs/tools/security/witness/default.nix @@ -10,15 +10,15 @@ buildGoModule rec { pname = "witness"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "in-toto"; repo = "witness"; rev = "v${version}"; - sha256 = "sha256-uv/HxPYOKxZskmlAxUS2I1sW4YsSAmIeNHjoJeR7VWs="; + sha256 = "sha256-QnZZVQZMkh9GH6io19mlE3gHaiX73TgH7ibFT1H5DB4="; }; - vendorHash = "sha256-9IkDBaDRJGWfPRN5+rYU4uH6nAsfnytDkF518rfNpyc="; + vendorHash = "sha256-5q405OP8VPChhxiH2tjh2H+ailQRjGmLZvul7CubjJo="; nativeBuildInputs = [ installShellFiles ]; From ba7b60d078eba3c084f1d1464a29d69300018e1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 02:56:39 +0000 Subject: [PATCH 30/98] vscode-extensions.reditorsupport.r: 2.8.3 -> 2.8.4 --- .../editors/vscode/extensions/reditorsupport.r/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix index cc7a8d9ab4ef..c2c2217762ef 100644 --- a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix +++ b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix @@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "r"; publisher = "reditorsupport"; - version = "2.8.3"; - hash = "sha256-3HVBBXMdRhnKLnhrbEQFIlIbB/rbj+AAb4/z3/Ch7eg="; + version = "2.8.4"; + hash = "sha256-wVT9/JUuqP8whW99q1gwVMf7PRzgZNLoIdlXsclpbck="; }; nativeBuildInputs = [ jq From 8c42ec95a4eac0d8a9a84ef18faeeb625b661329 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 17 May 2024 21:53:06 -0700 Subject: [PATCH 31/98] libimobiledevice: add RossComputerGuy as maintainer --- pkgs/development/libraries/libimobiledevice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index 9a97bb0a67a2..d67c4a67475e 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -77,6 +77,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = [ ]; + maintainers = with maintainers; [ RossComputerGuy ]; }; } From 61bf467bdb99cbe807f7de0d6b74f73f2456aaf5 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 17 May 2024 21:53:36 -0700 Subject: [PATCH 32/98] libcanberra: add RossComputerGuy as maintainer --- pkgs/development/libraries/libcanberra/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 684c6d9d242e..10c6706dc70d 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://0pointer.de/lennart/projects/libcanberra/"; license = licenses.lgpl2Plus; - maintainers = [ ]; + maintainers = with maintainers; [ RossComputerGuy ]; platforms = platforms.unix; }; } From e73c6c54e6f204e1207e113de57376a694d6bdc3 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 17 May 2024 21:55:15 -0700 Subject: [PATCH 33/98] libsepol: add RossComputerGuy as maintainer --- pkgs/os-specific/linux/libsepol/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index 548d5222c7a2..41d8a724e53c 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "SELinux binary policy manipulation library"; homepage = "http://userspace.selinuxproject.org"; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ RossComputerGuy ]; license = lib.licenses.gpl2Plus; pkgConfigModules = [ "libselinux" ]; }; From 3cdcbfdbadd260a0ff346a8a0b23c2025e02988a Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 17 May 2024 21:56:21 -0700 Subject: [PATCH 34/98] zip: add RossComputerGuy as maintainer --- pkgs/tools/archivers/zip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 1d75040c7784..8a81691d6448 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { homepage = "http://www.info-zip.org"; license = licenses.bsdOriginal; platforms = platforms.all; - maintainers = [ ]; + maintainers = with maintainers; [ RossComputerGuy ]; mainProgram = "zip"; }; } From 58b704661144f3d351a8e31ba73594dd2cb2b6f8 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 17 May 2024 21:57:40 -0700 Subject: [PATCH 35/98] gnutar: add RossComputerGuy as maintainer --- pkgs/tools/archivers/gnutar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 331d977147b2..34615d7e8bed 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ RossComputerGuy ]; mainProgram = "tar"; platforms = lib.platforms.all; From 725fec4ad843b9c368e8f91f404cc4bc18b7dd45 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 17 May 2024 21:58:38 -0700 Subject: [PATCH 36/98] semodule-utils: add RossComputerGuy as maintainer --- pkgs/os-specific/linux/semodule-utils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/semodule-utils/default.nix b/pkgs/os-specific/linux/semodule-utils/default.nix index 70de3cc6b60c..013a9ecb9034 100644 --- a/pkgs/os-specific/linux/semodule-utils/default.nix +++ b/pkgs/os-specific/linux/semodule-utils/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "SELinux policy core utilities (packaging additions)"; license = licenses.gpl2; inherit (libsepol.meta) homepage platforms; - maintainers = [ ]; + maintainers = with maintainers; [ RossComputerGuy ]; }; } From d01d4303423e49de20008cba95b4a517d17e830a Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sat, 18 May 2024 10:35:20 +0100 Subject: [PATCH 37/98] nixos/step-ca: Added Caddy example to integration tests. --- nixos/tests/step-ca.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/nixos/tests/step-ca.nix b/nixos/tests/step-ca.nix index a855b590232d..31ec0078e0f6 100644 --- a/nixos/tests/step-ca.nix +++ b/nixos/tests/step-ca.nix @@ -62,6 +62,24 @@ import ./make-test-python.nix ({ pkgs, ... }: }; }; + caclientcaddy = + { config, pkgs, ... }: { + security.pki.certificateFiles = [ "${test-certificates}/root_ca.crt" ]; + + networking.firewall.allowedTCPPorts = [ 80 443 ]; + + services.caddy = { + enable = true; + virtualHosts."caclientcaddy".extraConfig = '' + respond "Welcome to Caddy!" + + tls caddy@example.org { + ca https://caserver:8443/acme/acme/directory + } + ''; + }; + }; + catester = { config, pkgs, ... }: { security.pki.certificateFiles = [ "${test-certificates}/root_ca.crt" ]; }; @@ -73,5 +91,8 @@ import ./make-test-python.nix ({ pkgs, ... }: caserver.wait_for_unit("step-ca.service") caclient.wait_for_unit("acme-finished-caclient.target") catester.succeed("curl https://caclient/ | grep \"Welcome to nginx!\"") + + caclientcaddy.wait_for_unit("caddy.service") + catester.succeed("curl https://caclientcaddy/ | grep \"Welcome to Caddy!\"") ''; }) From c43df0840e890ff73fd233472cdd0e197c7df4cf Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sat, 18 May 2024 11:02:46 +0100 Subject: [PATCH 38/98] step-ca: Set version in ldflags so this is correctly displayed in startup message --- pkgs/tools/security/step-ca/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index 72f80c3c79ea..1b227b3cdfdf 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -24,6 +24,11 @@ buildGoModule rec { vendorHash = "sha256-XlfdIg8YHCeCvc7kZczUxlxUonyZSQATgsxLTMvNDk4="; + ldflags = [ + "-w" + "-X main.Version=${version}" + ]; + nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ]; buildInputs = From 0fe111d1c7dc0c2851072569ae17ce5e71325c29 Mon Sep 17 00:00:00 2001 From: Price Hiller Date: Sat, 18 May 2024 02:57:22 -0500 Subject: [PATCH 39/98] neovide: 0.12.2 -> 0.13.0 --- pkgs/by-name/ne/neovide/package.nix | 10 +++++----- pkgs/by-name/ne/neovide/skia-externals.json | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix index ce9b091add82..a4c8791c5aa6 100644 --- a/pkgs/by-name/ne/neovide/package.nix +++ b/pkgs/by-name/ne/neovide/package.nix @@ -26,16 +26,16 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { pname = "neovide"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "neovide"; repo = "neovide"; rev = version; - sha256 = "sha256-M19LKNjUmC0WkVGm4t7vjxgMMe0FdMTmB1mLcG33OUg="; + sha256 = "sha256-lYahMSaagT6DloFMXT2lLPM1xX/9IEGNIPvbo1MQgSw="; }; - cargoHash = "sha256-2fPprZVT7V+Ot8aCpWj6WTdyFylmzlujFdTJCrtE0rk="; + cargoHash = "sha256-g/Ezyz2gC1YaPMdIy/WdoOvezJUH3aB2FA87viahRzc="; SKIA_SOURCE_DIR = let @@ -43,8 +43,8 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { owner = "rust-skia"; repo = "skia"; # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia - rev = "m119-0.67.3"; - sha256 = "sha256-U75NuJnQa5+SNlOrsBmdlvflGdjo3el63EeIsbnE7ms="; + rev = "m124-0.72.3"; + sha256 = "sha256-zlHUJUXukE4CsXwwmVl3KHf9mnNPT8lC/ETEE15Gb4s="; }; # The externals for skia are taken from skia/DEPS externals = linkFarm "skia-externals" (lib.mapAttrsToList diff --git a/pkgs/by-name/ne/neovide/skia-externals.json b/pkgs/by-name/ne/neovide/skia-externals.json index e57814e2a2d8..9a71fd62899f 100644 --- a/pkgs/by-name/ne/neovide/skia-externals.json +++ b/pkgs/by-name/ne/neovide/skia-externals.json @@ -16,13 +16,13 @@ }, "zlib": { "url": "https://chromium.googlesource.com/chromium/src/third_party/zlib", - "rev": "c876c8f87101c5a75f6014b0f832499afeb65b73", - "sha256": "sha256-mwozVo8ymyrYN4tw+/ZnSI+xogSTZQ6PUBba/jQqRkE=" + "rev": "646b7f569718921d7d4b5b8e22572ff6c76f2596", + "sha256": "sha256-jNj6SuTZ5/a7crtYhxW3Q/TlfRMNMfYIVxDlr7bYdzQ=" }, "harfbuzz": { "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "4cfc6d8e173e800df086d7be078da2e8c5cfca19", - "sha256": "sha256-rrstyAz7Eb8ZgFJZKUASY8nU4YFZAptd5VS9B2cs2Yg=" + "rev": "c053e8f29257814e11ad61493dbbe29f27656de4", + "sha256": "sha256-D8DNcZH/oiJqWvfWFHvQ8AwQ3OrMwyZdfGmZ5y30Hvg=" }, "wuffs": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -31,7 +31,7 @@ }, "libpng": { "url": "https://skia.googlesource.com/third_party/libpng.git", - "rev": "386707c6d19b974ca2e3db7f5c61873813c6fe44", - "sha256": "sha256-67kf5MBsnBBi0bOfX/RKL52xpaCWm/ampltAI+EeQ+c=" + "rev": "144b348e072a78e8130ed0acc452c9f039a67bf2", + "sha256": "sha256-eTF7q7hR4S1OqV2oPQKmcHujA5Od4rGMc5879kT0SkE=" } } From ada47498125a023fefc36d00fe2bea9e343f9c7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 12:26:58 +0000 Subject: [PATCH 40/98] lswt: 1.0.4 -> 2.0.0 --- pkgs/applications/misc/lswt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/lswt/default.nix b/pkgs/applications/misc/lswt/default.nix index 98f36028dbc2..0845a5a1cb5e 100644 --- a/pkgs/applications/misc/lswt/default.nix +++ b/pkgs/applications/misc/lswt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lswt"; - version = "1.0.4"; + version = "2.0.0"; src = fetchFromSourcehut { owner = "~leon_plickat"; repo = pname; rev = "v${version}"; - hash = "sha256-Orwa7sV56AeznEcq/Xj5qj4PALMxq0CI+ZnXuY4JYE0="; + hash = "sha256-8jP6I2zsDt57STtuq4F9mcsckrjvaCE5lavqKTjhNT0="; }; nativeBuildInputs = [ wayland-scanner ]; From 5c42fa60099326bc1c22d9363552219feb589d6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 12:42:09 +0000 Subject: [PATCH 41/98] easyrsa: 3.1.7 -> 3.2.0 --- pkgs/tools/networking/easyrsa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index 47f4e5a7b835..d2639bdf5352 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "easyrsa"; - version = "3.1.7"; + version = "3.2.0"; src = fetchFromGitHub { owner = "OpenVPN"; repo = "easy-rsa"; rev = "v${version}"; - hash = "sha256-zdVcT04nj7eE1a6M7WHeWpwG/TVTwyK+WgD70XwPXfY="; + hash = "sha256-hjebDE7Ts93vtoOTquFbfTWdInhI7HXc4pRxIsvNLtg="; }; nativeBuildInputs = [ makeWrapper ]; From acc496b5e8fa2a5238872242a9773834bd0e6434 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 12:59:36 +0000 Subject: [PATCH 42/98] datovka: 4.23.7 -> 4.23.8 --- pkgs/applications/networking/datovka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index 3ed7a26138c8..31b8330bfdc8 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/pkgs/applications/networking/datovka/default.nix @@ -12,11 +12,11 @@ mkDerivation rec { pname = "datovka"; - version = "4.23.7"; + version = "4.23.8"; src = fetchurl { url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz"; - sha256 = "sha256-mGuTxOqudDhoJKZ9517H+A4PZxBqAOD+PfBHunhPXGw="; + sha256 = "sha256-YmXpbSrbibkH0+DKE+ujFSLqxnWiA3XpuQSzOQUyEOo="; }; buildInputs = [ libdatovka qmake qtbase qtsvg libxml2 qtwebsockets ]; From 4d4c167703fe56552f9fb992b1ba7b76178dbf72 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 13:04:08 +0000 Subject: [PATCH 43/98] haruna: 1.1.0 -> 1.1.1 --- pkgs/applications/video/haruna/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index 7409bb847074..533048d25b1d 100644 --- a/pkgs/applications/video/haruna/default.nix +++ b/pkgs/applications/video/haruna/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "haruna"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitLab { owner = "multimedia"; repo = "haruna"; rev = "v${version}"; - hash = "sha256-403ZqllSSaOdTS1GSf8EIQk9gHOxMsWogbK9qh+MhpY="; + hash = "sha256-m4u1V+vp4wOSqRbdbxgxDNgC28biiB3A6w1pSfuczHs="; domain = "invent.kde.org"; }; From 965b84d74dc993931537350700e192bf4840825e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 18 May 2024 16:08:13 +0200 Subject: [PATCH 44/98] intel-graphics-compiler: 1.0.16238.4 -> 1.0.16695.4 Changelog: https://github.com/intel/intel-graphics-compiler/releases/tag/igc-1.0.16695.4 --- .../compilers/intel-graphics-compiler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index d2075d79543c..02bc670f26cd 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -20,8 +20,8 @@ let vc_intrinsics_src = fetchFromGitHub { owner = "intel"; repo = "vc-intrinsics"; - rev = "v0.16.0"; - hash = "sha256-d197m80vSICdv4VKnyqdy3flzbKLKmB8jroY2difA7o="; + rev = "v0.18.0"; + hash = "sha256-F2GR3TDUUiygEhdQN+PsMT/CIYBATMQX5wkvwrziS2E="; }; inherit (llvmPackages_14) lld llvm; @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.16238.4"; + version = "1.0.16695.4"; src = fetchFromGitHub { owner = "intel"; From 02c795956bff14a3d41dd78fe09994bd8ff320f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 14:19:33 +0000 Subject: [PATCH 45/98] myks: 3.4.4 -> 4.1.1 --- pkgs/by-name/my/myks/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 6de9faf4e9c3..0205401138f9 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "myks"; - version = "3.4.4"; + version = "4.1.1"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; rev = "refs/tags/v${version}"; - hash = "sha256-PaA8j4BWijhPR3DTZ0nnO54v0Uj/DpFdJpofseTA1+A="; + hash = "sha256-IJlSryyNQFubjBQJ59Gl5Wn3eniwZ0svbGAxLKIrCt4="; }; - vendorHash = "sha256-A30SyqgAeYwgiYLZF9M3iW2u8JXPU6ozUThziCmSRgU="; + vendorHash = "sha256-u9dNmgFMn6OMkKgTwNSqizUHJwvRk+S1xKZDozWjbps="; subPackages = "."; From 5cc1875026445ab452b27fd2c27c91bec2917576 Mon Sep 17 00:00:00 2001 From: Sameer Rahmani Date: Sat, 18 May 2024 15:12:04 +0100 Subject: [PATCH 46/98] llvm,mlir: Fix the install location of cmake modules --- pkgs/development/compilers/llvm/common/mlir/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/mlir/default.nix b/pkgs/development/compilers/llvm/common/mlir/default.nix index 044e5c673108..891e66b1d57c 100644 --- a/pkgs/development/compilers/llvm/common/mlir/default.nix +++ b/pkgs/development/compilers/llvm/common/mlir/default.nix @@ -48,7 +48,8 @@ stdenv.mkDerivation rec { "-DLLVM_INSTALL_TOOLCHAIN_ONLY=OFF" "-DMLIR_TOOLS_INSTALL_DIR=${placeholder "out"}/bin/" "-DLLVM_ENABLE_IDE=OFF" - "-DMLIR_INSTALL_PACKAGE_DIR=${placeholder "out"}/lib/cmake/mlir" + "-DMLIR_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/mlir" + "-DMLIR_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake/mlir" "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" From f6a977cc1a5c9512979cfe2d184239c1379e1b7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 14:33:42 +0000 Subject: [PATCH 47/98] planify: 4.7.2 -> 4.7.4 --- pkgs/applications/office/planify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/planify/default.nix b/pkgs/applications/office/planify/default.nix index 8d4c079753ca..6188ffa76741 100644 --- a/pkgs/applications/office/planify/default.nix +++ b/pkgs/applications/office/planify/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.7.2"; + version = "4.7.4"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; rev = version; - hash = "sha256-G0A3U0TUGL4RT1wpIXw/cIwDDlaLCPpo5QG6bJfoIYc="; + hash = "sha256-x76HasjETqXqE5yXE69/69NAYEWAksHSt0nYRq8/P0k="; }; nativeBuildInputs = [ From c86dcd41a0f124e4f6eb325c2177523efb4bd549 Mon Sep 17 00:00:00 2001 From: isabel Date: Fri, 17 May 2024 17:07:55 +0100 Subject: [PATCH 48/98] catppuccinifier-gui: init at 8.0.0 --- .../ca/catppuccinifier-gui/package.nix | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 pkgs/by-name/ca/catppuccinifier-gui/package.nix diff --git a/pkgs/by-name/ca/catppuccinifier-gui/package.nix b/pkgs/by-name/ca/catppuccinifier-gui/package.nix new file mode 100644 index 000000000000..d4dbc5b39094 --- /dev/null +++ b/pkgs/by-name/ca/catppuccinifier-gui/package.nix @@ -0,0 +1,81 @@ +{ + lib, + gtk3, + glib, + dbus, + curl, + wget, + cairo, + stdenv, + librsvg, + libsoup, + fetchzip, + openssl_3, + webkitgtk, + gdk-pixbuf, + pkg-config, + makeDesktopItem, + copyDesktopItems, + autoPatchelfHook, +}: +let + version = "8.0.0"; +in +stdenv.mkDerivation { + pname = "catppuccinifier-gui"; + inherit version; + + src = fetchzip { + url = "https://github.com/lighttigerXIV/catppuccinifier/releases/download/${version}/Catppuccinifer-Linux-${version}.zip"; + hash = "sha256-fG6YhLsjvMUIWsOnm+GSOh6LclCAISPSRiDQdWLlAR4="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + pkg-config + copyDesktopItems + ]; + + buildInputs = [ + curl + wget + webkitgtk + gtk3 + cairo + gdk-pixbuf + libsoup + glib + dbus + openssl_3 + librsvg + ]; + + installPhase = '' + runHook preInstall + + install -Dm555 installation-files/catppuccinifier-gui "$out/bin/catppuccinifier-gui" + install -Dm644 installation-files/catppuccinifier.png "$out/share/pixmaps/catppuccinifier.png" + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + desktopName = "catppuccinifier"; + name = "catppuccinifier"; + exec = "catppuccinifier-gui"; + icon = "catppuccinifier"; + comment = "Apply catppuccin flavors to your wallpapers"; + }) + ]; + + meta = { + description = "Apply catppuccin flavors to your wallpapers"; + homepage = "https://github.com/lighttigerXIV/catppuccinifier"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ isabelroses ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "catppuccinifier-gui"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} From ece3b84f622445da960b40f4a223c760c7ce181d Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 19 May 2024 00:54:22 +0800 Subject: [PATCH 49/98] firmware-manager: correct license and add mainProgram License is mentioned here: License is mentioned here: pop-os/firmware-manager@3c542bd/assets/com.system76.FirmwareManager.appdata.xml#L5-L6 --- pkgs/os-specific/linux/firmware/firmware-manager/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix index 57b4207e383d..1682f16c3903 100644 --- a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix @@ -53,7 +53,8 @@ stdenv.mkDerivation rec { meta = { description = "Graphical frontend for firmware management"; homepage = "https://github.com/pop-os/firmware-manager"; - license = lib.licenses.gpl3; + license = with lib.licenses; [ gpl3Plus cc0 ]; + mainProgram = "com.system76.FirmwareManager"; maintainers = [ lib.maintainers.shlevy ]; platforms = lib.platforms.linux; }; From 0fbf681367d27a3a1e1a78427364c3223355637f Mon Sep 17 00:00:00 2001 From: "Winston R. Milling" Date: Sat, 18 May 2024 12:54:11 -0500 Subject: [PATCH 50/98] armcord: 3.2.6 -> 3.2.7 --- .../networking/instant-messengers/armcord/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix index a52b77905a51..d3644e1d27ee 100644 --- a/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { pname = "armcord"; - version = "3.2.6"; + version = "3.2.7"; src = let @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { { x86_64-linux = fetchurl { url = "${base}/v${version}/ArmCord_${version}_amd64.deb"; - hash = "sha256-9AcxqCxhLAjYclaw6lri06R0PgQQeRHTbLJLEdhDCWU="; + hash = "sha256-TFgO9ddz/Svi4QfugjTTejpV/m+xc1548cokzhVgwkw="; }; aarch64-linux = fetchurl { url = "${base}/v${version}/ArmCord_${version}_arm64.deb"; - hash = "sha256-/uk2slpNF1sSTW6z319Yg9yx/s45fJPvJQJpY11ULVw="; + hash = "sha256-AJ4TSG3ry2P40vzK1fsaWgQ/O0z9r3z8+0uxSmddZKo="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); From 864056a1552b9c5313481cbf765c298f3b2f1e46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 18:01:41 +0000 Subject: [PATCH 51/98] rosa: 1.2.38 -> 1.2.39 --- pkgs/by-name/ro/rosa/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ro/rosa/package.nix b/pkgs/by-name/ro/rosa/package.nix index b9156afa9df8..25ac1e682584 100644 --- a/pkgs/by-name/ro/rosa/package.nix +++ b/pkgs/by-name/ro/rosa/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rosa"; - version = "1.2.38"; + version = "1.2.39"; src = fetchFromGitHub { owner = "openshift"; repo = "rosa"; rev = "v${version}"; - hash = "sha256-eS9mK5iK/fXWMpgA/RF7wYybcJtPDW/pIWo9Iw0I+K8="; + hash = "sha256-K1FGiUNXSyCTmF//dculpnkTyn3hfqWrOiMUGk9kHrA="; }; vendorHash = null; From 37711ec8f927a5d2cff091ad3b9071fa1d432154 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 21:05:20 +0200 Subject: [PATCH 52/98] python311Packages.mortgage: refactor - enable tests - add pythonImportsCheck --- .../python-modules/mortgage/default.nix | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/mortgage/default.nix b/pkgs/development/python-modules/mortgage/default.nix index ebe5b55b1dba..69454c78331a 100644 --- a/pkgs/development/python-modules/mortgage/default.nix +++ b/pkgs/development/python-modules/mortgage/default.nix @@ -1,31 +1,41 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "mortgage"; version = "1.0.5"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit version pname; - sha256 = "18fcb356c631e9cc27fa7019f6ff6021707e34b9ce3a3b7dc815661288709921"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "jlumbroso"; + repo = "mortgage"; + rev = "refs/tags/v${version}"; + hash = "sha256-UwSEKfMQqxpcF+7TF/+qD6l8gEO/qDCUklpZz1Nt/Ok="; }; + build-system = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; - doCheck = false; # No tests in sdist + pythonImportsCheck = [ + "mortgage" + ]; - disabled = pythonOlder "3.5"; - - meta = { + meta = with lib; { description = "Mortgage calculator"; - license = lib.licenses.mit; + homepage = "https://github.com/jlumbroso/mortgage"; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } From 223d5bf1ea01e4347260dab3721f2368f13b0f69 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 21:06:06 +0200 Subject: [PATCH 53/98] python311Packages.mortgage: format with nixfmt --- .../python-modules/mortgage/default.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/mortgage/default.nix b/pkgs/development/python-modules/mortgage/default.nix index 69454c78331a..6cc5ccc507f2 100644 --- a/pkgs/development/python-modules/mortgage/default.nix +++ b/pkgs/development/python-modules/mortgage/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -20,17 +21,11 @@ buildPythonPackage rec { hash = "sha256-UwSEKfMQqxpcF+7TF/+qD6l8gEO/qDCUklpZz1Nt/Ok="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "mortgage" - ]; + pythonImportsCheck = [ "mortgage" ]; meta = with lib; { description = "Mortgage calculator"; From bc5b13fb432a809eb72e72786ce3e89ff82c9d4e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 21:14:55 +0200 Subject: [PATCH 54/98] python312Packages.looseversion: refactor --- .../python-modules/looseversion/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/looseversion/default.nix b/pkgs/development/python-modules/looseversion/default.nix index b16fd1a572d2..e3e97560a3fc 100644 --- a/pkgs/development/python-modules/looseversion/default.nix +++ b/pkgs/development/python-modules/looseversion/default.nix @@ -1,33 +1,43 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , hatchling +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "looseversion"; version = "1.3.0"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit version pname; - sha256 = "sha256-695l8/a7lTGoEBbG/vPrlaYRga3Ee3+UnpwOpHkRZp4="; + hash = "sha256-695l8/a7lTGoEBbG/vPrlaYRga3Ee3+UnpwOpHkRZp4="; }; - nativeBuildInputs = [ + build-system = [ hatchling ]; nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests.py" ]; - pythonImportsCheck = [ "looseversion" ]; + + pytestFlagsArray = [ + "tests.py" + ]; + + pythonImportsCheck = [ + "looseversion" + ]; meta = with lib; { description = "Version numbering for anarchists and software realists"; homepage = "https://github.com/effigies/looseversion"; + changelog = "https://github.com/effigies/looseversion/blob/${version}/CHANGES.md"; license = licenses.psfl; maintainers = with maintainers; [ pelme ]; }; From 50f0370604721fd995d4af642b8135a3d1751cff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 21:15:21 +0200 Subject: [PATCH 55/98] python312Packages.looseversion: format with nixfmt --- .../python-modules/looseversion/default.nix | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/looseversion/default.nix b/pkgs/development/python-modules/looseversion/default.nix index e3e97560a3fc..3bf1553a40d8 100644 --- a/pkgs/development/python-modules/looseversion/default.nix +++ b/pkgs/development/python-modules/looseversion/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchPypi -, hatchling -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { @@ -18,21 +19,13 @@ buildPythonPackage rec { hash = "sha256-695l8/a7lTGoEBbG/vPrlaYRga3Ee3+UnpwOpHkRZp4="; }; - build-system = [ - hatchling - ]; + build-system = [ hatchling ]; - nativeCheckInputs = [ - pytestCheckHook - ]; - - pytestFlagsArray = [ - "tests.py" - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "looseversion" - ]; + pytestFlagsArray = [ "tests.py" ]; + + pythonImportsCheck = [ "looseversion" ]; meta = with lib; { description = "Version numbering for anarchists and software realists"; From 240b2ec542128c030927e34ca6d833ea4af8acc3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 19:18:56 +0000 Subject: [PATCH 56/98] signal-desktop: 7.8.0 -> 7.9.0 --- .../instant-messengers/signal-desktop/signal-desktop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index e8d130708705..48fe8491bdd9 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.8.0"; + version = "7.9.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-gBcfe3lU2pmRHSXNNXBFU7Qv83Bf6OPv5LM/HxeLkjM="; + hash = "sha256-Iv2WG1kvB3tEiFu4Oy0po0KlpWCwfalDNOXstO/C+e0="; } From 9355dad97f74a341a6bbc8713de4f3409dee123c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 21:23:45 +0200 Subject: [PATCH 57/98] python311Packages.openhomedevice: refactor --- .../python-modules/openhomedevice/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/openhomedevice/default.nix b/pkgs/development/python-modules/openhomedevice/default.nix index 2e7ddf92a1d6..6c7a2ee856c1 100644 --- a/pkgs/development/python-modules/openhomedevice/default.nix +++ b/pkgs/development/python-modules/openhomedevice/default.nix @@ -6,23 +6,28 @@ , lxml , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "openhomedevice"; version = "2.2"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bazwilliams"; - repo = pname; + repo = "openhomedevice"; rev = "refs/tags/${version}"; hash = "sha256-GGp7nKFH01m1KW6yMkKlAdd26bDi8JDWva6OQ0CWMIw="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ async-upnp-client lxml ]; From 3156917d2368103d117cc40b9d8c82dd6e77ab72 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 21:24:08 +0200 Subject: [PATCH 58/98] python311Packages.openhomedevice: format with nixfmt --- .../python-modules/openhomedevice/default.nix | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/openhomedevice/default.nix b/pkgs/development/python-modules/openhomedevice/default.nix index 6c7a2ee856c1..3c53f5f58322 100644 --- a/pkgs/development/python-modules/openhomedevice/default.nix +++ b/pkgs/development/python-modules/openhomedevice/default.nix @@ -1,12 +1,13 @@ -{ lib -, aioresponses -, async-upnp-client -, buildPythonPackage -, fetchFromGitHub -, lxml -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + aioresponses, + async-upnp-client, + buildPythonPackage, + fetchFromGitHub, + lxml, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -23,9 +24,7 @@ buildPythonPackage rec { hash = "sha256-GGp7nKFH01m1KW6yMkKlAdd26bDi8JDWva6OQ0CWMIw="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ async-upnp-client @@ -37,13 +36,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "openhomedevice" - ]; + pythonImportsCheck = [ "openhomedevice" ]; - pytestFlagsArray = [ - "tests/*.py" - ]; + pytestFlagsArray = [ "tests/*.py" ]; meta = with lib; { description = "Python module to access Linn Ds and Openhome devices"; From 8438ebc4eddbcf89bbda45f6a9b7000e5d2e6a87 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 21:28:45 +0200 Subject: [PATCH 59/98] python311Packages.msgraph-core: 1.0.0 -> 1.1.0 Diff: https://github.com/microsoftgraph/msgraph-sdk-python-core/compare/refs/tags/v1.0.0...v1.1.0 --- .../python-modules/msgraph-core/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix index f8ee81afbac2..19779e82180c 100644 --- a/pkgs/development/python-modules/msgraph-core/default.nix +++ b/pkgs/development/python-modules/msgraph-core/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, python-dotenv , pythonOlder , fetchFromGitHub , setuptools @@ -15,17 +16,17 @@ buildPythonPackage rec { pname = "msgraph-core"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "microsoftgraph"; repo = "msgraph-sdk-python-core"; rev = "refs/tags/v${version}"; - hash = "sha256-VizjN7sXqPvo9VOSaaUnogTlUDJ1OA2COYNTcVRqhJA="; + hash = "sha256-bQW1piSypfj3YAfzuEk/AkrB1x0lrHoIDyZv+KeCYgE="; }; nativeBuildInputs = [ @@ -44,6 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ azure-identity pytestCheckHook + python-dotenv responses ]; @@ -51,6 +53,11 @@ buildPythonPackage rec { "msgraph_core" ]; + disabledTestPaths = [ + # client_id should be the id of a Microsoft Entra application + "tests/tasks/test_page_iterator.py" + ]; + meta = { description = "Core component of the Microsoft Graph Python SDK"; homepage = "https://github.com/microsoftgraph/msgraph-sdk-python-core"; From 2cbd830c439435665c73af6da3d0c45bb8cd949c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 21:30:34 +0200 Subject: [PATCH 60/98] python312Packages.msgraph-core: refactor --- pkgs/development/python-modules/msgraph-core/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix index 19779e82180c..ee01fdc1e7c7 100644 --- a/pkgs/development/python-modules/msgraph-core/default.nix +++ b/pkgs/development/python-modules/msgraph-core/default.nix @@ -29,11 +29,11 @@ buildPythonPackage rec { hash = "sha256-bQW1piSypfj3YAfzuEk/AkrB1x0lrHoIDyZv+KeCYgE="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ httpx microsoft-kiota-abstractions microsoft-kiota-authentication-azure @@ -61,6 +61,7 @@ buildPythonPackage rec { meta = { description = "Core component of the Microsoft Graph Python SDK"; homepage = "https://github.com/microsoftgraph/msgraph-sdk-python-core"; + changelog = "https://github.com/microsoftgraph/msgraph-sdk-python-core/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; From 61acf32683b20077a110712bc5732e94be836877 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 21:31:01 +0200 Subject: [PATCH 61/98] python312Packages.msgraph-core: format with nixfmt --- .../python-modules/msgraph-core/default.nix | 39 ++++++++----------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix index ee01fdc1e7c7..8bc1b7489301 100644 --- a/pkgs/development/python-modules/msgraph-core/default.nix +++ b/pkgs/development/python-modules/msgraph-core/default.nix @@ -1,17 +1,18 @@ -{ lib -, buildPythonPackage -, python-dotenv -, pythonOlder -, fetchFromGitHub -, setuptools -, httpx -, microsoft-kiota-abstractions -, microsoft-kiota-authentication-azure - ,microsoft-kiota-http -, requests -, azure-identity -, pytestCheckHook -, responses +{ + lib, + buildPythonPackage, + python-dotenv, + pythonOlder, + fetchFromGitHub, + setuptools, + httpx, + microsoft-kiota-abstractions, + microsoft-kiota-authentication-azure, + microsoft-kiota-http, + requests, + azure-identity, + pytestCheckHook, + responses, }: buildPythonPackage rec { @@ -21,7 +22,6 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "microsoftgraph"; repo = "msgraph-sdk-python-core"; @@ -29,9 +29,7 @@ buildPythonPackage rec { hash = "sha256-bQW1piSypfj3YAfzuEk/AkrB1x0lrHoIDyZv+KeCYgE="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ httpx @@ -39,7 +37,6 @@ buildPythonPackage rec { microsoft-kiota-authentication-azure microsoft-kiota-http requests - ]; nativeCheckInputs = [ @@ -49,9 +46,7 @@ buildPythonPackage rec { responses ]; - pythonImportsCheck = [ - "msgraph_core" - ]; + pythonImportsCheck = [ "msgraph_core" ]; disabledTestPaths = [ # client_id should be the id of a Microsoft Entra application From a03c87ba76d6cc3838ba2789a640143c91a31776 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 21:56:38 +0200 Subject: [PATCH 62/98] python312Packages.moviepy: refactor - enable some tests - add pythonImportsCheck - mifrate to optional-dependencies --- .../python-modules/moviepy/default.nix | 87 +++++++++++++------ 1 file changed, 62 insertions(+), 25 deletions(-) diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 65f35e85a0f1..f7145ce9656c 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -1,62 +1,99 @@ { lib , buildPythonPackage -, fetchPypi -, pythonOlder -, numpy , decorator +, fetchFromGitHub , imageio , imageio-ffmpeg +, matplotlib +, numpy , proglog +, pytestCheckHook +, pythonOlder , requests -, tqdm - # Advanced image processing (triples size of output) -, advancedProcessing ? false , scikit-image , scikit-learn , scipy -, matplotlib +, setuptools +, tqdm , youtube-dl }: buildPythonPackage rec { pname = "moviepy"; version = "1.0.3"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "2884e35d1788077db3ff89e763c5ba7bfddbd7ae9108c9bc809e7ba58fa433f5"; + src = fetchFromGitHub { + owner = "Zulko"; + repo = "moviepy"; + rev = "refs/tags/v${version}"; + hash = "sha256-l7AwzAKSaEV+pPbltKgwllK6X54oruU2w0AvoCsrESE="; }; postPatch = '' substituteInPlace setup.py \ - --replace "decorator>=4.0.2,<5.0" "decorator>=4.0.2,<6.0" + --replace-fail "decorator>=4.0.2,<5.0" "decorator>=4.0.2,<6.0" ''; - # No tests, require network connection - doCheck = false; + build-system = [ + setuptools + ]; - propagatedBuildInputs = [ - numpy + dependencies = [ decorator imageio imageio-ffmpeg - tqdm - requests + numpy proglog - ] ++ lib.optionals advancedProcessing [ - scikit-image - scikit-learn - scipy - matplotlib - youtube-dl + requests + tqdm + ]; + + passthru.optional-dependencies = { + optionals = [ + matplotlib + scikit-image + scikit-learn + scipy + youtube-dl + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "moviepy" + ]; + + disabledTests = [ + "test_cuts1" + "test_issue" + "test_PR" + "test_setup" + "test_subtitles" + "test_sys_write_flush" + ]; + + disabledTestPaths = [ + "tests/test_compositing.py" + "tests/test_fx.py" + "tests/test_ImageSequenceClip.py" + "tests/test_resourcerelease.py" + "tests/test_resourcereleasedemo.py" + "tests/test_TextClip.py" + "tests/test_VideoClip.py" + "tests/test_Videos.py" + "tests/test_videotools.py" ]; meta = with lib; { description = "Video editing with Python"; homepage = "https://zulko.github.io/moviepy/"; + changelog = "https://github.com/Zulko/moviepy/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ]; }; From dcab6ab9b3e779aa3f8c80c04edb3a3f842b0bc6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 21:57:32 +0200 Subject: [PATCH 63/98] python312Packages.moviepy: format with nixfmt --- .../python-modules/moviepy/default.nix | 45 +++++++++---------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index f7145ce9656c..01b6a7086ab8 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -1,21 +1,22 @@ -{ lib -, buildPythonPackage -, decorator -, fetchFromGitHub -, imageio -, imageio-ffmpeg -, matplotlib -, numpy -, proglog -, pytestCheckHook -, pythonOlder -, requests -, scikit-image -, scikit-learn -, scipy -, setuptools -, tqdm -, youtube-dl +{ + lib, + buildPythonPackage, + decorator, + fetchFromGitHub, + imageio, + imageio-ffmpeg, + matplotlib, + numpy, + proglog, + pytestCheckHook, + pythonOlder, + requests, + scikit-image, + scikit-learn, + scipy, + setuptools, + tqdm, + youtube-dl, }: buildPythonPackage rec { @@ -37,9 +38,7 @@ buildPythonPackage rec { --replace-fail "decorator>=4.0.2,<5.0" "decorator>=4.0.2,<6.0" ''; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ decorator @@ -65,9 +64,7 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - pythonImportsCheck = [ - "moviepy" - ]; + pythonImportsCheck = [ "moviepy" ]; disabledTests = [ "test_cuts1" From 065a82e20783c76001b3408b312f10d80face338 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 22:22:41 +0200 Subject: [PATCH 64/98] python312Packages.foobot-async: refactor --- .../python-modules/foobot-async/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/foobot-async/default.nix b/pkgs/development/python-modules/foobot-async/default.nix index 50029f232a1c..7f30cae06e78 100644 --- a/pkgs/development/python-modules/foobot-async/default.nix +++ b/pkgs/development/python-modules/foobot-async/default.nix @@ -6,22 +6,27 @@ , async-timeout , aioresponses , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "foobot-async"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "foobot_async"; inherit version; - sha256 = "fa557a22de925139cb4a21034ffdbcd01d28bf166c0e680eaf84a99206327f40"; + hash = "sha256-+lV6It6SUTnLSiEDT/280B0ovxZsDmgOr4SpkgYyf0A="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aiohttp async-timeout ]; @@ -31,7 +36,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "foobot_async" ]; + pythonImportsCheck = [ + "foobot_async" + ]; meta = with lib; { description = "API Client for Foobot Air Quality Monitoring devices"; From 9db58e6a8f991ab2ea484da23909412fb193a990 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 22:23:05 +0200 Subject: [PATCH 65/98] python312Packages.foobot-async: format with nixfmt --- .../python-modules/foobot-async/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/foobot-async/default.nix b/pkgs/development/python-modules/foobot-async/default.nix index 7f30cae06e78..895bccb33137 100644 --- a/pkgs/development/python-modules/foobot-async/default.nix +++ b/pkgs/development/python-modules/foobot-async/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, pythonOlder -, fetchPypi -, aiohttp -, async-timeout -, aioresponses -, pytestCheckHook -, setuptools +{ + lib, + buildPythonPackage, + pythonOlder, + fetchPypi, + aiohttp, + async-timeout, + aioresponses, + pytestCheckHook, + setuptools, }: buildPythonPackage rec { @@ -22,9 +23,7 @@ buildPythonPackage rec { hash = "sha256-+lV6It6SUTnLSiEDT/280B0ovxZsDmgOr4SpkgYyf0A="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ aiohttp @@ -36,9 +35,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "foobot_async" - ]; + pythonImportsCheck = [ "foobot_async" ]; meta = with lib; { description = "API Client for Foobot Air Quality Monitoring devices"; From 52743c88f5af69d2f64a5de6c7144a2aae76098b Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sat, 18 May 2024 22:16:31 +0100 Subject: [PATCH 66/98] nixos/step-ca: Added test case for finding package version in journald logs --- nixos/tests/step-ca.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/step-ca.nix b/nixos/tests/step-ca.nix index a855b590232d..e46b64541acb 100644 --- a/nixos/tests/step-ca.nix +++ b/nixos/tests/step-ca.nix @@ -71,6 +71,8 @@ import ./make-test-python.nix ({ pkgs, ... }: '' catester.start() caserver.wait_for_unit("step-ca.service") + caserver.succeed("journalctl -o cat -u step-ca.service | grep '${pkgs.step-ca.version}'") + caclient.wait_for_unit("acme-finished-caclient.target") catester.succeed("curl https://caclient/ | grep \"Welcome to nginx!\"") ''; From 57bf7a089624bf59ba7322e3dc08019c85be6399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Wed, 8 May 2024 17:30:01 +0000 Subject: [PATCH 67/98] tracexec: Packaging improvements from #310158 --- pkgs/by-name/tr/tracexec/package.nix | 55 ++++++++++++++++++++++------ 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/tr/tracexec/package.nix b/pkgs/by-name/tr/tracexec/package.nix index 055644424b5a..c64094e85223 100644 --- a/pkgs/by-name/tr/tracexec/package.nix +++ b/pkgs/by-name/tr/tracexec/package.nix @@ -1,37 +1,68 @@ { lib, - rustPlatform, + stdenv, fetchFromGitHub, + rustPlatform, + cargo-about, + nix-update-script, }: - -rustPlatform.buildRustPackage rec { +let pname = "tracexec"; version = "0.2.2"; +in +rustPlatform.buildRustPackage { + inherit pname version; src = fetchFromGitHub { owner = "kxxt"; repo = "tracexec"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-X2hLaBndeYLBMnDe2MT4pgZiPj0COHG2uTvAbW+JVd4="; }; cargoHash = "sha256-3xANOv+A4soDcKMINy+RnI8l6uS3koZpw3CMIUCmK5A="; - # Remove test binaries and only retain tracexec - postInstall = '' - find "$out/bin" -type f \! -name tracexec -print0 | xargs -0 rm -v + nativeBuildInputs = [ + cargo-about + ]; + + # Remove RiscV64 specialisation when this is fixed: + # * https://github.com/NixOS/nixpkgs/pull/310158#pullrequestreview-2046944158 + # * https://github.com/rust-vmm/seccompiler/pull/72 + cargoBuildFlags = lib.optional stdenv.hostPlatform.isRiscV64 "--no-default-features"; + + preBuild = '' + sed -i '1ino-clearly-defined = true' about.toml # disable network requests + cargo about generate --config about.toml -o THIRD_PARTY_LICENSES.HTML about.hbs ''; - # ptrace is not allowed in sandbox - doCheck = false; + # Tests don't work for native non-x86 compilation + # because upstream overrides the name of the linker executables, + # see https://github.com/NixOS/nixpkgs/pull/310158#issuecomment-2118845043 + doCheck = stdenv.hostPlatform.isx86_64; + + checkFlags = [ + "--skip=cli::test::log_mode_without_args_works" # `Permission denied` (needs `CAP_SYS_PTRACE`) + "--skip=tracer::test::tracer_emits_exec_event" # needs `/bin/true` + ]; + + postInstall = '' + # Remove test binaries (e.g. `empty-argv`, `corrupted-envp`) and only retain `tracexec` + find "$out/bin" -type f \! -name tracexec -print0 | xargs -0 rm -v + + install -Dm644 LICENSE -t "$out/share/licenses/${pname}/" + install -Dm644 THIRD_PARTY_LICENSES.HTML -t "$out/share/licenses/${pname}/" + ''; + + passthru.updateScript = nix-update-script { }; meta = { + changelog = "https://github.com/kxxt/tracexec/blob/v${version}/CHANGELOG.md"; description = "A small utility for tracing execve{,at} and pre-exec behavior"; homepage = "https://github.com/kxxt/tracexec"; - changelog = "https://github.com/kxxt/tracexec/blob/${src.rev}/CHANGELOG.md"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ fpletz ]; + license = lib.licenses.gpl2Plus; mainProgram = "tracexec"; + maintainers = with lib.maintainers; [ fpletz nh2 ]; platforms = lib.platforms.linux; }; } From 74dbcb53bdde54d54c528ddded6552bceed1cb99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 23:08:18 +0000 Subject: [PATCH 68/98] python311Packages.softlayer: 6.2.0 -> 6.2.2 --- pkgs/development/python-modules/softlayer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index 02e38fcc3786..232097f29f25 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "softlayer"; - version = "6.2.0"; + version = "6.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,8 +29,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = "softlayer-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-kOElL6VtHrtbA0lNAnDOC6VPX1mC7Rvk5x6N5x2Z1B0="; + rev = "refs/tags/v.${version}"; + hash = "sha256-xlfVxQFsBKKpEsVmPlxn0sSyePNEmhly6wS/lTvP3DA="; }; postPatch = '' From fc5e886209665b23bd7c5cc2a30068fc09d41a32 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sat, 18 May 2024 19:32:58 -0400 Subject: [PATCH 69/98] python311Packages.duecredit: 0.9.3 -> 0.10.1 --- .../python-modules/duecredit/default.nix | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/duecredit/default.nix b/pkgs/development/python-modules/duecredit/default.nix index 582d572a4420..b9f3b94ec513 100644 --- a/pkgs/development/python-modules/duecredit/default.nix +++ b/pkgs/development/python-modules/duecredit/default.nix @@ -6,25 +6,39 @@ , pytestCheckHook , vcrpy , citeproc-py +, looseversion , requests }: buildPythonPackage rec { pname = "duecredit"; - version = "0.9.3"; + version = "0.10.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-+DeOqQ0R+XUlkuSHySFj2oDZqf85mT64PAi/LtTso3I="; + hash = "sha256-IQgrmEclF/USrTjn5A0BbJ5GHgXh1R/KPJx4K4FuUuY="; }; - nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ citeproc-py requests ]; + postPatch = '' + substituteInPlace tox.ini \ + --replace-fail "--cov=duecredit" "" \ + --replace-fail "--cov-config=tox.ini" "" + ''; - nativeCheckInputs = [ pytestCheckHook vcrpy ]; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ + citeproc-py + looseversion + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + vcrpy + ]; disabledTests = [ "test_import_doi" ]; # tries to access network preCheck = '' @@ -33,12 +47,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "duecredit" ]; - meta = with lib; { + meta = { homepage = "https://github.com/duecredit/duecredit"; description = "Simple framework to embed references in code"; mainProgram = "duecredit"; changelog = "https://github.com/duecredit/duecredit/releases/tag/${version}"; - license = licenses.bsd2; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.bcdarwin ]; }; } From f9f118d44c0bebcb646b28282db35d377ef5b316 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 19 May 2024 02:00:32 +0200 Subject: [PATCH 70/98] python312Packages.rules: 3.3.0 -> 3.4.0 https://github.com/dfunckt/django-rules/blob/v3.4.0/CHANGELOG.md --- pkgs/development/python-modules/rules/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rules/default.nix b/pkgs/development/python-modules/rules/default.nix index 3563b76affe7..cc153e44c6f3 100644 --- a/pkgs/development/python-modules/rules/default.nix +++ b/pkgs/development/python-modules/rules/default.nix @@ -2,6 +2,9 @@ , buildPythonPackage , fetchFromGitHub +# build-system +, setuptools + # tests , django , djangorestframework @@ -10,16 +13,20 @@ buildPythonPackage rec { pname = "rules"; - version = "3.3.0"; - format = "setuptools"; + version = "3.4.0"; + pyproject = true; src = fetchFromGitHub { owner = "dfunckt"; repo = "django-rules"; rev = "v${version}"; - hash = "sha256-UFRfRwcvxEn0fD3ScJJ7f/EHd93BOpY3cEF9QDryJZY="; + hash = "sha256-fxLaxjni+0S59vtvKBduR0pYMwJWWBPzR5mnH+j6gVE="; }; + build-system = [ + setuptools + ]; + pythonImportsCheck = [ "rules" ]; From 0b073454231a19db2ee189cfcade1443228faaa9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 19 May 2024 02:11:36 +0200 Subject: [PATCH 71/98] pretalx: relax rules constraint --- pkgs/by-name/pr/pretalx/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index f3582c1b7fb5..4674812339ae 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -96,6 +96,7 @@ python.pkgs.buildPythonApplication rec { "pillow" "python-dateutil" "reportlab" + "rules" ]; propagatedBuildInputs = with python.pkgs; [ From e89e2da38f5affe7516fb03ce868e4e085103293 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 May 2024 01:07:33 +0000 Subject: [PATCH 72/98] goa: 3.16.1 -> 3.16.2 --- pkgs/development/tools/goa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index 79e597f9788e..646c48f6b481 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "goa"; - version = "3.16.1"; + version = "3.16.2"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - hash = "sha256-1j7qgMTb9uz261mI8adY9aM8BkCFQHCCjuc8RIDcqCg="; + hash = "sha256-HDGopedI0kI6S7/EqHHyBUJKx25M+0tN/kIBC6Z4NYU="; }; - vendorHash = "sha256-A7FsCfZQKFFrk0KXvgyJjfGjyHQ3Ruoq/+RxC+zSa04="; + vendorHash = "sha256-H1hGZsDitamDDO0BNYjkLR4eIL0NFmpQHvMblNVLBho="; subPackages = [ "cmd/goa" ]; From 2ecce462e96b34cf63f132eba53dfabaf8fea6f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 May 2024 01:15:28 +0000 Subject: [PATCH 73/98] racket: 8.12 -> 8.13 --- pkgs/development/interpreters/racket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index f75470566e2c..e74dd1a82c27 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { pname = "racket"; - version = "8.12"; # always change at once with ./minimal.nix + version = "8.13"; # always change at once with ./minimal.nix src = (lib.makeOverridable ({ name, hash }: fetchurl { @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { } )) { name = "${pname}-${version}"; - hash = "sha256-or26nirm5dGhg2S8to99BFOOSS2Oksn7Yb0y2L5b69c="; + hash = "sha256-AB4EkgRAtlic9i1Wd9GMwv9q6Puvd+Y7iozyCJBoX7w="; }; FONTCONFIG_FILE = fontsConf; From bb7577a307c2c158de0a6e98f651b46b6aa36639 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 May 2024 01:29:49 +0000 Subject: [PATCH 74/98] oneshot: 2.0.1 -> 2.0.2 --- pkgs/tools/networking/oneshot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/oneshot/default.nix b/pkgs/tools/networking/oneshot/default.nix index fe3948041d1a..541d5270dcd1 100644 --- a/pkgs/tools/networking/oneshot/default.nix +++ b/pkgs/tools/networking/oneshot/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oneshot"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "forestnode-io"; repo = "oneshot"; rev = "v${version}"; - hash = "sha256-QReh8wdFeiCAv+XMz4cADNn9QcxlvewFJJuJ+OH7Lgc="; + hash = "sha256-aIbKXBJNcBbYJRzETT0mkaqTRo+/8o6z882G21V74rg="; }; - vendorHash = "sha256-z6eOPugSwWEK02lgRu5Oo8LzjXnJlAtQvkzdevjBTVs="; + vendorHash = "sha256-TktSQMIHYXF9eyY6jyfE31WLXEq7VZU3qnVIMGjMMcA="; subPackages = [ "cmd" ]; From 57b25e46eead1b6a366ca3727e6434600108b31b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 May 2024 02:03:26 +0000 Subject: [PATCH 75/98] badkeys: 0.0.10 -> 0.0.11 --- pkgs/by-name/ba/badkeys/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/badkeys/package.nix b/pkgs/by-name/ba/badkeys/package.nix index 11a7aec3b144..3b7dd09dc9fc 100644 --- a/pkgs/by-name/ba/badkeys/package.nix +++ b/pkgs/by-name/ba/badkeys/package.nix @@ -5,14 +5,14 @@ }: python3Packages.buildPythonApplication rec { pname = "badkeys"; - version = "0.0.10"; + version = "0.0.11"; pyproject = true; src = fetchFromGitHub { owner = "badkeys"; repo = "badkeys"; - rev = "v${version}"; - hash = "sha256-4vIPOKU/R+wASEx4OQHjtP6mJSKJDtPgQB968vuT24Y="; + rev = "refs/tags/v${version}"; + hash = "sha256-VfkJeHEdvRc0Khf/C7ZUNpjd6t+hUULCTXXY80rs4Ko="; }; build-system = with python3Packages; [ From e621565f8374130c0658a41ccb801b02136443aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 May 2024 02:29:51 +0000 Subject: [PATCH 76/98] python311Packages.pyduotecno: 2024.5.0 -> 2024.5.1 --- pkgs/development/python-modules/pyduotecno/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyduotecno/default.nix b/pkgs/development/python-modules/pyduotecno/default.nix index da84cb7bffe3..e8ea8acf0c4c 100644 --- a/pkgs/development/python-modules/pyduotecno/default.nix +++ b/pkgs/development/python-modules/pyduotecno/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyduotecno"; - version = "2024.5.0"; + version = "2024.5.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = "pyDuotecno"; rev = "refs/tags/${version}"; - hash = "sha256-59dwSr/IlNmHoJnPEBTR2FOXZ8JiFIo1V69/r0yxKNM="; + hash = "sha256-huzv7f1Aq/n3cD9S4oXqGQogq7VpPpzAUqkOhiB879A="; }; build-system = [ setuptools ]; From 7fc78a816dffb8bfbc61ef9422a5be98cd3bd672 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 May 2024 03:06:30 +0000 Subject: [PATCH 77/98] vscode-extensions.mgt19937.typst-preview: 0.11.4 -> 0.11.6 --- .../vscode/extensions/mgt19937.typst-preview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/mgt19937.typst-preview/default.nix b/pkgs/applications/editors/vscode/extensions/mgt19937.typst-preview/default.nix index 156e35ab06a0..615589bf8dd7 100644 --- a/pkgs/applications/editors/vscode/extensions/mgt19937.typst-preview/default.nix +++ b/pkgs/applications/editors/vscode/extensions/mgt19937.typst-preview/default.nix @@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "typst-preview"; publisher = "mgt19937"; - version = "0.11.4"; - hash = "sha256-GwlzFphZmP87pLys01+PWTv13imcdGjunCMH6atz9xs="; + version = "0.11.6"; + hash = "sha256-8//6eUzMg5AX9NNQm5mzNGlOG50Cxl0Rt1+dPq0J2DU="; }; buildInputs = [ typst-preview ]; From 100c1501e12b095f7fafa9ae17c59a07bd79acb4 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sun, 19 May 2024 04:47:36 +0200 Subject: [PATCH 78/98] nixos/loki: skip config validation when it's impossible to validate This is a follow-up to 8d7f3c9dbde7d235f3e256f2dc13ec07e68f60f6 and ae48735c531aaa01fb083333b1ec7e538c04b99d. Running the config validation in the build sandbox is impossible and will fail when using `cfg.configFile` or `-config.expand-env=true`. `cfg.configFile` is a string of a path which is simply not available to the build sandbox. Similarly, one may opt to use `cfg.configuration` with environment variables in combination with `-config.expand-env=true`. The environment variables referenced that way are also not available in the build sandbox. So we skip the validation when it's impossible (`cfg.configFile`) or likely impossible (`-config.expand-env=true`). An alternative approach would be something like nixos/prometheus' `services.prometheus.checkConfig` that takes a boolean and makes toggling the config validation user-facing. --- nixos/modules/services/monitoring/loki.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/loki.nix b/nixos/modules/services/monitoring/loki.nix index 9af1de6aa11f..de4f1bc7aa23 100644 --- a/nixos/modules/services/monitoring/loki.nix +++ b/nixos/modules/services/monitoring/loki.nix @@ -97,7 +97,12 @@ in { serviceConfig = let conf = if cfg.configFile == null - then prettyJSON cfg.configuration + then + # Config validation may fail when using extraFlags = [ "-config.expand-env=true" ]. + # To work around this, we simply skip it when extraFlags is not empty. + if cfg.extraFlags == [] + then validateConfig (prettyJSON cfg.configuration) + else prettyJSON cfg.configuration else cfg.configFile; validateConfig = file: pkgs.runCommand "validate-loki-conf" { @@ -108,7 +113,7 @@ in { ''; in { - ExecStart = "${cfg.package}/bin/loki --config.file=${validateConfig conf} ${escapeShellArgs cfg.extraFlags}"; + ExecStart = "${cfg.package}/bin/loki --config.file=${conf} ${escapeShellArgs cfg.extraFlags}"; User = cfg.user; Restart = "always"; PrivateTmp = true; From 05e7a44e94212100b5a34110b37d6319e8739d1d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 May 2024 03:29:17 +0000 Subject: [PATCH 79/98] python311Packages.griffe: 0.45.0 -> 0.45.1 --- pkgs/development/python-modules/griffe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index c913971f6d35..2fd12f938674 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.45.0"; + version = "0.45.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "griffe"; rev = "refs/tags/${version}"; - hash = "sha256-nczu6Neh1feSZyyMrXyiXU1aDIjOsX6RKqaH+Qw8yrQ="; + hash = "sha256-NmCnhImkdo2zAHhl2fLknV0rXXmJ9A+FL1uXUBF4IPk="; }; build-system = [ pdm-backend ]; From d95a9f092c37c20952c145063581dc1897e05112 Mon Sep 17 00:00:00 2001 From: "Winston R. Milling" Date: Sat, 18 May 2024 22:50:05 -0500 Subject: [PATCH 80/98] k3s_1_26: remove package --- .../cluster/k3s/1_26/chart-versions.nix | 10 ---------- .../networking/cluster/k3s/1_26/versions.nix | 14 -------------- .../networking/cluster/k3s/default.nix | 17 +++-------------- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix delete mode 100644 pkgs/applications/networking/cluster/k3s/1_26/versions.nix diff --git a/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix deleted file mode 100644 index a0341b7cbdec..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.2+up25.0.0.tgz"; - sha256 = "0jygzsn5pxzf7423x5iqfffgx5xvm7c7hfck46y7vpv1fdkiipcq"; - }; - traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.2+up25.0.0.tgz"; - sha256 = "1g9n19lnqdkmbbr3rnbwc854awha0kqqfwyxanyx1lg5ww8ldp89"; - }; -} diff --git a/pkgs/applications/networking/cluster/k3s/1_26/versions.nix b/pkgs/applications/networking/cluster/k3s/1_26/versions.nix deleted file mode 100644 index 6ac3414b1b0e..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_26/versions.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - k3sVersion = "1.26.15+k3s1"; - k3sCommit = "132972364806998c35d250153e2af245f9ecf18d"; - k3sRepoSha256 = "13iwmjxyf71l2g66kxdivnj21bf9lmr5p4qlp8kmysm23w2badj9"; - k3sVendorHash = "sha256-xoscRchOK4p3d1DAnxbJq7oIvxIn1twePmOBDdfXzw8="; - chartVersions = import ./chart-versions.nix; - k3sRootVersion = "0.12.2"; - k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; - k3sCNIVersion = "1.4.0-k3s2"; - k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; - containerdVersion = "1.7.11-k3s2.26"; - containerdSha256 = "0413a81kzb05xkklwyngg8g6a0w4icsi938rim69jmr2sijc89ww"; - criCtlVersion = "1.26.0-rc.0-k3s1"; -} diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 58984502d98f..6e7cfb0d1325 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -12,17 +12,7 @@ let extraArgs = builtins.removeAttrs args [ "callPackage" ]; in { - k3s_1_26 = common ( - (import ./1_26/versions.nix) - // { - updateScript = [ - ./update-script.sh - "26" - ]; - } - ) extraArgs; - - # 1_27 can be built with the same builder as 1_26 + # 1_27 can be built with the same builder as 1_30 k3s_1_27 = common ( (import ./1_27/versions.nix) // { @@ -33,7 +23,7 @@ in } ) extraArgs; - # 1_28 can be built with the same builder as 1_26 + # 1_28 can be built with the same builder as 1_30 k3s_1_28 = common ( (import ./1_28/versions.nix) // { @@ -44,7 +34,7 @@ in } ) extraArgs; - # 1_29 can be built with the same builder as 1_26 + # 1_29 can be built with the same builder as 1_30 k3s_1_29 = common ( (import ./1_29/versions.nix) // { @@ -55,7 +45,6 @@ in } ) extraArgs; - # 1_30 can be built with the same builder as 1_26 k3s_1_30 = common ( (import ./1_30/versions.nix) // { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cefca0ede904..0714c95f4f9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32047,7 +32047,7 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/k3s { buildGoModule = buildGo121Module; go = go_1_21; - }) k3s_1_26 k3s_1_27 k3s_1_28 k3s_1_29; + }) k3s_1_27 k3s_1_28 k3s_1_29; inherit (callPackage ../applications/networking/cluster/k3s { buildGoModule = buildGo122Module; go = go_1_22; From b94bc3b0c45d723a62703b2d74aef68144868a30 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 19 May 2024 00:52:46 -0300 Subject: [PATCH 81/98] nixos/rl-2405: k3s was upgraded to 1.30 Co-authored-by: @wrmilling --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 489474468466..83adc69a4ee1 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -219,7 +219,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m -- `k3s`: was updated to version [v1.29](https://github.com/k3s-io/k3s/releases/tag/v1.29.1%2Bk3s2), all previous versions (k3s_1_26, k3s_1_27, k3s_1_28) will be removed. See [changelog and upgrade notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.29.md#urgent-upgrade-notes) for more information. +- `k3s`: has been updated to version [v1.30](https://github.com/k3s-io/k3s/releases/tag/v1.30.0%2Bk3s1), previous supported versions are available under release specific names (e.g. k3s_1_27, k3s_1_28, and k3s_1_29) and present to help you migrate to the latest supported version. See [changelog and upgrade notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.30.md#changelog-since-v1290) for more information. - `himalaya` was updated to v1.0.0-beta.4, which introduces breaking changes. Check out the [release note](https://github.com/soywod/himalaya/releases/tag/v1.0.0-beta.4) for details. From 70e4cf2354cc94fc9351d477c302c5d3247863cc Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 19 May 2024 07:19:36 +0300 Subject: [PATCH 82/98] netcdffortran: fix darwin build (#312683) --- .../development/libraries/netcdf-fortran/default.nix | 12 ++++++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index 978f906b7adc..0edc956eee60 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, netcdf, hdf5, curl, gfortran, CoreFoundation }: +{ lib, stdenv, fetchFromGitHub, netcdf, hdf5, curl, gfortran, CoreFoundation, CoreServices, SystemConfiguration }: stdenv.mkDerivation rec { pname = "netcdf-fortran"; version = "4.4.5"; @@ -12,7 +12,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran ]; buildInputs = [ netcdf hdf5 curl ] - ++ lib.optional stdenv.isDarwin CoreFoundation; + ++ lib.optionals stdenv.isDarwin [ + CoreFoundation + CoreServices + SystemConfiguration + ]; + env.NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ + "-F${CoreServices}/Library/Frameworks" + "-F${SystemConfiguration}/Library/Frameworks" + ]); doCheck = true; FFLAGS = [ "-std=legacy" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82de9b0bdb77..1bff1bfb5cf3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10841,7 +10841,7 @@ with pkgs; netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { }; netcdffortran = callPackage ../development/libraries/netcdf-fortran { - inherit (darwin.apple_sdk.frameworks) CoreFoundation; + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices SystemConfiguration; }; networking-ts-cxx = callPackage ../development/libraries/networking-ts-cxx { }; From b8175944c8b90cd18848d7452c9c99882d9caa7b Mon Sep 17 00:00:00 2001 From: Mateusz Wykurz Date: Fri, 19 Apr 2024 22:43:55 -0600 Subject: [PATCH 83/98] rcp: 0.7.0 -> 0.9.0 --- pkgs/by-name/rc/rcp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix index f04fa7e769eb..d48b399c48ca 100644 --- a/pkgs/by-name/rc/rcp/package.nix +++ b/pkgs/by-name/rc/rcp/package.nix @@ -7,20 +7,20 @@ rustPlatform.buildRustPackage rec { pname = "rcp"; - version = "0.7.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "wykurz"; repo = "rcp"; rev = "v${version}"; - hash = "sha256-kVO2WMwB/Lv4fCcdXaWL/Gfmenky6uMNVrUwhWU9y7A="; + hash = "sha256-e6m3E1R7o4X9cPEy/ayUIsK0xhRaVsAFDAwObJrDJPA="; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit ]); - cargoHash = "sha256-Pa8YgFAT9nue/QLhHQm6PlTJU/myK60UcND5TthMOxc="; + cargoHash = "sha256-croFSe37yQa9LijaNxKHrZlcJdExz9SweOoG21PPn9E="; RUSTFLAGS = "--cfg tokio_unstable"; From 60626235f4d2786f2cdf632d8951aae105217160 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 May 2024 05:45:01 +0000 Subject: [PATCH 84/98] webcord: 4.9.1 -> 4.9.2 --- pkgs/by-name/we/webcord/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/webcord/package.nix b/pkgs/by-name/we/webcord/package.nix index f3fb33f5dcc4..f68f070465a7 100644 --- a/pkgs/by-name/we/webcord/package.nix +++ b/pkgs/by-name/we/webcord/package.nix @@ -11,16 +11,16 @@ buildNpmPackage rec { pname = "webcord"; - version = "4.9.1"; + version = "4.9.2"; src = fetchFromGitHub { owner = "SpacingBat3"; repo = "WebCord"; rev = "refs/tags/v${version}"; - hash = "sha256-sYTMfqZokwJ3CFtArkUckCpQlnyJ1BVpewU92sNaKC8="; + hash = "sha256-iuhi4ELHNPxFDz7cmiTFuUA8bf6VI2YXnHOTi69FloU="; }; - npmDepsHash = "sha256-LxOqpUVl2hXZrfTQfMz1+fVGRuNwG6dX03fGQVYmqq0="; + npmDepsHash = "sha256-xEXAaYW/2Wx0ar0l7jcSj0NBYKTsa7vHdykLlU0BkJE="; nativeBuildInputs = [ copyDesktopItems From 0c068a007b934c58100bfc964b0c17ce15823a01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 May 2024 05:54:48 +0000 Subject: [PATCH 85/98] sequoia-sqop: 0.32.0 -> 0.33.0 --- pkgs/tools/security/sequoia-sqop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/sequoia-sqop/default.nix b/pkgs/tools/security/sequoia-sqop/default.nix index b9be02160898..9bd5684f30c6 100644 --- a/pkgs/tools/security/sequoia-sqop/default.nix +++ b/pkgs/tools/security/sequoia-sqop/default.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { pname = "sequoia-sqop"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage rec { # generated etc repo = "sequoia-sop"; rev = "v${version}"; - hash = "sha256-6g6JVNlLi++XboU/ewHM7KM0tJlDayCoz1octKloQro="; + hash = "sha256-5XK5Cec6ojrpIncAtlp9jYr9KxmNYJKPhbsJraA0FA0="; }; - cargoHash = "sha256-Vci29mnFiRRbI45Qkj6t8aVrEaJdKVB01zTXHQT5ckw="; + cargoHash = "sha256-8ujQyG9qLuG8vjHoRtvpn4ka/Ft39u+NoxSZrD9NsfY="; nativeBuildInputs = [ pkg-config From 0f4f8ccccf6128dba91fa90bc8df3d4fd57daf06 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 19 May 2024 09:47:30 +0200 Subject: [PATCH 86/98] typst-preview: 0.11.4 -> 0.11.6 --- pkgs/by-name/ty/typst-preview/dom.json | 8 ++++---- pkgs/by-name/ty/typst-preview/frontend.json | 6 +++--- pkgs/by-name/ty/typst-preview/package.nix | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ty/typst-preview/dom.json b/pkgs/by-name/ty/typst-preview/dom.json index b607a990d978..c29dc931d121 100644 --- a/pkgs/by-name/ty/typst-preview/dom.json +++ b/pkgs/by-name/ty/typst-preview/dom.json @@ -13,12 +13,12 @@ "unlink:local": "yarn unlink @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer" }, "peerDependencies": { - "@myriaddreamin/typst-ts-renderer": "0.4.2-rc10", - "@myriaddreamin/typst.ts": "0.4.2-rc10" + "@myriaddreamin/typst-ts-renderer": "0.5.0-rc4", + "@myriaddreamin/typst.ts": "0.5.0-rc4" }, "devDependencies": { - "@myriaddreamin/typst-ts-renderer": "0.4.2-rc10", - "@myriaddreamin/typst.ts": "0.4.2-rc10", + "@myriaddreamin/typst-ts-renderer": "0.5.0-rc4", + "@myriaddreamin/typst.ts": "0.5.0-rc4", "typescript": "^5.0.2", "vite": "^4.3.9", "vite-plugin-singlefile": "^0.13.5", diff --git a/pkgs/by-name/ty/typst-preview/frontend.json b/pkgs/by-name/ty/typst-preview/frontend.json index 2a0439383a2b..a0d9417f0f91 100644 --- a/pkgs/by-name/ty/typst-preview/frontend.json +++ b/pkgs/by-name/ty/typst-preview/frontend.json @@ -13,9 +13,9 @@ "unlink:local": "yarn unlink @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer" }, "dependencies": { - "@myriaddreamin/typst-ts-renderer": "0.4.2-rc10", - "@myriaddreamin/typst.ts": "0.4.2-rc10", - "typst-dom": "file:../typst-dom", + "@myriaddreamin/typst-ts-renderer": "0.5.0-rc4", + "@myriaddreamin/typst.ts": "0.5.0-rc4", + "typst-dom": "link:../typst-dom", "rxjs": "^7.8.1" }, "devDependencies": { diff --git a/pkgs/by-name/ty/typst-preview/package.nix b/pkgs/by-name/ty/typst-preview/package.nix index 8bfd4e03991b..deb0981ca038 100644 --- a/pkgs/by-name/ty/typst-preview/package.nix +++ b/pkgs/by-name/ty/typst-preview/package.nix @@ -14,13 +14,13 @@ let # Keep the vscode "mgt19937.typst-preview" extension in sync when updating # this package at pkgs/applications/editors/vscode/extensions/default.nix - version = "0.11.4"; + version = "0.11.6"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typst-preview"; rev = "v${version}"; - hash = "sha256-5MbKp6j4+61Do8YH0xPIQPHEjU/kCKsMUUQDJDXzSMw="; + hash = "sha256-z01Xm2NLWGn0/jEiVmoJKqcEXT5gqLs3H805LPUMDJw="; fetchSubmodules = true; postFetch = '' @@ -41,7 +41,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${domSrc}/yarn.lock"; - hash = "sha256-QIGwHG0n6vYfAPA/+CdvK1c+QxM3XyoQdS/T4+TdsKs="; + hash = "sha256-XAVxUKf2XJCOUkAT+tTefAk8myGismhz1aOHosZA+d4="; }; buildPhase = '' @@ -67,7 +67,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${frontendSrc}/yarn.lock"; - hash = "sha256-QFiyUky/0BdB5vS9KX5xBOvBCEtJ+zZG4f7ai5j6V4U="; + hash = "sha256-jZZG8omzwrustcrdVb42nypu6JKXPW/fJn26NUrc/ZA="; }; packageResolutions = { inherit typst-dom; }; @@ -92,7 +92,7 @@ rustPlatform.buildRustPackage { pname = "typst-preview"; inherit version src; - cargoHash = "sha256-xj8Xvbz0NUy0BFoVS8ONiYZZQWIJu1FZxJkBEuABDOw="; + cargoHash = "sha256-Ay9YKTLks3ly0hftP7jHr7C1L5vuj1aK5lFWZiWlzNc="; nativeBuildInputs = [ pkg-config From 27ce0d6e0f5ba3783a0aaabe86b0356d26856eac Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 19 May 2024 09:56:57 +0200 Subject: [PATCH 87/98] typstyle: 0.11.16 -> 0.11.21 --- pkgs/by-name/ty/typstyle/package.nix | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index 1022537164f8..4a5d4a9807d5 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, fetchpatch , pkg-config , libgit2 , zlib @@ -11,30 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "typstyle"; - version = "0.11.16"; + version = "0.11.21"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; rev = "v${version}"; - hash = "sha256-ZmGrdAHbU4PQgd9haoVEZ8Wn8Scujm9bJAtvO2+aPoQ="; + hash = "sha256-dmHacYUL0Pig3SxSlRU4ddKzZmBJKDq/ulV3GDW7O1k="; }; - patches = [ - (fetchpatch { - # Trim whitespace patch - name = "whitespace-trim.patch"; - url = "https://github.com/Enter-tainer/typstyle/commit/127b7362f5938e091e2e5a33976ad3f63b6e4ee3.patch"; - hash = "sha256-Xzo51bgpEUKP7WDQ7BFNAZsyofPcPDIJMWOf4S+GGvI="; - }) - ]; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "typst-syntax-0.11.0" = "sha256-BezpRq5O89gLbpRtte539vlJ4G5yJ6VPJ8AaC7rQNc0="; - }; - }; + cargoHash = "sha256-D1IabmWlPwWnSdltDN+DViVpm4ue+ZFIQZrhL+YNeUU="; nativeBuildInputs = [ pkg-config From 9c32070f1f2090c4d5320b684792213d2cf6316b Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 19 May 2024 10:12:26 +0200 Subject: [PATCH 88/98] openjump: reformat with `nixfmt-rfc-style` --- pkgs/by-name/op/openjump/package.nix | 30 +++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/op/openjump/package.nix b/pkgs/by-name/op/openjump/package.nix index 003d330cb372..19e79b33ac1b 100644 --- a/pkgs/by-name/op/openjump/package.nix +++ b/pkgs/by-name/op/openjump/package.nix @@ -1,6 +1,15 @@ -{ lib, stdenv, fetchurl, unzip, makeWrapper -, coreutils, gawk, which, gnugrep, findutils -, jre +{ + lib, + stdenv, + fetchurl, + unzip, + makeWrapper, + coreutils, + gawk, + which, + gnugrep, + findutils, + jre, }: stdenv.mkDerivation rec { @@ -19,7 +28,10 @@ stdenv.mkDerivation rec { unzip $src -d $out/opt ''; - nativeBuildInputs = [ makeWrapper unzip ]; + nativeBuildInputs = [ + makeWrapper + unzip + ]; installPhase = '' dir=$(echo $out/opt/OpenJUMP-*) @@ -27,7 +39,15 @@ stdenv.mkDerivation rec { chmod +x "$dir/bin/oj_linux.sh" makeWrapper "$dir/bin/oj_linux.sh" $out/bin/OpenJump \ --set JAVA_HOME ${jre} \ - --set PATH ${lib.makeBinPath [ coreutils gawk which gnugrep findutils ]} + --set PATH ${ + lib.makeBinPath [ + coreutils + gawk + which + gnugrep + findutils + ] + } ''; meta = { From c3ccab0b92eec5962449c5469271f5966009d459 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 19 May 2024 10:13:18 +0200 Subject: [PATCH 89/98] openjump: use `finalAttrs` pattern --- pkgs/by-name/op/openjump/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openjump/package.nix b/pkgs/by-name/op/openjump/package.nix index 19e79b33ac1b..76faf889df3f 100644 --- a/pkgs/by-name/op/openjump/package.nix +++ b/pkgs/by-name/op/openjump/package.nix @@ -12,13 +12,13 @@ jre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openjump"; version = "2.2.1"; revision = "r5222%5B94156e5%5D"; src = fetchurl { - url = "mirror://sourceforge/jump-pilot/OpenJUMP/${version}/OpenJUMP-Portable-${version}-${revision}-PLUS.zip"; + url = "mirror://sourceforge/jump-pilot/OpenJUMP/${finalAttrs.version}/OpenJUMP-Portable-${finalAttrs.version}-${finalAttrs.revision}-PLUS.zip"; hash = "sha256-+/AMmD6NDPy+2Gq1Ji5i/QWGU7FOsU+kKsWoNXcx/VI="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = jre.meta.platforms; mainProgram = "OpenJump"; }; -} +}) From 1c82c619e6def18f456a31892d24cdf027c26790 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 19 May 2024 10:14:10 +0200 Subject: [PATCH 90/98] openjump: add missing phase hooks --- pkgs/by-name/op/openjump/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/op/openjump/package.nix b/pkgs/by-name/op/openjump/package.nix index 76faf889df3f..08fc4c8c6678 100644 --- a/pkgs/by-name/op/openjump/package.nix +++ b/pkgs/by-name/op/openjump/package.nix @@ -24,8 +24,10 @@ stdenv.mkDerivation (finalAttrs: { # TODO: build from source unpackPhase = '' + runHook preUnpack mkdir -p $out/opt unzip $src -d $out/opt + runHook postUnpack ''; nativeBuildInputs = [ @@ -34,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ]; installPhase = '' + runHook preInstall dir=$(echo $out/opt/OpenJUMP-*) chmod +x "$dir/bin/oj_linux.sh" @@ -48,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: { findutils ] } + runHook postInstall ''; meta = { From 120a1ee1260136cce385d450866cc432f2b78a94 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 19 May 2024 10:14:59 +0200 Subject: [PATCH 91/98] openjump: sort `meta` attributes --- pkgs/by-name/op/openjump/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openjump/package.nix b/pkgs/by-name/op/openjump/package.nix index 08fc4c8c6678..e78fcc76e855 100644 --- a/pkgs/by-name/op/openjump/package.nix +++ b/pkgs/by-name/op/openjump/package.nix @@ -57,10 +57,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Open source Geographic Information System (GIS) written in the Java programming language"; homepage = "http://www.openjump.org/"; - sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; license = lib.licenses.gpl2; + mainProgram = "OpenJump"; maintainers = lib.teams.geospatial.members ++ [ lib.maintainers.marcweber ]; platforms = jre.meta.platforms; - mainProgram = "OpenJump"; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; }; }) From 03dc987e7c6992d58892782b80728ae9293978c4 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 19 May 2024 10:15:33 +0200 Subject: [PATCH 92/98] openjump: use `makeBinaryWrapper` --- pkgs/by-name/op/openjump/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openjump/package.nix b/pkgs/by-name/op/openjump/package.nix index e78fcc76e855..f527bdd11aba 100644 --- a/pkgs/by-name/op/openjump/package.nix +++ b/pkgs/by-name/op/openjump/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, unzip, - makeWrapper, + makeBinaryWrapper, coreutils, gawk, which, @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ - makeWrapper + makeBinaryWrapper unzip ]; From de106b66b4ed05ad705c2ab9d5710cb2102a13f8 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 19 May 2024 10:47:45 +0200 Subject: [PATCH 93/98] racket-minimal: 8.12 -> 8.13 --- pkgs/development/interpreters/racket/minimal.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index 3b49a91614cd..a2a87873d2e8 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -6,7 +6,7 @@ racket.overrideAttrs (oldAttrs: rec { version = oldAttrs.version; src = oldAttrs.src.override { name = "${pname}-${version}"; - hash = "sha256-ZbE5I2dnPY0GamerTFPFWz53+V1Xxhtx3AVp2KpF7vw="; + hash = "sha256-9fotAmBj72eRl+n4Paigs+PQs8BezUqWLEzjI6RBYzc="; }; meta = oldAttrs.meta // { From 78189e06e1e8a73c9458c7f922a5f766f5f11b71 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 19 May 2024 10:48:42 +0200 Subject: [PATCH 94/98] racket: reformat using `nixfmt-rfc-style` --- .../interpreters/racket/default.nix | 218 +++++++++++------- .../interpreters/racket/minimal.nix | 17 +- .../interpreters/racket/racket_7_9.nix | 117 ++++++---- 3 files changed, 223 insertions(+), 129 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index e74dd1a82c27..1edfefddd0cd 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -1,77 +1,110 @@ -{ lib, stdenv, fetchurl, makeFontsConf -, cacert -, cairo, coreutils, fontconfig, freefont_ttf -, glib, gmp -, gtk3 -, glibcLocales -, libedit, libffi -, libiconv -, libGL -, libGLU -, libjpeg -, ncurses -, libpng, libtool, mpfr, openssl, pango, poppler -, readline, sqlite -, disableDocs ? false -, CoreFoundation -, gsettings-desktop-schemas -, wrapGAppsHook3 +{ + lib, + stdenv, + fetchurl, + makeFontsConf, + cacert, + cairo, + coreutils, + fontconfig, + freefont_ttf, + glib, + gmp, + gtk3, + glibcLocales, + libedit, + libffi, + libiconv, + libGL, + libGLU, + libjpeg, + ncurses, + libpng, + libtool, + mpfr, + openssl, + pango, + poppler, + readline, + sqlite, + disableDocs ? false, + CoreFoundation, + gsettings-desktop-schemas, + wrapGAppsHook3, }: let - fontsConf = makeFontsConf { - fontDirectories = [ freefont_ttf ]; - }; - - libPath = lib.makeLibraryPath ([ - cairo - fontconfig - glib - gmp - gtk3 - gsettings-desktop-schemas - libedit - libjpeg - libpng - mpfr - ncurses - openssl - pango - poppler - readline - sqlite - ] ++ lib.optionals (!stdenv.isDarwin) [ - libGL - libGLU - ]); + fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; + libPath = lib.makeLibraryPath ( + [ + cairo + fontconfig + glib + gmp + gtk3 + gsettings-desktop-schemas + libedit + libjpeg + libpng + mpfr + ncurses + openssl + pango + poppler + readline + sqlite + ] + ++ lib.optionals (!stdenv.isDarwin) [ + libGL + libGLU + ] + ); in stdenv.mkDerivation rec { pname = "racket"; version = "8.13"; # always change at once with ./minimal.nix - src = (lib.makeOverridable ({ name, hash }: - fetchurl { - url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - inherit hash; - } - )) { - name = "${pname}-${version}"; - hash = "sha256-AB4EkgRAtlic9i1Wd9GMwv9q6Puvd+Y7iozyCJBoX7w="; - }; + src = + (lib.makeOverridable ( + { name, hash }: + fetchurl { + url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; + inherit hash; + } + )) + { + name = "${pname}-${version}"; + hash = "sha256-AB4EkgRAtlic9i1Wd9GMwv9q6Puvd+Y7iozyCJBoX7w="; + }; FONTCONFIG_FILE = fontsConf; LD_LIBRARY_PATH = libPath; NIX_LDFLAGS = lib.concatStringsSep " " [ - (lib.optionalString (stdenv.cc.isGNU && ! stdenv.isDarwin) "-lgcc_s") + (lib.optionalString (stdenv.cc.isGNU && !stdenv.isDarwin) "-lgcc_s") ]; - nativeBuildInputs = [ cacert wrapGAppsHook3 ]; + nativeBuildInputs = [ + cacert + wrapGAppsHook3 + ]; - buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ncurses ] - ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ]; + buildInputs = + [ + fontconfig + libffi + libtool + sqlite + gsettings-desktop-schemas + gtk3 + ncurses + ] + ++ lib.optionals stdenv.isDarwin [ + libiconv + CoreFoundation + ]; patches = [ # Hardcode variant detection because we wrap the Racket binary making it @@ -87,32 +120,34 @@ stdenv.mkDerivation rec { ./force-remove-codesign-then-add.patch ]; - preConfigure = '' - unset AR - for f in src/lt/configure src/cs/c/configure src/bc/src/string.c; do - substituteInPlace "$f" \ - --replace /usr/bin/uname ${coreutils}/bin/uname \ - --replace /bin/cp ${coreutils}/bin/cp \ - --replace /bin/ln ${coreutils}/bin/ln \ - --replace /bin/rm ${coreutils}/bin/rm \ - --replace /bin/true ${coreutils}/bin/true - done + preConfigure = + '' + unset AR + for f in src/lt/configure src/cs/c/configure src/bc/src/string.c; do + substituteInPlace "$f" \ + --replace /usr/bin/uname ${coreutils}/bin/uname \ + --replace /bin/cp ${coreutils}/bin/cp \ + --replace /bin/ln ${coreutils}/bin/ln \ + --replace /bin/rm ${coreutils}/bin/rm \ + --replace /bin/true ${coreutils}/bin/true + done - # The configure script forces using `libtool -o` as AR on Darwin. But, the - # `-o` option is only available from Apple libtool. GNU ar works here. - substituteInPlace src/ChezScheme/zlib/configure \ - --replace 'ARFLAGS="-o"' 'AR=ar; ARFLAGS="rc"' + # The configure script forces using `libtool -o` as AR on Darwin. But, the + # `-o` option is only available from Apple libtool. GNU ar works here. + substituteInPlace src/ChezScheme/zlib/configure \ + --replace 'ARFLAGS="-o"' 'AR=ar; ARFLAGS="rc"' - mkdir src/build - cd src/build + mkdir src/build + cd src/build - '' + lib.optionalString stdenv.isLinux '' - gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${libPath}) - gappsWrapperArgs+=("--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive") - '' + lib.optionalString stdenv.isDarwin '' - gappsWrapperArgs+=("--prefix" "DYLD_LIBRARY_PATH" ":" ${libPath}) - '' - ; + '' + + lib.optionalString stdenv.isLinux '' + gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${libPath}) + gappsWrapperArgs+=("--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive") + '' + + lib.optionalString stdenv.isDarwin '' + gappsWrapperArgs+=("--prefix" "DYLD_LIBRARY_PATH" ":" ${libPath}) + ''; preBuild = lib.optionalString stdenv.isDarwin '' # Cannot set DYLD_LIBRARY_PATH as an attr of this drv, becasue dynamic @@ -129,9 +164,16 @@ stdenv.mkDerivation rec { ''; shared = if stdenv.isDarwin then "dylib" else "shared"; - configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ] - ++ lib.optionals disableDocs [ "--disable-docs" ] - ++ lib.optionals stdenv.isDarwin [ "--disable-strip" "--enable-xonx" ]; + configureFlags = + [ + "--enable-${shared}" + "--enable-lt=${libtool}/bin/libtool" + ] + ++ lib.optionals disableDocs [ "--disable-docs" ] + ++ lib.optionals stdenv.isDarwin [ + "--disable-strip" + "--enable-xonx" + ]; configureScript = "../configure"; @@ -152,8 +194,16 @@ stdenv.mkDerivation rec { ''; homepage = "https://racket-lang.org/"; changelog = "https://github.com/racket/racket/releases/tag/v${version}"; - license = with licenses; [ asl20 /* or */ mit ]; + license = with licenses; [ + asl20 # or + mit + ]; maintainers = with maintainers; [ vrthra ]; - platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; + platforms = [ + "x86_64-darwin" + "x86_64-linux" + "aarch64-linux" + "aarch64-darwin" + ]; }; } diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index a2a87873d2e8..42cf8de9526d 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -1,5 +1,4 @@ -{ racket -}: +{ racket }: racket.overrideAttrs (oldAttrs: rec { pname = "racket-minimal"; @@ -11,10 +10,16 @@ racket.overrideAttrs (oldAttrs: rec { meta = oldAttrs.meta // { description = "Racket without bundled packages, such as Dr. Racket"; - longDescription = ''The essential package racket-libs is included, - as well as libraries that live in collections. In particular, raco - and the pkg library are still bundled. + longDescription = '' + The essential package racket-libs is included, + as well as libraries that live in collections. In particular, raco + and the pkg library are still bundled. ''; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; }; }) diff --git a/pkgs/development/interpreters/racket/racket_7_9.nix b/pkgs/development/interpreters/racket/racket_7_9.nix index 78efe8e2914c..1446be8f2460 100644 --- a/pkgs/development/interpreters/racket/racket_7_9.nix +++ b/pkgs/development/interpreters/racket/racket_7_9.nix @@ -1,26 +1,39 @@ -{ lib, stdenv, fetchurl, makeFontsConf -, cacert -, cairo, coreutils, fontconfig, freefont_ttf -, glib, gmp -, gtk3 -, libedit, libffi -, libiconv -, libGL -, libGLU -, libjpeg -, libpng, libtool, mpfr, openssl, pango, poppler -, readline, sqlite -, disableDocs ? false -, CoreFoundation -, gsettings-desktop-schemas -, wrapGAppsHook3 +{ + lib, + stdenv, + fetchurl, + makeFontsConf, + cacert, + cairo, + coreutils, + fontconfig, + freefont_ttf, + glib, + gmp, + gtk3, + libedit, + libffi, + libiconv, + libGL, + libGLU, + libjpeg, + libpng, + libtool, + mpfr, + openssl, + pango, + poppler, + readline, + sqlite, + disableDocs ? false, + CoreFoundation, + gsettings-desktop-schemas, + wrapGAppsHook3, }: let - fontsConf = makeFontsConf { - fontDirectories = [ freefont_ttf ]; - }; + fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; libPath = lib.makeLibraryPath [ cairo @@ -41,34 +54,50 @@ let readline sqlite ]; - in stdenv.mkDerivation rec { pname = "racket"; version = "7.9"; # always change at once with ./minimal.nix - src = (lib.makeOverridable ({ name, sha256 }: - fetchurl { - url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - inherit sha256; - } - )) { - name = "${pname}-${version}"; - sha256 = "0gmp2ahmfd97nn9bwpfx9lznjmjkd042slnrrbdmyh59cqh98y2m"; - }; + src = + (lib.makeOverridable ( + { name, sha256 }: + fetchurl { + url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; + inherit sha256; + } + )) + { + name = "${pname}-${version}"; + sha256 = "0gmp2ahmfd97nn9bwpfx9lznjmjkd042slnrrbdmyh59cqh98y2m"; + }; FONTCONFIG_FILE = fontsConf; LD_LIBRARY_PATH = libPath; NIX_LDFLAGS = lib.concatStringsSep " " [ - (lib.optionalString (stdenv.cc.isGNU && ! stdenv.isDarwin) "-lgcc_s") + (lib.optionalString (stdenv.cc.isGNU && !stdenv.isDarwin) "-lgcc_s") (lib.optionalString stdenv.isDarwin "-framework CoreFoundation") ]; - nativeBuildInputs = [ cacert wrapGAppsHook3 ]; + nativeBuildInputs = [ + cacert + wrapGAppsHook3 + ]; - buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ] - ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ]; + buildInputs = + [ + fontconfig + libffi + libtool + sqlite + gsettings-desktop-schemas + gtk3 + ] + ++ lib.optionals stdenv.isDarwin [ + libiconv + CoreFoundation + ]; preConfigure = '' unset AR @@ -82,15 +111,18 @@ stdenv.mkDerivation rec { ''; shared = if stdenv.isDarwin then "dylib" else "shared"; - configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ] - ++ lib.optionals disableDocs [ "--disable-docs" ] - ++ lib.optionals stdenv.isDarwin [ "--enable-xonx" ]; + configureFlags = + [ + "--enable-${shared}" + "--enable-lt=${libtool}/bin/libtool" + ] + ++ lib.optionals disableDocs [ "--disable-docs" ] + ++ lib.optionals stdenv.isDarwin [ "--enable-xonx" ]; configureScript = "../configure"; enableParallelBuilding = false; - meta = with lib; { description = "A programmable programming language"; longDescription = '' @@ -103,9 +135,16 @@ stdenv.mkDerivation rec { GUIs and charts. ''; homepage = "https://racket-lang.org/"; - license = with licenses; [ asl20 /* or */ mit ]; + license = with licenses; [ + asl20 # or + mit + ]; maintainers = with maintainers; [ vrthra ]; - platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" ]; + platforms = [ + "x86_64-darwin" + "x86_64-linux" + "aarch64-linux" + ]; broken = stdenv.isDarwin; # No support yet for setting FFI lookup path }; } From 747f8f5159053c3e45a34542d0485248b7e802be Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 19 May 2024 13:04:12 +0200 Subject: [PATCH 95/98] twitch-dl: 2.3.0 -> 2.3.1 Diff: https://github.com/ihabunek/twitch-dl/compare/refs/tags/2.3.0...2.3.1 Changelog: https://github.com/ihabunek/twitch-dl/blob/refs/tags/2.3.1/CHANGELOG.md --- pkgs/by-name/tw/twitch-dl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tw/twitch-dl/package.nix b/pkgs/by-name/tw/twitch-dl/package.nix index fa78dc273c75..81c444ea340f 100644 --- a/pkgs/by-name/tw/twitch-dl/package.nix +++ b/pkgs/by-name/tw/twitch-dl/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "twitch-dl"; - version = "2.3.0"; + version = "2.3.1"; pyproject = true; src = fetchFromGitHub { owner = "ihabunek"; repo = "twitch-dl"; rev = "refs/tags/${version}"; - hash = "sha256-0uOOc3ANXleQlENB+gdWheafBiOOcyZsFvYj7r+WMCY="; + hash = "sha256-ixkIDJbysa3TOJiNmAG2SuJwCv5MaX6nCtUnS4901rg="; }; pythonRelaxDeps = [ From bcdbb17a41d8fab94e8031a7c5e180fa5acd0809 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 May 2024 11:11:16 +0000 Subject: [PATCH 96/98] php81Packages.phpstan: 1.11.0 -> 1.11.1 --- pkgs/development/php-packages/phpstan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index da7d11a870ff..1016e27d8322 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -6,16 +6,16 @@ php.buildComposerProject (finalAttrs: { pname = "phpstan"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan-src"; rev = finalAttrs.version; - hash = "sha256-zf6u7fGMMx+DeXcS4SxyK3aQ53jnXzQ8YPrJ89vG65Y="; + hash = "sha256-CMIWxxryDDA38uyGl3SIooliU0ElAY1iAqnexn2Uq58="; }; - vendorHash = "sha256-Uv2BoE/hTK59uxHsdm4M5hfozDw4LwwZH4MHd+vN60Y="; + vendorHash = "sha256-CSkwBBV6b2inpQu4TKBR23Du11mzr3rV6GtprzHAOgQ="; composerStrictValidation = false; meta = { From 4dcdfe98f6c0ce227a61a948583d3b2c96c7da57 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 19 May 2024 13:44:46 +0200 Subject: [PATCH 97/98] robo: 4.0.7 -> 5.0.0 --- pkgs/by-name/ro/robo/package.nix | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ro/robo/package.nix b/pkgs/by-name/ro/robo/package.nix index 7310488376dd..adde9d7c2d50 100644 --- a/pkgs/by-name/ro/robo/package.nix +++ b/pkgs/by-name/ro/robo/package.nix @@ -1,21 +1,32 @@ { - lib -, php -, fetchFromGitHub + lib, + php82, + fetchFromGitHub, + fetchpatch, }: -php.buildComposerProject (finalAttrs: { +php82.buildComposerProject (finalAttrs: { pname = "robo"; - version = "4.0.6"; + version = "5.0.0"; src = fetchFromGitHub { owner = "consolidation"; repo = "robo"; rev = finalAttrs.version; - hash = "sha256-rpCs24Q15XM4BdW1+IfysFR/8/ZU4o5b4MyJL48uDaU="; + hash = "sha256-tibG2sR5CsRnUjZEvOewX/fyMuAS1kgKjYbrkk+f0BI="; }; - vendorHash = "sha256-Ul8XjH0Nav37UVpNQslOkF2bkiyqUAEZiIbcSW2tGkQ="; + patches = [ + # Fix the version number + # Most likely to remove at the next bump update + # See https://github.com/drupol/robo/pull/1 + (fetchpatch { + url = "https://github.com/drupol/robo/commit/c3cd001525c1adb5980a3a18a5561a0a5bbe1f50.patch"; + hash = "sha256-iMdZx+Bldmf1IS6Ypoet7GSsE6J9ZnE0HTskznkyEKM="; + }) + ]; + + vendorHash = "sha256-RRnHv6sOYm8fYhY3Q6m5sFDflFXd9b9LPcAqk/D1jdE="; meta = { changelog = "https://github.com/consolidation/robo/blob/${finalAttrs.version}/CHANGELOG.md"; From 8e008e152c91c58ed99e5affcfb273f805958a32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 May 2024 12:29:52 +0000 Subject: [PATCH 98/98] cargo-crev: 0.25.6 -> 0.25.9 --- pkgs/development/tools/rust/cargo-crev/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index 832d736a9771..1d67dce2811d 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.25.6"; + version = "0.25.9"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "sha256-kMbbUXiU549JwblLzcP4X5rs6Qu8vaLKB5rnZSpKHKQ="; + sha256 = "sha256-ZevtYJ1ibSs3an3m1KJNTTquz1w6UfTiFgd1mNHFHWE="; }; - cargoHash = "sha256-gUHy8yXTiQd3/7IyVmiq0QqXKF4ZVhF+riryEj/w2NI="; + cargoHash = "sha256-QHhfHm2fDFR5BpSnw1wzr3dfCWDTzWNDDdRtj2qOoKE="; preCheck = '' export HOME=$(mktemp -d)