diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 828482c1caf1f..0072f5ab68262 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9532,6 +9532,12 @@ githubId = 1592375; name = "Walter Huf"; }; + huggy = { + email = "nixpkgs@huggy.moe"; + github = "makeding"; + githubId = 6511667; + name = "huggy"; + }; hughmandalidis = { name = "Hugh Mandalidis"; email = "mandalidis.hugh@gmail.com"; @@ -14243,6 +14249,12 @@ githubId = 585424; name = "Massimo Gengarelli"; }; + MasterEvarior = { + email = "nix-maintainer@giannin.ch"; + github = "MasterEvarior"; + githubId = 36074738; + name = "MasterEvarior"; + }; matdibu = { email = "contact@mateidibu.dev"; github = "matdibu"; @@ -15744,6 +15756,13 @@ githubId = 2176611; name = "Marko Poikonen"; }; + mtpham99 = { + name = "Matthew Pham"; + email = "mtpham.nixos@protonmail.com"; + github = "mtpham99"; + githubId = 72663763; + keys = [ { fingerprint = "DB3E A12D B291 594A 79C5 F6B3 10AB 6868 37F6 FA3F"; } ]; + }; mtreca = { email = "maxime.treca@gmail.com"; github = "mtreca"; @@ -17349,6 +17368,12 @@ githubId = 108072; name = "Slawomir Gonet"; }; + oughie = { + name = "Oughie"; + email = "oughery@gmail.com"; + github = "Oughie"; + githubId = 123173954; + }; outfoxxed = { name = "outfoxxed"; email = "nixpkgs@outfoxxed.me"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 627d2bfe0857e..f384eb18e7473 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -46,10 +46,11 @@ with lib.maintainers; android = { members = [ - numinit + adrian-gierakowski hadilq + johnrtitor + numinit RossComputerGuy - adrian-gierakowski ]; scope = "Maintain Android-related tooling in nixpkgs."; githubTeams = [ "android" ]; diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 0bef956556049..5c6bc0ab47d8f 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -221,6 +221,8 @@ word-breaking. So you want to write `extraArgs = [ "--prefer" "spaced pat" ]` rather than previous `extraArgs = [ "--prefer 'spaced pat'" ]`. +- `nodePackages."@commitlint/config-conventional"` has been removed, as it is a library, and projects should depend on it instead. + - `nodePackages.vls` has been deprecated, as the upstream consumer of it, vetur, has been deprecated by upstream. Upstream suggests migrating to Volar for Vue LSP tooling instead. - `nodePackages.create-react-native-app` has been removed, as it is deprecated. Upstream suggests using a framework for React Native apps instead. @@ -466,6 +468,8 @@ - `gerbera` now has wavpack support. +- `ddclient` was updated from 3.11.2 to 4.0.0 [Release notes](https://github.com/ddclient/ddclient/releases/tag/v4.0.0) + ```{=include=} sections diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index e4d03f39018e2..3731b011a8455 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -4,7 +4,7 @@ { config, lib, pkgs, ... }: let - makeProg = args: pkgs.substituteAll (args // { + makeProg = args: pkgs.replaceVarsWith (args // { dir = "bin"; isExecutable = true; nativeBuildInputs = [ @@ -18,28 +18,32 @@ let nixos-generate-config = makeProg { name = "nixos-generate-config"; src = ./nixos-generate-config.pl; - perl = "${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl"; - hostPlatformSystem = pkgs.stdenv.hostPlatform.system; - detectvirt = "${config.systemd.package}/bin/systemd-detect-virt"; - btrfs = "${pkgs.btrfs-progs}/bin/btrfs"; - inherit (config.system.nixos-generate-config) configuration desktopConfiguration; - xserverEnabled = config.services.xserver.enable; + replacements = { + perl = "${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl"; + hostPlatformSystem = pkgs.stdenv.hostPlatform.system; + detectvirt = "${config.systemd.package}/bin/systemd-detect-virt"; + btrfs = "${pkgs.btrfs-progs}/bin/btrfs"; + inherit (config.system.nixos-generate-config) configuration desktopConfiguration; + xserverEnabled = config.services.xserver.enable; + }; manPage = ./manpages/nixos-generate-config.8; }; nixos-version = makeProg { name = "nixos-version"; src = ./nixos-version.sh; - inherit (pkgs) runtimeShell; - inherit (config.system.nixos) version codeName revision; - inherit (config.system) configurationRevision; - json = builtins.toJSON ({ - nixosVersion = config.system.nixos.version; - } // lib.optionalAttrs (config.system.nixos.revision != null) { - nixpkgsRevision = config.system.nixos.revision; - } // lib.optionalAttrs (config.system.configurationRevision != null) { - configurationRevision = config.system.configurationRevision; - }); + replacements = { + inherit (pkgs) runtimeShell; + inherit (config.system.nixos) version codeName revision; + inherit (config.system) configurationRevision; + json = builtins.toJSON ({ + nixosVersion = config.system.nixos.version; + } // lib.optionalAttrs (config.system.nixos.revision != null) { + nixpkgsRevision = config.system.nixos.revision; + } // lib.optionalAttrs (config.system.configurationRevision != null) { + configurationRevision = config.system.configurationRevision; + }); + }; manPage = ./manpages/nixos-version.8; }; diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 69c3f25d1870c..f4caf21dc3b25 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -94,7 +94,7 @@ let ++ optional (pskString != null) "psk=${pskString}" ++ optionals (opts.auth != null) (filter (x: x != "") (splitString "\n" opts.auth)) ++ optional (opts.priority != null) "priority=${toString opts.priority}" - ++ optional (opts.extraConfig != "") opts.extraConfig; + ++ filter (x: x != "") (splitString "\n" opts.extraConfig); in '' network={ diff --git a/nixos/modules/services/search/hound.nix b/nixos/modules/services/search/hound.nix index 33ade1b963b4a..98ef752aa8e8c 100644 --- a/nixos/modules/services/search/hound.nix +++ b/nixos/modules/services/search/hound.nix @@ -7,6 +7,13 @@ let cfg = config.services.hound; settingsFormat = pkgs.formats.json { }; + houndConfigFile = pkgs.writeTextFile { + name = "hound-config.json"; + text = builtins.toJSON cfg.settings; + checkPhase = '' + ${cfg.package}/bin/houndd -check-conf -conf $out + ''; + }; in { imports = [ @@ -96,13 +103,7 @@ in }; }; - environment.etc."hound/config.json".source = pkgs.writeTextFile { - name = "hound-config"; - text = builtins.toJSON cfg.settings; - checkPhase = '' - ${cfg.package}/bin/houndd -check-conf -conf $out - ''; - }; + environment.etc."hound/config.json".source = houndConfigFile; services.hound.settings = { dbpath = "${config.services.hound.home}/data"; @@ -112,6 +113,7 @@ in description = "Hound Code Search"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; + restartTriggers = [ houndConfigFile ]; serviceConfig = { User = cfg.user; Group = cfg.group; diff --git a/nixos/modules/services/security/canaille.nix b/nixos/modules/services/security/canaille.nix index 427ecaffde219..4489b5f71c1ed 100644 --- a/nixos/modules/services/security/canaille.nix +++ b/nixos/modules/services/security/canaille.nix @@ -33,9 +33,12 @@ let old.dependencies ++ old.optional-dependencies.front ++ old.optional-dependencies.oidc + ++ old.optional-dependencies.scim ++ old.optional-dependencies.ldap ++ old.optional-dependencies.sentry - ++ old.optional-dependencies.postgresql; + ++ old.optional-dependencies.postgresql + ++ old.optional-dependencies.otp + ++ old.optional-dependencies.sms; makeWrapperArgs = (old.makeWrapperArgs or [ ]) ++ [ "--set CONFIG /etc/canaille/config.toml" "--set SECRETS_DIR \"${secretsDir}\"" diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 6f0f62546a018..3e88d43bd9a11 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -527,7 +527,7 @@ sub addGeneration { my @links = sort (glob "$path/specialisation/*"); if ($current != 1 && scalar(@links) != 0) { - $conf .= "submenu \"> $name$nameSuffix\" --class submenu {\n"; + $conf .= "submenu \"$name$nameSuffix\" --class submenu {\n"; } addEntry("$name" . (scalar(@links) == 0 ? "" : " - Default") . $nameSuffix, $path, $options, $current); diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 85fcbb83cecee..e5080bd8d191a 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -31,7 +31,7 @@ let edk2ShellEspPath = "efi/edk2-uefi-shell/shell.efi"; - systemdBootBuilder = pkgs.substituteAll rec { + systemdBootBuilder = pkgs.replaceVarsWith { name = "systemd-boot"; dir = "bin"; @@ -40,68 +40,66 @@ let isExecutable = true; - inherit (builtins) storeDir; + replacements = rec { + inherit (builtins) storeDir; - inherit (pkgs) python3; + inherit (pkgs) python3; - systemd = config.systemd.package; + systemd = config.systemd.package; - bootspecTools = pkgs.bootspec; + bootspecTools = pkgs.bootspec; - nix = config.nix.package.out; + nix = config.nix.package.out; - timeout = if config.boot.loader.timeout == null then "menu-force" else config.boot.loader.timeout; + timeout = if config.boot.loader.timeout == null then "menu-force" else config.boot.loader.timeout; - configurationLimit = if cfg.configurationLimit == null then 0 else cfg.configurationLimit; + configurationLimit = if cfg.configurationLimit == null then 0 else cfg.configurationLimit; - inherit (cfg) - consoleMode - graceful - editor - rebootForBitlocker - ; + inherit (cfg) + consoleMode + graceful + editor + rebootForBitlocker + ; - inherit (efi) efiSysMountPoint canTouchEfiVariables; + inherit (efi) efiSysMountPoint canTouchEfiVariables; - bootMountPoint = - if cfg.xbootldrMountPoint != null then cfg.xbootldrMountPoint else efi.efiSysMountPoint; + bootMountPoint = + if cfg.xbootldrMountPoint != null then cfg.xbootldrMountPoint else efi.efiSysMountPoint; - nixosDir = "/EFI/nixos"; + nixosDir = "/EFI/nixos"; - inherit (config.system.nixos) distroName; + inherit (config.system.nixos) distroName; - memtest86 = optionalString cfg.memtest86.enable pkgs.memtest86plus; - - netbootxyz = optionalString cfg.netbootxyz.enable pkgs.netbootxyz-efi; + checkMountpoints = pkgs.writeShellScript "check-mountpoints" '' + fail() { + echo "$1 = '$2' is not a mounted partition. Is the path configured correctly?" >&2 + exit 1 + } + ${pkgs.util-linuxMinimal}/bin/findmnt ${efiSysMountPoint} > /dev/null || fail efiSysMountPoint ${efiSysMountPoint} + ${lib.optionalString (cfg.xbootldrMountPoint != null) + "${pkgs.util-linuxMinimal}/bin/findmnt ${cfg.xbootldrMountPoint} > /dev/null || fail xbootldrMountPoint ${cfg.xbootldrMountPoint}" + } + ''; - checkMountpoints = pkgs.writeShellScript "check-mountpoints" '' - fail() { - echo "$1 = '$2' is not a mounted partition. Is the path configured correctly?" >&2 - exit 1 - } - ${pkgs.util-linuxMinimal}/bin/findmnt ${efiSysMountPoint} > /dev/null || fail efiSysMountPoint ${efiSysMountPoint} - ${lib.optionalString (cfg.xbootldrMountPoint != null) - "${pkgs.util-linuxMinimal}/bin/findmnt ${cfg.xbootldrMountPoint} > /dev/null || fail xbootldrMountPoint ${cfg.xbootldrMountPoint}" - } - ''; - - copyExtraFiles = pkgs.writeShellScript "copy-extra-files" '' - empty_file=$(${pkgs.coreutils}/bin/mktemp) - - ${concatStrings ( - mapAttrsToList (n: v: '' - ${pkgs.coreutils}/bin/install -Dp "${v}" "${bootMountPoint}/"${escapeShellArg n} - ${pkgs.coreutils}/bin/install -D $empty_file "${bootMountPoint}/${nixosDir}/.extra-files/"${escapeShellArg n} - '') cfg.extraFiles - )} - - ${concatStrings ( - mapAttrsToList (n: v: '' - ${pkgs.coreutils}/bin/install -Dp "${pkgs.writeText n v}" "${bootMountPoint}/loader/entries/"${escapeShellArg n} - ${pkgs.coreutils}/bin/install -D $empty_file "${bootMountPoint}/${nixosDir}/.extra-files/loader/entries/"${escapeShellArg n} - '') cfg.extraEntries - )} - ''; + copyExtraFiles = pkgs.writeShellScript "copy-extra-files" '' + empty_file=$(${pkgs.coreutils}/bin/mktemp) + + ${concatStrings ( + mapAttrsToList (n: v: '' + ${pkgs.coreutils}/bin/install -Dp "${v}" "${bootMountPoint}/"${escapeShellArg n} + ${pkgs.coreutils}/bin/install -D $empty_file "${bootMountPoint}/${nixosDir}/.extra-files/"${escapeShellArg n} + '') cfg.extraFiles + )} + + ${concatStrings ( + mapAttrsToList (n: v: '' + ${pkgs.coreutils}/bin/install -Dp "${pkgs.writeText n v}" "${bootMountPoint}/loader/entries/"${escapeShellArg n} + ${pkgs.coreutils}/bin/install -D $empty_file "${bootMountPoint}/${nixosDir}/.extra-files/loader/entries/"${escapeShellArg n} + '') cfg.extraEntries + )} + ''; + }; }; finalSystemdBootBuilder = pkgs.writeScript "install-systemd-boot.sh" '' diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 384371033c727..4dfc0e1e7831e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -975,6 +975,7 @@ in { spark = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./spark {}; spiped = runTest ./spiped.nix; sqlite3-to-mysql = handleTest ./sqlite3-to-mysql.nix {}; + squid = handleTest ./squid.nix {}; sslh = handleTest ./sslh.nix {}; ssh-agent-auth = handleTest ./ssh-agent-auth.nix {}; ssh-audit = handleTest ./ssh-audit.nix {}; diff --git a/nixos/tests/hound.nix b/nixos/tests/hound.nix index 75400eca232bd..b73ba27bed296 100644 --- a/nixos/tests/hound.nix +++ b/nixos/tests/hound.nix @@ -11,17 +11,15 @@ import ./make-test-python.nix ( { services.hound = { enable = true; - config = '' - { - "max-concurrent-indexers": 1, - "dbpath": "/var/lib/hound/data", - "repos": { - "nix": { - "url": "file:///var/lib/hound/my-git" - } - } - } - ''; + settings = { + "max-concurrent-indexers" = 1; + "dbpath" = "/var/lib/hound/data"; + "repos" = { + "nix" = { + "url" = "file:///var/lib/hound/my-git"; + }; + }; + }; }; systemd.services.houndseed = { diff --git a/nixos/tests/squid.nix b/nixos/tests/squid.nix new file mode 100644 index 0000000000000..7b38e5c75b105 --- /dev/null +++ b/nixos/tests/squid.nix @@ -0,0 +1,165 @@ +# This is a distributed test of the Squid as a forward proxy +# - "external" -- i.e. the internet, where the proxy and server communicate +# - "internal" -- i.e. an office LAN, where the client and proxy communicat + +import ./make-test-python.nix ( + { + pkgs, + lib, + ... + }: + # VLANS: + # 1 -- simulates the internal network + # 2 -- simulates the external network + let + commonConfig = { + # Disable eth0 autoconfiguration + networking.useDHCP = false; + + environment.systemPackages = [ + (pkgs.writeScriptBin "check-connection" '' + #!/usr/bin/env bash + + set -e + + if [[ "$2" == "" || "$1" == "--help" || "$1" == "-h" ]]; + then + echo "check-connection <[expect-success|expect-failure]>" + exit 1 + fi + + ADDRESS="$1" + + function test_icmp() { timeout 3 ping -c 1 "$ADDRESS"; } + + if [[ "$2" == "expect-success" ]]; + then + test_icmp + else + ! test_icmp + fi + '') + ]; + }; + in + { + name = "squid"; + meta = with pkgs.lib.maintainers; { + maintainers = [ cobalt ]; + }; + + nodes = { + client = + { ... }: + lib.mkMerge [ + commonConfig + { + virtualisation.vlans = [ 1 ]; + networking.firewall.enable = true; + } + ]; + + proxy = + { config, nodes, ... }: + let + clientIp = (pkgs.lib.head nodes.client.networking.interfaces.eth1.ipv4.addresses).address; + serverIp = (pkgs.lib.head nodes.server.networking.interfaces.eth1.ipv4.addresses).address; + in + lib.mkMerge [ + commonConfig + { + virtualisation.vlans = [ + 1 + 2 + ]; + networking.firewall.enable = true; + networking.firewall.allowedTCPPorts = [ config.services.squid.proxyPort ]; + + nixpkgs.config.permittedInsecurePackages = [ + "squid-6.12" + ]; + + services.squid = { + enable = true; + + extraConfig = '' + acl client src ${clientIp} + acl server dst ${serverIp} + http_access allow client server + ''; + }; + } + ]; + + server = + { ... }: + lib.mkMerge [ + commonConfig + { + virtualisation.vlans = [ 2 ]; + networking.firewall.enable = true; + networking.firewall.allowedTCPPorts = [ 80 ]; + + services.nginx = { + enable = true; + + virtualHosts."server" = { + root = "/etc"; + locations."/".index = "hostname"; + listen = [ + { + addr = "0.0.0.0"; + port = 80; + } + ]; + }; + }; + } + ]; + }; + + testScript = + { nodes, ... }: + let + clientIp = (pkgs.lib.head nodes.client.networking.interfaces.eth1.ipv4.addresses).address; + serverIp = (pkgs.lib.head nodes.server.networking.interfaces.eth1.ipv4.addresses).address; + proxyExternalIp = (pkgs.lib.head nodes.proxy.networking.interfaces.eth2.ipv4.addresses).address; + proxyInternalIp = (pkgs.lib.head nodes.proxy.networking.interfaces.eth1.ipv4.addresses).address; + in + '' + client.start() + proxy.start() + server.start() + + proxy.wait_for_unit("network.target") + proxy.wait_for_unit("squid.service") + client.wait_for_unit("network.target") + server.wait_for_unit("network.target") + server.wait_for_unit("nginx.service") + + # Topology checks. + with subtest("proxy connectivity"): + ## The proxy should have direct access to the server and client + proxy.succeed("check-connection ${serverIp} expect-success") + proxy.succeed("check-connection ${clientIp} expect-success") + + with subtest("server connectivity"): + ## The server should have direct access to the proxy + server.succeed("check-connection ${proxyExternalIp} expect-success") + ## ... and not have access to the client + server.succeed("check-connection ${clientIp} expect-failure") + + with subtest("client connectivity"): + # The client should be also able to connect to the proxy + client.succeed("check-connection ${proxyInternalIp} expect-success") + # but not the client to the server + client.succeed("check-connection ${serverIp} expect-failure") + + with subtest("HTTP"): + # the client cannot reach the server directly over HTTP + client.fail('[[ `timeout 3 curl http://${serverIp}` ]]') + # ... but can with the proxy + client.succeed('[[ `timeout 3 curl --proxy http://${proxyInternalIp}:3128 http://${serverIp}` == "server" ]]') + ''; + } +) diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index ea5cba92460d9..95ff14a96bd53 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -28,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "tiled"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "mapeditor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9cgGweo0D43U/puS82JCmBrikKe/TclHsrghQ4OZVEo="; + sha256 = "sha256-9oUKn51MQcsStgIJrp9XW5YAIpAUcO0kzfGnYA3gz/E="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index fc9aa5558d2a5..e91d213913e92 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -37,7 +37,7 @@ rec { meta = with lib; { description = "Most popular clone of the VI editor"; - homepage = "http://www.vim.org"; + homepage = "https://www.vim.org"; license = licenses.vim; maintainers = with maintainers; [ das_j diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 8b775dd74e642..63f0266f395fe 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1,5 +1,5 @@ # GENERATED by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit! -{ lib, buildVimPlugin, buildNeovimPlugin, fetchFromGitHub, fetchgit }: +{ lib, buildVimPlugin, buildNeovimPlugin, fetchFromGitHub }: final: prev: { @@ -1686,17 +1686,6 @@ final: prev: meta.homepage = "https://github.com/xavierd/clang_complete/"; }; - clangd_extensions-nvim = buildVimPlugin { - pname = "clangd_extensions.nvim"; - version = "2025-01-27"; - src = fetchgit { - url = "https://git.sr.ht/~p00f/clangd_extensions.nvim"; - rev = "db28f29be928d18cbfb86fbfb9f83f584f658feb"; - sha256 = "16j27jwr90ixj1r6qcwfc9f90a2jdzd5104vpwwvyrdlqpgkml2x"; - }; - meta.homepage = "https://git.sr.ht/~p00f/clangd_extensions.nvim"; - }; - clever-f-vim = buildVimPlugin { pname = "clever-f.vim"; version = "2022-10-15"; @@ -1793,17 +1782,6 @@ final: prev: meta.homepage = "https://github.com/tzachar/cmp-ai/"; }; - cmp-async-path = buildVimPlugin { - pname = "cmp-async-path"; - version = "2024-10-21"; - src = fetchgit { - url = "https://codeberg.org/FelipeLema/cmp-async-path/"; - rev = "d6d1ffa2075039632a2d71e8fa139818e15ac757"; - sha256 = "1x10v0kd0i2pdxknzdn3zgqdn4hgbivgnczsj56wc32jzcs6k49i"; - }; - meta.homepage = "https://codeberg.org/FelipeLema/cmp-async-path/"; - }; - cmp-beancount = buildVimPlugin { pname = "cmp-beancount"; version = "2024-07-16"; @@ -4667,17 +4645,6 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/gitignore.vim/"; }; - gitlab-vim = buildVimPlugin { - pname = "gitlab.vim"; - version = "2025-01-24"; - src = fetchgit { - url = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim"; - rev = "aa50a927a1d92abed361442b9366f0f1cddac937"; - sha256 = "0z80wj2qhk55yk4p3gpqnssdz7znq3m8sgcln08ivknw6mlmwvxa"; - }; - meta.homepage = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim"; - }; - gitlinker-nvim = buildVimPlugin { pname = "gitlinker.nvim"; version = "2023-02-03"; @@ -5063,17 +5030,6 @@ final: prev: meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; - hare-vim = buildVimPlugin { - pname = "hare.vim"; - version = "2025-01-24"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/hare.vim"; - rev = "1e39bb30c680756dd6b4b85af50571b5afee58cb"; - sha256 = "0ivkh0dgc6djaqjsnbsc36027w4as9k1dj4d3ja4wzxnqk2ll97p"; - }; - meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; - }; - harpoon = buildVimPlugin { pname = "harpoon"; version = "2024-08-29"; @@ -6446,17 +6402,6 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/"; }; - lsp_lines-nvim = buildVimPlugin { - pname = "lsp_lines.nvim"; - version = "2024-12-21"; - src = fetchgit { - url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; - rev = "a92c755f182b89ea91bd8a6a2227208026f27b4d"; - sha256 = "14ym4d8vgvw2vhsaxik8612wyvszd895q69n9h100yd7x5jqhy4c"; - }; - meta.homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; - }; - lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; version = "2025-01-10"; @@ -9390,17 +9335,6 @@ final: prev: meta.homepage = "https://github.com/gennaro-tedesco/nvim-jqx/"; }; - nvim-julia-autotest = buildVimPlugin { - pname = "nvim-julia-autotest"; - version = "2022-10-31"; - src = fetchgit { - url = "https://gitlab.com/usmcamp0811/nvim-julia-autotest"; - rev = "b74e2f9c961e604cb56cc23f87188348bfa0f33f"; - sha256 = "0jd6r5chh4rdj1jyrsqhb67glwqjcygzvk8gyp0v7axr2xn6r8r1"; - }; - meta.homepage = "https://gitlab.com/usmcamp0811/nvim-julia-autotest"; - }; - nvim-lastplace = buildVimPlugin { pname = "nvim-lastplace"; version = "2023-07-27"; @@ -11157,17 +11091,6 @@ final: prev: meta.homepage = "https://github.com/luochen1990/rainbow/"; }; - rainbow-delimiters-nvim = buildVimPlugin { - pname = "rainbow-delimiters.nvim"; - version = "2025-01-12"; - src = fetchgit { - url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "85b80abaa09cbbc039e3095b2f515b3cf8cadd11"; - sha256 = "10sz2qp42rpf341qpr7cvjkwn0r07mmkdr5pbs3a7siczid4y935"; - }; - meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - }; - rainbow_parentheses-vim = buildVimPlugin { pname = "rainbow_parentheses.vim"; version = "2013-03-05"; @@ -17925,17 +17848,6 @@ final: prev: meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; - vim-stationeers-ic10-syntax = buildVimPlugin { - pname = "vim-stationeers-ic10-syntax"; - version = "2025-01-08"; - src = fetchgit { - url = "https://gitlab.com/LittleMorph/vim-ic10"; - rev = "7c1f13b198cfe122fb52f6abfb8dc95d5ca51013"; - sha256 = "0pxk1qq6niy9msm369w5xn2jcwpa8a30hpqk6hb1ag1v6244j3g1"; - }; - meta.homepage = "https://gitlab.com/LittleMorph/vim-ic10"; - }; - vim-strip-trailing-whitespace = buildVimPlugin { pname = "vim-strip-trailing-whitespace"; version = "2022-02-01"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/clangd_extensions-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/clangd_extensions-nvim/default.nix new file mode 100644 index 0000000000000..8a7712cd36c9f --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/clangd_extensions-nvim/default.nix @@ -0,0 +1,26 @@ +{ + lib, + fetchFromSourcehut, + nix-update-script, + vimUtils, +}: +vimUtils.buildVimPlugin { + pname = "clangd_extensions.nvim"; + version = "unstable-2024-10-05"; + + src = fetchFromSourcehut { + owner = "~p00f"; + repo = "clangd_extensions.nvim"; + rev = "8f7b72100883e0e34400d9518d40a03f21e4d0a6"; + hash = "sha256-N2YPu2Oa5KBkL8GSp9Al+rxhtNgu7YtxtMuy5BIcnOY="; + }; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Clangd's off-spec features for neovim's LSP client"; + homepage = "https://git.sr.ht/~p00f/clangd_extensions.nvim"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix new file mode 100644 index 0000000000000..059e9c1733f3c --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix @@ -0,0 +1,30 @@ +{ + lib, + vimUtils, + fetchFromGitea, + nix-update-script, + vimPlugins, +}: +vimUtils.buildVimPlugin { + pname = "cmp-async-path"; + version = "unstable-2024-10-21"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "FelipeLema"; + repo = "cmp-async-path"; + rev = "d6d1ffa2075039632a2d71e8fa139818e15ac757"; + hash = "sha256-MZFpNPtSDMZNkfoz+3ZcDxLb8PvDtm9nb1dE0CbYIPQ="; + }; + + checkInputs = [ vimPlugins.nvim-cmp ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Nvim-cmp source for filesystem paths with async processing"; + homepage = "https://codeberg.org/FelipeLema/cmp-async-path/"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix new file mode 100644 index 0000000000000..e8908af5bf8ef --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/gitlab-vim/default.nix @@ -0,0 +1,26 @@ +{ + lib, + vimUtils, + fetchFromGitLab, + nix-update-script, +}: +vimUtils.buildVimPlugin { + pname = "gitlab.vim"; + version = "unstable-2025-01-23"; + + src = fetchFromGitLab { + owner = "gitlab-org/editor-extensions"; + repo = "gitlab.vim"; + rev = "62a60341df24ccecb73bc9ae34a198674bb12faf"; + hash = "sha256-9G5H3MUdE++hR7p8nsoxK5kuA84k8oJBMvOa01PZrsA="; + }; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Integrate GitLab Duo with Neovim"; + homepage = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/non-generated/hare-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/hare-vim/default.nix new file mode 100644 index 0000000000000..bd624de3c059b --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/hare-vim/default.nix @@ -0,0 +1,26 @@ +{ + lib, + vimUtils, + fetchFromSourcehut, + nix-update-script, +}: +vimUtils.buildVimPlugin { + pname = "hare.vim"; + version = "unstable-2025-01-23"; + + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "hare.vim"; + rev = "1a732aca2931402f3186f52ae626540a770aefe2"; + hash = "sha256-wBeQvDm7ZTUcw21VIAryyH6tMuBiQCMOJRZX/8ic8B4="; + }; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Hare programming in Vim"; + homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; + license = lib.licenses.vim; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix new file mode 100644 index 0000000000000..34fa410f2b46e --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/lsp_lines-nvim/default.nix @@ -0,0 +1,26 @@ +{ + lib, + vimUtils, + fetchFromSourcehut, + nix-update-script, +}: +vimUtils.buildVimPlugin { + pname = "lsp_lines.nvim"; + version = "unstable-2024-12-10"; + + src = fetchFromSourcehut { + owner = "~whynothugo"; + repo = "lsp_lines.nvim"; + rev = "a92c755f182b89ea91bd8a6a2227208026f27b4d"; + hash = "sha256-jHiIZemneQACTDYZXBJqX2/PRTBoxq403ILvt1Ej1ZM="; + }; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Neovim diagnostics using virtual lines"; + homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/non-generated/nvim-julia-autotest/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/nvim-julia-autotest/default.nix new file mode 100644 index 0000000000000..2a0fc95ef84bc --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/nvim-julia-autotest/default.nix @@ -0,0 +1,26 @@ +{ + lib, + vimUtils, + fetchFromGitLab, + nix-update-script, +}: +vimUtils.buildVimPlugin { + pname = "nvim-julia-autotest"; + version = "unstable-2022-10-31"; + + src = fetchFromGitLab { + owner = "usmcamp0811"; + repo = "nvim-julia-autotest"; + rev = "b74e2f9c961e604cb56cc23f87188348bfa0f33f"; + hash = "sha256-IaNsbBe5q7PB9Q/N/Z9nEnP6jlkQ6+xlkC0TCFnJpkk="; + }; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Automatically run Julia tests when you save runtest.jl file"; + homepage = "https://gitlab.com/usmcamp0811/nvim-julia-autotest"; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/non-generated/rainbow-delimiters-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/rainbow-delimiters-nvim/default.nix new file mode 100644 index 0000000000000..1e921dde3288a --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/rainbow-delimiters-nvim/default.nix @@ -0,0 +1,33 @@ +{ + lib, + vimUtils, + fetchFromGitLab, + nix-update-script, +}: +vimUtils.buildVimPlugin { + pname = "rainbow-delimiters.nvim"; + version = "unstable-2025-01-12"; + + src = fetchFromGitLab { + owner = "HiPhish"; + repo = "rainbow-delimiters.nvim"; + rev = "85b80abaa09cbbc039e3095b2f515b3cf8cadd11"; + hash = "sha256-zWHXYs3XdnoszqOFY3hA2L5mNn1a44OAeKv3lL3EMEw="; + }; + + nvimSkipModule = [ + # rainbow-delimiters.types.lua + "rainbow-delimiters.types" + # Test that requires an unpackaged dependency + "rainbow-delimiters._test.highlight" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Rainbow delimiters for Neovim with Tree-sitter"; + homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix new file mode 100644 index 0000000000000..d6818ed031739 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix @@ -0,0 +1,26 @@ +{ + lib, + vimUtils, + fetchFromGitLab, + nix-update-script, +}: +vimUtils.buildVimPlugin { + pname = "vim-ic10"; + version = "unstable-2025-01-08"; + + src = fetchFromGitLab { + owner = "LittleMorph"; + repo = "vim-ic10"; + rev = "7c1f13b198cfe122fb52f6abfb8dc95d5ca51013"; + hash = "sha256-4Q1JiDA7PBUWNBNfCIZC6nImhe2FJzOqrslHazAOs18="; + }; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Stationeers IC10 syntax highlighting for Vim"; + homepage = "https://gitlab.com/LittleMorph/vim-ic10"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index a578519757751..c8d252ae24d6e 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -315,6 +315,8 @@ in ]; }; + clangd_extensions-nvim = callPackage ./non-generated/clangd_extensions-nvim { }; + clang_complete = super.clang_complete.overrideAttrs { # In addition to the arguments you pass to your compiler, you also need to # specify the path of the C++ std header (if you are using C++). @@ -366,9 +368,7 @@ in ]; }; - cmp-async-path = super.cmp-async-path.overrideAttrs { - checkInputs = [ self.nvim-cmp ]; - }; + cmp-async-path = callPackage ./non-generated/cmp-async-path { }; cmp-beancount = super.cmp-beancount.overrideAttrs { checkInputs = [ self.nvim-cmp ]; @@ -1199,6 +1199,8 @@ in configurePhase = "cd plugins/nvim"; }; + gitlab-vim = callPackage ./non-generated/gitlab-vim { }; + gitlinker-nvim = super.gitlinker-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -1268,6 +1270,8 @@ in ]; }; + hare-vim = callPackage ./non-generated/hare-vim { }; + harpoon = super.harpoon.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -1585,6 +1589,8 @@ in luaAttr = luaPackages.lsp-progress-nvim; }; + lsp_lines-nvim = callPackage ./non-generated/lsp_lines-nvim { }; + lspecho-nvim = super.lspecho-nvim.overrideAttrs { meta.license = lib.licenses.mit; }; @@ -2297,6 +2303,8 @@ in dependencies = [ self.nvim-java-core ]; }; + nvim-julia-autotest = callPackage ./non-generated/nvim-julia-autotest { }; + nvim-lsp-file-operations = super.nvim-lsp-file-operations.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -2721,14 +2729,7 @@ in quicker-nvim = super.quicker-nvim.overrideAttrs { }; - rainbow-delimiters-nvim = super.rainbow-delimiters-nvim.overrideAttrs { - nvimSkipModule = [ - # rainbow-delimiters.types.lua - "rainbow-delimiters.types" - # Test that requires an unpackaged dependency - "rainbow-delimiters._test.highlight" - ]; - }; + rainbow-delimiters-nvim = callPackage ./non-generated/rainbow-delimiters-nvim { }; range-highlight-nvim = super.range-highlight-nvim.overrideAttrs { dependencies = [ self.cmd-parser-nvim ]; @@ -3642,6 +3643,8 @@ in dependencies = [ self.vim-repeat ]; }; + vim-stationeers-ic10-syntax = callPackage ./non-generated/vim-stationeers-ic10-syntax { }; + vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: { postPatch = old.postPatch or "" diff --git a/pkgs/applications/editors/vim/plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py index 37c0adb6bb290..1d8f332acba3f 100755 --- a/pkgs/applications/editors/vim/plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/update.py @@ -82,7 +82,7 @@ def _isNeovimPlugin(plug: pluginupdate.Plugin) -> bool: f.write( textwrap.dedent( """ - { lib, buildVimPlugin, buildNeovimPlugin, fetchFromGitHub, fetchgit }: + { lib, buildVimPlugin, buildNeovimPlugin, fetchFromGitHub }: final: prev: { diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 5fd747b9a552b..4f63eb7fae3ea 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -138,7 +138,6 @@ https://github.com/declancm/cinnamon.nvim/,HEAD, https://github.com/projekt0n/circles.nvim/,, https://github.com/zootedb0t/citruszest.nvim/,, https://github.com/xavierd/clang_complete/,, -https://git.sr.ht/~p00f/clangd_extensions.nvim,HEAD, https://github.com/rhysd/clever-f.vim/,, https://github.com/bbchung/clighter8/,, https://github.com/ekickx/clipboard-image.nvim/,, @@ -147,7 +146,6 @@ https://github.com/asheq/close-buffers.vim/,HEAD, https://github.com/Civitasv/cmake-tools.nvim/,, https://github.com/winston0410/cmd-parser.nvim/,, https://github.com/tzachar/cmp-ai/,HEAD, -https://codeberg.org/FelipeLema/cmp-async-path/,, https://github.com/crispgm/cmp-beancount/,HEAD, https://github.com/hrsh7th/cmp-buffer/,, https://github.com/hrsh7th/cmp-calc/,, @@ -386,7 +384,6 @@ https://github.com/mikesmithgh/git-prompt-string-lualine.nvim/,HEAD, https://github.com/ThePrimeagen/git-worktree.nvim/,, https://github.com/wintermute-cell/gitignore.nvim/,HEAD, https://github.com/vim-scripts/gitignore.vim/,, -https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim,HEAD, https://github.com/ruifm/gitlinker.nvim/,, https://github.com/lewis6991/gitsigns.nvim/,, https://github.com/gregsexton/gitv/,, @@ -419,7 +416,6 @@ https://github.com/junegunn/gv.vim/,, https://github.com/chrishrb/gx.nvim/,HEAD, https://github.com/TheSnakeWitcher/hardhat.nvim/,HEAD, https://github.com/m4xshen/hardtime.nvim/,HEAD, -https://git.sr.ht/~sircmpwn/hare.vim,HEAD, https://github.com/ThePrimeagen/harpoon/,master, https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2 https://github.com/kiyoon/haskell-scope-highlighting.nvim/,HEAD, @@ -534,7 +530,6 @@ https://github.com/ahmedkhalf/lsp-rooter.nvim/,, https://github.com/nvim-lua/lsp-status.nvim/,, https://github.com/VonHeikemen/lsp-zero.nvim/,v3.x, https://github.com/nvim-lua/lsp_extensions.nvim/,, -https://git.sr.ht/~whynothugo/lsp_lines.nvim,, https://github.com/ray-x/lsp_signature.nvim/,, https://github.com/lspcontainers/lspcontainers.nvim/,, https://github.com/deathbeam/lspecho.nvim/,HEAD, @@ -777,7 +772,6 @@ https://github.com/nvim-java/nvim-java-core/,HEAD, https://github.com/nvim-java/nvim-java-dap/,HEAD, https://github.com/mfussenegger/nvim-jdtls/,, https://github.com/gennaro-tedesco/nvim-jqx/,, -https://gitlab.com/usmcamp0811/nvim-julia-autotest,HEAD, https://github.com/ethanholz/nvim-lastplace/,HEAD, https://github.com/kosayoda/nvim-lightbulb/,, https://github.com/josa42/nvim-lightline-lsp/,, @@ -924,7 +918,6 @@ https://github.com/stefandtw/quickfix-reflector.vim/,, https://github.com/dannyob/quickfixstatus/,, https://github.com/jbyuki/quickmath.nvim/,HEAD, https://github.com/luochen1990/rainbow/,, -https://gitlab.com/HiPhish/rainbow-delimiters.nvim,HEAD, https://github.com/kien/rainbow_parentheses.vim/,, https://github.com/vim-scripts/random.vim/,, https://github.com/winston0410/range-highlight.nvim/,, @@ -1487,7 +1480,6 @@ https://github.com/kbenzie/vim-spirv/,, https://github.com/yorokobi/vim-splunk/,HEAD, https://github.com/mhinz/vim-startify/,, https://github.com/dstein64/vim-startuptime/,, -https://gitlab.com/LittleMorph/vim-ic10,HEAD,vim-stationeers-ic10-syntax https://github.com/axelf4/vim-strip-trailing-whitespace/,, https://github.com/nbouscal/vim-stylish-haskell/,, https://github.com/alx741/vim-stylishask/,, diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 364ac42cbf904..f3eb4596bf191 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -27,13 +27,13 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-rtqGkVtB69yt98bTb/g2iZtZNtCn7V5Q4uSBDx+/xGQ=", + "hash": "sha256-m2T8MNHBQfAyFDL28v4HE0UJzTKZFH1DY5OlfmCp+kE=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.31.1", + "rev": "v4.33.0", "spdx": "MIT", - "vendorHash": "sha256-dIQ5WATs8HOjJpLyVPDgT+WZ8GkkSoNsmavxpCj4jmE=" + "vendorHash": "sha256-0WLhjCCOMi6uQJ+yEA+W6KHyZaf5L2P5hTFSdyb1ExU=" }, "akamai": { "hash": "sha256-acGLXJclAfg43AkJRoROReIOjBEnhgSpDRgvO6LumIY=", @@ -153,20 +153,20 @@ "vendorHash": null }, "baiducloud": { - "hash": "sha256-x8h/htGfphrvLNTKcxSnV0lomd/gdBuOn3U1ke6AqzI=", + "hash": "sha256-YcQq0FK76XjF80yOjOMhDp+aRoFOewXObVksDAzQSh8=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.21.10", + "rev": "v1.21.12", "spdx": "MPL-2.0", "vendorHash": null }, "bigip": { - "hash": "sha256-hXQR6JcnZesO3rY/SkSxoff8JRuzK6oeEOorG8evNwg=", + "hash": "sha256-qTYHtkwgNlroct+HPfiexny9lBCDXwnlNRKRXmW0tXQ=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.22.6", + "rev": "v1.22.7", "spdx": "MPL-2.0", "vendorHash": null }, @@ -207,13 +207,13 @@ "vendorHash": "sha256-A6/YN/iFxdfGjYO8Pum5nWysGmEeLaxgFPe8zaoPfjA=" }, "buildkite": { - "hash": "sha256-mhiPKnn5cOXMlz1cM0BrJnRVESWakgkiN/R5ZUUEv/M=", + "hash": "sha256-xz9gYf13tNU3J7nQscuIRU41CGjYc6qMXnLltAaPQac=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.15.2", + "rev": "v1.15.5", "spdx": "MIT", - "vendorHash": "sha256-UdJxDq4VU7rWMoiSlXtb861yd+az2nrxGafvEj2K34Y=" + "vendorHash": "sha256-6Tmxmm/X3MZtFxlNa2H/oXGADlpoZ8oUSvTqKPAr5fA=" }, "ccloud": { "hash": "sha256-Dpx0eugcHCJV8GNPqjxx4P9ohgJgB10DTnHr+CeN/iQ=", @@ -317,13 +317,13 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-naPINUxSZP12wLanGw1BUYiGkyi1uqliDieR97oD+yI=", + "hash": "sha256-/RaKITbDBaTcF4xL+66gTBlEitbwj7z2NhJ60o+Cje0=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.50.0", + "rev": "v3.52.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-LInse2bxYuGRGc28MOaMJJ6WAV0m2JF13mpvkSgyDCk=" + "vendorHash": "sha256-rbGBGmgOmv+PtkYlj89FXagDscrtVRl7J0ZP3n+lVdU=" }, "deno": { "hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=", @@ -543,11 +543,11 @@ "vendorHash": "sha256-PEm/5AMATheF/yxEMVlEC/7hsRsMtMcp5wHpqrFBlFA=" }, "gridscale": { - "hash": "sha256-J4ZLexpjYXxOTaqih0+Nucyf2soYXxGiB38xAeXUJKs=", + "hash": "sha256-kgpEPbQLqiu8X0lOs6dCUqWpYTDxQX8fMgWoP0wWtBw=", "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.27.0", + "rev": "v2.0.2", "spdx": "MPL-2.0", "vendorHash": null }, @@ -813,13 +813,13 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "migadu": { - "hash": "sha256-Pmc09MRNxrJHXlb74EnHkmML90pbKSLCyTrFlI+j3d8=", + "hash": "sha256-ZKlxt/qTccHlNSTwTFKroK/JmKLTcQ8MIeCKx+iRJm0=", "homepage": "https://registry.terraform.io/providers/metio/migadu", "owner": "metio", "repo": "terraform-provider-migadu", - "rev": "2024.12.26", + "rev": "2025.1.16", "spdx": "0BSD", - "vendorHash": "sha256-YFzYLUfyJglKaJSBksrI1DBHmK6+yoMIg9QlGIEZFkU=" + "vendorHash": "sha256-03pGB+biwTfJdGADhBSJn1BNhuowTrO8nwQm2eCCpaI=" }, "minio": { "hash": "sha256-GJU70N/8EocLNxTG/psIsRYVHkg5fALhA9/ewErNML0=", @@ -913,13 +913,13 @@ "vendorHash": null }, "okta": { - "hash": "sha256-ONhXeCCezhMgHQeT/HLFPUHW3No1Yv9vXho006dJoPQ=", + "hash": "sha256-LRlSqgcQPs3R/l4DKm5Ij3GjK7/WxRPV+/o4I2ukCFY=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v4.12.0", + "rev": "v4.13.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-MA0w44ig8sS1+JgJ/TnBSiUlADDn/WP5zCYgcDXGaQk=" + "vendorHash": "sha256-EPBi417Ue8FFC23vOh9ENS50SHlrvJBAX1TX+oiFMMA=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -958,13 +958,13 @@ "vendorHash": "sha256-0Atbzx1DjInPMa1lNxyNKfNMILjN4S814TlIAQeTfdI=" }, "opentelekomcloud": { - "hash": "sha256-gcELIKjDeXp0rqz+tDp2S9VEzPVoL+7RfvpfNF/qets=", + "hash": "sha256-KA0SMkf+Wt/YDa/lPndedD75yCMTcDO/EFX9wrLtIVY=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.28", + "rev": "v1.36.29", "spdx": "MPL-2.0", - "vendorHash": "sha256-KvQNpXn11KdGbGQBWj7FwVypJOcFhLjgOKBfFZOyL7M=" + "vendorHash": "sha256-/vhalSK/kxbBc3Pq19BPl6H6L0FXhAqkK0/p1MPXckc=" }, "opsgenie": { "hash": "sha256-+msy9kPAryR0Ll5jKOd47DMjeMxEdSIfKZZKVHohQGY=", @@ -1093,13 +1093,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-8Jk++If2Uu51P/b29xSeUuIRduqm5lB9ob9YuAM0nPI=", + "hash": "sha256-8aESalFQaA6Qwod4rDeUzrKe80rbHfVJZIKtLliKUME=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.48.0", + "rev": "v2.49.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-sd5Q/YcK28XgZGuNin6cn5xmwB2TenUuHMT9SRYIRTs=" + "vendorHash": "sha256-a1xH1NX+8/A4tcPYyxvg3lY9DZPrOAEl4OvngU9+tjE=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1192,13 +1192,13 @@ "vendorHash": "sha256-c3R/7k7y7XS2Qli00nSj7gh/3Mj88PY4WybBTq/+pPs=" }, "spotinst": { - "hash": "sha256-ovrWtOJe5AVF1oneb+9It4MMkT8uL3bBdiXJNjahYRY=", + "hash": "sha256-zP71u5xaWcb+LBKGU3yFAQcZnK6MlO5WRQwc8Fz9ZJY=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.207.0", + "rev": "v1.208.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-mVZbO2AH+mQeOj3I1FH2poQnQNGJUzxQNGmIv8nOqNw=" + "vendorHash": "sha256-HNKdEwG+7IJ2YpX97qkvXZbsoJWx+u+rZXRoZzvB1XA=" }, "ssh": { "hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=", @@ -1228,11 +1228,11 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic": { - "hash": "sha256-THjaIm6QsHNEGuafwmnU3dUQqNJiDy4qTO+3bEIGR8Q=", + "hash": "sha256-T+DQ2uTkbwzTShKx1FOavOc/V/DxwBOxKPE639+mhXg=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v3.0.0", + "rev": "v3.0.1", "spdx": "MPL-2.0", "vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE=" }, @@ -1273,22 +1273,22 @@ "vendorHash": "sha256-VMEL2dQ1+kMRWjJP6Obc3N1OytpAkRVW/9596WhwkE4=" }, "tencentcloud": { - "hash": "sha256-8WH87IFcZO5vK3kS9q94AJQ4Vv4jsFSPT0PZ1Cwt6jQ=", + "hash": "sha256-g4UQs7GdU5GFkrC9eeFLMYGLR2Wt2UbSSX5yP1CExT0=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.152", + "rev": "v1.81.164", "spdx": "MPL-2.0", "vendorHash": null }, "tfe": { - "hash": "sha256-kF17NEk/faVBNXXq2ipoIqS97ENxmr1UnEJc6m9ScDw=", + "hash": "sha256-PnwwIeWktTiOSRHD7Vc9NttTpIBG0D2vWS0ngGRu3Yk=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.62.0", + "rev": "v0.63.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-zDL3MOsOzMFh894xeqt+CIvKlQxDm3JLXsy2IK4ZMlE=" + "vendorHash": "sha256-6QIaJIlHr6c/pC6T/kQu0835Yf7l5idsTWl1sAcwXoQ=" }, "thunder": { "hash": "sha256-2i1DSOSt/vbFs0QCPogEBvADhLJFKbrQzwZ20ChCQMk=", diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix index 06f42fbe1dad0..6a2eeac259580 100644 --- a/pkgs/applications/networking/discordo/default.nix +++ b/pkgs/applications/networking/discordo/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "discordo"; - version = "0-unstable-2025-01-12"; + version = "0-unstable-2025-01-27"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "2f071695146188c65b51f7030a89addfa845469a"; - hash = "sha256-k2wwFx0Wi60xpdiS7qGoHdS6TfXFlI6yDeXXfOp1ivc="; + rev = "1783361d5fb839e54f4562a9c42eb478d9cc8f57"; + hash = "sha256-AU7gT+q1vF4WWn5o2OCiAjHjub0ig1O7/CjFnuQaN6I="; }; vendorHash = "sha256-FsZRh4k9ucmAruJa1MZ4kVVryrEuHy9StgXHvgBiWSg="; diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index 75d3e1d6ef9c3..23cb137956957 100644 --- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -24,6 +24,7 @@ wayland, wayland-protocols, wayland-scanner, + debug ? false, }: gcc14Stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-hyprland"; @@ -65,6 +66,10 @@ gcc14Stdenv.mkDerivation (finalAttrs: { wayland-scanner ]; + cmakeBuildType = if debug then "Debug" else "RelWithDebInfo"; + + dontStrip = debug; + dontWrapQtApps = true; postInstall = '' diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 24f1524bad110..ac01b2558c1df 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -156,7 +156,6 @@ rec { libuuid libogg libvorbis - SDL SDL2_image glew110 openssl @@ -179,9 +178,6 @@ rec { libtiff pixman speex - SDL_image - SDL_ttf - SDL_mixer SDL2_ttf SDL2_mixer libappindicator-gtk2 diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix index be2f29bd60c48..7fa713a762e6b 100644 --- a/pkgs/by-name/ae/aerc/package.nix +++ b/pkgs/by-name/ae/aerc/package.nix @@ -15,17 +15,17 @@ buildGoModule rec { pname = "aerc"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromSourcehut { owner = "~rjarry"; repo = "aerc"; rev = version; - hash = "sha256-0ZSmmmj5PpSORL0s0SSNoZGzct9Ps8j0ILAUCpJOOBw="; + hash = "sha256-IBTM3Ersm8yUCgiBLX8ozuvMEbfmY6eW5xvJD20UgRA="; }; proxyVendor = true; - vendorHash = "sha256-WowRlAzyrfZi27JzskIDberiYt9PQkuS6H3hKqUP9qo="; + vendorHash = "sha256-O1j0J6vCE6rap5/fOTxlUpXAG5mgZf8CfNOB4VOBxms="; nativeBuildInputs = [ scdoc diff --git a/pkgs/by-name/an/ansible-navigator/package.nix b/pkgs/by-name/an/ansible-navigator/package.nix index 6749994c3c896..92583af360432 100644 --- a/pkgs/by-name/an/ansible-navigator/package.nix +++ b/pkgs/by-name/an/ansible-navigator/package.nix @@ -7,7 +7,7 @@ }: python3Packages.buildPythonApplication rec { pname = "ansible-navigator"; - version = "24.12.0"; + version = "25.1.0"; pyproject = true; disabled = python3Packages.pythonOlder "3.10"; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "ansible_navigator"; - hash = "sha256-+DJXSwwTIjF0b/i5NHCrnR9N+nMyl8of+zyEmmTzboQ="; + hash = "sha256-WcA14CiUUNXa+yR1IzoyQ7LWBXFI8yzV+xpRj2W8lzQ="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix index 7ead97cefb9ce..346aee98c5d96 100644 --- a/pkgs/by-name/au/automatic-timezoned/package.nix +++ b/pkgs/by-name/au/automatic-timezoned/package.nix @@ -5,17 +5,17 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.45"; + version = "2.0.50"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8fgOhmjFXC0nMs7oTfJWbn1DOmOU9RtTgR+xmV/nZ9g="; + sha256 = "sha256-xXTm7/NS9XJRX/MQld7+GVOum9iW0wYfvaEve7K5cIk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-OimAHyx6UdNB6RIGa+LN5Xy63L7VbTj7lazZyUQXy1s="; + cargoHash = "sha256-Zd4LUXPrRhz4r8C/BqnWnJOHYCnbO7uz9sqVi8hVKFI="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/by-name/c3/c3-lsp/package.nix b/pkgs/by-name/c3/c3-lsp/package.nix index e5d879b64bee3..9bd26fde545e0 100644 --- a/pkgs/by-name/c3/c3-lsp/package.nix +++ b/pkgs/by-name/c3/c3-lsp/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "c3-lsp"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "pherrymason"; repo = "c3-lsp"; rev = "v${version}"; - hash = "sha256-1EuDXQGzqNM19SRokM9GGzA2ZcD0XaCbywErVSjINIM="; + hash = "sha256-MScpFh4J4jVJI5WtW4tfNB18YDpxs+ass1HmXyOO5VM="; }; sourceRoot = "${src.name}/server"; - vendorHash = "sha256-7g0Z392ksrvV+D9nMw325BykwLd9mvXRS1Zv6RNSs0w="; + vendorHash = "sha256-eT+Qirl0R1+di3JvXxggGK/nK9+nqw+8QEur+ldJXSc="; postInstall = '' mv $out/bin/lsp $out/bin/c3-lsp diff --git a/pkgs/by-name/ca/can-utils/package.nix b/pkgs/by-name/ca/can-utils/package.nix index 3dd97b7e8f64d..8d377fdb39974 100644 --- a/pkgs/by-name/ca/can-utils/package.nix +++ b/pkgs/by-name/ca/can-utils/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "can-utils"; - version = "2023.03"; + version = "2025.01"; src = fetchFromGitHub { owner = "linux-can"; repo = "can-utils"; rev = "v${version}"; - hash = "sha256-FaopviBJOmO0lXoJcdKNdtsoaJ8JrFEJGyO1aNBv+Pg="; + hash = "sha256-wum0hqPj3rCHHubNsOnj89tvrRQxoXrGQvZFcMKAGME="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/by-name/ca/canaille/package.nix b/pkgs/by-name/ca/canaille/package.nix index be6bc98756968..76a433cb7e952 100644 --- a/pkgs/by-name/ca/canaille/package.nix +++ b/pkgs/by-name/ca/canaille/package.nix @@ -11,7 +11,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "canaille"; - version = "0.0.56"; + version = "0.0.57"; pyproject = true; disabled = python.pythonOlder "3.10"; @@ -20,7 +20,7 @@ python.pkgs.buildPythonApplication rec { owner = "yaal"; repo = "canaille"; rev = "refs/tags/${version}"; - hash = "sha256-cLsLwttUDxMKVqtVDCY5A22m1YY1UezeZQh1j74WzgU="; + hash = "sha256-pesN7k5kGHi3dqTMaXWdCsNsnaJxXv/Ku1wVC9N9a3k="; }; build-system = with python.pkgs; [ @@ -35,6 +35,7 @@ python.pkgs.buildPythonApplication rec { flask flask-wtf pydantic-settings + requests wtforms ] ++ sentry-sdk.optional-dependencies.flask; @@ -51,6 +52,7 @@ python.pkgs.buildPythonApplication rec { pytest-lazy-fixtures pytest-smtpd pytest-xdist + scim2-tester slapd toml faker @@ -58,8 +60,11 @@ python.pkgs.buildPythonApplication rec { ] ++ optional-dependencies.front ++ optional-dependencies.oidc + ++ optional-dependencies.scim ++ optional-dependencies.ldap - ++ optional-dependencies.postgresql; + ++ optional-dependencies.postgresql + ++ optional-dependencies.otp + ++ optional-dependencies.sms; postInstall = '' mkdir -p $out/etc/schema @@ -88,6 +93,10 @@ python.pkgs.buildPythonApplication rec { zxcvbn-rs-py ]; oidc = [ authlib ]; + scim = [ + scim2-models + authlib + ]; ldap = [ python-ldap ]; sentry = [ sentry-sdk ]; postgresql = [ @@ -95,7 +104,13 @@ python.pkgs.buildPythonApplication rec { sqlalchemy sqlalchemy-json sqlalchemy-utils - ] ++ sqlalchemy.optional-dependencies.postgresql; + ] ++ sqlalchemy.optional-dependencies.postgresql_psycopg2binary; + otp = [ + otpauth + pillow + qrcode + ]; + sms = [ smpplib ]; }; passthru = { diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index 6bd040f99a0f7..ddd2f5bcb4f72 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "2.2.3"; + version = "2.2.7"; src = fetchFromGitHub { owner = "tauri-apps"; repo = "tauri"; - tag = "tauri-v${version}"; - hash = "sha256-VZPMy1UMvELcJxu5DHz4YSVe4wVrxrJjeiJK3ySczCA="; + tag = "tauri-cli-v${version}"; + hash = "sha256-BUZMIrPaeoYgmzzkPNEf83KjeiY9dlObivlC3jO5vIc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-LcwOKUFiHoZ4WmTlwqsA2A9BZkBLPEINjZSyk6skvbA="; + cargoHash = "sha256-OhKp7fZjsVrB/ipvzFAei7kRqYgybrSm6uZRAnijKek="; nativeBuildInputs = [ pkg-config ]; @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { updateScript = nix-update-script { extraArgs = [ "--version-regex" - "tauri-v(.*)" + "tauri-cli-v(.*)" ]; }; }; diff --git a/pkgs/by-name/ca/cargo-tauri/test-app.nix b/pkgs/by-name/ca/cargo-tauri/test-app.nix index 8f039fffd9ea0..083817e6959bd 100644 --- a/pkgs/by-name/ca/cargo-tauri/test-app.nix +++ b/pkgs/by-name/ca/cargo-tauri/test-app.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { src ; - hash = "sha256-deLcw84MsSqoVTUgqEJrcZhzFxACw56WIgsC8iYR4zk="; + hash = "sha256-zG4TmZlZ6oPvbDr3a8RlhM6ivtMG+vWox/OJETSUR2A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ci/cirrus-cli/package.nix b/pkgs/by-name/ci/cirrus-cli/package.nix index 0449246e01963..548a364c28b88 100644 --- a/pkgs/by-name/ci/cirrus-cli/package.nix +++ b/pkgs/by-name/ci/cirrus-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.134.0"; + version = "0.135.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = "cirrus-cli"; rev = "v${version}"; - hash = "sha256-f7EMIz2MR5LgW2chIkOyUx2BuC/EBJVR8AOl+ufHwu0="; + hash = "sha256-s7nJ6fhmVZf/+uuN7rW+lq0Xvlz9p425yQNzoTRxTLo="; }; vendorHash = "sha256-FMUBwrY5PJLsd507340PC+f0f9PzPblFYpnNi6hiNeM="; diff --git a/pkgs/by-name/cl/clock-rs/package.nix b/pkgs/by-name/cl/clock-rs/package.nix new file mode 100644 index 0000000000000..2acd33536db7d --- /dev/null +++ b/pkgs/by-name/cl/clock-rs/package.nix @@ -0,0 +1,36 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "clock-rs"; + version = "0.1.213"; + + src = fetchFromGitHub { + owner = "Oughie"; + repo = "clock-rs"; + tag = "v${version}"; + sha256 = "06spnadlgy7902bqhhi6019ay5y55qfrarsfidp938icali9q5pi"; + }; + + cargoHash = "sha256-ir/IwhREheMSdElLYqp3/zHE54BMAK5/7f5/wyTd1yc="; + + meta = { + description = "Modern, digital clock that effortlessly runs in your terminal"; + longDescription = '' + clock-rs is a terminal-based clock written in Rust, designed to be a new alternative to tty-clock. + It supports all major platforms and offers several improvements, which include: + + The use of a single configuration file to manage its settings, with the ability to overwrite them through the command line, + Many additional features such as a timer and a stopwatch, + And greater flexibility as well as better user experience! + ''; + homepage = "https://github.com/Oughie/clock-rs"; + license = lib.licenses.asl20; + mainProgram = "clock-rs"; + maintainers = [ lib.maintainers.oughie ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/da/darklua/package.nix b/pkgs/by-name/da/darklua/package.nix index e7c34ce4687ad..29e620568ab53 100644 --- a/pkgs/by-name/da/darklua/package.nix +++ b/pkgs/by-name/da/darklua/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "darklua"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "seaofvoices"; repo = "darklua"; rev = "v${version}"; - hash = "sha256-OLx3J8E9PYXgWbQncWoezyptrbFYcw3xmXzYAn7IUFw="; + hash = "sha256-D83cLJ6voLvgZ51qLoCUzBG83VFB3Y7HxuaZHpaiOn4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-t3uLi4ywqXeLNMxueljCIo4fYdDVB17iVUcyqXsydrY="; + cargoHash = "sha256-DQkj4t+l6FJnJQ+g96CXypssbRzHbS6X9AOG0LGDclg="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/by-name/dd/ddclient/package.nix b/pkgs/by-name/dd/ddclient/package.nix index 86847869864bd..ff13221d32029 100644 --- a/pkgs/by-name/dd/ddclient/package.nix +++ b/pkgs/by-name/dd/ddclient/package.nix @@ -12,7 +12,7 @@ let in perlPackages.buildPerlPackage rec { pname = "ddclient"; - version = "3.11.2"; + version = "4.0.0"; outputs = [ "out" ]; @@ -20,7 +20,7 @@ perlPackages.buildPerlPackage rec { owner = "ddclient"; repo = "ddclient"; rev = "v${version}"; - sha256 = "sha256-d1G+AM28nBpMWh1QBjm78KKeOL5b5arxERYRCXohwBg="; + sha256 = "sha256-RCE24RKcW4EhicOTwgz5UE/gzqLxw+UNNk960vFx5Gs="; }; postPatch = '' diff --git a/pkgs/by-name/dd/ddns-go/package.nix b/pkgs/by-name/dd/ddns-go/package.nix index 37b971c477de9..ed322327016a5 100644 --- a/pkgs/by-name/dd/ddns-go/package.nix +++ b/pkgs/by-name/dd/ddns-go/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "ddns-go"; - version = "6.8.0"; + version = "6.8.1"; src = fetchFromGitHub { owner = "jeessy2"; repo = pname; rev = "v${version}"; - hash = "sha256-zVNlsFPSLI8mXBUOo8z7nM4nShNd0ZwG5lZL2VyeGi8="; + hash = "sha256-a8torNtFdBq19a4eb0uMgivtF7FUF1DX6g8kyCc4Gxg="; }; vendorHash = "sha256-D66uremGVcTcyBlCA9vrQM5zGPFR96FqVak6tATEdI0="; diff --git a/pkgs/by-name/do/dotenv-cli/package.nix b/pkgs/by-name/do/dotenv-cli/package.nix index 8ca6297020bc6..5db7d841e907a 100644 --- a/pkgs/by-name/do/dotenv-cli/package.nix +++ b/pkgs/by-name/do/dotenv-cli/package.nix @@ -10,18 +10,18 @@ }: stdenv.mkDerivation rec { pname = "dotenv-cli"; - version = "7.4.3"; + version = "8.0.0"; src = fetchFromGitHub { owner = "entropitor"; repo = "dotenv-cli"; rev = "v${version}"; - hash = "sha256-kR9LSHvbvKLuJBGrsmYMeqF3s8SF+/99OeNlKp9azI8="; + hash = "sha256-cqJGw6z0m1ImFEmG2jfcYjaKVhrGyM4hbOAHC7xNAFY="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-Sx5DHUAXquqMqJgvhvHcRPqkfWN49+6icUQIos6OHCg="; + hash = "sha256-/w9MZ+hNEwB41VwPSYEY6V0uWmZ4Tsev3h2fa/REm2E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/el/element-call/package.nix b/pkgs/by-name/el/element-call/package.nix index 1a3b90799c569..0123a954d8f1d 100644 --- a/pkgs/by-name/el/element-call/package.nix +++ b/pkgs/by-name/el/element-call/package.nix @@ -37,10 +37,18 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ yarnConfigHook yarnBuildHook - yarnInstallHook nodejs ]; + installPhase = '' + runHook preInstall + + mkdir $out + cp -r dist/* $out + + runHook postInstall + ''; + meta = with lib; { homepage = "https://github.com/element-hq/element-call"; description = "Group calls powered by Matrix"; diff --git a/pkgs/by-name/fl/flarum/package.nix b/pkgs/by-name/fl/flarum/package.nix index 489d335f038b5..ab8daa790b82d 100644 --- a/pkgs/by-name/fl/flarum/package.nix +++ b/pkgs/by-name/fl/flarum/package.nix @@ -3,20 +3,20 @@ , fetchFromGitHub }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "flarum"; version = "1.8.1"; src = fetchFromGitHub { owner = "flarum"; repo = "flarum"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kigUZpiHTM24XSz33VQYdeulG1YI5s/M02V7xue72VM="; }; composerLock = ./composer.lock; composerStrictValidation = false; - vendorHash = "sha256-m+x/4A/DcMv7mMfQjpH1vsVqXuMHhSHeX3sgI43uJLI="; + vendorHash = "sha256-pup+ZfPEnqoA3wEXQNn4pWTYXri6d4XzMfuc8k1SeQk="; meta = with lib; { changelog = "https://github.com/flarum/framework/blob/main/CHANGELOG.md"; diff --git a/pkgs/by-name/fl/flex-launcher/package.nix b/pkgs/by-name/fl/flex-launcher/package.nix new file mode 100644 index 0000000000000..de73d4b4480eb --- /dev/null +++ b/pkgs/by-name/fl/flex-launcher/package.nix @@ -0,0 +1,48 @@ +{ + stdenv, + fetchFromGitHub, + SDL2, + SDL2_ttf, + SDL2_image, + cmake, + validatePkgConfig, + inih, + lib, + gitUpdater, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "flex-launcher"; + version = "2.2"; + + src = fetchFromGitHub { + owner = "complexlogic"; + repo = "flex-launcher"; + tag = "v${finalAttrs.version}"; + hash = "sha256-touQMOKvp+D1vIYvyz/nU7aU9g6VXpDN3BPgoK/iYfw="; + }; + + nativeBuildInputs = [ + cmake + validatePkgConfig + ]; + + buildInputs = [ + SDL2 + SDL2_ttf + SDL2_image + inih + ]; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = { + description = "Customizable HTPC application launcher"; + license = lib.licenses.unlicense; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ MasterEvarior ]; + homepage = "https://complexlogic.github.io/flex-launcher/"; + changelog = "https://github.com/complexlogic/flex-launcher/releases/tag/v${finalAttrs.version}"; + mainProgram = "flex-launcher"; + }; +}) diff --git a/pkgs/by-name/fr/frankenphp/package.nix b/pkgs/by-name/fr/frankenphp/package.nix index 506fdac0ebc54..d7395131df7f3 100644 --- a/pkgs/by-name/fr/frankenphp/package.nix +++ b/pkgs/by-name/fr/frankenphp/package.nix @@ -31,13 +31,13 @@ let in buildGoModule rec { pname = "frankenphp"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "dunglas"; repo = "frankenphp"; tag = "v${version}"; - hash = "sha256-eXyO+Z/qD15smqb2/S1los/zsBVlxuYq+DAkvksMz/s="; + hash = "sha256-lY0nZCaevAlTOLHozOvH1xtLFTLOv093N4mrETt4Lhg="; }; sourceRoot = "${src.name}/caddy"; @@ -45,7 +45,7 @@ buildGoModule rec { # frankenphp requires C code that would be removed with `go mod tidy` # https://github.com/golang/go/issues/26366 proxyVendor = true; - vendorHash = "sha256-KlWRyQz//sR24IJj9RvRtPQG0N0FjVSL6Yrq0Nhgi/A="; + vendorHash = "sha256-LqsdX2oivCYhXBGZBKP+V7iNUoZuW6lRFO9kUpeEvL4="; buildInputs = [ phpUnwrapped diff --git a/pkgs/by-name/ge/geoserver/extensions.nix b/pkgs/by-name/ge/geoserver/extensions.nix index 9d3d4e63e31e1..96754b9aa427f 100644 --- a/pkgs/by-name/ge/geoserver/extensions.nix +++ b/pkgs/by-name/ge/geoserver/extensions.nix @@ -42,325 +42,325 @@ in { app-schema = mkGeoserverExtension { name = "app-schema"; - version = "2.26.1"; # app-schema - hash = "sha256-klT03jure+ILuQX5X3jdIfUa7AI/bdzTEig2QDs/P5o="; # app-schema + version = "2.26.2"; # app-schema + hash = "sha256-pFjKgEuAFiEN6FJkooKqMHzkbZnQWchzzLFPsA9TDH4="; # app-schema }; authkey = mkGeoserverExtension { name = "authkey"; - version = "2.26.1"; # authkey - hash = "sha256-jjZtUiSQ8ZzsLrinT8Uw628jIRKnGi6XnGT/5GvCwew="; # authkey + version = "2.26.2"; # authkey + hash = "sha256-u1/dbTHZPIImVq46YGWpdsO60wg6jWmc4ttAzasKpcU="; # authkey }; cas = mkGeoserverExtension { name = "cas"; - version = "2.26.1"; # cas - hash = "sha256-FcUlQ9gSb64wxnEZaU1oJViPDbA32GChcdiZ5uvft7w="; # cas + version = "2.26.2"; # cas + hash = "sha256-KagmWS+VNsC1wtasa9UwNZsaUzmbZKG/SPBq91pW4R8="; # cas }; charts = mkGeoserverExtension { name = "charts"; - version = "2.26.1"; # charts - hash = "sha256-IDGBTMa+VMqZIxOFylL29t0h9AoOXe7GJmj3dKrdGQ0="; # charts + version = "2.26.2"; # charts + hash = "sha256-TDv+7JFe5N8HtxjNOFYcfdJ9kdCLBKigdvqzb9p3dow="; # charts }; control-flow = mkGeoserverExtension { name = "control-flow"; - version = "2.26.1"; # control-flow - hash = "sha256-09EuvTTGeaNRLKshhsyHPvE4p9F5IJPV/ig8cNigQbA="; # control-flow + version = "2.26.2"; # control-flow + hash = "sha256-QQowtOOUKJCm1C7VkDHWbIscCal3PsxFMTfi5JUZqi8="; # control-flow }; css = mkGeoserverExtension { name = "css"; - version = "2.26.1"; # css - hash = "sha256-Qy5AYnXIcsoGxnGCjHRK4XiDflT1jVoVKr6Iq/GMYlg="; # css + version = "2.26.2"; # css + hash = "sha256-MgAwSWpSVrGJYRxGt1gCiLXj8uXQ8hvCkfI+yGtZU34="; # css }; csw = mkGeoserverExtension { name = "csw"; - version = "2.26.1"; # csw - hash = "sha256-mZ7BrWFmLrpzW/oM0YovTC+Zb6BMnj1idMSiemNX6Xc="; # csw + version = "2.26.2"; # csw + hash = "sha256-i3ObMkSOnCGihZm8CcMj90jG3B8pYRTX9Yd4uuholKY="; # csw }; csw-iso = mkGeoserverExtension { name = "csw-iso"; - version = "2.26.1"; # csw-iso - hash = "sha256-FV5GDv+fywFhdNJi5hT5qvvPQVBT3TJpjI0SQnmH5BY="; # csw-iso + version = "2.26.2"; # csw-iso + hash = "sha256-zEVkldjEsI+sBbMDvvL2b6DciwwUacsufXgvIDfLYX4="; # csw-iso }; db2 = mkGeoserverExtension { name = "db2"; - version = "2.26.1"; # db2 - hash = "sha256-XlCAFADr8hLFQAbCxrFtrNIBh4S4oEjbezlCwprW8uQ="; # db2 + version = "2.26.2"; # db2 + hash = "sha256-g9J/KZ3ET2HSs1fhVFW8cRe409vfZddBaXoXOgVZrcE="; # db2 }; # Needs wps extension. dxf = mkGeoserverExtension { name = "dxf"; - version = "2.26.1"; # dxf - hash = "sha256-WHuhp+nqO5NemYWGiRcuD5/vlBdmMNT+sdm2a+yk9do="; # dxf + version = "2.26.2"; # dxf + hash = "sha256-Ninuw1npfy3lND0O8Tu87hv/gXPQFC3vU8H1oE8aLdc="; # dxf }; excel = mkGeoserverExtension { name = "excel"; - version = "2.26.1"; # excel - hash = "sha256-JRNM+JilMODNb2r4XEBRj2wkIb/zc6e6Q+U+/X8egAY="; # excel + version = "2.26.2"; # excel + hash = "sha256-Lqkbr6KTtiKUmW5A3Uqem0C81oNnLd6eVzm/MwvnYjg="; # excel }; feature-pregeneralized = mkGeoserverExtension { name = "feature-pregeneralized"; - version = "2.26.1"; # feature-pregeneralized - hash = "sha256-I0UzMFkZF9SaIFI+GcfegxdC4IFIUi6+GsutotJ5i1Q="; # feature-pregeneralized + version = "2.26.2"; # feature-pregeneralized + hash = "sha256-T6NiDBOIpqQKEAm58558seSpHSA84w9K1C9l2Xy/sWQ="; # feature-pregeneralized }; # Note: The extension name ("gdal") clashes with pkgs.gdal. gdal = mkGeoserverExtension { name = "gdal"; - version = "2.26.1"; # gdal + version = "2.26.2"; # gdal buildInputs = [ pkgs.gdal ]; - hash = "sha256-EoaKKlEhch5/wg4SODx9JV9+M+4Ui9Wcb2HSM1bcgLE="; # gdal + hash = "sha256-OgkoB2VY4x+6kfDDbOMKUzyd6/Q1m9YMC6sZU17qRsE="; # gdal }; # Throws "java.io.FileNotFoundException: URL [jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties] cannot be resolved to absolute file path because it does not reside in the file system: jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties" but seems to work out of the box. #geofence = mkGeoserverExtension { # name = "geofence"; - # version = "2.26.1"; # geofence - # hash = "sha256-B2yPPEOsdBDxO/mG3W6MYBqhigjvS6YTZTsvHoUzBAg="; # geofence + # version = "2.26.2"; # geofence + # hash = "sha256-gXJYk64qO78hQhEmmJU98mrSYIKK/DlRPptdS6rFDD0="; # geofence #}; #geofence-server = mkGeoserverExtension { # name = "geofence-server"; - # version = "2.26.1"; # geofence-server - # hash = "sha256-pgWWomyBmru2tfQfuGdomQirN0Km3j5W/JG644vNHZQ="; # geofence-server + # version = "2.26.2"; # geofence-server + # hash = "sha256-tyxIjQNmATtLy1X9dmaLugsbMyg7+2+NMx8a5jvVvDU="; # geofence-server #}; #geofence-wps = mkGeoserverExtension { # name = "geofence-wps"; - # version = "2.26.1"; # geofence-wps - # hash = "sha256-hQBYJ+jXx3/GOVzqcSS1w/Zc0GKAD2fyIX5lm9kiPmg="; # geofence-wps + # version = "2.26.2"; # geofence-wps + # hash = "sha256-ZU5E5SsYBpOvguYhHXLrm5IJzYtSggcF+iqB76LB05g="; # geofence-wps #}; geopkg-output = mkGeoserverExtension { name = "geopkg-output"; - version = "2.26.1"; # geopkg-output - hash = "sha256-9EuI9Hvvxdf1FmJ6AMHmbc5RJr33MlBbGd9NqNwacFo="; # geopkg-output + version = "2.26.2"; # geopkg-output + hash = "sha256-XzzT6g5G26/NZzdCl4wqtQUbNfMGrc5/lI/HRN+x8BU="; # geopkg-output }; grib = mkGeoserverExtension { name = "grib"; - version = "2.26.1"; # grib - hash = "sha256-o87Fyy+remmP8c3m4TZ6TX+lUoPdH//P2yJ1DeV+iBs="; # grib + version = "2.26.2"; # grib + hash = "sha256-9onvPoSFOLODqedOLW3Bf0IJLE3UtuMSF8l4dGysMDs="; # grib buildInputs = [ netcdf ]; }; gwc-s3 = mkGeoserverExtension { name = "gwc-s3"; - version = "2.26.1"; # gwc-s3 - hash = "sha256-7XLrG4sJ1Bvw6d0qzT0ZGLVQ8wr9br9mUEwZGvd9U+s="; # gwc-s3 + version = "2.26.2"; # gwc-s3 + hash = "sha256-3z7DfkY/NP9ESfZWI+/ubHwHmBJM0SYyJGNVz7oAuVc="; # gwc-s3 }; h2 = mkGeoserverExtension { name = "h2"; - version = "2.26.1"; # h2 - hash = "sha256-ldqz1tPPJkyJPFBeltDUIDLwZtTu8mpSHRbWGsY3TfY="; # h2 + version = "2.26.2"; # h2 + hash = "sha256-7wsbxACFtmtL1ApQy1DT2yYzOF51nfi7CWYlUGfYoKY="; # h2 }; iau = mkGeoserverExtension { name = "iau"; - version = "2.26.1"; # iau - hash = "sha256-mzkYYPfixrSx7+r0lSrOw9agocpi7BogDnmcqtiJh1M="; # iau + version = "2.26.2"; # iau + hash = "sha256-j8Z5q0w6iqC++KScWoRTMOf4o7ADPN7IfPccc8A4A1M="; # iau }; importer = mkGeoserverExtension { name = "importer"; - version = "2.26.1"; # importer - hash = "sha256-Os7oRg+EM5p7rXyI5Qg0vWzZ2i1/tplw1zHaLJJ0feM="; # importer + version = "2.26.2"; # importer + hash = "sha256-4BObAg/3BuP8UH4yodClBJsSlTE4S2tyPtqDHqOGRYg="; # importer }; inspire = mkGeoserverExtension { name = "inspire"; - version = "2.26.1"; # inspire - hash = "sha256-cYxoBk/oOjKj7gk4mzHUSU1LbWLRxjSbH9B+JiZCxgU="; # inspire + version = "2.26.2"; # inspire + hash = "sha256-NZ5oMXpakPfdJZg8J9Y3D/8j09H0P9CQgnpeObrGkNE="; # inspire }; # Needs Kakadu plugin from # https://github.com/geosolutions-it/imageio-ext #jp2k = mkGeoserverExtension { # name = "jp2k"; - # version = "2.26.1"; # jp2k - # hash = "sha256-P4UUtfRSlH4GMpDcvy1TjyorolrPLK0P8zCwDJUbFhE="; # jp2k + # version = "2.26.2"; # jp2k + # hash = "sha256-W+nx7PeEksyjA2iuN75qvWqDSdSnF0eNHAPqwce3amA="; # jp2k #}; libjpeg-turbo = mkGeoserverExtension { name = "libjpeg-turbo"; - version = "2.26.1"; # libjpeg-turbo - hash = "sha256-pGorlT/BaS605wyIcgNAM5aJxV6I78Dr3m1uADxdebI="; # libjpeg-turbo + version = "2.26.2"; # libjpeg-turbo + hash = "sha256-EYZQOQ1rAqTbRHh7cewkvJT4l1cmyFxNUwEFW2/8ezQ="; # libjpeg-turbo buildInputs = [ libjpeg.out ]; }; mapml = mkGeoserverExtension { name = "mapml"; - version = "2.26.1"; # mapml - hash = "sha256-r1Z7Gc3c/kH2jm6wD46Oj2ZZTg136k2n9lqnRVkPXfs="; # mapml + version = "2.26.2"; # mapml + hash = "sha256-RHTPzy0f3DP6ye94Slw/Tz/GIleAgW1DMiMkkneT7kk="; # mapml }; mbstyle = mkGeoserverExtension { name = "mbstyle"; - version = "2.26.1"; # mbstyle - hash = "sha256-a5jQDyn/nOS/HbhAzKAKl40g1SDYQ51Xi+LzWtByntA="; # mbstyle + version = "2.26.2"; # mbstyle + hash = "sha256-vJB9wFiMJtu16JuJ+vESYG07U/Hs7NmMo3kqMkjV0k4="; # mbstyle }; metadata = mkGeoserverExtension { name = "metadata"; - version = "2.26.1"; # metadata - hash = "sha256-O9/gBrJBp8/fOYOx7fsqkgcQ0k6wxIoz9DLQDemjJK8="; # metadata + version = "2.26.2"; # metadata + hash = "sha256-CVp2KVHmqeIXPf031HBnvilcgfEKOpyv9Pc/yNpCFM8="; # metadata }; mongodb = mkGeoserverExtension { name = "mongodb"; - version = "2.26.1"; # mongodb - hash = "sha256-j9e2V6UkagW55WKKW2eaCnBBGwKmdDjGQBSvngpAqb8="; # mongodb + version = "2.26.2"; # mongodb + hash = "sha256-Ndo0/r0maxZ7GcGQFY8ZNgtmxXaDJ1Gtj4oDRN7qzWM="; # mongodb }; monitor = mkGeoserverExtension { name = "monitor"; - version = "2.26.1"; # monitor - hash = "sha256-CLTtJHO+/Hq8/JFErm3ieyLc6wIqCelx0CRDpzbPfZ0="; # monitor + version = "2.26.2"; # monitor + hash = "sha256-1/yqmzFaPbntgxB1zXqJIrKCdKJpPzHm30v+Ww/kgXE="; # monitor }; mysql = mkGeoserverExtension { name = "mysql"; - version = "2.26.1"; # mysql - hash = "sha256-TiSkHdp/U9P1acaD5mN0eOA/J/5fnnJH14nDlKNY3+k="; # mysql + version = "2.26.2"; # mysql + hash = "sha256-QOlAUhXyzpazYk/JJr9IcU1gIVS7iGB6Ly2HgbER8dA="; # mysql }; netcdf = mkGeoserverExtension { name = "netcdf"; - version = "2.26.1"; # netcdf - hash = "sha256-k/zDVoh19Pg/jZa4svAqU1c4EqPnPRSIQL9ZTlrohvY="; # netcdf + version = "2.26.2"; # netcdf + hash = "sha256-cwe518kyk5vMjjBvHhzmTdZ/G0nT0KEDoQK7GbiAnfQ="; # netcdf buildInputs = [ netcdf ]; }; netcdf-out = mkGeoserverExtension { name = "netcdf-out"; - version = "2.26.1"; # netcdf-out - hash = "sha256-maHIpPQshEcB7JZuhTIo1X209o29iv36alUx76LWV2I="; # netcdf-out + version = "2.26.2"; # netcdf-out + hash = "sha256-/u9cOOT0/FvEt39VXO3l4Vv01Qpiqg9qJnNH4nnUxa0="; # netcdf-out buildInputs = [ netcdf ]; }; ogr-wfs = mkGeoserverExtension { name = "ogr-wfs"; - version = "2.26.1"; # ogr-wfs + version = "2.26.2"; # ogr-wfs buildInputs = [ pkgs.gdal ]; - hash = "sha256-XFEO0JruZCgYj7LWNftIFeI0LoypMbtD2A148LbLg+4="; # ogr-wfs + hash = "sha256-4Lp9ffQVgug2zP6ikDyDSITqrq8K5wADjNm3ArpJz1s="; # ogr-wfs }; # Needs ogr-wfs extension. ogr-wps = mkGeoserverExtension { name = "ogr-wps"; - version = "2.26.1"; # ogr-wps + version = "2.26.2"; # ogr-wps # buildInputs = [ pkgs.gdal ]; - hash = "sha256-qfuU/HlVTHjPIA9DCdc8YURpLyPHSxXKEko0s3tDLpI="; # ogr-wps + hash = "sha256-57rQgsdwXI7eQFhbL+ieP8uOlfeOJqUVWibBNZiPb9E="; # ogr-wps }; oracle = mkGeoserverExtension { name = "oracle"; - version = "2.26.1"; # oracle - hash = "sha256-dZ6b+hYD1uJDHMJRDChsZc3W9TiQhKfvCBbDIr9xB9E="; # oracle + version = "2.26.2"; # oracle + hash = "sha256-23/lMh1L3zzwUk3cJCxQhdLdQoghhkK1JAoet9nmN1M="; # oracle }; params-extractor = mkGeoserverExtension { name = "params-extractor"; - version = "2.26.1"; # params-extractor - hash = "sha256-7qr+jxo4tzxW76k/t+Zd0h45U6mqzReRjnsJfWFZV8o="; # params-extractor + version = "2.26.2"; # params-extractor + hash = "sha256-mEKf4riqzSlwra71jY4MO1BM2/fCfikW1CKAB02ntF8="; # params-extractor }; printing = mkGeoserverExtension { name = "printing"; - version = "2.26.1"; # printing - hash = "sha256-jXdp0zX5sq4HBs1lF658FtSRjMOm1KXrbVm9dDPDmfk="; # printing + version = "2.26.2"; # printing + hash = "sha256-/R4MX73aiTGbqDNK+2rthcBUwJesc3j96UDqmpTZpxk="; # printing }; pyramid = mkGeoserverExtension { name = "pyramid"; - version = "2.26.1"; # pyramid - hash = "sha256-hRc24f5pY94TRsmttc0SLPjS6S23kzCeiyuE8XbM4pA="; # pyramid + version = "2.26.2"; # pyramid + hash = "sha256-6FIDk62d45ctmwhaW/XpdHziiPFyhsKm36l5BpZa4/w="; # pyramid }; querylayer = mkGeoserverExtension { name = "querylayer"; - version = "2.26.1"; # querylayer - hash = "sha256-7wNSoi6PUZJLHGUO0D48O88xKoU63FBSH4+lfxgbEjA="; # querylayer + version = "2.26.2"; # querylayer + hash = "sha256-sM9OmWKJwOjxqzuhOEF+6j01r3+lvvZmaOIxBnmsUbo="; # querylayer }; sldservice = mkGeoserverExtension { name = "sldservice"; - version = "2.26.1"; # sldservice - hash = "sha256-T2v42w8mhaFH/gcnJUEJdlQZH6gNyx8Y8wpKws0Xsns="; # sldservice + version = "2.26.2"; # sldservice + hash = "sha256-aKRy0wbx5XRdXPGZFsf+bdxmU0ILAPiMI2Zqg2nu52E="; # sldservice }; sqlserver = mkGeoserverExtension { name = "sqlserver"; - version = "2.26.1"; # sqlserver - hash = "sha256-gQrmBMxosWkvAb9+DG9UEgrmG8AKl3NPgYLZ2nG2iM0="; # sqlserver + version = "2.26.2"; # sqlserver + hash = "sha256-Sacng3WZ+bbljlnYQfP9RWk96kVeiJlGFFgudNheg9g="; # sqlserver }; vectortiles = mkGeoserverExtension { name = "vectortiles"; - version = "2.26.1"; # vectortiles - hash = "sha256-/cR7S5dzR8td7dFk05QkLnp0vhSpXuCLO0vmiB2JyRQ="; # vectortiles + version = "2.26.2"; # vectortiles + hash = "sha256-6hC8YfGbgUC6Mxx5/0qfbKOaO7UmHEhcrY9q1U/Q3Us="; # vectortiles }; wcs2_0-eo = mkGeoserverExtension { name = "wcs2_0-eo"; - version = "2.26.1"; # wcs2_0-eo - hash = "sha256-SYUo3G/BuILOHN6t8F9Q/gwGjAzCY9crmvU+f6mDm/U="; # wcs2_0-eo + version = "2.26.2"; # wcs2_0-eo + hash = "sha256-u433otfuIdCOPON8mGcyDgVoHstXV4tKClRopN+yJHE="; # wcs2_0-eo }; web-resource = mkGeoserverExtension { name = "web-resource"; - version = "2.26.1"; # web-resource - hash = "sha256-z2Zm4UvigN7TvIIHnn42xThIg8Xy3F2+1fPzdhDMZ+A="; # web-resource + version = "2.26.2"; # web-resource + hash = "sha256-C8+8Ri7RLz8UhsMuhINF2p7SriHV6+lU/DBMBo75fUw="; # web-resource }; wmts-multi-dimensional = mkGeoserverExtension { name = "wmts-multi-dimensional"; - version = "2.26.1"; # wmts-multi-dimensional - hash = "sha256-Wju8vN4KCN13aJshPqfUEQa8B0WHdeOvFEZ/ZzZOg7E="; # wmts-multi-dimensional + version = "2.26.2"; # wmts-multi-dimensional + hash = "sha256-6Wnf4im1fZULjoSOu2V3Phn4/6A3UGnCP8BvZDtaKUU="; # wmts-multi-dimensional }; wps = mkGeoserverExtension { name = "wps"; - version = "2.26.1"; # wps - hash = "sha256-Yi1MdBWeoNBMco/8JUouVXVpfebmpXkTo6COJPLl0bw="; # wps + version = "2.26.2"; # wps + hash = "sha256-ocFmcaWsEq7iothnc7/7DIPpbCo5z5WwI3F1tbDX8dA="; # wps }; # Needs hazelcast (https://github.com/hazelcast/hazelcast (?)) which is not # available in nixpgs as of 2024/01. #wps-cluster-hazelcast = mkGeoserverExtension { # name = "wps-cluster-hazelcast"; - # version = "2.26.1"; # wps-cluster-hazelcast - # hash = "sha256-Ed2jV6fmoOUQX7Cs3Qe1TjJ8mki/u1v/nng7MqF+Jqs="; # wps-cluster-hazelcast + # version = "2.26.2"; # wps-cluster-hazelcast + # hash = "sha256-GoSeXKd4wBhYdnGlHgoHiaVxnb4VNEg1TG5IXG0qJzA="; # wps-cluster-hazelcast #}; wps-download = mkGeoserverExtension { name = "wps-download"; - version = "2.26.1"; # wps-download - hash = "sha256-HX+RUZHsfyMb/u/I2S57zrW6HKhzSdE9CZT3GjQ0fbM="; # wps-download + version = "2.26.2"; # wps-download + hash = "sha256-FBVt/B2nuf0PY4o1yuJ997sjWdsWYYxDgC94yOKQH/8="; # wps-download }; # Needs Postrgres configuration or similar. # See https://docs.geoserver.org/main/en/user/extensions/wps-jdbc/index.html wps-jdbc = mkGeoserverExtension { name = "wps-jdbc"; - version = "2.26.1"; # wps-jdbc - hash = "sha256-W6EUZtt8It1u786eFvuw9k7eZ1SLBG+J4amW036PZko="; # wps-jdbc + version = "2.26.2"; # wps-jdbc + hash = "sha256-w3pzprk4UG4vE6K7tB/41U66OGSpB9uNUafKmKZ5uWY="; # wps-jdbc }; ysld = mkGeoserverExtension { name = "ysld"; - version = "2.26.1"; # ysld - hash = "sha256-kwAMkoSNxoraZ20fVg0xCOD3slxAITL+eLOIJCGewXk="; # ysld + version = "2.26.2"; # ysld + hash = "sha256-guaTT3S0lU6nSaw90gNCHm5Gsdc27jX+XE/92vVfVQI="; # ysld }; } diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix index a228335d3e686..c3e7b826cc3fb 100644 --- a/pkgs/by-name/ge/geoserver/package.nix +++ b/pkgs/by-name/ge/geoserver/package.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation (finalAttrs: rec { pname = "geoserver"; - version = "2.26.1"; + version = "2.26.2"; src = fetchurl { url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip"; - hash = "sha256-qKlXVwzCNS+diuOo43q0nfwPlIMuUPOY1OaoKt9mL+g="; + hash = "sha256-K4OeMGnczKXVl+nxyd9unuCdoEpyF7j364Vxe49EOxo="; }; patches = [ diff --git a/pkgs/by-name/gn/gnmic/package.nix b/pkgs/by-name/gn/gnmic/package.nix index 527cb55f29bc2..73fe10e42abea 100644 --- a/pkgs/by-name/gn/gnmic/package.nix +++ b/pkgs/by-name/gn/gnmic/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "gnmic"; - version = "0.39.1"; + version = "0.40.0"; src = fetchFromGitHub { owner = "openconfig"; repo = pname; rev = "v${version}"; - hash = "sha256-bFMgGPGbBWfT7M5rE6k4Q5L9srgy0UyFtAq/xOdZhxw="; + hash = "sha256-rdT1gCALEsPiyN+4RKmJ36CUkYmbkIyi56JjVkzzkp8="; }; - vendorHash = "sha256-9A/ZcamCMUpNxG3taHrqI4JChjpSjSuwx0ZUyGAuGXo="; + vendorHash = "sha256-n4HBm9n3RkSmAkd29dhDN0tZ/bjVCBzQSihgY8VA1L4="; ldflags = [ "-s" diff --git a/pkgs/by-name/gn/gnome-terminal/package.nix b/pkgs/by-name/gn/gnome-terminal/package.nix index f52e6ad434755..0b876e7369719 100644 --- a/pkgs/by-name/gn/gnome-terminal/package.nix +++ b/pkgs/by-name/gn/gnome-terminal/package.nix @@ -1,13 +1,13 @@ { stdenv, lib, - fetchFromGitLab, + fetchurl, meson, ninja, pkg-config, python3, libxml2, - gitUpdater, + gnome, nautilus, glib, gtk4, @@ -30,14 +30,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-terminal"; - version = "3.54.2"; + version = "3.54.3"; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "gnome-terminal"; - rev = finalAttrs.version; - hash = "sha256-81dOdmIwa3OmuUTciTlearqic6bFMfiX1nvoIxJCt/M="; + src = fetchurl { + url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor finalAttrs.version}/gnome-terminal-${finalAttrs.version}.tar.xz"; + hash = "sha256-Oa8AueYadNjN8oFSvq/uUTwyfhIjoHfRMcR5xQT0pHU="; }; nativeBuildInputs = [ @@ -78,8 +75,9 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = gitUpdater { - odd-unstable = true; + updateScript = gnome.updateScript { + packageName = "gnome-terminal"; + versionPolicy = "odd-unstable"; }; tests = { diff --git a/pkgs/by-name/go/go-migrate/package.nix b/pkgs/by-name/go/go-migrate/package.nix index a78acdc7941da..f5857b03ad37e 100644 --- a/pkgs/by-name/go/go-migrate/package.nix +++ b/pkgs/by-name/go/go-migrate/package.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "go-migrate"; - version = "4.18.1"; + version = "4.18.2"; src = fetchFromGitHub { owner = "golang-migrate"; repo = "migrate"; rev = "v${version}"; - sha256 = "sha256-ZZeurnoFcObrK75zkIZvz9ycdDP9AM3uX6h/4bMWpGc="; + sha256 = "sha256-DRWJ5USabSQtNkyDjz8P7eOS2QBE1KaD8K8XYORBVGo="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-Zaq88oF5rSCSv736afyKDvTNCSIyrIGTN0kuJWqS7tg="; + vendorHash = "sha256-0SbhHA5gKzODW8rHCEuZXWs8vMsVDMqJsRDPs4V1gGc="; subPackages = [ "cmd/migrate" ]; diff --git a/pkgs/by-name/hd/hdrop/package.nix b/pkgs/by-name/hd/hdrop/package.nix index 4c1360184bb0e..312573f396055 100644 --- a/pkgs/by-name/hd/hdrop/package.nix +++ b/pkgs/by-name/hd/hdrop/package.nix @@ -15,13 +15,13 @@ stdenvNoCC.mkDerivation rec { pname = "hdrop"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "Schweber"; repo = "hdrop"; rev = "v${version}"; - hash = "sha256-OX9kjGGdIvsaaGwNq7IbyD5B7AmlH1wHiR6P4uIOdi8="; + hash = "sha256-9uhofu4YHlHTLtOikShKlNWSjNslVNtJcSIUKvtWFZc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hyprland-qt-support/package.nix b/pkgs/by-name/hy/hyprland-qt-support/package.nix new file mode 100644 index 0000000000000..3f97833d5a881 --- /dev/null +++ b/pkgs/by-name/hy/hyprland-qt-support/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + qt6, + pkg-config, + hyprlang, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "hyprland-qt-support"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "hyprwm"; + repo = "hyprland-qt-support"; + tag = "v${finalAttrs.version}"; + hash = "sha256-+uZovj+X0a28172y0o0BvgGXyZLpKPbG03sVlCiSrWc="; + }; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + qt6.qtbase + qt6.qtdeclarative + qt6.qtsvg + qt6.qtwayland + hyprlang + ]; + + cmakeFlags = [ + (lib.cmakeFeature "INSTALL_QML_PREFIX" qt6.qtbase.qtQmlPrefix) + ]; + + meta = { + description = "A Qt6 QML provider for hypr* apps"; + homepage = "https://github.com/hyprwm/hyprland-qt-support"; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = lib.teams.hyprland.members; + }; +}) diff --git a/pkgs/by-name/hy/hyprland-qtutils/package.nix b/pkgs/by-name/hy/hyprland-qtutils/package.nix index f1109b56cebfe..96eab20a79bb8 100644 --- a/pkgs/by-name/hy/hyprland-qtutils/package.nix +++ b/pkgs/by-name/hy/hyprland-qtutils/package.nix @@ -5,6 +5,7 @@ cmake, pkg-config, hyprutils, + hyprland-qt-support, pciutils, qt6, }: @@ -13,13 +14,13 @@ let in gcc14Stdenv.mkDerivation (finalAttrs: { pname = "hyprland-qtutils"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland-qtutils"; tag = "v${finalAttrs.version}"; - hash = "sha256-FxbuGQExtN37ToWYnGmO6weOYN6WPHN/RAqbr7gNPek="; + hash = "sha256-9m/Ha7hrxtbBl4UylZTYzTT/8a6Sy5DvTmBJrcQ6FwQ="; }; nativeBuildInputs = [ @@ -30,6 +31,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: { buildInputs = [ hyprutils + hyprland-qt-support qt6.qtbase qt6.qtsvg qt6.qtwayland diff --git a/pkgs/by-name/hy/hyprpolkitagent/package.nix b/pkgs/by-name/hy/hyprpolkitagent/package.nix index f63a95a4c04b9..b9b2ba249496d 100644 --- a/pkgs/by-name/hy/hyprpolkitagent/package.nix +++ b/pkgs/by-name/hy/hyprpolkitagent/package.nix @@ -4,6 +4,7 @@ cmake, pkg-config, fetchFromGitHub, + hyprland-qt-support, hyprutils, kdePackages, polkit, @@ -27,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + hyprland-qt-support hyprutils kdePackages.kirigami-addons kdePackages.polkit-qt-1 diff --git a/pkgs/by-name/hy/hyprsysteminfo/package.nix b/pkgs/by-name/hy/hyprsysteminfo/package.nix new file mode 100644 index 0000000000000..54e1f7a6cfbc7 --- /dev/null +++ b/pkgs/by-name/hy/hyprsysteminfo/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + qt6, + pkg-config, + hyprutils, + pciutils, + hyprland-qt-support, +}: +let + inherit (lib.strings) makeBinPath; +in +stdenv.mkDerivation (finalAttrs: { + pname = "hyprsysteminfo"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "hyprwm"; + repo = "hyprsysteminfo"; + tag = "v${finalAttrs.version}"; + hash = "sha256-KDxT9B+1SATWiZdUBAQvZu17vk3xmyXcw2Zy56bdWbY="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + qt6.qtbase + qt6.qtdeclarative + qt6.qtsvg + qt6.qtwayland + hyprutils + hyprland-qt-support + ]; + + preFixup = '' + qtWrapperArgs+=(--prefix PATH : "${makeBinPath [ pciutils ]}") + ''; + + meta = { + description = "A tiny qt6/qml application to display information about the running system"; + homepage = "https://github.com/hyprwm/hyprsysteminfo"; + license = lib.licenses.bsd3; + maintainers = lib.teams.hyprland.members; + mainProgram = "hyprsysteminfo"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/im/imgproxy/package.nix b/pkgs/by-name/im/imgproxy/package.nix index 3ce46a4b6a685..c01f697f5c50d 100644 --- a/pkgs/by-name/im/imgproxy/package.nix +++ b/pkgs/by-name/im/imgproxy/package.nix @@ -11,12 +11,12 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.27.1"; + version = "3.27.2"; src = fetchFromGitHub { owner = pname; repo = pname; - hash = "sha256-ewfBMHSrt7fBazgswOwOmeqk0uAc3uULPYppQZcLep4="; + hash = "sha256-rPdo+gj1nxbrE3qbABB7H+tN6WXAdwhtPUCYCsn6vEk="; rev = "v${version}"; }; diff --git a/pkgs/by-name/im/immich-public-proxy/package.nix b/pkgs/by-name/im/immich-public-proxy/package.nix index 3eab126726465..63157a6af6c5c 100644 --- a/pkgs/by-name/im/immich-public-proxy/package.nix +++ b/pkgs/by-name/im/immich-public-proxy/package.nix @@ -8,17 +8,17 @@ }: buildNpmPackage rec { pname = "immich-public-proxy"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "alangrainger"; repo = "immich-public-proxy"; tag = "v${version}"; - hash = "sha256-R2w11AdOgcV1R1eIzDgt+yexWwystDNJiJ+14MH6WtU="; + hash = "sha256-nhVU3CVexXV+WCUP8E1tGvwwjy+PCTL9v3/3KI1tDus="; }; sourceRoot = "${src.name}/app"; - npmDepsHash = "sha256-VXCJ0VaAKOlz342saRAnb1MLZGgIZwPpy/2oS/Gvsj8="; + npmDepsHash = "sha256-NQgxAHNMPp2eDoiMqjqBOZ3364XjW3WtvrK/ciqg1DI="; # patch in absolute nix store paths so the process doesn't need to cwd in $out postPatch = '' diff --git a/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix b/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix index 25fbc1d493028..1e448dd767fa8 100644 --- a/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix +++ b/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "kittycad-kcl-lsp"; - version = "0.1.65"; + version = "0.1.66"; src = fetchFromGitHub { owner = "KittyCAD"; repo = "kcl-lsp"; tag = "v${version}"; - hash = "sha256-3j7xiTrhDPBNTg53y2KyLpk8m4DrJbZWYkdIm5sxEfs="; + hash = "sha256-uKsxWNR5syd2+/4I9nxZ+fWBUdHP3rhpUzLVPn4v8Wk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Hab3DlLU2PRaZCBA2BM5FlpDkpXIfIFxys6uPCDUrnc="; + cargoHash = "sha256-dKNuPg6XRZ6UwZr6+S3+LM3t9xATgGndhX3hrD3Xp0Q="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/li/libburn/package.nix b/pkgs/by-name/li/libburn/package.nix index 4f3e60bf90ce1..4d4901901ac54 100644 --- a/pkgs/by-name/li/libburn/package.nix +++ b/pkgs/by-name/li/libburn/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitea, + fetchpatch, autoreconfHook, pkg-config, }: @@ -18,6 +19,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Xo45X4374FXvlrJ4Q0PahYvuWXO0k3N0ke0mbURYt54="; }; + patches = [ + # Fix the build against C23 compilers (like gcc-15): + (fetchpatch { + name = "c23.patch"; + url = "https://dev.lovelyhq.com/libburnia/libburn/commit/d537f9dd35282df834a311ead5f113af67d223b3.patch"; + hash = "sha256-aouU/6AchLhzMzvkVvUnFHWfebYTrkEJ6P3fF5pvE9M="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config diff --git a/pkgs/by-name/li/libcifpp/package.nix b/pkgs/by-name/li/libcifpp/package.nix index 0e2b001eeaf7b..d4c419eba30c6 100644 --- a/pkgs/by-name/li/libcifpp/package.nix +++ b/pkgs/by-name/li/libcifpp/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libcifpp"; - version = "7.0.8"; + version = "7.0.9"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "libcifpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-PD811D/n++PM45H/BatlLiMaIeUEiisLU/bGhiUhPU0="; + hash = "sha256-wV4YvQmtpbj+mOiMeSr9gBpZzFPygkAOkj74vv4pA4U="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libmcfp/package.nix b/pkgs/by-name/li/libmcfp/package.nix index 085798010bd89..81643693b47bc 100644 --- a/pkgs/by-name/li/libmcfp/package.nix +++ b/pkgs/by-name/li/libmcfp/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmcfp"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "mhekkel"; repo = "libmcfp"; tag = "v${finalAttrs.version}"; - hash = "sha256-7Oy7qEXIAJ50NXL4+Mm67WrivpubDz7uLWZ3YVzTFxA="; + hash = "sha256-e4scwaCwKU2M5FJ/+UTNDigazopQwGhCIqDatQX7ERw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libspelling/package.nix b/pkgs/by-name/li/libspelling/package.nix index 15d226079e316..2c818931128aa 100644 --- a/pkgs/by-name/li/libspelling/package.nix +++ b/pkgs/by-name/li/libspelling/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitLab, + fetchurl, meson, ninja, pkg-config, @@ -17,9 +17,9 @@ gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libspelling"; - version = "0.4.5"; + version = "0.4.6"; outputs = [ "out" @@ -27,12 +27,9 @@ stdenv.mkDerivation rec { "devdoc" ]; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "libspelling"; - rev = version; - hash = "sha256-+WjhBg98s5RxQfd85FtMNuoVWjw9Hap9yDqnpYNAGgw="; + src = fetchurl { + url = "mirror://gnome/sources/libspelling/${lib.versions.majorMinor finalAttrs.version}/libspelling-${finalAttrs.version}.tar.xz"; + hash = "sha256-MkiptTNuovcn0tuRLS8Ag6zMBQXOcHZ5s9m4JmwBAfU="; }; nativeBuildInputs = [ @@ -69,4 +66,4 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.gnome.org/GNOME/libspelling/-/raw/${version}/NEWS"; maintainers = with maintainers; [ chuangzhu ] ++ teams.gnome.members; }; -} +}) diff --git a/pkgs/by-name/li/limbo/package.nix b/pkgs/by-name/li/limbo/package.nix index 9146a29a2d43d..9b1b7685905ae 100644 --- a/pkgs/by-name/li/limbo/package.nix +++ b/pkgs/by-name/li/limbo/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { pname = "limbo"; - version = "0.0.12"; + version = "0.0.13"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "limbo"; tag = "v${version}"; - hash = "sha256-Lmtvn7hWdrqumtTpiYK0sTsESeKo4Mfao32K0DfHmrc="; + hash = "sha256-zIjtuATXlqFh2IoM9cqWysZdRFaVgJTcZFWUsK+NtsQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-wmo2ZUtFGylH1z2R+SwMOWSsq0lGn9nkMwtvI9sZn5U="; + cargoHash = "sha256-Bb293Amn1S4QARtWrtRkWFHF5FisIcbrfJTsOV6aUQo="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix index 6130c19dbabcc..8758a657238eb 100644 --- a/pkgs/by-name/li/lint-staged/package.nix +++ b/pkgs/by-name/li/lint-staged/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "lint-staged"; - version = "15.4.0"; + version = "15.4.3"; src = fetchFromGitHub { owner = "okonet"; repo = "lint-staged"; rev = "v${version}"; - hash = "sha256-upCbaGoP/O2j3PrZzxMneRBNvz/24sUpUOZK8C7R/Bc="; + hash = "sha256-TBh0qqe2sHSisBMU86TlGhSVrBFY9rgYs5uGSmSTT4g="; }; - npmDepsHash = "sha256-V/AUZV7Ru0TrD0PIm82ppWlqKwzbeiFm+CZO/PtSI+s="; + npmDepsHash = "sha256-p0+Feii4riQ4TtNAQtPZ1bH/yA8q1tjm15IKNi1Ksvk="; dontNpmBuild = true; diff --git a/pkgs/by-name/lk/lk-jwt-service/package.nix b/pkgs/by-name/lk/lk-jwt-service/package.nix index 78ea0a5d9af43..5964e0104a6f7 100644 --- a/pkgs/by-name/lk/lk-jwt-service/package.nix +++ b/pkgs/by-name/lk/lk-jwt-service/package.nix @@ -6,23 +6,19 @@ buildGoModule rec { pname = "lk-jwt-service"; - version = "0-unstable-2024-04-27"; + version = "0.1.1"; src = fetchFromGitHub { owner = "element-hq"; repo = "lk-jwt-service"; - rev = "4a295044a4d0bd2af4474bf6a8a14fd0596ecf9e"; - hash = "sha256-dN4iJ8P0u5dbZ93mp/FumcvByP7EpQhOvR+Oe4COWXQ="; + tag = "v${version}"; + hash = "sha256-RbfJdAhLz2wfTC17i533U25TIUtJEkHTgqJC2R+j1uM="; }; - vendorHash = "sha256-9qOApmmOW+N1L/9hj9tVy0hLIUI36WL2TGWUcM3ajeM="; - - postInstall = '' - mv $out/bin/ec-lms $out/bin/lk-jwt-service - ''; + vendorHash = "sha256-7wruthAqC9jVpAhPiIDdqAB51l38fLHEhl2QOaBJiL0="; meta = with lib; { - description = "Minimal service to provide LiveKit JWTs using Matrix OpenID Connect"; + description = "Minimal service to issue LiveKit JWTs for MatrixRTC"; homepage = "https://github.com/element-hq/lk-jwt-service"; license = licenses.agpl3Plus; maintainers = with maintainers; [ kilimnik ]; diff --git a/pkgs/by-name/ll/lldap-cli/package.nix b/pkgs/by-name/ll/lldap-cli/package.nix index 737ecded6f8c6..71872a9164078 100644 --- a/pkgs/by-name/ll/lldap-cli/package.nix +++ b/pkgs/by-name/ll/lldap-cli/package.nix @@ -7,18 +7,21 @@ gnugrep, gnused, jq, + lldap, + unixtools, curl, makeWrapper, + unstableGitUpdater, }: stdenv.mkDerivation { pname = "lldap-cli"; - version = "0-unstable-2024-02-24"; + version = "0-unstable-2024-11-11"; src = fetchFromGitHub { owner = "Zepmann"; repo = "lldap-cli"; - rev = "d1fe50006c4a3a1796d4fb2d73d8c8dcfc875fd5"; - hash = "sha256-ZKRTYdgtOfV7TgpaVKLhYrCttYvB/bUexMshmmF8NyY="; + rev = "2a80dc47c334c88faf3000b45c631bc2cea09906"; + hash = "sha256-uk7SOiQmUYtoJnihSnPsu/7Er4wXX4xvPboJaNSMjkM="; }; nativeBuildInputs = [ makeWrapper ]; @@ -42,15 +45,19 @@ stdenv.mkDerivation { --prefix PATH : ${ lib.makeBinPath [ bash + unixtools.column coreutils gnugrep gnused jq + lldap # Needed for lldap_set_password curl ] } ''; + passthru.updateScript = unstableGitUpdater { }; + meta = { description = "Command line tool for managing LLDAP"; longDescription = '' diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix index b5d60fee652fd..d6416ec60ce26 100644 --- a/pkgs/by-name/mi/minijinja/package.nix +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "minijinja"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "minijinja"; rev = version; - hash = "sha256-6jPTbtB7n85oGHYgOqZgBF5QyQGJwyZ3zyY+XLfU9y0="; + hash = "sha256-8MKd1sT+zg03tkKppd8/Zu6ZZWoVTMTmQXSrcDKp0xw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-V+ByJGJZFc1MEsSQkfO7P+08qDaTw0I2ye+4wwYrw4M="; + cargoHash = "sha256-cOaHJsgzCTxY1JGpSamajyWfmAc+M+s2OS5xhcvUN8I="; # The tests relies on the presence of network connection doCheck = false; diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix index d87a6024284b1..53d8446cfbbfa 100644 --- a/pkgs/by-name/mi/misconfig-mapper/package.nix +++ b/pkgs/by-name/mi/misconfig-mapper/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "misconfig-mapper"; - version = "1.12.6"; + version = "1.13.0"; src = fetchFromGitHub { owner = "intigriti"; repo = "misconfig-mapper"; tag = "v${version}"; - hash = "sha256-OdwTY73w/N1NuEeK7GsQWFT9NyOwrKlK0q0llW9Ena0="; + hash = "sha256-WheKF6IG4quJpNBPXbOMKGEUkR6wr3cVi97Gtpaz+LA="; }; vendorHash = "sha256-omnWQfriaPqz51xrUKZM5112ZEHJZgAm68hnqUyzR6A="; diff --git a/pkgs/by-name/mp/mp4fpsmod/package.nix b/pkgs/by-name/mp/mp4fpsmod/package.nix new file mode 100644 index 0000000000000..9f8710d381789 --- /dev/null +++ b/pkgs/by-name/mp/mp4fpsmod/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, +}: + +stdenv.mkDerivation rec { + pname = "mp4fpsmod"; + version = "0.27-unstable-2023-12-30"; + + src = fetchFromGitHub { + owner = "nu774"; + repo = "mp4fpsmod"; + rev = "e2dd065012f4d2c7e42d4acdefee2ffdc50d3d86"; + hash = "sha256-54pkjlvLLi4pLlQA/l+v4Mx5HlloR6GiB2GP71A0x/g="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + enableParallelBuilding = true; + + preConfigure = '' + ./bootstrap.sh + ''; + + meta = with lib; { + description = "Tiny mp4 time code editor"; + longDescription = '' + Tiny mp4 time code editor. You can use this for changing fps, + delaying audio tracks, executing DTS compression, extracting + time codes of mp4. + ''; + inherit (src.meta) homepage; + license = with licenses; [ + # All files are distributed as Public Domain, except for the followings: + publicDomain + mpl11 # mp4v2 + boost # Boost + bsd2 # FreeBSD CVS + ]; + platforms = platforms.unix; + maintainers = with maintainers; [ huggy ]; + mainProgram = "mp4fpsmod"; + }; +} diff --git a/pkgs/by-name/na/nanobench/package.nix b/pkgs/by-name/na/nanobench/package.nix new file mode 100644 index 0000000000000..af59b41ee20b3 --- /dev/null +++ b/pkgs/by-name/na/nanobench/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + nix-update-script, +}: + +stdenv.mkDerivation rec { + pname = "nanobench"; + version = "4.3.11"; + + src = fetchFromGitHub { + owner = "martinus"; + repo = "nanobench"; + tag = "v${version}"; + hash = "sha256-6OoVU31cNY0pIYpK/PdB9Qej+9IJo7+fHFQCTymBVrk="; + }; + + patches = [ + # Missing header from a test file. Required for compiling as of gcc13. Patched in commit from master branch. + # Remove on next release. + (fetchpatch { + url = "https://github.com/martinus/nanobench/commit/e4327893194f06928012eb81cabc606c4e4791ac.patch"; + hash = "sha256-vmpohg9TbIxT+p4JerWh/QBcZ3/+1gPSNf15sqW6leM="; + }) + + # Change cmake install directories to conventional locations. Patches from unmerged pull request. + # Remove when merged upstream. + (fetchpatch { + url = "https://github.com/martinus/nanobench/pull/98/commits/92c6995ccaebbda87fed13de8eaf3d135d1af0c0.patch"; + hash = "sha256-JwCpwSRzV1qnwwcJIGEJWxthT4Vj12TXhAGG0bc8KGM="; + }) + (fetchpatch { + url = "https://github.com/martinus/nanobench/pull/98/commits/17a1f0b598a09d399dd492c72bca5b48ad76c794.patch"; + hash = "sha256-2lOD63qN7gywUQxrdSRVyddpzcQjjeWOrA3hqu7x+CY="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Simple, fast, accurate single-header microbenchmarking functionality for C++11/14/17/20"; + homepage = "https://nanobench.ankerl.com/"; + changelog = "https://github.com/martinus/nanobench/releases/tag/v${version}"; + platforms = lib.platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mtpham99 ]; + }; +} diff --git a/pkgs/by-name/ne/nezha-theme-nazhua/package.nix b/pkgs/by-name/ne/nezha-theme-nazhua/package.nix index 93341c30479df..ed654b29d9546 100644 --- a/pkgs/by-name/ne/nezha-theme-nazhua/package.nix +++ b/pkgs/by-name/ne/nezha-theme-nazhua/package.nix @@ -12,18 +12,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "nezha-theme-nazhua"; - version = "0.5.1"; + version = "0.5.6"; src = fetchFromGitHub { owner = "hi2shark"; repo = "nazhua"; tag = "v${finalAttrs.version}"; - hash = "sha256-5XEdfUCwQSa+PWu4SHJCg3rCtblyD5x41lKe0SvFrU8="; + hash = "sha256-HqNiXkj3GLw5MlQu2fREwUYpT35txopli9SZcFCM90w="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-Wy4xtLjDNkBLeESJCbfq9GhT0mSTAfGBN0A3oHX5BuE="; + hash = "sha256-/CQsG3iQdPyKHdApeMzq4w90NsMBdLXUP2lya8vtK5Q="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/no/novelwriter/package.nix b/pkgs/by-name/no/novelwriter/package.nix index 1c798122be50e..dd07731612167 100644 --- a/pkgs/by-name/no/novelwriter/package.nix +++ b/pkgs/by-name/no/novelwriter/package.nix @@ -7,7 +7,7 @@ nix-update-script, }: let - version = "2.5.3"; + version = "2.6"; in python3.pkgs.buildPythonApplication { pname = "novelwriter"; @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication { owner = "vkbo"; repo = "novelWriter"; rev = "v${version}"; - hash = "sha256-OrsDL5zpMDV2spxC0jtpuhaSWBIS6XBEWZuVxHAS/QM="; + hash = "sha256-eQ0az+4SEpf07rlCHGvK8Fp8ECimpTblWNlxwANNisE="; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/pkgs/by-name/oa/oauth2c/package.nix b/pkgs/by-name/oa/oauth2c/package.nix index ce05dd9faa97e..cb75d2fc90602 100644 --- a/pkgs/by-name/oa/oauth2c/package.nix +++ b/pkgs/by-name/oa/oauth2c/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "oauth2c"; - version = "1.17.1"; + version = "1.17.2"; src = fetchFromGitHub { owner = "cloudentity"; repo = pname; rev = "v${version}"; - hash = "sha256-rrQSQDrdaU3HBTZL0vwHYK07XzcYwUZQp9aG6lwuDsc="; + hash = "sha256-axCzPCYPn6T8AGqE92Yf/aVJ78Wl004Ts4YebSWYa6U="; }; vendorHash = "sha256-ZQFIETfiNKyeZuskwNfoTXBy3MSWmG0tDztz0Mm7xJY="; diff --git a/pkgs/by-name/oh/oh-my-fish/package.nix b/pkgs/by-name/oh/oh-my-fish/package.nix index b91a89c0beb18..b93eb00d7862a 100644 --- a/pkgs/by-name/oh/oh-my-fish/package.nix +++ b/pkgs/by-name/oh/oh-my-fish/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fish, runtimeShell, - substituteAll, + replaceVars, }: stdenv.mkDerivation (finalAttrs: { @@ -38,14 +38,16 @@ stdenv.mkDerivation (finalAttrs: { cp -vr * $out/share/oh-my-fish cp -v ${ - substituteAll { - name = "omf-install"; - src = ./omf-install; - omf = placeholder "out"; + replaceVars ./omf-install { inherit fish runtimeShell; + # replaced below + omf = null; } } $out/bin/omf-install + substituteInPlace $out/bin/omf-install \ + --replace-fail '@omf@' "$out" + chmod +x $out/bin/omf-install cat $out/bin/omf-install diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix index 86e54ac70aaf8..0da01c5c0a99f 100644 --- a/pkgs/by-name/op/openvas-scanner/package.nix +++ b/pkgs/by-name/op/openvas-scanner/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "openvas-scanner"; - version = "23.15.0"; + version = "23.15.3"; src = fetchFromGitHub { owner = "greenbone"; repo = "openvas-scanner"; tag = "v${version}"; - hash = "sha256-LjZZYIA0Qkuheb8ZAPBuiy5GgjOgCfJ0D/YM03zTcW0="; + hash = "sha256-9TzS/w/FZSawrc505aeaGJlz4m6k4Q4loCVgChzKs30="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ox/oxipng/package.nix b/pkgs/by-name/ox/oxipng/package.nix index ac9f6c0d7738c..def5dee39458d 100644 --- a/pkgs/by-name/ox/oxipng/package.nix +++ b/pkgs/by-name/ox/oxipng/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, rustPlatform, + qemu, }: rustPlatform.buildRustPackage rec { @@ -20,6 +21,9 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-4c9YcIQRZsbDJvl8P9Pkd3atTVM+RbQ/4BMb7rE84po="; + # See https://github.com/shssoichiro/oxipng/blob/14b8b0e93a/.cargo/config.toml#L5 + nativeCheckInputs = [ qemu ]; + meta = { homepage = "https://github.com/shssoichiro/oxipng"; description = "Multithreaded lossless PNG compression optimizer"; diff --git a/pkgs/by-name/pa/packer/package.nix b/pkgs/by-name/pa/packer/package.nix index 324c428ef0b98..9bb7f19c98bfb 100644 --- a/pkgs/by-name/pa/packer/package.nix +++ b/pkgs/by-name/pa/packer/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "packer"; - version = "1.11.2"; + version = "1.12.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - hash = "sha256-xi5CWL+KQd9nZSd0EscdH+lfw+WLtteSxtEos0lCNcA="; + hash = "sha256-19eaQs2f4zM3lXuQrWoS2S/tXWe3HdxXesjtVG67LFE="; }; - vendorHash = "sha256-Xmmc30W1ZfMc7YSQswyCjw1KyDA5qi8W+kZ1L7cM3cQ="; + vendorHash = "sha256-BsYL0PEpujsXLjhFP05yK8Pr0tc0lrdsQqxzmKso3rw="; subPackages = [ "." ]; diff --git a/pkgs/by-name/pa/pay-respects/package.nix b/pkgs/by-name/pa/pay-respects/package.nix index fb8e85c98aa13..dd5c3b3857e00 100644 --- a/pkgs/by-name/pa/pay-respects/package.nix +++ b/pkgs/by-name/pa/pay-respects/package.nix @@ -8,18 +8,18 @@ }: rustPlatform.buildRustPackage rec { pname = "pay-respects"; - version = "0.6.11"; + version = "0.6.12"; src = fetchFromGitea { domain = "codeberg.org"; owner = "iff"; repo = "pay-respects"; rev = "v${version}"; - hash = "sha256-4m8/sp6r2Xb2SsNcatMv0+mWHBx+XKD0LEzrEwuWIEA="; + hash = "sha256-lDIhI9CnWwVVGyAJAS3gDUEkeXShTvPd8JKC1j9/9yU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-uE3nS5XAn20iB7VQuYpFryIhQ7WMAEFGrD+KHJb1H5I="; + cargoHash = "sha256-z0nHq5qiT59bCgOWb7D3h25LcejwJlp64j5zaUx9jb0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix index fe76cf7a3dead..b89368fc00682 100644 --- a/pkgs/by-name/pd/pdm/package.nix +++ b/pkgs/by-name/pd/pdm/package.nix @@ -24,7 +24,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "pdm"; - version = "2.22.2"; + version = "2.22.3"; pyproject = true; disabled = python.pkgs.pythonOlder "3.8"; @@ -33,7 +33,7 @@ python.pkgs.buildPythonApplication rec { owner = "pdm-project"; repo = "pdm"; tag = version; - hash = "sha256-se0Xvziyg4CU6wENO0oYVAI4f2uBv3Ubadiptf/uPgQ="; + hash = "sha256-+qUvVQJO/xfBZJuMBezu/LdKhKag1BCQ3To2qFXiOzY="; }; pythonRelaxDeps = [ "hishel" ]; diff --git a/pkgs/by-name/po/poptracker/package.nix b/pkgs/by-name/po/poptracker/package.nix index b0b6f93f9d5e5..f29f75853f931 100644 --- a/pkgs/by-name/po/poptracker/package.nix +++ b/pkgs/by-name/po/poptracker/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "poptracker"; - version = "0.29.0"; + version = "0.30.1"; src = fetchFromGitHub { owner = "black-sliver"; repo = "PopTracker"; rev = "v${finalAttrs.version}"; - hash = "sha256-rkEaq8YLt0NhspXVgEqZ/9FF7GDlTU5fKgWGXeA6UX4="; + hash = "sha256-U1C0vwHcUfjBPGLcmmWFqaKmIMPlV/FumIbFJ6JDBFc="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix index 7e969644a6db5..f413e1c583b8d 100644 --- a/pkgs/by-name/py/pylyzer/package.nix +++ b/pkgs/by-name/py/pylyzer/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.77"; + version = "0.0.78"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; tag = "v${version}"; - hash = "sha256-MlDW3dNe9fdOzWp38VkjgoiqOYgBF+ezwTQE0+6SXCc="; + hash = "sha256-g8/zhl0dCQOq4aTlivAh3ufgfEMzeMvTtJQxFuHHWB0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-bkYRPwiB2BN4WNZ0HcOBiDbFyidftbHWyIDvJasnePc="; + cargoHash = "sha256-mi4pCYA0dQnv3MIpZxVVY0qLdIts/qvxS4og0Tyxk3w="; nativeBuildInputs = [ git diff --git a/pkgs/by-name/re/refine/package.nix b/pkgs/by-name/re/refine/package.nix index bfad38b7fcd8d..91f7bd1a0271c 100644 --- a/pkgs/by-name/re/refine/package.nix +++ b/pkgs/by-name/re/refine/package.nix @@ -34,7 +34,7 @@ in python3Packages.buildPythonApplication rec { pname = "refine"; - version = "0.4.0"; + version = "0.4.2"; pyproject = false; # uses meson src = fetchFromGitLab { @@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec { owner = "TheEvilSkeleton"; repo = "Refine"; tag = version; - hash = "sha256-dgp2a/+Du2mEPQ4EPmOPvKsklrWI2zD1rPJnhE7LetQ="; + hash = "sha256-5oXLcmj0ZWYaCP93S+tSTqFn+XnrUkE/VwiA3ufvSQ0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ri/river-bsp-layout/package.nix b/pkgs/by-name/ri/river-bsp-layout/package.nix index 3610c51667f2b..88772a7075bc6 100644 --- a/pkgs/by-name/ri/river-bsp-layout/package.nix +++ b/pkgs/by-name/ri/river-bsp-layout/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "river-bsp-layout"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "areif-dev"; repo = "river-bsp-layout"; rev = "v${version}"; - hash = "sha256-LRVZPAS4V5PtrqyOkKUfrZuwLqPZbLoyjn2DPxCFE2o="; + hash = "sha256-/R9v3NGsSG4JJtdk0sJX7ahRolRmJMwMP48JRmLffXc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-tLMZQb05UPYVHH7b1+qtxalaLRMAWEDJ1Nkm9UqoApg="; + cargoHash = "sha256-kfeRGT/qgZRPfXl03JYRF1CVPIIiGPIdxLORiA6QWu4="; meta = { homepage = "https://github.com/areif-dev/river-bsp-layout"; diff --git a/pkgs/by-name/sc/scaleway-cli/package.nix b/pkgs/by-name/sc/scaleway-cli/package.nix index acf6a9fd26d34..707229ad5b520 100644 --- a/pkgs/by-name/sc/scaleway-cli/package.nix +++ b/pkgs/by-name/sc/scaleway-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.35.0"; + version = "2.36.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-k+WfloaNr9qJE+y6ANgUvZnMWZjSa5YpZvHcOxk/79Q="; + sha256 = "sha256-xHHLOYdJ32Uo2TXdKPtYrbsx8kqGY5oF5zXGdsFTkd4="; }; - vendorHash = "sha256-HMZfka92iT7350tE35Hlo6KMnA21sJZBvaFoclmMsYw="; + vendorHash = "sha256-QPRUba3JUUp0wtylL21+FCTWf/BWStbOcmPwoSOeRF8="; ldflags = [ "-w" diff --git a/pkgs/by-name/sd/SDL_ttf/package.nix b/pkgs/by-name/sd/SDL_ttf/package.nix index df6ce3b42ec7f..64fc256db640a 100644 --- a/pkgs/by-name/sd/SDL_ttf/package.nix +++ b/pkgs/by-name/sd/SDL_ttf/package.nix @@ -49,5 +49,8 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.zlib; maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]); inherit (SDL.meta) platforms; + knownVulnerabilities = [ + "CVE-2022-27470" + ]; }; }) diff --git a/pkgs/by-name/sd/sdcc/package.nix b/pkgs/by-name/sd/sdcc/package.nix index e90b3b00ff38e..0f707b27bad8f 100644 --- a/pkgs/by-name/sd/sdcc/package.nix +++ b/pkgs/by-name/sd/sdcc/package.nix @@ -32,11 +32,11 @@ assert ] excludePorts == [ ]; stdenv.mkDerivation (finalAttrs: { pname = "sdcc"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { url = "mirror://sourceforge/sdcc/sdcc-src-${finalAttrs.version}.tar.bz2"; - hash = "sha256-rowSFl6xdoDf9EsyjYh5mWMGtyQe+jqDsuOy0veQanU="; + hash = "sha256-1QMEN/tDa7HZOo29v7RrqqYGEzGPT7P1hx1ygV0e7YA="; }; outputs = [ diff --git a/pkgs/by-name/se/sedutil/package.nix b/pkgs/by-name/se/sedutil/package.nix index 5b731b9620692..946b40c512b8f 100644 --- a/pkgs/by-name/se/sedutil/package.nix +++ b/pkgs/by-name/se/sedutil/package.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://www.drivetrust.com"; license = licenses.gpl3Plus; platforms = platforms.linux; + mainProgram = "sedutil-cli"; }; } diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix index a272b26b3cfb1..6f7af52806b59 100644 --- a/pkgs/by-name/se/sentry-native/package.nix +++ b/pkgs/by-name/se/sentry-native/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.7.18"; + version = "0.7.19"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - hash = "sha256-V/2SsLxhu/EenF408RnowGCeKkGpkn1i19Ic1l7Z7f8="; + hash = "sha256-N9zrXr5KwcShRfh0bFlK904FN+KPdVNmxYnLxoRkWxA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sq/sql-formatter/package.nix b/pkgs/by-name/sq/sql-formatter/package.nix index b0d04027dab25..4ff946655c774 100644 --- a/pkgs/by-name/sq/sql-formatter/package.nix +++ b/pkgs/by-name/sq/sql-formatter/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "sql-formatter"; - version = "15.4.9"; + version = "15.4.10"; src = fetchFromGitHub { owner = "sql-formatter-org"; repo = "sql-formatter"; rev = "v${version}"; - hash = "sha256-rCM/RDyWGBAobsiODIujkcjkqM4uSFPdRfvPqgIJQaY="; + hash = "sha256-KRF4AFBkXzy9wYBTTsc4LvlLNbSohzbdbue+SZjNTJo="; }; yarnOfflineCache = fetchYarnDeps { diff --git a/pkgs/by-name/sq/squid/package.nix b/pkgs/by-name/sq/squid/package.nix index 73322d9a5797d..3211758710e7e 100644 --- a/pkgs/by-name/sq/squid/package.nix +++ b/pkgs/by-name/sq/squid/package.nix @@ -16,6 +16,7 @@ cppunit, esi ? false, ipv6 ? true, + nixosTests, }: stdenv.mkDerivation (finalAttrs: { @@ -80,6 +81,8 @@ stdenv.mkDerivation (finalAttrs: { done ''; + passthru.tests.squid = nixosTests.squid; + meta = with lib; { description = "Caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; homepage = "http://www.squid-cache.org"; diff --git a/pkgs/by-name/st/step-kms-plugin/package.nix b/pkgs/by-name/st/step-kms-plugin/package.nix index 8f6eb6af9fdb6..bbbf684e52f4b 100644 --- a/pkgs/by-name/st/step-kms-plugin/package.nix +++ b/pkgs/by-name/st/step-kms-plugin/package.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "step-kms-plugin"; - version = "0.11.8"; + version = "0.12.0"; src = fetchFromGitHub { owner = "smallstep"; repo = pname; rev = "v${version}"; - hash = "sha256-73l+R0Xrvyckt2ifJs12c3k6zSb9AhHV0F9Zk6qIwAg="; + hash = "sha256-zYDKUSYnuYGexWet8F6DI/5nPcGJtvSvB7b6sij6JY8="; }; vendorHash = "sha256-sXwaxMfBb8zZDCP3g8iZgXL540uDyWtu57cUPia9FzA="; diff --git a/pkgs/by-name/su/sudo-font/package.nix b/pkgs/by-name/su/sudo-font/package.nix index 940c11a76b2c7..d4dd350cba6e5 100644 --- a/pkgs/by-name/su/sudo-font/package.nix +++ b/pkgs/by-name/su/sudo-font/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "sudo-font"; - version = "2.1"; + version = "2.2"; src = fetchzip { url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - hash = "sha256-ER+TpODf+Inqo+XWJRNOHumzGRL4Dms5N1E+BU7Tr94="; + hash = "sha256-qI43FDDXcJby2EbEow0ZBzPVOQby3+WxvhJKyjrYUp8="; }; installPhase = '' diff --git a/pkgs/by-name/sv/svgbob/package.nix b/pkgs/by-name/sv/svgbob/package.nix index 9761700ecb9a4..816367c1afadf 100644 --- a/pkgs/by-name/sv/svgbob/package.nix +++ b/pkgs/by-name/sv/svgbob/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "svgbob"; - version = "0.7.4"; + version = "0.7.6"; src = fetchCrate { inherit version; crateName = "svgbob_cli"; - hash = "sha256-qSY12WjSPMoWqJHkYnPvhCtZAuI3eq+sA+/Yr9Yssp8="; + hash = "sha256-mPF6GcsXl/Bcri9d8SS21+/sjssT4//ktwC620NrEUg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nMo8qO0dKwtZJY78+r4kLrR9Cw6Eu5Hq8IPp6ilJqfk="; + cargoHash = "sha256-ObUAN+1ZHqYjWLZe/HGwTOgGbOVCdqY27kZ2zTj0Mu0="; postInstall = '' mv $out/bin/svgbob_cli $out/bin/svgbob diff --git a/pkgs/by-name/ti/timelens/package.nix b/pkgs/by-name/ti/timelens/package.nix deleted file mode 100644 index 2d2f1947d6fba..0000000000000 --- a/pkgs/by-name/ti/timelens/package.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - pkg-config, - glib, - gst_all_1, - wrapGAppsHook3, -}: - -rustPlatform.buildRustPackage rec { - pname = "timelens"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "timelens"; - repo = "timelens"; - rev = version; - hash = "sha256-cGFM1QOuavGwGBccUEttSTp+aD+d31Cqul+AQYvbyhY="; - }; - - cargoHash = "sha256-rVE2foebSEk3zJQTAkmhoIOFyMArGnt9tLlOS7RjQYM="; - - nativeBuildInputs = [ - pkg-config - wrapGAppsHook3 - ]; - - buildInputs = [ - glib - gst_all_1.gstreamer - gst_all_1.gst-libav - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-ugly - ]; - - meta = { - description = "Open source project for creating visual timelines"; - homepage = "https://timelens.blinry.org"; - changelog = "https://github.com/timelens/timelens/blob/${src.rev}/CHANGELOG.md"; - license = lib.licenses.gpl2Plus; - maintainers = [ ]; - mainProgram = "timelens"; - }; -} diff --git a/pkgs/by-name/tr/trickest-cli/package.nix b/pkgs/by-name/tr/trickest-cli/package.nix index 730b9a4df1e24..0d0d065d866a5 100644 --- a/pkgs/by-name/tr/trickest-cli/package.nix +++ b/pkgs/by-name/tr/trickest-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "trickest-cli"; - version = "1.8.4"; + version = "1.9.1"; src = fetchFromGitHub { owner = "trickest"; repo = "trickest-cli"; tag = "v${version}"; - hash = "sha256-8UrSY/ewy+0vo6QUV/cDBfv04TA3Toampf0hDnsWnXs="; + hash = "sha256-oLLPtKKYTHKqyyVuQS/0Xjmce202Dk/Gm1Ajy+hf/YY="; }; vendorHash = "sha256-gk8YMMvTHBL7yoXU9n0jhtUS472fqLW5m+mSl4Lio6c="; diff --git a/pkgs/by-name/tr/trunk-ng/package.nix b/pkgs/by-name/tr/trunk-ng/package.nix index 8c914af48f3eb..47959e4eddbfa 100644 --- a/pkgs/by-name/tr/trunk-ng/package.nix +++ b/pkgs/by-name/tr/trunk-ng/package.nix @@ -37,13 +37,8 @@ rustPlatform.buildRustPackage rec { # requires network checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; - cargoHash = - { - darwin = "sha256-TwpGw3LH3TmZSbC4DkoOYpQdOpksXXoAoiacyZAefTU="; - linux = "sha256-AivISmT/r8xa/vSXUN8sU7z67t1hcyMQM+t6oXmIOhU="; - } - .${stdenv.hostPlatform.parsed.kernel.name} - or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + useFetchCargoVendor = true; + cargoHash = "sha256-jDewjDm7Nh09CkRdPG0/ELn4odz/aaRNg8GegDxK6f8="; meta = with lib; { homepage = "https://github.com/ctron/trunk"; diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix index 144fb8abb5cd3..85b4f65ed687d 100644 --- a/pkgs/by-name/tu/tui-journal/package.nix +++ b/pkgs/by-name/tu/tui-journal/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "tui-journal"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "AmmarAbouZor"; repo = "tui-journal"; rev = "v${version}"; - hash = "sha256-KPh+ree1XSOdURb+pM0sjJeq3NnNvPOQ+spK4g3RxGM="; + hash = "sha256-2I+rldbJlTkfUrEcryXj1i2OvaQDbikruJK6FEss0no="; }; useFetchCargoVendor = true; - cargoHash = "sha256-d+JlOLQtSMeC4W/9vsSm/CItAIuuwgLnZUEmR0jO9tM="; + cargoHash = "sha256-/etpNZ3vqno42rHmO1wXCG2wLzq7PjImofy1qd2CWl0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix index 3ca112a8cf4f3..2d86e22b8cbee 100644 --- a/pkgs/by-name/ut/ut1999/package.nix +++ b/pkgs/by-name/ut/ut1999/package.nix @@ -21,7 +21,7 @@ let version = "469d"; - srcs = { + srcs = rec { x86_64-linux = fetchurl { url = "https://github.com/OldUnreal/UnrealTournamentPatches/releases/download/v${version}/OldUnreal-UTPatch${version}-Linux-amd64.tar.bz2"; hash = "sha256-aoGzWuakwN/OL4+xUq8WEpd2c1rrNN/DkffI2vDVGjs="; @@ -38,6 +38,8 @@ let url = "https://github.com/OldUnreal/UnrealTournamentPatches/releases/download/v${version}/OldUnreal-UTPatch${version}-macOS-Sonoma.dmg"; hash = "sha256-TbhJbOH4E5WOb6XR9dmqLkXziK3/CzhNjd1ypBkkmvw="; }; + # fat binary + aarch64-darwin = x86_64-darwin; }; unpackIso = runCommand "ut1999-iso" @@ -56,11 +58,12 @@ let cp -r Music Sounds Textures Maps $out ''; systemDir = - { + rec { x86_64-linux = "System64"; aarch64-linux = "SystemARM64"; - x86_64-darwin = "System"; i686-linux = "System"; + x86_64-darwin = "System"; + aarch64-darwin = x86_64-darwin; } .${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); in @@ -98,43 +101,49 @@ stdenv.mkDerivation { in '' runHook preInstall - + mkdir -p $out + '' + + lib.optionalString (stdenv.hostPlatform.isLinux) '' mkdir -p $out/bin + '' + + '' cp -r ${if stdenv.hostPlatform.isDarwin then "UnrealTournament.app" else "./*"} $out chmod -R 755 $out cd ${outPrefix} - - # NOTE: OldUnreal patch doesn't include these folders but could in the future - rm -rf ./{Music,Sounds,Maps} - ln -s ${unpackIso}/{Music,Sounds,Maps} . - - # TODO: unpack compressed maps with ucc - + # NOTE: OldUnreal patch doesn't include these folders on linux but could in the future + # on darwin it does, but they are empty + rm -rf ./{Music,Sounds} + ln -s ${unpackIso}/{Music,Sounds} . + '' + + lib.optionalString (stdenv.hostPlatform.isLinux) '' + # maps need no post-processing on linux, therefore linking them is ok + rm -rf ./Maps + ln -s ${unpackIso}/Maps . + '' + + lib.optionalString (stdenv.hostPlatform.isDarwin) '' + # Maps need post-processing on darwin, therefore need to be copied + cp -n ${unpackIso}/Maps/* ./Maps || true + # unpack compressed maps with ucc (needs absolute paths) + for map in $PWD/Maps/*.uz; do ./UCC decompress $map; done + mv ${systemDir}/*.unr ./Maps || true + rm ./Maps/*.uz + '' + + '' cp -n ${unpackIso}/Textures/* ./Textures || true - cp -n ${unpackIso}/System/*.{u,int} ./System || true '' + lib.optionalString (stdenv.hostPlatform.isLinux) '' + cp -n ${unpackIso}/System/*.{u,int} ./System || true ln -s "$out/${systemDir}/ut-bin" "$out/bin/ut1999" ln -s "$out/${systemDir}/ucc-bin" "$out/bin/ut1999-ucc" install -D "${./ut1999.svg}" "$out/share/pixmaps/ut1999.svg" - ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 16x16 ut1999_16x16.png - ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 24x24 ut1999_24x24.png - ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 32x32 ut1999_32x32.png - ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 48x48 ut1999_48x48.png - ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 64x64 ut1999_64x64.png - ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 128x128 ut1999_128x128.png - ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 192x192 ut1999_192x192.png - ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 256x256 ut1999_256x256.png - install -D "ut1999_16x16.png" "$out/share/icons/hicolor/16x16/apps/ut1999.png" - install -D "ut1999_24x24.png" "$out/share/icons/hicolor/24x24/apps/ut1999.png" - install -D "ut1999_32x32.png" "$out/share/icons/hicolor/32x32/apps/ut1999.png" - install -D "ut1999_48x48.png" "$out/share/icons/hicolor/48x48/apps/ut1999.png" - install -D "ut1999_64x64.png" "$out/share/icons/hicolor/64x64/apps/ut1999.png" - install -D "ut1999_128x128.png" "$out/share/icons/hicolor/128x128/apps/ut1999.png" - install -D "ut1999_192x192.png" "$out/share/icons/hicolor/192x192/apps/ut1999.png" - install -D "ut1999_256x256.png" "$out/share/icons/hicolor/256x256/apps/ut1999.png" + for size in 16 24 32 48 64 128 192 256; do + square=$(printf "%sx%s" $size $size) + ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize $square ut1999_$square.png + install -D "ut1999_$square.png" "$out/share/icons/hicolor/$square/apps/ut1999.png" + done + # TODO consider to remove shared libraries that can be provided by nixpkgs for darwin too # Remove bundled libraries to use native versions instead rm $out/${systemDir}/libmpg123.so* \ $out/${systemDir}/libopenal.so* \ diff --git a/pkgs/by-name/vo/voicevox-engine/make-installable.patch b/pkgs/by-name/vo/voicevox-engine/make-installable.patch index 6cc3b04ad05b3..ba1c7a00cb56c 100644 --- a/pkgs/by-name/vo/voicevox-engine/make-installable.patch +++ b/pkgs/by-name/vo/voicevox-engine/make-installable.patch @@ -2,7 +2,7 @@ diff --git a/pyproject.toml b/pyproject.toml index fa23446..6a7705c 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -40,7 +40,15 @@ use_parentheses = true +@@ -40,7 +40,20 @@ use_parentheses = true datas = "datas" # PyInstaller's argument [tool.poetry] @@ -12,7 +12,12 @@ index fa23446..6a7705c 100644 +authors = [] +description = "" +packages = [ { include = "voicevox_engine" } ] -+include = [ "resources/**/*", "run.py", "engine_manifest.json", "presets.yaml"] ++include = [ ++ { path = "resources/**/*", format = ["sdist", "wheel"] }, ++ { path = "run.py", format = ["sdist", "wheel"] }, ++ { path = "engine_manifest.json", format = ["sdist", "wheel"] }, ++ { path = "presets.yaml", format = ["sdist", "wheel"] } ++] + +[tool.poetry.scripts] +voicevox-engine = "run:main" diff --git a/pkgs/by-name/vo/voicevox/package.nix b/pkgs/by-name/vo/voicevox/package.nix index a12fcef8e1c03..6f64d266a39ae 100644 --- a/pkgs/by-name/vo/voicevox/package.nix +++ b/pkgs/by-name/vo/voicevox/package.nix @@ -15,13 +15,13 @@ buildNpmPackage rec { pname = "voicevox"; - version = "0.22.3"; + version = "0.22.4"; src = fetchFromGitHub { owner = "VOICEVOX"; repo = "voicevox"; tag = version; - hash = "sha256-6z+A4bJIDfN/K8IjEdt2TqEa/EDt4uQpGh+zSWfP74I="; + hash = "sha256-IOs3wBcFYpO4AHiWFOQWd5hp6EmwyA7Rcc8wjHKvYNQ="; }; patches = [ diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix index 8d19671fc6c48..08aeea7a832a4 100644 --- a/pkgs/by-name/vt/vte/package.nix +++ b/pkgs/by-name/vt/vte/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchFromGitLab, + fetchurl, fetchpatch, gettext, pkg-config, @@ -34,19 +34,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "vte"; - version = "0.78.2"; + version = "0.78.3"; outputs = [ "out" "dev" ] ++ lib.optional (gtkVersion != null) "devdoc"; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "vte"; - rev = finalAttrs.version; - hash = "sha256-ZUECInBRNYkXJtGveLq8SR6YdWqJA0y9UJSxmc8mVNk="; + src = fetchurl { + url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz"; + hash = "sha256-l+KsOie8V1U1iiI/VfWiUYZUqgNhv8YaGWwcLgh5jv8="; }; patches = [ diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix index 9bda318b58fd8..a050d09c653ed 100644 --- a/pkgs/by-name/wa/waveterm/package.nix +++ b/pkgs/by-name/wa/waveterm/package.nix @@ -33,7 +33,7 @@ let selectSystem = attrs: attrs.${stdenv.hostPlatform.system}; pname = "waveterm"; - version = "0.10.4"; + version = "0.11.0"; passthru.updateScript = ./update.sh; @@ -64,8 +64,8 @@ let fetchurl { url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/waveterm-linux-${arch}-${version}.deb"; hash = selectSystem { - x86_64-linux = "sha256-dwBnRuskajMpfaBQ5zr19+CQ3A/qen2RtxmV7GnXx0E="; - aarch64-linux = "sha256-HfzvbAV8RkmuwvuBtgvHgzAslbejlPJJJO7juGSMm1o="; + x86_64-linux = "sha256-4GKsO7gIQaIC7e7IH1QgIpXQqIX6NHyw8wXO0OWXRUI="; + aarch64-linux = "sha256-xbNBNwQNBwvAcx/sp8bchNtqUpXXILZADOr2wwQOrPk="; }; }; @@ -142,8 +142,8 @@ let fetchurl { url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/Wave-darwin-${arch}-${version}.zip"; hash = selectSystem { - x86_64-darwin = "sha256-iQimmHhpojimZvJtPgOExLaEu/io6BrWWkTsx/1avjY="; - aarch64-darwin = "sha256-4txsd3aKIcsjSvx+XeDm7a6M9YRkZNLUuvv5adLOVx8="; + x86_64-darwin = "sha256-qmBNZ6ovvDd2Kv3l94kl/p05xnSN21mjPTwzDP21Knc="; + aarch64-darwin = "sha256-GyLXmoBVpVKdrZcJGtVNxBk8vqsssAhNF+YNgnL6oVY="; }; }; diff --git a/pkgs/by-name/wa/waypipe/package.nix b/pkgs/by-name/wa/waypipe/package.nix index 3d4e7e8593e52..4ea1668981734 100644 --- a/pkgs/by-name/wa/waypipe/package.nix +++ b/pkgs/by-name/wa/waypipe/package.nix @@ -22,18 +22,18 @@ }: llvmPackages.stdenv.mkDerivation rec { pname = "waypipe"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mstoeckl"; repo = "waypipe"; tag = "v${version}"; - hash = "sha256-l9gZ7FtLxGKBRlMem3VGJGTvOkVAtLBa7eF9+gA5Vfo="; + hash = "sha256-MTh3it+sJxd+vOTi9fVOxvlqlkgJAK56wel3xX0IzJE="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-CTLSMm8GN21L+5WtPBWSTTbeD3WoeScKV27TCu7tovI="; + hash = "sha256-M1PTlkmZu1+F14kAO5yH9Oa7/hJlYiG9ACncRaz30Q8="; }; strictDeps = true; diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix index e0a5e58b8e07e..036633da5da26 100644 --- a/pkgs/by-name/wa/waytrogen/package.nix +++ b/pkgs/by-name/wa/waytrogen/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jkrvtwkzlsQgbw8/N4uzeqQ3fVSur2oa21IOXRRgh9I="; }; - cargoHash = "sha256-UkYQ/oN1+C9WQ+4hbhXxORw5J3Ypwe7DaDg5LhgP2d0="; + useFetchCargoVendor = true; + cargoHash = "sha256-iCcYlBqXo76QLuzdd1/YbLL99eCOnniHDAOllX8XyXQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix index 8c09c2cf0b210..331643e2e4337 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-gnome"; - version = "47.1"; + version = "47.2"; src = fetchurl { url = "mirror://gnome/sources/xdg-desktop-portal-gnome/${lib.versions.major finalAttrs.version}/xdg-desktop-portal-gnome-${finalAttrs.version}.tar.xz"; - hash = "sha256-1CD/chc7BNyUkdPX3YzJYgT38/J8TL6mAkNh6pg592k="; + hash = "sha256-S1NoqhncCqYsioTkgciiZJC013x5ALjlydQyzpHxJ0w="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 2aeecc1e9d037..5cfc47b90224e 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -292,16 +292,6 @@ rustPlatform.buildRustPackage rec { versionCheckProgramArg = [ "--version" ]; doInstallCheck = true; - # The darwin Applications directory is not stripped by default, see - # https://github.com/NixOS/nixpkgs/issues/367169 - # This setting is not platform-guarded as it doesn't do any harm on Linux, - # where this directory simply does not exist. - stripDebugList = [ - "bin" - "libexec" - "Applications" - ]; - passthru = { updateScript = gitUpdater { rev-prefix = "v"; diff --git a/pkgs/desktops/xfce/core/xfdesktop/default.nix b/pkgs/desktops/xfce/core/xfdesktop/default.nix index ab6900c28e1fd..0f6e6ef70ee3d 100644 --- a/pkgs/desktops/xfce/core/xfdesktop/default.nix +++ b/pkgs/desktops/xfce/core/xfdesktop/default.nix @@ -1,6 +1,7 @@ { lib, mkXfceDerivation, + fetchpatch, exo, gtk3, libxfce4ui, @@ -21,6 +22,15 @@ mkXfceDerivation { sha256 = "sha256-80g3lk1TkQI0fbYf2nXs36TrPlaGTHgH6k/TGOzRd3w="; + patches = [ + # Fix monitor chooser UI resource path + # https://gitlab.xfce.org/xfce/xfdesktop/-/merge_requests/181 + (fetchpatch { + url = "https://gitlab.xfce.org/xfce/xfdesktop/-/commit/699e21b062f56bdc0db192bfe036420b2618612e.patch"; + hash = "sha256-YTtXF+OJMHn6KY2xui1qGZ04np9a60asne+8ZS/dujs="; + }) + ]; + buildInputs = [ exo gtk3 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 8b9e8e4fbe238..f2415d204dbea 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1419,7 +1419,7 @@ self: super: builtins.intersectAttrs super { tailwind = addBuildDepend # Overrides for tailwindcss copied from: # https://github.com/EmaApps/emanote/blob/master/nix/tailwind.nix - (pkgs.nodePackages.tailwindcss.overrideAttrs (oa: { + (pkgs.tailwindcss.overrideAttrs (oa: { plugins = [ pkgs.nodePackages."@tailwindcss/aspect-ratio" pkgs.nodePackages."@tailwindcss/forms" diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/development/libraries/gupnp/1.6.nix index 65033624639f7..8cbe314e7d322 100644 --- a/pkgs/development/libraries/gupnp/1.6.nix +++ b/pkgs/development/libraries/gupnp/1.6.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.6.7"; + version = "1.6.8"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-SmHYpainJw5gzpz+lmHMT6Mm8EWmVxjS64/2iv2++AU="; + hash = "sha256-cKADzr1oV3KT+z5q9J/5AiA7+HaLL8XWUd3B8PoeEek="; }; depsBuildBuild = [ diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index d187b9ee4378e..5581c6e9d695c 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -39,6 +39,7 @@ mapAliases { "@antora/cli" = pkgs.antora; # Added 2023-05-06 "@astrojs/language-server" = pkgs.astro-language-server; # Added 2024-02-12 "@bitwarden/cli" = pkgs.bitwarden-cli; # added 2023-07-25 + "@commitlint/config-conventional" = throw "@commitlint/config-conventional has been dropped, as it is a library and your JS project should lock it instead."; # added 2024-12-16 "@emacs-eask/cli" = pkgs.eask; # added 2023-08-17 "@forge/cli" = throw "@forge/cli was removed because it was broken"; # added 2023-09-20 "@githubnext/github-copilot-cli" = pkgs.github-copilot-cli; # Added 2023-05-02 @@ -182,6 +183,7 @@ mapAliases { surge = pkgs.surge-cli; # Added 2023-09-08 inherit (pkgs) svelte-language-server; # Added 2024-05-12 swagger = throw "swagger was removed because it was broken and abandoned upstream"; # added 2023-09-09 + inherit (pkgs) tailwindcss; # added 2024-12-04 teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23 tedicross = throw "tedicross was removed because it was broken"; # added 2023-09-09 inherit (pkgs) terser; # Added 2023-08-31 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index f990a692b0f1d..0e37a6f244cf2 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -3,7 +3,6 @@ , "@antfu/ni" , "@babel/cli" , "@commitlint/cli" -, "@commitlint/config-conventional" , "@microsoft/rush" , "@shopify/cli" , "@tailwindcss/aspect-ratio" @@ -167,7 +166,6 @@ , "speed-test" , "svelte-check" , "svgo" -, "tailwindcss" , "tern" , "thelounge-plugin-closepms" , "thelounge-plugin-giphy" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 2371cf2b48a05..3a0116e0dee07 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -17942,15 +17942,6 @@ let sha512 = "8gsBDI5Y3vrKUCxN6Ue8xr6occZ5nsDEc4C7jO/EovFGozx8uttCAyfhRrvoUAWi2WMm3OmYs+0mPJU7kQdYWQ=="; }; }; - "conventional-changelog-conventionalcommits-7.0.2" = { - name = "conventional-changelog-conventionalcommits"; - packageName = "conventional-changelog-conventionalcommits"; - version = "7.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-7.0.2.tgz"; - sha512 = "NKXYmMR/Hr1DevQegFB4MwfM5Vv0m4UIxKZTTYuD98lpTknaZlSRrDOG4X7wIXpGkfsYxZTghUN+Qq+T0YQI7w=="; - }; - }; "conventional-changelog-conventionalcommits-8.0.0" = { name = "conventional-changelog-conventionalcommits"; packageName = "conventional-changelog-conventionalcommits"; @@ -53769,36 +53760,6 @@ in bypassCache = true; reconstructLock = true; }; - "@commitlint/config-conventional" = nodeEnv.buildNodePackage { - name = "_at_commitlint_slash_config-conventional"; - packageName = "@commitlint/config-conventional"; - version = "19.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-19.5.0.tgz"; - sha512 = "OBhdtJyHNPryZKg0fFpZNOBM1ZDbntMvqMuSmpfyP86XSfwzGw4CaoYRG4RutUPg0BTK07VMRIkNJT6wi2zthg=="; - }; - dependencies = [ - sources."@commitlint/types-19.5.0" - sources."@types/conventional-commits-parser-5.0.0" - sources."@types/node-22.5.5" - sources."array-ify-1.0.0" - sources."chalk-5.3.0" - sources."compare-func-2.0.0" - sources."conventional-changelog-conventionalcommits-7.0.2" - sources."dot-prop-5.3.0" - sources."is-obj-2.0.0" - sources."undici-types-6.19.8" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Shareable commitlint config enforcing conventional commits"; - homepage = "https://commitlint.js.org/"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@microsoft/rush" = nodeEnv.buildNodePackage { name = "_at_microsoft_slash_rush"; packageName = "@microsoft/rush"; @@ -75210,183 +75171,6 @@ in bypassCache = true; reconstructLock = true; }; - tailwindcss = nodeEnv.buildNodePackage { - name = "tailwindcss"; - packageName = "tailwindcss"; - version = "3.4.12"; - src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.12.tgz"; - sha512 = "Htf/gHj2+soPb9UayUNci/Ja3d8pTmu9ONTfh4QY8r3MATTZOzmv6UYWF7ZwikEIC8okpfqmGqrmDehua8mF8w=="; - }; - dependencies = [ - sources."@alloc/quick-lru-5.2.0" - sources."@cspotcode/source-map-support-0.8.1" - sources."@isaacs/cliui-8.0.2" - (sources."@jridgewell/gen-mapping-0.3.5" // { - dependencies = [ - sources."@jridgewell/trace-mapping-0.3.25" - ]; - }) - sources."@jridgewell/resolve-uri-3.1.2" - sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.5.0" - sources."@jridgewell/trace-mapping-0.3.9" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.7.26" - sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.13" - sources."@swc/types-0.1.12" - sources."@swc/wasm-1.7.26" - sources."@tsconfig/node10-1.0.11" - sources."@tsconfig/node12-1.0.11" - sources."@tsconfig/node14-1.0.3" - sources."@tsconfig/node16-1.0.4" - sources."@types/node-22.5.5" - sources."acorn-8.12.1" - sources."acorn-walk-8.3.4" - sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" - sources."any-promise-1.3.0" - sources."anymatch-3.1.3" - sources."arg-5.0.2" - sources."balanced-match-1.0.2" - sources."binary-extensions-2.3.0" - sources."brace-expansion-2.0.1" - sources."braces-3.0.3" - sources."camelcase-css-2.0.1" - (sources."chokidar-3.6.0" // { - dependencies = [ - sources."glob-parent-5.1.2" - ]; - }) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-4.1.1" - sources."create-require-1.1.1" - sources."cross-spawn-7.0.3" - sources."cssesc-3.0.0" - sources."didyoumean-1.2.2" - sources."diff-4.0.2" - sources."dlv-1.1.3" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-9.2.2" - (sources."fast-glob-3.3.2" // { - dependencies = [ - sources."glob-parent-5.1.2" - ]; - }) - sources."fastq-1.17.1" - sources."fill-range-7.1.1" - sources."foreground-child-3.3.0" - sources."function-bind-1.1.2" - sources."glob-10.4.5" - sources."glob-parent-6.0.2" - sources."hasown-2.0.2" - sources."is-binary-path-2.1.0" - sources."is-core-module-2.15.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."isexe-2.0.0" - sources."jackspeak-3.4.3" - sources."jiti-1.21.6" - sources."lilconfig-2.1.0" - sources."lines-and-columns-1.2.4" - sources."lru-cache-10.4.3" - sources."make-error-1.3.6" - sources."merge2-1.4.1" - sources."micromatch-4.0.8" - sources."minimatch-9.0.5" - sources."minipass-7.1.2" - sources."mz-2.7.0" - sources."nanoid-3.3.7" - sources."normalize-path-3.0.0" - sources."object-assign-4.1.1" - sources."object-hash-3.0.0" - sources."package-json-from-dist-1.0.0" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."path-scurry-1.11.1" - sources."picocolors-1.1.0" - sources."picomatch-2.3.1" - sources."pify-2.3.0" - sources."pirates-4.0.6" - sources."postcss-8.4.47" - sources."postcss-import-15.1.0" - sources."postcss-js-4.0.1" - (sources."postcss-load-config-4.0.2" // { - dependencies = [ - sources."lilconfig-3.1.2" - ]; - }) - sources."postcss-nested-6.2.0" - sources."postcss-selector-parser-6.1.2" - sources."postcss-value-parser-4.2.0" - sources."queue-microtask-1.2.3" - sources."read-cache-1.0.0" - sources."readdirp-3.6.0" - sources."resolve-1.22.8" - sources."reusify-1.0.4" - sources."run-parallel-1.2.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."source-map-js-1.2.1" - sources."string-width-5.1.2" - (sources."string-width-cjs-4.2.3" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."strip-ansi-6.0.1" - ]; - }) - (sources."strip-ansi-7.1.0" // { - dependencies = [ - sources."ansi-regex-6.1.0" - ]; - }) - sources."strip-ansi-cjs-6.0.1" - sources."sucrase-3.35.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."thenify-3.3.1" - sources."thenify-all-1.6.0" - sources."to-regex-range-5.0.1" - sources."ts-interface-checker-0.1.13" - (sources."ts-node-10.9.2" // { - dependencies = [ - sources."arg-4.1.3" - ]; - }) - sources."tslib-2.7.0" - sources."typescript-5.6.2" - sources."undici-types-6.19.8" - sources."util-deprecate-1.0.2" - sources."v8-compile-cache-lib-3.0.1" - sources."which-2.0.2" - sources."wrap-ansi-8.1.0" - (sources."wrap-ansi-cjs-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."yaml-2.5.1" - sources."yn-3.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A utility-first CSS framework for rapidly building custom user interfaces."; - homepage = "https://tailwindcss.com"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; tern = nodeEnv.buildNodePackage { name = "tern"; packageName = "tern"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index c770df51c1d15..814ce34f85e9b 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -258,27 +258,6 @@ final: prev: { name = "rush"; }; - tailwindcss = prev.tailwindcss.override { - plugins = [ ]; - nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; - postInstall = '' - nodePath="" - for p in "$out" "${final.postcss}" $plugins; do - nodePath="$nodePath''${nodePath:+:}$p/lib/node_modules" - done - wrapProgram "$out/bin/tailwind" \ - --prefix NODE_PATH : "$nodePath" - wrapProgram "$out/bin/tailwindcss" \ - --prefix NODE_PATH : "$nodePath" - unset nodePath - ''; - passthru.tests = { - simple-execution = callPackage ./package-tests/tailwindcss.nix { - inherit (final) tailwindcss; - }; - }; - }; - thelounge-plugin-closepms = prev.thelounge-plugin-closepms.override { nativeBuildInputs = [ pkgs.node-pre-gyp ]; }; diff --git a/pkgs/development/php-packages/php-parallel-lint/default.nix b/pkgs/development/php-packages/php-parallel-lint/default.nix index 342e4158f07a3..4e79ec0a30e39 100644 --- a/pkgs/development/php-packages/php-parallel-lint/default.nix +++ b/pkgs/development/php-packages/php-parallel-lint/default.nix @@ -2,21 +2,26 @@ fetchFromGitHub, lib, php, + versionCheckHook, }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "php-parallel-lint"; version = "1.4.0"; src = fetchFromGitHub { owner = "php-parallel-lint"; repo = "PHP-Parallel-Lint"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-g5e/yfvfq55MQDux3JRDvhaYEay68Q4u1VfIwDRgv7I="; }; composerLock = ./composer.lock; - vendorHash = "sha256-NZLGeX1i+E621UGYeWn5tKufDbCLv4iD1VXJcnhfleY="; + vendorHash = "sha256-ySdLlqlGKZ6LgmAOBMkBNoCAqWrgMwE/Cj6ZEPEsCko="; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; meta = { description = "Tool to check syntax of PHP files faster than serial check with fancier output"; diff --git a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix index efa62109277e1..312b26a27e1cb 100644 --- a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-eventhub"; - version = "11.1.0"; + version = "11.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_mgmt_eventhub"; inherit version; - hash = "sha256-47j+CauuZ8XaiE57bw3kTi+CfFuACaZSuVH7LSD8s5I="; + hash = "sha256-McR/GPc9LYM0XN5ZCVaOKIWMJUijWxDiMZS0dnqc5+M="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 92e73ce6b2423..502f538739ba5 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.36.6"; + version = "1.36.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-9ewaWm7LkpEpA2MRY0gvbOhPCS1bw27Aj3cHAL78zHs="; + hash = "sha256-8J+hyMYuDd3zvMQFORoSErHe5W1wQ3izg/9A8d3BSNs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 4bb19c57001fd..81238266e916c 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.36.6"; + version = "1.36.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-9HwwA2pePIQu9zR66yBnqVKVmnucMsfcDtJwQKIxNQ0="; + hash = "sha256-qLZdf2rhSqkNA/vBwnt8PGs8o9fC6x2BREG6BKIt2YE="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/es-client/default.nix b/pkgs/development/python-modules/es-client/default.nix index 49a1f30051c41..dcef4e4f068d3 100644 --- a/pkgs/development/python-modules/es-client/default.nix +++ b/pkgs/development/python-modules/es-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "es-client"; - version = "8.15.2"; + version = "8.17.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "untergeek"; repo = "es_client"; tag = "v${version}"; - hash = "sha256-7vkpZNY333DYj9klzm1YG5ccxsu+LrP7WOWPH1KCfFA="; + hash = "sha256-j7yaN7FOrGlRjZSBugRCtecfUw/3dNuI252VO/eYnzk="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/ete3/default.nix b/pkgs/development/python-modules/ete3/default.nix index 282a0546431f3..b16679376a536 100644 --- a/pkgs/development/python-modules/ete3/default.nix +++ b/pkgs/development/python-modules/ete3/default.nix @@ -8,34 +8,42 @@ lxml, withXmlSupport ? false, pyqt5, + setuptools, + legacy-cgi, }: buildPythonPackage rec { pname = "ete3"; version = "3.1.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-BqO3+o7ZAYewdqjbvlsbYqzulCAdPG6CL1X0SWAe9vI="; }; + build-system = [ + setuptools + ]; + doCheck = false; # Tests are (i) not 3.x compatible, (ii) broken under 2.7 + pythonImportsCheck = [ "ete3" ]; - propagatedBuildInputs = + dependencies = [ six numpy + legacy-cgi ] ++ lib.optional withTreeVisualization pyqt5 ++ lib.optional withXmlSupport lxml; - meta = with lib; { + meta = { description = "Python framework for the analysis and visualization of trees"; mainProgram = "ete3"; homepage = "http://etetoolkit.org/"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ delehef ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ delehef ]; }; } diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 244d0dfdf42e9..5982eaca2791b 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "1.1.0"; + version = "1.1.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; tag = version; - hash = "sha256-7gWqlb2PNRI50Xe8lv2Kim7wUYVzuQMa4BAbg2a7NvM="; + hash = "sha256-lFOxf9+O1APreIL/wQTZ+zSMx/MxPTRQrFWgw324myY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/inference-gym/default.nix b/pkgs/development/python-modules/inference-gym/default.nix index dd1a854b92c92..315d78dde39de 100644 --- a/pkgs/development/python-modules/inference-gym/default.nix +++ b/pkgs/development/python-modules/inference-gym/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "inference-gym"; - version = "0.0.4"; + version = "0.0.5"; format = "wheel"; src = fetchPypi { @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "inference_gym"; dist = "py3"; python = "py3"; - hash = "sha256-bpi/IB8PuLPIKoTjmBeVl/4XGvE/yyG8WYxNqNcruvE="; + hash = "sha256-E3lNgCZIObPBkl0PWACUG19XOiCOh1+N/sUFHQyA/wE="; }; pythonImportsCheck = [ "inference_gym" ]; diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index 3375c23bc9095..46bdab1780c39 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.12.7"; + version = "1.12.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; tag = "v${version}"; - hash = "sha256-bB9BeDhFlwdIgIv9VfvBkqxcfzpPe3jl6D/ChdP2FsM="; + hash = "sha256-blQhnQoNMXQhNQJ7EXawoYHxbPEgPmLltoLQTzsKwtA="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/letpot/default.nix b/pkgs/development/python-modules/letpot/default.nix new file mode 100644 index 0000000000000..24cab45a1968f --- /dev/null +++ b/pkgs/development/python-modules/letpot/default.nix @@ -0,0 +1,43 @@ +{ + aiohttp, + aiomqtt, + buildPythonPackage, + fetchFromGitHub, + lib, + poetry-core, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "letpot"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jpelgrom"; + repo = "python-letpot"; + tag = "v${version}"; + hash = "sha256-OFLQ0DV7roqUlm6zJWAzMRpcmAi/oco8lEHbmfqNaVs="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + aiomqtt + ]; + + pythonImportsCheck = [ "letpot" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/jpelgrom/python-letpot/releases/tag/${src.tag}"; + description = "Asynchronous Python client for LetPot hydroponic gardens"; + homepage = "https://github.com/jpelgrom/python-letpot"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/llama-cpp-python/default.nix b/pkgs/development/python-modules/llama-cpp-python/default.nix index 6c07005d4ddf6..90e2d9f7d0cbf 100644 --- a/pkgs/development/python-modules/llama-cpp-python/default.nix +++ b/pkgs/development/python-modules/llama-cpp-python/default.nix @@ -64,13 +64,26 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; SKBUILD_CMAKE_ARGS = lib.strings.concatStringsSep ";" ( - lib.optionals cudaSupport [ + # Set GGML_NATIVE=off. Otherwise, cmake attempts to build with + # -march=native* which is either a no-op (if cc-wrapper is able to ignore + # it), or an attempt to build a non-reproducible binary. + # + # This issue was spotted when cmake rules appended feature modifiers to + # -mcpu, breaking linux build as follows: + # + # cc1: error: unknown value ‘native+nodotprod+noi8mm+nosve’ for ‘-mcpu’ + [ "-DGGML_NATIVE=off" ] + ++ lib.optionals cudaSupport [ "-DGGML_CUDA=on" "-DCUDAToolkit_ROOT=${lib.getDev cudaPackages.cuda_nvcc}" "-DCMAKE_CUDA_COMPILER=${lib.getExe cudaPackages.cuda_nvcc}" ] ); + preBuild = '' + export CMAKE_BUILD_PARALLEL_LEVEL="$NIX_BUILD_CORES" + ''; + nativeBuildInputs = [ cmake ninja @@ -128,10 +141,9 @@ buildPythonPackage rec { homepage = "https://github.com/abetlen/llama-cpp-python"; changelog = "https://github.com/abetlen/llama-cpp-python/blob/v${version}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ kirillrdy ]; - badPlatforms = [ - # cc1: error: unknown value ‘native+nodotprod+noi8mm+nosve’ for ‘-mcpu’ - "aarch64-linux" + maintainers = with lib.maintainers; [ + booxter + kirillrdy ]; }; } diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index f942fadb403f7..735c530dc01f4 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -5,7 +5,7 @@ pytestCheckHook, pythonOlder, fetchFromGitLab, - substituteAll, + replaceVars, bubblewrap, exiftool, ffmpeg, @@ -40,22 +40,21 @@ buildPythonPackage rec { patches = [ # hardcode paths to some binaries - (substituteAll ( - { - src = ./paths.patch; - exiftool = "${exiftool}/bin/exiftool"; - ffmpeg = "${ffmpeg}/bin/ffmpeg"; - } - // lib.optionalAttrs dolphinIntegration { kdialog = "${plasma5Packages.kdialog}/bin/kdialog"; } - )) + (replaceVars ./paths.patch { + exiftool = "${exiftool}/bin/exiftool"; + ffmpeg = "${ffmpeg}/bin/ffmpeg"; + kdialog = if dolphinIntegration then "${plasma5Packages.kdialog}/bin/kdialog" else null; + # replaced in postPatch + mat2 = null; + mat2svg = null; + }) # the executable shouldn't be called .mat2-wrapped ./executable-name.patch # hardcode path to mat2 executable ./tests.patch ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ - (substituteAll { - src = ./bubblewrap-path.patch; + (replaceVars ./bubblewrap-path.patch { bwrap = "${bubblewrap}/bin/bwrap"; }) ]; diff --git a/pkgs/development/python-modules/mdtraj/default.nix b/pkgs/development/python-modules/mdtraj/default.nix index b1a11e18d8d3d..6bdffc644f2b9 100644 --- a/pkgs/development/python-modules/mdtraj/default.nix +++ b/pkgs/development/python-modules/mdtraj/default.nix @@ -6,12 +6,13 @@ fetchpatch, llvmPackages, zlib, - cython_0, - oldest-supported-numpy, + cython, + numpy, setuptools, + versioneer, wheel, astunparse, - numpy, + netcdf4, packaging, pyparsing, scipy, @@ -48,16 +49,17 @@ buildPythonPackage rec { ]; build-system = [ - cython_0 - oldest-supported-numpy + cython + numpy setuptools + versioneer wheel ]; buildInputs = [ zlib ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; dependencies = [ - astunparse + netcdf4 numpy packaging pyparsing @@ -84,6 +86,7 @@ buildPythonPackage rec { # require network access "test_pdb_from_url" "test_1vii_url_and_gz" + "test_3" # fail due to data race "test_read_atomindices_1" diff --git a/pkgs/development/python-modules/otpauth/default.nix b/pkgs/development/python-modules/otpauth/default.nix new file mode 100644 index 0000000000000..167a69e34b1c8 --- /dev/null +++ b/pkgs/development/python-modules/otpauth/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchPypi, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "otpauth"; + version = "2.1.1"; + + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-4J7WOgGzWs14t7sPmB/c29HZ2cAb4aPg1wJMZdDnTio="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ pname ]; + + meta = with lib; { + description = "Implements one time password of HOTP/TOTP"; + homepage = "https://otp.authlib.org/"; + changelog = "https://github.com/authlib/otpauth/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ erictapen ]; + }; +} diff --git a/pkgs/development/python-modules/pcbnewtransition/default.nix b/pkgs/development/python-modules/pcbnewtransition/default.nix index 79e2ef3d1624a..f5a674d3763d4 100644 --- a/pkgs/development/python-modules/pcbnewtransition/default.nix +++ b/pkgs/development/python-modules/pcbnewtransition/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { pname = "pcbnewtransition"; - version = "0.4.2"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pcbnewTransition"; inherit version; - hash = "sha256-fFOzL80m92PcF9SC6NZ69OUuEJn1sl+mWVFjRorhS4M="; + hash = "sha256-4XNcnQzUWpY0NEfS2bdtkedvG4lY79jaPe0QqTWNW6s="; }; propagatedBuildInputs = [ kicad ]; diff --git a/pkgs/development/python-modules/pcffont/default.nix b/pkgs/development/python-modules/pcffont/default.nix index db83e7f9c5e2c..f663f812c826b 100644 --- a/pkgs/development/python-modules/pcffont/default.nix +++ b/pkgs/development/python-modules/pcffont/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pcffont"; - version = "0.0.15"; + version = "0.0.16"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pcffont"; inherit version; - hash = "sha256-sJWopdjZ0vM0BrdBgc6XZsDGFN7/NCCBqrCyYCRhT3M="; + hash = "sha256-erZ9zcXZqBg71subC8U7QA7nwwoh2lQeIzRAkmxBxzg="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 87466acbb22be..d86427837f0e6 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.27.5"; + version = "1.27.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; tag = "v${version}"; - hash = "sha256-TnK7CeW4mJGS77tzYkBQJbLn+niZEMWScpLLaWLmQAA="; + hash = "sha256-Kh4F5dicbVvM9k8T4iMERMuze3Ztawi9LXH7+udtZFU="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/python-codon-tables/default.nix b/pkgs/development/python-modules/python-codon-tables/default.nix index f5fc127aa471c..ded3d5103f2da 100644 --- a/pkgs/development/python-modules/python-codon-tables/default.nix +++ b/pkgs/development/python-modules/python-codon-tables/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "python-codon-tables"; - version = "0.1.12"; + version = "0.1.13"; format = "setuptools"; src = fetchPypi { pname = "python_codon_tables"; inherit version; - hash = "sha256-pzPoR55nU8ObPv1iIE52qpqD5xGdYLm1uG3nCD6I46Y="; + hash = "sha256-3PQLBgZJjefCOrh+PHbaViy4VwZGR68mkwC58usi51o="; }; # no tests in tarball diff --git a/pkgs/development/python-modules/scim2-client/default.nix b/pkgs/development/python-modules/scim2-client/default.nix new file mode 100644 index 0000000000000..4ccad91014133 --- /dev/null +++ b/pkgs/development/python-modules/scim2-client/default.nix @@ -0,0 +1,64 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchPypi, + hatchling, + scim2-models, + pytestCheckHook, + portpicker, + pytest-httpserver, + pytest-asyncio, + scim2-server, + httpx, + werkzeug, +}: + +buildPythonPackage rec { + pname = "scim2-client"; + version = "0.5.1"; + + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + inherit version; + pname = "scim2_client"; + hash = "sha256-g2RR+Ruvjw88cGHcwEPoktTmB8VcWAPnea3BErS8JyI="; + }; + + build-system = [ hatchling ]; + + dependencies = [ scim2-models ]; + + nativeCheckInputs = [ + pytestCheckHook + portpicker + pytest-httpserver + pytest-asyncio + scim2-server + werkzeug + ] ++ optional-dependencies.httpx; + + # Werkzeug returns 500, didn't deem it worth it to investigate + disabledTests = [ + "test_search_request" + "test_query_dont_check_request_payload" + ]; + + pythonImportsCheck = [ "scim2_client" ]; + + optional-dependencies = { + httpx = [ httpx ]; + werkzeug = [ werkzeug ]; + }; + + meta = with lib; { + description = "Pythonically build SCIM requests and parse SCIM responses"; + homepage = "https://scim2-client.readthedocs.io/"; + changelog = "https://github.com/python-scim/scim2-client/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ erictapen ]; + }; +} diff --git a/pkgs/development/python-modules/scim2-models/default.nix b/pkgs/development/python-modules/scim2-models/default.nix new file mode 100644 index 0000000000000..ada6c553129d2 --- /dev/null +++ b/pkgs/development/python-modules/scim2-models/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchPypi, + hatchling, + pydantic, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "scim2-models"; + version = "0.3.0"; + + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + inherit version; + pname = "scim2_models"; + hash = "sha256-odtiOF54IOZ8lP11gkaBU5frOzvRvKeXoqPvNG6B2Cc="; + }; + + build-system = [ hatchling ]; + + dependencies = [ pydantic ] ++ pydantic.optional-dependencies.email; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "scim2_models" ]; + + meta = with lib; { + description = "SCIM2 models serialization and validation with pydantic"; + homepage = "https://github.com/python-scim/scim2-models"; + changelog = "https://github.com/python-scim/scim2-models/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ erictapen ]; + }; +} diff --git a/pkgs/development/python-modules/scim2-server/default.nix b/pkgs/development/python-modules/scim2-server/default.nix new file mode 100644 index 0000000000000..bd0bac6a1ddd7 --- /dev/null +++ b/pkgs/development/python-modules/scim2-server/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + scim2-filter-parser, + scim2-models, + werkzeug, + pytestCheckHook, + httpx, + time-machine, +}: + +buildPythonPackage rec { + pname = "scim2-server"; + version = "0.1.2"; + + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "scim2_server"; + hash = "sha256-6MHQVo0vqJ/69iBz3GtH1f2YO/Vh/MORSkEETwy/9pE="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + scim2-filter-parser + scim2-models + werkzeug + ]; + + nativeCheckInputs = [ + pytestCheckHook + httpx + time-machine + ]; + + pythonImportsCheck = [ "scim2_server" ]; + + meta = with lib; { + description = "Lightweight SCIM2 server prototype"; + homepage = "https://github.com/python-scim/scim2-server"; + changelog = "https://github.com/python-scim/scim2-server/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ erictapen ]; + }; +} diff --git a/pkgs/development/python-modules/scim2-tester/default.nix b/pkgs/development/python-modules/scim2-tester/default.nix new file mode 100644 index 0000000000000..2125a7706e868 --- /dev/null +++ b/pkgs/development/python-modules/scim2-tester/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchPypi, + hatchling, + scim2-client, + pytestCheckHook, + werkzeug, + scim2-server, + pytest-httpserver, +}: + +buildPythonPackage rec { + pname = "scim2-tester"; + version = "0.1.13"; + + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchPypi { + inherit version; + pname = "scim2_tester"; + hash = "sha256-Jpfxyok46fRCW3aAOFb0BTEI++Ou5lob/0RsoXgzkxk="; + }; + + build-system = [ hatchling ]; + + dependencies = [ scim2-client ]; + + nativeCheckInputs = [ + pytestCheckHook + werkzeug + scim2-server + pytest-httpserver + ] ++ optional-dependencies.httpx; + + pythonImportsCheck = [ "scim2_tester" ]; + + optional-dependencies.httpx = scim2-client.optional-dependencies.httpx; + + meta = with lib; { + description = "SCIM RFCs server compliance checker"; + homepage = "https://scim2-tester.readthedocs.io/"; + changelog = "https://github.com/python-scim/scim2-tester/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ erictapen ]; + }; +} diff --git a/pkgs/development/python-modules/skops/default.nix b/pkgs/development/python-modules/skops/default.nix index 36ce2d59d9cea..90a37ba3bba42 100644 --- a/pkgs/development/python-modules/skops/default.nix +++ b/pkgs/development/python-modules/skops/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - setuptools, + hatchling, pytestCheckHook, pytest-cov-stub, huggingface-hub, @@ -29,7 +29,7 @@ buildPythonPackage rec { hash = "sha256-23Wy/VSd/CvpqT/zDX4ApplfsUwbjOj9q+T8YCKs8X4="; }; - build-system = [ setuptools ]; + build-system = [ hatchling ]; dependencies = [ huggingface-hub diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix index 69ddb4ad716cb..2f8dcecc023ab 100644 --- a/pkgs/development/python-modules/triton/default.nix +++ b/pkgs/development/python-modules/triton/default.nix @@ -17,7 +17,7 @@ python, pytestCheckHook, stdenv, - substituteAll, + replaceVars, setuptools, torchWithRocm, zlib, @@ -43,28 +43,20 @@ buildPythonPackage { patches = [ ./0001-setup.py-introduce-TRITON_OFFLINE_BUILD.patch - (substituteAll { - src = ./0001-_build-allow-extra-cc-flags.patch; + (replaceVars ./0001-_build-allow-extra-cc-flags.patch { ccCmdExtraFlags = "-Wl,-rpath,${addDriverRunpath.driverLink}/lib"; }) - (substituteAll ( - { - src = ./0002-nvidia-amd-driver-short-circuit-before-ldconfig.patch; - } - // lib.optionalAttrs rocmSupport { libhipDir = "${lib.getLib rocmPackages.clr}/lib"; } - // lib.optionalAttrs cudaSupport { - libcudaStubsDir = "${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs"; - ccCmdExtraFlags = "-Wl,-rpath,${addDriverRunpath.driverLink}/lib"; - } - )) + (replaceVars ./0002-nvidia-amd-driver-short-circuit-before-ldconfig.patch { + libhipDir = if rocmSupport then "${lib.getLib rocmPackages.clr}/lib" else null; + libcudaStubsDir = + if cudaSupport then "${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs" else null; + }) ] ++ lib.optionals cudaSupport [ - (substituteAll { - src = ./0003-nvidia-cudart-a-systempath.patch; + (replaceVars ./0003-nvidia-cudart-a-systempath.patch { cudaToolkitIncludeDirs = "${lib.getInclude cudaPackages.cuda_cudart}/include"; }) - (substituteAll { - src = ./0004-nvidia-allow-static-ptxas-path.patch; + (replaceVars ./0004-nvidia-allow-static-ptxas-path.patch { nixpkgsExtraBinaryPaths = lib.escapeShellArgs [ (lib.getExe' cudaPackages.cuda_nvcc "ptxas") ]; }) ]; diff --git a/pkgs/development/python-modules/zxcvbn-rs-py/default.nix b/pkgs/development/python-modules/zxcvbn-rs-py/default.nix index 1a8aece7881d2..6c98f6e688596 100644 --- a/pkgs/development/python-modules/zxcvbn-rs-py/default.nix +++ b/pkgs/development/python-modules/zxcvbn-rs-py/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zxcvbn-rs-py"; - version = "0.1.1"; + version = "0.2.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "zxcvbn_rs_py"; inherit version; - hash = "sha256-7EZJ/WGekfsnisqTs9dwwbQia6OlDEx3MR9mkqSI+gA="; + hash = "sha256-DQzdOngHGZma2NyfrNuMppG6GzpGoKfwVQGUVmN7erA="; }; build-system = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoVendor { name = "${pname}-${version}"; inherit src; - hash = "sha256-Tzd0XEbrvXrX7oMT41R5kUJi7equhdL7/pUHp7ghyeg="; + hash = "sha256-WkaTEoVQVOwxcTyOIG5oHEvcv65fBEpokl3/6SxqiUw="; }; pythonImportsCheck = [ "zxcvbn_rs_py" ]; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 4829bcc798ee1..1db3881940071 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -246,7 +246,7 @@ rec { lib, callPackage, mitm-cache, - substituteAll, + replaceVars, symlinkJoin, concatTextFile, makeSetupHook, @@ -266,11 +266,10 @@ rec { name = "setup-hook.sh"; files = [ (mitm-cache.setupHook) - (substituteAll { - src = ./setup-hook.sh; + (replaceVars ./setup-hook.sh { # jdk used for keytool inherit (gradle) jdk; - init_script = ./init-build.gradle; + init_script = "${./init-build.gradle}"; }) ]; })) diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 7bbeee4a15363..5c02e5e194e9c 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - substituteAll, + replaceVars, nixosTests, docbook_xml_dtd_45, @@ -65,8 +65,7 @@ stdenv.mkDerivation (finalAttrs: { ./respect-xml-catalog-files-var.patch # Hardcode paths - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { brz = "${breezy}/bin/brz"; cp = "${coreutils}/bin/cp"; patch = "${patch}/bin/patch"; @@ -81,8 +80,7 @@ stdenv.mkDerivation (finalAttrs: { euelfcompress = "${elfutils}/bin/eu-elfcompress"; }) - (substituteAll { - src = ./fix-test-paths.patch; + (replaceVars ./fix-test-paths.patch { inherit glibcLocales; }) ./fix-test-prefix.patch diff --git a/pkgs/development/tools/flatpak-builder/fix-test-paths.patch b/pkgs/development/tools/flatpak-builder/fix-test-paths.patch index 96212a30fcf8c..d107ef738d036 100644 --- a/pkgs/development/tools/flatpak-builder/fix-test-paths.patch +++ b/pkgs/development/tools/flatpak-builder/fix-test-paths.patch @@ -5,7 +5,7 @@ skip_without_python2 () { - if ! test -f /usr/bin/python2 || ! /usr/bin/python2 -c "import sys; sys.exit(0 if sys.version_info >= (2, 7) else 1)" ; then -+ if ! test -f @python2@/bin/python2 || ! @python2@/bin/python2 -c "import sys; sys.exit(0 if sys.version_info >= (2, 7) else 1)" ; then ++ if true ; then echo "1..0 # SKIP this test requires /usr/bin/python2 (2.7) support" exit 0 fi diff --git a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix new file mode 100644 index 0000000000000..8c124a29aee69 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix @@ -0,0 +1,29 @@ +{ + buildHomeAssistantComponent, + fetchFromGitHub, + lib, + gitUpdater, +}: + +buildHomeAssistantComponent rec { + owner = "jmcollin78"; + domain = "versatile_thermostat"; + version = "7.1.5"; + + src = fetchFromGitHub { + inherit owner; + repo = domain; + rev = "refs/tags/${version}"; + hash = "sha256-XCDWByw/2xUjub/fNGvpIGzDyn3rq+JMI7syI1oPus0="; + }; + + passthru.updateScript = gitUpdater { ignoredVersions = "(Alpha|Beta|alpha|beta).*"; }; + + meta = { + changelog = "https://github.com/jmcollin78/versatile_thermostat/releases/tag/${version}"; + description = "A full-featured thermostat"; + homepage = "https://github.com/jmcollin78/versatile_thermostat"; + maintainers = with lib.maintainers; [ pwoelfel ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix index 899e212232c43..811709ef4d7f8 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "bubble-card"; - version = "2.3.4"; + version = "2.4.0"; dontBuild = true; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "Clooos"; repo = "Bubble-Card"; rev = "v${version}"; - hash = "sha256-90If8QKlxacJZoEG3+IFHPd9cuFJS5Ki9XMdTaq67IA="; + hash = "sha256-Hn6jH7lT+bjkOM/iRCmD1B8l6ZRqjNTmVMj4IN7ixE4="; }; installPhase = '' diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/versatile-thermostat-ui-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/versatile-thermostat-ui-card/package.nix new file mode 100644 index 0000000000000..1d3d7c75aad8a --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/versatile-thermostat-ui-card/package.nix @@ -0,0 +1,37 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage rec { + pname = "versatile-thermostat-ui-card"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "jmcollin78"; + repo = "versatile-thermostat-ui-card"; + rev = "${version}"; + hash = "sha256-JOm0jQysBtKHjAXtWnjbEn7UPSNLHd95TGfP13WH0Ww="; + }; + + npmFlags = [ "--legacy-peer-deps" ]; + npmDepsHash = "sha256-TlJGO0kw3+8ukT1DERp/xDwmeSu0ofP5mqrmXmGcF2M="; + + installPhase = '' + runHook preInstall + + mkdir $out + install -m0644 dist/versatile-thermostat-ui-card.js $out + + runHook postInstall + ''; + + meta = with lib; { + changelog = "https://github.com/jmcollin78/versatile-thermostat-ui-card/releases/tag/${version}"; + description = "Home Assistant card for the Versatile Thermostat integration."; + homepage = "https://github.com/jmcollin78/versatile-thermostat-ui-card"; + license = licenses.mit; + maintainers = with maintainers; [ pwoelfel ]; + }; +} diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 3f4933500f7be..3c0e87ab6c76c 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -12,7 +12,7 @@ outer@{ nixosTests, installShellFiles, - substituteAll, + replaceVars, removeReferencesTo, gd, geoip, @@ -40,7 +40,7 @@ outer@{ buildInputs ? [ ], extraPatches ? [ ], fixPatch ? p: p, - postPatch ? "", + postPatch ? null, preConfigure ? "", preInstall ? "", postInstall ? "", @@ -214,12 +214,7 @@ stdenv.mkDerivation { patches = map fixPatch ( [ - (substituteAll { - src = ./nix-etag-1.15.4.patch; - preInstall = '' - export nixStoreDir="$NIX_STORE" nixStoreDirLen="''${#NIX_STORE}" - ''; - }) + ./nix-etag-1.15.4.patch ./nix-skip-check-logs-path.patch ] ++ @@ -255,7 +250,11 @@ stdenv.mkDerivation { ) ++ extraPatches; - inherit postPatch; + postPatch = lib.defaultTo '' + substituteInPlace src/http/ngx_http_core_module.c \ + --replace-fail '@nixStoreDir@' "$NIX_STORE" \ + --replace-fail '@nixStoreDirLen@' "''${#NIX_STORE}" + '' postPatch; hardeningEnable = lib.optional (!stdenv.hostPlatform.isDarwin) "pie"; diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 3b82179f73a3d..bd26b5796dcd0 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -39,6 +39,10 @@ callPackage ../nginx/generic.nix args rec { buildInputs = [ libpq ]; postPatch = '' + substituteInPlace bundle/nginx-${nginxVersion}/src/http/ngx_http_core_module.c \ + --replace-fail '@nixStoreDir@' "$NIX_STORE" \ + --replace-fail '@nixStoreDirLen@' "''${#NIX_STORE}" + patchShebangs configure bundle/ ''; diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index 812784ebd394d..d60b8ec7815b9 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -8,7 +8,7 @@ libxcrypt, libxml2, libxslt, - substituteAll, + replaceVars, gd, geoip, gperftools, @@ -48,17 +48,17 @@ stdenv.mkDerivation rec { jemalloc ] ++ lib.concatMap (mod: mod.inputs or [ ]) modules; - patches = - lib.singleton (substituteAll { - src = ../nginx/nix-etag-1.15.4.patch; - preInstall = '' - export nixStoreDir="$NIX_STORE" nixStoreDirLen="''${#NIX_STORE}" - ''; - }) - ++ [ - ./check-resolv-conf.patch - ../nginx/nix-skip-check-logs-path.patch - ]; + patches = [ + ../nginx/nix-etag-1.15.4.patch + ./check-resolv-conf.patch + ../nginx/nix-skip-check-logs-path.patch + ]; + + postPatch = '' + substituteInPlace src/http/ngx_http_core_module.c \ + --replace-fail '@nixStoreDir@' "$NIX_STORE" \ + --replace-fail '@nixStoreDirLen@' "''${#NIX_STORE}" + ''; configureFlags = [ diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 45319b2b79a63..3c50af1fe6bf3 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -11,33 +11,32 @@ stdenv.mkDerivation rec { pname = "screen"; - version = "4.9.1"; + version = "5.0.0"; src = fetchurl { url = "mirror://gnu/screen/screen-${version}.tar.gz"; - hash = "sha256-Js7z48QlccDUhK1vrxEMXBUJH7+HKwb6eqR2bHQFrGk="; + hash = "sha256-8Eo50AoOXHyGpVM4gIkDCCrV301z3xov00JZdq7ZSXE="; }; configureFlags = [ "--enable-telnet" "--enable-pam" - "--with-sys-screenrc=/etc/screenrc" - "--enable-colors256" - "--enable-rxvt_osc" ]; + # We need _GNU_SOURCE so that mallocmock_reset() is defined: https://savannah.gnu.org/bugs/?66416 + NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isGNU) "-D_GNU_SOURCE=1 -Wno-int-conversion -Wno-incompatible-pointer-types"; + nativeBuildInputs = [ autoreconfHook ]; - buildInputs = - [ - ncurses - libxcrypt - ] - ++ lib.optional stdenv.hostPlatform.isLinux pam - ++ lib.optional stdenv.hostPlatform.isDarwin utmp; + buildInputs = [ + ncurses + libxcrypt + pam + ] ++ lib.optional stdenv.hostPlatform.isDarwin utmp; - doCheck = true; + # The test suite seems to have some glibc malloc hooks that don't exist/link on macOS + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { homepage = "https://www.gnu.org/software/screen/"; diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index 37695fb066a83..4301f58926c1a 100644 --- a/pkgs/tools/misc/toybox/default.nix +++ b/pkgs/tools/misc/toybox/default.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "toybox"; - version = "0.8.11"; + version = "0.8.12"; src = fetchFromGitHub { owner = "landley"; repo = pname; rev = version; - sha256 = "sha256-7izs2C5/czec0Dt3apL8s7luARAlw4PfUFy9Xsxb0zw="; + sha256 = "sha256-D+tf2bJQlf2pLMNZdMUOoUdE3ea/KgkqoXGsnl1MVOE="; }; depsBuildBuild = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix deleted file mode 100644 index 5dcc9a862bb29..0000000000000 --- a/pkgs/tools/text/xsv/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - Security, -}: - -rustPlatform.buildRustPackage rec { - pname = "xsv"; - version = "0.13.0"; - - src = fetchFromGitHub { - owner = "BurntSushi"; - repo = "xsv"; - rev = version; - sha256 = "17v1nw36mrarrd5yv4xd3mpc1d7lvhd5786mqkzyyraf78pjg045"; - }; - - cargoHash = "sha256-y9f9eBMhSBx6L3cZyZ4VkNSB7yJ55khCskUp6t4HBq4="; - - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - - meta = with lib; { - description = "Fast CSV toolkit written in Rust"; - mainProgram = "xsv"; - homepage = "https://github.com/BurntSushi/xsv"; - license = with licenses; [ - unlicense # or - mit - ]; - maintainers = [ maintainers.jgertm ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 92af4d30971c5..ba7e24ce2c86f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1384,6 +1384,7 @@ mapAliases { tijolo = throw "'tijolo' has been removed due to being unmaintained"; # Added 2024-12-27 timescale-prometheus = throw "'timescale-prometheus' has been renamed to/replaced by 'promscale'"; # Converted to throw 2024-10-17 tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22 + timelens = throw "'timelens' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 tix = tclPackages.tix; # Added 2024-10-02 tkcvs = tkrev; # Added 2022-03-07 tkimg = tclPackages.tkimg; # Added 2024-10-02 @@ -1534,6 +1535,7 @@ mapAliases { xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18 xplayer = throw "xplayer has been removed as the upstream project was archived"; # Added 2024-12-27 xprite-editor = throw "'xprite-editor' has been removed due to lack of maintenance upstream. Consider using 'pablodraw' or 'aseprite' instead"; # Added 2024-09-14 + xsv = throw "'xsv' has been removed due to lack of upstream maintenance"; xulrunner = firefox-unwrapped; # Added 2023-11-03 xvfb_run = throw "'xvfb_run' has been renamed to/replaced by 'xvfb-run'"; # Converted to throw 2024-10-17 xwaylandvideobridge = libsForQt5.xwaylandvideobridge; # Added 2024-09-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bb34c926c5db..59ac31b798848 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5526,10 +5526,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - xsv = callPackage ../tools/text/xsv { - inherit (darwin.apple_sdk.frameworks) Security; - }; - xtreemfs = callPackage ../tools/filesystems/xtreemfs { }; xorriso = libisoburn; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 73bc798aadb79..3cabaec2c7b14 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -438,6 +438,7 @@ in { nvidia_x11 = nvidiaPackages.stable; nvidia_x11_beta = nvidiaPackages.beta; + nvidia_x11_latest = nvidiaPackages.latest; nvidia_x11_legacy340 = nvidiaPackages.legacy_340; nvidia_x11_legacy390 = nvidiaPackages.legacy_390; nvidia_x11_legacy470 = nvidiaPackages.legacy_470; @@ -451,6 +452,7 @@ in { # this is not a replacement for nvidia_x11* # only the opensource kernel driver exposed for hydra to build nvidia_x11_beta_open = nvidiaPackages.beta.open; + nvidia_x11_latest_open = nvidiaPackages.latest.open; nvidia_x11_production_open = nvidiaPackages.production.open; nvidia_x11_stable_open = nvidiaPackages.stable.open; nvidia_x11_vulkan_beta_open = nvidiaPackages.vulkan_beta.open; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4705c78485618..f594b8aa5ed3a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7266,6 +7266,8 @@ self: super: with self; { lektricowifi = callPackage ../development/python-modules/lektricowifi { }; + letpot = callPackage ../development/python-modules/letpot { }; + leveldb = callPackage ../development/python-modules/leveldb { }; levenshtein = callPackage ../development/python-modules/levenshtein { }; @@ -9949,6 +9951,8 @@ self: super: with self; { osxphotos = callPackage ../development/python-modules/osxphotos { }; + otpauth = callPackage ../development/python-modules/otpauth { }; + ots-python = callPackage ../development/python-modules/ots-python { }; outcome = callPackage ../development/python-modules/outcome { }; @@ -14552,8 +14556,16 @@ self: super: with self; { scienceplots = callPackage ../development/python-modules/scienceplots { }; + scim2-client = callPackage ../development/python-modules/scim2-client { }; + scim2-filter-parser = callPackage ../development/python-modules/scim2-filter-parser { }; + scim2-models = callPackage ../development/python-modules/scim2-models { }; + + scim2-server = callPackage ../development/python-modules/scim2-server { }; + + scim2-tester = callPackage ../development/python-modules/scim2-tester { }; + scikit-bio = callPackage ../development/python-modules/scikit-bio { }; scikit-build = callPackage ../development/python-modules/scikit-build { };