diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 52665296dd5f..cfb2d37ba0ee 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1539,7 +1539,7 @@ in sftpgo = runTest ./sftpgo.nix; sfxr-qt = runTest ./sfxr-qt.nix; sgt-puzzles = runTest ./sgt-puzzles.nix; - shadow = runTest ./shadow.nix; + shadow = import ./shadow { inherit runTest; }; shadowsocks = handleTest ./shadowsocks { }; shadps4 = runTest ./shadps4.nix; sharkey = runTest ./web-apps/sharkey.nix; diff --git a/nixos/tests/shadow/default.nix b/nixos/tests/shadow/default.nix new file mode 100644 index 000000000000..ba773f93f073 --- /dev/null +++ b/nixos/tests/shadow/default.nix @@ -0,0 +1,5 @@ +{ runTest }: +{ + login = runTest ./login.nix; + system = runTest ./system.nix; +} diff --git a/nixos/tests/shadow.nix b/nixos/tests/shadow/login.nix similarity index 100% rename from nixos/tests/shadow.nix rename to nixos/tests/shadow/login.nix diff --git a/nixos/tests/shadow/system.nix b/nixos/tests/shadow/system.nix new file mode 100644 index 000000000000..fbed9be8beba --- /dev/null +++ b/nixos/tests/shadow/system.nix @@ -0,0 +1,147 @@ +{ pkgs, ... }: +let + # Create a Python environment for the controller with all necessary test framework dependencies + controllerPython = pkgs.python3.withPackages (ps: [ + ps.flaky + ps.jc + ps.pytest + ps.pytest-mh + ps.pytest-ticket + ]); + + shadowHostName = "shadowhost"; +in +{ + name = "shadow-system-tests"; + + meta.maintainers = with pkgs.lib.maintainers; [ joaosreis ]; + + nodes = { + # The target host: runs sshd, has shadow and other test dependencies installed, mutable users, and some specific settings to match the expectations of the test suite + shadowhost = + { pkgs, ... }: + { + networking.hostName = shadowHostName; + services.openssh = { + enable = true; + settings = { + PermitRootLogin = "yes"; + PasswordAuthentication = false; + }; + }; + + users.mutableUsers = true; + + environment.systemPackages = with pkgs; [ + shadow + expect + ]; + + users.defaultUserShell = "/bin/sh"; + + security.loginDefs.settings = { + PASS_MAX_DAYS = 99999; + PASS_MIN_DAYS = 0; + PASS_WARN_AGE = 7; + USERGROUPS_ENAB = "yes"; + CREATE_HOME = "yes"; + UID_MIN = 1001; + GID_MIN = 1001; + }; + + security.pam.services = { + newusers.text = '' + auth required pam_permit.so + account required pam_permit.so + password required pam_permit.so + session required pam_permit.so + ''; + }; + + services.envfs.enable = true; + }; + + # The controller: runs pytest-mh against the shadow host + controller = + { pkgs, ... }: + { + environment.systemPackages = [ + controllerPython + pkgs.openssh + ]; + }; + + }; + + testScript = '' + import textwrap + + start_all() + + # ------------------------------------------------------------------ + # 1. Generate an SSH keypair on the controller and authorise it + # on the shadow host + # ------------------------------------------------------------------ + controller.succeed("mkdir -p /root/.ssh && chmod 700 /root/.ssh") + controller.succeed( + "ssh-keygen -t ed25519 -N \'\' -f /root/.ssh/id_ed25519 2>&1" + ) + pub_key = controller.succeed("cat /root/.ssh/id_ed25519.pub").strip() + + # Inject the generated public key into the shadow host at runtime + shadowhost.succeed("mkdir -p /root/.ssh && chmod 700 /root/.ssh") + shadowhost.succeed( + f"echo '{pub_key}' >> /root/.ssh/authorized_keys && " + "chmod 600 /root/.ssh/authorized_keys" + ) + + # ------------------------------------------------------------------ + # 2. Make sure the shadow host has a writable /etc/login.defs, + # since the test framework expects to be able to write to it. + # ------------------------------------------------------------------ + shadowhost.succeed( + "cp --remove-destination $(readlink -f /etc/login.defs) /etc/login.defs && " + "chmod 644 /etc/login.defs" + ) + + # ------------------------------------------------------------------ + # 3. Copy the upstream test suite onto the controller + # ------------------------------------------------------------------ + controller.succeed( + "cp -r ${pkgs.shadow.passthru.testFramework} /root/shadow-tests && " + "chmod -R u+w /root/shadow-tests" + ) + + # ------------------------------------------------------------------ + # 4. Write the mhc.yaml topology config + # This tells pytest-mh where the shadow host is and which role + # it plays. The hostname must match the NixOS node name. + # ------------------------------------------------------------------ + controller.succeed(textwrap.dedent(""" + cat > /root/shadow-tests/mhc.yaml << 'EOF' + domains: + - id: shadow + hosts: + - hostname: ${shadowHostName} + role: shadow + ssh: + user: root + private_key: /root/.ssh/id_ed25519 + EOF + """)) + + + # ------------------------------------------------------------------ + # 5. Run the upstream pytest-mh test suite from the controller + # ------------------------------------------------------------------ + shadowhost.wait_for_unit("sshd.service") + # gpasswd tests are disabled, since they rely on specific behavior of the gpasswd command that is not applicable to NixOS + controller.succeed( + "cd /root/shadow-tests && " + "${controllerPython}/bin/pytest " + "--mh-config=mhc.yaml " + "--deselect=tests/test_gpasswd.py " + "-v tests/" + ) + ''; +} diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 5af2c5353f82..5931a7d01d98 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2015,8 +2015,8 @@ let mktplcRef = { name = "gitlab-workflow"; publisher = "gitlab"; - version = "6.84.2"; - hash = "sha256-UBoZ6DxT5d7zeTycgmuLomzoVcB7iAnflfxAup6QslI="; + version = "6.85.3"; + hash = "sha256-EsQ+95Wo/5F9mEMQ7X36vBgUWlsz5BCOm+7QrGHuepc="; }; meta = { description = "GitLab extension for Visual Studio Code"; @@ -5113,8 +5113,8 @@ let mktplcRef = { name = "vscode-gradle"; publisher = "vscjava"; - version = "3.17.3"; - hash = "sha256-heFcGOe10r7y23xyFc/nFKk/nsrX4wc5fT9e4GKGhW0="; + version = "3.18.0"; + hash = "sha256-ybMejIJER9HHVh1z+tazgvQ0UIa8eKoJBb7JOLU1Kpw="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix index dc8ca7283294..67df81e6ddf4 100644 --- a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "mongodb-vscode"; publisher = "mongodb"; - version = "1.16.0"; - hash = "sha256-cnKYDrExL3yDJkEofWPglzMa50KDMgKQxsM5zK1RaBs="; + version = "1.16.1"; + hash = "sha256-UIxXrJpH/Ix4Ev6veumcT/9h1SgZgEXHjnwkOH9ch44="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix index 51f89e1e87c3..7523d64c9ea6 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix @@ -180,7 +180,7 @@ stdenv.mkDerivation { meta = { description = "Native debugger extension for VSCode based on LLDB"; homepage = "https://github.com/vadimcn/vscode-lldb"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix index 60ef8d53553b..bee347a92d7c 100644 --- a/pkgs/applications/editors/your-editor/default.nix +++ b/pkgs/applications/editors/your-editor/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Small and simple terminal editor core that is meant to be extended through a powerful plugin architecture"; homepage = "https://your-editor.org/"; changelog = "https://github.com/your-editor/yed/blob/${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.unix; mainProgram = "yed"; }; diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 465fc428cfd6..776dceef6050 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -365,7 +365,7 @@ stdenv.mkDerivation ( meta = { inherit version; homepage = "https://www.winehq.org/"; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; sourceProvenance = with lib.sourceTypes; [ fromSource binaryNativeCode # mono, gecko diff --git a/pkgs/applications/emulators/wine/fonts.nix b/pkgs/applications/emulators/wine/fonts.nix index 94b2d74440a4..3ed188a42705 100644 --- a/pkgs/applications/emulators/wine/fonts.nix +++ b/pkgs/applications/emulators/wine/fonts.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Microsoft replacement fonts by the Wine project"; homepage = "https://wiki.winehq.org/Create_Fonts"; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ avnik diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index cdbac84aaf3d..a2decfce52cd 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -209,7 +209,7 @@ lib.makeScope pkgs.newScope ( broken = gimp.apiVersion != "2.0"; description = "GIMP plug-in to do the fourier transform"; homepage = "https://people.via.ecp.fr/~remi/soft/gimp/gimp_plugin_en.php3#fourier"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; }; }; @@ -243,7 +243,7 @@ lib.makeScope pkgs.newScope ( broken = lib.versionOlder gimp.version "3"; description = "Suite of gimp plugins for texture synthesis"; homepage = "https://github.com/bootchk/resynthesizer"; - license = [ lib.licenses.gpl3Plus ]; + license = lib.licenses.gpl3Plus; }; }; diff --git a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix index 0024092cfcd5..65151cb3192b 100644 --- a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix +++ b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix @@ -101,7 +101,7 @@ python3.pkgs.buildPythonApplication { meta = { description = "Inkscape extension for machine embroidery design"; homepage = "https://inkstitch.org/"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ tropf pluiedev diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index c4ef999b274b..33f308b23834 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -838,7 +838,7 @@ } }, "ungoogled-chromium": { - "version": "150.0.7871.114", + "version": "150.0.7871.124", "deps": { "depot_tools": { "rev": "f4fadaf6a5ba1bced9d3d9021060667b563bf583", @@ -850,16 +850,16 @@ "hash": "sha256-/1A+DkzAQj2zGPe/A/G0Z3VrYJXUxq4Hd/+d/o5p3G8=" }, "ungoogled-patches": { - "rev": "150.0.7871.114-1", - "hash": "sha256-qvAtrj013U44vU+U3JLuItAPbgtHwm9Kq7hU2NLYDaE=" + "rev": "150.0.7871.124-1", + "hash": "sha256-3dwDG3YuX/l5bOLcC3lICM2qmGnwVAPPJraDRaHZSe8=" }, "npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "f405107495a07cb1bfcf687d4af8d91117098db6", - "hash": "sha256-VdDnFbE+/leFzR/PqR3ColKKqwkvuY/LsFje0nrwiXU=", + "rev": "9261fd0a595ac4964ea84e6bd4a025c1173a2ffa", + "hash": "sha256-YKkZfxFZ7mitD6YqJZW+NQByq71UVb0jCFIBXj0SyzU=", "recompress": true }, "src/third_party/clang-format/script": { @@ -929,8 +929,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "8d3c5a8caebd836b99fa32062951a401910eba33", - "hash": "sha256-7X8FSWCA+BpAXbUPvjPyiGagmVXsadRGAY5haAEzRL8=" + "rev": "13e691adf3d4d3ebee2f7239731a07d3b9704956", + "hash": "sha256-fbjREn3D+quRRADGwR7V65BZt5b+1DgnsG4ZMhwGq6o=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -1389,8 +1389,8 @@ }, "src/third_party/libyuv": { "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "3c5fa6ef272f6077d76816ee3d6a697ef1d6d272", - "hash": "sha256-FXFSC9dRb/KhSQdhJUqKEUpZbzU8ZpVnoSXtF/HPiJI=" + "rev": "8aeb3a9ca36341a640528e59b34b5d641080dca8", + "hash": "sha256-FGl0xK7ooaRFzFBxuV6oOu3h1x2b/myLLO2En3xgVCk=" }, "src/third_party/lss": { "url": "https://chromium.googlesource.com/linux-syscall-support.git", @@ -1494,8 +1494,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "14d05ec761901b6e9e9193af8b347ab3a7f6fed0", - "hash": "sha256-KZGrztOKaT368KSCxiJAqnsgINpNODUlaXnH/maQNIA=" + "rev": "bee4c917220040e147f14964635ff92ce6c5a3f6", + "hash": "sha256-SWmoX+sNaw4KnlTBPt63uBSYfQavJejB3+Vlw/gtWX8=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -1664,8 +1664,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "ce0af5c0d181678bcda077c68d4beaec2854ad16", - "hash": "sha256-gjuH2HQAC0poQileS8JLusocBDoShuaQ9pbaAXmFj4g=" + "rev": "209c9cea0db17d8caf23e9d2c7de08c351609744", + "hash": "sha256-3jUyRERu1r+Fl2uSAaRchV2L99XLp8XO9DHctk0lMjY=" }, "src/agents/shared": { "url": "https://chromium.googlesource.com/chromium/agents.git", diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 80174bc67d6e..88d59af1aa81 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -39,7 +39,6 @@ let i686-linux = "linux-i686"; x86_64-linux = "linux-x86_64"; aarch64-linux = "linux-aarch64"; - # bundles are universal and can be re-used for both darwin architectures aarch64-darwin = "mac"; }; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix index 7a57f58bef6c..8ba869bfb2ec 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix @@ -32,7 +32,7 @@ buildGoModule rec { meta = { description = "Helm plugin which maps deprecated or removed Kubernetes APIs in a release to supported APIs"; homepage = "https://github.com/helm/helm-mapkubeapis"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ aos ]; }; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index bbd0d279a248..bbb93d2df847 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -45,13 +45,13 @@ "vendorHash": "sha256-031RZo1EqWrt79NvdrrZ9FW/E+mfwkGmr7wyMYX4SHg=" }, "aliyun_alicloud": { - "hash": "sha256-PF/mGGoO8voHyUiUN3qTOsBEJ0r6TBWa+p1P4vgliDs=", + "hash": "sha256-G52l+5WlcxSNflx0ioD0jEKI1GBWe5D4qW8VH8k6uTA=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.284.0", + "rev": "v1.285.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-sESuNlWNyjjGYb7z+tQF7RGBgicnPISuwXRzB+QJ7E4=" + "vendorHash": "sha256-sZeXHTrMUUPllPzvpbFjwA5FjFJXnO1k5h9B5i8U+vs=" }, "aminueza_minio": { "hash": "sha256-4b5K2Hyy26euJct1/0dxC39DMM41W6+jdJS68/d4yCw=", @@ -427,13 +427,13 @@ "vendorHash": "sha256-ZbU2z7qUHPR7vDSflesSjgK7x3LYXVe/gnVsy19q6Bs=" }, "fortinetdev_fortios": { - "hash": "sha256-w7LxnOEAoeJKyicI8Bfd2yH+3oTz3ZVBnskbSEgZBO4=", + "hash": "sha256-etGi9KDbmET8Eh4DPJkNA/HbjR+1VUBADlf3MKWbqkc=", "homepage": "https://registry.terraform.io/providers/fortinetdev/fortios", "owner": "fortinetdev", "repo": "terraform-provider-fortios", - "rev": "1.24.1", + "rev": "1.25.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-V+D/D+i1xbPp9IAfrAds2rNv5t/aXQxPwH9vY09DsMo=" + "vendorHash": "sha256-ZU05thGO6uUsAxEi/aMQFxlQZ57okGfDEHx/+wNe+x8=" }, "gavinbunney_kubectl": { "hash": "sha256-UQ/xvhs7II+EGH5bKdrVC47hp5dhLqQZeqSBz06ho1s=", diff --git a/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix b/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix deleted file mode 100644 index 030234b95fb5..000000000000 --- a/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - stdenvNoCC, - lib, - fetchzip, -}: - -stdenvNoCC.mkDerivation rec { - pname = "ripcord"; - version = "0.4.29"; - - src = fetchzip { - url = "https://cancel.fm/dl/Ripcord_Mac_${version}.zip"; - sha256 = "sha256-v8iydjLBjFN5LuctpcBpEkhSICxPhLKzLjSASWtsQok="; - stripRoot = false; - }; - - dontBuild = true; - dontFixup = true; # modification is not allowed by the license https://cancel.fm/ripcord/shareware-redistribution/ - - installPhase = '' - runHook preInstall - - mkdir -p $out/Applications - cp -r $src/Ripcord.app $out/Applications/ - - runHook postInstall - ''; - - meta = { - description = "Desktop chat client for Slack and Discord"; - homepage = "https://cancel.fm/ripcord/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - # See: https://cancel.fm/ripcord/shareware-redistribution/ - license = lib.licenses.unfreeRedistributable; - maintainers = with lib.maintainers; [ mikroskeem ]; - platforms = [ ]; - }; -} diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 601ead626005..004c91f93cfc 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -39,7 +39,6 @@ let mozillaPlatforms = { x86_64-linux = "linux-x86_64"; - # bundles are universal and can be re-used for both darwin architectures aarch64-darwin = "mac"; }; diff --git a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix index d53b26671d3e..6c138f1f9f05 100644 --- a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix +++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix @@ -35,7 +35,7 @@ let meta = { homepage = "https://github.com/kodi-game/controller-topology-project"; description = "Models how controllers connect to and map to each other for all gaming history"; - license = with lib.licenses; [ odbl ]; + license = lib.licenses.odbl; teams = [ lib.teams.kodi ]; }; }; diff --git a/pkgs/applications/video/obs-studio/plugins/distroav/default.nix b/pkgs/applications/video/obs-studio/plugins/distroav/default.nix index f24a89c61bc3..c223220a29f2 100644 --- a/pkgs/applications/video/obs-studio/plugins/distroav/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/distroav/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = { description = "Network A/V plugin for OBS Studio (formerly obs-ndi)"; homepage = "https://github.com/DistroAV/DistroAV"; - license = with lib.licenses; [ gpl2 ]; + license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ globule655 ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ac/actool/package.nix b/pkgs/by-name/ac/actool/package.nix index a33cf769d26a..92e38b436951 100644 --- a/pkgs/by-name/ac/actool/package.nix +++ b/pkgs/by-name/ac/actool/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Apple's actool reimplementation"; homepage = "https://github.com/viraptor/actool"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; mainProgram = "actool"; maintainers = [ lib.maintainers.viraptor ]; }; diff --git a/pkgs/by-name/ad/adbtuifm/package.nix b/pkgs/by-name/ad/adbtuifm/package.nix index 233bb5a818d3..3fa01b1e20b2 100644 --- a/pkgs/by-name/ad/adbtuifm/package.nix +++ b/pkgs/by-name/ad/adbtuifm/package.nix @@ -17,7 +17,7 @@ buildGoModule (finalAttrs: { description = "TUI-based file manager for the Android Debug Bridge"; homepage = "https://github.com/darkhz/adbtuifm"; changelog = "https://github.com/darkhz/adbtuifm/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ daru-san ]; mainProgram = "adbtuifm"; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/by-name/ad/adenum/package.nix b/pkgs/by-name/ad/adenum/package.nix index c44a4e2d37bf..ca4b5d811ce8 100644 --- a/pkgs/by-name/ad/adenum/package.nix +++ b/pkgs/by-name/ad/adenum/package.nix @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication { description = "Tool to find misconfiguration through LDAP"; mainProgram = "adenum"; homepage = "https://github.com/SecuProject/ADenum"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/ad/adreaper/package.nix b/pkgs/by-name/ad/adreaper/package.nix index 806fd1a78eda..29f7e2641905 100644 --- a/pkgs/by-name/ad/adreaper/package.nix +++ b/pkgs/by-name/ad/adreaper/package.nix @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { changelog = "https://github.com/m0n1x90/ADReaper/releases/tag/ADReaperv${finalAttrs.version}"; # Upstream doesn't have a license yet # https://github.com/AidenPearce369/ADReaper/issues/2 - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; maintainers = with lib.maintainers; [ fab ]; mainProgram = "ADReaper"; }; diff --git a/pkgs/by-name/af/affine-bin/package.nix b/pkgs/by-name/af/affine-bin/package.nix index f2e33e1c83e4..f26a395c878e 100644 --- a/pkgs/by-name/af/affine-bin/package.nix +++ b/pkgs/by-name/af/affine-bin/package.nix @@ -43,7 +43,6 @@ stdenvNoCC.mkDerivation ( license = lib.licenses.mit; maintainers = with lib.maintainers; [ richar - redyf xiaoxiangmoe ]; platforms = [ diff --git a/pkgs/by-name/ag/agent-safehouse/package.nix b/pkgs/by-name/ag/agent-safehouse/package.nix index ca43776cf6ec..c07c75768503 100644 --- a/pkgs/by-name/ag/agent-safehouse/package.nix +++ b/pkgs/by-name/ag/agent-safehouse/package.nix @@ -2,18 +2,19 @@ lib, stdenvNoCC, fetchFromGitHub, + versionCheckHook, nix-update-script, }: stdenvNoCC.mkDerivation rec { pname = "safehouse"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "eugene1g"; repo = "agent-safehouse"; rev = "v" + version; - hash = "sha256-Nm04UnyQ2mVLkIIEspDd2vbdcJxZ17MH07fW6PvokJI="; + hash = "sha256-2GWxh5J9qqudc2QM/CACXpqJLcNULKSfTAHBzR++UAE="; }; postPatch = "patchShebangs scripts bin"; @@ -37,12 +38,18 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + meta = { description = "Sandbox your local AI agents so they can read/write only what they need"; homepage = "https://github.com/eugene1g/agent-safehouse"; mainProgram = "safehouse"; license = lib.licenses.asl20; platforms = lib.platforms.darwin; - maintainers = with lib.maintainers; [ myzel394 ]; + maintainers = with lib.maintainers; [ + myzel394 + Br1ght0ne + ]; }; } diff --git a/pkgs/by-name/ai/aiodnsbrute/package.nix b/pkgs/by-name/ai/aiodnsbrute/package.nix index 63b463daa275..6477b8e65f23 100644 --- a/pkgs/by-name/ai/aiodnsbrute/package.nix +++ b/pkgs/by-name/ai/aiodnsbrute/package.nix @@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { mainProgram = "aiodnsbrute"; homepage = "https://github.com/blark/aiodnsbrute"; changelog = "https://github.com/blark/aiodnsbrute/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ai/airbuddy/package.nix b/pkgs/by-name/ai/airbuddy/package.nix index a20169b03656..706f9946c238 100644 --- a/pkgs/by-name/ai/airbuddy/package.nix +++ b/pkgs/by-name/ai/airbuddy/package.nix @@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; homepage = "https://v2.airbuddy.app"; changelog = "https://support.airbuddy.app/articles/airbuddy-2-changelog"; - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ stepbrobd ]; platforms = [ diff --git a/pkgs/by-name/al/alephone/package.nix b/pkgs/by-name/al/alephone/package.nix index 42fb25a838dc..a0d7cb135ba0 100644 --- a/pkgs/by-name/al/alephone/package.nix +++ b/pkgs/by-name/al/alephone/package.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Aleph One is the open source continuation of Bungie’s Marathon 2 game engine"; mainProgram = "alephone"; homepage = "https://alephone.lhowon.org/"; - license = [ lib.licenses.gpl3 ]; + license = lib.licenses.gpl3; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix index 837cd4e989cf..3908ee82c0cc 100644 --- a/pkgs/by-name/al/all-the-package-names/package.nix +++ b/pkgs/by-name/al/all-the-package-names/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "all-the-package-names"; - version = "2.0.2495"; + version = "2.0.2503"; src = fetchFromGitHub { owner = "nice-registry"; repo = "all-the-package-names"; tag = "v${version}"; - hash = "sha256-65UbcJXOUZVDEtjDy0PkRLPIlhk8/WxItDeyiULLpNY="; + hash = "sha256-UtwbQXhX8dmmA6dVuVFcMQkM98kOt/U//OAVMGBImDU="; }; - npmDepsHash = "sha256-Vv3rJBDRSwWnbYFO01M0rLJM3b2gP0z8wAi9T2nRwxQ="; + npmDepsHash = "sha256-V7MWSEJT2RtYE1iYJHj2ltrfzke+GO1PfT/wo+MqlZk="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/am/amber/package.nix b/pkgs/by-name/am/amber/package.nix index ada5d438294a..fbf9a722854a 100644 --- a/pkgs/by-name/am/amber/package.nix +++ b/pkgs/by-name/am/amber/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Code search-and-replace tool"; homepage = "https://github.com/dalance/amber"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.bdesham ]; }; }) diff --git a/pkgs/by-name/am/amd-debug-tools/package.nix b/pkgs/by-name/am/amd-debug-tools/package.nix index 309eb68b0593..226caa0d22ba 100644 --- a/pkgs/by-name/am/amd-debug-tools/package.nix +++ b/pkgs/by-name/am/amd-debug-tools/package.nix @@ -9,13 +9,13 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "amd-debug-tools"; - version = "0.2.18"; + version = "0.2.20"; pyproject = true; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/superm1/amd-debug-tools.git"; tag = finalAttrs.version; - hash = "sha256-qBgQFjiWFRKVTsIx0aLZC9AQWsVzgbJGOPGG6ojKoDE="; + hash = "sha256-JDacCakZC+4N4IDAODWLSuensAtFArl052I4weK/zJQ="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/am/amfora/package.nix b/pkgs/by-name/am/amfora/package.nix index 6733bff81d39..a82f3c7446db 100644 --- a/pkgs/by-name/am/amfora/package.nix +++ b/pkgs/by-name/am/amfora/package.nix @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { description = "Fancy terminal browser for the Gemini protocol"; mainProgram = "amfora"; homepage = "https://github.com/makew0rld/amfora"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ deifactor ]; changelog = "https://github.com/makew0rld/amfora/blob/v${finalAttrs.version}/CHANGELOG.md"; }; diff --git a/pkgs/by-name/an/anchor/package.nix b/pkgs/by-name/an/anchor/package.nix index 76b35e307594..bd8e0316c6da 100644 --- a/pkgs/by-name/an/anchor/package.nix +++ b/pkgs/by-name/an/anchor/package.nix @@ -1,8 +1,8 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, + fetchpatch, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -19,6 +19,17 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-oEgWfklxjP8+TxrhDKJgcTsanpqJpEiHXJyir8neYj8="; + # Upstream patch to fix cargo metadata discovery on macOS Nix sandboxes. + # Replaces fragile subprocess-cwd approach with in-process manifest path + # resolution. Remove on next version bump (included in v1.1.3+). + # See: https://github.com/otter-sec/anchor/pull/4757 + patches = [ + (fetchpatch { + url = "https://github.com/otter-sec/anchor/commit/25bf2112b67d84e5bc406d7eac2919c90d8e54ed.patch"; + hash = "sha256-q5OGNoUGPuCNHgaZNo9fmUxqQnFH2MhRW4ZefX+Of0Y="; + }) + ]; + # Only build the anchor-cli package cargoBuildFlags = [ "-p" @@ -31,16 +42,6 @@ rustPlatform.buildRustPackage (finalAttrs: { "anchor-cli" ]; - # These tests use tempdir + cargo metadata subprocess which fails on Darwin - # sandboxes due to getcwd() differences (XNU vs Linux). Tracked upstream at - # https://github.com/otter-sec/anchor/issues/4751 - checkFlags = map (t: "--skip=${t}") ( - lib.optionals stdenv.hostPlatform.isDarwin [ - "program::tests::discover_solana_programs_finds_sibling_programs_from_nested_member" - "program::tests::discover_solana_programs_lists_all_members_from_nested_member" - ] - ); - meta = { description = "Solana Sealevel Framework"; homepage = "https://github.com/otter-sec/anchor"; diff --git a/pkgs/by-name/an/angrr/package.nix b/pkgs/by-name/an/angrr/package.nix index 0ef7b65f393d..c100ef488f36 100644 --- a/pkgs/by-name/an/angrr/package.nix +++ b/pkgs/by-name/an/angrr/package.nix @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Auto Nix GC Root Retention"; homepage = "https://github.com/linyinfeng/angrr"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ yinfeng ]; platforms = with lib.platforms; linux ++ darwin; mainProgram = "angrr"; diff --git a/pkgs/by-name/an/animatch/package.nix b/pkgs/by-name/an/animatch/package.nix index e727a92f87b0..332be7b42c7a 100644 --- a/pkgs/by-name/an/animatch/package.nix +++ b/pkgs/by-name/an/animatch/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.com/HolyPangolin/animatch/"; description = "Cute match three game for the Librem 5 smartphone"; mainProgram = "animatch"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ colinsane ]; }; }) diff --git a/pkgs/by-name/an/anki-sync-server/package.nix b/pkgs/by-name/an/anki-sync-server/package.nix index 826ff0c21135..994e798115ce 100644 --- a/pkgs/by-name/an/anki-sync-server/package.nix +++ b/pkgs/by-name/an/anki-sync-server/package.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage { meta = { description = "Standalone official anki sync server"; homepage = "https://apps.ankiweb.net"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ martinetd ]; mainProgram = "anki-sync-server"; }; diff --git a/pkgs/by-name/an/ansi/package.nix b/pkgs/by-name/an/ansi/package.nix index fd2d0f4b8c5a..41a314206716 100644 --- a/pkgs/by-name/an/ansi/package.nix +++ b/pkgs/by-name/an/ansi/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: { the colors and styles, such as bold or italic. ''; homepage = "https://github.com/phip1611/ansi-escape-sequences-cli"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ phip1611 ]; mainProgram = "ansi"; }; diff --git a/pkgs/by-name/an/ante/package.nix b/pkgs/by-name/an/ante/package.nix index 0368755b9997..f0f678af344a 100644 --- a/pkgs/by-name/an/ante/package.nix +++ b/pkgs/by-name/an/ante/package.nix @@ -70,7 +70,7 @@ rustPlatform.buildRustPackage { homepage = "https://antelang.org/"; description = "Low-level functional language for exploring refinement types, lifetime inference, and algebraic effects"; mainProgram = "ante"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ehllie ]; }; } diff --git a/pkgs/by-name/an/antiprism/package.nix b/pkgs/by-name/an/antiprism/package.nix index afe7bb297fd5..2ae40853178a 100644 --- a/pkgs/by-name/an/antiprism/package.nix +++ b/pkgs/by-name/an/antiprism/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.antiprism.com"; description = "Collection of programs for generating, manipulating, transforming and viewing polyhedra"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/ap/apache-flex-sdk/package.nix b/pkgs/by-name/ap/apache-flex-sdk/package.nix index 4c5b18d5abe0..5d603721f3bb 100644 --- a/pkgs/by-name/ap/apache-flex-sdk/package.nix +++ b/pkgs/by-name/ap/apache-flex-sdk/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Flex SDK for Adobe Flash / ActionScript"; homepage = "https://flex.apache.org/"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dywedir ]; }; }) diff --git a/pkgs/by-name/ap/apksigcopier/package.nix b/pkgs/by-name/ap/apksigcopier/package.nix index cd8aafdff6d3..ba13328dafff 100644 --- a/pkgs/by-name/ap/apksigcopier/package.nix +++ b/pkgs/by-name/ap/apksigcopier/package.nix @@ -76,7 +76,7 @@ python3.pkgs.buildPythonApplication rec { * compare two APKs with different signatures (requires apksigner) ''; homepage = "https://github.com/obfusk/apksigcopier"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ obfusk ]; }; } diff --git a/pkgs/by-name/ap/apparmor-utils/package.nix b/pkgs/by-name/ap/apparmor-utils/package.nix index ac360b87646a..3ec57fde8ebe 100644 --- a/pkgs/by-name/ap/apparmor-utils/package.nix +++ b/pkgs/by-name/ap/apparmor-utils/package.nix @@ -11,7 +11,7 @@ buildPackages, # apparmor deps - apparmor-parser, + apparmor-init, }: let inherit (python3Packages) libapparmor; @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication { cd utils substituteInPlace aa-remove-unknown \ - --replace-fail "/lib/apparmor/rc.apparmor.functions" "${apparmor-parser}/lib/apparmor/rc.apparmor.functions" + --replace-fail "/lib/apparmor/rc.apparmor.functions" "${apparmor-init}/lib/apparmor/rc.apparmor.functions" substituteInPlace Makefile \ --replace-fail "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h" sed -i -E 's/^(DESTDIR|BINDIR|PYPREFIX)=.*//g' Makefile diff --git a/pkgs/by-name/ap/apt-offline/package.nix b/pkgs/by-name/ap/apt-offline/package.nix index 86a1be8b6343..e5fadb2c6740 100644 --- a/pkgs/by-name/ap/apt-offline/package.nix +++ b/pkgs/by-name/ap/apt-offline/package.nix @@ -55,7 +55,7 @@ python3Packages.buildPythonApplication { meta = { homepage = "https://github.com/rickysarraf/apt-offline"; description = "Offline APT package manager"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "apt-offline"; maintainers = [ ]; }; diff --git a/pkgs/by-name/ap/apt-swarm/package.nix b/pkgs/by-name/ap/apt-swarm/package.nix index a6e2617b87a4..c15d3ea6a693 100644 --- a/pkgs/by-name/ap/apt-swarm/package.nix +++ b/pkgs/by-name/ap/apt-swarm/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/kpcyrd/apt-swarm"; changelog = "https://github.com/kpcyrd/apt-swarm/releases/tag/v${finalAttrs.version}"; mainProgram = "apt-swarm"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ kpcyrd ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix index ee0a854d6c20..670b90d7d8ff 100644 --- a/pkgs/by-name/ap/apt/package.nix +++ b/pkgs/by-name/ap/apt/package.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://salsa.debian.org/apt-team/apt"; description = "Command-line package management tools used on Debian-based systems"; changelog = "https://salsa.debian.org/apt-team/apt/-/raw/${finalAttrs.version}/debian/changelog"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "apt"; maintainers = with lib.maintainers; [ VZstless ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ar/aranym/package.nix b/pkgs/by-name/ar/aranym/package.nix index 3585c8938eb8..58ffd92cc258 100644 --- a/pkgs/by-name/ar/aranym/package.nix +++ b/pkgs/by-name/ar/aranym/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { and direct access to various host resources including sound, disk drives, optical storage devices (CD/DVD-ROMs), parallel port and more. ''; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "aranym"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ar/arduino-core-unwrapped/downloads.nix b/pkgs/by-name/ar/arduino-core-unwrapped/downloads.nix index b450b1137833..67722d2b081a 100644 --- a/pkgs/by-name/ar/arduino-core-unwrapped/downloads.nix +++ b/pkgs/by-name/ar/arduino-core-unwrapped/downloads.nix @@ -156,29 +156,6 @@ }; } -// optionalAttrs (system == "x86_64-darwin") { - "build/arduino-builder-macosx-1.6.1-signed.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-macosx-1.6.1-signed.tar.bz2"; - sha256 = "sha256-icMXwovzT2UQAKry9sWyRvcNxPXaFdltAPyW/DDVEFA="; - }; - "build/macosx/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-apple-darwin14-signed.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-apple-darwin14-signed.tar.bz2"; - sha256 = "0lcnp525glnc2chcynnz2nllm4q6ar4n9nrjqd1jbj4m706zbv67"; - }; - "build/macosx/avrdude-6.3.0-arduino17-x86_64-apple-darwin12-signed.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino17-x86_64-apple-darwin12-signed.tar.bz2"; - sha256 = "1m24dci8mjf70yrf033mp1834pbp870m8sns2jxs3iy2i4qviiki"; - }; - "build/linux/arduinoOTA-1.3.0-darwin_amd64-signed.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduinoOTA-1.3.0-darwin_amd64-signed.tar.bz2"; - sha256 = "12pwfnikq3z3ji5wgjhzx1mfyaha5cym7mr63r8kfl5a85fhk8nz"; - }; - "build/macosx/appbundler/appbundler-1.0ea-arduino5.jar.zip" = fetchurl { - url = "https://downloads.arduino.cc/appbundler-1.0ea-arduino5.jar.zip"; - sha256 = "1ims951z7ajprqms7yd8ll83c79n7krhd9ljw30yn61f6jk46x82"; - }; -} - // optionalAttrs (system == "aarch64-linux") { "build/arduino-builder-linuxaarch64-1.6.1.tar.bz2" = fetchurl { url = "https://downloads.arduino.cc/tools/arduino-builder-linuxaarch64-1.6.1.tar.bz2"; diff --git a/pkgs/by-name/ar/aritim-dark/package.nix b/pkgs/by-name/ar/aritim-dark/package.nix index 6ff829f7261c..eef426f95c26 100644 --- a/pkgs/by-name/ar/aritim-dark/package.nix +++ b/pkgs/by-name/ar/aritim-dark/package.nix @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Dark theme deeply inspired by the Ayu Dark color palette"; homepage = "https://github.com/Mrcuve0/Aritim-Dark"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.pasqui23 ]; }; diff --git a/pkgs/by-name/ar/arouteserver/package.nix b/pkgs/by-name/ar/arouteserver/package.nix index 465367e1db1b..3a5999b6ead6 100644 --- a/pkgs/by-name/ar/arouteserver/package.nix +++ b/pkgs/by-name/ar/arouteserver/package.nix @@ -60,7 +60,7 @@ python3Packages.buildPythonPackage rec { mainProgram = "arouteserver"; homepage = "https://github.com/pierky/arouteserver"; changelog = "https://github.com/pierky/arouteserver/blob/v${version}/CHANGES.rst"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ marcel johannwagner diff --git a/pkgs/by-name/ar/arpoison/package.nix b/pkgs/by-name/ar/arpoison/package.nix index c75964942e7b..7f3228a9888b 100644 --- a/pkgs/by-name/ar/arpoison/package.nix +++ b/pkgs/by-name/ar/arpoison/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "UNIX arp cache update utility"; homepage = "http://www.arpoison.net/"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.michalrus ]; platforms = lib.platforms.unix; mainProgram = "arpoison"; diff --git a/pkgs/by-name/ar/arsenal/package.nix b/pkgs/by-name/ar/arsenal/package.nix index cbf26e54ed2b..ac65eb8721b2 100644 --- a/pkgs/by-name/ar/arsenal/package.nix +++ b/pkgs/by-name/ar/arsenal/package.nix @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { meta = { description = "Tool to generate commands for security and network tools"; homepage = "https://github.com/Orange-Cyberdefense/arsenal"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "arsenal"; }; diff --git a/pkgs/by-name/as/as-tree/package.nix b/pkgs/by-name/as/as-tree/package.nix index 150cd1d3c079..e8f8cde8739e 100644 --- a/pkgs/by-name/as/as-tree/package.nix +++ b/pkgs/by-name/as/as-tree/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage { meta = { description = "Print a list of paths as a tree of paths"; homepage = "https://github.com/jez/as-tree"; - license = with lib.licenses; [ blueOak100 ]; + license = lib.licenses.blueOak100; maintainers = with lib.maintainers; [ jshholland ]; mainProgram = "as-tree"; }; diff --git a/pkgs/by-name/as/asciinema-scenario/package.nix b/pkgs/by-name/as/asciinema-scenario/package.nix index 4b4e869f0119..475a5c480686 100644 --- a/pkgs/by-name/as/asciinema-scenario/package.nix +++ b/pkgs/by-name/as/asciinema-scenario/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Create asciinema videos from a text file"; homepage = "https://github.com/garbas/asciinema-scenario/"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "asciinema-scenario"; }; }) diff --git a/pkgs/by-name/as/asciinema/package.nix b/pkgs/by-name/as/asciinema/package.nix index 9b690bf3b8c6..4f4fab462d49 100644 --- a/pkgs/by-name/as/asciinema/package.nix +++ b/pkgs/by-name/as/asciinema/package.nix @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage (finalAttrs: { computer users working with the command-line, such as developers or system administrators. ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "asciinema"; maintainers = with lib.maintainers; [ jiriks74 diff --git a/pkgs/by-name/as/asn/package.nix b/pkgs/by-name/as/asn/package.nix index e809b7c29697..860a90dab0d5 100644 --- a/pkgs/by-name/as/asn/package.nix +++ b/pkgs/by-name/as/asn/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/nitefood/asn"; changelog = "https://github.com/nitefood/asn/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ devhell ]; mainProgram = "asn"; }; diff --git a/pkgs/by-name/as/assetfinder/package.nix b/pkgs/by-name/as/assetfinder/package.nix index 3dc1ceeca593..66122ca9293f 100644 --- a/pkgs/by-name/as/assetfinder/package.nix +++ b/pkgs/by-name/as/assetfinder/package.nix @@ -31,6 +31,6 @@ buildGoModule (finalAttrs: { fromSource binaryNativeCode ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }) diff --git a/pkgs/by-name/at/atari800/package.nix b/pkgs/by-name/at/atari800/package.nix index e19b8730b8a0..43f567993849 100644 --- a/pkgs/by-name/at/atari800/package.nix +++ b/pkgs/by-name/at/atari800/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { WinCE, Sega Dreamcast, Android and other systems supported by the SDL library. ''; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/at/ataripp/package.nix b/pkgs/by-name/at/ataripp/package.nix index fde9cae8f43a..34e3bd45e998 100644 --- a/pkgs/by-name/at/ataripp/package.nix +++ b/pkgs/by-name/at/ataripp/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { will compile on a variety of systems (Linux, Solaris, Irix). ''; maintainers = [ ]; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/at/atomic-swap/package.nix b/pkgs/by-name/at/atomic-swap/package.nix index 37c1125600bb..81b630af0585 100644 --- a/pkgs/by-name/at/atomic-swap/package.nix +++ b/pkgs/by-name/at/atomic-swap/package.nix @@ -41,7 +41,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/AthanorLabs/atomic-swap"; changelog = "https://github.com/AthanorLabs/atomic-swap/releases/tag/v${finalAttrs.version}"; description = "ETH-XMR atomic swap implementation"; - license = with lib.licenses; [ lgpl3Only ]; + license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ happysalada lord-valen diff --git a/pkgs/by-name/au/auge/package.nix b/pkgs/by-name/au/auge/package.nix new file mode 100644 index 000000000000..fdd1d1f07acc --- /dev/null +++ b/pkgs/by-name/au/auge/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + fetchurl, + versionCheckHook, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "auge"; + version = "1.9.0"; + + __structuredAttrs = true; + strictDeps = true; + + # Building from source requires swift 6.3.0 while nixpkgs only has 5.10.1 + src = fetchurl { + url = "https://github.com/Arthur-Ficial/auge/releases/download/v${finalAttrs.version}/auge-${finalAttrs.version}-arm64-macos.tar.gz"; + hash = "sha256-hL3kq1/hFo4rlq2nz4iaRLqoErLiF032ovqwl5Rwqso="; + }; + + sourceRoot = "."; + + dontBuild = true; + dontConfigure = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp auge $out/bin/ + chmod +x $out/bin/auge + + runHook postInstall + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "On-device Apple Vision framework CLI"; + homepage = "https://github.com/Arthur-Ficial/auge"; + changelog = "https://github.com/Arthur-Ficial/auge/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne ]; + platforms = [ "aarch64-darwin" ]; + mainProgram = "auge"; + sourceProvenance = [ + lib.sourceTypes.binaryNativeCode + ]; + }; +}) diff --git a/pkgs/by-name/au/aurea/package.nix b/pkgs/by-name/au/aurea/package.nix index 903190036cf1..0bad074fe21a 100644 --- a/pkgs/by-name/au/aurea/package.nix +++ b/pkgs/by-name/au/aurea/package.nix @@ -63,7 +63,7 @@ python3Packages.buildPythonApplication (finalAttrs: { homepage = "https://github.com/CleoMenezesJr/Aurea"; mainProgram = "aurea"; platforms = lib.platforms.linux; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/au/autokey/package.nix b/pkgs/by-name/au/autokey/package.nix index f20e3906ea1e..4722e7557404 100644 --- a/pkgs/by-name/au/autokey/package.nix +++ b/pkgs/by-name/au/autokey/package.nix @@ -96,7 +96,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Desktop automation utility for Linux and X11"; homepage = "https://github.com/autokey/autokey"; changelog = "https://github.com/autokey/autokey/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ iamanaws ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/au/autoprefixer/package.nix b/pkgs/by-name/au/autoprefixer/package.nix index 35ea1a5adc2c..76efe7f2cd45 100644 --- a/pkgs/by-name/au/autoprefixer/package.nix +++ b/pkgs/by-name/au/autoprefixer/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "autoprefixer"; - version = "10.5.0"; + version = "10.5.3"; src = fetchFromGitHub { owner = "postcss"; repo = "autoprefixer"; tag = finalAttrs.version; - hash = "sha256-s152v9sIuQLvhfPsZvQa+O9UhoASgm/e8dnz0t4pP3A="; + hash = "sha256-hjckcgWojItp2gseQI18zzxizjw/HxQPiTb/JegSCcs="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 4; - hash = "sha256-Sxt4vtdlMdXxXqt22hfZJskj8mkB5t85IZ5BsbCoDF4="; + hash = "sha256-diOgX9lXKOwCx9V737mmmtrhqDg5beXJH/PjlJHFpto="; }; installPhase = '' diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix index 91460fe1cc90..e017df48942d 100644 --- a/pkgs/by-name/av/avalonia/package.nix +++ b/pkgs/by-name/av/avalonia/package.nix @@ -203,7 +203,7 @@ stdenvNoCC.mkDerivation ( meta = { homepage = "https://avaloniaui.net/"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ corngood ]; description = "Cross-platform UI framework for dotnet"; sourceProvenance = with lib.sourceTypes; [ diff --git a/pkgs/by-name/av/aver/package.nix b/pkgs/by-name/av/aver/package.nix index 2174d4d5f268..ab28492ef5f7 100644 --- a/pkgs/by-name/av/aver/package.nix +++ b/pkgs/by-name/av/aver/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "aver"; - version = "0.26.0"; + version = "0.27.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "jasisz"; repo = "aver"; tag = "v${finalAttrs.version}"; - hash = "sha256-LeI6qy+z8azrrgoskRq/hsk5t0PDydQ/yJNxYIB7I68="; + hash = "sha256-jVXkHdTSTvHVKHe1jIYqISvm2oUolBWNLBxHt3KDpWk="; }; - cargoHash = "sha256-Zqu56tBbKjWZmpRpPuK9JMexcajRcDzBW4AfTRAkPbs="; + cargoHash = "sha256-3ekeWs2o2TVe2SZgMKTGANTucSiR3aXaqOzJIaoAuK4="; cargoBuildFlags = [ "--workspace" diff --git a/pkgs/by-name/az/azure-static-sites-client/package.nix b/pkgs/by-name/az/azure-static-sites-client/package.nix index c007204348f1..51bb767bfabf 100644 --- a/pkgs/by-name/az/azure-static-sites-client/package.nix +++ b/pkgs/by-name/az/azure-static-sites-client/package.nix @@ -16,23 +16,15 @@ let versions = lib.importJSON ./versions.json; flavor = lib.head (lib.filter (x: x.version == versionFlavor) versions); - fetchBinary = - runtimeId: - fetchurl { - url = flavor.files.${runtimeId}.url; - sha256 = flavor.files.${runtimeId}.sha; - }; - sources = { - "x86_64-linux" = fetchBinary "linux-x64"; - }; in stdenv.mkDerivation { pname = "StaticSitesClient-${versionFlavor}"; version = flavor.buildId; - src = - sources.${stdenv.hostPlatform.system} - or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + src = fetchurl { + url = flavor.files.linux-x64.url; + sha256 = flavor.files.linux-x64.sha; + }; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/by-name/ba/badgemagic-app/package.nix b/pkgs/by-name/ba/badgemagic-app/package.nix index 09f219b86173..c914b0cdec1e 100644 --- a/pkgs/by-name/ba/badgemagic-app/package.nix +++ b/pkgs/by-name/ba/badgemagic-app/package.nix @@ -23,7 +23,7 @@ flutter338.buildFlutterApplication { meta = { description = "Badge Magic with LEDs - mobile and desktop app"; homepage = "https://github.com/fossasia/badgemagic-app"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = [ lib.maintainers.matthewcroughan ]; platforms = [ "aarch64-linux" diff --git a/pkgs/by-name/ba/badrobot/package.nix b/pkgs/by-name/ba/badrobot/package.nix index 628c41978e11..6cc9b8a2af68 100644 --- a/pkgs/by-name/ba/badrobot/package.nix +++ b/pkgs/by-name/ba/badrobot/package.nix @@ -46,7 +46,7 @@ buildGoModule (finalAttrs: { likelihood that a compromised Operator would be able to obtain full cluster permissions. ''; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ jk ]; diff --git a/pkgs/by-name/ba/barrage/package.nix b/pkgs/by-name/ba/barrage/package.nix index 93ad9db5a828..ebbe395f37cf 100644 --- a/pkgs/by-name/ba/barrage/package.nix +++ b/pkgs/by-name/ba/barrage/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://lgames.sourceforge.io/Barrage/"; description = "Destructive action game"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "barrage"; maintainers = [ ]; inherit (SDL.meta) platforms; diff --git a/pkgs/by-name/ba/bartender/package.nix b/pkgs/by-name/ba/bartender/package.nix index 67a14d429c5c..3b62a9c9020e 100644 --- a/pkgs/by-name/ba/bartender/package.nix +++ b/pkgs/by-name/ba/bartender/package.nix @@ -62,7 +62,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { changelog = "https://downloads.macbartender.com/B2/updates/${ builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version }/rnotes.html"; - license = [ lib.licenses.unfree ]; + license = lib.licenses.unfree; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; maintainers = with lib.maintainers; [ stepbrobd diff --git a/pkgs/by-name/ba/bashate/package.nix b/pkgs/by-name/ba/bashate/package.nix index e405b8f66799..d0ee31928130 100644 --- a/pkgs/by-name/ba/bashate/package.nix +++ b/pkgs/by-name/ba/bashate/package.nix @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { description = "Style enforcement for bash programs"; mainProgram = "bashate"; homepage = "https://opendev.org/openstack/bashate"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; teams = [ lib.teams.openstack ]; }; diff --git a/pkgs/by-name/be/beancount-language-server/package.nix b/pkgs/by-name/be/beancount-language-server/package.nix index 882f15ea9ebb..2f34771dceb8 100644 --- a/pkgs/by-name/be/beancount-language-server/package.nix +++ b/pkgs/by-name/be/beancount-language-server/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Language Server Protocol (LSP) for beancount files"; mainProgram = "beancount-language-server"; homepage = "https://github.com/polarmutex/beancount-language-server"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ polarmutex ]; }; }) diff --git a/pkgs/by-name/be/bee/package.nix b/pkgs/by-name/be/bee/package.nix index d1e380341837..4a59f8d2bf50 100644 --- a/pkgs/by-name/be/bee/package.nix +++ b/pkgs/by-name/be/bee/package.nix @@ -51,7 +51,7 @@ buildGoModule (finalAttrs: { Bee is a Swarm node implementation, written in Go. ''; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix index 36ed0ff97e27..4c2181fe9523 100644 --- a/pkgs/by-name/be/bespokesynth/package.nix +++ b/pkgs/by-name/be/bespokesynth/package.nix @@ -163,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Software modular synth with controllers support, scripting and VST"; homepage = "https://www.bespokesynth.com/"; - license = [ lib.licenses.gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ astro tobiasBora diff --git a/pkgs/by-name/be/bettercap/package.nix b/pkgs/by-name/be/bettercap/package.nix index 2cbeff80b3a8..394cf90956a9 100644 --- a/pkgs/by-name/be/bettercap/package.nix +++ b/pkgs/by-name/be/bettercap/package.nix @@ -43,7 +43,7 @@ buildGoModule (finalAttrs: { in realtime, sniff for credentials and much more. ''; homepage = "https://www.bettercap.org/"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; mainProgram = "bettercap"; # Broken on darwin for Go toolchain > 1.22, with error: # 'link: golang.org/x/net/internal/socket: invalid reference to syscall.recvmsg' diff --git a/pkgs/by-name/be/betterdisplay/package.nix b/pkgs/by-name/be/betterdisplay/package.nix index de3ea22f032d..38f5ca39b283 100644 --- a/pkgs/by-name/be/betterdisplay/package.nix +++ b/pkgs/by-name/be/betterdisplay/package.nix @@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Unlock your displays on your Mac! Flexible HiDPI scaling, XDR/HDR extra brightness, virtual screens, DDC control, extra dimming, PIP/streaming, EDID override and lots more"; homepage = "https://betterdisplay.pro/"; changelog = "https://github.com/waydabber/BetterDisplay/releases/tag/v${finalAttrs.version}"; - license = [ lib.licenses.unfree ]; + license = lib.licenses.unfree; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; maintainers = with lib.maintainers; [ DimitarNestorov ]; platforms = lib.platforms.darwin; diff --git a/pkgs/by-name/bi/bic/package.nix b/pkgs/by-name/bi/bic/package.nix index 2279faf537e1..130894cd6d09 100644 --- a/pkgs/by-name/bi/bic/package.nix +++ b/pkgs/by-name/bi/bic/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { bic This a project that allows developers to explore and test C-APIs using a read eval print loop, also known as a REPL. ''; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; homepage = "https://github.com/hexagonal-sun/bic"; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ hexagonal-sun ]; diff --git a/pkgs/by-name/bi/bit/package.nix b/pkgs/by-name/bi/bit/package.nix index ad1a371f33e3..09945a711270 100644 --- a/pkgs/by-name/bi/bit/package.nix +++ b/pkgs/by-name/bi/bit/package.nix @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { meta = { description = "Command-line tool for git"; homepage = "https://github.com/chriswalz/bit"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; mainProgram = "bit"; }; diff --git a/pkgs/by-name/bl/blaze/package.nix b/pkgs/by-name/bl/blaze/package.nix index 2901db3175cd..345e5d6912b0 100644 --- a/pkgs/by-name/bl/blaze/package.nix +++ b/pkgs/by-name/bl/blaze/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "High performance C++ math library"; homepage = "https://bitbucket.org/blaze-lib/blaze"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/bl/blendfarm/package.nix b/pkgs/by-name/bl/blendfarm/package.nix index de227c59e8d6..a96e67f8f949 100644 --- a/pkgs/by-name/bl/blendfarm/package.nix +++ b/pkgs/by-name/bl/blendfarm/package.nix @@ -134,7 +134,7 @@ buildDotnetModule rec { meta = { description = "Open-source, cross-platform, stand-alone, Network Renderer for Blender"; homepage = "https://github.com/LogicReinc/LogicReinc.BlendFarm"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ gador ]; mainProgram = "blendfarm-nix"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/bl/blink1-tool/package.nix b/pkgs/by-name/bl/blink1-tool/package.nix index 2894ddac25e3..36ddfee0a476 100644 --- a/pkgs/by-name/bl/blink1-tool/package.nix +++ b/pkgs/by-name/bl/blink1-tool/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Command line client for the blink(1) notification light"; homepage = "https://blink1.thingm.com/"; - license = with lib.licenses; [ cc-by-sa-40 ]; + license = lib.licenses.cc-by-sa-40; maintainers = with lib.maintainers; [ cransom ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "blink1-tool"; diff --git a/pkgs/by-name/bl/blockattack/package.nix b/pkgs/by-name/bl/blockattack/package.nix index aafab547514c..0d8d99da8cc9 100644 --- a/pkgs/by-name/bl/blockattack/package.nix +++ b/pkgs/by-name/bl/blockattack/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Open source clone of Panel de Pon (aka Tetris Attack)"; broken = stdenv.hostPlatform.isDarwin; changelog = "https://github.com/blockattack/blockattack-game/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "blockattack"; maintainers = [ ]; inherit (SDL2.meta) platforms; diff --git a/pkgs/by-name/bl/bluez-alsa/package.nix b/pkgs/by-name/bl/bluez-alsa/package.nix index 3bdce7e545e1..41fe72114c04 100644 --- a/pkgs/by-name/bl/bluez-alsa/package.nix +++ b/pkgs/by-name/bl/bluez-alsa/package.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { BluezALSA if you disable `bluetooth-discover` and `bluez5-discover` modules in PA and configure it to play/capture sound over `bluealsa` PCM. ''; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "bluealsa"; maintainers = with lib.maintainers; [ oxij ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/bl/bluez-tools/package.nix b/pkgs/by-name/bl/bluez-tools/package.nix index 66ddbe928818..e252d03e6278 100644 --- a/pkgs/by-name/bl/bluez-tools/package.nix +++ b/pkgs/by-name/bl/bluez-tools/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/khvzak/bluez-tools"; description = "Set of tools to manage bluetooth devices for linux"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "bt-agent"; maintainers = [ ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/bo/boltbrowser/package.nix b/pkgs/by-name/bo/boltbrowser/package.nix index 85393e32c2ae..7b152f3fb3b0 100644 --- a/pkgs/by-name/bo/boltbrowser/package.nix +++ b/pkgs/by-name/bo/boltbrowser/package.nix @@ -20,7 +20,7 @@ buildGoModule (finalAttrs: { meta = { description = "CLI Browser for BoltDB files"; homepage = "https://github.com/br0xen/boltbrowser"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "boltbrowser"; }; diff --git a/pkgs/by-name/bo/bounty/package.nix b/pkgs/by-name/bo/bounty/package.nix index 3f2a43d4e5ad..d16d4c6dc29d 100644 --- a/pkgs/by-name/bo/bounty/package.nix +++ b/pkgs/by-name/bo/bounty/package.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage { meta = { description = "CLI tool for bountybot.dev"; homepage = "https://github.com/ghbountybot/cli"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ andrewgazelka ]; mainProgram = "bounty"; }; diff --git a/pkgs/by-name/br/brook/package.nix b/pkgs/by-name/br/brook/package.nix index afbf3e191c48..7e8f9e8b7f6f 100644 --- a/pkgs/by-name/br/brook/package.nix +++ b/pkgs/by-name/br/brook/package.nix @@ -20,7 +20,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://github.com/txthinking/brook"; description = "Cross-platform Proxy/VPN software"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ xrelkd ]; mainProgram = "brook"; }; diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix index 2dc1d3488e50..086ceaf8cb2e 100644 --- a/pkgs/by-name/br/broot/package.nix +++ b/pkgs/by-name/br/broot/package.nix @@ -87,7 +87,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://dystroy.org/broot/"; changelog = "https://github.com/Canop/broot/releases/tag/v${finalAttrs.version}"; maintainers = with lib.maintainers; [ dywedir ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "broot"; }; }) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index f847d768e712..63153baf9f0f 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -197,7 +197,6 @@ buildNpmPackage rec { gepbird kashw2 mattpolzin - redyf water-sucks starsep ]; diff --git a/pkgs/by-name/br/brutus/package.nix b/pkgs/by-name/br/brutus/package.nix index cb47e2affa73..bb38e4e4b14b 100644 --- a/pkgs/by-name/br/brutus/package.nix +++ b/pkgs/by-name/br/brutus/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "brutus"; - version = "1.6.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = "brutus"; tag = "v${finalAttrs.version}"; - hash = "sha256-iZ0oUYlrcPxPGuJvHXqHX+R4dXKS7pLgZgNhBuBVWtc="; + hash = "sha256-tHTgKeQ37DsrrucrI8ZfgvdGy8Xrqs1RtOt/GLrmOk0="; }; - vendorHash = "sha256-XpwwFz8PfyTksLD0SomC5BE0tzUL9D/qtBSed4mrsXQ="; + vendorHash = "sha256-scgSyLQvkTzG5bdW56bPO4raE+rLULHxOaFCu+DjyEE="; ldflags = [ "-s" diff --git a/pkgs/by-name/bt/btfdump/package.nix b/pkgs/by-name/bt/btfdump/package.nix index f90f3fa12b1c..f7b97a1c6d83 100644 --- a/pkgs/by-name/bt/btfdump/package.nix +++ b/pkgs/by-name/bt/btfdump/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { description = "BTF introspection tool"; mainProgram = "btf"; homepage = "https://github.com/anakryiko/btfdump"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; } diff --git a/pkgs/by-name/bu/bugdom/package.nix b/pkgs/by-name/bu/bugdom/package.nix index c2f40e2c262e..abb1511068bb 100644 --- a/pkgs/by-name/bu/bugdom/package.nix +++ b/pkgs/by-name/bu/bugdom/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Port of Bugdom, a 1999 Macintosh game by Pangea Software, for modern operating systems"; homepage = "https://github.com/jorio/Bugdom"; - license = with lib.licenses; [ cc-by-sa-40 ]; + license = lib.licenses.cc-by-sa-40; maintainers = with lib.maintainers; [ lux ]; mainProgram = "Bugdom"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/bu/buildpack/package.nix b/pkgs/by-name/bu/buildpack/package.nix index 09dcb0b5cc33..9cc9b7fc1cc1 100644 --- a/pkgs/by-name/bu/buildpack/package.nix +++ b/pkgs/by-name/bu/buildpack/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "pack"; - version = "0.40.3"; + version = "0.40.8"; src = fetchFromGitHub { owner = "buildpacks"; repo = "pack"; tag = "v${finalAttrs.version}"; - hash = "sha256-KKgF05oJDgMQExJtsAc6weor4OxUZl4xNIFY0VoQfs4="; + hash = "sha256-mD32ZQ/PxiWnOvCdDFlNx1NIevhfgPcg9+ToUmfM6jo="; }; - vendorHash = "sha256-sRITmNcCwJw4aXLv/wKYOTZai95YY/DY87F4P2+7b5A="; + vendorHash = "sha256-0cyxhyEt4P+sd0FmN177rsTugWM0x2Ebk1LEHtX9wZE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix index b901985b3808..2ead9ba2e839 100644 --- a/pkgs/by-name/bu/bun/package.nix +++ b/pkgs/by-name/bu/bun/package.nix @@ -58,23 +58,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { -change /usr/lib/libicucore.A.dylib '${lib.getLib darwin.ICU}/lib/libicucore.A.dylib' '${lib.getExe rcodesign}' sign --code-signature-flags linker-signed $out/bin/bun '' - # We currently cannot generate completions for x86_64-darwin because bun requires avx support to run, which is: - # 1. Not currently supported by the version of Rosetta on our aarch64 builders - # 2. Is not correctly detected even on macOS 15+, where it is available through Rosetta - # - # The baseline builds are no longer an option because they too now require avx support. - + - lib.optionalString - ( - stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform - && !(stdenvNoCC.hostPlatform.isDarwin && stdenvNoCC.hostPlatform.isx86_64) - ) - '' - installShellCompletion --cmd bun \ - --bash <(SHELL="bash" $out/bin/bun completions) \ - --zsh <(SHELL="zsh" $out/bin/bun completions) \ - --fish <(SHELL="fish" $out/bin/bun completions) - ''; + + lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' + installShellCompletion --cmd bun \ + --bash <(SHELL="bash" $out/bin/bun completions) \ + --zsh <(SHELL="zsh" $out/bin/bun completions) \ + --fish <(SHELL="fish" $out/bin/bun completions) + ''; passthru = { sources = { @@ -134,8 +123,5 @@ stdenvNoCC.mkDerivation (finalAttrs: { # Broken for Musl at 2024-01-13, tracking issue: # https://github.com/NixOS/nixpkgs/issues/280716 broken = stdenvNoCC.hostPlatform.isMusl; - - # Hangs when run via Rosetta 2 on Apple Silicon - hydraPlatforms = lib.lists.remove "x86_64-darwin" lib.platforms.all; }; }) diff --git a/pkgs/by-name/by/bytecode-viewer/package.nix b/pkgs/by-name/by/bytecode-viewer/package.nix index dfcbb86ecf0b..2fc9eef6c4d4 100644 --- a/pkgs/by-name/by/bytecode-viewer/package.nix +++ b/pkgs/by-name/by/bytecode-viewer/package.nix @@ -79,6 +79,6 @@ maven.buildMavenPackage rec { fromSource binaryBytecode # deps ]; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; }; } diff --git a/pkgs/by-name/ca/cantoolz/package.nix b/pkgs/by-name/ca/cantoolz/package.nix index a037c3ebcd63..03216ec9042e 100644 --- a/pkgs/by-name/ca/cantoolz/package.nix +++ b/pkgs/by-name/ca/cantoolz/package.nix @@ -70,7 +70,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { implemented with a new module. ''; homepage = "https://github.com/CANToolz/CANToolz"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ca/cargo-bolero/package.nix b/pkgs/by-name/ca/cargo-bolero/package.nix index 55e26723c9c4..1c51065e51ad 100644 --- a/pkgs/by-name/ca/cargo-bolero/package.nix +++ b/pkgs/by-name/ca/cargo-bolero/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Fuzzing and property testing front-end framework for Rust"; mainProgram = "cargo-bolero"; homepage = "https://github.com/camshaft/bolero"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ekleog ]; }; }) diff --git a/pkgs/by-name/ca/cargo-bump/package.nix b/pkgs/by-name/ca/cargo-bump/package.nix index 91920e40d5cf..9894060b4f45 100644 --- a/pkgs/by-name/ca/cargo-bump/package.nix +++ b/pkgs/by-name/ca/cargo-bump/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Increments the version number of the current project"; mainProgram = "cargo-bump"; homepage = "https://github.com/wraithan/cargo-bump"; - license = with lib.licenses; [ isc ]; + license = lib.licenses.isc; maintainers = with lib.maintainers; [ cafkafk ]; }; }) diff --git a/pkgs/by-name/ca/cargo-hf2/package.nix b/pkgs/by-name/ca/cargo-hf2/package.nix index 9127e8b0e084..b22742de046a 100644 --- a/pkgs/by-name/ca/cargo-hf2/package.nix +++ b/pkgs/by-name/ca/cargo-hf2/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Cargo Subcommand for Microsoft HID Flashing Library for UF2 Bootloaders"; mainProgram = "cargo-hf2"; homepage = "https://lib.rs/crates/cargo-hf2"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ astrobeastie ]; }; }) diff --git a/pkgs/by-name/ca/cargo-leptos/package.nix b/pkgs/by-name/ca/cargo-leptos/package.nix index c60351525f4c..c76f676ff335 100644 --- a/pkgs/by-name/ca/cargo-leptos/package.nix +++ b/pkgs/by-name/ca/cargo-leptos/package.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "cargo-leptos"; homepage = "https://github.com/leptos-rs/cargo-leptos"; changelog = "https://github.com/leptos-rs/cargo-leptos/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ benwis ]; }; }) diff --git a/pkgs/by-name/ca/cargo-license/package.nix b/pkgs/by-name/ca/cargo-license/package.nix index ff18e5aaa5f2..0fa1ba42cf61 100644 --- a/pkgs/by-name/ca/cargo-license/package.nix +++ b/pkgs/by-name/ca/cargo-license/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Cargo subcommand to see license of dependencies"; mainProgram = "cargo-license"; homepage = "https://github.com/onur/cargo-license"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ basvandijk matthiasbeyer diff --git a/pkgs/by-name/ca/cargo-pgo/package.nix b/pkgs/by-name/ca/cargo-pgo/package.nix index a687cb48b53b..c6804f22d59b 100644 --- a/pkgs/by-name/ca/cargo-pgo/package.nix +++ b/pkgs/by-name/ca/cargo-pgo/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Cargo subcommand for optimizing Rust binaries/libraries with PGO and BOLT"; homepage = "https://github.com/kobzol/cargo-pgo"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ dannixon ]; }; }) diff --git a/pkgs/by-name/ca/cargo-rdme/package.nix b/pkgs/by-name/ca/cargo-rdme/package.nix index f1a23f8fdd44..6cea4afc2800 100644 --- a/pkgs/by-name/ca/cargo-rdme/package.nix +++ b/pkgs/by-name/ca/cargo-rdme/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "cargo-rdme"; homepage = "https://github.com/orium/cargo-rdme"; changelog = "https://github.com/orium/cargo-rdme/blob/v${finalAttrs.version}/release-notes.md"; - license = with lib.licenses; [ mpl20 ]; + license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ GoldsteinE chrjabs diff --git a/pkgs/by-name/ca/cargo-risczero/package.nix b/pkgs/by-name/ca/cargo-risczero/package.nix index 00e182b435ed..275fae3c4e6b 100644 --- a/pkgs/by-name/ca/cargo-risczero/package.nix +++ b/pkgs/by-name/ca/cargo-risczero/package.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Cargo extension to help create, manage, and test RISC Zero projects"; mainProgram = "cargo-risczero"; homepage = "https://risczero.com"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/ca/cargo-rr/package.nix b/pkgs/by-name/ca/cargo-rr/package.nix index f7bd9d935d2b..df879f130c1e 100644 --- a/pkgs/by-name/ca/cargo-rr/package.nix +++ b/pkgs/by-name/ca/cargo-rr/package.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Cargo subcommand \"rr\": a light wrapper around rr, the time-travelling debugger"; mainProgram = "cargo-rr"; homepage = "https://github.com/dzfranklin/cargo-rr"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ otavio matthiasbeyer diff --git a/pkgs/by-name/ca/cargo-sbom/package.nix b/pkgs/by-name/ca/cargo-sbom/package.nix index de854436a5fb..3e6a9514067e 100644 --- a/pkgs/by-name/ca/cargo-sbom/package.nix +++ b/pkgs/by-name/ca/cargo-sbom/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Create software bill of materials (SBOM) for Rust"; homepage = "https://github.com/psastras/sbom-rs"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ matthiasbeyer ]; diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index 09de9e544fe2..ff89dd62390d 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "cargo-shear"; homepage = "https://github.com/Boshen/cargo-shear"; changelog = "https://github.com/Boshen/cargo-shear/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.cathalmullan ]; }; }) diff --git a/pkgs/by-name/ca/cargo-sonar/package.nix b/pkgs/by-name/ca/cargo-sonar/package.nix index 1732402c8734..bd53a609c21d 100644 --- a/pkgs/by-name/ca/cargo-sonar/package.nix +++ b/pkgs/by-name/ca/cargo-sonar/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Utility to produce some Sonar-compatible format from different Rust tools like cargo-clippy cargo-audit or cargo-outdated"; mainProgram = "cargo-sonar"; homepage = "https://gitlab.com/woshilapin/cargo-sonar"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.jonboh ]; }; }) diff --git a/pkgs/by-name/ca/cargo-typify/package.nix b/pkgs/by-name/ca/cargo-typify/package.nix index b292a4632890..74b0a06aadeb 100644 --- a/pkgs/by-name/ca/cargo-typify/package.nix +++ b/pkgs/by-name/ca/cargo-typify/package.nix @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "JSON Schema to Rust type converter"; homepage = "https://github.com/oxidecomputer/typify"; changelog = "https://github.com/oxidecomputer/typify/blob/${finalAttrs.src.tag}/CHANGELOG.adoc"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ iamanaws ]; mainProgram = "cargo-typify"; }; diff --git a/pkgs/by-name/ca/cargo-wipe/package.nix b/pkgs/by-name/ca/cargo-wipe/package.nix index 37c4c4ad8273..f93ade472283 100644 --- a/pkgs/by-name/ca/cargo-wipe/package.nix +++ b/pkgs/by-name/ca/cargo-wipe/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = ''Cargo subcommand "wipe": recursively finds and optionally wipes all "target" or "node_modules" folders''; mainProgram = "cargo-wipe"; homepage = "https://github.com/mihai-dinculescu/cargo-wipe"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ otavio ]; }; }) diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix index a29905cec257..4786535a02d2 100644 --- a/pkgs/by-name/ca/cargo-xwin/package.nix +++ b/pkgs/by-name/ca/cargo-xwin/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Cross compile Cargo project to Windows MSVC target with ease"; mainProgram = "cargo-xwin"; homepage = "https://github.com/rust-cross/cargo-xwin"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ shivaraj-bh ]; }; }) diff --git a/pkgs/by-name/ca/cassandra-cpp-driver/package.nix b/pkgs/by-name/ca/cassandra-cpp-driver/package.nix index 0e7b52c9a7de..09b794d61339 100644 --- a/pkgs/by-name/ca/cassandra-cpp-driver/package.nix +++ b/pkgs/by-name/ca/cassandra-cpp-driver/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { library for Apache Cassandra 2.1+ using exclusively Cassandra’s binary protocol and Cassandra Query Language v3. ''; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; platforms = lib.platforms.x86_64; homepage = "https://docs.datastax.com/en/developer/cpp-driver/"; maintainers = [ lib.maintainers.npatsakula ]; diff --git a/pkgs/by-name/ca/cat9/package.nix b/pkgs/by-name/ca/cat9/package.nix index a06a11131ab4..58c97ca231fd 100644 --- a/pkgs/by-name/ca/cat9/package.nix +++ b/pkgs/by-name/ca/cat9/package.nix @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/letoram/cat9"; description = "User shell for LASH"; - license = with lib.licenses; [ unlicense ]; + license = lib.licenses.unlicense; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/ca/catdocx/package.nix b/pkgs/by-name/ca/catdocx/package.nix index 69be98201e9d..5c2de4fb9c35 100644 --- a/pkgs/by-name/ca/catdocx/package.nix +++ b/pkgs/by-name/ca/catdocx/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { description = "Extracts plain text from docx files"; mainProgram = "catdocx"; homepage = "https://github.com/jncraton/catdocx"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ lib.maintainers.michalrus ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/ca/catdvi/package.nix b/pkgs/by-name/ca/catdvi/package.nix index 7433873ed170..298fff300310 100644 --- a/pkgs/by-name/ca/catdvi/package.nix +++ b/pkgs/by-name/ca/catdvi/package.nix @@ -19,6 +19,10 @@ in stdenv.mkDerivation (finalAttrs: { pname = "catdvi"; version = "0.14"; + + __structuredAttrs = true; + strictDeps = true; + src = fetchurl { url = with finalAttrs; "http://downloads.sourceforge.net/catdvi/catdvi-${version}.tar.bz2"; hash = "sha256-orVQVdQuRXp//OGkA7xRidNi4+J+tkw398LPZ+HX+k8="; @@ -51,13 +55,9 @@ stdenv.mkDerivation (finalAttrs: { '') buildPlatformTools ); - nativeBuildInputs = [ - texlive.bin.core - texlive.bin.core.dev - ]; - buildInputs = [ tex + texlive.bin.core ]; makeFlags = [ diff --git a/pkgs/by-name/cb/cbconvert/package.nix b/pkgs/by-name/cb/cbconvert/package.nix index 90ce62162bf3..6cdc7255a448 100644 --- a/pkgs/by-name/cb/cbconvert/package.nix +++ b/pkgs/by-name/cb/cbconvert/package.nix @@ -54,7 +54,7 @@ buildGoModule (finalAttrs: { description = "Comic Book converter"; homepage = "https://github.com/gen2brain/cbconvert"; changelog = "https://github.com/gen2brain/cbconvert/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ jwillikers ]; mainProgram = "cbconvert"; diff --git a/pkgs/by-name/cb/cbonsai/package.nix b/pkgs/by-name/cb/cbonsai/package.nix index ef13aaee2050..104b3045a3a1 100644 --- a/pkgs/by-name/cb/cbonsai/package.nix +++ b/pkgs/by-name/cb/cbonsai/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Grow bonsai trees in your terminal"; mainProgram = "cbonsai"; homepage = "https://gitlab.com/jallbrit/cbonsai"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/cd/cdk-go/package.nix b/pkgs/by-name/cd/cdk-go/package.nix index 3774c2a61ecf..87ba783893a7 100644 --- a/pkgs/by-name/cd/cdk-go/package.nix +++ b/pkgs/by-name/cd/cdk-go/package.nix @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { description = "Container penetration toolkit"; homepage = "https://github.com/cdk-team/CDK"; changelog = "https://github.com/cdk-team/CDK/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "cdk"; broken = stdenv.hostPlatform.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 diff --git a/pkgs/by-name/ce/celestegame/celeste.nix b/pkgs/by-name/ce/celestegame/celeste.nix index 2c7900602d20..3b34646f3f64 100644 --- a/pkgs/by-name/ce/celestegame/celeste.nix +++ b/pkgs/by-name/ce/celestegame/celeste.nix @@ -162,7 +162,7 @@ stdenvNoCC.mkDerivation { meta = { inherit downloadPage description; homepage = "https://www.celestegame.com"; - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ ulysseszhan ]; platforms = [ diff --git a/pkgs/by-name/cf/cfripper/package.nix b/pkgs/by-name/cf/cfripper/package.nix index 93e0ce49fcf0..ea58101d841f 100644 --- a/pkgs/by-name/cf/cfripper/package.nix +++ b/pkgs/by-name/cf/cfripper/package.nix @@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { description = "Tool for analysing CloudFormation templates"; homepage = "https://github.com/Skyscanner/cfripper"; changelog = "https://github.com/Skyscanner/cfripper/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; mainProgram = "cfripper"; }; diff --git a/pkgs/by-name/cf/cfspeedtest/package.nix b/pkgs/by-name/cf/cfspeedtest/package.nix index 17a7e90df2e3..d79ccec67afd 100644 --- a/pkgs/by-name/cf/cfspeedtest/package.nix +++ b/pkgs/by-name/cf/cfspeedtest/package.nix @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Unofficial CLI for speed.cloudflare.com"; homepage = "https://github.com/code-inflation/cfspeedtest"; changelog = "https://github.com/code-inflation/cfspeedtest/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ colemickens stepbrobd diff --git a/pkgs/by-name/cg/cgns/package.nix b/pkgs/by-name/cg/cgns/package.nix index 817d5f39431f..2de3a487d504 100644 --- a/pkgs/by-name/cg/cgns/package.nix +++ b/pkgs/by-name/cg/cgns/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://cgns.github.io"; downloadPage = "https://github.com/cgns/cgns"; changelog = "https://github.com/cgns/cgns/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ zlib ]; + license = lib.licenses.zlib; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ qbisi ]; }; diff --git a/pkgs/by-name/ch/chemacs2/package.nix b/pkgs/by-name/ch/chemacs2/package.nix index 9bce24384d04..662e33d4e960 100644 --- a/pkgs/by-name/ch/chemacs2/package.nix +++ b/pkgs/by-name/ch/chemacs2/package.nix @@ -44,7 +44,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { Think of it as a bootloader for Emacs. ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix index 62eaa2812c3f..26a8791fd2e2 100644 --- a/pkgs/by-name/ch/cherry-studio/package.nix +++ b/pkgs/by-name/ch/cherry-studio/package.nix @@ -159,6 +159,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "cherry-studio"; platforms = with lib.platforms; linux ++ darwin; maintainers = with lib.maintainers; [ xiaoxiangmoe ]; - license = with lib.licenses; [ agpl3Only ]; + license = lib.licenses.agpl3Only; }; }) diff --git a/pkgs/by-name/ch/cholmod-extra/package.nix b/pkgs/by-name/ch/cholmod-extra/package.nix index 5426acb9b724..ce1c7c1534bc 100644 --- a/pkgs/by-name/ch/cholmod-extra/package.nix +++ b/pkgs/by-name/ch/cholmod-extra/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/jluttine/cholmod-extra"; description = "Set of additional routines for SuiteSparse CHOLMOD Module"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ jluttine ]; platforms = with lib.platforms; unix; }; diff --git a/pkgs/by-name/ch/chopchop/package.nix b/pkgs/by-name/ch/chopchop/package.nix index 4767b31ac7d1..70f9fc7902e2 100644 --- a/pkgs/by-name/ch/chopchop/package.nix +++ b/pkgs/by-name/ch/chopchop/package.nix @@ -20,7 +20,7 @@ buildGoModule (finalAttrs: { meta = { description = "CLI to search for sensitive services/files/folders"; homepage = "https://github.com/michelin/ChopChop"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ch/chow-kick/package.nix b/pkgs/by-name/ch/chow-kick/package.nix index 729e7f93c03e..b85a99bba6e4 100644 --- a/pkgs/by-name/ch/chow-kick/package.nix +++ b/pkgs/by-name/ch/chow-kick/package.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/Chowdhury-DSP/ChowKick"; description = "Kick synthesizer based on old-school drum machine circuits"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; mainProgram = "ChowKick"; diff --git a/pkgs/by-name/ch/chow-phaser/package.nix b/pkgs/by-name/ch/chow-phaser/package.nix index 79375f699547..a2859996588c 100644 --- a/pkgs/by-name/ch/chow-phaser/package.nix +++ b/pkgs/by-name/ch/chow-phaser/package.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/jatinchowdhury18/ChowPhaser"; description = "Phaser effect based loosely on the Schulte Compact Phasing 'A'"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; mainProgram = "ChowPhaserStereo"; maintainers = with lib.maintainers; [ magnetophon ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ch/chow-tape-model/package.nix b/pkgs/by-name/ch/chow-tape-model/package.nix index 630bd0732071..56b4b1ce1ee8 100644 --- a/pkgs/by-name/ch/chow-tape-model/package.nix +++ b/pkgs/by-name/ch/chow-tape-model/package.nix @@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/jatinchowdhury18/AnalogTapeModel"; description = "Physical modelling signal processing for analog tape recording. LV2, VST3, CLAP, and standalone"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ magnetophon ]; platforms = lib.platforms.linux; # error: 'vvtanh' was not declared in this scope; did you mean 'tanh'? diff --git a/pkgs/by-name/ch/chrome-export/package.nix b/pkgs/by-name/ch/chrome-export/package.nix index 0228861b2edf..ba40c910fb6d 100644 --- a/pkgs/by-name/ch/chrome-export/package.nix +++ b/pkgs/by-name/ch/chrome-export/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Scripts to save Google Chrome's bookmarks and history as HTML bookmarks files"; homepage = "https://github.com/bdesham/chrome-export"; - license = [ lib.licenses.isc ]; + license = lib.licenses.isc; maintainers = [ lib.maintainers.bdesham ]; platforms = python3.meta.platforms; }; diff --git a/pkgs/by-name/ci/cicero-tui/package.nix b/pkgs/by-name/ci/cicero-tui/package.nix index 793e4438d2d6..88ea58c6dd68 100644 --- a/pkgs/by-name/ci/cicero-tui/package.nix +++ b/pkgs/by-name/ci/cicero-tui/package.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Unicode tool with a terminal user interface"; homepage = "https://github.com/eyeplum/cicero-tui"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; mainProgram = "cicero"; }; diff --git a/pkgs/by-name/ci/cilium-cli/package.nix b/pkgs/by-name/ci/cilium-cli/package.nix index b67cbfcd9337..727f3a838167 100644 --- a/pkgs/by-name/ci/cilium-cli/package.nix +++ b/pkgs/by-name/ci/cilium-cli/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "cilium-cli"; - version = "0.19.5"; + version = "0.19.6"; src = fetchFromGitHub { owner = "cilium"; repo = "cilium-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-2MxIqKuuzSEzmhdmWqYxinHKzlP7io7Tw6Ini2Sl3wQ="; + hash = "sha256-2Yj0CvhF848oeLTnonk+ItBkNqN+RZekCQjcfr6ZYUM="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ci/cinnamon/package.nix b/pkgs/by-name/ci/cinnamon/package.nix index cb28d2074460..b8dbff2dacee 100644 --- a/pkgs/by-name/ci/cinnamon/package.nix +++ b/pkgs/by-name/ci/cinnamon/package.nix @@ -224,7 +224,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/linuxmint/cinnamon"; description = "Cinnamon desktop environment"; - license = [ lib.licenses.gpl2 ]; + license = lib.licenses.gpl2; platforms = lib.platforms.linux; teams = [ lib.teams.cinnamon ]; }; diff --git a/pkgs/by-name/ci/cirrusgo/package.nix b/pkgs/by-name/ci/cirrusgo/package.nix index d02de5a3adbe..49674d8004e5 100644 --- a/pkgs/by-name/ci/cirrusgo/package.nix +++ b/pkgs/by-name/ci/cirrusgo/package.nix @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { description = "Tool to scan SAAS and PAAS applications"; mainProgram = "cirrusgo"; homepage = "https://github.com/Ph33rr/cirrusgo"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ci/citrix-workspace/package.nix b/pkgs/by-name/ci/citrix-workspace/package.nix index 583e8368fd9a..21f67549a1d9 100644 --- a/pkgs/by-name/ci/citrix-workspace/package.nix +++ b/pkgs/by-name/ci/citrix-workspace/package.nix @@ -18,12 +18,8 @@ gdk-pixbuf, glib, glib-networking, - gnome2, gst_all_1, - gtk2, - gtk2-x11, gtk3, - gtk_engines, harfbuzzFull, heimdal, hyphen, @@ -41,7 +37,6 @@ libjson, libmanette, libnotify, - libpng12, libpulseaudio, libredirect, libseccomp, @@ -77,7 +72,6 @@ xprop, xdpyinfo, libxcb, - x264, zlib, extraCerts ? [ ], @@ -168,11 +162,7 @@ stdenv.mkDerivation rec { fuse3' gdk-pixbuf glib-networking - gnome2.gtkglext - gtk2 - gtk2-x11 gtk3 - gtk_engines harfbuzzFull heimdal hyphen @@ -188,7 +178,6 @@ stdenv.mkDerivation rec { libjson libmanette libnotify - libpng12 libpulseaudio libseccomp libsecret @@ -212,7 +201,6 @@ stdenv.mkDerivation rec { libxaw libxmu libxtst - x264 zlib ] ++ gstPackages; @@ -344,6 +332,9 @@ stdenv.mkDerivation rec { # the tarball still contains the legacy WebKitGTK 4.0 bundle. rm -rf "$ICAInstDir/Webkit2gtk4.0" + # FHS launcher hinst generates even for non-root installs; it hardcodes + # store paths without any of the wrapper environment. + rm -f "$ICAInstDir/wfica.sh" if [ -f "$ICAInstDir/util/setlog" ]; then chmod +x "$ICAInstDir/util/setlog" ln -sf "$ICAInstDir/util/setlog" "$out/bin/citrix-setlog" @@ -413,7 +404,12 @@ stdenv.mkDerivation rec { done echo "Copy .desktop files." - cp $out/opt/citrix-icaclient/desktop/* $out/share/applications/ + cp $out/opt/citrix-icaclient/desktop/*.desktop $out/share/applications/ + + install -Dm444 "$ICAInstDir/desktop/Citrix-mime_types.xml" \ + $out/share/mime/packages/Citrix-mime_types.xml + install -Dm444 "$ICAInstDir/icons/000_Receiver_64.png" \ + $out/share/icons/hicolor/64x64/apps/Citrix-Receiver.png runHook postInstall ''; diff --git a/pkgs/by-name/ci/civetweb/package.nix b/pkgs/by-name/ci/civetweb/package.nix index 6736b11090e8..13c996fddcbf 100644 --- a/pkgs/by-name/ci/civetweb/package.nix +++ b/pkgs/by-name/ci/civetweb/package.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Embedded C/C++ web server"; mainProgram = "civetweb"; homepage = "https://github.com/civetweb/civetweb"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; }; }) diff --git a/pkgs/by-name/cl/clap/package.nix b/pkgs/by-name/cl/clap/package.nix index 1f99982f11ba..5007bb7e0e1f 100644 --- a/pkgs/by-name/cl/clap/package.nix +++ b/pkgs/by-name/cl/clap/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "clap"; - version = "1.2.9"; + version = "1.2.10"; src = fetchFromGitHub { owner = "free-audio"; repo = "clap"; rev = finalAttrs.version; - hash = "sha256-iQRy4+FNT2oun2pkl89A/bPZyv2R0YyF35IhkIwA1B0="; + hash = "sha256-87vmpcfi2+bWZ0GFU91Qd52WddeuHTIDAdz9fc4ciJc="; }; postPatch = '' diff --git a/pkgs/by-name/cl/clapgrep/package.nix b/pkgs/by-name/cl/clapgrep/package.nix index f64e4e7df6e0..31325d53b528 100644 --- a/pkgs/by-name/cl/clapgrep/package.nix +++ b/pkgs/by-name/cl/clapgrep/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Search through all your files"; homepage = "https://github.com/luleyleo/clapgrep"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "clapgrep"; diff --git a/pkgs/by-name/cl/claude-mergetool/package.nix b/pkgs/by-name/cl/claude-mergetool/package.nix index f323cdc2ed54..29cf3dfd9a55 100644 --- a/pkgs/by-name/cl/claude-mergetool/package.nix +++ b/pkgs/by-name/cl/claude-mergetool/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/9999years/claude-mergetool"; changelog = "https://github.com/9999years/claude-mergetool/releases/tag/v${version}"; description = "Resolve Git/jj merge conflicts automatically with claude-code"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers._9999years ]; mainProgram = "claude-mergetool"; }; diff --git a/pkgs/by-name/cl/click/package.nix b/pkgs/by-name/cl/click/package.nix index 15f231edc31f..1afd7f01f9a9 100644 --- a/pkgs/by-name/cl/click/package.nix +++ b/pkgs/by-name/cl/click/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Command Line Interactive Controller for Kubernetes"; homepage = "https://github.com/databricks/click"; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; maintainers = [ lib.maintainers.mbode ]; mainProgram = "click"; }; diff --git a/pkgs/by-name/cl/cloudbrute/package.nix b/pkgs/by-name/cl/cloudbrute/package.nix index f56d867aa8d5..381e9540ae66 100644 --- a/pkgs/by-name/cl/cloudbrute/package.nix +++ b/pkgs/by-name/cl/cloudbrute/package.nix @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { Alibaba, Vultr, Linode). ''; homepage = "https://github.com/0xsha/CloudBrute"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/cl/cloudmonkey/package.nix b/pkgs/by-name/cl/cloudmonkey/package.nix index 34f60d86ea4b..b93780123a74 100644 --- a/pkgs/by-name/cl/cloudmonkey/package.nix +++ b/pkgs/by-name/cl/cloudmonkey/package.nix @@ -20,7 +20,7 @@ buildGoModule (finalAttrs: { meta = { description = "CLI for Apache CloudStack"; homepage = "https://github.com/apache/cloudstack-cloudmonkey"; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; maintainers = [ lib.maintainers.womfoo ]; mainProgram = "cloudstack-cloudmonkey"; }; diff --git a/pkgs/by-name/cm/cmc/package.nix b/pkgs/by-name/cm/cmc/package.nix index 07e0370365d0..dde599bdddd6 100644 --- a/pkgs/by-name/cm/cmc/package.nix +++ b/pkgs/by-name/cm/cmc/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/TimidRobot/cmc"; description = "Manages SSH ControlMaster sessions"; mainProgram = "cmc"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ chordtoll ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/cn/cnstrokeorder/package.nix b/pkgs/by-name/cn/cnstrokeorder/package.nix index 44d4d21b886f..02b0f35635cb 100644 --- a/pkgs/by-name/cn/cnstrokeorder/package.nix +++ b/pkgs/by-name/cn/cnstrokeorder/package.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec { meta = { description = "Chinese font that shows stroke order for HSK 1-4"; homepage = "http://rtega.be/chmn/index.php?subpage=68"; - license = [ lib.licenses.arphicpl ]; + license = lib.licenses.arphicpl; maintainers = with lib.maintainers; [ johnazoidberg ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/co/cockpit-files/package.nix b/pkgs/by-name/co/cockpit-files/package.nix index 60ad181b1230..e2d15ae8d224 100644 --- a/pkgs/by-name/co/cockpit-files/package.nix +++ b/pkgs/by-name/co/cockpit-files/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/cockpit-project/cockpit-files"; changelog = "https://github.com/cockpit-project/cockpit-files/releases/tag/${finalAttrs.version}"; platforms = lib.platforms.linux; - license = [ lib.licenses.lgpl21 ]; + license = lib.licenses.lgpl21; teams = [ lib.teams.cockpit ]; }; }) diff --git a/pkgs/by-name/co/cockpit-machines/package.nix b/pkgs/by-name/co/cockpit-machines/package.nix index b58acdbcee30..96f4fb87e736 100644 --- a/pkgs/by-name/co/cockpit-machines/package.nix +++ b/pkgs/by-name/co/cockpit-machines/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/cockpit-project/cockpit-machines"; changelog = "https://github.com/cockpit-project/cockpit-machines/releases/tag/${finalAttrs.version}"; platforms = lib.platforms.linux; - license = [ lib.licenses.lgpl21 ]; + license = lib.licenses.lgpl21; teams = [ lib.teams.cockpit ]; }; }) diff --git a/pkgs/by-name/co/cockpit-podman/package.nix b/pkgs/by-name/co/cockpit-podman/package.nix index 7a5278395eed..f2419ca2f855 100644 --- a/pkgs/by-name/co/cockpit-podman/package.nix +++ b/pkgs/by-name/co/cockpit-podman/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/cockpit-project/cockpit-podman"; changelog = "https://github.com/cockpit-project/cockpit-podman/releases/tag/${finalAttrs.version}"; platforms = lib.platforms.linux; - license = [ lib.licenses.lgpl21 ]; + license = lib.licenses.lgpl21; teams = [ lib.teams.cockpit ]; }; }) diff --git a/pkgs/by-name/co/coconutbattery/package.nix b/pkgs/by-name/co/coconutbattery/package.nix index a0240542cb9d..40733c9f1667 100644 --- a/pkgs/by-name/co/coconutbattery/package.nix +++ b/pkgs/by-name/co/coconutbattery/package.nix @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { It shows you live information about the battery quality in your Mac, iPhone and iPad. ''; homepage = "https://www.coconut-flavour.com/coconutbattery"; - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ stepbrobd ]; platforms = [ diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix index 9ab51d274a81..7abab8e37b30 100644 --- a/pkgs/by-name/co/codeberg-cli/package.nix +++ b/pkgs/by-name/co/codeberg-cli/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "CLI Tool for Codeberg similar to gh and glab"; homepage = "https://codeberg.org/Aviac/codeberg-cli"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ robwalt ]; mainProgram = "berg"; }; diff --git a/pkgs/by-name/co/codesearch/package.nix b/pkgs/by-name/co/codesearch/package.nix index bc55d87aaaa8..ef378b6f9396 100644 --- a/pkgs/by-name/co/codesearch/package.nix +++ b/pkgs/by-name/co/codesearch/package.nix @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { meta = { description = "Fast, indexed regexp search over large file trees"; homepage = "https://github.com/google/codesearch"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ bennofs ]; }; }) diff --git a/pkgs/by-name/co/colorgrind/package.nix b/pkgs/by-name/co/colorgrind/package.nix index 70b9ce0d16e4..649a57ea10d9 100644 --- a/pkgs/by-name/co/colorgrind/package.nix +++ b/pkgs/by-name/co/colorgrind/package.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Perl wrapper for Valgrind with ANSI escape code colored output"; homepage = "http://renatocf.github.io/colorgrind/"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "colorgrind"; }; diff --git a/pkgs/by-name/co/colorized-logs/package.nix b/pkgs/by-name/co/colorized-logs/package.nix index f08531461b96..48987505dff2 100644 --- a/pkgs/by-name/co/colorized-logs/package.nix +++ b/pkgs/by-name/co/colorized-logs/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Tools for logs with ANSI color"; homepage = "https://github.com/kilobyte/colorized-logs"; changelog = "https://github.com/kilobyte/colorized-logs/blob/v${finalAttrs.version}/ChangeLog"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ CobaltCause ]; }; diff --git a/pkgs/by-name/co/colstr/package.nix b/pkgs/by-name/co/colstr/package.nix index 1d5b693b9f2b..716c8126acd9 100644 --- a/pkgs/by-name/co/colstr/package.nix +++ b/pkgs/by-name/co/colstr/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Deterministically output each input argument in a color assigned to it"; homepage = "https://git.sleeping.town/wonder/colstr"; - license = with lib.licenses; [ cc0 ]; + license = lib.licenses.cc0; maintainers = with lib.maintainers; [ annaaurora ]; mainProgram = "colstr"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/co/commix/package.nix b/pkgs/by-name/co/commix/package.nix index 3c46fb420986..b218a18532d5 100644 --- a/pkgs/by-name/co/commix/package.nix +++ b/pkgs/by-name/co/commix/package.nix @@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { mainProgram = "commix"; homepage = "https://github.com/commixproject/commix"; changelog = "https://github.com/commixproject/commix/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/co/communique/package.nix b/pkgs/by-name/co/communique/package.nix new file mode 100644 index 000000000000..bf46339cb802 --- /dev/null +++ b/pkgs/by-name/co/communique/package.nix @@ -0,0 +1,47 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + cacert, + gitMinimal, + ripgrep, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "communique"; + version = "1.2.1"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "jdx"; + repo = "communique"; + tag = "v${finalAttrs.version}"; + hash = "sha256-lQN6LViO3Ta6eCbU6j76OFN95R6A0hP3Pfc38KrHDng="; + }; + + cargoHash = "sha256-RJzjpDhxpi7Zmzw9kl48yq6//zTYOeJ+SrgAfqq/tl4="; + + nativeCheckInputs = [ + cacert + gitMinimal + ripgrep + ]; + + __darwinAllowLocalNetworking = true; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Editorialized release notes powered by AI"; + homepage = "https://github.com/jdx/communique"; + changelog = "https://github.com/jdx/communique/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne ]; + mainProgram = "communique"; + }; +}) diff --git a/pkgs/by-name/co/composer-require-checker/package.nix b/pkgs/by-name/co/composer-require-checker/package.nix index 4a32672c5deb..8eef375c54b3 100644 --- a/pkgs/by-name/co/composer-require-checker/package.nix +++ b/pkgs/by-name/co/composer-require-checker/package.nix @@ -25,7 +25,7 @@ php.buildComposerProject2 (finalAttrs: { description = "CLI tool to check whether a specific composer package uses imported symbols that aren't part of its direct composer dependencies"; homepage = "https://github.com/maglnet/ComposerRequireChecker/"; changelog = "https://github.com/maglnet/ComposerRequireChecker/releases/tag/${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "composer-require-checker"; maintainers = [ lib.maintainers.patka ]; }; diff --git a/pkgs/by-name/co/conda/package.nix b/pkgs/by-name/co/conda/package.nix index 16f5322bb1b3..8bd71cb42b5e 100644 --- a/pkgs/by-name/co/conda/package.nix +++ b/pkgs/by-name/co/conda/package.nix @@ -143,7 +143,7 @@ buildFHSEnv { "aarch64-linux" "x86_64-linux" ]; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ jluttine ]; }; } diff --git a/pkgs/by-name/co/confluencepot/package.nix b/pkgs/by-name/co/confluencepot/package.nix index 87732ffe870b..a5bfaaa3c2fe 100644 --- a/pkgs/by-name/co/confluencepot/package.nix +++ b/pkgs/by-name/co/confluencepot/package.nix @@ -39,7 +39,7 @@ buildGoModule (finalAttrs: { ConfluencePot is a simple honeypot for the Atlassian Confluence unauthenticated and remote OGNL injection vulnerability (CVE-2022-26134). ''; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ fab ]; mainProgram = "confluencepot"; }; diff --git a/pkgs/by-name/co/convco/package.nix b/pkgs/by-name/co/convco/package.nix index 9bd51a9efc5b..30a0eea2d75f 100644 --- a/pkgs/by-name/co/convco/package.nix +++ b/pkgs/by-name/co/convco/package.nix @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Conventional commit cli"; mainProgram = "convco"; homepage = "https://github.com/convco/convco"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ hoverbear cafkafk diff --git a/pkgs/by-name/co/coturn/package.nix b/pkgs/by-name/co/coturn/package.nix index 142647a7f086..24eaad35921a 100644 --- a/pkgs/by-name/co/coturn/package.nix +++ b/pkgs/by-name/co/coturn/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { description = "TURN server"; homepage = "https://coturn.net/"; changelog = "https://github.com/coturn/coturn/blob/${finalAttrs.version}/ChangeLog"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ _0x4A6F ]; broken = stdenv.hostPlatform.isDarwin; # 2018-10-21 diff --git a/pkgs/by-name/co/coze/package.nix b/pkgs/by-name/co/coze/package.nix index 07ebefa970c2..a2019e841897 100644 --- a/pkgs/by-name/co/coze/package.nix +++ b/pkgs/by-name/co/coze/package.nix @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { description = "CLI client for Coze, a cryptographic JSON messaging specification"; mainProgram = "coze"; homepage = "https://github.com/Cyphrme/CozeCLI"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ qbit ]; }; }) diff --git a/pkgs/by-name/cp/cpplint/package.nix b/pkgs/by-name/cp/cpplint/package.nix index 35df50e7375c..44c42719e0bf 100644 --- a/pkgs/by-name/cp/cpplint/package.nix +++ b/pkgs/by-name/cp/cpplint/package.nix @@ -56,6 +56,6 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Static code checker for C++"; changelog = "https://github.com/cpplint/cpplint/releases/tag/${finalAttrs.version}"; mainProgram = "cpplint"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; }; }) diff --git a/pkgs/by-name/cr/crackql/package.nix b/pkgs/by-name/cr/crackql/package.nix index b3474f3f65c8..7860eb4fe424 100644 --- a/pkgs/by-name/cr/crackql/package.nix +++ b/pkgs/by-name/cr/crackql/package.nix @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication { description = "GraphQL password brute-force and fuzzing utility"; mainProgram = "crackql"; homepage = "https://github.com/nicholasaleks/CrackQL"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/cr/cratedb/package.nix b/pkgs/by-name/cr/cratedb/package.nix index 8119c0d7f7fd..1f652d880999 100644 --- a/pkgs/by-name/cr/cratedb/package.nix +++ b/pkgs/by-name/cr/cratedb/package.nix @@ -72,7 +72,7 @@ maven.buildMavenPackage { ''; homepage = "https://cratedb.com/database"; changelog = "https://cratedb.com/docs/crate/reference/en/latest/appendices/release-notes/${version}.html"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; platforms = with lib.platforms; unix ++ windows; # FIXME: Somehow dependencies are platform-dependent. Somehow. broken = stdenvNoCC.hostPlatform.system != "x86_64-linux"; diff --git a/pkgs/by-name/cr/crates-lsp/package.nix b/pkgs/by-name/cr/crates-lsp/package.nix index bf41babb8ea4..fee204199ea1 100644 --- a/pkgs/by-name/cr/crates-lsp/package.nix +++ b/pkgs/by-name/cr/crates-lsp/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Language Server implementation for Cargo.toml"; homepage = "https://github.com/MathiasPius/crates-lsp"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = [ "x86_64-linux" diff --git a/pkgs/by-name/cr/crates-tui/package.nix b/pkgs/by-name/cr/crates-tui/package.nix index b5c7145a24a0..c56137165e9c 100644 --- a/pkgs/by-name/cr/crates-tui/package.nix +++ b/pkgs/by-name/cr/crates-tui/package.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage { meta = { description = "TUI for exploring crates.io using Ratatui"; homepage = "https://github.com/ratatui/crates-tui"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; # See Cargo.toml: workspaces.metadata.dist.targets # Other platforms may work but YMMV platforms = [ diff --git a/pkgs/by-name/cr/crc32c/package.nix b/pkgs/by-name/cr/crc32c/package.nix index 221e67c07488..e34105895448 100644 --- a/pkgs/by-name/cr/crc32c/package.nix +++ b/pkgs/by-name/cr/crc32c/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/google/crc32c"; description = "CRC32C implementation with support for CPU-specific acceleration instructions"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ cpcloud ]; }; }) diff --git a/pkgs/by-name/cr/crlfuzz/package.nix b/pkgs/by-name/cr/crlfuzz/package.nix index b30c3b4c3b05..6115ffa3a269 100644 --- a/pkgs/by-name/cr/crlfuzz/package.nix +++ b/pkgs/by-name/cr/crlfuzz/package.nix @@ -23,7 +23,7 @@ buildGoModule (finalAttrs: { description = "Tool to scan for CRLF vulnerability"; mainProgram = "crlfuzz"; homepage = "https://github.com/dwisiswant0/crlfuzz"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/cr/crunch/package.nix b/pkgs/by-name/cr/crunch/package.nix index 067a5e3a6644..0b328ac4dcb0 100644 --- a/pkgs/by-name/cr/crunch/package.nix +++ b/pkgs/by-name/cr/crunch/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "crunch"; homepage = "https://sourceforge.net/projects/crunch-wordlist/"; platforms = lib.platforms.unix; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/cu/cubelify/package.nix b/pkgs/by-name/cu/cubelify/package.nix index d4f08b49ddb5..40ffb90e59ca 100644 --- a/pkgs/by-name/cu/cubelify/package.nix +++ b/pkgs/by-name/cu/cubelify/package.nix @@ -33,7 +33,7 @@ appimageTools.wrapType2 rec { meta = { description = "Powerful and feature-rich Hypixel anti-sniping stats overlay"; homepage = "https://cubelify.com/"; - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; mainProgram = "cubelify"; maintainers = with lib.maintainers; [ yunfachi ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/cu/cudatext/deps.json b/pkgs/by-name/cu/cudatext/deps.json index ba7392d2130e..f75d576ecf74 100644 --- a/pkgs/by-name/cu/cudatext/deps.json +++ b/pkgs/by-name/cu/cudatext/deps.json @@ -16,8 +16,8 @@ }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2026.06.12", - "hash": "sha256-JTUxakTv9MVbMQArJJC995kSCD37Xs1rvLmDoyQhHf4=" + "rev": "2026.06.24", + "hash": "sha256-mjvWki4rUSvSYCmqM2eLDwbsKHkSSnq4noZYJDby1rY=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -31,8 +31,8 @@ }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2026.06.10", - "hash": "sha256-WZnGdl0lt8nOKKZsqPIcSRTVXYEixGKDHtMPveOvE5E=" + "rev": "2026.07.08", + "hash": "sha256-mwFBB75vSCLiL1XQ0yR/Tf9ykTevdyAIYtYnusF77T0=" }, "Python-for-Lazarus": { "owner": "Alexey-T", diff --git a/pkgs/by-name/cu/cudatext/package.nix b/pkgs/by-name/cu/cudatext/package.nix index 6f2445c3172a..d08496a0c29c 100644 --- a/pkgs/by-name/cu/cudatext/package.nix +++ b/pkgs/by-name/cu/cudatext/package.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "cudatext"; - version = "1.234.4.1"; + version = "1.234.6.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; tag = finalAttrs.version; - hash = "sha256-/2OXF0ggbBvgAlQTeQcjxITd8UbdOc9Hruml112XoEU="; + hash = "sha256-4ahclaXYtHPepQRtvcYyYyD42pEJMngO5DJMItudQd0="; }; patches = [ ./proc_globdata.patch ]; diff --git a/pkgs/by-name/cy/cyclonedds/package.nix b/pkgs/by-name/cy/cyclonedds/package.nix index ec54083be952..1e1c1dd38acb 100644 --- a/pkgs/by-name/cy/cyclonedds/package.nix +++ b/pkgs/by-name/cy/cyclonedds/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Eclipse Cyclone DDS project"; homepage = "https://cyclonedds.io/"; - license = with lib.licenses; [ epl20 ]; + license = lib.licenses.epl20; maintainers = with lib.maintainers; [ bachp ]; }; }) diff --git a/pkgs/by-name/cy/cyrus-imapd/package.nix b/pkgs/by-name/cy/cyrus-imapd/package.nix index 8e95b5a449a5..29227eeab376 100644 --- a/pkgs/by-name/cy/cyrus-imapd/package.nix +++ b/pkgs/by-name/cy/cyrus-imapd/package.nix @@ -191,7 +191,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.cyrusimap.org"; description = "Email, contacts and calendar server"; changelog = "https://www.cyrusimap.org/imap/download/release-notes/${lib.versions.majorMinor finalAttrs.version}/x/${finalAttrs.version}.html"; - license = with lib.licenses; [ bsdOriginal ]; + license = lib.licenses.bsdOriginal; mainProgram = "cyradm"; maintainers = with lib.maintainers; [ moraxyc diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix index 5c226e630e4e..1fd27332a6de 100644 --- a/pkgs/by-name/cz/czkawka/package.nix +++ b/pkgs/by-name/cz/czkawka/package.nix @@ -126,7 +126,7 @@ let homepage = "https://github.com/qarmin/czkawka"; description = "Simple, fast and easy to use app to remove unnecessary files from your computer"; changelog = "https://github.com/qarmin/czkawka/raw/${self.version}/Changelog.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "czkawka_gui"; maintainers = with lib.maintainers; [ yanganto diff --git a/pkgs/by-name/da/daisydisk/package.nix b/pkgs/by-name/da/daisydisk/package.nix index 784b352b8d82..3419cee31b3e 100644 --- a/pkgs/by-name/da/daisydisk/package.nix +++ b/pkgs/by-name/da/daisydisk/package.nix @@ -51,7 +51,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Find out what’s taking up your disk space and recover it in the most efficient and easy way"; homepage = "https://daisydiskapp.com/"; changelog = "https://daisydiskapp.com/releases"; - license = [ lib.licenses.unfree ]; + license = lib.licenses.unfree; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; maintainers = with lib.maintainers; [ DimitarNestorov ]; platforms = lib.platforms.darwin; diff --git a/pkgs/by-name/da/darkly/package.nix b/pkgs/by-name/da/darkly/package.nix index 9dad017633cf..b2fc28ac9e5f 100644 --- a/pkgs/by-name/da/darkly/package.nix +++ b/pkgs/by-name/da/darkly/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Bali10050/Darkly"; changelog = "https://github.com/Bali10050/Darkly/releases/tag/v${finalAttrs.version}"; platforms = lib.platforms.linux; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "darkly-settings6"; }; diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index c954ded2f1f6..88e96055a2db 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -230,7 +230,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ flosse mrVanDalo - paperdigits freyacodes ]; }; diff --git a/pkgs/by-name/dc/dcrctl/package.nix b/pkgs/by-name/dc/dcrctl/package.nix index 053a60b5121f..dddad707dab3 100644 --- a/pkgs/by-name/dc/dcrctl/package.nix +++ b/pkgs/by-name/dc/dcrctl/package.nix @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://decred.org"; description = "Secure Decred wallet daemon written in Go (golang)"; - license = with lib.licenses; [ isc ]; + license = lib.licenses.isc; maintainers = [ ]; mainProgram = "dcrctl"; }; diff --git a/pkgs/by-name/dc/dcrd/package.nix b/pkgs/by-name/dc/dcrd/package.nix index e69ffc91c3d1..1f349723c597 100644 --- a/pkgs/by-name/dc/dcrd/package.nix +++ b/pkgs/by-name/dc/dcrd/package.nix @@ -32,7 +32,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://decred.org"; description = "Decred daemon in Go (golang)"; - license = with lib.licenses; [ isc ]; + license = lib.licenses.isc; maintainers = with lib.maintainers; [ juaningan ]; }; }) diff --git a/pkgs/by-name/dc/dcrwallet/package.nix b/pkgs/by-name/dc/dcrwallet/package.nix index 10a9b712bbee..81f24d57ea57 100644 --- a/pkgs/by-name/dc/dcrwallet/package.nix +++ b/pkgs/by-name/dc/dcrwallet/package.nix @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://decred.org"; description = "Secure Decred wallet daemon written in Go (golang)"; - license = with lib.licenses; [ isc ]; + license = lib.licenses.isc; maintainers = with lib.maintainers; [ juaningan ]; mainProgram = "dcrwallet"; }; diff --git a/pkgs/by-name/dd/ddsmt/package.nix b/pkgs/by-name/dd/ddsmt/package.nix index 22e4cf83a734..810c774b93aa 100644 --- a/pkgs/by-name/dd/ddsmt/package.nix +++ b/pkgs/by-name/dd/ddsmt/package.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication { meta = { description = "Delta debugger for SMT benchmarks in SMT-LIB v2"; homepage = "https://ddsmt.readthedocs.io/"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; }; } diff --git a/pkgs/by-name/de/deniseemu/package.nix b/pkgs/by-name/de/deniseemu/package.nix index dfc536f64bec..4e2106e24685 100644 --- a/pkgs/by-name/de/deniseemu/package.nix +++ b/pkgs/by-name/de/deniseemu/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://bitbucket.org/piciji/denise"; downloadPage = "https://sourceforge.net/projects/deniseemu/"; description = "C64 / Amiga Emulator"; - license = [ lib.licenses.gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.matthewcroughan ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/de/descent3/package.nix b/pkgs/by-name/de/descent3/package.nix index 5027a8bc12e7..bf77dcebd4b1 100644 --- a/pkgs/by-name/de/descent3/package.nix +++ b/pkgs/by-name/de/descent3/package.nix @@ -15,7 +15,7 @@ runCommand "descent3-${descent3-unwrapped.version}" meta = descent3-unwrapped.meta // { # The code that produces the wrapper is in the Nixpkgs repo, and the # Nixpkgs repo is MIT Licensed. - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; longDescription = '' Playing Descent 3 using the Nix package manager is a little bit awkward at the moment. This wrapper makes it slightly less awkward. Here’s how diff --git a/pkgs/by-name/de/deterministic-uname/package.nix b/pkgs/by-name/de/deterministic-uname/package.nix index f83c4ef9c0d5..7f2047400999 100644 --- a/pkgs/by-name/de/deterministic-uname/package.nix +++ b/pkgs/by-name/de/deterministic-uname/package.nix @@ -61,7 +61,7 @@ replaceVarsWith { not intercept these calls, builds made on different kernels will produce different results. ''; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ artturin ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/di/dict-cc-py/package.nix b/pkgs/by-name/di/dict-cc-py/package.nix index 77f97174f87d..ab871a5c5310 100644 --- a/pkgs/by-name/di/dict-cc-py/package.nix +++ b/pkgs/by-name/di/dict-cc-py/package.nix @@ -32,7 +32,7 @@ python3.pkgs.buildPythonPackage { description = "Unofficial command line client for dict.cc"; mainProgram = "dict.cc.py"; homepage = "https://github.com/rbaron/dict.cc.py"; - license = with lib.licenses; [ cc0 ]; + license = lib.licenses.cc0; maintainers = [ ]; }; } diff --git a/pkgs/by-name/di/diffedit3/package.nix b/pkgs/by-name/di/diffedit3/package.nix index b82cd45dc91a..95eba3db3711 100644 --- a/pkgs/by-name/di/diffedit3/package.nix +++ b/pkgs/by-name/di/diffedit3/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { homepage = "https://github.com/ilyagr/diffedit3"; description = "3-pane diff editor"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; mainProgram = "diffedit3"; maintainers = with lib.maintainers; [ thoughtpolice ]; }; diff --git a/pkgs/by-name/di/diffr/package.nix b/pkgs/by-name/di/diffr/package.nix index 10ecfdd6f64a..8f67ff8645cd 100644 --- a/pkgs/by-name/di/diffr/package.nix +++ b/pkgs/by-name/di/diffr/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Yet another diff highlighting tool"; mainProgram = "diffr"; homepage = "https://github.com/mookid/diffr"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/di/dirb/package.nix b/pkgs/by-name/di/dirb/package.nix index dbf59823052d..7b8eed782016 100644 --- a/pkgs/by-name/di/dirb/package.nix +++ b/pkgs/by-name/di/dirb/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Web content scanner"; homepage = "https://dirb.sourceforge.net/"; maintainers = with lib.maintainers; [ bennofs ]; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/di/dismap/package.nix b/pkgs/by-name/di/dismap/package.nix index 064e0c4bb23b..7f595788b3b0 100644 --- a/pkgs/by-name/di/dismap/package.nix +++ b/pkgs/by-name/di/dismap/package.nix @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { description = "Asset discovery and identification tools"; mainProgram = "dismap"; homepage = "https://github.com/zhzyker/dismap"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/di/diswall/package.nix b/pkgs/by-name/di/diswall/package.nix index ec5ebaebf32c..273b0be8a4c4 100644 --- a/pkgs/by-name/di/diswall/package.nix +++ b/pkgs/by-name/di/diswall/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: { intruder to get any system information. ''; homepage = "https://www.diswall.stream"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ izorkin ]; mainProgram = "diswall"; }; diff --git a/pkgs/by-name/dm/dmenu-rs/package.nix b/pkgs/by-name/dm/dmenu-rs/package.nix index 70ac55438b09..993749044cfc 100644 --- a/pkgs/by-name/dm/dmenu-rs/package.nix +++ b/pkgs/by-name/dm/dmenu-rs/package.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { "Pixel perfect port of dmenu, rewritten in Rust with extensive plugin support" + lib.optionalString enablePlugins ", with all upstream plugins enabled"; homepage = "https://github.com/Shizcow/dmenu-rs"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ benjaminedwardwebb ]; platforms = lib.platforms.linux; broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; diff --git a/pkgs/by-name/dn/dnsmon-go/package.nix b/pkgs/by-name/dn/dnsmon-go/package.nix index 9fa7ae6bd15d..2757812bf968 100644 --- a/pkgs/by-name/dn/dnsmon-go/package.nix +++ b/pkgs/by-name/dn/dnsmon-go/package.nix @@ -25,7 +25,7 @@ buildGoModule { meta = { description = "Tool to collect DNS traffic"; homepage = "https://github.com/jonpulsifer/dnsmon-go"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "dnsmon-go"; }; diff --git a/pkgs/by-name/dn/dnstwist/package.nix b/pkgs/by-name/dn/dnstwist/package.nix index 99e4d20638d4..135402b4d8de 100644 --- a/pkgs/by-name/dn/dnstwist/package.nix +++ b/pkgs/by-name/dn/dnstwist/package.nix @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { description = "Domain name permutation engine for detecting homograph phishing attacks"; homepage = "https://github.com/elceef/dnstwist"; changelog = "https://github.com/elceef/dnstwist/releases/tag/${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "dnstwist"; }; diff --git a/pkgs/by-name/do/doh-proxy-rust/package.nix b/pkgs/by-name/do/doh-proxy-rust/package.nix index 18aaa31e1614..1d55facdf152 100644 --- a/pkgs/by-name/do/doh-proxy-rust/package.nix +++ b/pkgs/by-name/do/doh-proxy-rust/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { homepage = "https://github.com/jedisct1/doh-server"; description = "Fast, mature, secure DoH server proxy written in Rust"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ stephank ]; mainProgram = "doh-proxy"; }; diff --git a/pkgs/by-name/dp/dput-ng/package.nix b/pkgs/by-name/dp/dput-ng/package.nix index 7caf42e88a6a..7b62937839db 100644 --- a/pkgs/by-name/dp/dput-ng/package.nix +++ b/pkgs/by-name/dp/dput-ng/package.nix @@ -64,7 +64,7 @@ python3.pkgs.buildPythonApplication { meta = { description = "Next-generation Debian package upload tool"; homepage = "https://dput.readthedocs.io/en/latest/"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "dput"; diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix index 60685251dcf5..8ab3e8ed629b 100644 --- a/pkgs/by-name/du/dua/package.nix +++ b/pkgs/by-name/du/dua/package.nix @@ -56,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Tool to conveniently learn about the disk usage of directories"; homepage = "https://github.com/Byron/dua-cli"; changelog = "https://github.com/Byron/dua-cli/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ killercup defelo diff --git a/pkgs/by-name/du/dummyhttp/package.nix b/pkgs/by-name/du/dummyhttp/package.nix index d148a7579701..d3eee27af110 100644 --- a/pkgs/by-name/du/dummyhttp/package.nix +++ b/pkgs/by-name/du/dummyhttp/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Super simple HTTP server that replies a fixed body with a fixed response code"; homepage = "https://github.com/svenstaro/dummyhttp"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; mainProgram = "dummyhttp"; }; diff --git a/pkgs/by-name/du/dupe-krill/package.nix b/pkgs/by-name/du/dupe-krill/package.nix index a975ccf16da1..c42c2a51afcd 100644 --- a/pkgs/by-name/du/dupe-krill/package.nix +++ b/pkgs/by-name/du/dupe-krill/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Fast file deduplicator"; homepage = "https://github.com/kornelski/dupe-krill"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ urbas ]; mainProgram = "dupe-krill"; }; diff --git a/pkgs/by-name/du/durden/package.nix b/pkgs/by-name/du/durden/package.nix index 57ec7ed07277..9c55d8718774 100644 --- a/pkgs/by-name/du/durden/package.nix +++ b/pkgs/by-name/du/durden/package.nix @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { features in Arcan, and as a very competent entry to the advanced-user side of the desktop environment spectrum. ''; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix b/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix index 013557a892fb..ddc4e794bf60 100644 --- a/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix +++ b/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix @@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation { meta = { homepage = "https://gitlab.com/dwt1/shell-color-scripts"; description = "Collection of shell color scripts collected by dt (Derek Taylor)"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.all; mainProgram = "colorscript"; diff --git a/pkgs/by-name/e-/e-imzo-manager/package.nix b/pkgs/by-name/e-/e-imzo-manager/package.nix index 23e3a43b7a0b..07764992fc81 100644 --- a/pkgs/by-name/e-/e-imzo-manager/package.nix +++ b/pkgs/by-name/e-/e-imzo-manager/package.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://git.oss.uzinfocom.uz/xinux/e-imzo-manager"; mainProgram = "E-IMZO-Manager"; description = "GTK application for managing E-IMZO keys"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ orzklv diff --git a/pkgs/by-name/ea/ea/package.nix b/pkgs/by-name/ea/ea/package.nix index 107c19da4cc9..2bed9e08e2a7 100644 --- a/pkgs/by-name/ea/ea/package.nix +++ b/pkgs/by-name/ea/ea/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Makes file paths from CLI output actionable"; homepage = "https://github.com/dduan/ea"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ deejayem ]; mainProgram = "ea"; }; diff --git a/pkgs/by-name/ea/each/package.nix b/pkgs/by-name/ea/each/package.nix index b2bd7c2b65e7..d16a519959bd 100644 --- a/pkgs/by-name/ea/each/package.nix +++ b/pkgs/by-name/ea/each/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Command-line tool for processing CSV, JSON and other structured data"; mainProgram = "each"; homepage = "https://github.com/arraypad/each"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ thiagokokada ]; }; }) diff --git a/pkgs/by-name/ec/ecdsatool/package.nix b/pkgs/by-name/ec/ecdsatool/package.nix index 4110f5f4a4d3..b9a90e88f595 100644 --- a/pkgs/by-name/ec/ecdsatool/package.nix +++ b/pkgs/by-name/ec/ecdsatool/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { description = "Create and manipulate ECC NISTP256 keypairs"; mainProgram = "ecdsatool"; homepage = "https://github.com/kaniini/ecdsatool/"; - license = with lib.licenses; [ free ]; + license = lib.licenses.free; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/ed/eduke32/package.nix b/pkgs/by-name/ed/eduke32/package.nix index afd2cb120202..ad46cb0fcbf8 100644 --- a/pkgs/by-name/ed/eduke32/package.nix +++ b/pkgs/by-name/ed/eduke32/package.nix @@ -181,7 +181,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Enhanced port of Duke Nukem 3D for various platforms"; homepage = "https://eduke32.com"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ qubitnano ]; diff --git a/pkgs/by-name/ef/effitask/package.nix b/pkgs/by-name/ef/effitask/package.nix index 7fc694d37356..11ea7bf263fe 100644 --- a/pkgs/by-name/ef/effitask/package.nix +++ b/pkgs/by-name/ef/effitask/package.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://github.com/todotxt-rs/effitask"; maintainers = with lib.maintainers; [ davidak ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "effitask"; }; }) diff --git a/pkgs/by-name/el/elf2uf2-rs/package.nix b/pkgs/by-name/el/elf2uf2-rs/package.nix index 434781557bcb..a5e240ffaa25 100644 --- a/pkgs/by-name/el/elf2uf2-rs/package.nix +++ b/pkgs/by-name/el/elf2uf2-rs/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Convert ELF files to UF2 for USB Flashing Bootloaders"; mainProgram = "elf2uf2-rs"; homepage = "https://github.com/JoNil/elf2uf2-rs"; - license = with lib.licenses; [ bsd0 ]; + license = lib.licenses.bsd0; platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ polygon diff --git a/pkgs/by-name/el/elfx86exts/package.nix b/pkgs/by-name/el/elfx86exts/package.nix index 657b6a2ff6b8..b123e6e16c9f 100644 --- a/pkgs/by-name/el/elfx86exts/package.nix +++ b/pkgs/by-name/el/elfx86exts/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://github.com/pkgw/elfx86exts"; maintainers = with lib.maintainers; [ rmcgibbo ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "elfx86exts"; }; }) diff --git a/pkgs/by-name/em/emacspeak/package.nix b/pkgs/by-name/em/emacspeak/package.nix index a0bc83a38c07..f171cd5bf800 100644 --- a/pkgs/by-name/em/emacspeak/package.nix +++ b/pkgs/by-name/em/emacspeak/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/tvraman/emacspeak/"; description = "Emacs extension that provides spoken output"; changelog = "https://github.com/tvraman/emacspeak/blob/${finalAttrs.src.rev}/etc/NEWS"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "emacspeak"; maintainers = [ ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/em/email/package.nix b/pkgs/by-name/em/email/package.nix index 9aba58c1d25f..4ab0524bc94b 100644 --- a/pkgs/by-name/em/email/package.nix +++ b/pkgs/by-name/em/email/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { meta = { description = "Command line SMTP client"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; homepage = "https://deanproxy.com/code"; platforms = lib.platforms.unix; mainProgram = "email"; diff --git a/pkgs/by-name/em/emmy-lua-code-style/package.nix b/pkgs/by-name/em/emmy-lua-code-style/package.nix index 7cf1f72aafd1..e4597f81aadf 100644 --- a/pkgs/by-name/em/emmy-lua-code-style/package.nix +++ b/pkgs/by-name/em/emmy-lua-code-style/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Fast, powerful, and feature-rich Lua formatting and checking tool"; mainProgram = "CodeFormat"; platforms = lib.platforms.unix; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.nobbz ]; }; }) diff --git a/pkgs/by-name/en/engauge-digitizer/package.nix b/pkgs/by-name/en/engauge-digitizer/package.nix index c331bdaa9c95..b8f331deae1d 100644 --- a/pkgs/by-name/en/engauge-digitizer/package.nix +++ b/pkgs/by-name/en/engauge-digitizer/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Engauge Digitizer is a tool for recovering graph data from an image file"; mainProgram = "engauge"; homepage = "https://markummitchell.github.io/engauge-digitizer"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sheepforce ]; }; diff --git a/pkgs/by-name/en/enpass-mac/package.nix b/pkgs/by-name/en/enpass-mac/package.nix index c03fd6eb77b1..34e3cfcdb9e9 100644 --- a/pkgs/by-name/en/enpass-mac/package.nix +++ b/pkgs/by-name/en/enpass-mac/package.nix @@ -84,7 +84,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Choose your own safest place to store passwords"; homepage = "https://www.enpass.io"; changelog = "https://www.enpass.io/release-notes/macos-website-ver/"; - license = [ lib.licenses.unfree ]; + license = lib.licenses.unfree; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; maintainers = with lib.maintainers; [ DimitarNestorov ]; platforms = lib.platforms.darwin; diff --git a/pkgs/by-name/en/enum4linux-ng/package.nix b/pkgs/by-name/en/enum4linux-ng/package.nix index d77b60db798d..00ea0ff0f690 100644 --- a/pkgs/by-name/en/enum4linux-ng/package.nix +++ b/pkgs/by-name/en/enum4linux-ng/package.nix @@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { ''; homepage = "https://github.com/cddmp/enum4linux-ng"; changelog = "https://github.com/cddmp/enum4linux-ng/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fab ]; mainProgram = "enum4linux-ng"; }; diff --git a/pkgs/by-name/er/erofs-utils/package.nix b/pkgs/by-name/er/erofs-utils/package.nix index 868184eafe4e..e7f6e7a7bd21 100644 --- a/pkgs/by-name/er/erofs-utils/package.nix +++ b/pkgs/by-name/er/erofs-utils/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/about/"; description = "Userspace utilities for linux-erofs file system"; changelog = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v${finalAttrs.version}"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ nikstur jmbaur diff --git a/pkgs/by-name/er/erosmb/package.nix b/pkgs/by-name/er/erosmb/package.nix index 45a519260591..145516f799fe 100644 --- a/pkgs/by-name/er/erosmb/package.nix +++ b/pkgs/by-name/er/erosmb/package.nix @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { description = "SMB network scanner"; homepage = "https://github.com/viktor02/EroSmb"; changelog = "https://github.com/viktor02/EroSmb/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "erosmb"; }; diff --git a/pkgs/by-name/es/esphome/dashboard.nix b/pkgs/by-name/es/esphome/dashboard.nix index 180acf1ef55c..0359539d239a 100644 --- a/pkgs/by-name/es/esphome/dashboard.nix +++ b/pkgs/by-name/es/esphome/dashboard.nix @@ -54,7 +54,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "ESPHome dashboard"; homepage = "https://esphome.io/"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ hexa ]; }; }) diff --git a/pkgs/by-name/et/ete-unwrapped/package.nix b/pkgs/by-name/et/ete-unwrapped/package.nix index 1b396ad00ce0..c8f8479f8b5d 100644 --- a/pkgs/by-name/et/ete-unwrapped/package.nix +++ b/pkgs/by-name/et/ete-unwrapped/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Improved Wolfenstein: Enemy Territory Engine"; homepage = "https://github.com/etfdevs/ETe"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ ashleyghooper drupol diff --git a/pkgs/by-name/et/etlegacy-assets/package.nix b/pkgs/by-name/et/etlegacy-assets/package.nix index f4443287a060..d0259a237b2d 100644 --- a/pkgs/by-name/et/etlegacy-assets/package.nix +++ b/pkgs/by-name/et/etlegacy-assets/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = { description = "ET: Legacy assets only"; homepage = "https://etlegacy.com"; - license = with lib.licenses; [ cc-by-nc-sa-30 ]; + license = lib.licenses.cc-by-nc-sa-30; longDescription = '' ET: Legacy, an open source project fully compatible client and server for the popular online FPS game Wolfenstein: Enemy Territory - whose diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix index 73b9e82e8e6e..25b878fa6369 100644 --- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix +++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation { meta = { description = "ET: Legacy is an open source project based on the code of Wolfenstein: Enemy Territory which was released in 2010 under the terms of the GPLv3 license"; homepage = "https://etlegacy.com"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; longDescription = '' ET: Legacy, an open source project fully compatible client and server for the popular online FPS game Wolfenstein: Enemy Territory - whose diff --git a/pkgs/by-name/ev/evans/package.nix b/pkgs/by-name/ev/evans/package.nix index c7f8e974a554..5d66dfad7e8f 100644 --- a/pkgs/by-name/ev/evans/package.nix +++ b/pkgs/by-name/ev/evans/package.nix @@ -23,7 +23,7 @@ buildGoModule (finalAttrs: { description = "More expressive universal gRPC client"; mainProgram = "evans"; homepage = "https://evans.syfm.me/"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ diogox ]; }; }) diff --git a/pkgs/by-name/ev/everest-bin/package.nix b/pkgs/by-name/ev/everest-bin/package.nix index 2d0ba6e4a1a3..5fc06ee6949c 100644 --- a/pkgs/by-name/ev/everest-bin/package.nix +++ b/pkgs/by-name/ev/everest-bin/package.nix @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation { ''; meta = { description = "Celeste mod loader (don't install; use celestegame instead)"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ulysseszhan ]; homepage = "https://everestapi.github.io"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/ev/everest/package.nix b/pkgs/by-name/ev/everest/package.nix index b05e536acf03..1fb0046ebd02 100644 --- a/pkgs/by-name/ev/everest/package.nix +++ b/pkgs/by-name/ev/everest/package.nix @@ -102,7 +102,7 @@ buildDotnetModule { meta = { description = "Celeste mod loader (don't install; use celestegame instead)"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ulysseszhan ]; homepage = "https://everestapi.github.io"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/ev/evmdis/package.nix b/pkgs/by-name/ev/evmdis/package.nix index 5d028fc29d8f..c7d7fbff6166 100644 --- a/pkgs/by-name/ev/evmdis/package.nix +++ b/pkgs/by-name/ev/evmdis/package.nix @@ -27,7 +27,7 @@ buildGoModule { homepage = "https://github.com/Arachnid/evmdis"; description = "Ethereum EVM disassembler"; mainProgram = "evmdis"; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ asymmetric ]; }; } diff --git a/pkgs/by-name/ev/evremap/package.nix b/pkgs/by-name/ev/evremap/package.nix index 37f4f2679a46..580a63f3c2e7 100644 --- a/pkgs/by-name/ev/evremap/package.nix +++ b/pkgs/by-name/ev/evremap/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage { description = "Keyboard input remapper for Linux/Wayland systems"; homepage = "https://github.com/wez/evremap"; maintainers = with lib.maintainers; [ pluiedev ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "evremap"; }; } diff --git a/pkgs/by-name/ex/external-editor-revived/package.nix b/pkgs/by-name/ex/external-editor-revived/package.nix index 29f29d11471f..57be8c4ead17 100644 --- a/pkgs/by-name/ex/external-editor-revived/package.nix +++ b/pkgs/by-name/ex/external-editor-revived/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Native messaging host for the Thunderbird addon allowing to edit mails in external programs"; homepage = "https://github.com/Frederick888/external-editor-revived"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ mofrim ]; mainProgram = "external-editor-revived"; }; diff --git a/pkgs/by-name/ex/extrude/package.nix b/pkgs/by-name/ex/extrude/package.nix index 2612f6629a0e..973a3381fe2e 100644 --- a/pkgs/by-name/ex/extrude/package.nix +++ b/pkgs/by-name/ex/extrude/package.nix @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { description = "Tool to analyse binaries for missing security features"; mainProgram = "extrude"; homepage = "https://github.com/liamg/extrude"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/fa/falkor/package.nix b/pkgs/by-name/fa/falkor/package.nix index 3bcf0da92424..900257712a8d 100644 --- a/pkgs/by-name/fa/falkor/package.nix +++ b/pkgs/by-name/fa/falkor/package.nix @@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Electron-based gaming hub"; homepage = "https://github.com/Team-Falkor/falkor"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ icedborn ]; platforms = [ "x86_64-linux" ]; hydraPlatforms = [ ]; diff --git a/pkgs/by-name/fc/fceux/package.nix b/pkgs/by-name/fc/fceux/package.nix index 4cf042e1d37d..659c2398c982 100644 --- a/pkgs/by-name/fc/fceux/package.nix +++ b/pkgs/by-name/fc/fceux/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://www.fceux.com"; description = "Nintendo Entertainment System (NES) Emulator"; changelog = "https://github.com/TASEmulators/fceux/blob/${finalAttrs.src.rev}/changelog.txt"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "fceux"; maintainers = with lib.maintainers; [ kuflierl ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/fe/febio-studio/package.nix b/pkgs/by-name/fe/febio-studio/package.nix index 09613f96e9b3..4e8f0c929665 100644 --- a/pkgs/by-name/fe/febio-studio/package.nix +++ b/pkgs/by-name/fe/febio-studio/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "FEBio Suite Solver"; mainProgram = "FEBioStudio"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; homepage = "https://febio.org/"; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ Scriptkiddi ]; diff --git a/pkgs/by-name/fe/febio/package.nix b/pkgs/by-name/fe/febio/package.nix index 28427d15792b..96acb051ab6c 100644 --- a/pkgs/by-name/fe/febio/package.nix +++ b/pkgs/by-name/fe/febio/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Software tool for nonlinear finite element analysis in biomechanics and biophysics"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; homepage = "https://febio.org/"; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ Scriptkiddi ]; diff --git a/pkgs/by-name/fe/fedimint/package.nix b/pkgs/by-name/fe/fedimint/package.nix index 86dfd656f004..6b6e350358f2 100644 --- a/pkgs/by-name/fe/fedimint/package.nix +++ b/pkgs/by-name/fe/fedimint/package.nix @@ -79,7 +79,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Federated E-Cash Mint"; homepage = "https://github.com/fedimint/fedimint"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ dpc ]; mainProgram = "fedimint-cli"; }; diff --git a/pkgs/by-name/fe/fermyon-spin/package.nix b/pkgs/by-name/fe/fermyon-spin/package.nix index 3354659377e0..83735f7ba65b 100644 --- a/pkgs/by-name/fe/fermyon-spin/package.nix +++ b/pkgs/by-name/fe/fermyon-spin/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Framework for building, deploying, and running fast, secure, and composable cloud microservices with WebAssembly"; homepage = "https://github.com/spinframework/spin"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; mainProgram = "spin"; maintainers = [ ]; platforms = builtins.attrNames packageHashes; diff --git a/pkgs/by-name/fl/flac2mp3/package.nix b/pkgs/by-name/fl/flac2mp3/package.nix index 8d2ef887ec22..33ce91412280 100644 --- a/pkgs/by-name/fl/flac2mp3/package.nix +++ b/pkgs/by-name/fl/flac2mp3/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Tool to convert audio files from flac to mp3 format including the copying of tags"; homepage = "https://github.com/robinbowes/flac2mp3"; changelog = "https://github.com/robinbowes/flac2mp3/releases/tag/${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ lilahummel ]; }; }) diff --git a/pkgs/by-name/fl/flannel/package.nix b/pkgs/by-name/fl/flannel/package.nix index 34ed44d4c61c..d873f3e8c261 100644 --- a/pkgs/by-name/fl/flannel/package.nix +++ b/pkgs/by-name/fl/flannel/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "flannel"; - version = "0.28.6"; + version = "0.28.7"; rev = "v${version}"; vendorHash = "sha256-io2xUh5jM2x7P01MIpPgLAVXC/CAL22zrC6kfi4uYFs="; @@ -16,7 +16,7 @@ buildGoModule rec { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "sha256-djPi4dgG9iR7K5c9NhMVJI1xdBmCX39+G/zt6dDRZx8="; + sha256 = "sha256-K810ikYfDdOtOUTSGqeAwczxNO/XPB+2RbelHBc8tok="; }; ldflags = [ "-X github.com/flannel-io/flannel/pkg/version.Version=${rev}" ]; diff --git a/pkgs/by-name/fl/flare/engine.nix b/pkgs/by-name/fl/flare/engine.nix index 8b9e26d8e2d4..55ed135f8d7e 100644 --- a/pkgs/by-name/fl/flare/engine.nix +++ b/pkgs/by-name/fl/flare/engine.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { aanderse McSinyx ]; - license = [ lib.licenses.gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/fl/flare/game.nix b/pkgs/by-name/fl/flare/game.nix index c3868c8d2b3d..0ec86b74347b 100644 --- a/pkgs/by-name/fl/flare/game.nix +++ b/pkgs/by-name/fl/flare/game.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { aanderse McSinyx ]; - license = [ lib.licenses.cc-by-sa-30 ]; + license = lib.licenses.cc-by-sa-30; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/fl/flashprog/package.nix b/pkgs/by-name/fl/flashprog/package.nix index 3f7d9aa58be8..96baeb034583 100644 --- a/pkgs/by-name/fl/flashprog/package.nix +++ b/pkgs/by-name/fl/flashprog/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://flashprog.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; changelog = "https://flashprog.org/wiki/Flashprog/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl2 ]; + license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ felixsinger funkeleinhorn diff --git a/pkgs/by-name/fl/flat-remix-icon-theme/package.nix b/pkgs/by-name/fl/flat-remix-icon-theme/package.nix index eb89a4959e9f..410a02fe5734 100644 --- a/pkgs/by-name/fl/flat-remix-icon-theme/package.nix +++ b/pkgs/by-name/fl/flat-remix-icon-theme/package.nix @@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Flat remix is a pretty simple icon theme inspired on material design"; homepage = "https://drasite.com/flat-remix"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; # breeze-icons and pantheon.elementary-icon-theme dependencies are restricted to linux platforms = lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/by-name/fl/flatcc/package.nix b/pkgs/by-name/fl/flatcc/package.nix index 23300be4a0e1..62d30133edb2 100644 --- a/pkgs/by-name/fl/flatcc/package.nix +++ b/pkgs/by-name/fl/flatcc/package.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "flatcc"; homepage = "https://github.com/dvidelabs/flatcc"; changelog = "https://github.com/dvidelabs/flatcc/blob/${finalAttrs.src.tag}/CHANGELOG.md"; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ onny ]; }; }) diff --git a/pkgs/by-name/fl/flawfinder/package.nix b/pkgs/by-name/fl/flawfinder/package.nix index dfbf11197fce..658c6c30740e 100644 --- a/pkgs/by-name/fl/flawfinder/package.nix +++ b/pkgs/by-name/fl/flawfinder/package.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { description = "Tool to examines C/C++ source code for security flaws"; mainProgram = "flawfinder"; homepage = "https://dwheeler.com/flawfinder/"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ fab ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix index 5efb29de1a11..85f3e0d8f4f0 100644 --- a/pkgs/by-name/fl/flclash/package.nix +++ b/pkgs/by-name/fl/flclash/package.nix @@ -31,7 +31,7 @@ let meta = { description = "Proxy client based on ClashMeta, simple and easy to use"; homepage = "https://github.com/chen08209/FlClash"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ VZstless ]; }; diff --git a/pkgs/by-name/fl/flowblade/package.nix b/pkgs/by-name/fl/flowblade/package.nix index c69c98bd04f9..344a23a7c4c6 100644 --- a/pkgs/by-name/fl/flowblade/package.nix +++ b/pkgs/by-name/fl/flowblade/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Multitrack Non-Linear Video Editor"; homepage = "https://jliljebl.github.io/flowblade/"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ polygon ]; mainProgram = "flowblade"; diff --git a/pkgs/by-name/fl/flywheel-cli/package.nix b/pkgs/by-name/fl/flywheel-cli/package.nix index b134fa032be8..aab993c1f79b 100644 --- a/pkgs/by-name/fl/flywheel-cli/package.nix +++ b/pkgs/by-name/fl/flywheel-cli/package.nix @@ -5,29 +5,13 @@ unzip, }: -let - inherit (stdenv.hostPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; - - os = - { - x86_64-linux = "linux"; - } - .${system} or throwSystem; - - sha256 = - { - x86_64-linux = "sha256-SxBjRd95hoh2zwX6IDnkZnTWVduQafPHvnWw8qTuM78="; - } - .${system} or throwSystem; -in stdenv.mkDerivation (finalAttrs: { pname = "flywheel-cli"; version = "16.2.0"; src = fetchurl { - url = "https://storage.googleapis.com/flywheel-dist/cli/${finalAttrs.version}/fw-${os}_amd64-${finalAttrs.version}.zip"; - inherit sha256; + url = "https://storage.googleapis.com/flywheel-dist/cli/${finalAttrs.version}/fw-linux_amd64-${finalAttrs.version}.zip"; + hash = "sha256-SxBjRd95hoh2zwX6IDnkZnTWVduQafPHvnWw8qTuM78="; }; nativeBuildInputs = [ unzip ]; @@ -38,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -Dt $out/bin ./${os}_amd64/fw + install -Dt $out/bin ./linux_amd64/fw runHook postInstall ''; diff --git a/pkgs/by-name/fm/fm-go/package.nix b/pkgs/by-name/fm/fm-go/package.nix index 568b37d94345..e7a1e2b32a09 100644 --- a/pkgs/by-name/fm/fm-go/package.nix +++ b/pkgs/by-name/fm/fm-go/package.nix @@ -22,7 +22,7 @@ let homepage = "https://github.com/mistakenelf/fm"; description = "Terminal based file manager"; changelog = "https://github.com/mistakenelf/fm/releases/tag/${finalAttrs.src.rev}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "fm"; maintainers = [ ]; }; diff --git a/pkgs/by-name/fo/font-config-info/package.nix b/pkgs/by-name/fo/font-config-info/package.nix index 9ee14d3d1762..688c62d2854a 100644 --- a/pkgs/by-name/fo/font-config-info/package.nix +++ b/pkgs/by-name/fo/font-config-info/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Prints a Linux system's font configuration"; homepage = "https://github.com/derat/font-config-info"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ romildo ]; mainProgram = "font-config-info"; diff --git a/pkgs/by-name/fo/fontfor/package.nix b/pkgs/by-name/fo/fontfor/package.nix index 4b52ad8f006a..99a8d5b0ec20 100644 --- a/pkgs/by-name/fo/fontfor/package.nix +++ b/pkgs/by-name/fo/fontfor/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Find fonts which can show a specified character and preview them in browser"; homepage = "https://github.com/7sDream/fontfor"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; mainProgram = "fontfor"; }; diff --git a/pkgs/by-name/fo/ford/package.nix b/pkgs/by-name/fo/ford/package.nix index c2f5f3ebfd4c..3f2dcec9710b 100644 --- a/pkgs/by-name/fo/ford/package.nix +++ b/pkgs/by-name/fo/ford/package.nix @@ -58,7 +58,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Fortran documentation system"; mainProgram = "ford"; homepage = "https://github.com/Fortran-FOSS-Programmers/ford"; - license = [ lib.licenses.gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.sheepforce ]; }; }) diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix index bf90ea627b69..25db7b50a01d 100644 --- a/pkgs/by-name/fo/forecast/package.nix +++ b/pkgs/by-name/fo/forecast/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage { pname = "forecast"; - version = "0-unstable-2026-01-27"; + version = "0-unstable-2026-07-12"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "forecast"; - rev = "b82babc843d5e9c58a6635d3b1941ac185ae4906"; - hash = "sha256-QoZ854+2/4+VMZbOI/M167qjDPahtzbV/NH8Y46uBs8="; + rev = "0de1b7502979eb3704445c98ce8dbb7969e109da"; + hash = "sha256-9IZDDIhZY+YC0SOie5z0Ed5UAvBcf+soZ0RRz8sr71w="; }; - cargoHash = "sha256-di7zjwI0/6NB2cAih3d7iqwSb+o/607jbgJN1MtbZX8="; + cargoHash = "sha256-F5AlYm9bzJJUrDiY712dbwpCR3lzvQNFKXHzIDG+TVQ="; nativeBuildInputs = [ libcosmicAppHook diff --git a/pkgs/by-name/fo/fortls/package.nix b/pkgs/by-name/fo/fortls/package.nix index d6b771aa8aa3..a08b22726716 100644 --- a/pkgs/by-name/fo/fortls/package.nix +++ b/pkgs/by-name/fo/fortls/package.nix @@ -54,7 +54,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Fortran Language Server"; mainProgram = "fortls"; homepage = "https://github.com/fortran-lang/fortls"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.sheepforce ]; }; }) diff --git a/pkgs/by-name/fo/fortran-language-server/package.nix b/pkgs/by-name/fo/fortran-language-server/package.nix index 383732e2e574..04a61238dd86 100644 --- a/pkgs/by-name/fo/fortran-language-server/package.nix +++ b/pkgs/by-name/fo/fortran-language-server/package.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "FORTRAN Language Server for the Language Server Protocol"; mainProgram = "fortls"; homepage = "https://pypi.org/project/fortran-language-server/"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.sheepforce ]; }; }) diff --git a/pkgs/by-name/fo/fotema/package.nix b/pkgs/by-name/fo/fotema/package.nix index 723d9ab9d6aa..272bfd80ab1f 100644 --- a/pkgs/by-name/fo/fotema/package.nix +++ b/pkgs/by-name/fo/fotema/package.nix @@ -102,7 +102,7 @@ clangStdenv.mkDerivation (finalAttrs: { meta = { description = "Photo gallery for Linux"; homepage = "https://github.com/blissd/fotema"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "fotema"; diff --git a/pkgs/by-name/fp/fprettify/package.nix b/pkgs/by-name/fp/fprettify/package.nix index 7eceee491925..e3b73c8ca265 100644 --- a/pkgs/by-name/fp/fprettify/package.nix +++ b/pkgs/by-name/fp/fprettify/package.nix @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Auto-formatter for modern Fortran code that imposes strict whitespace formatting, written in Python"; mainProgram = "fprettify"; homepage = "https://pypi.org/project/fprettify/"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/fr/fre/package.nix b/pkgs/by-name/fr/fre/package.nix index 78eec456b62e..ae6b16cf83a4 100644 --- a/pkgs/by-name/fr/fre/package.nix +++ b/pkgs/by-name/fr/fre/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "CLI tool for tracking your most-used directories and files"; homepage = "https://github.com/camdencheek/fre"; changelog = "https://github.com/camdencheek/fre/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ gaykitty ]; mainProgram = "fre"; }; diff --git a/pkgs/by-name/fr/free42/package.nix b/pkgs/by-name/fr/free42/package.nix index a38818417b30..96a639a3260c 100644 --- a/pkgs/by-name/fr/free42/package.nix +++ b/pkgs/by-name/fr/free42/package.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://thomasokken.com/free42/"; changelog = "https://thomasokken.com/free42/history.html"; description = "Software clone of the HP-42S calculator"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ elfenermarcell ]; mainProgram = "free42dec"; platforms = with lib.platforms; unix; diff --git a/pkgs/by-name/fr/freepv/package.nix b/pkgs/by-name/fr/freepv/package.nix index 8ccd3ff08afc..e37de84d89f9 100644 --- a/pkgs/by-name/fr/freepv/package.nix +++ b/pkgs/by-name/fr/freepv/package.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Open source panorama viewer using GL"; homepage = "https://freepv.sourceforge.net/"; - license = [ lib.licenses.lgpl21 ]; + license = lib.licenses.lgpl21; }; }) diff --git a/pkgs/by-name/fr/frodo4/package.nix b/pkgs/by-name/fr/frodo4/package.nix index a4d37b3a3e3d..9f49ba742498 100644 --- a/pkgs/by-name/fr/frodo4/package.nix +++ b/pkgs/by-name/fr/frodo4/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/cebix/frodo4"; description = "C64 emulator with emphasis on graphical accuracy"; mainProgram = "Frodo"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ chordtoll ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/fr/frugally-deep/package.nix b/pkgs/by-name/fr/frugally-deep/package.nix index c7861f0995a9..900bbb1b3995 100644 --- a/pkgs/by-name/fr/frugally-deep/package.nix +++ b/pkgs/by-name/fr/frugally-deep/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Header-only library for using Keras (TensorFlow) models in C++"; homepage = "https://github.com/Dobiasd/frugally-deep"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/fu/functiontrace-server/package.nix b/pkgs/by-name/fu/functiontrace-server/package.nix index 0584ab933271..95583d1fab82 100644 --- a/pkgs/by-name/fu/functiontrace-server/package.nix +++ b/pkgs/by-name/fu/functiontrace-server/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Server for FunctionTrace, a graphical Python profiler"; homepage = "https://functiontrace.com"; - license = with lib.licenses; [ prosperity30 ]; + license = lib.licenses.prosperity30; maintainers = with lib.maintainers; [ tehmatt ]; }; } diff --git a/pkgs/by-name/fu/furnace/package.nix b/pkgs/by-name/fu/furnace/package.nix index 0591915c2523..5a37b6718bf3 100644 --- a/pkgs/by-name/fu/furnace/package.nix +++ b/pkgs/by-name/fu/furnace/package.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Multi-system chiptune tracker compatible with DefleMask modules"; homepage = "https://github.com/tildearrow/furnace"; changelog = "https://github.com/tildearrow/furnace/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ OPNA2608 ]; platforms = lib.platforms.all; mainProgram = "furnace"; diff --git a/pkgs/by-name/fu/fuzzdb/package.nix b/pkgs/by-name/fu/fuzzdb/package.nix index 4ca1eb4cb191..bb67c638b5c3 100644 --- a/pkgs/by-name/fu/fuzzdb/package.nix +++ b/pkgs/by-name/fu/fuzzdb/package.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Comprehensive collection of attack patterns and predictable resource names used for security testing and fuzzing application"; homepage = "https://github.com/fuzzdb-project/fuzzdb"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/fw/fwanalyzer/package.nix b/pkgs/by-name/fw/fwanalyzer/package.nix index 6460d68cb5ac..330e29854586 100644 --- a/pkgs/by-name/fw/fwanalyzer/package.nix +++ b/pkgs/by-name/fw/fwanalyzer/package.nix @@ -39,7 +39,7 @@ buildGoModule (finalAttrs: { meta = { description = "Tool to analyze filesystem images"; homepage = "https://github.com/cruise-automation/fwanalyzer"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; mainProgram = "fwanalyzer"; }; diff --git a/pkgs/by-name/fy/fyi/package.nix b/pkgs/by-name/fy/fyi/package.nix index c8218a4e8c19..e1ea4eaed3e9 100644 --- a/pkgs/by-name/fy/fyi/package.nix +++ b/pkgs/by-name/fy/fyi/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://codeberg.org/dnkl/fyi/releases/tag/${finalAttrs.version}"; description = "Command line utility to create desktop notifications"; homepage = "https://codeberg.org/dnkl/fyi"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; mainProgram = "fyi"; maintainers = with lib.maintainers; [ marnym ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ga/galaxis/package.nix b/pkgs/by-name/ga/galaxis/package.nix index c25ae4dfc9cf..e404df1eaadb 100644 --- a/pkgs/by-name/ga/galaxis/package.nix +++ b/pkgs/by-name/ga/galaxis/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { game's simpler deductions. ''; homepage = "http://catb.org/~esr/galaxis/"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "galaxis"; maintainers = [ ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ga/game-rs/package.nix b/pkgs/by-name/ga/game-rs/package.nix index 7c0a7cfe0598..9cf7b03f00ed 100644 --- a/pkgs/by-name/ga/game-rs/package.nix +++ b/pkgs/by-name/ga/game-rs/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Minimal CLI game launcher for linux"; homepage = "https://github.com/amanse/game-rs"; changelog = "https://github.com/Amanse/game-rs/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ amanse ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/gd/gdu/package.nix b/pkgs/by-name/gd/gdu/package.nix index 622769eafb27..e03a4ec1db9d 100644 --- a/pkgs/by-name/gd/gdu/package.nix +++ b/pkgs/by-name/gd/gdu/package.nix @@ -63,7 +63,7 @@ buildGoModule (finalAttrs: { ''; homepage = "https://github.com/dundee/gdu"; changelog = "https://github.com/dundee/gdu/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab zowoq diff --git a/pkgs/by-name/ge/geesefs/package.nix b/pkgs/by-name/ge/geesefs/package.nix index be5ea1e7a896..658c16b34943 100644 --- a/pkgs/by-name/ge/geesefs/package.nix +++ b/pkgs/by-name/ge/geesefs/package.nix @@ -27,7 +27,7 @@ buildGoModule { meta = { homepage = "https://github.com/yandex-cloud/geesefs"; description = "Finally, a good FUSE FS implementation over S3"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.flokli ]; platforms = lib.platforms.unix; mainProgram = "geesefs"; diff --git a/pkgs/by-name/ge/geoipupdate/package.nix b/pkgs/by-name/ge/geoipupdate/package.nix index 210c27fd5198..7ee20c77422c 100644 --- a/pkgs/by-name/ge/geoipupdate/package.nix +++ b/pkgs/by-name/ge/geoipupdate/package.nix @@ -24,7 +24,7 @@ buildGoModule (finalAttrs: { meta = { description = "Automatic GeoIP database updater"; homepage = "https://github.com/maxmind/geoipupdate"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ das_j helsinki-Jo diff --git a/pkgs/by-name/ge/gerbolyze/package.nix b/pkgs/by-name/ge/gerbolyze/package.nix index 690e38ca3313..a5a13ccc60c1 100644 --- a/pkgs/by-name/ge/gerbolyze/package.nix +++ b/pkgs/by-name/ge/gerbolyze/package.nix @@ -32,7 +32,7 @@ let meta = { description = "SVG-flatten SVG downconverter"; homepage = "https://github.com/jaseg/gerbolyze"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ wulfsta ]; mainProgram = "svg-flatten"; platforms = lib.platforms.linux; @@ -91,7 +91,7 @@ python3Packages.buildPythonApplication { meta = { description = "Directly render SVG overlays into Gerber and Excellon files"; homepage = "https://github.com/jaseg/gerbolyze"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ wulfsta ]; mainProgram = "gerbolyze"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ge/geticons/package.nix b/pkgs/by-name/ge/geticons/package.nix index 8d50d39c9325..1ca57bd976f8 100644 --- a/pkgs/by-name/ge/geticons/package.nix +++ b/pkgs/by-name/ge/geticons/package.nix @@ -23,6 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "CLI utility to get icons for apps on your system or other generic icons by name"; mainProgram = "geticons"; homepage = "https://git.sr.ht/~zethra/geticons"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; }; }) diff --git a/pkgs/by-name/gg/gg-jj/package.nix b/pkgs/by-name/gg/gg-jj/package.nix index 69e7aa478d9f..4d1a93bce638 100644 --- a/pkgs/by-name/gg/gg-jj/package.nix +++ b/pkgs/by-name/gg/gg-jj/package.nix @@ -82,7 +82,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "GUI for the version control system Jujutsu"; homepage = "https://github.com/gulbanana/gg"; changelog = "https://github.com/gulbanana/gg/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; inherit (cargo-tauri.hook.meta) platforms; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "gg"; diff --git a/pkgs/by-name/gh/ghdorker/package.nix b/pkgs/by-name/gh/ghdorker/package.nix index 96c5bf424647..d0ac4064bca7 100644 --- a/pkgs/by-name/gh/ghdorker/package.nix +++ b/pkgs/by-name/gh/ghdorker/package.nix @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { description = "Extensible GitHub dorking tool"; mainProgram = "ghdorker"; homepage = "https://github.com/dtaivpp/ghdorker"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/gi/gir-rs/package.nix b/pkgs/by-name/gi/gir-rs/package.nix index 5bb5ce06c398..a4b16ffd69f6 100644 --- a/pkgs/by-name/gi/gir-rs/package.nix +++ b/pkgs/by-name/gi/gir-rs/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { meta = { description = "Tool to generate rust bindings and user API for glib-based libraries"; homepage = "https://github.com/gtk-rs/gir/"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ anish ]; mainProgram = "gir"; }; diff --git a/pkgs/by-name/gi/git-absorb/package.nix b/pkgs/by-name/gi/git-absorb/package.nix index 711a366e1d26..e2cc2d6c46df 100644 --- a/pkgs/by-name/gi/git-absorb/package.nix +++ b/pkgs/by-name/gi/git-absorb/package.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { homepage = "https://github.com/tummychow/git-absorb"; description = "git commit --fixup, but automatic"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ matthiasbeyer ]; diff --git a/pkgs/by-name/gi/git-credential-manager/package.nix b/pkgs/by-name/gi/git-credential-manager/package.nix index 71cddaeae4cf..bcefa224c2cd 100644 --- a/pkgs/by-name/gi/git-credential-manager/package.nix +++ b/pkgs/by-name/gi/git-credential-manager/package.nix @@ -58,7 +58,7 @@ buildDotnetModule rec { meta = { description = "Secure, cross-platform Git credential storage with authentication to GitHub, Azure Repos, and other popular Git hosting services"; homepage = "https://github.com/git-ecosystem/git-credential-manager"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ _999eagle ]; longDescription = '' diff --git a/pkgs/by-name/gi/git-gr/package.nix b/pkgs/by-name/gi/git-gr/package.nix index fdfd2141f396..5fc3aa0fb75a 100644 --- a/pkgs/by-name/gi/git-gr/package.nix +++ b/pkgs/by-name/gi/git-gr/package.nix @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/9999years/git-gr"; changelog = "https://github.com/9999years/git-gr/releases/tag/v${version}"; description = "Gerrit CLI client"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers._9999years ]; mainProgram = "git-gr"; }; diff --git a/pkgs/by-name/gi/git-metrics/package.nix b/pkgs/by-name/gi/git-metrics/package.nix index d5b1bb5b5590..1072b3574423 100644 --- a/pkgs/by-name/gi/git-metrics/package.nix +++ b/pkgs/by-name/gi/git-metrics/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { homepage = "https://github.com/jdrouet/git-metrics"; description = "Git extension to be able to track metrics about your project, within the git repository"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ matthiasbeyer ]; diff --git a/pkgs/by-name/gi/git-point/package.nix b/pkgs/by-name/gi/git-point/package.nix index 1420708e1cbc..75482bdd8d41 100644 --- a/pkgs/by-name/gi/git-point/package.nix +++ b/pkgs/by-name/gi/git-point/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { lib.maintainers.qyriad lib.maintainers.philiptaron ]; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; sourceProvenance = [ lib.sourceTypes.fromSource ]; platforms = lib.platforms.all; mainProgram = "git-point"; diff --git a/pkgs/by-name/gi/git-privacy/package.nix b/pkgs/by-name/gi/git-privacy/package.nix index 21a2b06b9188..ecd8ed84e55c 100644 --- a/pkgs/by-name/gi/git-privacy/package.nix +++ b/pkgs/by-name/gi/git-privacy/package.nix @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { meta = { description = "Tool to redact Git author and committer dates"; homepage = "https://github.com/EMPRI-DEVOPS/git-privacy"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fab ]; mainProgram = "git-privacy"; }; diff --git a/pkgs/by-name/gi/git-prole/package.nix b/pkgs/by-name/gi/git-prole/package.nix index 42d96fef65ec..e23acdab7709 100644 --- a/pkgs/by-name/gi/git-prole/package.nix +++ b/pkgs/by-name/gi/git-prole/package.nix @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/9999years/git-prole"; changelog = "https://github.com/9999years/git-prole/releases/tag/v${version}"; description = "`git-worktree(1)` manager"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers._9999years ]; mainProgram = "git-prole"; }; diff --git a/pkgs/by-name/gi/git-upstream/package.nix b/pkgs/by-name/gi/git-upstream/package.nix index b63abd7f7981..c2a5f88777ab 100644 --- a/pkgs/by-name/gi/git-upstream/package.nix +++ b/pkgs/by-name/gi/git-upstream/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/9999years/git-upstream"; changelog = "https://github.com/9999years/git-upstream/releases/tag/v${finalAttrs.version}"; description = "Shortcut for `git push --set-upstream`"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers._9999years ]; mainProgram = "git-upstream"; }; diff --git a/pkgs/by-name/gi/git-vanity-hash/package.nix b/pkgs/by-name/gi/git-vanity-hash/package.nix index 6179ecc4a2cc..911893091641 100644 --- a/pkgs/by-name/gi/git-vanity-hash/package.nix +++ b/pkgs/by-name/gi/git-vanity-hash/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage { meta = { homepage = "https://github.com/prasmussen/git-vanity-hash"; description = "Tool for creating commit hashes with a specific prefix"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.kaction ]; mainProgram = "git-vanity-hash"; }; diff --git a/pkgs/by-name/gi/git-workspace/package.nix b/pkgs/by-name/gi/git-workspace/package.nix index 4e8a50ce7305..3c7615de3170 100644 --- a/pkgs/by-name/gi/git-workspace/package.nix +++ b/pkgs/by-name/gi/git-workspace/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Sync personal and work git repositories from multiple providers"; homepage = "https://github.com/orf/git-workspace"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ misuzu ]; mainProgram = "git-workspace"; }; diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix index 2158bd9241a5..ce1fbf8d160e 100644 --- a/pkgs/by-name/gi/gitaly/package.nix +++ b/pkgs/by-name/gi/gitaly/package.nix @@ -98,7 +98,7 @@ buildGoModule ( meta = { homepage = "https://gitlab.com/gitlab-org/gitaly"; description = "Git RPC service for handling all the git calls made by GitLab"; - platforms = lib.platforms.linux ++ [ ]; + platforms = lib.platforms.linux; teams = [ lib.teams.gitlab ]; license = lib.licenses.mit; }; diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix index dfae5dbc37ec..1191c645692f 100644 --- a/pkgs/by-name/gi/gitea/package.nix +++ b/pkgs/by-name/gi/gitea/package.nix @@ -13,14 +13,14 @@ openssh, fetchPnpmDeps, pnpmConfigHook, - pnpm_10, + pnpm_11, stdenv, sqliteSupport ? true, nixosTests, }: let - pnpm = pnpm_10; + pnpm = pnpm_11; frontend = stdenv.mkDerivation (finalAttrs: { pname = "gitea-frontend"; @@ -30,7 +30,7 @@ let inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 4; - hash = "sha256-FroVRhNzCLtbW9Z0s6xr4l0mIX+hY4KOomZAhPILWlY="; + hash = "sha256-VAXSj+AYV6uEdCAD/sEzeydqn4cqNL+ITfrGq41jaLI="; }; nativeBuildInputs = [ @@ -53,18 +53,18 @@ let in buildGoModule (finalAttrs: { pname = "gitea"; - version = "1.26.4"; + version = "1.27.0"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; tag = "v${finalAttrs.version}"; - hash = "sha256-xfLhiQMygYKgSMrvmH2V/LIMeaA4ovOeUDT4RUwhvgo="; + hash = "sha256-Pn1V4U43d4lTKRO7AftgKDDWls2z+3IeZgPBaKZlbow="; }; proxyVendor = true; - vendorHash = "sha256-VyzfBZnxnubNIdf+xwLav4W4DgapcLLKN1aKrZ9NbDg="; + vendorHash = "sha256-YRBMGWKIZgMxOXaXG2bIBj1XzkhSwiMyfRy+yQGw+Bo="; outputs = [ "out" @@ -79,14 +79,14 @@ buildGoModule (finalAttrs: { overrideModAttrs = _: { postPatch = '' substituteInPlace go.mod \ - --replace-fail "go 1.26.3" "go 1.26" + --replace-fail "go 1.26.4" "go 1.26.0" ''; }; postPatch = '' substituteInPlace modules/setting/server.go --subst-var data substituteInPlace go.mod \ - --replace-fail "go 1.26.3" "go 1.26" + --replace-fail "go 1.26.4" "go 1.26.0" ''; subPackages = [ "." ]; @@ -112,6 +112,7 @@ buildGoModule (finalAttrs: { mkdir -p $out cp -R ./options/locale $out/locale + mv $out/bin/gitea{.dev,} wrapProgram $out/bin/gitea \ --prefix PATH : ${ lib.makeBinPath [ diff --git a/pkgs/by-name/gi/gitjacker/package.nix b/pkgs/by-name/gi/gitjacker/package.nix index e97fc4f7e786..ac3f19c6b720 100644 --- a/pkgs/by-name/gi/gitjacker/package.nix +++ b/pkgs/by-name/gi/gitjacker/package.nix @@ -39,7 +39,7 @@ buildGoModule (finalAttrs: { even where directory listings are disabled. ''; homepage = "https://github.com/liamg/gitjacker"; - license = with lib.licenses; [ unlicense ]; + license = lib.licenses.unlicense; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/gi/gitlab-timelogs/package.nix b/pkgs/by-name/gi/gitlab-timelogs/package.nix index 5df5d02c4620..d508ca6946d2 100644 --- a/pkgs/by-name/gi/gitlab-timelogs/package.nix +++ b/pkgs/by-name/gi/gitlab-timelogs/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://github.com/phip1611/gitlab-timelogs"; changelog = "https://github.com/phip1611/gitlab-timelogs/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ blitz phip1611 diff --git a/pkgs/by-name/gi/gitte/package.nix b/pkgs/by-name/gi/gitte/package.nix index 301d404677d9..f6e6d0192c24 100644 --- a/pkgs/by-name/gi/gitte/package.nix +++ b/pkgs/by-name/gi/gitte/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://codeberg.org/ckruse/Gitte"; mainProgram = "gitte"; description = "GTK4/libadwaita Git client"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ckruse diff --git a/pkgs/by-name/gi/gittyup/package.nix b/pkgs/by-name/gi/gittyup/package.nix index 92e92539c16c..cc83cfa7fe7a 100644 --- a/pkgs/by-name/gi/gittyup/package.nix +++ b/pkgs/by-name/gi/gittyup/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Graphical Git client designed to help you understand and manage your source code history"; homepage = "https://murmele.github.io/Gittyup"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fliegendewurst phijor diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index 2b9d3eabec65..fc64a8eddc9a 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "glab"; - version = "1.106.0"; + version = "1.108.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-GO4SeXr/kT8vvg7v/ehreu9g3ZDeXIC7jKB9/Cg4ze4="; + hash = "sha256-JVUeCq21D5ajBiGU+fR6MHGF1Nz6i1aQFUiJZsw2zUI="; leaveDotGit = true; postFetch = '' cd "$out" @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { ''; }; - vendorHash = "sha256-fwsefYGNnx9OkITaZ0Z9Xc+1/Pj4FxEX+194C93d5K0="; + vendorHash = "sha256-Ss5JnTa9KfOw5fElleu+HcDHVW5Bz8QxZ++YrCF2jCY="; ldflags = [ "-s" diff --git a/pkgs/by-name/gl/global-platform-pro/package.nix b/pkgs/by-name/gl/global-platform-pro/package.nix index 67d99f61406f..a6e44b81cadb 100644 --- a/pkgs/by-name/gl/global-platform-pro/package.nix +++ b/pkgs/by-name/gl/global-platform-pro/package.nix @@ -87,7 +87,7 @@ maven.buildMavenPackage rec { fromSource binaryBytecode # deps ]; - license = with lib.licenses; [ lgpl3 ]; + license = lib.licenses.lgpl3; mainProgram = "gp"; }; } diff --git a/pkgs/by-name/gn/gnomecast/package.nix b/pkgs/by-name/gn/gnomecast/package.nix index 0cd942d37a7d..52c4764a50fe 100644 --- a/pkgs/by-name/gn/gnomecast/package.nix +++ b/pkgs/by-name/gn/gnomecast/package.nix @@ -49,7 +49,7 @@ buildPythonApplication { meta = { description = "Native Linux GUI for Chromecasting local files"; homepage = "https://github.com/keredson/gnomecast"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; broken = stdenv.hostPlatform.isDarwin; mainProgram = "gnomecast"; }; diff --git a/pkgs/by-name/gn/gnu-shepherd/package.nix b/pkgs/by-name/gn/gnu-shepherd/package.nix index 3b8be6079788..9a1635b415bf 100644 --- a/pkgs/by-name/gn/gnu-shepherd/package.nix +++ b/pkgs/by-name/gn/gnu-shepherd/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.gnu.org/software/shepherd/"; description = "Service manager that looks after the herd of system services"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ kloenk ]; }; diff --git a/pkgs/by-name/go/go-audit/package.nix b/pkgs/by-name/go/go-audit/package.nix index 5688247ca788..bead40959749 100644 --- a/pkgs/by-name/go/go-audit/package.nix +++ b/pkgs/by-name/go/go-audit/package.nix @@ -23,7 +23,7 @@ buildGoModule (finalAttrs: { meta = { description = "Alternative to the auditd daemon"; homepage = "https://github.com/slackhq/go-audit"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; platforms = lib.platforms.linux; mainProgram = "go-audit"; diff --git a/pkgs/by-name/go/go-cve-search/package.nix b/pkgs/by-name/go/go-cve-search/package.nix index 307f9b5f2d3d..cea8622b7ef1 100644 --- a/pkgs/by-name/go/go-cve-search/package.nix +++ b/pkgs/by-name/go/go-cve-search/package.nix @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { ''; homepage = "https://github.com/s-index/go-cve-search"; changelog = "https://github.com/s-index/go-cve-search/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/go/go-licenses/package.nix b/pkgs/by-name/go/go-licenses/package.nix index bab6b8313b4c..ff47e3c966a8 100644 --- a/pkgs/by-name/go/go-licenses/package.nix +++ b/pkgs/by-name/go/go-licenses/package.nix @@ -50,7 +50,7 @@ buildGoModule (finalAttrs: { description = "Reports on the licenses used by a Go package and its dependencies"; mainProgram = "go-licenses"; homepage = "https://github.com/google/go-licenses"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ Luflosi ]; }; }) diff --git a/pkgs/by-name/go/go365/package.nix b/pkgs/by-name/go/go365/package.nix index 86e06f8ad4cd..c55fce455215 100644 --- a/pkgs/by-name/go/go365/package.nix +++ b/pkgs/by-name/go/go365/package.nix @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { description = "Office 365 enumeration tool"; homepage = "https://github.com/optiv/Go365"; changelog = "https://github.com/optiv/Go365/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "Go365"; }; diff --git a/pkgs/by-name/go/gobi_loader/package.nix b/pkgs/by-name/go/gobi_loader/package.nix index 13f44029265a..96cb504b090b 100644 --- a/pkgs/by-name/go/gobi_loader/package.nix +++ b/pkgs/by-name/go/gobi_loader/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Firmware loader for Qualcomm Gobi USB chipsets"; homepage = "https://www.codon.org.uk/~mjg59/gobi_loader/"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ _0x4A6F ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/go/goeland/package.nix b/pkgs/by-name/go/goeland/package.nix index 4cc79004aea0..9788a3810bec 100644 --- a/pkgs/by-name/go/goeland/package.nix +++ b/pkgs/by-name/go/goeland/package.nix @@ -34,7 +34,7 @@ buildGoModule (finalAttrs: { ''; homepage = "https://github.com/slurdge/goeland"; changelog = "https://github.com/slurdge/goeland/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.sweenu ]; }; }) diff --git a/pkgs/by-name/go/gogdl/package.nix b/pkgs/by-name/go/gogdl/package.nix index 3c5df2a78ba0..85547311f399 100644 --- a/pkgs/by-name/go/gogdl/package.nix +++ b/pkgs/by-name/go/gogdl/package.nix @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "GOG Downloading module for Heroic Games Launcher"; mainProgram = "gogdl"; homepage = "https://github.com/Heroic-Games-Launcher/heroic-gogdl"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/go/gomapenum/package.nix b/pkgs/by-name/go/gomapenum/package.nix index 2247aa56a9be..7dc199b84350 100644 --- a/pkgs/by-name/go/gomapenum/package.nix +++ b/pkgs/by-name/go/gomapenum/package.nix @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { description = "Tools for user enumeration and password bruteforce"; mainProgram = "gomapenum"; homepage = "https://github.com/nodauf/GoMapEnum"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/go/gomobile/package.nix b/pkgs/by-name/go/gomobile/package.nix index 4b00da7f414b..f25c06b753b0 100644 --- a/pkgs/by-name/go/gomobile/package.nix +++ b/pkgs/by-name/go/gomobile/package.nix @@ -71,7 +71,7 @@ buildGoModule { meta = { description = "Tool for building and running mobile apps written in Go"; homepage = "https://pkg.go.dev/golang.org/x/mobile/cmd/gomobile"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ jakubgs ]; }; } diff --git a/pkgs/by-name/go/goofys/package.nix b/pkgs/by-name/go/goofys/package.nix index 0a678d455e2d..3bf49d7232a4 100644 --- a/pkgs/by-name/go/goofys/package.nix +++ b/pkgs/by-name/go/goofys/package.nix @@ -29,7 +29,7 @@ buildGoModule { meta = { homepage = "https://github.com/kahing/goofys"; description = "High-performance, POSIX-ish Amazon S3 file system written in Go"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ ]; broken = stdenv.hostPlatform.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 mainProgram = "goofys"; diff --git a/pkgs/by-name/go/google-cloud-cpp/package.nix b/pkgs/by-name/go/google-cloud-cpp/package.nix index cf3d824a9fd6..a2919dea36d1 100644 --- a/pkgs/by-name/go/google-cloud-cpp/package.nix +++ b/pkgs/by-name/go/google-cloud-cpp/package.nix @@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: { requiredSystemFeatures = [ "big-parallel" ]; meta = { - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; homepage = "https://github.com/googleapis/google-cloud-cpp"; description = "C++ Idiomatic Clients for Google Cloud Platform services"; changelog = "https://github.com/googleapis/google-cloud-cpp/blob/v${finalAttrs.version}/CHANGELOG.md"; diff --git a/pkgs/by-name/go/gopeed/package.nix b/pkgs/by-name/go/gopeed/package.nix index 527cf0124410..25c743f62e52 100644 --- a/pkgs/by-name/go/gopeed/package.nix +++ b/pkgs/by-name/go/gopeed/package.nix @@ -21,7 +21,7 @@ let metaCommon = { description = "Modern download manager"; homepage = "https://github.com/GopeedLab/gopeed"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/gp/gpg-mdp/package.nix b/pkgs/by-name/gp/gpg-mdp/package.nix index 522cbc8852df..e62916a04459 100644 --- a/pkgs/by-name/gp/gpg-mdp/package.nix +++ b/pkgs/by-name/gp/gpg-mdp/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://tamentis.com/projects/mdp/"; changelog = "https://github.com/tamentis/mdp/releases/tag/v${finalAttrs.version}"; - license = [ lib.licenses.isc ]; + license = lib.licenses.isc; description = "Manage your passwords with GnuPG and a text editor"; }; diff --git a/pkgs/by-name/gp/gptcommit/package.nix b/pkgs/by-name/gp/gptcommit/package.nix index 9a923674f43b..dfcf46a392f1 100644 --- a/pkgs/by-name/gp/gptcommit/package.nix +++ b/pkgs/by-name/gp/gptcommit/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Git prepare-commit-msg hook for authoring commit messages with GPT-3"; mainProgram = "gptcommit"; homepage = "https://github.com/zurawiki/gptcommit"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ happysalada ]; platforms = with lib.platforms; all; }; diff --git a/pkgs/by-name/gp/gptscript/package.nix b/pkgs/by-name/gp/gptscript/package.nix index 50f7936a9211..4a992d5fbdee 100644 --- a/pkgs/by-name/gp/gptscript/package.nix +++ b/pkgs/by-name/gp/gptscript/package.nix @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/gptscript-ai/gptscript"; changelog = "https://github.com/gptscript-ai/gptscript/releases/tag/v${finalAttrs.version}"; description = "Build AI assistants that interact with your systems"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ jamiemagee ]; mainProgram = "gptscript"; }; diff --git a/pkgs/by-name/gr/grafx2/package.nix b/pkgs/by-name/gr/grafx2/package.nix index 9574fd771c43..a7505811a3f9 100644 --- a/pkgs/by-name/gr/grafx2/package.nix +++ b/pkgs/by-name/gr/grafx2/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { The program is mostly developed on Haiku, Linux and Windows, but is also portable on many other platforms. ''; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "grafx2-sdl"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/gr/graph-cli/package.nix b/pkgs/by-name/gr/graph-cli/package.nix index 720ec87b7a87..d9d046488eb7 100644 --- a/pkgs/by-name/gr/graph-cli/package.nix +++ b/pkgs/by-name/gr/graph-cli/package.nix @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication (finalAttrs: { meta = { description = "CLI to create graphs from CSV files"; homepage = "https://github.com/mcastorina/graph-cli/"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ leungbk ]; mainProgram = "graph"; }; diff --git a/pkgs/by-name/gr/graphicsmagick/package.nix b/pkgs/by-name/gr/graphicsmagick/package.nix index ef76fb84d481..4c9ab79b4938 100644 --- a/pkgs/by-name/gr/graphicsmagick/package.nix +++ b/pkgs/by-name/gr/graphicsmagick/package.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { including important formats like DPX, GIF, JPEG, JPEG-2000, JXL, PNG, PDF, PNM, TIFF, and WebP. ''; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ambossmann ]; mainProgram = "gm"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/gr/greenx/package.nix b/pkgs/by-name/gr/greenx/package.nix index fb360c6728b8..16c1f586823d 100644 --- a/pkgs/by-name/gr/greenx/package.nix +++ b/pkgs/by-name/gr/greenx/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Library for Green’s function based electronic structure theory calculations"; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; homepage = "https://github.com/nomad-coe/greenX"; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sheepforce ]; diff --git a/pkgs/by-name/gr/greybird/package.nix b/pkgs/by-name/gr/greybird/package.nix index 29bd35504195..f79e3ea6f623 100644 --- a/pkgs/by-name/gr/greybird/package.nix +++ b/pkgs/by-name/gr/greybird/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Grey and blue theme from the Shimmer Project for GTK-based environments"; homepage = "https://github.com/shimmerproject/Greybird"; - license = [ lib.licenses.gpl2Plus ]; # or alternatively: cc-by-nc-sa-30 or later + license = lib.licenses.gpl2Plus; # or alternatively: cc-by-nc-sa-30 or later platforms = lib.platforms.linux; maintainers = [ lib.maintainers.romildo ]; }; diff --git a/pkgs/by-name/gr/gridtracker2/package.nix b/pkgs/by-name/gr/gridtracker2/package.nix index 29e695afb3f9..bd45ad2b1ed2 100644 --- a/pkgs/by-name/gr/gridtracker2/package.nix +++ b/pkgs/by-name/gr/gridtracker2/package.nix @@ -11,13 +11,13 @@ }: buildNpmPackage (finalAttrs: { pname = "gridtracker2"; - version = "2.260705.2"; + version = "2.260714.0"; src = fetchFromGitLab { owner = "gridtracker.org"; repo = "gridtracker2"; tag = "v${finalAttrs.version}"; - hash = "sha256-LYBzoxLCJqbGI8j9nBDFfo9PPTiVDpbT6hM4TJEab1s="; + hash = "sha256-ZY+p86wgjzVNALBt6+Gn68sZ6tNcsq5wo1QykZccPT0="; }; npmDepsHash = "sha256-5h3bswjVf/8JHhwHRFTUfydN7XXtWbxNHTZ0mLL7RT8="; diff --git a/pkgs/by-name/gr/grobi/package.nix b/pkgs/by-name/gr/grobi/package.nix index ff198cf8db35..553b08f25e73 100644 --- a/pkgs/by-name/gr/grobi/package.nix +++ b/pkgs/by-name/gr/grobi/package.nix @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://github.com/fd0/grobi"; description = "Automatically configure monitors/outputs for Xorg via RANDR"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; platforms = lib.platforms.linux; mainProgram = "grobi"; }; diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index a55a869ba160..2fd707cefe94 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -136,7 +136,7 @@ buildGoModule (finalAttrs: { As a vulnerability scanner grype is able to scan the contents of a container image or filesystem to find known vulnerabilities. ''; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab jk diff --git a/pkgs/by-name/gs/gswatcher/package.nix b/pkgs/by-name/gs/gswatcher/package.nix index bafe4c812f8c..539633bde6d4 100644 --- a/pkgs/by-name/gs/gswatcher/package.nix +++ b/pkgs/by-name/gs/gswatcher/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Simple game server monitor and administrative tool"; homepage = "https://github.com/lxndr/gswatcher"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pluiedev ]; }; diff --git a/pkgs/by-name/gt/gt/package.nix b/pkgs/by-name/gt/gt/package.nix index fd62a2b45d99..1eb3dbf13f10 100644 --- a/pkgs/by-name/gt/gt/package.nix +++ b/pkgs/by-name/gt/gt/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Linux command line tool for setting up USB gadgets using configfs"; homepage = "https://github.com/linux-usb-gadgets/gt"; mainProgram = "gt"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/gt/gtk-session-lock/package.nix b/pkgs/by-name/gt/gtk-session-lock/package.nix index f84b82e5bf28..35640bc2cc2e 100644 --- a/pkgs/by-name/gt/gtk-session-lock/package.nix +++ b/pkgs/by-name/gt/gtk-session-lock/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { # The author stated "GTK Session Lock is licensed under the GNU General # Public License version 3.0 or any later version approved by me (Cu3PO42)." # Since we don't know if the author will approve later versions, we mark gpl3Only - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; diff --git a/pkgs/by-name/gu/gui-for-singbox/package.nix b/pkgs/by-name/gu/gui-for-singbox/package.nix index 11b2ef7cf184..8245518cc16e 100644 --- a/pkgs/by-name/gu/gui-for-singbox/package.nix +++ b/pkgs/by-name/gu/gui-for-singbox/package.nix @@ -32,7 +32,7 @@ let metaCommon = { homepage = "https://github.com/GUI-for-Cores/GUI.for.SingBox"; hydraPlatforms = [ ]; # https://gui-for-cores.github.io/guide/#note - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ vollate ]; }; diff --git a/pkgs/by-name/gu/guilt/package.nix b/pkgs/by-name/gu/guilt/package.nix index 53d4e1249f9d..d3c0688368fd 100644 --- a/pkgs/by-name/gu/guilt/package.nix +++ b/pkgs/by-name/gu/guilt/package.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/jeffpc/guilt"; maintainers = with lib.maintainers; [ javimerino ]; - license = [ lib.licenses.gpl2 ]; + license = lib.licenses.gpl2; platforms = lib.platforms.all; mainProgram = "guilt"; }; diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 595bb7bef992..50191ac86634 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -20,18 +20,20 @@ ruby, withUring ? stdenv.hostPlatform.isLinux, liburing, + withZstandard ? true, + zstd, nixosTests, }: stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0-rolling-2026-06-25"; + version = "2.3.0-rolling-2026-06-29"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "58a9a054300a09235df52954101a49573762e0fc"; - hash = "sha256-TofY3JzWM4XNiMqna5KnmtBJETndJ/YY0sFY/0X99GA="; + rev = "edd7a120bfc4af11ac0cbebce2a43cc1f93f9af1"; + hash = "sha256-WQy+v4zpwzgbMxT43+Nd33+YPynyZIwqzVTaknqjCmE="; }; outputs = [ @@ -53,7 +55,8 @@ stdenv.mkDerivation (finalAttrs: { bison ruby ] - ++ lib.optional withUring liburing; + ++ lib.optional withUring liburing + ++ lib.optional withZstandard zstd; buildInputs = [ brotli @@ -64,11 +67,13 @@ stdenv.mkDerivation (finalAttrs: { zlib wslay ] - ++ lib.optional withBrotli brotli; + ++ lib.optional withBrotli brotli + ++ lib.optional withZstandard zstd; cmakeFlags = [ "-DWITH_BROTLI=${if withBrotli then "ON" else "OFF"}" "-DWITH_MRUBY=${if withMruby then "ON" else "OFF"}" + "-DWITH_ZSTD=${if withZstandard then "ON" else "OFF"}" ]; postInstall = '' diff --git a/pkgs/by-name/ha/halfempty/package.nix b/pkgs/by-name/ha/halfempty/package.nix index f0550d84e6f9..b8307f554b38 100644 --- a/pkgs/by-name/ha/halfempty/package.nix +++ b/pkgs/by-name/ha/halfempty/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "halfempty"; homepage = "https://github.com/googleprojectzero/halfempty/"; maintainers = with lib.maintainers; [ fpletz ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ha/harminv/package.nix b/pkgs/by-name/ha/harminv/package.nix index c60ee2b20dff..663bff3c62b5 100644 --- a/pkgs/by-name/ha/harminv/package.nix +++ b/pkgs/by-name/ha/harminv/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Harmonic inversion algorithm of Mandelshtam: decompose signal into sum of decaying sinusoids"; homepage = "https://github.com/NanoComp/harminv"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ sheepforce markuskowa diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix index 731ac2e94f52..9b80f6bfde08 100644 --- a/pkgs/by-name/ha/havn/package.nix +++ b/pkgs/by-name/ha/havn/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "havn"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "mrjackwills"; repo = "havn"; tag = "v${finalAttrs.version}"; - hash = "sha256-9xMrzRfnUA8GG+u255oBhdUWL7NACVtj50QwZuMM4yg="; + hash = "sha256-7VRYZK9QzKmhK4LPFRzf6QwgMwAC9aa6/+Fu/4SLQoo="; }; - cargoHash = "sha256-Fu+AU46AY/96uwKqDQcQ9inp2VZAZnq0YxR8N6wcQ2M="; + cargoHash = "sha256-pGfuKfjU/J52GgX8VmnNi9LLRfhQJagVzADn1bkUSvI="; checkFlags = [ # Skip tests that require network access diff --git a/pkgs/by-name/ha/hax11/package.nix b/pkgs/by-name/ha/hax11/package.nix index b3abacbe9fb4..33b586be1186 100644 --- a/pkgs/by-name/ha/hax11/package.nix +++ b/pkgs/by-name/ha/hax11/package.nix @@ -47,7 +47,7 @@ multiStdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/CyberShadow/hax11"; description = "Hackbrary to Hook and Augment X11 protocol calls"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ cybershadow ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/he/hebbot/package.nix b/pkgs/by-name/he/hebbot/package.nix index bb2469185630..fe4cc079fd7f 100644 --- a/pkgs/by-name/he/hebbot/package.nix +++ b/pkgs/by-name/he/hebbot/package.nix @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Matrix bot which can generate \"This Week in X\" like blog posts "; homepage = "https://github.com/haecker-felix/hebbot"; changelog = "https://github.com/haecker-felix/hebbot/releases/tag/v2.1"; - license = with lib.licenses; [ agpl3Only ]; + license = lib.licenses.agpl3Only; mainProgram = "hebbot"; maintainers = with lib.maintainers; [ a-kenji ]; }; diff --git a/pkgs/by-name/he/hecate/package.nix b/pkgs/by-name/he/hecate/package.nix index 00ff0afaccea..d4c37415ed26 100644 --- a/pkgs/by-name/he/hecate/package.nix +++ b/pkgs/by-name/he/hecate/package.nix @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { inherit (finalAttrs.src.meta) homepage; description = "Terminal hex editor"; longDescription = "The Hex Editor From Hell!"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ramkromberg ]; mainProgram = "hecate"; }; diff --git a/pkgs/by-name/he/heh/package.nix b/pkgs/by-name/he/heh/package.nix index a2d9475ab0ec..64e141311d02 100644 --- a/pkgs/by-name/he/heh/package.nix +++ b/pkgs/by-name/he/heh/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { description = "Cross-platform terminal UI used for modifying file data in hex or ASCII"; homepage = "https://github.com/ndd7xv/heh"; changelog = "https://github.com/ndd7xv/heh/releases/tag/${src.rev}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ piturnah ]; mainProgram = "heh"; }; diff --git a/pkgs/by-name/hf/hfinger/package.nix b/pkgs/by-name/hf/hfinger/package.nix index 92989dc1325f..585b0416a84d 100644 --- a/pkgs/by-name/hf/hfinger/package.nix +++ b/pkgs/by-name/hf/hfinger/package.nix @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { mainProgram = "hfinger"; homepage = "https://github.com/CERT-Polska/hfinger"; changelog = "https://github.com/CERT-Polska/hfinger/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/hi/high-tide/package.nix b/pkgs/by-name/hi/high-tide/package.nix index 1916aaca9438..91ceebb4eefb 100644 --- a/pkgs/by-name/hi/high-tide/package.nix +++ b/pkgs/by-name/hi/high-tide/package.nix @@ -73,7 +73,7 @@ python313Packages.buildPythonApplication (finalAttrs: { meta = { description = "Libadwaita TIDAL client for Linux"; homepage = "https://github.com/Nokse22/high-tide"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "high-tide"; maintainers = with lib.maintainers; [ drafolin diff --git a/pkgs/by-name/hi/hivemind/package.nix b/pkgs/by-name/hi/hivemind/package.nix index 6fd8813dc659..1b0d4315fc2f 100644 --- a/pkgs/by-name/hi/hivemind/package.nix +++ b/pkgs/by-name/hi/hivemind/package.nix @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://github.com/DarthSim/"; description = "Process manager for Procfile-based applications"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.sveitser ]; mainProgram = "hivemind"; }; diff --git a/pkgs/by-name/hk/hk/package.nix b/pkgs/by-name/hk/hk/package.nix index abe884cfe875..b8ed92271a0d 100644 --- a/pkgs/by-name/hk/hk/package.nix +++ b/pkgs/by-name/hk/hk/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hk"; - version = "1.50.0"; + version = "1.51.0"; __structuredAttrs = true; @@ -22,10 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "jdx"; repo = "hk"; tag = "v${finalAttrs.version}"; - hash = "sha256-1sty3JUxiT4UDPmoqR6vql9bQcoSR+xfq3dQzT6u6rY="; + hash = "sha256-kCmujjvh2CACLrzqFal1CFc7RMzECBYsQ4W3ZnJGRV0="; }; - cargoHash = "sha256-oUgAzO7kWVlbw1ZvcjqIdV78tvXQYlV5bwvOSucQvWE="; + cargoHash = "sha256-hICexfvE0swz+g/9r/vR/sG2DUAK5Fj0lDTrkuWujok="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ho/hotdoc/package.nix b/pkgs/by-name/ho/hotdoc/package.nix index 47862db4d978..26576ee89438 100644 --- a/pkgs/by-name/ho/hotdoc/package.nix +++ b/pkgs/by-name/ho/hotdoc/package.nix @@ -115,7 +115,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Tastiest API documentation system"; homepage = "https://hotdoc.github.io/"; - license = [ lib.licenses.lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; maintainers = [ ]; }; } diff --git a/pkgs/by-name/ho/hover/package.nix b/pkgs/by-name/ho/hover/package.nix index 90de28ebf09e..b2718923a68d 100644 --- a/pkgs/by-name/ho/hover/package.nix +++ b/pkgs/by-name/ho/hover/package.nix @@ -48,7 +48,7 @@ let meta = { description = "Build tool to run Flutter applications on desktop"; homepage = "https://github.com/go-flutter-desktop/hover"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.ericdallo ]; }; diff --git a/pkgs/by-name/ht/htmltest/package.nix b/pkgs/by-name/ht/htmltest/package.nix index ff0d289a345e..968a21ddb2bb 100644 --- a/pkgs/by-name/ht/htmltest/package.nix +++ b/pkgs/by-name/ht/htmltest/package.nix @@ -34,7 +34,7 @@ buildGoModule (finalAttrs: { links, images, scripts references work, your alt tags are filled in, etc. ''; homepage = "https://github.com/wjdp/htmltest"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ht/httpdump/package.nix b/pkgs/by-name/ht/httpdump/package.nix index 352e4d14425c..9285923c7f7e 100644 --- a/pkgs/by-name/ht/httpdump/package.nix +++ b/pkgs/by-name/ht/httpdump/package.nix @@ -29,7 +29,7 @@ buildGoModule { description = "Parse and display HTTP traffic from network device or pcap file"; mainProgram = "httpdump"; homepage = "https://github.com/hsiafan/httpdump"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/hu/humility/package.nix b/pkgs/by-name/hu/humility/package.nix index 93a032cc52a4..2dfa7dd81007 100644 --- a/pkgs/by-name/hu/humility/package.nix +++ b/pkgs/by-name/hu/humility/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage { description = "Debugger for Hubris"; mainProgram = "humility"; homepage = "https://github.com/oxidecomputer/humility"; - license = with lib.licenses; [ mpl20 ]; + license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ therishidesai ]; }; } diff --git a/pkgs/by-name/hu/hunspell/dictionaries.nix b/pkgs/by-name/hu/hunspell/dictionaries.nix index 94eee9bece0f..9ca7e0e7a303 100644 --- a/pkgs/by-name/hu/hunspell/dictionaries.nix +++ b/pkgs/by-name/hu/hunspell/dictionaries.nix @@ -884,7 +884,7 @@ rec { meta = { description = "Hunspell dictionary for Russian, updated version as used in Mozilla products"; homepage = "https://github.com/Goudron/ru-spelling-dictionary"; - license = [ lib.licenses.mpl20 ]; + license = lib.licenses.mpl20; }; }; @@ -896,7 +896,7 @@ rec { dictFileName = "cs_CZ"; shortDescription = "Czech (Czechia)"; readmeFile = "README_cs.txt"; - license = with lib.licenses; [ gpl2 ]; + license = lib.licenses.gpl2; }; # SLOVAK @@ -988,7 +988,7 @@ rec { dictFileName = "he_IL"; shortDescription = "Hebrew (Israel)"; readmeFile = "README_he_IL.txt"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; }; # THAI @@ -1008,7 +1008,7 @@ rec { meta = { description = "Hunspell dictionary for Central Thai (Thailand)"; homepage = "https://github.com/SyafiqHadzir/Hunspell-TH"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ toastal ]; # looking for a native speaker platforms = lib.platforms.all; }; @@ -1053,7 +1053,7 @@ rec { sourceRoot = "no"; readmeFile = "README_hyph_NO.txt"; shortDescription = "Norwegian Bokmål (Norway)"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; }; nn_NO = nn-no; @@ -1063,7 +1063,7 @@ rec { sourceRoot = "no"; readmeFile = "README_hyph_NO.txt"; shortDescription = "Norwegian Nynorsk (Norway)"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; }; # TOKI PONA @@ -1121,7 +1121,7 @@ rec { dictFileName = "pt_BR"; shortDescription = "Portuguese (Brazil)"; readmeFile = "README_pt_BR.txt"; - license = with lib.licenses; [ lgpl3 ]; + license = lib.licenses.lgpl3; }; pt_PT = pt-pt; @@ -1194,7 +1194,7 @@ rec { meta = { description = "Hunspell dictionary for ${shortDescription} from rospell"; homepage = "https://sourceforge.net/projects/rospell/"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ Andy3153 ]; }; }; diff --git a/pkgs/by-name/hy/hydra-cli/package.nix b/pkgs/by-name/hy/hydra-cli/package.nix index 549b5eec7d49..8464c3962d9b 100644 --- a/pkgs/by-name/hy/hydra-cli/package.nix +++ b/pkgs/by-name/hy/hydra-cli/package.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Client for the Hydra CI"; mainProgram = "hydra-cli"; homepage = "https://github.com/nlewo/hydra-cli"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ lewo aleksana diff --git a/pkgs/by-name/ib/ibtool/package.nix b/pkgs/by-name/ib/ibtool/package.nix index 7729742bf4c5..9d87e11e4fe4 100644 --- a/pkgs/by-name/ib/ibtool/package.nix +++ b/pkgs/by-name/ib/ibtool/package.nix @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication (finalAttrs: { meta = { description = "Apple's ibtool reimplementation"; homepage = "https://github.com/viraptor/ibtool"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; mainProgram = "ibtool"; maintainers = [ lib.maintainers.viraptor ]; }; diff --git a/pkgs/by-name/ic/icesprog/package.nix b/pkgs/by-name/ic/icesprog/package.nix index a453534f7820..ed02168f6275 100644 --- a/pkgs/by-name/ic/icesprog/package.nix +++ b/pkgs/by-name/ic/icesprog/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "iCESugar FPGA flash utility"; mainProgram = "icesprog"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ RossComputerGuy ]; homepage = "https://github.com/wuxx/icesugar"; }; diff --git a/pkgs/by-name/if/ifwifi/package.nix b/pkgs/by-name/if/ifwifi/package.nix index dd5cba23547a..f1413bb283e7 100644 --- a/pkgs/by-name/if/ifwifi/package.nix +++ b/pkgs/by-name/if/ifwifi/package.nix @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: { project that gave me almost everything I wanted to create this tool. ''; homepage = "https://github.com/araujobsd/ifwifi"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; # networkmanager doesn't work on darwin # even though the `wifiscanner` crate would work diff --git a/pkgs/by-name/ii/iir1/package.nix b/pkgs/by-name/ii/iir1/package.nix index 2eb083070b3a..fb523df04a70 100644 --- a/pkgs/by-name/ii/iir1/package.nix +++ b/pkgs/by-name/ii/iir1/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { description = "DSP IIR realtime filter library written in C++"; downloadPage = "https://github.com/berndporr/iir1"; changelog = "https://github.com/berndporr/iir1/releases/tag/${finalAttrs.src.rev}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/ik/ikill/package.nix b/pkgs/by-name/ik/ikill/package.nix index 9c656b996fb8..1e19b3f531b9 100644 --- a/pkgs/by-name/ik/ikill/package.nix +++ b/pkgs/by-name/ik/ikill/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Interactively kill running processes"; homepage = "https://github.com/pombadev/ikill"; maintainers = with lib.maintainers; [ zendo ]; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; platforms = lib.platforms.linux; mainProgram = "ikill"; }; diff --git a/pkgs/by-name/im/imapdedup/package.nix b/pkgs/by-name/im/imapdedup/package.nix index b275569cb47d..8b620e6b1656 100644 --- a/pkgs/by-name/im/imapdedup/package.nix +++ b/pkgs/by-name/im/imapdedup/package.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Duplicate email message remover"; homepage = "https://github.com/quentinsf/IMAPdedup"; maintainers = with lib.maintainers; [ sigmanificient ]; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; mainProgram = "imapdedup"; }; }) diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix index 7b9f98853290..b3ce78ad5a99 100644 --- a/pkgs/by-name/im/imhex/package.nix +++ b/pkgs/by-name/im/imhex/package.nix @@ -135,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM"; homepage = "https://github.com/WerWolv/ImHex"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ kashw2 cafkafk diff --git a/pkgs/by-name/in/inql/package.nix b/pkgs/by-name/in/inql/package.nix index eeee417289da..1e0114e58d65 100644 --- a/pkgs/by-name/in/inql/package.nix +++ b/pkgs/by-name/in/inql/package.nix @@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { mainProgram = "inql"; homepage = "https://github.com/doyensec/inql"; changelog = "https://github.com/doyensec/inql/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/in/internalallthethings/package.nix b/pkgs/by-name/in/internalallthethings/package.nix index 2a0ea15a2d81..8bac7efd957b 100644 --- a/pkgs/by-name/in/internalallthethings/package.nix +++ b/pkgs/by-name/in/internalallthethings/package.nix @@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation { meta = { homepage = "https://github.com/swisskyrepo/InternalAllTheThings"; description = "Active Directory and Internal Pentest Cheatsheets"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ felbinger ]; platforms = mkdocs.meta.platforms; sourceProvenance = with lib.sourceTypes; [ fromSource ]; diff --git a/pkgs/by-name/in/invidious-router/package.nix b/pkgs/by-name/in/invidious-router/package.nix index 970efb5a1724..3aba1da93f59 100644 --- a/pkgs/by-name/in/invidious-router/package.nix +++ b/pkgs/by-name/in/invidious-router/package.nix @@ -27,7 +27,7 @@ buildGoModule { meta = { homepage = "https://gitlab.com/gaincoder/invidious-router"; description = "Go application that routes requests to different Invidious instances based on their health status and (optional) response time"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ sils ]; mainProgram = "invidious-router"; }; diff --git a/pkgs/by-name/io/ioc-scan/package.nix b/pkgs/by-name/io/ioc-scan/package.nix index 49efb35b8aad..f05ef0c01569 100644 --- a/pkgs/by-name/io/ioc-scan/package.nix +++ b/pkgs/by-name/io/ioc-scan/package.nix @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { description = "Tool to search a filesystem for indicators of compromise (IoC)"; homepage = "https://github.com/cisagov/ioc-scanner"; changelog = "https://github.com/cisagov/ioc-scanner/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ cc0 ]; + license = lib.licenses.cc0; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ip/ipinfo/package.nix b/pkgs/by-name/ip/ipinfo/package.nix index c536cd9ac917..9e21184c787b 100644 --- a/pkgs/by-name/ip/ipinfo/package.nix +++ b/pkgs/by-name/ip/ipinfo/package.nix @@ -24,7 +24,7 @@ buildGoModule rec { description = "Command Line Interface for the IPinfo API"; homepage = "https://github.com/ipinfo/cli"; changelog = "https://github.com/ipinfo/cli/releases/tag/ipinfo-${version}"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/is/iso-flags/package.nix b/pkgs/by-name/is/iso-flags/package.nix index d66e64f1ca16..679cb5edf42e 100644 --- a/pkgs/by-name/is/iso-flags/package.nix +++ b/pkgs/by-name/is/iso-flags/package.nix @@ -45,7 +45,7 @@ stdenvNoCC.mkDerivation { meta = { homepage = "https://github.com/joielechong/iso-country-flags-svg-collection"; description = "248 country flag SVG & PNG icons with different icon styles"; - license = [ lib.licenses.publicDomain ]; + license = lib.licenses.publicDomain; platforms = lib.platforms.linux; # the output assets should work anywhere, but unsure about the tools to build them... maintainers = [ lib.maintainers.mkg20001 ]; }; diff --git a/pkgs/by-name/it/ite-backlight/package.nix b/pkgs/by-name/it/ite-backlight/package.nix index ca2b9ad8b246..65b8a1fb9ec4 100644 --- a/pkgs/by-name/it/ite-backlight/package.nix +++ b/pkgs/by-name/it/ite-backlight/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { This project aims to provide a set of simple utilities for controlling ITE 8291 keyboard backlight controllers. ''; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; homepage = "https://github.com/hexagonal-sun/ite-backlight"; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ hexagonal-sun ]; diff --git a/pkgs/by-name/ja/jackass/package.nix b/pkgs/by-name/ja/jackass/package.nix index 99bba6cbcca1..50e820a7235c 100644 --- a/pkgs/by-name/ja/jackass/package.nix +++ b/pkgs/by-name/ja/jackass/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { PowerUser64 l1npengtul ]; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix index 62f51d330e8a..eafddf6b27f5 100644 --- a/pkgs/by-name/ja/jasper/package.nix +++ b/pkgs/by-name/ja/jasper/package.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { was chosen primarily due to the availability of C development environments for most computing platforms when JasPer was first developed, circa 1999. ''; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "jasper"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/je/jellyfin-tui/package.nix b/pkgs/by-name/je/jellyfin-tui/package.nix index b1fe48e44087..ffbaf54fb7aa 100644 --- a/pkgs/by-name/je/jellyfin-tui/package.nix +++ b/pkgs/by-name/je/jellyfin-tui/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "jellyfin-tui"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "dhonus"; repo = "jellyfin-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-su2zybyRc5Tyi7F+xX/YsWxqz8vLJdX3mAccqKqkRgo="; + hash = "sha256-ZdcAPN+APEnkQbPdLpcQd/fdQnEP6peQ+xdZI5sskSM="; }; - cargoHash = "sha256-euTJMkTPAnPJCAGUWkmcME1w6nOBq0GSUTDFEhE5nIc="; + cargoHash = "sha256-mri4PhYcUTWWKLl39sDhLUsFQFGLUAvDlhKNcj9gTFU="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix index 8d3603432001..96bc793e1172 100644 --- a/pkgs/by-name/jn/jnv/package.nix +++ b/pkgs/by-name/jn/jnv/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Interactive JSON filter using jq"; mainProgram = "jnv"; homepage = "https://github.com/ynqa/jnv"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ nealfennimore nshalman diff --git a/pkgs/by-name/jo/jocalsend/package.nix b/pkgs/by-name/jo/jocalsend/package.nix index ad86d22c6a19..6597f1be5bb7 100644 --- a/pkgs/by-name/jo/jocalsend/package.nix +++ b/pkgs/by-name/jo/jocalsend/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://git.kittencollective.com/nebkor/joecalsend"; description = "Rust terminal client for Localsend"; changelog = "https://git.kittencollective.com/nebkor/joecalsend/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ unfreeRedistributable ]; + license = lib.licenses.unfreeRedistributable; maintainers = with lib.maintainers; [ Cameo007 ]; mainProgram = "jocalsend"; }; diff --git a/pkgs/by-name/jo/john/package.nix b/pkgs/by-name/jo/john/package.nix index 7378febe2b92..0a95f2b97525 100644 --- a/pkgs/by-name/jo/john/package.nix +++ b/pkgs/by-name/jo/john/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation { pname = "john"; - version = "1.9.0-Jumbo-1-unstable-2026-06-07"; + version = "1.9.0-Jumbo-1-unstable-2026-07-07"; src = fetchFromGitHub { owner = "openwall"; repo = "john"; - rev = "309326510e585c7a1340dab2e475c2ebfa6295aa"; - hash = "sha256-9bk5Icnm7PgQdSVrAKWHaKN0POctVKbofR7Aa9T2fXE="; + rev = "b544069b36ac166fb0a2fb19d0dc144ca72da6bb"; + hash = "sha256-dSdezI0+WSufYVLNChNJQ04VzuKczbfBLrI/5smR1fA="; }; patches = lib.optionals withOpenCL [ diff --git a/pkgs/by-name/jp/jpmml-evaluator/package.nix b/pkgs/by-name/jp/jpmml-evaluator/package.nix new file mode 100644 index 000000000000..3ca614f03a80 --- /dev/null +++ b/pkgs/by-name/jp/jpmml-evaluator/package.nix @@ -0,0 +1,56 @@ +{ + lib, + maven, + fetchFromGitHub, + makeBinaryWrapper, + jre_headless, + nix-update-script, +}: + +let + pname = "jpmml-evaluator"; + version = "1.7.7"; +in +maven.buildMavenPackage { + inherit pname version; + strictDeps = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "jpmml"; + repo = "jpmml-evaluator"; + tag = version; + hash = "sha256-DtI/cHmiKVH0IAp3mWJr2sDDjAzM5d9/cBx4KJm74WM="; + }; + + mvnHash = "sha256-PBkRDMPF/btYROGs4bl71wl2em05N6T2Klf1qFZLHDI="; + + nativeBuildInputs = [ + makeBinaryWrapper + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/java $out/bin + cp pmml-evaluator-example/target/pmml-evaluator-example-executable-*.jar $out/share/java/jpmml-evaluator.jar + + makeBinaryWrapper ${jre_headless}/bin/java $out/bin/jpmml-evaluator \ + --add-flags "-jar $out/share/java/jpmml-evaluator.jar" + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Java Evaluator API for PMML"; + homepage = "https://github.com/jpmml/jpmml-evaluator"; + changelog = "https://github.com/jpmml/jpmml-evaluator/releases/tag/${version}"; + license = lib.licenses.agpl3Only; + maintainers = [ lib.maintainers.b-rodrigues ]; + mainProgram = "jpmml-evaluator"; + platforms = lib.platforms.all; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; + }; +} diff --git a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix index c5bd601b5317..cd7e05c817dd 100644 --- a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix +++ b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://git.sr.ht/~hadronized/kak-tree-sitter"; description = "Server that interfaces tree-sitter with kakoune"; mainProgram = "kak-tree-sitter"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ lelgenio ]; }; }) diff --git a/pkgs/by-name/ka/kanji-stroke-order-font/package.nix b/pkgs/by-name/ka/kanji-stroke-order-font/package.nix index e33bac6c9e31..3f88eee860ec 100644 --- a/pkgs/by-name/ka/kanji-stroke-order-font/package.nix +++ b/pkgs/by-name/ka/kanji-stroke-order-font/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { description = "Font containing stroke order diagrams for over 6500 kanji, 180 kana and other characters"; homepage = "https://www.kanji.uk/"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ptrhlm stephen-huan diff --git a/pkgs/by-name/ka/kassert/package.nix b/pkgs/by-name/ka/kassert/package.nix index dd796b047373..9ffdccde0198 100644 --- a/pkgs/by-name/ka/kassert/package.nix +++ b/pkgs/by-name/ka/kassert/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://kamping-site.github.io/kassert/"; downloadPage = "https://github.com/kamping-site/kassert"; changelog = "https://github.com/kamping-site/kasser/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ qbisi ]; }; diff --git a/pkgs/by-name/ke/keycloak-config-cli/package.nix b/pkgs/by-name/ke/keycloak-config-cli/package.nix index df21c7e3715f..f599bfab35b2 100644 --- a/pkgs/by-name/ke/keycloak-config-cli/package.nix +++ b/pkgs/by-name/ke/keycloak-config-cli/package.nix @@ -5,25 +5,33 @@ jre_headless, makeWrapper, nix-update-script, + versionCheckHook, }: -maven.buildMavenPackage rec { +maven.buildMavenPackage (finalAttrs: { pname = "keycloak-config-cli"; - version = "6.4.0"; + version = "6.5.1"; src = fetchFromGitHub { owner = "adorsys"; repo = "keycloak-config-cli"; - tag = "v${version}"; - hash = "sha256-Vg56Dz9U0eAJw+7u90MSZWmMIZttWYGXAwsXZsEfTj8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-dSeLn9YaT0k6Mg8cxmoDoEtvjrzkyETvI4dt+q/Wj3A="; }; - mvnHash = "sha256-tdh8hRqGXI3zuwy55dC3La9dm2naqeCEZT4qcw37iDI="; + mvnHash = "sha256-Ff9ra9ruPJ8PA0bmC8uU8PiNqjtJoR4U04veZAqZ3sM="; - # Tests use MockServer which needs to bind to a local port - __darwinAllowLocalNetworking = true; + # JavaScriptEvaluatorTest needs GraalVM's Truffle engine, which fails to + # initialize on the sandbox JDK (org.graalvm.polyglot.Engine$ImplHolder). + doCheck = false; + + strictDeps = true; + __structuredAttrs = true; nativeBuildInputs = [ makeWrapper ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + installPhase = '' runHook preInstall install -Dm444 target/keycloak-config-cli.jar $out/share/keycloak-config-cli/keycloak-config-cli.jar @@ -36,6 +44,7 @@ maven.buildMavenPackage rec { meta = { homepage = "https://github.com/adorsys/keycloak-config-cli"; + changelog = "https://github.com/adorsys/keycloak-config-cli/releases/tag/v${finalAttrs.version}"; description = "Import YAML/JSON-formatted configuration files into Keycloak"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ @@ -46,4 +55,4 @@ maven.buildMavenPackage rec { mainProgram = "keycloak-config-cli"; platforms = jre_headless.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/ki/kiterunner/package.nix b/pkgs/by-name/ki/kiterunner/package.nix index c30a8e139085..1cb256d51c69 100644 --- a/pkgs/by-name/ki/kiterunner/package.nix +++ b/pkgs/by-name/ki/kiterunner/package.nix @@ -37,7 +37,7 @@ buildGoModule (finalAttrs: { and endpoints in modern applications. ''; homepage = "https://github.com/assetnote/kiterunner"; - license = with lib.licenses; [ agpl3Only ]; + license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ki/kitty-img/package.nix b/pkgs/by-name/ki/kitty-img/package.nix index 96a6da300e1e..a7ede19a6bde 100644 --- a/pkgs/by-name/ki/kitty-img/package.nix +++ b/pkgs/by-name/ki/kitty-img/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Print images inline in kitty"; homepage = "https://git.sr.ht/~zethra/kitty-img"; changelog = "https://git.sr.ht/~zethra/kitty-img/refs/${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ gaykitty ]; mainProgram = "kitty-img"; }; diff --git a/pkgs/by-name/kl/klayout/package.nix b/pkgs/by-name/kl/klayout/package.nix index 6b842a645514..7e6ff18cc50b 100644 --- a/pkgs/by-name/kl/klayout/package.nix +++ b/pkgs/by-name/kl/klayout/package.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "High performance layout viewer and editor with support for GDS and OASIS"; mainProgram = "klayout"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; homepage = "https://www.klayout.de/"; changelog = "https://www.klayout.de/development.html#${finalAttrs.version}"; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/by-name/kn/knowsmore/package.nix b/pkgs/by-name/kn/knowsmore/package.nix index 9c0f9ef1f627..77ea63f6ff98 100644 --- a/pkgs/by-name/kn/knowsmore/package.nix +++ b/pkgs/by-name/kn/knowsmore/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "knowsmore"; - version = "0.1.50"; + version = "0.1.51"; pyproject = true; src = fetchFromGitHub { owner = "helviojunior"; repo = "knowsmore"; tag = "v${finalAttrs.version}"; - hash = "sha256-D3WhlReBwQLU+U/389r5gR73+DNvFiVuSr6NQgG2oFY="; + hash = "sha256-GpFcRLPyWmkqyF4cpsm7uNv2U1TTJI0NoRV6IQQiQw4="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/ko/koodousfinder/package.nix b/pkgs/by-name/ko/koodousfinder/package.nix index 093e90987527..7e987f65c3dc 100644 --- a/pkgs/by-name/ko/koodousfinder/package.nix +++ b/pkgs/by-name/ko/koodousfinder/package.nix @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication { meta = { description = "Tool to allows users to search for and analyze Android apps"; homepage = "https://github.com/HuntDownProject/KoodousFinder"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/ko/kord/package.nix b/pkgs/by-name/ko/kord/package.nix index 0d0cec62fd1a..bff91f9bb568 100644 --- a/pkgs/by-name/ko/kord/package.nix +++ b/pkgs/by-name/ko/kord/package.nix @@ -55,6 +55,6 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Music theory binary and library for Rust"; homepage = "https://github.com/twitchax/kord"; maintainers = with lib.maintainers; [ kidsan ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }) diff --git a/pkgs/by-name/kr/krapslog/package.nix b/pkgs/by-name/kr/krapslog/package.nix index c13ff620d55e..4dac61c7d625 100644 --- a/pkgs/by-name/kr/krapslog/package.nix +++ b/pkgs/by-name/kr/krapslog/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Visualize a log file with sparklines"; homepage = "https://github.com/acj/krapslog-rs"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ yanganto ]; mainProgram = "krapslog"; }; diff --git a/pkgs/by-name/ks/kshutdown/package.nix b/pkgs/by-name/ks/kshutdown/package.nix index f1956581dfc0..2fce0f755dbf 100644 --- a/pkgs/by-name/ks/kshutdown/package.nix +++ b/pkgs/by-name/ks/kshutdown/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://kshutdown.sourceforge.io/"; description = "Graphical shutdown utility for Linux and Windows"; mainProgram = "kshutdown"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ eymeric ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ku/kubeaudit/package.nix b/pkgs/by-name/ku/kubeaudit/package.nix index f476f7ed6e87..c38a64f577f0 100644 --- a/pkgs/by-name/ku/kubeaudit/package.nix +++ b/pkgs/by-name/ku/kubeaudit/package.nix @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { description = "Audit tool for Kubernetes"; homepage = "https://github.com/Shopify/kubeaudit"; changelog = "https://github.com/Shopify/kubeaudit/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "kubeaudit"; }; diff --git a/pkgs/by-name/ku/kubeclarity/package.nix b/pkgs/by-name/ku/kubeclarity/package.nix index d39a9619315f..8121a6ee324e 100644 --- a/pkgs/by-name/ku/kubeclarity/package.nix +++ b/pkgs/by-name/ku/kubeclarity/package.nix @@ -56,7 +56,7 @@ buildGoModule (finalAttrs: { ''; homepage = "https://github.com/openclarity/kubeclarity"; changelog = "https://github.com/openclarity/kubeclarity/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ku/kubernetes-polaris/package.nix b/pkgs/by-name/ku/kubernetes-polaris/package.nix index 2e6b3cf8e50e..5ab1d74f6189 100644 --- a/pkgs/by-name/ku/kubernetes-polaris/package.nix +++ b/pkgs/by-name/ku/kubernetes-polaris/package.nix @@ -49,7 +49,7 @@ buildGoModule (finalAttrs: { description = "Validate and remediate Kubernetes resources to ensure configuration best practices are followed"; mainProgram = "polaris"; homepage = "https://www.fairwinds.com/polaris"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ longer ]; }; }) diff --git a/pkgs/by-name/ku/kubernix/package.nix b/pkgs/by-name/ku/kubernix/package.nix index 991f5870f2d2..4eae332f35a5 100644 --- a/pkgs/by-name/ku/kubernix/package.nix +++ b/pkgs/by-name/ku/kubernix/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Single dependency Kubernetes clusters for local testing, experimenting and development"; mainProgram = "kubernix"; homepage = "https://github.com/saschagrunert/kubernix"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ saschagrunert ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ku/kubesec/package.nix b/pkgs/by-name/ku/kubesec/package.nix index 6ceb33e5ec66..bbfdb5fd052e 100644 --- a/pkgs/by-name/ku/kubesec/package.nix +++ b/pkgs/by-name/ku/kubesec/package.nix @@ -52,7 +52,7 @@ buildGoModule (finalAttrs: { mainProgram = "kubesec"; homepage = "https://github.com/controlplaneio/kubesec"; changelog = "https://github.com/controlplaneio/kubesec/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab jk diff --git a/pkgs/by-name/ku/kubie/package.nix b/pkgs/by-name/ku/kubie/package.nix index 988291d230e2..f3e27bb26eb2 100644 --- a/pkgs/by-name/ku/kubie/package.nix +++ b/pkgs/by-name/ku/kubie/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Shell independent context and namespace switcher for kubectl"; mainProgram = "kubie"; homepage = "https://github.com/kubie-org/kubie"; - license = with lib.licenses; [ zlib ]; + license = lib.licenses.zlib; maintainers = with lib.maintainers; [ illiusdope ]; }; }) diff --git a/pkgs/by-name/kx/kx-aspe-cli/package.nix b/pkgs/by-name/kx/kx-aspe-cli/package.nix index 54ff953c63d4..e7e9d5ac1f46 100644 --- a/pkgs/by-name/kx/kx-aspe-cli/package.nix +++ b/pkgs/by-name/kx/kx-aspe-cli/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Keyoxide profile generator CLI using ASPE"; mainProgram = "kx-aspe"; platforms = lib.platforms.linux; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; maintainers = [ lib.maintainers.nobbz ]; }; }) diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix index b34cfffa956b..44de740f5c71 100644 --- a/pkgs/by-name/la/labwc/package.nix +++ b/pkgs/by-name/la/labwc/package.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/labwc/labwc"; description = "Wayland stacking compositor, inspired by Openbox"; changelog = "https://github.com/labwc/labwc/blob/master/NEWS.md"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "labwc"; maintainers = [ ]; inherit (wayland.meta) platforms; diff --git a/pkgs/by-name/la/lapce/package.nix b/pkgs/by-name/la/lapce/package.nix index f94a88f9bbb5..c4d0d084ae36 100644 --- a/pkgs/by-name/la/lapce/package.nix +++ b/pkgs/by-name/la/lapce/package.nix @@ -107,7 +107,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Lightning-fast and Powerful Code Editor written in Rust"; homepage = "https://github.com/lapce/lapce"; changelog = "https://github.com/lapce/lapce/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; mainProgram = "lapce"; }; }) diff --git a/pkgs/by-name/la/laze/package.nix b/pkgs/by-name/la/laze/package.nix index 0d2803e1ff8d..d673643ed58b 100644 --- a/pkgs/by-name/la/laze/package.nix +++ b/pkgs/by-name/la/laze/package.nix @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "laze"; homepage = "https://github.com/kaspar030/laze"; changelog = "https://github.com/kaspar030/laze/blob/${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dannixon ]; }; }) diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index a11eacfd6409..27bf48fb73a8 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -8,13 +8,13 @@ }: buildGoModule (finalAttrs: { pname = "lazygit"; - version = "0.63.0"; + version = "0.63.1"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazygit"; tag = "v${finalAttrs.version}"; - hash = "sha256-WDGYS2W0FCIDoayafzUjcwTAW+v2jxfJo54kaM6ymCE="; + hash = "sha256-vcpd04DEHmtEJtOOYohxHUgNtQfiChErWmNiQle8pvc="; }; vendorHash = null; diff --git a/pkgs/by-name/la/lazyjournal/package.nix b/pkgs/by-name/la/lazyjournal/package.nix index 7a5b014e8ed7..cd613e21cbc5 100644 --- a/pkgs/by-name/la/lazyjournal/package.nix +++ b/pkgs/by-name/la/lazyjournal/package.nix @@ -34,7 +34,7 @@ buildGoModule { meta = { description = "TUI for journalctl, file system logs, as well as Docker and Podman containers"; homepage = "https://github.com/Lifailon/lazyjournal"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = with lib.platforms; unix ++ windows; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "lazyjournal"; diff --git a/pkgs/by-name/lb/lbreakout2/package.nix b/pkgs/by-name/lb/lbreakout2/package.nix index 22f4500376a9..cc6aa9ccaf75 100644 --- a/pkgs/by-name/lb/lbreakout2/package.nix +++ b/pkgs/by-name/lb/lbreakout2/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://lgames.sourceforge.net/LBreakout2/"; description = "Breakout clone from the LGames series"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "lbreakout2"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/lc/lcalc/package.nix b/pkgs/by-name/lc/lcalc/package.nix index 8ca3e7d23956..e29277b96f37 100644 --- a/pkgs/by-name/lc/lcalc/package.nix +++ b/pkgs/by-name/lc/lcalc/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.com/sagemath/lcalc"; description = "Program for calculating with L-functions"; mainProgram = "lcalc"; - license = with lib.licenses; [ gpl2 ]; + license = lib.licenses.gpl2; teams = [ lib.teams.sage ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/ld/ldapmonitor/package.nix b/pkgs/by-name/ld/ldapmonitor/package.nix index 051d50ff5c82..26556ceeffe9 100644 --- a/pkgs/by-name/ld/ldapmonitor/package.nix +++ b/pkgs/by-name/ld/ldapmonitor/package.nix @@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { mainProgram = "ldapmonitor"; homepage = "https://github.com/p0dalirius/LDAPmonitor"; changelog = "https://github.com/p0dalirius/LDAPmonitor/releases/tag/${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/le/ledmon/package.nix b/pkgs/by-name/le/ledmon/package.nix index 9a69b171b3b0..d6eed318eeea 100644 --- a/pkgs/by-name/le/ledmon/package.nix +++ b/pkgs/by-name/le/ledmon/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/md-raid-utilities/ledmon"; description = "Enclosure LED Utilities"; platforms = lib.platforms.linux; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ sorki ]; }; }) diff --git a/pkgs/by-name/le/lemmy-help/package.nix b/pkgs/by-name/le/lemmy-help/package.nix index 88fcb34d5ddb..0336a0551d61 100644 --- a/pkgs/by-name/le/lemmy-help/package.nix +++ b/pkgs/by-name/le/lemmy-help/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://github.com/numToStr/lemmy-help"; changelog = "https://github.com/numToStr/lemmy-help/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; mainProgram = "lemmy-help"; }; diff --git a/pkgs/by-name/li/libagar/package.nix b/pkgs/by-name/li/libagar/package.nix index 5994aa44a756..b8999c144cc8 100644 --- a/pkgs/by-name/li/libagar/package.nix +++ b/pkgs/by-name/li/libagar/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Cross-platform GUI toolkit"; homepage = "http://libagar.org/index.html"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ramkromberg ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/li/libagar_test/package.nix b/pkgs/by-name/li/libagar_test/package.nix index 2fd663cdb654..210aee5180ae 100644 --- a/pkgs/by-name/li/libagar_test/package.nix +++ b/pkgs/by-name/li/libagar_test/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { description = "Tests for libagar"; mainProgram = "agartest"; homepage = "http://libagar.org/index.html"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ramkromberg ]; platforms = lib.platforms.linux; broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); diff --git a/pkgs/by-name/li/libajantv2/package.nix b/pkgs/by-name/li/libajantv2/package.nix index 492ae821ecdc..dffc8bf3a642 100644 --- a/pkgs/by-name/li/libajantv2/package.nix +++ b/pkgs/by-name/li/libajantv2/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "AJA NTV2 Open Source Static Libs and Headers for building applications that only wish to statically link against"; homepage = "https://github.com/aja-video/libajantv2"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.lukegb ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/li/libamplsolver/package.nix b/pkgs/by-name/li/libamplsolver/package.nix index e836cc9a5741..e96a3604f7ec 100644 --- a/pkgs/by-name/li/libamplsolver/package.nix +++ b/pkgs/by-name/li/libamplsolver/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Library of routines that help solvers work with AMPL"; homepage = "https://ampl.com/netlib/ampl/"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ aanderse ]; # generates header at compile time diff --git a/pkgs/by-name/li/libbacktrace/package.nix b/pkgs/by-name/li/libbacktrace/package.nix index 8ae11fe8a786..0e4f30d052ba 100644 --- a/pkgs/by-name/li/libbacktrace/package.nix +++ b/pkgs/by-name/li/libbacktrace/package.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation { description = "C library that may be linked into a C/C++ program to produce symbolic backtraces"; homepage = "https://github.com/ianlancetaylor/libbacktrace"; maintainers = with lib.maintainers; [ twey ]; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/by-name/li/libdatachannel/package.nix b/pkgs/by-name/li/libdatachannel/package.nix index f0f60aac75b3..b356fa9334c8 100644 --- a/pkgs/by-name/li/libdatachannel/package.nix +++ b/pkgs/by-name/li/libdatachannel/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "C/C++ WebRTC network library featuring Data Channels, Media Transport, and WebSockets"; homepage = "https://libdatachannel.org/"; - license = with lib.licenses; [ mpl20 ]; + license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ erdnaxe ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; diff --git a/pkgs/by-name/li/libedit/package.nix b/pkgs/by-name/li/libedit/package.nix index 11712e641d99..b74e107981a8 100644 --- a/pkgs/by-name/li/libedit/package.nix +++ b/pkgs/by-name/li/libedit/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { provides generic line editing, history, and tokenization functions, similar to those found in GNU Readline. ''; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ corngood ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/li/libgdsii/package.nix b/pkgs/by-name/li/libgdsii/package.nix index d7c011932808..7484d4837a3e 100644 --- a/pkgs/by-name/li/libgdsii/package.nix +++ b/pkgs/by-name/li/libgdsii/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Library and command-line utility for reading GDSII geometry files"; mainProgram = "GDSIIConvert"; homepage = "https://github.com/HomerReid/libGDSII"; - license = [ lib.licenses.gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ sheepforce markuskowa diff --git a/pkgs/by-name/li/libjpeg-tools/package.nix b/pkgs/by-name/li/libjpeg-tools/package.nix index 02b166817efe..53082642fc2d 100644 --- a/pkgs/by-name/li/libjpeg-tools/package.nix +++ b/pkgs/by-name/li/libjpeg-tools/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A complete implementation of 10918-1 (JPEG) coming from jpeg.org (the ISO group) with extensions for HDR, lossless and alpha channel coding standardized as ISO/IEC 18477 (JPEG XT)"; homepage = "https://github.com/thorfdbg/libjpeg"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; changelog = "https://github.com/thorfdbg/libjpeg/README.history"; maintainers = with lib.maintainers; [ bcdarwin ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/li/libmpdclient/package.nix b/pkgs/by-name/li/libmpdclient/package.nix index eb80534dbfe3..48ae8a2a6df4 100644 --- a/pkgs/by-name/li/libmpdclient/package.nix +++ b/pkgs/by-name/li/libmpdclient/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Client library for MPD (music player daemon)"; homepage = "https://www.musicpd.org/libs/libmpdclient/"; changelog = "https://raw.githubusercontent.com/MusicPlayerDaemon/libmpdclient/${finalAttrs.src.rev}/NEWS"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/li/libmt32emu/package.nix b/pkgs/by-name/li/libmt32emu/package.nix index df69448aca61..85f3fbe184f4 100644 --- a/pkgs/by-name/li/libmt32emu/package.nix +++ b/pkgs/by-name/li/libmt32emu/package.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://munt.sourceforge.net/"; description = "Library to emulate Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ OPNA2608 ]; platforms = lib.platforms.unix; # Not tested on ReactOS yet :) }; diff --git a/pkgs/by-name/li/libnghttp2_asio/package.nix b/pkgs/by-name/li/libnghttp2_asio/package.nix index 152d8c0615f6..693716a7920d 100644 --- a/pkgs/by-name/li/libnghttp2_asio/package.nix +++ b/pkgs/by-name/li/libnghttp2_asio/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { OpenSSL. libnghttp2_asio provides both client and server APIs. ''; homepage = "https://github.com/nghttp2/nghttp2-asio"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ izorkin ]; }; } diff --git a/pkgs/by-name/li/libnvme/package.nix b/pkgs/by-name/li/libnvme/package.nix index f58a2d176c04..aaa5214ad200 100644 --- a/pkgs/by-name/li/libnvme/package.nix +++ b/pkgs/by-name/li/libnvme/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { description = "C Library for NVM Express on Linux"; homepage = "https://github.com/linux-nvme/libnvme"; maintainers = with lib.maintainers; [ vifino ]; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/li/libopenshot-audio/package.nix b/pkgs/by-name/li/libopenshot-audio/package.nix index 7288bf804841..b8816e679f1c 100644 --- a/pkgs/by-name/li/libopenshot-audio/package.nix +++ b/pkgs/by-name/li/libopenshot-audio/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { high-quality editing and playback of audio, and is based on the amazing JUCE library. ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/li/libopenshot/package.nix b/pkgs/by-name/li/libopenshot/package.nix index 4d9bdabc6166..1eec1eaf174e 100644 --- a/pkgs/by-name/li/libopenshot/package.nix +++ b/pkgs/by-name/li/libopenshot/package.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { delivering high quality video editing, animation, and playback solutions to the world. API currently supports C++, Python, and Ruby. ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/li/libr3/package.nix b/pkgs/by-name/li/libr3/package.nix index 1145b48362d9..647b91eb1f83 100644 --- a/pkgs/by-name/li/libr3/package.nix +++ b/pkgs/by-name/li/libr3/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "High-performance path dispatching library"; homepage = "https://github.com/c9s/r3"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; }; }) diff --git a/pkgs/by-name/li/librespot/package.nix b/pkgs/by-name/li/librespot/package.nix index 24dd76fd0f1d..8c4a3e7f498f 100644 --- a/pkgs/by-name/li/librespot/package.nix +++ b/pkgs/by-name/li/librespot/package.nix @@ -73,7 +73,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "librespot"; homepage = "https://github.com/librespot-org/librespot"; changelog = "https://github.com/librespot-org/librespot/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ bennofs ]; }; }) diff --git a/pkgs/by-name/li/librewolf-unwrapped/src.json b/pkgs/by-name/li/librewolf-unwrapped/src.json index ee4e908f7de4..bcc4927bcbc6 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/src.json +++ b/pkgs/by-name/li/librewolf-unwrapped/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "152.0.5-1", + "packageVersion": "152.0.6-1", "source": { - "rev": "152.0.5-1", - "hash": "sha256-5f/JkPWOUlfxND9JrPJv9j7UZvfndxi5vLPWZNJwHzk=" + "rev": "152.0.6-1", + "hash": "sha256-O5s1t/ZZVYL/9ik4zyi/kKAQEbSERO6vD1NJzEUmnU4=" }, "firefox": { - "version": "152.0.5", - "hash": "sha512-bPLcfyimo0MPKGbfTKNQY8ut8jTIKjT6ZR4C2QnldB5QzZhv7xvZfUhrUSRMtjmysQNRRog0e/f5T9FtJkzE8g==" + "version": "152.0.6", + "hash": "sha512-xNh3g31wB/thHDjUnZtt07xMXJypALVOci4UDOfs0JJPabXO3H+MH+YC5+/h1xWbAZ3ieZnikjXNYxghuxPmsA==" } } diff --git a/pkgs/by-name/li/libsidplayfp/package.nix b/pkgs/by-name/li/libsidplayfp/package.nix index dab256cfe4ad..2699b6a91c1a 100644 --- a/pkgs/by-name/li/libsidplayfp/package.nix +++ b/pkgs/by-name/li/libsidplayfp/package.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/libsidplayfp/libsidplayfp"; changelog = "https://github.com/libsidplayfp/libsidplayfp/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ramkromberg OPNA2608 diff --git a/pkgs/by-name/li/libspng/package.nix b/pkgs/by-name/li/libspng/package.nix index eb7b69bcbd27..24315abdb844 100644 --- a/pkgs/by-name/li/libspng/package.nix +++ b/pkgs/by-name/li/libspng/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Simple, modern libpng alternative"; homepage = "https://libspng.org/"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ humancalico ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/li/libssh2/package.nix b/pkgs/by-name/li/libssh2/package.nix index 1e987379f73c..7a48067d111d 100644 --- a/pkgs/by-name/li/libssh2/package.nix +++ b/pkgs/by-name/li/libssh2/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Client-side C library implementing the SSH2 protocol"; homepage = "https://www.libssh2.org"; platforms = lib.platforms.all; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; }) diff --git a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix index 82626adf9740..36329fdabc7b 100644 --- a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix +++ b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix @@ -17,14 +17,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "libtorrent-rasterbar"; - version = "2.0.12"; + version = "2.0.13"; src = fetchFromGitHub { owner = "arvidn"; repo = "libtorrent"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-JbNOKzB830VQkZjC8ZAmzbu/7nkAgyD8cOr22uYbIGQ="; + hash = "sha256-0L7C3IY/XA+/vLJjZr47aFdYypevhMn1tzZNvDtOjbw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libversion/package.nix b/pkgs/by-name/li/libversion/package.nix index ba5c0d1ee3db..e9fe43fd2337 100644 --- a/pkgs/by-name/li/libversion/package.nix +++ b/pkgs/by-name/li/libversion/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Advanced version string comparison library"; homepage = "https://github.com/repology/libversion"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ryantm ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/li/libvori/package.nix b/pkgs/by-name/li/libvori/package.nix index 42c00efae9f8..8cc74b367f03 100644 --- a/pkgs/by-name/li/libvori/package.nix +++ b/pkgs/by-name/li/libvori/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Library for Voronoi integration of electron densities"; homepage = "https://brehm-research.de/libvori.php"; - license = with lib.licenses; [ lgpl3Only ]; + license = lib.licenses.lgpl3Only; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.sheepforce ]; }; diff --git a/pkgs/by-name/li/libyang/package.nix b/pkgs/by-name/li/libyang/package.nix index 85ef0f7499e1..1838497f1208 100644 --- a/pkgs/by-name/li/libyang/package.nix +++ b/pkgs/by-name/li/libyang/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { sysrepo or FRRouting projects. ''; homepage = "https://github.com/CESNET/libyang"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ woffs ]; }; diff --git a/pkgs/by-name/li/libz/package.nix b/pkgs/by-name/li/libz/package.nix index 6e351e7bb43e..dfde91c55dfa 100644 --- a/pkgs/by-name/li/libz/package.nix +++ b/pkgs/by-name/li/libz/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://sortix.org/libz/"; description = "Clean fork of zlib"; - license = [ lib.licenses.zlib ]; + license = lib.licenses.zlib; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/li/lief/package.nix b/pkgs/by-name/li/lief/package.nix index d91399f0d52e..4b87c777fb79 100644 --- a/pkgs/by-name/li/lief/package.nix +++ b/pkgs/by-name/li/lief/package.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Library to Instrument Executable Formats"; homepage = "https://lief.quarkslab.com/"; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; platforms = with lib.platforms; linux ++ darwin; maintainers = with lib.maintainers; [ lassulus diff --git a/pkgs/by-name/li/lightning/package.nix b/pkgs/by-name/li/lightning/package.nix index 086ac44f3d53..90646f340256 100644 --- a/pkgs/by-name/li/lightning/package.nix +++ b/pkgs/by-name/li/lightning/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { standardized RISC instruction set inspired by the MIPS and SPARC chips. ''; maintainers = [ ]; - license = with lib.licenses; [ lgpl3Plus ]; + license = lib.licenses.lgpl3Plus; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; # failing tests }; diff --git a/pkgs/by-name/li/linvstmanager/package.nix b/pkgs/by-name/li/linvstmanager/package.nix index 5358d1d975d7..e3ddcdd758c5 100644 --- a/pkgs/by-name/li/linvstmanager/package.nix +++ b/pkgs/by-name/li/linvstmanager/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Graphical companion application for various bridges like LinVst, etc"; mainProgram = "linvstmanager"; homepage = "https://github.com/Goli4thus/linvstmanager"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ GabrielDougherty ]; }; diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index e1ba10303089..114959d2ae80 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://www.live555.com/liveMedia/"; description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)"; changelog = "http://www.live555.com/liveMedia/public/changelog.txt"; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/ll/lla/package.nix b/pkgs/by-name/ll/lla/package.nix index 9d8c38b2578c..094ab30f08a3 100644 --- a/pkgs/by-name/ll/lla/package.nix +++ b/pkgs/by-name/ll/lla/package.nix @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://lla.chaqchase.com"; changelog = "https://github.com/chaqchase/lla/blob/refs/tags/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ pluiedev ]; platforms = lib.platforms.unix; mainProgram = "lla"; diff --git a/pkgs/by-name/lm/lmp/package.nix b/pkgs/by-name/lm/lmp/package.nix index 3fa1b52eefdf..883894c3b63c 100644 --- a/pkgs/by-name/lm/lmp/package.nix +++ b/pkgs/by-name/lm/lmp/package.nix @@ -20,7 +20,7 @@ buildGoModule (finalAttrs: { meta = { description = "Scanning and validation toolkit for the Log4J vulnerability"; homepage = "https://github.com/0xInfection/LogMePwn"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "lmp"; }; diff --git a/pkgs/by-name/lo/loksh/package.nix b/pkgs/by-name/lo/loksh/package.nix index 44d02a14f928..771c3b88d54a 100644 --- a/pkgs/by-name/lo/loksh/package.nix +++ b/pkgs/by-name/lo/loksh/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { vulnerabilities and makes loksh a good fit for resource-constrained systems. ''; - license = with lib.licenses; [ publicDomain ]; + license = lib.licenses.publicDomain; maintainers = with lib.maintainers; [ cameronnemo ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/lp/lpairs2/package.nix b/pkgs/by-name/lp/lpairs2/package.nix index ce1248cd2e26..d2dc5c3851bb 100644 --- a/pkgs/by-name/lp/lpairs2/package.nix +++ b/pkgs/by-name/lp/lpairs2/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://lgames.sourceforge.net/LPairs/"; description = "Matching the pairs - a typical Memory Game"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "lpairs2"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ls/lsb-release/package.nix b/pkgs/by-name/ls/lsb-release/package.nix index 4e5f82c2c8ab..a0d17aae335d 100644 --- a/pkgs/by-name/ls/lsb-release/package.nix +++ b/pkgs/by-name/ls/lsb-release/package.nix @@ -23,7 +23,7 @@ replaceVarsWith { meta = { description = "Prints certain LSB (Linux Standard Base) and Distribution information"; mainProgram = "lsb_release"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ls/lspmux/package.nix b/pkgs/by-name/ls/lspmux/package.nix index 5e3fce8ce39d..a539ba227f48 100644 --- a/pkgs/by-name/ls/lspmux/package.nix +++ b/pkgs/by-name/ls/lspmux/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Share one language server instance between multiple LSP clients to save resources"; mainProgram = "lspmux"; homepage = "https://codeberg.org/p2502/lspmux"; - license = with lib.licenses; [ eupl12 ]; + license = lib.licenses.eupl12; maintainers = with lib.maintainers; [ mrcjkb ]; }; }) diff --git a/pkgs/by-name/lt/ltris/package.nix b/pkgs/by-name/lt/ltris/package.nix index 15c2107a06ea..58abf38148b4 100644 --- a/pkgs/by-name/lt/ltris/package.nix +++ b/pkgs/by-name/lt/ltris/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://lgames.sourceforge.io/LTris/"; description = "Tetris clone from the LGames series"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "ltris2"; maintainers = with lib.maintainers; [ marcin-serwin ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/lu/lumen/package.nix b/pkgs/by-name/lu/lumen/package.nix index af26fb66b206..71962b623652 100644 --- a/pkgs/by-name/lu/lumen/package.nix +++ b/pkgs/by-name/lu/lumen/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lumen"; - version = "2.30.0"; + version = "2.31.0"; __structuredAttrs = true; @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "jnsahaj"; repo = "lumen"; tag = "v${finalAttrs.version}"; - hash = "sha256-EoxMYlWHmuprjjhvj3GyCxGDIcT/d+JMda9j75pqs+k="; + hash = "sha256-RoOCBwmBIOu17h0cB/t69lw1NWGl6chwAEgK4QixsPs="; }; - cargoHash = "sha256-qTFRfy+Wutee5SbaMaqcYjXgr6xZKYYBIuyVA7jAGiY="; + cargoHash = "sha256-RKSFbsqeR+m/VLs1qu6Ln4bZ9prYj5vUoemuLpSe5+M="; strictDeps = true; diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index 7714186e91c0..889b646cff91 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -34,7 +34,7 @@ appimageTools.wrapType2 rec { meta = { description = "Free Minecraft client with mods, cosmetics, and performance boost"; homepage = "https://www.lunarclient.com/"; - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; mainProgram = "lunarclient"; maintainers = with lib.maintainers; [ Technical27 diff --git a/pkgs/by-name/lu/luwen/package.nix b/pkgs/by-name/lu/luwen/package.nix index 35dc01452d8d..f9a80ad2fa3c 100644 --- a/pkgs/by-name/lu/luwen/package.nix +++ b/pkgs/by-name/lu/luwen/package.nix @@ -26,6 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Tenstorrent system interface tools"; homepage = "https://github.com/tenstorrent/luwen"; maintainers = with lib.maintainers; [ RossComputerGuy ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }) diff --git a/pkgs/by-name/lz/lzsa/package.nix b/pkgs/by-name/lz/lzsa/package.nix index ef06433c7860..4b5312125ea0 100644 --- a/pkgs/by-name/lz/lzsa/package.nix +++ b/pkgs/by-name/lz/lzsa/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/emmanuel-marty/lzsa"; description = "Byte-aligned, efficient lossless packer that is optimized for fast decompression on 8-bit micros"; mainProgram = "lzsa"; - license = with lib.licenses; [ cc0 ]; + license = lib.licenses.cc0; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/ma/macchina/package.nix b/pkgs/by-name/ma/macchina/package.nix index 0e3b98afaf39..54d2cb46757f 100644 --- a/pkgs/by-name/ma/macchina/package.nix +++ b/pkgs/by-name/ma/macchina/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Fast, minimal and customizable system information fetcher"; homepage = "https://github.com/Macchina-CLI/macchina"; changelog = "https://github.com/Macchina-CLI/macchina/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ _414owen progrm_jarvis diff --git a/pkgs/by-name/ma/maker-panel/package.nix b/pkgs/by-name/ma/maker-panel/package.nix index 8d6d830396e0..77e76344ed32 100644 --- a/pkgs/by-name/ma/maker-panel/package.nix +++ b/pkgs/by-name/ma/maker-panel/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Make mechanical PCBs by combining shapes together"; homepage = "https://github.com/twitchyliquid64/maker-panel"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/ma/mangayomi/package.nix b/pkgs/by-name/ma/mangayomi/package.nix index dd6f25130177..867070e8222e 100644 --- a/pkgs/by-name/ma/mangayomi/package.nix +++ b/pkgs/by-name/ma/mangayomi/package.nix @@ -27,7 +27,7 @@ let changelog = "https://github.com/kodjodevf/mangayomi/releases/tag/v${version}"; description = "Reading manga, novels, and watching animes"; homepage = "https://github.com/kodjodevf/mangayomi"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ma/mangojuice/package.nix b/pkgs/by-name/ma/mangojuice/package.nix index 2c664aa2506c..85baeb2c27be 100644 --- a/pkgs/by-name/ma/mangojuice/package.nix +++ b/pkgs/by-name/ma/mangojuice/package.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Convenient alternative to GOverlay for setting up MangoHud"; homepage = "https://github.com/radiolamp/mangojuice"; changelog = "https://github.com/radiolamp/mangojuice/releases/tag/${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pluiedev diff --git a/pkgs/by-name/ma/marco/package.nix b/pkgs/by-name/ma/marco/package.nix index 296c681f6282..7e830bfa5c06 100644 --- a/pkgs/by-name/ma/marco/package.nix +++ b/pkgs/by-name/ma/marco/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "MATE default window manager"; homepage = "https://github.com/mate-desktop/marco"; - license = [ lib.licenses.gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/ma/mas/package.nix b/pkgs/by-name/ma/mas/package.nix index fc07f3ad0c03..5e34f52f41bc 100644 --- a/pkgs/by-name/ma/mas/package.nix +++ b/pkgs/by-name/ma/mas/package.nix @@ -15,23 +15,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { __structuredAttrs = true; - src = - let - # nix store prefetch-file https://github.com/mas-cli/mas/releases/download/v$VERSION/mas-$VERSION-$ARCH.pkg - sources = - { - aarch64-darwin = { - arch = "arm64"; - hash = "sha256-vCGKhUyF2eHJVJapayYoe7ZgVrlWiLkPkdBPpi7SG3U="; - }; - } - .${stdenvNoCC.hostPlatform.system} - or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); - in - fetchurl { - url = "https://github.com/mas-cli/mas/releases/download/v${finalAttrs.version}/mas-${finalAttrs.version}-${sources.arch}.pkg"; - inherit (sources) hash; - }; + # nix store prefetch-file https://github.com/mas-cli/mas/releases/download/v$VERSION/mas-$VERSION-arm64.pkg + src = fetchurl { + url = "https://github.com/mas-cli/mas/releases/download/v${finalAttrs.version}/mas-${finalAttrs.version}-arm64.pkg"; + hash = "sha256-vCGKhUyF2eHJVJapayYoe7ZgVrlWiLkPkdBPpi7SG3U="; + }; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ma/mate-calc/package.nix b/pkgs/by-name/ma/mate-calc/package.nix index 3488fd4ba96f..91f18026e381 100644 --- a/pkgs/by-name/ma/mate-calc/package.nix +++ b/pkgs/by-name/ma/mate-calc/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Calculator for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = [ lib.licenses.gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/ma/mate-polkit/package.nix b/pkgs/by-name/ma/mate-polkit/package.nix index 49b7269fae3e..363842c17ebc 100644 --- a/pkgs/by-name/ma/mate-polkit/package.nix +++ b/pkgs/by-name/ma/mate-polkit/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Integrates polkit authentication for MATE desktop"; homepage = "https://mate-desktop.org"; - license = [ lib.licenses.gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/ma/mate-sensors-applet/package.nix b/pkgs/by-name/ma/mate-sensors-applet/package.nix index 536b3c3251fa..a8496deb4f96 100644 --- a/pkgs/by-name/ma/mate-sensors-applet/package.nix +++ b/pkgs/by-name/ma/mate-sensors-applet/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/mate-desktop/mate-sensors-applet"; description = "MATE panel applet for hardware sensors"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/ma/mate-system-monitor/package.nix b/pkgs/by-name/ma/mate-system-monitor/package.nix index bc8715962c5e..06ece55fd14b 100644 --- a/pkgs/by-name/ma/mate-system-monitor/package.nix +++ b/pkgs/by-name/ma/mate-system-monitor/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { description = "System monitor for the MATE desktop"; mainProgram = "mate-system-monitor"; homepage = "https://mate-desktop.org"; - license = [ lib.licenses.gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/ma/mate-tweak/package.nix b/pkgs/by-name/ma/mate-tweak/package.nix index 63cc32afbd25..ee347085be71 100644 --- a/pkgs/by-name/ma/mate-tweak/package.nix +++ b/pkgs/by-name/ma/mate-tweak/package.nix @@ -85,7 +85,7 @@ python3Packages.buildPythonApplication rec { description = "Tweak tool for the MATE Desktop"; homepage = "https://github.com/ubuntu-mate/mate-tweak"; changelog = "https://github.com/ubuntu-mate/mate-tweak/releases/tag/${version}"; - license = [ lib.licenses.gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/ma/mate-user-share/package.nix b/pkgs/by-name/ma/mate-user-share/package.nix index f3e0b3846e5d..8a3acda40b02 100644 --- a/pkgs/by-name/ma/mate-user-share/package.nix +++ b/pkgs/by-name/ma/mate-user-share/package.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { description = "User level public file sharing for the MATE desktop"; mainProgram = "mate-file-share-properties"; homepage = "https://github.com/mate-desktop/mate-user-share"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/ma/matterbridge/package.nix b/pkgs/by-name/ma/matterbridge/package.nix index d847c02f3aa2..edad78b29a8e 100644 --- a/pkgs/by-name/ma/matterbridge/package.nix +++ b/pkgs/by-name/ma/matterbridge/package.nix @@ -22,7 +22,7 @@ buildGoModule { meta = { description = "Simple bridge between Mattermost, IRC, XMPP, Gitter, Slack, Discord, Telegram, Rocket.Chat, Hipchat(via xmpp), Matrix and Steam"; homepage = "https://github.com/42wim/matterbridge"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ryantm ]; mainProgram = "matterbridge"; }; diff --git a/pkgs/by-name/mc/mcap-cli/package.nix b/pkgs/by-name/mc/mcap-cli/package.nix index 65fcd91a4a4b..96aa8e76e35e 100644 --- a/pkgs/by-name/mc/mcap-cli/package.nix +++ b/pkgs/by-name/mc/mcap-cli/package.nix @@ -77,7 +77,7 @@ buildGoModule { meta = { description = "MCAP CLI tool to inspect and fix MCAP files"; homepage = "https://github.com/foxglove/mcap"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ therishidesai ]; diff --git a/pkgs/by-name/md/md4c/package.nix b/pkgs/by-name/md/md4c/package.nix index 32fad6ff5a2a..5447b89d4fb5 100644 --- a/pkgs/by-name/md/md4c/package.nix +++ b/pkgs/by-name/md/md4c/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { - Permissive license: MD4C is available under the MIT license. ''; changelog = "https://github.com/mity/md4c/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; mainProgram = "md2html"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/md/mdbook-open-on-gh/package.nix b/pkgs/by-name/md/mdbook-open-on-gh/package.nix index d922a63a13b8..841918c42094 100644 --- a/pkgs/by-name/md/mdbook-open-on-gh/package.nix +++ b/pkgs/by-name/md/mdbook-open-on-gh/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "mdbook preprocessor to add a open-on-github link on every page"; mainProgram = "mdbook-open-on-gh"; homepage = "https://github.com/badboy/mdbook-open-on-gh"; - license = [ lib.licenses.mpl20 ]; + license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ matthiasbeyer ]; }; }) diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix index 0633a329ed5a..3f55eea140de 100644 --- a/pkgs/by-name/md/mdbook/package.nix +++ b/pkgs/by-name/md/mdbook/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { mainProgram = "mdbook"; homepage = "https://github.com/rust-lang/mdBook"; changelog = "https://github.com/rust-lang/mdBook/blob/v${version}/CHANGELOG.md"; - license = [ lib.licenses.mpl20 ]; + license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ Frostman matthiasbeyer diff --git a/pkgs/by-name/md/mdsh/package.nix b/pkgs/by-name/md/mdsh/package.nix index e5bb0805e79e..297a02e2d957 100644 --- a/pkgs/by-name/md/mdsh/package.nix +++ b/pkgs/by-name/md/mdsh/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Markdown shell pre-processor"; homepage = "https://github.com/zimbatm/mdsh"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ zimbatm ]; mainProgram = "mdsh"; }; diff --git a/pkgs/by-name/me/melonds/package.nix b/pkgs/by-name/me/melonds/package.nix index 4403f9ff44eb..7e1f67e99c3b 100644 --- a/pkgs/by-name/me/melonds/package.nix +++ b/pkgs/by-name/me/melonds/package.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { - (WIP) GBA slot add-ons - and more are planned! ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "melonDS"; maintainers = with lib.maintainers; [ artemist diff --git a/pkgs/by-name/me/messer-slim/package.nix b/pkgs/by-name/me/messer-slim/package.nix index 93f74a7820e9..84ab01605fae 100644 --- a/pkgs/by-name/me/messer-slim/package.nix +++ b/pkgs/by-name/me/messer-slim/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Evolutionary simulation framework"; homepage = "https://messerlab.org/slim/"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ bzizou ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/mg/mgba/package.nix b/pkgs/by-name/mg/mgba/package.nix index 100ef2405845..651badb289a7 100644 --- a/pkgs/by-name/mg/mgba/package.nix +++ b/pkgs/by-name/mg/mgba/package.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { not support. ''; changelog = "https://raw.githubusercontent.com/mgba-emu/mgba/${finalAttrs.src.rev}/CHANGES"; - license = with lib.licenses; [ mpl20 ]; + license = lib.licenses.mpl20; mainProgram = "mgba"; maintainers = with lib.maintainers; [ Gliczy ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/mi/mimeo/package.nix b/pkgs/by-name/mi/mimeo/package.nix index 5edbcdaab098..4ac69cb3519a 100644 --- a/pkgs/by-name/mi/mimeo/package.nix +++ b/pkgs/by-name/mi/mimeo/package.nix @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication { meta = { description = "Open files by MIME-type or file name using regular expressions"; homepage = "https://xyne.dev/projects/mimeo/"; - license = [ lib.licenses.gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.rycee ]; platforms = lib.platforms.unix; mainProgram = "mimeo"; diff --git a/pkgs/by-name/mi/mimikatz/package.nix b/pkgs/by-name/mi/mimikatz/package.nix index 665ea7f82975..320ff1c76db9 100644 --- a/pkgs/by-name/mi/mimikatz/package.nix +++ b/pkgs/by-name/mi/mimikatz/package.nix @@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/gentilkiwi/mimikatz"; description = "Little tool to play with Windows security"; - license = with lib.licenses; [ cc-by-40 ]; + license = lib.licenses.cc-by-40; maintainers = [ ]; platforms = lib.platforms.all; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix index 9c03a3de2a9d..346726ba5716 100644 --- a/pkgs/by-name/mi/minijinja/package.nix +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Command Line Utility to render MiniJinja/Jinja2 templates"; homepage = "https://github.com/mitsuhiko/minijinja"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ psibi ]; changelog = "https://github.com/mitsuhiko/minijinja/blob/${finalAttrs.version}/CHANGELOG.md"; mainProgram = "minijinja-cli"; diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index 56bb57953d04..895e3cc33cee 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -66,7 +66,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "CLI tool to serve files and directories over HTTP"; homepage = "https://github.com/svenstaro/miniserve"; changelog = "https://github.com/svenstaro/miniserve/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ defelo ]; diff --git a/pkgs/by-name/mi/misc-gitology/package.nix b/pkgs/by-name/mi/misc-gitology/package.nix index 2b6c9f735544..df4c21bfb68b 100644 --- a/pkgs/by-name/mi/misc-gitology/package.nix +++ b/pkgs/by-name/mi/misc-gitology/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = { description = "Assortment of scripts around Git"; homepage = "https://github.com/da-x/misc-gitology"; - license = [ lib.licenses.bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ lib.maintainers._9999years ]; }; diff --git a/pkgs/by-name/mi/mixxc/package.nix b/pkgs/by-name/mi/mixxc/package.nix index 7e302d0369f8..d84b7b683227 100644 --- a/pkgs/by-name/mi/mixxc/package.nix +++ b/pkgs/by-name/mi/mixxc/package.nix @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Minimalistic and customizable volume mixer"; homepage = "https://github.com/Elvyria/mixxc"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ daru-san ]; mainProgram = "mixxc"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/mo/mole/package.nix b/pkgs/by-name/mo/mole/package.nix index f704747b45ad..cee2fd9ac470 100644 --- a/pkgs/by-name/mo/mole/package.nix +++ b/pkgs/by-name/mo/mole/package.nix @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { meta = { description = "CLI application to create SSH tunnels"; homepage = "https://github.com/davrodpin/mole"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; broken = stdenv.hostPlatform.isDarwin; # build fails with go > 1.17 mainProgram = "mole"; diff --git a/pkgs/by-name/mo/molotov/package.nix b/pkgs/by-name/mo/molotov/package.nix index c7c018ec04db..39453f9aa5ec 100644 --- a/pkgs/by-name/mo/molotov/package.nix +++ b/pkgs/by-name/mo/molotov/package.nix @@ -26,7 +26,7 @@ appimageTools.wrapType2 { meta = { description = "French TV service"; homepage = "https://www.molotov.tv/"; - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; maintainers = with lib.maintainers; [ apeyroux ]; platforms = [ "x86_64-linux" ]; mainProgram = "molotov"; diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix index 97a400cdfa3f..f7f763729501 100644 --- a/pkgs/by-name/mo/mongodb-ce/package.nix +++ b/pkgs/by-name/mo/mongodb-ce/package.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://www.mongodb.com/docs/upcoming/release-notes/8.2/"; description = "MongoDB is a general purpose, document-based, distributed database"; homepage = "https://www.mongodb.com/"; - license = with lib.licenses; [ sspl ]; + license = lib.licenses.sspl; longDescription = '' MongoDB CE (Community Edition) is a general purpose, document-based, distributed database. It is designed to be flexible and easy to use, with the ability to store data of any structure. diff --git a/pkgs/by-name/mo/morewaita-icon-theme/package.nix b/pkgs/by-name/mo/morewaita-icon-theme/package.nix index 82413b29852c..0cc65fc43082 100644 --- a/pkgs/by-name/mo/morewaita-icon-theme/package.nix +++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix @@ -46,7 +46,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Adwaita style extra icons theme for Gnome Shell"; homepage = "https://github.com/somepaulo/MoreWaita"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pkosel diff --git a/pkgs/by-name/mo/moshi/package.nix b/pkgs/by-name/mo/moshi/package.nix index 964f47f06c9d..2e269857d4f8 100644 --- a/pkgs/by-name/mo/moshi/package.nix +++ b/pkgs/by-name/mo/moshi/package.nix @@ -129,7 +129,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/kyutai-labs/moshi"; # The rust implementation is licensed under Apache # https://github.com/kyutai-labs/moshi/tree/main/rust#license - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; platforms = lib.platforms.all; mainProgram = "moshi-cli"; diff --git a/pkgs/by-name/mo/motif/package.nix b/pkgs/by-name/mo/motif/package.nix index e26a574a4372..13fb70496167 100644 --- a/pkgs/by-name/mo/motif/package.nix +++ b/pkgs/by-name/mo/motif/package.nix @@ -144,7 +144,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://motif.ics.com"; description = "Unix standard widget-toolkit and window-manager"; platforms = lib.platforms.unix; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ qyliss ]; broken = demoSupport && stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16"; }; diff --git a/pkgs/by-name/mo/mousam/package.nix b/pkgs/by-name/mo/mousam/package.nix index 6ae21ef082b4..95be139e716b 100644 --- a/pkgs/by-name/mo/mousam/package.nix +++ b/pkgs/by-name/mo/mousam/package.nix @@ -51,7 +51,7 @@ python3Packages.buildPythonApplication (finalAttrs: { meta = { description = "Beautiful and lightweight weather app based on Python and GTK4"; homepage = "https://amit9838.github.io/mousam"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "mousam"; maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/mo/mov-cli/package.nix b/pkgs/by-name/mo/mov-cli/package.nix index 6c7167681675..4460f24724e3 100644 --- a/pkgs/by-name/mo/mov-cli/package.nix +++ b/pkgs/by-name/mo/mov-cli/package.nix @@ -61,7 +61,7 @@ python3.pkgs.buildPythonPackage (finalAttrs: { meta = { homepage = "https://github.com/mov-cli/mov-cli"; description = "Cli tool to browse and watch movies"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; mainProgram = "mov-cli"; maintainers = with lib.maintainers; [ baitinq ]; }; diff --git a/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix b/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix index 0486eb081bc2..7ed7ef095446 100644 --- a/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix +++ b/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix @@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Dictionary converted from mecab-ipadic-NEologd for Mozc"; homepage = "https://github.com/utuhiro78/mozcdic-ut-neologd"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ pineapplehunter ]; platforms = lib.platforms.all; # this does not need to be separately built diff --git a/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix b/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix index 749fab6a8b55..f7eccc0b4062 100644 --- a/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix +++ b/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix @@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Dictionary converted from SudachiDict for Mozc"; homepage = "https://github.com/utuhiro78/mozcdic-ut-sudachidict"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ pineapplehunter ]; platforms = lib.platforms.all; # this does not need to be separately built diff --git a/pkgs/by-name/mo/mozo/package.nix b/pkgs/by-name/mo/mozo/package.nix index f90066f4e1fe..c6c23e26894a 100644 --- a/pkgs/by-name/mo/mozo/package.nix +++ b/pkgs/by-name/mo/mozo/package.nix @@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication rec { description = "MATE Desktop menu editor"; mainProgram = "mozo"; homepage = "https://github.com/mate-desktop/mozo"; - license = with lib.licenses; [ lgpl2Plus ]; + license = lib.licenses.lgpl2Plus; platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/mp/mpv/scripts/videoclip.nix b/pkgs/by-name/mp/mpv/scripts/videoclip.nix index 762bc7400eca..ee75757f57e8 100644 --- a/pkgs/by-name/mp/mpv/scripts/videoclip.nix +++ b/pkgs/by-name/mp/mpv/scripts/videoclip.nix @@ -10,13 +10,13 @@ }: buildLua { pname = "videoclip"; - version = "0.2-unstable-2026-05-31"; + version = "0.2-unstable-2026-07-07"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "videoclip"; - rev = "d9a3e0966b238b824b86767956eb44a11ac367c6"; - hash = "sha256-NZaflGehxoIf9eY3/p9WrKXXQj3x6GDZ6iMLeu5BhPc="; + rev = "979bae398da7ccd70cb2fb305c371b7af9259b10"; + hash = "sha256-k3fxSeAjRZg4J5x5IQhKGYtUqfBE4heR1KNurGTElGs="; }; patchPhase = '' diff --git a/pkgs/by-name/mt/mt32emu-qt/package.nix b/pkgs/by-name/mt/mt32emu-qt/package.nix index b30c7f30aa3e..e379da4976d4 100644 --- a/pkgs/by-name/mt/mt32emu-qt/package.nix +++ b/pkgs/by-name/mt/mt32emu-qt/package.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: { synthesis and conversion of pre-recorded SMF files to WAVE making use of the mt32emu library and the Qt framework. ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ OPNA2608 ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/mt/mt32emu-smf2wav/package.nix b/pkgs/by-name/mt/mt32emu-smf2wav/package.nix index b694f4fa7ee0..81af98a1a7b4 100644 --- a/pkgs/by-name/mt/mt32emu-smf2wav/package.nix +++ b/pkgs/by-name/mt/mt32emu-smf2wav/package.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://munt.sourceforge.net/"; description = "Produces a WAVE file from a Standard MIDI file (SMF)"; mainProgram = "mt32emu-smf2wav"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ OPNA2608 ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/mu/multimarkdown/package.nix b/pkgs/by-name/mu/multimarkdown/package.nix index 503ab3da9236..249d6ee7b7e3 100644 --- a/pkgs/by-name/mu/multimarkdown/package.nix +++ b/pkgs/by-name/mu/multimarkdown/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { - glossary entries (LaTeX only) - document metadata (e.g. title, author, date, etc.) ''; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.all; maintainers = [ ]; }; diff --git a/pkgs/by-name/mu/multipart-parser-c/package.nix b/pkgs/by-name/mu/multipart-parser-c/package.nix index 5406e880379e..482167366e09 100644 --- a/pkgs/by-name/mu/multipart-parser-c/package.nix +++ b/pkgs/by-name/mu/multipart-parser-c/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "Http multipart parser implemented in C"; homepage = "https://github.com/iafonov/multipart-parser-c"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/by-name/mu/multiqc/package.nix b/pkgs/by-name/mu/multiqc/package.nix index 320da0f89667..b8acb3350220 100644 --- a/pkgs/by-name/mu/multiqc/package.nix +++ b/pkgs/by-name/mu/multiqc/package.nix @@ -114,7 +114,7 @@ python3Packages.buildPythonApplication (finalAttrs: { ''; homepage = "https://multiqc.info"; changelog = "https://github.com/MultiQC/MultiQC/releases/tag/v${finalAttrs.version}/"; - license = [ lib.licenses.gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.apraga ]; mainProgram = "multiqc"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/mu/muso/package.nix b/pkgs/by-name/mu/muso/package.nix index 76ec9e605175..727f2725624e 100644 --- a/pkgs/by-name/mu/muso/package.nix +++ b/pkgs/by-name/mu/muso/package.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage { description = "Automatic music sorter (based on ID3 tags)"; mainProgram = "muso"; homepage = "https://github.com/quebin31/muso"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ crertel ]; }; } diff --git a/pkgs/by-name/mu/mustache-go/package.nix b/pkgs/by-name/mu/mustache-go/package.nix index 509484983afa..2e88898d9693 100644 --- a/pkgs/by-name/mu/mustache-go/package.nix +++ b/pkgs/by-name/mu/mustache-go/package.nix @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://github.com/cbroglie/mustache"; description = "Mustache template language in Go"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ Zimmi48 ]; mainProgram = "mustache"; }; diff --git a/pkgs/by-name/na/nats-top/package.nix b/pkgs/by-name/na/nats-top/package.nix index 18fdd1b7dd0a..1be44955424d 100644 --- a/pkgs/by-name/na/nats-top/package.nix +++ b/pkgs/by-name/na/nats-top/package.nix @@ -36,7 +36,7 @@ buildGoModule (finalAttrs: { description = "top-like tool for monitoring NATS servers"; homepage = "https://github.com/nats-io/nats-top"; changelog = "https://github.com/nats-io/nats-top/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "nats-top"; }; diff --git a/pkgs/by-name/nb/nbutools/package.nix b/pkgs/by-name/nb/nbutools/package.nix index 0c96e540bea2..e34468024fca 100644 --- a/pkgs/by-name/nb/nbutools/package.nix +++ b/pkgs/by-name/nb/nbutools/package.nix @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication { meta = { description = "Tools for offensive security of NetBackup infrastructures"; homepage = "https://github.com/airbus-seclab/nbutools"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/ne/nerva/package.nix b/pkgs/by-name/ne/nerva/package.nix index 07be8a91c966..d9ba85e22c02 100644 --- a/pkgs/by-name/ne/nerva/package.nix +++ b/pkgs/by-name/ne/nerva/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "nerva"; - version = "1.40.1"; + version = "1.40.2"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = "nerva"; tag = "v${finalAttrs.version}"; - hash = "sha256-JiTTcrdiH/gKt/7/PybUWBN4Qwn+5cmfE9VLwWmsuMk="; + hash = "sha256-znkY0R3g8ueazxx+ljCAdsBMkY1FmKn8R9GLYYIY2cA="; }; vendorHash = "sha256-Z0MSD+1/1VzrJ+pz5x0JvxrCxtJe59ckaTqHK/+TVN8="; diff --git a/pkgs/by-name/ne/netsniff-ng/package.nix b/pkgs/by-name/ne/netsniff-ng/package.nix index 8f6438b9adbd..fb8a4014b730 100644 --- a/pkgs/by-name/ne/netsniff-ng/package.nix +++ b/pkgs/by-name/ne/netsniff-ng/package.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { development and analysis, debugging, auditing or network reconnaissance. ''; homepage = "http://netsniff-ng.org/"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix b/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix index d0bc1b54563b..ee4e267442a0 100644 --- a/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix +++ b/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ lib.maintainers.viraptor ]; description = "Neural Amp Modeler LV2 plugin implementation"; homepage = finalAttrs.src.meta.homepage; - license = [ lib.licenses.gpl3 ]; + license = lib.licenses.gpl3; }; }) diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 67f424342b6a..0f60677bb40c 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -197,7 +197,7 @@ buildDotnetModule (finalAttrs: { mainProgram = "NexusMods.App"; homepage = "https://github.com/Nexus-Mods/NexusMods.App"; changelog = "https://github.com/Nexus-Mods/NexusMods.App/releases/tag/${finalAttrs.src.tag}"; - license = [ lib.licenses.gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ l0b0 MattSturgeon diff --git a/pkgs/by-name/nf/nflz/package.nix b/pkgs/by-name/nf/nflz/package.nix index 43196b9c0ff2..09f11ba1de8b 100644 --- a/pkgs/by-name/nf/nflz/package.nix +++ b/pkgs/by-name/nf/nflz/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { belong to a set of ordered files. An example are photos from a camera. ''; homepage = "https://github.com/phip1611/nflz"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ phip1611 ]; mainProgram = "nflz"; }; diff --git a/pkgs/by-name/nf/nfpm/package.nix b/pkgs/by-name/nf/nfpm/package.nix index c5d196bcaca0..1fab8eb455e6 100644 --- a/pkgs/by-name/nf/nfpm/package.nix +++ b/pkgs/by-name/nf/nfpm/package.nix @@ -49,7 +49,7 @@ buildGoModule (finalAttrs: { techknowlogick caarlos0 ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "nfpm"; }; }) diff --git a/pkgs/by-name/ni/nim-atlas/package.nix b/pkgs/by-name/ni/nim-atlas/package.nix index 4c8d92b3e095..bc35b46ba46d 100644 --- a/pkgs/by-name/ni/nim-atlas/package.nix +++ b/pkgs/by-name/ni/nim-atlas/package.nix @@ -23,7 +23,7 @@ buildNimPackage ( meta = final.src.meta // { description = "Nim package cloner"; mainProgram = "atlas"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; }; } ) diff --git a/pkgs/by-name/ni/nimdow/package.nix b/pkgs/by-name/ni/nimdow/package.nix index 4e11d9a0d11d..475a5b7061d0 100644 --- a/pkgs/by-name/ni/nimdow/package.nix +++ b/pkgs/by-name/ni/nimdow/package.nix @@ -46,7 +46,7 @@ buildNimPackage (finalAttrs: { finalAttrs.src.meta // { description = "Nim based tiling window manager"; platforms = lib.platforms.linux; - license = [ lib.licenses.gpl2 ]; + license = lib.licenses.gpl2; maintainers = [ lib.maintainers.marcusramberg ]; mainProgram = "nimdow"; }; diff --git a/pkgs/by-name/ni/ninjas2/package.nix b/pkgs/by-name/ni/ninjas2/package.nix index 149a6c2c02e7..eb5d27294012 100644 --- a/pkgs/by-name/ni/ninjas2/package.nix +++ b/pkgs/by-name/ni/ninjas2/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/clearly-broken-software/ninjas2"; description = "Sample slicer plugin for LV2, VST, and jack standalone"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; mainProgram = "ninjas2"; diff --git a/pkgs/by-name/ni/nitrokey-udev-rules/package.nix b/pkgs/by-name/ni/nitrokey-udev-rules/package.nix index ee66ef3a3618..5bb74b7f114d 100644 --- a/pkgs/by-name/ni/nitrokey-udev-rules/package.nix +++ b/pkgs/by-name/ni/nitrokey-udev-rules/package.nix @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "udev rules for Nitrokey devices"; homepage = "https://github.com/Nitrokey/nitrokey-udev-rules"; - license = [ lib.licenses.cc0 ]; + license = lib.licenses.cc0; maintainers = with lib.maintainers; [ robinkrahl ]; diff --git a/pkgs/by-name/ni/nix-index-unwrapped/package.nix b/pkgs/by-name/ni/nix-index-unwrapped/package.nix index 060f79e0ff17..8492d81443fa 100644 --- a/pkgs/by-name/ni/nix-index-unwrapped/package.nix +++ b/pkgs/by-name/ni/nix-index-unwrapped/package.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Files database for nixpkgs"; homepage = "https://github.com/nix-community/nix-index"; changelog = "https://github.com/nix-community/nix-index/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ bennofs ncfavier diff --git a/pkgs/by-name/ni/nix-playground/package.nix b/pkgs/by-name/ni/nix-playground/package.nix index b816714ee882..8beb4f1a4438 100644 --- a/pkgs/by-name/ni/nix-playground/package.nix +++ b/pkgs/by-name/ni/nix-playground/package.nix @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { mainProgram = "np"; homepage = "https://github.com/LaunchPlatform/nix-playground"; changelog = "https://github.com/LaunchPlatform/nix-playground/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fangpen ]; }; }) diff --git a/pkgs/by-name/ni/nix-query-tree-viewer/package.nix b/pkgs/by-name/ni/nix-query-tree-viewer/package.nix index dfb27ae232a6..f0f85837d794 100644 --- a/pkgs/by-name/ni/nix-query-tree-viewer/package.nix +++ b/pkgs/by-name/ni/nix-query-tree-viewer/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "GTK viewer for the output of `nix store --query --tree`"; mainProgram = "nix-query-tree-viewer"; homepage = "https://github.com/cdepillabout/nix-query-tree-viewer"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ cdepillabout ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/ni/nix-visualize/package.nix b/pkgs/by-name/ni/nix-visualize/package.nix index c031036333ca..c81babd85732 100644 --- a/pkgs/by-name/ni/nix-visualize/package.nix +++ b/pkgs/by-name/ni/nix-visualize/package.nix @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication { description = "Generate dependency graphs of a given nix package"; mainProgram = "nix-visualize"; homepage = "https://github.com/craigmbooth/nix-visualize"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ henrirosten ]; }; } diff --git a/pkgs/by-name/ni/nix-your-shell/package.nix b/pkgs/by-name/ni/nix-your-shell/package.nix index da3cc7c51d86..3dedca30b6e2 100644 --- a/pkgs/by-name/ni/nix-your-shell/package.nix +++ b/pkgs/by-name/ni/nix-your-shell/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "`nix` and `nix-shell` wrapper for shells other than `bash`"; homepage = "https://github.com/MercuryTechnologies/nix-your-shell"; changelog = "https://github.com/MercuryTechnologies/nix-your-shell/releases/tag/v${finalAttrs.version}"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ _9999years ]; }; }) diff --git a/pkgs/by-name/ni/nixdoc/package.nix b/pkgs/by-name/ni/nixdoc/package.nix index 3d6c90120f14..0bb18b86aacd 100644 --- a/pkgs/by-name/ni/nixdoc/package.nix +++ b/pkgs/by-name/ni/nixdoc/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Generate documentation for Nix functions"; mainProgram = "nixdoc"; homepage = "https://github.com/nix-community/nixdoc"; - license = [ lib.licenses.gpl3 ]; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ infinisil hsjobeki diff --git a/pkgs/by-name/ni/nixtamal/package.nix b/pkgs/by-name/ni/nixtamal/package.nix index 09a6e4687fe7..4e3a206bcb08 100644 --- a/pkgs/by-name/ni/nixtamal/package.nix +++ b/pkgs/by-name/ni/nixtamal/package.nix @@ -144,7 +144,7 @@ ocamlPackages.buildDunePackage (finalAttrs: { }; meta = { - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; mainProgram = "nixtamal"; outputsToInstall = [ diff --git a/pkgs/by-name/nm/nmh/package.nix b/pkgs/by-name/nm/nmh/package.nix index 49c9f935a20f..9ab44d38ce02 100644 --- a/pkgs/by-name/nm/nmh/package.nix +++ b/pkgs/by-name/nm/nmh/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://nmh.nongnu.org/"; downloadPage = "https://download.savannah.nongnu.org/releases/nmh/"; changelog = "https://savannah.nongnu.org/news/?group=nmh"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; longDescription = '' This is the nmh mail user agent (reader/sender), a command-line based mail reader that is powerful and extensible. nmh is an excellent choice diff --git a/pkgs/by-name/no/nohang/package.nix b/pkgs/by-name/no/nohang/package.nix index 3b9e01a12043..aacbd3c14357 100644 --- a/pkgs/by-name/no/nohang/package.nix +++ b/pkgs/by-name/no/nohang/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/hakavlad/nohang"; description = "Sophisticated low memory handler for Linux"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "nohang"; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ Dev380 ]; diff --git a/pkgs/by-name/no/nomacs/package.nix b/pkgs/by-name/no/nomacs/package.nix index 2ec5f4154826..423622825096 100644 --- a/pkgs/by-name/no/nomacs/package.nix +++ b/pkgs/by-name/no/nomacs/package.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { between images. ''; changelog = "https://github.com/nomacs/nomacs/releases/tag/${finalAttrs.src.rev}"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "nomacs"; maintainers = with lib.maintainers; [ mindavi diff --git a/pkgs/by-name/no/nosqli/package.nix b/pkgs/by-name/no/nosqli/package.nix index 2bf5a55ec61d..154e3d6d51dc 100644 --- a/pkgs/by-name/no/nosqli/package.nix +++ b/pkgs/by-name/no/nosqli/package.nix @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { description = "NoSql Injection tool for finding vulnerable websites using MongoDB"; mainProgram = "nosqli"; homepage = "https://github.com/Charlie-belmer/nosqli"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix b/pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix index 1cc052beeeee..3c2be5e1c90f 100644 --- a/pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix +++ b/pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Monochrome emoji font"; homepage = "https://fonts.google.com/noto/specimen/Noto+Emoji"; - license = [ lib.licenses.ofl ]; + license = lib.licenses.ofl; maintainers = [ lib.maintainers.nicoo ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/no/novelwriter/package.nix b/pkgs/by-name/no/novelwriter/package.nix index bfa500012e6a..0a8e6a4da2a6 100644 --- a/pkgs/by-name/no/novelwriter/package.nix +++ b/pkgs/by-name/no/novelwriter/package.nix @@ -58,7 +58,7 @@ python3.pkgs.buildPythonApplication { description = "Open source plain text editor designed for writing novels"; homepage = "https://novelwriter.io"; changelog = "https://github.com/vkbo/novelWriter/blob/main/CHANGELOG.md"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "novelwriter"; diff --git a/pkgs/by-name/ns/nsc/package.nix b/pkgs/by-name/ns/nsc/package.nix index 7b4371ea366c..2138cf274aba 100644 --- a/pkgs/by-name/ns/nsc/package.nix +++ b/pkgs/by-name/ns/nsc/package.nix @@ -56,7 +56,7 @@ buildGoModule rec { meta = { description = "Tool for creating NATS account and user access configurations"; homepage = "https://github.com/nats-io/nsc"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ cbrewster ]; mainProgram = "nsc"; }; diff --git a/pkgs/by-name/nt/ntfs2btrfs/package.nix b/pkgs/by-name/nt/ntfs2btrfs/package.nix index 7ad2579512c4..730eb51e9912 100644 --- a/pkgs/by-name/nt/ntfs2btrfs/package.nix +++ b/pkgs/by-name/nt/ntfs2btrfs/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "CLI tool which does in-place conversion of Microsoft's NTFS filesystem to the open-source filesystem Btrfs"; homepage = "https://github.com/maharmstone/ntfs2btrfs"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ j1nxie ]; mainProgram = "ntfs2btrfs"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/nt/ntlmrecon/package.nix b/pkgs/by-name/nt/ntlmrecon/package.nix index 17f1ae8bbcd1..1a0f8a9b7161 100644 --- a/pkgs/by-name/nt/ntlmrecon/package.nix +++ b/pkgs/by-name/nt/ntlmrecon/package.nix @@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { mainProgram = "ntlmrecon"; homepage = "https://github.com/pwnfoo/NTLMRecon"; changelog = "https://github.com/pwnfoo/NTLMRecon/releases/tag/v-${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/nt/ntp/package.nix b/pkgs/by-name/nt/ntp/package.nix index ea7fda8098a9..e36dad33bf80 100644 --- a/pkgs/by-name/nt/ntp/package.nix +++ b/pkgs/by-name/nt/ntp/package.nix @@ -52,10 +52,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.ntp.org/"; description = "Implementation of the Network Time Protocol"; - license = { - # very close to isc and bsd2 - url = "https://www.eecis.udel.edu/~mills/ntp/html/copyright.html"; - }; + license = lib.licenses.AND [ + lib.licenses.ntp + lib.licenses.bsd2 + ]; maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/nv/nv-codec-headers/package.nix b/pkgs/by-name/nv/nv-codec-headers/package.nix index 1e0ae0656ebc..5aaad8a20871 100644 --- a/pkgs/by-name/nv/nv-codec-headers/package.nix +++ b/pkgs/by-name/nv/nv-codec-headers/package.nix @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation { description = "FFmpeg version of headers for NVENC - major version ${pick.version}"; homepage = "https://ffmpeg.org/"; downloadPage = "https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/nv/nvfancontrol/package.nix b/pkgs/by-name/nv/nvfancontrol/package.nix index 1d79639b80bd..bded96ad5490 100644 --- a/pkgs/by-name/nv/nvfancontrol/package.nix +++ b/pkgs/by-name/nv/nvfancontrol/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { description = "Nvidia dynamic fan control for Linux"; homepage = "https://github.com/foucault/nvfancontrol"; changelog = "https://github.com/foucault/nvfancontrol/releases/tag/${version}"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ devins2518 ]; mainProgram = "nvfancontrol"; diff --git a/pkgs/by-name/nw/nwg-drawer/package.nix b/pkgs/by-name/nw/nwg-drawer/package.nix index 342e6566c2b3..d62dc4c9b861 100644 --- a/pkgs/by-name/nw/nwg-drawer/package.nix +++ b/pkgs/by-name/nw/nwg-drawer/package.nix @@ -63,7 +63,7 @@ buildGoModule { description = "Application drawer for sway Wayland compositor"; homepage = "https://github.com/nwg-piotr/nwg-drawer"; changelog = "https://github.com/nwg-piotr/nwg-drawer/releases/tag/${src.rev}"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; mainProgram = "nwg-drawer"; maintainers = [ ]; platforms = with lib.platforms; linux; diff --git a/pkgs/by-name/nz/nzportable/assets.nix b/pkgs/by-name/nz/nzportable/assets.nix index 3161c24a7af5..3474f8145f8d 100644 --- a/pkgs/by-name/nz/nzportable/assets.nix +++ b/pkgs/by-name/nz/nzportable/assets.nix @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Game asset repository for Nazi Zombies: Portable"; homepage = "https://github.com/nzp-team/assets"; - license = with lib.licenses; [ cc-by-sa-40 ]; + license = lib.licenses.cc-by-sa-40; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ pluiedev ]; }; diff --git a/pkgs/by-name/oc/oci2git/package.nix b/pkgs/by-name/oc/oci2git/package.nix index 67de8e4ab9e2..e62c45995245 100644 --- a/pkgs/by-name/oc/oci2git/package.nix +++ b/pkgs/by-name/oc/oci2git/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Introspecting Docker images as easy as using Git"; homepage = "https://github.com/Virviil/oci2git"; changelog = "https://github.com/Virviil/oci2git/releases/tag/v${finalAttrs.version}"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.kpbaks ]; mainProgram = "oci2git"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/oe/oed/package.nix b/pkgs/by-name/oe/oed/package.nix index fe96dc2f906a..fc47875ee2d8 100644 --- a/pkgs/by-name/oe/oed/package.nix +++ b/pkgs/by-name/oe/oed/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Portable ed editor from OpenBSD"; homepage = "https://github.com/ibara/oed"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; mainProgram = "ed"; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/oh/oh-my-git/package.nix b/pkgs/by-name/oh/oh-my-git/package.nix index 26cfeef71534..6915d8dc4d51 100644 --- a/pkgs/by-name/oh/oh-my-git/package.nix +++ b/pkgs/by-name/oh/oh-my-git/package.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { homepage = "https://ohmygit.org/"; description = "Interactive Git learning game"; mainProgram = "oh-my-git"; - license = with lib.licenses; [ blueOak100 ]; + license = lib.licenses.blueOak100; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ jojosch ]; }; diff --git a/pkgs/by-name/on/oneko/package.nix b/pkgs/by-name/on/oneko/package.nix index c43f40b3fac6..6f28b27d4172 100644 --- a/pkgs/by-name/on/oneko/package.nix +++ b/pkgs/by-name/on/oneko/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { When the cat is done catching the mouse, it starts sleeping. ''; homepage = "https://github.com/IreneKnapp/oneko"; - license = with lib.licenses; [ publicDomain ]; + license = lib.licenses.publicDomain; maintainers = with lib.maintainers; [ xaverdh irenes diff --git a/pkgs/by-name/oo/ooklaserver/package.nix b/pkgs/by-name/oo/ooklaserver/package.nix index 34c3fc8e0949..53604b67e2f1 100644 --- a/pkgs/by-name/oo/ooklaserver/package.nix +++ b/pkgs/by-name/oo/ooklaserver/package.nix @@ -8,7 +8,6 @@ let filenameMapping = { "x86_64-linux" = "OoklaServer-linux-x86_64-static-musl.zip"; "aarch64-linux" = "OoklaServer-linux-aarch64-static-musl.zip"; - # Mach-O universal binary with 2 architectures: [x86_64:Mach-O 64-bit executable x86_64] [arm64] "aarch64-darwin" = "OoklaServer-macosx.zip"; "x86_64-windows" = "OoklaServer-windows64.zip"; "i686-windows" = "OoklaServer-windows32.zip"; diff --git a/pkgs/by-name/op/openapv/package.nix b/pkgs/by-name/op/openapv/package.nix index 27d31127a004..949b98b7dbac 100644 --- a/pkgs/by-name/op/openapv/package.nix +++ b/pkgs/by-name/op/openapv/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/AcademySoftwareFoundation/openapv/releases/tag/v${finalAttrs.version}"; description = "Reference implementation of the APV codec"; homepage = "https://github.com/AcademySoftwareFoundation/openapv"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ pyrox0 ]; }; }) diff --git a/pkgs/by-name/op/opencomposite/package.nix b/pkgs/by-name/op/opencomposite/package.nix index 1afa20c3e3e8..6a05be08e1c8 100644 --- a/pkgs/by-name/op/opencomposite/package.nix +++ b/pkgs/by-name/op/opencomposite/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Reimplementation of OpenVR, translating calls to OpenXR"; homepage = "https://gitlab.com/znixian/OpenOVR"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ Scrumplex ]; # This can realistically only work on systems that support OpenXR Loader inherit (openxr-loader.meta) platforms; diff --git a/pkgs/by-name/op/openh264/package.nix b/pkgs/by-name/op/openh264/package.nix index 3e0d12e14257..4c2d79ec60f2 100644 --- a/pkgs/by-name/op/openh264/package.nix +++ b/pkgs/by-name/op/openh264/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.openh264.org"; description = "Codec library which supports H.264 encoding and decoding"; changelog = "https://github.com/cisco/openh264/releases/tag/${finalAttrs.src.rev}"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; # See meson.build platforms = diff --git a/pkgs/by-name/op/openorbitaloptimizer/package.nix b/pkgs/by-name/op/openorbitaloptimizer/package.nix index e7e74680acca..6b608bf94f66 100644 --- a/pkgs/by-name/op/openorbitaloptimizer/package.nix +++ b/pkgs/by-name/op/openorbitaloptimizer/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Common orbital optimisation algorithms for quantum chemistry"; - license = [ lib.licenses.mpl20 ]; + license = lib.licenses.mpl20; homepage = "https://github.com/susilehtola/OpenOrbitalOptimizer"; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sheepforce ]; diff --git a/pkgs/by-name/op/openshot-qt/package.nix b/pkgs/by-name/op/openshot-qt/package.nix index 7e84ad63bed9..ae7e4b63b647 100644 --- a/pkgs/by-name/op/openshot-qt/package.nix +++ b/pkgs/by-name/op/openshot-qt/package.nix @@ -68,7 +68,7 @@ python3Packages.buildPythonApplication (finalAttrs: { and effects, and then export your film to DVD, YouTube, Vimeo, Xbox 360, and many other common formats. ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "openshot-qt"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/op/opentelemetry-cpp/package.nix b/pkgs/by-name/op/opentelemetry-cpp/package.nix index e144e405b3a0..4bd91de3da4c 100644 --- a/pkgs/by-name/op/opentelemetry-cpp/package.nix +++ b/pkgs/by-name/op/opentelemetry-cpp/package.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "OpenTelemetry C++ Client Library"; homepage = "https://github.com/open-telemetry/opentelemetry-cpp"; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ jfroche panicgh diff --git a/pkgs/by-name/op/openttd-ttf/package.nix b/pkgs/by-name/op/openttd-ttf/package.nix index 29c995ee948f..9aa45a2a1315 100644 --- a/pkgs/by-name/op/openttd-ttf/package.nix +++ b/pkgs/by-name/op/openttd-ttf/package.nix @@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/zephyris/openttd-ttf"; changelog = "https://github.com/zephyris/openttd-ttf/releases/tag/${finalAttrs.version}"; description = "TrueType typefaces for text in a pixel art style, designed for use in OpenTTD"; - license = [ lib.licenses.gpl2 ]; + license = lib.licenses.gpl2; platforms = lib.platforms.all; maintainers = [ lib.maintainers.sfrijters ]; }; diff --git a/pkgs/by-name/op/openusage/package.nix b/pkgs/by-name/op/openusage/package.nix index 6d4326bc5d68..7db3f84249e2 100644 --- a/pkgs/by-name/op/openusage/package.nix +++ b/pkgs/by-name/op/openusage/package.nix @@ -2,41 +2,35 @@ lib, stdenvNoCC, fetchurl, + _7zz, nix-update-script, - undmg, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "openusage"; - version = "0.6.13"; + version = "0.7.5"; - # if is aarch64 download aarch64, otherwise intel - src = - if stdenvNoCC.hostPlatform.isAarch64 then - fetchurl { - url = "https://github.com/robinebers/openusage/releases/download/v${finalAttrs.version}/OpenUsage_${finalAttrs.version}_aarch64.dmg"; - hash = "sha256-Zfv1VAJSDHFdo2R9KgZ3TN/gu2Ua9Uleq5wNXrBBEH4="; - } - else if stdenvNoCC.hostPlatform.isx86_64 then - fetchurl { - url = "https://github.com/robinebers/openusage/releases/download/v${finalAttrs.version}/OpenUsage_${finalAttrs.version}_x64.dmg"; - hash = "sha256-tllecJOGNUDG3GwQhjeRaNrTHVK2GPzstfiT/GanZmM="; - } - else - throw "Unsupported architecture"; + src = fetchurl { + url = "https://github.com/robinebers/openusage/releases/download/v${finalAttrs.version}/OpenUsage-${finalAttrs.version}.dmg"; + hash = "sha256-ycKm7kzOM+fv5Jhjv3JrG+oyK3LEOj9Ps7ll2Pz0T9c="; + }; + + unpackCmd = "7zz -snld x $src"; + + nativeBuildInputs = [ _7zz ]; + + sourceRoot = "."; installPhase = '' runHook preInstall - mkdir -p $out/Applications - cp -r "OpenUsage.app" $out/Applications/ + mkdir -p $out/Applications $out/bin + cp -r OpenUsage.app $out/Applications/ + ln -s $out/Applications/OpenUsage.app/Contents/MacOS/OpenUsage $out/bin/openusage runHook postInstall ''; - nativeBuildInputs = [ undmg ]; - sourceRoot = "."; - dontBuild = true; dontFixup = true; @@ -49,6 +43,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = lib.platforms.darwin; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ myzel394 ]; + maintainers = with lib.maintainers; [ + myzel394 + Br1ght0ne + ]; + mainProgram = "openusage"; }; }) diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix index 73557961b21b..581d9b007c14 100644 --- a/pkgs/by-name/op/openvino/package.nix +++ b/pkgs/by-name/op/openvino/package.nix @@ -189,7 +189,7 @@ stdenv.mkDerivation (finalAttrs: { It supports pre-trained models from the Open Model Zoo, along with 100+ open source and public models in popular formats such as Caffe*, TensorFlow*, MXNet* and ONNX*. ''; homepage = "https://docs.openvinotoolkit.org/"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; platforms = lib.platforms.all; broken = stdenv.hostPlatform.isDarwin; # Cannot find macos sdk }; diff --git a/pkgs/by-name/op/ophcrack/package.nix b/pkgs/by-name/op/ophcrack/package.nix index 31b341415cc0..fd67f0d24f03 100644 --- a/pkgs/by-name/op/ophcrack/package.nix +++ b/pkgs/by-name/op/ophcrack/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Free Windows password cracker based on rainbow tables"; homepage = "https://ophcrack.sourceforge.io"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ tochiaha ]; mainProgram = "ophcrack"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/ou/oui/package.nix b/pkgs/by-name/ou/oui/package.nix index 3856b9158101..0b673e975f59 100644 --- a/pkgs/by-name/ou/oui/package.nix +++ b/pkgs/by-name/ou/oui/package.nix @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { meta = { description = "MAC Address CLI Toolkit"; homepage = "https://github.com/thatmattlove/oui"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ johannwagner ]; mainProgram = "oui"; }; diff --git a/pkgs/by-name/ov/overmind/package.nix b/pkgs/by-name/ov/overmind/package.nix index 618a13d7e12a..96edb1fdadf6 100644 --- a/pkgs/by-name/ov/overmind/package.nix +++ b/pkgs/by-name/ov/overmind/package.nix @@ -35,7 +35,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/DarthSim/overmind"; description = "Process manager for Procfile-based applications and tmux"; mainProgram = "overmind"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/p4/p4v/package.nix b/pkgs/by-name/p4/p4v/package.nix index 9e6d58e391fd..1e0deb5f9b0b 100644 --- a/pkgs/by-name/p4/p4v/package.nix +++ b/pkgs/by-name/p4/p4v/package.nix @@ -17,7 +17,6 @@ let url = "https://web.archive.org/web/20260414052748/https://filehost.perforce.com/perforce/r26.1/bin.macosx12u/P4V.dmg"; sha256 = "sha256-8MBLS6EQOVenxZ1Uv75kPzU8aO2AldmxkwOz+JcBRpY="; }; - # this is universal }; mkDerivation = diff --git a/pkgs/by-name/pa/paging-calculator/package.nix b/pkgs/by-name/pa/paging-calculator/package.nix index 6fd238e3b66d..e904bb1cb9c1 100644 --- a/pkgs/by-name/pa/paging-calculator/package.nix +++ b/pkgs/by-name/pa/paging-calculator/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://github.com/phip1611/paging-calculator"; changelog = "https://github.com/phip1611/paging-calculator/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ phip1611 ]; }; }) diff --git a/pkgs/by-name/pa/pandoc-imagine/package.nix b/pkgs/by-name/pa/pandoc-imagine/package.nix index aed98010d7f3..7678dc6d1342 100644 --- a/pkgs/by-name/pa/pandoc-imagine/package.nix +++ b/pkgs/by-name/pa/pandoc-imagine/package.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { A pandoc filter that will turn code blocks tagged with certain classes into images or ASCII art ''; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; mainProgram = "pandoc-imagine"; }; diff --git a/pkgs/by-name/pa/paperview/package.nix b/pkgs/by-name/pa/paperview/package.nix index 174f9bd2065a..b51b637214f8 100644 --- a/pkgs/by-name/pa/paperview/package.nix +++ b/pkgs/by-name/pa/paperview/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { description = "High performance X11 animated wallpaper setter"; homepage = "https://github.com/glouw/paperview"; platforms = lib.platforms.linux; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ]; mainProgram = "paperview"; }; diff --git a/pkgs/by-name/pa/papilo/package.nix b/pkgs/by-name/pa/papilo/package.nix index 6320d10a0928..5f45db7930fb 100644 --- a/pkgs/by-name/pa/papilo/package.nix +++ b/pkgs/by-name/pa/papilo/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://scipopt.org/"; description = "Parallel Presolve for Integer and Linear Optimization"; - license = with lib.licenses; [ lgpl3Plus ]; + license = lib.licenses.lgpl3Plus; mainProgram = "papilo"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/pa/pasco/package.nix b/pkgs/by-name/pa/pasco/package.nix index 5b6fbd09840b..ee51bc04b9a8 100644 --- a/pkgs/by-name/pa/pasco/package.nix +++ b/pkgs/by-name/pa/pasco/package.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://sourceforge.net/projects/fast/files/Pasco/"; maintainers = [ ]; platforms = lib.platforms.unix; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; }; }) diff --git a/pkgs/by-name/pa/passwdqc/package.nix b/pkgs/by-name/pa/passwdqc/package.nix index 5188b6640223..e0d48f7361e9 100644 --- a/pkgs/by-name/pa/passwdqc/package.nix +++ b/pkgs/by-name/pa/passwdqc/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.openwall.com/passwdqc/"; description = "Passphrase strength checking and enforcement"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ ]; mainProgram = "passwdqc"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/pa/payloadsallthethings/package.nix b/pkgs/by-name/pa/payloadsallthethings/package.nix index e3402065b523..ec3575891007 100644 --- a/pkgs/by-name/pa/payloadsallthethings/package.nix +++ b/pkgs/by-name/pa/payloadsallthethings/package.nix @@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation { meta = { homepage = "https://github.com/swisskyrepo/PayloadsAllTheThings"; description = "List of useful payloads and bypass for Web Application Security and Pentest/CTF"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ shard7 felbinger diff --git a/pkgs/by-name/pc/pc/package.nix b/pkgs/by-name/pc/pc/package.nix index d8bf35a59b51..090065346d4f 100644 --- a/pkgs/by-name/pc/pc/package.nix +++ b/pkgs/by-name/pc/pc/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Programmer's calculator"; homepage = "https://git.sr.ht/~ft/pc"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ moody ]; platforms = lib.platforms.unix; mainProgram = "pc"; diff --git a/pkgs/by-name/pd/pdfcrack/package.nix b/pkgs/by-name/pd/pdfcrack/package.nix index 67fbe8cc8f33..9369fefa6cb5 100644 --- a/pkgs/by-name/pd/pdfcrack/package.nix +++ b/pkgs/by-name/pd/pdfcrack/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://pdfcrack.sourceforge.net/"; description = "Small command line driven tool for recovering passwords and content from PDF files"; mainProgram = "pdfcrack"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ qoelet ]; }; diff --git a/pkgs/by-name/pd/pdfid/package.nix b/pkgs/by-name/pd/pdfid/package.nix index ace3467577e6..67d233a12a47 100644 --- a/pkgs/by-name/pd/pdfid/package.nix +++ b/pkgs/by-name/pd/pdfid/package.nix @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication (finalAttrs: { meta = { description = "Scan a file to look for certain PDF keywords"; homepage = "https://blog.didierstevens.com/programs/pdf-tools/"; - license = with lib.licenses; [ free ]; + license = lib.licenses.free; mainProgram = "pdfid"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/pe/pebble/package.nix b/pkgs/by-name/pe/pebble/package.nix index 94cb097f5dfc..418e499bd84a 100644 --- a/pkgs/by-name/pe/pebble/package.nix +++ b/pkgs/by-name/pe/pebble/package.nix @@ -33,7 +33,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/letsencrypt/pebble"; description = "Small RFC 8555 ACME test server"; longDescription = "Miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA"; - license = [ lib.licenses.mpl20 ]; + license = lib.licenses.mpl20; mainProgram = "pebble"; teams = [ lib.teams.acme ]; }; diff --git a/pkgs/by-name/pe/perseus-cli/package.nix b/pkgs/by-name/pe/perseus-cli/package.nix index 0de27545fe47..2579f9b6d830 100644 --- a/pkgs/by-name/pe/perseus-cli/package.nix +++ b/pkgs/by-name/pe/perseus-cli/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://framesurge.sh/perseus/en-US"; description = "High-level web development framework for Rust with full support for server-side rendering and static generation"; maintainers = with lib.maintainers; [ max-niederman ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "perseus"; }; }) diff --git a/pkgs/by-name/pe/pest-ide-tools/package.nix b/pkgs/by-name/pe/pest-ide-tools/package.nix index 2352fb12ddeb..2e2aa95bdc85 100644 --- a/pkgs/by-name/pe/pest-ide-tools/package.nix +++ b/pkgs/by-name/pe/pest-ide-tools/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "IDE support for Pest, via the LSP"; homepage = "https://pest.rs"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ nickhu ]; mainProgram = "pest-language-server"; }; diff --git a/pkgs/by-name/pf/pfixtools/package.nix b/pkgs/by-name/pf/pfixtools/package.nix index 1733aadb6ec6..910df7af3da1 100644 --- a/pkgs/by-name/pf/pfixtools/package.nix +++ b/pkgs/by-name/pf/pfixtools/package.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation { meta = { description = "Collection of postfix-related tools"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; homepage = "https://github.com/Fruneau/pfixtools"; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ jerith666 ]; diff --git a/pkgs/by-name/pg/pgtop/package.nix b/pkgs/by-name/pg/pgtop/package.nix index fdb3153caf5f..3f868bbca6d8 100644 --- a/pkgs/by-name/pg/pgtop/package.nix +++ b/pkgs/by-name/pg/pgtop/package.nix @@ -31,6 +31,6 @@ perlPackages.buildPerlPackage rec { homepage = "https://github.com/cosimo/pgtop"; changelog = "https://github.com/cosimo/pgtop/releases/tag/v${version}"; maintainers = [ lib.maintainers.hagl ]; - license = [ lib.licenses.gpl2Only ]; + license = lib.licenses.gpl2Only; }; } diff --git a/pkgs/by-name/pi/pict-rs/package.nix b/pkgs/by-name/pi/pict-rs/package.nix index f7525ec4500f..5bdf1e096728 100644 --- a/pkgs/by-name/pi/pict-rs/package.nix +++ b/pkgs/by-name/pi/pict-rs/package.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Simple image hosting service"; mainProgram = "pict-rs"; homepage = "https://git.asonix.dog/asonix/pict-rs"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ happysalada ]; }; }) diff --git a/pkgs/by-name/pi/pigeon/package.nix b/pkgs/by-name/pi/pigeon/package.nix index de228c80efaa..889c337e0900 100644 --- a/pkgs/by-name/pi/pigeon/package.nix +++ b/pkgs/by-name/pi/pigeon/package.nix @@ -28,6 +28,6 @@ buildGoModule (finalAttrs: { description = "PEG parser generator for Go"; mainProgram = "pigeon"; maintainers = with lib.maintainers; [ zimbatm ]; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; }; }) diff --git a/pkgs/by-name/pi/pijul/package.nix b/pkgs/by-name/pi/pijul/package.nix index 75e35a8bf6f0..cf1cf740d9d0 100644 --- a/pkgs/by-name/pi/pijul/package.nix +++ b/pkgs/by-name/pi/pijul/package.nix @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Distributed version control system"; homepage = "https://pijul.org"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ gal_bolle dywedir diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix index 021a00c7fe4f..37c8b07f1ec0 100644 --- a/pkgs/by-name/pi/pik/package.nix +++ b/pkgs/by-name/pi/pik/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { It works like pkill command but search is interactive. ''; homepage = "https://github.com/jacek-kurlit/pik"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ bew ]; mainProgram = "pik"; }; diff --git a/pkgs/by-name/pi/pinegrow/package.nix b/pkgs/by-name/pi/pinegrow/package.nix index fdcb41335c28..c62ede8a5590 100644 --- a/pkgs/by-name/pi/pinegrow/package.nix +++ b/pkgs/by-name/pi/pinegrow/package.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation { description = "UI Web Editor"; platforms = [ "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = with lib.licenses; [ unfreeRedistributable ]; + license = lib.licenses.unfreeRedistributable; maintainers = with lib.maintainers; [ gador ]; mainProgram = "pinegrow"; }; diff --git a/pkgs/by-name/pi/piped/package.nix b/pkgs/by-name/pi/piped/package.nix index aab4f2408d10..4891ae99b3ce 100644 --- a/pkgs/by-name/pi/piped/package.nix +++ b/pkgs/by-name/pi/piped/package.nix @@ -48,7 +48,7 @@ buildNpmPackage rec { homepage = "https://github.com/TeamPiped/Piped"; description = "Efficient and privacy-friendly YouTube frontend"; maintainers = [ ]; - license = [ lib.licenses.agpl3Plus ]; + license = lib.licenses.agpl3Plus; }; } diff --git a/pkgs/by-name/pi/pipeworld/package.nix b/pkgs/by-name/pi/pipeworld/package.nix index 9f8835de61b9..850d2c0363bd 100644 --- a/pkgs/by-name/pi/pipeworld/package.nix +++ b/pkgs/by-name/pi/pipeworld/package.nix @@ -44,7 +44,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { application within another desktop as a 'substitute' for your normal terminal emulator. ''; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/pk/pkarr/package.nix b/pkgs/by-name/pk/pkarr/package.nix index fa5c8352b03c..f709cd6f4a17 100644 --- a/pkgs/by-name/pk/pkarr/package.nix +++ b/pkgs/by-name/pk/pkarr/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Public Key Addressable Resource Records (sovereign TLDs) "; homepage = "https://github.com/pubky/pkarr"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ dpc ]; mainProgram = "pkarr-server"; }; diff --git a/pkgs/by-name/pl/plus42/package.nix b/pkgs/by-name/pl/plus42/package.nix index 232710d80be7..38503d07f6f8 100644 --- a/pkgs/by-name/pl/plus42/package.nix +++ b/pkgs/by-name/pl/plus42/package.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://thomasokken.com/plus42/"; changelog = "https://thomasokken.com/plus42/history.html"; description = "Software clone of the HP-42S calculator (enhanced version)"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ elfenermarcell ]; mainProgram = "plus42dec"; platforms = with lib.platforms; unix; diff --git a/pkgs/by-name/po/pop-hp-wallpapers/package.nix b/pkgs/by-name/po/pop-hp-wallpapers/package.nix index 535476b673cb..badaf14cfa28 100644 --- a/pkgs/by-name/po/pop-hp-wallpapers/package.nix +++ b/pkgs/by-name/po/pop-hp-wallpapers/package.nix @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Wallpapers for High-Performance System76 products"; homepage = "https://pop.system76.com/"; - license = with lib.licenses; [ cc-by-sa-40 ]; + license = lib.licenses.cc-by-sa-40; maintainers = with lib.maintainers; [ pandapip1 ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/po/pouf/package.nix b/pkgs/by-name/po/pouf/package.nix index fe4e0747162e..22ad54f4a30d 100644 --- a/pkgs/by-name/po/pouf/package.nix +++ b/pkgs/by-name/po/pouf/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/mothsart/pouf"; changelog = "https://github.com/mothsart/pouf/releases/tag/${finalAttrs.version}"; maintainers = with lib.maintainers; [ mothsart ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "pouf"; }; }) diff --git a/pkgs/by-name/po/powersploit/package.nix b/pkgs/by-name/po/powersploit/package.nix index 9c452d954b28..dfd88e9b1d9c 100644 --- a/pkgs/by-name/po/powersploit/package.nix +++ b/pkgs/by-name/po/powersploit/package.nix @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation { changelog = "https://github.com/PowerShellMafia/PowerSploit/releases/"; description = "PowerShell Post-Exploitation Framework"; homepage = "https://github.com/PowerShellMafia/PowerSploit"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ shard7 ]; platforms = lib.platforms.all; sourceProvenance = with lib.sourceTypes; [ fromSource ]; diff --git a/pkgs/by-name/po/powertabeditor/package.nix b/pkgs/by-name/po/powertabeditor/package.nix index 0825bbf51d7f..ab165971ee25 100644 --- a/pkgs/by-name/po/powertabeditor/package.nix +++ b/pkgs/by-name/po/powertabeditor/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { description = "View and edit guitar tablature"; homepage = "https://powertab.github.io/"; changelog = "https://github.com/powertab/powertabeditor/blob/refs/tags/${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = with lib.platforms; linux ++ darwin ++ windows; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "powertabeditor"; diff --git a/pkgs/by-name/pr/precice/package.nix b/pkgs/by-name/pr/precice/package.nix index b1b215d4afe8..5e7999db30a2 100644 --- a/pkgs/by-name/pr/precice/package.nix +++ b/pkgs/by-name/pr/precice/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "PreCICE stands for Precise Code Interaction Coupling Environment"; homepage = "https://precice.org/"; - license = with lib.licenses; [ lgpl3Only ]; + license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ Scriptkiddi ]; mainProgram = "precice-tools"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/pr/prek/package.nix b/pkgs/by-name/pr/prek/package.nix index b55fcf3467ba..886b6b5b971a 100644 --- a/pkgs/by-name/pr/prek/package.nix +++ b/pkgs/by-name/pr/prek/package.nix @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Better `pre-commit`, re-engineered in Rust "; mainProgram = "prek"; changelog = "https://github.com/j178/prek/blob/${finalAttrs.src.tag}/CHANGELOG.md"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.thunze ]; }; }) diff --git a/pkgs/by-name/pr/prettyping/package.nix b/pkgs/by-name/pr/prettyping/package.nix index c03d72783e4a..182da0787170 100644 --- a/pkgs/by-name/pr/prettyping/package.nix +++ b/pkgs/by-name/pr/prettyping/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/denilsonsa/prettyping"; description = "Wrapper around the standard ping tool with the objective of making the output prettier, more colorful, more compact, and easier to read"; mainProgram = "prettyping"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ qoelet ]; }; diff --git a/pkgs/by-name/pr/prio/package.nix b/pkgs/by-name/pr/prio/package.nix index dc610a27da38..8a01b457bdd2 100644 --- a/pkgs/by-name/pr/prio/package.nix +++ b/pkgs/by-name/pr/prio/package.nix @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/letoram/prio"; description = "Plan9- Rio like Window Manager for Arcan"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/pr/prometheus-cpp/package.nix b/pkgs/by-name/pr/prometheus-cpp/package.nix index d656565f7bee..88fb261a8415 100644 --- a/pkgs/by-name/pr/prometheus-cpp/package.nix +++ b/pkgs/by-name/pr/prometheus-cpp/package.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Prometheus Client Library for Modern C++"; homepage = "https://github.com/jupp0r/prometheus-cpp"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; }; }) diff --git a/pkgs/by-name/pr/prometheus-xmpp-alerts/package.nix b/pkgs/by-name/pr/prometheus-xmpp-alerts/package.nix index dc18f47d6965..97d8337c022d 100644 --- a/pkgs/by-name/pr/prometheus-xmpp-alerts/package.nix +++ b/pkgs/by-name/pr/prometheus-xmpp-alerts/package.nix @@ -58,6 +58,6 @@ python3Packages.buildPythonApplication rec { mainProgram = "prometheus-xmpp-alerts"; homepage = "https://github.com/jelmer/prometheus-xmpp-alerts"; maintainers = with lib.maintainers; [ fpletz ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; } diff --git a/pkgs/by-name/pr/protege/package.nix b/pkgs/by-name/pr/protege/package.nix index b126923e85d7..4d62b1530a65 100644 --- a/pkgs/by-name/pr/protege/package.nix +++ b/pkgs/by-name/pr/protege/package.nix @@ -81,7 +81,7 @@ maven.buildMavenPackage rec { connections to description logic reasoners. ''; maintainers = with lib.maintainers; [ nessdoor ]; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; # TODO Protege is able to run on Darwin as well, but I (@nessdoor) had no # way of testing it nor any experience in packaging Darwin apps, so I # will leave the task to someone who has the right tools and knowledge. diff --git a/pkgs/by-name/pr/proxysql/package.nix b/pkgs/by-name/pr/proxysql/package.nix index 373a1bab4b58..852c812b6d66 100644 --- a/pkgs/by-name/pr/proxysql/package.nix +++ b/pkgs/by-name/pr/proxysql/package.nix @@ -226,7 +226,7 @@ stdenv.mkDerivation (finalAttrs: { description = "High-performance MySQL proxy"; mainProgram = "proxysql"; homepage = "https://proxysql.com/"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/pu/pufferpanel/package.nix b/pkgs/by-name/pu/pufferpanel/package.nix index eca9974399ad..82ca7ccf0a21 100644 --- a/pkgs/by-name/pu/pufferpanel/package.nix +++ b/pkgs/by-name/pu/pufferpanel/package.nix @@ -107,7 +107,7 @@ buildGoModule rec { meta = { description = "Free, open source game management panel"; homepage = "https://www.pufferpanel.com/"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ tie ]; mainProgram = "pufferpanel"; }; diff --git a/pkgs/by-name/pu/pulldown-cmark/package.nix b/pkgs/by-name/pu/pulldown-cmark/package.nix index a9f32bfc446b..40e8e0e6ca58 100644 --- a/pkgs/by-name/pu/pulldown-cmark/package.nix +++ b/pkgs/by-name/pu/pulldown-cmark/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Pull parser for CommonMark written in Rust"; homepage = "https://github.com/raphlinus/pulldown-cmark"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ CobaltCause ]; mainProgram = "pulldown-cmark"; }; diff --git a/pkgs/by-name/pu/pulsarctl/package.nix b/pkgs/by-name/pu/pulsarctl/package.nix index dbb3b1a247ae..8e35378991fe 100644 --- a/pkgs/by-name/pu/pulsarctl/package.nix +++ b/pkgs/by-name/pu/pulsarctl/package.nix @@ -70,7 +70,7 @@ buildGoModule rec { meta = { description = "CLI for Apache Pulsar written in Go"; homepage = "https://github.com/streamnative/pulsarctl"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; platforms = lib.platforms.unix; maintainers = [ ]; mainProgram = "pulsarctl"; diff --git a/pkgs/by-name/pu/pulumi-bin/package.nix b/pkgs/by-name/pu/pulumi-bin/package.nix index 86513a3c1187..fa5950c5aa65 100644 --- a/pkgs/by-name/pu/pulumi-bin/package.nix +++ b/pkgs/by-name/pu/pulumi-bin/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { homepage = "https://pulumi.io/"; description = "Pulumi is a cloud development platform that makes creating cloud programs easy and productive"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; platforms = builtins.attrNames data.pulumiPkgs; maintainers = with lib.maintainers; [ jlesquembre diff --git a/pkgs/by-name/pw/pwdsafety/package.nix b/pkgs/by-name/pw/pwdsafety/package.nix index f822c3b9dfb5..580927c6dd73 100644 --- a/pkgs/by-name/pw/pwdsafety/package.nix +++ b/pkgs/by-name/pw/pwdsafety/package.nix @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { description = "Command line tool checking password safety"; homepage = "https://github.com/edoardottt/pwdsafety"; changelog = "https://github.com/edoardottt/pwdsafety/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fab ]; mainProgram = "pwdsafety"; }; diff --git a/pkgs/by-name/px/pxattr/package.nix b/pkgs/by-name/px/pxattr/package.nix index 9d08f7b0d58e..a687b2514461 100644 --- a/pkgs/by-name/px/pxattr/package.nix +++ b/pkgs/by-name/px/pxattr/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.lesbonscomptes.com/pxattr/index.html"; description = "Provides a single interface to extended file attributes"; maintainers = [ ]; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; platforms = lib.platforms.unix; mainProgram = "pxattr"; }; diff --git a/pkgs/by-name/py/pyp/package.nix b/pkgs/by-name/py/pyp/package.nix index 6d0a126f84c1..34df06103d50 100644 --- a/pkgs/by-name/py/pyp/package.nix +++ b/pkgs/by-name/py/pyp/package.nix @@ -44,7 +44,7 @@ python3Packages.buildPythonApplication (finalAttrs: { homepage = "https://github.com/hauntsaninja/pyp"; description = "Easily run Python at the shell"; changelog = "https://github.com/hauntsaninja/pyp/blob/${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "pyp"; maintainers = with lib.maintainers; [ rmcgibbo diff --git a/pkgs/by-name/py/pyspread/package.nix b/pkgs/by-name/py/pyspread/package.nix index ab6706468ad8..6bb3b984431e 100644 --- a/pkgs/by-name/py/pyspread/package.nix +++ b/pkgs/by-name/py/pyspread/package.nix @@ -86,7 +86,7 @@ python3Packages.buildPythonApplication (finalAttrs: { that can be accessed from other cells. These objects can represent anything including lists or matrices. ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "pyspread"; maintainers = with lib.maintainers; [ Merikei ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/py/python-caja/package.nix b/pkgs/by-name/py/python-caja/package.nix index b06000ba2e13..f7a09d2358a0 100644 --- a/pkgs/by-name/py/python-caja/package.nix +++ b/pkgs/by-name/py/python-caja/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Python binding for Caja components"; homepage = "https://github.com/mate-desktop/python-caja"; - license = [ lib.licenses.gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/py/pyznap/package.nix b/pkgs/by-name/py/pyznap/package.nix index 3242caefe190..75f76d05bcc5 100644 --- a/pkgs/by-name/py/pyznap/package.nix +++ b/pkgs/by-name/py/pyznap/package.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication (finalAttrs: { homepage = "https://github.com/yboetz/pyznap"; description = "ZFS snapshot tool written in python"; mainProgram = "pyznap"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ rbrewer ]; }; }) diff --git a/pkgs/by-name/ql/qlog/package.nix b/pkgs/by-name/ql/qlog/package.nix index a33c4f16fcb1..f3fc79443fe6 100644 --- a/pkgs/by-name/ql/qlog/package.nix +++ b/pkgs/by-name/ql/qlog/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Amateur radio logbook software"; mainProgram = "qlog"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; homepage = "https://github.com/foldynl/QLog"; maintainers = with lib.maintainers; [ oliver-koss diff --git a/pkgs/by-name/qm/qmk_hid/package.nix b/pkgs/by-name/qm/qmk_hid/package.nix index 09d94c215fa5..557277f70e79 100644 --- a/pkgs/by-name/qm/qmk_hid/package.nix +++ b/pkgs/by-name/qm/qmk_hid/package.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Commandline tool for interactng with QMK devices over HID"; homepage = "https://github.com/FrameworkComputer/qmk_hid"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ ]; mainProgram = "qmk_hid"; }; diff --git a/pkgs/by-name/qo/qogir-icon-theme/package.nix b/pkgs/by-name/qo/qogir-icon-theme/package.nix index bb80479dc9c6..d1111f72d39a 100644 --- a/pkgs/by-name/qo/qogir-icon-theme/package.nix +++ b/pkgs/by-name/qo/qogir-icon-theme/package.nix @@ -73,7 +73,7 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "dark" "all" ] color meta = { description = "Flat colorful design icon theme"; homepage = "https://github.com/vinceliuice/Qogir-icon-theme"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ romildo ]; }; diff --git a/pkgs/by-name/qo/qovery-cli/package.nix b/pkgs/by-name/qo/qovery-cli/package.nix index 47a33f715938..5424752a9a05 100644 --- a/pkgs/by-name/qo/qovery-cli/package.nix +++ b/pkgs/by-name/qo/qovery-cli/package.nix @@ -52,7 +52,7 @@ buildGoModule (finalAttrs: { description = "Qovery Command Line Interface"; homepage = "https://github.com/Qovery/qovery-cli"; changelog = "https://github.com/Qovery/qovery-cli/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; mainProgram = "qovery-cli"; }; diff --git a/pkgs/by-name/qt/qtalarm/package.nix b/pkgs/by-name/qt/qtalarm/package.nix index d052eca2251d..edd300015566 100644 --- a/pkgs/by-name/qt/qtalarm/package.nix +++ b/pkgs/by-name/qt/qtalarm/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qtalarm"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "CountMurphy"; repo = "QTalarm"; tag = finalAttrs.version; - hash = "sha256-IN/XdR8J5uMIAjb1G2kzuLDtO972RLKSy3Ceh9CcHWw="; + hash = "sha256-rf1Vd5npCu6HVPunRfV2yFIWiSJ686iU3gXcT8g4VUQ="; }; buildInputs = [ diff --git a/pkgs/by-name/qu/quark-engine/package.nix b/pkgs/by-name/qu/quark-engine/package.nix index 7b7fef2f031f..e15223b5c4de 100644 --- a/pkgs/by-name/qu/quark-engine/package.nix +++ b/pkgs/by-name/qu/quark-engine/package.nix @@ -58,7 +58,7 @@ pythonPackages.buildPythonApplication (finalAttrs: { description = "Android malware (analysis and scoring) system"; homepage = "https://quark-engine.readthedocs.io/"; changelog = "https://github.com/quark-engine/quark-engine/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/qu/quicksand/package.nix b/pkgs/by-name/qu/quicksand/package.nix index 71fa36a6b2cb..aa66281e43d5 100644 --- a/pkgs/by-name/qu/quicksand/package.nix +++ b/pkgs/by-name/qu/quicksand/package.nix @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation { sizes as well. Quicksand Family is available in three styles which are Light, Regular and Bold including true italics for each weight. ''; - license = with lib.licenses; [ ofl ]; + license = lib.licenses.ofl; maintainers = with lib.maintainers; [ hubble ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/ra/radicle-explorer/package.nix b/pkgs/by-name/ra/radicle-explorer/package.nix index 7689932d4b7d..05ef22bf9596 100644 --- a/pkgs/by-name/ra/radicle-explorer/package.nix +++ b/pkgs/by-name/ra/radicle-explorer/package.nix @@ -14,7 +14,7 @@ let repo = "twemoji"; tag = "v14.0.2"; hash = "sha256-YoOnZ5uVukzi/6bLi22Y8U5TpplPzB7ji42l+/ys5xI="; - meta.license = [ lib.licenses.cc-by-40 ]; + meta.license = lib.licenses.cc-by-40; }; in diff --git a/pkgs/by-name/ra/raffi/package.nix b/pkgs/by-name/ra/raffi/package.nix index 824ca153be96..22cab85c620c 100644 --- a/pkgs/by-name/ra/raffi/package.nix +++ b/pkgs/by-name/ra/raffi/package.nix @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Fuzzel launcher based on yaml configuration"; homepage = "https://github.com/chmouel/raffi"; changelog = "https://github.com/chmouel/raffi/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ aos chmouel diff --git a/pkgs/by-name/ra/rankwidth/package.nix b/pkgs/by-name/ra/rankwidth/package.nix index c54a997198d9..6a01cf204e89 100644 --- a/pkgs/by-name/ra/rankwidth/package.nix +++ b/pkgs/by-name/ra/rankwidth/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Calculates rank-width and rank-decompositions"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; teams = [ lib.teams.sage ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/rb/rblake2sum/package.nix b/pkgs/by-name/rb/rblake2sum/package.nix index ca1d0ba0762e..94432adaf920 100644 --- a/pkgs/by-name/rb/rblake2sum/package.nix +++ b/pkgs/by-name/rb/rblake2sum/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage { meta = { description = "Recursive blake2 digest (hash) of a file-system path"; homepage = "https://github.com/crev-dev/rblake2sum"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ dpc ]; mainProgram = "rblake2sum"; }; diff --git a/pkgs/by-name/rb/rblake3sum/package.nix b/pkgs/by-name/rb/rblake3sum/package.nix index 041e24adfa2b..fffab405a351 100644 --- a/pkgs/by-name/rb/rblake3sum/package.nix +++ b/pkgs/by-name/rb/rblake3sum/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage { meta = { description = "Recursive blake3 digest (hash) of a file-system path"; homepage = "https://github.com/rustshop/rblake3sum"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ dpc ]; mainProgram = "rblake3sum"; }; diff --git a/pkgs/by-name/rc/rc/package.nix b/pkgs/by-name/rc/rc/package.nix index 65d4a9e94dcb..2ab49b10190a 100644 --- a/pkgs/by-name/rc/rc/package.nix +++ b/pkgs/by-name/rc/rc/package.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/rakitzis/rc"; description = "Plan 9 shell"; - license = [ lib.licenses.zlib ]; + license = lib.licenses.zlib; mainProgram = "rc"; maintainers = with lib.maintainers; [ ramkromberg ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix index 88e66d9926d2..fa067775f0f5 100644 --- a/pkgs/by-name/rc/rcp/package.nix +++ b/pkgs/by-name/rc/rcp/package.nix @@ -63,7 +63,7 @@ pkgsStatic.rustPlatform.buildRustPackage (finalAttrs: { changelog = "https://github.com/wykurz/rcp/releases/tag/v${finalAttrs.version}"; description = "Tools to efficiently copy, remove and link large filesets"; homepage = "https://github.com/wykurz/rcp"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "rcp"; maintainers = with lib.maintainers; [ wykurz ]; # procfs only supports Linux and Android diff --git a/pkgs/by-name/re/re-appintentsmetadataprocessor/package.nix b/pkgs/by-name/re/re-appintentsmetadataprocessor/package.nix index b0aeb3aa66d8..b85c886eb744 100644 --- a/pkgs/by-name/re/re-appintentsmetadataprocessor/package.nix +++ b/pkgs/by-name/re/re-appintentsmetadataprocessor/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "appintentsmetadataprocessor"; description = "Open reimplementation of Apple's appintentsmetadataprocessor"; homepage = "https://codeberg.org/viraptor/re-appintentsmetadataprocessor"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ viraptor ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/re/re-derq/package.nix b/pkgs/by-name/re/re-derq/package.nix index a242fd29ab18..a8a5f125fa83 100644 --- a/pkgs/by-name/re/re-derq/package.nix +++ b/pkgs/by-name/re/re-derq/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "derq"; description = "Open reimplementation of Apple's derq"; homepage = "https://codeberg.org/viraptor/re-derq"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ viraptor ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/re/re-intentbuilderc/package.nix b/pkgs/by-name/re/re-intentbuilderc/package.nix index d6391c8f04ef..ff26751b8ff3 100644 --- a/pkgs/by-name/re/re-intentbuilderc/package.nix +++ b/pkgs/by-name/re/re-intentbuilderc/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "intentbuilderc"; description = "Open reimplementation of Apple's intentbuilderc"; homepage = "https://codeberg.com/viraptor/re-intentbuilderc"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ viraptor ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/re/re-plistbuddy/package.nix b/pkgs/by-name/re/re-plistbuddy/package.nix index 8e51a23b8378..d5c215dd00ab 100644 --- a/pkgs/by-name/re/re-plistbuddy/package.nix +++ b/pkgs/by-name/re/re-plistbuddy/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Open reimplementation of Apple's PlistBuddy and plutil"; homepage = "https://github.com/viraptor/re-plistbuddy"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ viraptor ]; platforms = lib.platforms.darwin; }; diff --git a/pkgs/by-name/re/readsb/package.nix b/pkgs/by-name/re/readsb/package.nix index a3e17b7a2216..1a213b5b44ea 100644 --- a/pkgs/by-name/re/readsb/package.nix +++ b/pkgs/by-name/re/readsb/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "ADS-B decoder swiss knife"; homepage = "https://github.com/wiedehopf/readsb"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ wucke13 ]; platforms = lib.platforms.linux; # uses epoll, hence its linux only }; diff --git a/pkgs/by-name/re/reap/package.nix b/pkgs/by-name/re/reap/package.nix index 3417e3babf53..c1a46e4fa02a 100644 --- a/pkgs/by-name/re/reap/package.nix +++ b/pkgs/by-name/re/reap/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { homepage = "https://github.com/leahneukirchen/reap"; description = "Run process until all its spawned processes are dead"; mainProgram = "reap"; - license = with lib.licenses; [ publicDomain ]; + license = lib.licenses.publicDomain; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.leahneukirchen ]; }; diff --git a/pkgs/by-name/re/reaper-reapack-extension/darwin.nix b/pkgs/by-name/re/reaper-reapack-extension/darwin.nix index 3f643cbed2a4..d8fedc11f106 100644 --- a/pkgs/by-name/re/reaper-reapack-extension/darwin.nix +++ b/pkgs/by-name/re/reaper-reapack-extension/darwin.nix @@ -13,16 +13,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta ; src = fetchurl { - url = - let - arch = if stdenvNoCC.hostPlatform.system == "x86_64-darwin" then "x86_64" else "arm64"; - in - "https://github.com/cfillion/reapack/releases/download/v${finalAttrs.version}/reaper_reapack-${arch}.dylib"; - hash = - { - aarch64-darwin = "sha256-eFKEUuTUWE4Wp/vWVrvTbK78U6TicvRXSWggVAH2Og4="; - } - .${stdenvNoCC.hostPlatform.system}; + url = "https://github.com/cfillion/reapack/releases/download/v${finalAttrs.version}/reaper_reapack-arm64.dylib"; + hash = "sha256-eFKEUuTUWE4Wp/vWVrvTbK78U6TicvRXSWggVAH2Og4="; }; dontUnpack = true; diff --git a/pkgs/by-name/re/reaper-sws-extension/darwin.nix b/pkgs/by-name/re/reaper-sws-extension/darwin.nix index 9ad9d3679f6c..dc84ddba15ff 100644 --- a/pkgs/by-name/re/reaper-sws-extension/darwin.nix +++ b/pkgs/by-name/re/reaper-sws-extension/darwin.nix @@ -16,16 +16,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { let plugin = fetchurl { - url = - let - arch = if stdenvNoCC.hostPlatform.system == "x86_64-darwin" then "x86_64" else "arm64"; - in - "https://github.com/reaper-oss/sws/releases/download/v${finalAttrs.version}/reaper_sws-${arch}.dylib"; - hash = - { - aarch64-darwin = "sha256-jmuob0qslYhxiE2ShfTwY4RJAKBLJSUb+VBEM0sQPbo="; - } - .${stdenvNoCC.hostPlatform.system}; + url = "https://github.com/reaper-oss/sws/releases/download/v${finalAttrs.version}/reaper_sws-arm64.dylib"; + hash = "sha256-jmuob0qslYhxiE2ShfTwY4RJAKBLJSUb+VBEM0sQPbo="; }; in [ diff --git a/pkgs/by-name/re/red-trul/package.nix b/pkgs/by-name/re/red-trul/package.nix index 0d47ee9a7074..9fbe34d9d9f0 100644 --- a/pkgs/by-name/re/red-trul/package.nix +++ b/pkgs/by-name/re/red-trul/package.nix @@ -49,7 +49,7 @@ buildNpmPackage (finalAttrs: { description = "Lightweight utility to transcode FLAC releases"; homepage = "https://github.com/lfence/red-trul"; changelog = "https://github.com/lfence/red-trul/releases/tag/${finalAttrs.version}"; - license = with lib.licenses; [ isc ]; + license = lib.licenses.isc; maintainers = with lib.maintainers; [ lilahummel ]; }; }) diff --git a/pkgs/by-name/re/redlist/package.nix b/pkgs/by-name/re/redlist/package.nix index 4a81f6dea55d..19881cb7e1c4 100644 --- a/pkgs/by-name/re/redlist/package.nix +++ b/pkgs/by-name/re/redlist/package.nix @@ -42,7 +42,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Convert Spotify playlists to local m3u's and fill the gaps"; mainProgram = "redlist"; homepage = "https://github.com/Laharah/redlist"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ lilahummel ]; }; }) diff --git a/pkgs/by-name/re/refine/package.nix b/pkgs/by-name/re/refine/package.nix index 41d622f59b8d..e2402c0740b8 100644 --- a/pkgs/by-name/re/refine/package.nix +++ b/pkgs/by-name/re/refine/package.nix @@ -80,7 +80,7 @@ python3Packages.buildPythonApplication (finalAttrs: { homepage = "https://gitlab.gnome.org/TheEvilSkeleton/Refine"; mainProgram = "refine"; platforms = lib.platforms.linux; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ getchoo ]; }; }) diff --git a/pkgs/by-name/re/refurb/package.nix b/pkgs/by-name/re/refurb/package.nix index f5d25cc688c5..494969c9dfd1 100644 --- a/pkgs/by-name/re/refurb/package.nix +++ b/pkgs/by-name/re/refurb/package.nix @@ -56,7 +56,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Tool for refurbishing and modernizing Python codebases"; mainProgram = "refurb"; homepage = "https://github.com/dosisod/refurb"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix index 3e31ee1375d6..a0de1bc728d9 100644 --- a/pkgs/by-name/re/reindeer/package.nix +++ b/pkgs/by-name/re/reindeer/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Generate Buck build rules from Rust Cargo dependencies"; mainProgram = "reindeer"; homepage = "https://github.com/facebookincubator/reindeer"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ amaanq ]; }; }) diff --git a/pkgs/by-name/re/rename/package.nix b/pkgs/by-name/re/rename/package.nix index be43b399c644..a0d518280557 100644 --- a/pkgs/by-name/re/rename/package.nix +++ b/pkgs/by-name/re/rename/package.nix @@ -22,7 +22,7 @@ perlPackages.buildPerlPackage rec { cyplo cfouche ]; - license = with lib.licenses; [ gpl1Plus ]; + license = lib.licenses.gpl1Plus; mainProgram = "rename"; }; } diff --git a/pkgs/by-name/re/resnap/package.nix b/pkgs/by-name/re/resnap/package.nix index a276cc4bca2a..5b635a0a5878 100644 --- a/pkgs/by-name/re/resnap/package.nix +++ b/pkgs/by-name/re/resnap/package.nix @@ -47,7 +47,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Take screnshots of your reMarkable tablet over SSH"; homepage = "https://github.com/cloudsftp/reSnap"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ _404wolf ]; mainProgram = "reSnap"; }; diff --git a/pkgs/by-name/re/resorter/package.nix b/pkgs/by-name/re/resorter/package.nix index 73d53d950b26..702a1cc0c78e 100644 --- a/pkgs/by-name/re/resorter/package.nix +++ b/pkgs/by-name/re/resorter/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Tool to sort a list of items based on pairwise comparisons"; homepage = "https://github.com/hiAndrewQuinn/resorter"; - license = with lib.licenses; [ cc0 ]; + license = lib.licenses.cc0; mainProgram = "resorter"; maintainers = [ ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/re/restic-integrity/package.nix b/pkgs/by-name/re/restic-integrity/package.nix index 04c82529582a..92775e51eda7 100644 --- a/pkgs/by-name/re/restic-integrity/package.nix +++ b/pkgs/by-name/re/restic-integrity/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "CLI tool to check the integrity of a restic repository without unlocking it"; homepage = "https://git.nwex.de/networkException/restic-integrity"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ networkexception ]; mainProgram = "restic-integrity"; }; diff --git a/pkgs/by-name/ri/ripgrep-all/package.nix b/pkgs/by-name/ri/ripgrep-all/package.nix index d6a8422641f3..75b7d7968344 100644 --- a/pkgs/by-name/ri/ripgrep-all/package.nix +++ b/pkgs/by-name/ri/ripgrep-all/package.nix @@ -62,7 +62,7 @@ rustPlatform.buildRustPackage (finalAttrs: { to search in pdf, docx, sqlite, jpg, movie subtitles (mkv, mp4), etc. ''; homepage = "https://github.com/phiresky/ripgrep-all"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ zaninime ma27 diff --git a/pkgs/by-name/ri/ripgrep/package.nix b/pkgs/by-name/ri/ripgrep/package.nix index fbfb4fc87bfc..6249e96438c3 100644 --- a/pkgs/by-name/ri/ripgrep/package.nix +++ b/pkgs/by-name/ri/ripgrep/package.nix @@ -17,7 +17,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "ripgrep"; - version = "15.1.0"; + version = "15.2.0"; __structuredAttrs = true; @@ -25,10 +25,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "BurntSushi"; repo = "ripgrep"; tag = finalAttrs.version; - hash = "sha256-0gjwYMUlXYnmIWQS1SVzF1yQw1lpveRLw5qp049lc3I="; + hash = "sha256-BsSIbZwB6s8i3dDTRYJ1EdVbJmiO0oxcLu6qiYlPkOI="; }; - cargoHash = "sha256-ry3pLuYNwX776Dpj9IE2+uc7eEa5+sQvdNNeG1eJecs="; + cargoHash = "sha256-AqizStE9ICd6mNDZWdeXg6dHuTiY+B0TNauQQYWUa84="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ro/rode-central/package.nix b/pkgs/by-name/ro/rode-central/package.nix index ce00b49fd866..8a33cb664e56 100644 --- a/pkgs/by-name/ro/rode-central/package.nix +++ b/pkgs/by-name/ro/rode-central/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Companion app for configuring compatible RØDE devices, unlocking advanced features, enabling or disabling functions and updating firmware"; homepage = "https://rode.com/en-us/apps/rode-central"; changelog = "https://rode.com/en-us/release-notes/rode-central"; - license = [ lib.licenses.unfree ]; + license = lib.licenses.unfree; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; maintainers = with lib.maintainers; [ ethancedwards8 ]; platforms = lib.platforms.darwin; diff --git a/pkgs/by-name/ro/ron-lsp/package.nix b/pkgs/by-name/ro/ron-lsp/package.nix index ebd02a7a790f..6574ebe385c2 100644 --- a/pkgs/by-name/ro/ron-lsp/package.nix +++ b/pkgs/by-name/ro/ron-lsp/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { based on Rust type annotations ''; homepage = "https://github.com/jasonjmcghee/ron-lsp"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ Dietr1ch ]; diff --git a/pkgs/by-name/rq/rq/package.nix b/pkgs/by-name/rq/rq/package.nix index 33c3be604056..b66846f7f4a3 100644 --- a/pkgs/by-name/rq/rq/package.nix +++ b/pkgs/by-name/rq/rq/package.nix @@ -45,6 +45,6 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Tool for doing record analysis and transformation"; mainProgram = "rq"; homepage = "https://github.com/dflemstr/rq"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }) diff --git a/pkgs/by-name/ru/ruler/package.nix b/pkgs/by-name/ru/ruler/package.nix index b3bcd2f9c188..2f0e593f5631 100644 --- a/pkgs/by-name/ru/ruler/package.nix +++ b/pkgs/by-name/ru/ruler/package.nix @@ -26,7 +26,7 @@ buildGoModule rec { description = "Tool to abuse Exchange services"; homepage = "https://github.com/sensepost/ruler"; changelog = "https://github.com/sensepost/ruler/releases/tag/${version}"; - license = with lib.licenses; [ cc-by-nc-40 ]; + license = lib.licenses.cc-by-nc-40; maintainers = with lib.maintainers; [ fab ]; mainProgram = "ruler"; }; diff --git a/pkgs/by-name/ru/russ/package.nix b/pkgs/by-name/ru/russ/package.nix index 178ed2e6419d..08ca42aae459 100644 --- a/pkgs/by-name/ru/russ/package.nix +++ b/pkgs/by-name/ru/russ/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage { changelog = "https://github.com/ckampfe/russ/blob/master/CHANGELOG.md"; description = "TUI RSS reader with vim-like controls and a local-first, offline-first focus"; homepage = "https://github.com/ckampfe/russ"; - license = with lib.licenses; [ agpl3Only ]; + license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ blusk ]; mainProgram = "russ"; }; diff --git a/pkgs/by-name/ru/rusti-cal/package.nix b/pkgs/by-name/ru/rusti-cal/package.nix index 80021d927b1d..1321e9efee9d 100644 --- a/pkgs/by-name/ru/rusti-cal/package.nix +++ b/pkgs/by-name/ru/rusti-cal/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Minimal command line calendar, similar to cal"; mainProgram = "rusti-cal"; homepage = "https://github.com/arthurhenrique/rusti-cal"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.detegr ]; }; }) diff --git a/pkgs/by-name/sa/saber/package.nix b/pkgs/by-name/sa/saber/package.nix index 59b748062ca6..595c0b1074b5 100644 --- a/pkgs/by-name/sa/saber/package.nix +++ b/pkgs/by-name/sa/saber/package.nix @@ -109,7 +109,7 @@ flutter341.buildFlutterApplication { description = "Cross-platform open-source app built for handwriting"; homepage = "https://github.com/saber-notes/saber"; mainProgram = "saber"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = [ "aarch64-linux" diff --git a/pkgs/by-name/sc/scalpel/package.nix b/pkgs/by-name/sc/scalpel/package.nix index 4b2400011cb5..1ff683dbb605 100644 --- a/pkgs/by-name/sc/scalpel/package.nix +++ b/pkgs/by-name/sc/scalpel/package.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "scalpel"; maintainers = with lib.maintainers; [ shard7 ]; platforms = lib.platforms.unix; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }) diff --git a/pkgs/by-name/sc/scilla/package.nix b/pkgs/by-name/sc/scilla/package.nix index 7fb3155ede79..f325f137f371 100644 --- a/pkgs/by-name/sc/scilla/package.nix +++ b/pkgs/by-name/sc/scilla/package.nix @@ -32,7 +32,7 @@ buildGoModule (finalAttrs: { mainProgram = "scilla"; homepage = "https://github.com/edoardottt/scilla"; changelog = "https://github.com/edoardottt/scilla/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/sc/scipopt-soplex/package.nix b/pkgs/by-name/sc/scipopt-soplex/package.nix index 748358d57eb2..16a2765d4214 100644 --- a/pkgs/by-name/sc/scipopt-soplex/package.nix +++ b/pkgs/by-name/sc/scipopt-soplex/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://soplex.zib.de/"; description = "Sequential object-oriented simPlex"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; mainProgram = "soplex"; maintainers = with lib.maintainers; [ pmeinhold ]; changelog = "https://soplex.zib.de/doc-${finalAttrs.version}/html/CHANGELOG.php"; diff --git a/pkgs/by-name/sc/scponly/package.nix b/pkgs/by-name/sc/scponly/package.nix index df2434dfc50f..e57e8dd5a87f 100644 --- a/pkgs/by-name/sc/scponly/package.nix +++ b/pkgs/by-name/sc/scponly/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { description = "Shell that only permits scp and sftp-server"; mainProgram = "scponly"; homepage = "https://github.com/scponly/scponly"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ wmertens ]; }; } diff --git a/pkgs/by-name/sc/scryer-prolog/package.nix b/pkgs/by-name/sc/scryer-prolog/package.nix index 2c3fe35fa29e..fca8f5050b70 100644 --- a/pkgs/by-name/sc/scryer-prolog/package.nix +++ b/pkgs/by-name/sc/scryer-prolog/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Modern Prolog implementation written mostly in Rust"; mainProgram = "scryer-prolog"; homepage = "https://github.com/mthom/scryer-prolog"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ malbarbo wkral diff --git a/pkgs/by-name/sd/sdlookup/package.nix b/pkgs/by-name/sd/sdlookup/package.nix index b567ea34960e..e0a3a89ecfd6 100644 --- a/pkgs/by-name/sd/sdlookup/package.nix +++ b/pkgs/by-name/sd/sdlookup/package.nix @@ -21,7 +21,7 @@ buildGoModule { description = "IP lookups for open ports and vulnerabilities from internetdb.shodan.io"; mainProgram = "sdlookup"; homepage = "https://github.com/j3ssie/sdlookup"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/se/seabios/package.nix b/pkgs/by-name/se/seabios/package.nix index b92735de1e73..ce6fee05e8f1 100644 --- a/pkgs/by-name/se/seabios/package.nix +++ b/pkgs/by-name/se/seabios/package.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { It can run in an emulator or it can run natively on x86 hardware with the use of coreboot. ''; - license = with lib.licenses; [ lgpl3Plus ]; + license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ sigmasquadron ]; platforms = lib.systems.inspect.patternLogicalAnd lib.systems.inspect.patterns.isUnix lib.systems.inspect.patterns.isx86; badPlatforms = [ lib.systems.inspect.patterns.isDarwin ]; diff --git a/pkgs/by-name/se/secp256k1/package.nix b/pkgs/by-name/se/secp256k1/package.nix index 0ac343bd4bf9..e13840d732b1 100644 --- a/pkgs/by-name/se/secp256k1/package.nix +++ b/pkgs/by-name/se/secp256k1/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { to research best practices. Use at your own risk. ''; homepage = "https://github.com/bitcoin-core/secp256k1"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; platforms = with lib.platforms; all; }; diff --git a/pkgs/by-name/se/secretscanner/package.nix b/pkgs/by-name/se/secretscanner/package.nix index 2a69fd6531c5..1d700c913a5b 100644 --- a/pkgs/by-name/se/secretscanner/package.nix +++ b/pkgs/by-name/se/secretscanner/package.nix @@ -56,7 +56,7 @@ buildGoModule (finalAttrs: { "x86_64-linux" "aarch64-linux" ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/se/secretspec/package.nix b/pkgs/by-name/se/secretspec/package.nix index e5d0ea5c77be..46e798244fab 100644 --- a/pkgs/by-name/se/secretspec/package.nix +++ b/pkgs/by-name/se/secretspec/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Declarative secrets, every environment, any provider"; homepage = "https://secretspec.dev"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ domenkozar sandydoo diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix index 4735ebfb1fdf..1e04584bdb6e 100644 --- a/pkgs/by-name/se/serie/package.nix +++ b/pkgs/by-name/se/serie/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Rich git commit graph in your terminal, like magic"; homepage = "https://github.com/lusingander/serie"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ matthiasbeyer ]; mainProgram = "serie"; }; diff --git a/pkgs/by-name/se/serpent/package.nix b/pkgs/by-name/se/serpent/package.nix index d33389150004..ea0bc4df2899 100644 --- a/pkgs/by-name/se/serpent/package.nix +++ b/pkgs/by-name/se/serpent/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { features for contract programming. ''; homepage = "https://github.com/ethereum/wiki/wiki/Serpent"; - license = with lib.licenses; [ wtfpl ]; + license = lib.licenses.wtfpl; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix b/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix index f43d216c0bad..9136f196575f 100644 --- a/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix +++ b/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation (finalAttrs: { veehaitch ]; platforms = [ "x86_64-linux" ]; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; }; }) diff --git a/pkgs/by-name/sh/sh4d0wup/package.nix b/pkgs/by-name/sh/sh4d0wup/package.nix index e5472814aea4..946a02278729 100644 --- a/pkgs/by-name/sh/sh4d0wup/package.nix +++ b/pkgs/by-name/sh/sh4d0wup/package.nix @@ -69,7 +69,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/kpcyrd/sh4d0wup"; changelog = "https://github.com/kpcyrd/sh4d0wup/releases/tag/v${finalAttrs.version}"; mainProgram = "sh4d0wup"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ kpcyrd ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/sh/sha2wordlist/package.nix b/pkgs/by-name/sh/sha2wordlist/package.nix index 89a79652d495..9b13df97c108 100644 --- a/pkgs/by-name/sh/sha2wordlist/package.nix +++ b/pkgs/by-name/sh/sha2wordlist/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { description = "Display SHA-256 as PGP words"; homepage = "https://github.com/kirei/sha2wordlist"; maintainers = with lib.maintainers; [ baloo ]; - license = [ lib.licenses.bsd2 ]; + license = lib.licenses.bsd2; platforms = lib.platforms.all; mainProgram = "sha2wordlist"; }; diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix index 4c5f050b911f..51a216b27684 100644 --- a/pkgs/by-name/sh/shadow/package.nix +++ b/pkgs/by-name/sh/shadow/package.nix @@ -20,6 +20,7 @@ withTcb ? lib.meta.availableOn stdenv.hostPlatform tcb, tcb, cmocka, + fetchpatch, }: let glibc' = @@ -139,7 +140,58 @@ stdenv.mkDerivation (finalAttrs: { passthru = { shellPath = "/bin/nologin"; - # TODO: Run system tests: https://github.com/shadow-maint/shadow/blob/master/doc/contributions/tests.md#system-tests tests = { inherit (nixosTests) shadow; }; + # Package the upstream system test framework for use in nixosTests + testFramework = stdenv.mkDerivation { + name = "shadow-test-framework"; + inherit (finalAttrs) version; + src = "${finalAttrs.src}/tests/system"; + installPhase = '' + cp -r . $out/ + ''; + dontBuild = true; + patches = [ + # tests: update useradd tests to expect ID 1001 + (fetchpatch { + name = "update-useradd-tests.patch"; + url = "https://github.com/shadow-maint/shadow/commit/59fbe8415dab17f1e702fbdee96956886c86c737.patch"; + hash = "sha256-U0+NSCd4AfTuHMddTx9+wNtpdJt9t8+D5ApW0OCNgsY="; + stripLen = 2; + }) + # tests: update usermod tests to expect ID 1001 + (fetchpatch { + name = "update-usermod-tests.patch"; + url = "https://github.com/shadow-maint/shadow/commit/91c2ad44ababca2e32cdb71152b0f7f2a7c546be.patch"; + hash = "sha256-v1EEvMfUYoE/ZnBM0k/+kUBK3W1dXr588OQzvFmnXLI="; + stripLen = 2; + }) + # tests: update groupadd tests to expect GID 1001 + (fetchpatch { + name = "update-groupadd-tests.patch"; + url = "https://github.com/shadow-maint/shadow/commit/60568eaec13d1e417f56f0e59ac9573c0e3b9a83.patch"; + hash = "sha256-tLmGeW4Y7UcZqMhW3IXgygKPhCmbZkkW5XTJ7CFz9vg="; + stripLen = 2; + }) + # tests: update newgrp tests to expect GID 1002 + (fetchpatch { + name = "update-newgrp-tests.patch"; + url = "https://github.com/shadow-maint/shadow/commit/49ff9bf33a7b6af57cb26688c3139f014302c9d9.patch"; + hash = "sha256-1760t4Ezd5Ke4PFZ70Njb+k+1kp17aT/7uqu1PswVss="; + stripLen = 2; + }) + ]; + postPatch = '' + # Replace the gshadow existence check in the test framework with a more NixOS-friendly one, since NixOS does not have /etc/gshadow as a regular file + substituteInPlace framework/hosts/shadow.py \ + --replace-fail 'getent gshadow > /dev/null 2>&1' 'test -f /etc/gshadow' + + # Remove the backup entry for gshadow, since it's not being used in the tests running on NixOS + sed -i '/{"origin": "\/etc\/gshadow", "backup": "gshadow"}/d' framework/hosts/shadow.py + + # Replace the Debian-specific check in the useradd test with a NixOS-specific one + substituteInPlace tests/test_useradd.py \ + --replace-fail 'if "Debian" in shadow.host.distro_name:' 'if "NixOS" in shadow.host.distro_name:' + ''; + }; }; }) diff --git a/pkgs/by-name/sh/sheldon/package.nix b/pkgs/by-name/sh/sheldon/package.nix index 88baf441cccc..15b850d6836a 100644 --- a/pkgs/by-name/sh/sheldon/package.nix +++ b/pkgs/by-name/sh/sheldon/package.nix @@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Fast and configurable shell plugin manager"; homepage = "https://github.com/rossmacarthur/sheldon"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ seqizz ]; platforms = lib.platforms.unix; mainProgram = "sheldon"; diff --git a/pkgs/by-name/sh/shelldap/package.nix b/pkgs/by-name/sh/shelldap/package.nix index 4b222ed0e8b7..d6f435319c90 100644 --- a/pkgs/by-name/sh/shelldap/package.nix +++ b/pkgs/by-name/sh/shelldap/package.nix @@ -47,7 +47,7 @@ perlPackages.buildPerlPackage rec { homepage = "https://github.com/mahlonsmith/shelldap/"; description = "Handy shell-like interface for browsing LDAP servers and editing their content"; changelog = "https://github.com/mahlonsmith/shelldap/blob/v${version}/CHANGELOG"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ clerie tobiasBora diff --git a/pkgs/by-name/sh/shotgun/package.nix b/pkgs/by-name/sh/shotgun/package.nix index eb8a761a5c06..c3126dd8b418 100644 --- a/pkgs/by-name/sh/shotgun/package.nix +++ b/pkgs/by-name/sh/shotgun/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Minimal X screenshot utility"; homepage = "https://github.com/neXromancers/shotgun"; - license = with lib.licenses; [ mpl20 ]; + license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ lumi ]; diff --git a/pkgs/by-name/si/sidplayfp/package.nix b/pkgs/by-name/si/sidplayfp/package.nix index a11d90ef8189..44937c6d1ebe 100644 --- a/pkgs/by-name/si/sidplayfp/package.nix +++ b/pkgs/by-name/si/sidplayfp/package.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { description = "SID player using libsidplayfp"; homepage = "https://github.com/libsidplayfp/sidplayfp"; changelog = "https://github.com/libsidplayfp/sidplayfp/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "sidplayfp"; maintainers = with lib.maintainers; [ OPNA2608 diff --git a/pkgs/by-name/si/silx/package.nix b/pkgs/by-name/si/silx/package.nix index 3680545dafe8..831d13db6fff 100644 --- a/pkgs/by-name/si/silx/package.nix +++ b/pkgs/by-name/si/silx/package.nix @@ -34,7 +34,7 @@ python3Packages.buildPythonApplication (finalAttrs: { changelog = "https://github.com/silx-kit/silx/blob/main/CHANGELOG.rst"; description = "Software to support data assessment, reduction and analysis at synchrotron radiation facilities"; homepage = "https://github.com/silx-kit/silx"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.pmiddend ]; mainProgram = "silx"; }; diff --git a/pkgs/by-name/si/simde/package.nix b/pkgs/by-name/si/simde/package.nix index 8aba1e37f2ef..dabe255eb73c 100644 --- a/pkgs/by-name/si/simde/package.nix +++ b/pkgs/by-name/si/simde/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://simd-everywhere.github.io"; description = "Implementations of SIMD instruction sets for systems which don't natively support them"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ whiteley ]; platforms = lib.flatten ( with lib.platforms; diff --git a/pkgs/by-name/si/simple-completion-language-server/package.nix b/pkgs/by-name/si/simple-completion-language-server/package.nix index f2cd825097f3..22602c56ae39 100644 --- a/pkgs/by-name/si/simple-completion-language-server/package.nix +++ b/pkgs/by-name/si/simple-completion-language-server/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage { meta = { description = "Language server to enable word completion and snippets for Helix editor"; homepage = "https://github.com/estin/simple-completion-language-server"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.kpbaks ]; mainProgram = "simple-completion-language-server"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/si/simple-live-app/package.nix b/pkgs/by-name/si/simple-live-app/package.nix index 24959753cb62..1f1b4f0e81d3 100644 --- a/pkgs/by-name/si/simple-live-app/package.nix +++ b/pkgs/by-name/si/simple-live-app/package.nix @@ -57,7 +57,7 @@ flutter332.buildFlutterApplication rec { description = "Simply Watch Live"; homepage = "https://github.com/xiaoyaocz/dart_simple_live"; mainProgram = "simple_live_app"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/si/sipvicious/package.nix b/pkgs/by-name/si/sipvicious/package.nix index 448689118616..b3299e766e09 100644 --- a/pkgs/by-name/si/sipvicious/package.nix +++ b/pkgs/by-name/si/sipvicious/package.nix @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { description = "Set of tools to audit SIP based VoIP systems"; homepage = "https://github.com/EnableSecurity/sipvicious"; changelog = "https://github.com/EnableSecurity/sipvicious/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/si/sirula/package.nix b/pkgs/by-name/si/sirula/package.nix index 3497d5b3b4ec..b920a1d9400b 100644 --- a/pkgs/by-name/si/sirula/package.nix +++ b/pkgs/by-name/si/sirula/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Simple app launcher for wayland written in rust"; homepage = "https://github.com/DorianRudolph/sirula"; - license = [ lib.licenses.gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.atagen ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/si/sish/package.nix b/pkgs/by-name/si/sish/package.nix index 41bb1150570c..50f1c705cd4f 100644 --- a/pkgs/by-name/si/sish/package.nix +++ b/pkgs/by-name/si/sish/package.nix @@ -37,7 +37,7 @@ buildGoModule (finalAttrs: { description = "HTTP(S)/WS(S)/TCP Tunnels to localhost"; homepage = "https://github.com/antoniomika/sish"; changelog = "https://github.com/antoniomika/sish/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "sish"; }; diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix index 8c622c8ea8ab..139b02922412 100644 --- a/pkgs/by-name/sk/sketchybar/package.nix +++ b/pkgs/by-name/sk/sketchybar/package.nix @@ -10,12 +10,6 @@ let inherit (stdenv.hostPlatform) system; - - target = - { - "aarch64-darwin" = "arm64"; - } - .${system} or (throw "Unsupported system: ${system}"); in stdenv.mkDerivation (finalAttrs: { pname = "sketchybar"; @@ -37,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { apple-sdk_15 ]; - makeFlags = [ target ]; + makeFlags = [ "arm64" ]; # TODO: Remove once #536365 reaches this branch env.NIX_CFLAGS_LINK = "-fuse-ld=lld"; diff --git a/pkgs/by-name/sk/skrooge/package.nix b/pkgs/by-name/sk/skrooge/package.nix index 9bbdcffd80b0..29edd3944e1e 100644 --- a/pkgs/by-name/sk/skrooge/package.nix +++ b/pkgs/by-name/sk/skrooge/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Personal finances manager, powered by KDE"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ joko ]; homepage = "https://skrooge.org/"; }; diff --git a/pkgs/by-name/sl/slint-lsp/package.nix b/pkgs/by-name/sl/slint-lsp/package.nix index afdab4339a91..5b19b603b1f2 100644 --- a/pkgs/by-name/sl/slint-lsp/package.nix +++ b/pkgs/by-name/sl/slint-lsp/package.nix @@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://slint-ui.com/"; downloadPage = "https://github.com/slint-ui/slint/"; changelog = "https://github.com/slint-ui/slint/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ xgroleau ]; }; }) diff --git a/pkgs/by-name/sl/slowhttptest/package.nix b/pkgs/by-name/sl/slowhttptest/package.nix index 07e00b6d829c..ce8945ee04e9 100644 --- a/pkgs/by-name/sl/slowhttptest/package.nix +++ b/pkgs/by-name/sl/slowhttptest/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Application Layer DoS attack simulator"; homepage = "https://github.com/shekyan/slowhttptest"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; mainProgram = "slowhttptest"; }; diff --git a/pkgs/by-name/sl/sly/package.nix b/pkgs/by-name/sl/sly/package.nix index 1942accedd6f..b3b4dfaa8527 100644 --- a/pkgs/by-name/sl/sly/package.nix +++ b/pkgs/by-name/sl/sly/package.nix @@ -47,7 +47,7 @@ flutter335.buildFlutterApplication rec { description = "Friendly image editor"; homepage = "https://github.com/kra-mo/Sly"; mainProgram = "sly"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/sm/smbscan/package.nix b/pkgs/by-name/sm/smbscan/package.nix index f5bca72cfee9..8503319301eb 100644 --- a/pkgs/by-name/sm/smbscan/package.nix +++ b/pkgs/by-name/sm/smbscan/package.nix @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication { meta = { description = "Tool to enumerate file shares"; homepage = "https://github.com/jeffhacks/smbscan"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "smbscan"; }; diff --git a/pkgs/by-name/sm/smoked-salmon/package.nix b/pkgs/by-name/sm/smoked-salmon/package.nix index d1e6331b9ad5..e888f449472c 100644 --- a/pkgs/by-name/sm/smoked-salmon/package.nix +++ b/pkgs/by-name/sm/smoked-salmon/package.nix @@ -89,7 +89,7 @@ python3Packages.buildPythonApplication (finalAttrs: { meta = { description = "Toolkit for checking, editing and uploading music. Catered to Gazelle-based trackers"; homepage = "https://github.com/smokin-salmon/smoked-salmon"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; mainProgram = "salmon"; maintainers = with lib.maintainers; [ ambroisie diff --git a/pkgs/by-name/sn/sn0int/package.nix b/pkgs/by-name/sn/sn0int/package.nix index 3e775420da11..c0b029a37e80 100644 --- a/pkgs/by-name/sn/sn0int/package.nix +++ b/pkgs/by-name/sn/sn0int/package.nix @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec { description = "Semi-automatic OSINT framework and package manager"; homepage = "https://github.com/kpcyrd/sn0int"; changelog = "https://github.com/kpcyrd/sn0int/releases/tag/v${version}"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fab xrelkd diff --git a/pkgs/by-name/sn/snowcrash/package.nix b/pkgs/by-name/sn/snowcrash/package.nix index 253c059d057f..16f353d862a5 100644 --- a/pkgs/by-name/sn/snowcrash/package.nix +++ b/pkgs/by-name/sn/snowcrash/package.nix @@ -27,7 +27,7 @@ buildGoModule rec { meta = { description = "Polyglot payload generator"; homepage = "https://github.com/redcode-labs/SNOWCRASH"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "SNOWCRASH"; }; diff --git a/pkgs/by-name/sn/snowmachine/package.nix b/pkgs/by-name/sn/snowmachine/package.nix index 35f2c33c6cc5..73f70f6740a6 100644 --- a/pkgs/by-name/sn/snowmachine/package.nix +++ b/pkgs/by-name/sn/snowmachine/package.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Python script that will make your terminal snow"; homepage = "https://github.com/sontek/snowmachine"; mainProgram = "snowmachine"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ djanatyn sontek diff --git a/pkgs/by-name/so/socat/package.nix b/pkgs/by-name/so/socat/package.nix index 40cf1ef10dcc..899229ad33d1 100644 --- a/pkgs/by-name/so/socat/package.nix +++ b/pkgs/by-name/so/socat/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { description = "Utility for bidirectional data transfer between two independent data channels"; homepage = "http://www.dest-unreach.org/socat/"; platforms = lib.platforms.unix; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ ryan4yin ]; mainProgram = "socat"; }; diff --git a/pkgs/by-name/so/soplex/package.nix b/pkgs/by-name/so/soplex/package.nix index 911ff41f4fcb..d65d20e04a74 100644 --- a/pkgs/by-name/so/soplex/package.nix +++ b/pkgs/by-name/so/soplex/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://scipopt.org"; description = "Sequential object-oriented simPlex"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; mainProgram = "soplex"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/sp/spyre/package.nix b/pkgs/by-name/sp/spyre/package.nix index 2bff9345b6a0..29c859caaed7 100644 --- a/pkgs/by-name/sp/spyre/package.nix +++ b/pkgs/by-name/sp/spyre/package.nix @@ -47,7 +47,7 @@ buildGoModule (finalAttrs: { description = "YARA-based IOC scanner"; mainProgram = "spyre"; homepage = "https://github.com/spyre-project/spyre"; - license = with lib.licenses; [ lgpl3Plus ]; + license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/sp/spytrap-adb/package.nix b/pkgs/by-name/sp/spytrap-adb/package.nix index 60e71cb9ca62..d810fdb810cb 100644 --- a/pkgs/by-name/sp/spytrap-adb/package.nix +++ b/pkgs/by-name/sp/spytrap-adb/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/spytrap-org/spytrap-adb"; changelog = "https://github.com/spytrap-org/spytrap-adb/releases/tag/v${finalAttrs.version}"; mainProgram = "spytrap-adb"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ kpcyrd ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/sq/squawk/package.nix b/pkgs/by-name/sq/squawk/package.nix index 890fee503637..c07e786f30a4 100644 --- a/pkgs/by-name/sq/squawk/package.nix +++ b/pkgs/by-name/sq/squawk/package.nix @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Linter for PostgreSQL, focused on migrations"; homepage = "https://squawkhq.com"; changelog = "https://github.com/sbdchd/squawk/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/sr/srisum/package.nix b/pkgs/by-name/sr/srisum/package.nix index 9a8f628ccf45..98bf64ea757b 100644 --- a/pkgs/by-name/sr/srisum/package.nix +++ b/pkgs/by-name/sr/srisum/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Command-line utility to compute and check subresource integrity hashes"; homepage = "https://github.com/zkat/srisum-rs"; changelog = "https://github.com/zkat/srisum-rs/raw/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ pjjw ]; platforms = lib.platforms.all; mainProgram = "srisum"; diff --git a/pkgs/by-name/ss/sscg/package.nix b/pkgs/by-name/ss/sscg/package.nix index ee6ebf08e052..b5e566793798 100644 --- a/pkgs/by-name/ss/sscg/package.nix +++ b/pkgs/by-name/ss/sscg/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Simple Signed Certificate Generator"; homepage = "https://github.com/sgallagher/sscg"; changelog = "https://github.com/sgallagher/sscg/blob/sscg-${finalAttrs.version}"; - license = [ lib.licenses.gpl3 ]; + license = lib.licenses.gpl3; maintainers = [ lib.maintainers.lucasew ]; mainProgram = "sscg"; }; diff --git a/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix b/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix index cea563241906..a1d89ccdda51 100644 --- a/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix +++ b/pkgs/by-name/ss/ssh-askpass-fullscreen/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/atj/ssh-askpass-fullscreen"; broken = stdenv.hostPlatform.isDarwin; description = "Small, fullscreen SSH askpass GUI using GTK+2"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "ssh-askpass-fullscreen"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ss/sshchecker/package.nix b/pkgs/by-name/ss/sshchecker/package.nix index 87b7ae0f27ee..6e0353fdc0d1 100644 --- a/pkgs/by-name/ss/sshchecker/package.nix +++ b/pkgs/by-name/ss/sshchecker/package.nix @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { SSH login on the giving IP list. ''; homepage = "https://github.com/lazytools/sshchecker"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ss/sssnake/package.nix b/pkgs/by-name/ss/sssnake/package.nix index 827090d5de74..ff52f3363971 100644 --- a/pkgs/by-name/ss/sssnake/package.nix +++ b/pkgs/by-name/ss/sssnake/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Cli snake game that plays itself"; mainProgram = "sssnake"; homepage = "https://github.com/angeljumbo/sssnake"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ quantenzitrone ]; }; diff --git a/pkgs/by-name/st/stacktile/package.nix b/pkgs/by-name/st/stacktile/package.nix index 7796617df9cb..91739e3358f6 100644 --- a/pkgs/by-name/st/stacktile/package.nix +++ b/pkgs/by-name/st/stacktile/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://sr.ht/~leon_plickat/stacktile/"; description = "Layout generator for the river Wayland compositor"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "stacktile"; maintainers = [ ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/st/stacs/package.nix b/pkgs/by-name/st/stacs/package.nix index 5c74e4b929a4..b8f0c3c71bf2 100644 --- a/pkgs/by-name/st/stacs/package.nix +++ b/pkgs/by-name/st/stacs/package.nix @@ -54,7 +54,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { description = "Static token and credential scanner"; mainProgram = "stacs"; homepage = "https://github.com/stacscan/stacs"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/st/stamp/package.nix b/pkgs/by-name/st/stamp/package.nix index fd889cef2035..553e879c4285 100644 --- a/pkgs/by-name/st/stamp/package.nix +++ b/pkgs/by-name/st/stamp/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation { description = "Modern GTK4 email client for the GNOME ecosystem"; homepage = "https://gitlab.gnome.org/jbrummer/stamp"; maintainers = with lib.maintainers; [ onny ]; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; mainProgram = "stamp"; }; diff --git a/pkgs/by-name/st/starlark/package.nix b/pkgs/by-name/st/starlark/package.nix index 12a09fc2acc4..38dcbfc170ce 100644 --- a/pkgs/by-name/st/starlark/package.nix +++ b/pkgs/by-name/st/starlark/package.nix @@ -6,13 +6,13 @@ }: buildGoModule { pname = "starlark"; - version = "0-unstable-2026-06-30"; + version = "0-unstable-2026-07-08"; src = fetchFromGitHub { owner = "google"; repo = "starlark-go"; - rev = "529d8e869a14da46efe75b7e904a6183dd26ae29"; - hash = "sha256-/DTLgF5S0lzftLVF2XTk0k5auuGBWnZqjN092i0eOKA="; + rev = "5395d018f003e2a08bfbca6dcb2562acee700f62"; + hash = "sha256-g/f0g11vC9ScBuVYt/PRGSCyJApjq2m1hsFqUNUsZg4="; }; vendorHash = "sha256-Ejw5f5ulEcLHm4WYKatwA7FZ9lfdqZTOE3SdkaK6jYE="; diff --git a/pkgs/by-name/st/stdmanpages/package.nix b/pkgs/by-name/st/stdmanpages/package.nix index 0bb79ed1fa09..8421264ba3d3 100644 --- a/pkgs/by-name/st/stdmanpages/package.nix +++ b/pkgs/by-name/st/stdmanpages/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "GCC C++ STD manual pages"; homepage = "https://gcc.gnu.org/"; - license = with lib.licenses; [ fdl13Plus ]; + license = lib.licenses.fdl13Plus; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix index 07a347d16fe0..9b6cc458275b 100644 --- a/pkgs/by-name/st/steamguard-cli/package.nix +++ b/pkgs/by-name/st/steamguard-cli/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: { changelog = "https://github.com/dyc3/steamguard-cli/releases/tag/v${finalAttrs.version}"; description = "Linux utility for generating 2FA codes for Steam and managing Steam trade confirmations"; homepage = "https://github.com/dyc3/steamguard-cli"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; mainProgram = "steamguard"; maintainers = with lib.maintainers; [ surfaceflinger diff --git a/pkgs/by-name/st/stegseek/package.nix b/pkgs/by-name/st/stegseek/package.nix index a6f2be99032d..745a16e9482f 100644 --- a/pkgs/by-name/st/stegseek/package.nix +++ b/pkgs/by-name/st/stegseek/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { used to extract hidden data from files. ''; homepage = "https://github.com/RickdeJager/stegseek"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "stegseek"; }; diff --git a/pkgs/by-name/st/stella/package.nix b/pkgs/by-name/st/stella/package.nix index e2c8cfef8f21..97a249183ac2 100644 --- a/pkgs/by-name/st/stella/package.nix +++ b/pkgs/by-name/st/stella/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { As of its 3.5 release, Stella is officially donationware. ''; changelog = "https://github.com/stella-emu/stella/releases/tag/${finalAttrs.src.rev}"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "stella"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/st/stevia/package.nix b/pkgs/by-name/st/stevia/package.nix index 7b06e656e1ff..360abbd01815 100644 --- a/pkgs/by-name/st/stevia/package.nix +++ b/pkgs/by-name/st/stevia/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { description = "User friendly on screen keyboard for Phosh"; homepage = "https://gitlab.gnome.org/World/Phosh/stevia"; changelog = "https://gitlab.gnome.org/World/Phosh/stevia/-/releases/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ungeskriptet diff --git a/pkgs/by-name/st/stressapptest/package.nix b/pkgs/by-name/st/stressapptest/package.nix index 4b2324c1eec7..0ccdcef428eb 100644 --- a/pkgs/by-name/st/stressapptest/package.nix +++ b/pkgs/by-name/st/stressapptest/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Userspace memory and IO stress test tool"; homepage = "https://github.com/stressapptest/stressapptest"; changelog = "https://github.com/stressapptest/stressapptest/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; platforms = lib.platforms.unix; mainProgram = "stressapptest"; diff --git a/pkgs/by-name/st/strip-ansi/package.nix b/pkgs/by-name/st/strip-ansi/package.nix index f3b4a2bc106f..5234d420567d 100644 --- a/pkgs/by-name/st/strip-ansi/package.nix +++ b/pkgs/by-name/st/strip-ansi/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage { meta = { homepage = "https://github.com/KSXGitHub/strip-ansi-cli"; description = "Strip ANSI escape sequences from text"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers._9999years ]; mainProgram = "strip-ansi"; }; diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix index 8a2e679aa441..f9a760e3d4f4 100644 --- a/pkgs/by-name/st/stripe-cli/package.nix +++ b/pkgs/by-name/st/stripe-cli/package.nix @@ -105,7 +105,7 @@ buildGoModule (finalAttrs: { Tail your API request logs in real-time Create, retrieve, update, or delete API objects. ''; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ RaghavSood jk diff --git a/pkgs/by-name/st/stylance-cli/package.nix b/pkgs/by-name/st/stylance-cli/package.nix index b080c398e672..5f5f26753dbe 100644 --- a/pkgs/by-name/st/stylance-cli/package.nix +++ b/pkgs/by-name/st/stylance-cli/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "stylance"; homepage = "https://github.com/basro/stylance-rs"; changelog = "https://github.com/basro/stylance-rs/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ dav-wolff ]; }; }) diff --git a/pkgs/by-name/su/subfont/package.nix b/pkgs/by-name/su/subfont/package.nix index b38068892390..c2c3bdd6b4ef 100644 --- a/pkgs/by-name/su/subfont/package.nix +++ b/pkgs/by-name/su/subfont/package.nix @@ -50,7 +50,7 @@ buildNpmPackage (finalAttrs: { mainProgram = "subfont"; homepage = "https://github.com/Munter/subfont"; changelog = "https://github.com/Munter/subfont/blob/v${version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ dav-wolff ]; }; }) diff --git a/pkgs/by-name/su/subjs/package.nix b/pkgs/by-name/su/subjs/package.nix index f08849bc9cdf..a004e59dd59a 100644 --- a/pkgs/by-name/su/subjs/package.nix +++ b/pkgs/by-name/su/subjs/package.nix @@ -32,7 +32,7 @@ buildGoModule (finalAttrs: { secrets and more. ''; homepage = "https://github.com/lc/subjs"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/sv/svxlink/package.nix b/pkgs/by-name/sv/svxlink/package.nix index a19e96491929..d2935678ac51 100644 --- a/pkgs/by-name/sv/svxlink/package.nix +++ b/pkgs/by-name/sv/svxlink/package.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { GUI, Qtel - The Qt EchoLink client ''; homepage = "https://www.svxlink.org/"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ zaninime ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/sw/swaggerhole/package.nix b/pkgs/by-name/sw/swaggerhole/package.nix index 207d7ebc8571..ed34e0ae2ea0 100644 --- a/pkgs/by-name/sw/swaggerhole/package.nix +++ b/pkgs/by-name/sw/swaggerhole/package.nix @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication { description = "Tool to searching for secret on swaggerhub"; mainProgram = "swaggerhole"; homepage = "https://github.com/Liodeus/swaggerHole"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/sw/swapview/package.nix b/pkgs/by-name/sw/swapview/package.nix index 339d8e3a883f..f0f6bd9f55e9 100644 --- a/pkgs/by-name/sw/swapview/package.nix +++ b/pkgs/by-name/sw/swapview/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage { mainProgram = "swapview"; homepage = "https://github.com/lilydjwg/swapview"; platforms = lib.platforms.linux; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ oxalica ]; }; } diff --git a/pkgs/by-name/sw/swayrbar/package.nix b/pkgs/by-name/sw/swayrbar/package.nix index 2628029b1765..e088ab55f8f1 100644 --- a/pkgs/by-name/sw/swayrbar/package.nix +++ b/pkgs/by-name/sw/swayrbar/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Status command for sway's swaybar implementing the swaybar-protocol"; homepage = "https://git.sr.ht/~tsdh/swayr#a-idswayrbarswayrbara"; changelog = "https://git.sr.ht/~tsdh/swayr/tree/main/item/swayrbar/NEWS.md"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ilkecan ]; mainProgram = "swayrbar"; diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index c90ae32ded47..31032d54a62e 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -83,7 +83,7 @@ buildGoModule (finalAttrs: { (SBOM) from container images and filesystems. Exceptional for vulnerability detection when used with a scanner tool like Grype. ''; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ developer-guy jk diff --git a/pkgs/by-name/sy/synchrony/package.nix b/pkgs/by-name/sy/synchrony/package.nix index 30fbc199171a..e71bf755322d 100644 --- a/pkgs/by-name/sy/synchrony/package.nix +++ b/pkgs/by-name/sy/synchrony/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Simple deobfuscator for mangled or obfuscated JavaScript files"; homepage = "https://deobfuscate.relative.im/"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ pluiedev ]; inherit (nodejs.meta) platforms; mainProgram = "synchrony"; diff --git a/pkgs/by-name/sy/system76-keyboard-configurator/package.nix b/pkgs/by-name/sy/system76-keyboard-configurator/package.nix index 905ed066b700..5771b760ed7b 100644 --- a/pkgs/by-name/sy/system76-keyboard-configurator/package.nix +++ b/pkgs/by-name/sy/system76-keyboard-configurator/package.nix @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Keyboard configuration application for System76 keyboards and laptops"; mainProgram = "system76-keyboard-configurator"; homepage = "https://github.com/pop-os/keyboard-configurator"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ mirrexagon ]; platforms = with lib.platforms; linux ++ darwin; }; diff --git a/pkgs/by-name/sy/systemctl-tui/package.nix b/pkgs/by-name/sy/systemctl-tui/package.nix index 73fae11200f1..aec78727361b 100644 --- a/pkgs/by-name/sy/systemctl-tui/package.nix +++ b/pkgs/by-name/sy/systemctl-tui/package.nix @@ -8,16 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "systemctl-tui"; - version = "0.5.2"; + version = "0.6.1"; + __structuredAttrs = true; src = fetchFromGitHub { owner = "rgwood"; repo = "systemctl-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-r9bbEItk+DzVh6oFybaa8LZAAe35TyvvT6tuXOQlCSQ="; + hash = "sha256-+vPzfnRFNXY1ajhvFLyQ9j6ReaEclKSOtjsD+/as9u0="; }; - cargoHash = "sha256-XLISZFxC3v0Hf0QX3P1HmrzACMBwFvB5hrAsZgYE7ig="; + cargoHash = "sha256-RXb9ITIoUtJb9SO2r2m2ukNk3EEuSrcijZ1GjzgEnYg="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/t-/t-rec/package.nix b/pkgs/by-name/t-/t-rec/package.nix index d2267931a7e7..db98ef22b488 100644 --- a/pkgs/by-name/t-/t-rec/package.nix +++ b/pkgs/by-name/t-/t-rec/package.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Blazingly fast terminal recorder that generates animated gif images for the web written in rust"; homepage = "https://github.com/sassman/t-rec-rs"; changelog = "https://github.com/sassman/t-rec-rs/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ hoverbear matthiasbeyer diff --git a/pkgs/by-name/ta/tack/package.nix b/pkgs/by-name/ta/tack/package.nix index 6b4d448cb70b..2d721b691f76 100644 --- a/pkgs/by-name/ta/tack/package.nix +++ b/pkgs/by-name/ta/tack/package.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/manic-systems/tack"; description = "flake-like toml nix pins, lazily fetched and transformed"; mainProgram = "tack"; - license = [ lib.licenses.eupl12 ]; + license = lib.licenses.eupl12; maintainers = with lib.maintainers; [ amaanq atagen diff --git a/pkgs/by-name/ta/tarssh/package.nix b/pkgs/by-name/ta/tarssh/package.nix index 883077cf6167..ce49bc4e3199 100644 --- a/pkgs/by-name/ta/tarssh/package.nix +++ b/pkgs/by-name/ta/tarssh/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Simple SSH tarpit inspired by endlessh"; homepage = "https://github.com/Freaky/tarssh"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ sohalt ]; platforms = lib.platforms.unix; mainProgram = "tarssh"; diff --git a/pkgs/by-name/ta/taskwarrior-tui/package.nix b/pkgs/by-name/ta/taskwarrior-tui/package.nix index 948fa1d0479c..4a629a0cd8d7 100644 --- a/pkgs/by-name/ta/taskwarrior-tui/package.nix +++ b/pkgs/by-name/ta/taskwarrior-tui/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Terminal user interface for taskwarrior"; homepage = "https://github.com/kdheepak/taskwarrior-tui"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ matthiasbeyer ]; mainProgram = "taskwarrior-tui"; }; diff --git a/pkgs/by-name/td/tdlib/package.nix b/pkgs/by-name/td/tdlib/package.nix index e8a96d5ad13b..9fb8828d6d60 100644 --- a/pkgs/by-name/td/tdlib/package.nix +++ b/pkgs/by-name/td/tdlib/package.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation { meta = { description = "Cross-platform library for building Telegram clients"; homepage = "https://core.telegram.org/tdlib/"; - license = [ lib.licenses.boost ]; + license = lib.licenses.boost; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.vyorkin diff --git a/pkgs/by-name/te/tecla/package.nix b/pkgs/by-name/te/tecla/package.nix index 68787f904c6d..a4cdba67f56c 100644 --- a/pkgs/by-name/te/tecla/package.nix +++ b/pkgs/by-name/te/tecla/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { included man pages. ''; changelog = "https://sites.astro.caltech.edu/~mcs/tecla/release.html"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "enhance"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/te/tectonic-unwrapped/package.nix b/pkgs/by-name/te/tectonic-unwrapped/package.nix index b5c1f90efce5..23c1d2bcd8dd 100644 --- a/pkgs/by-name/te/tectonic-unwrapped/package.nix +++ b/pkgs/by-name/te/tectonic-unwrapped/package.nix @@ -125,7 +125,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Modernized, complete, self-contained TeX/LaTeX engine, powered by XeTeX and TeXLive"; homepage = "https://tectonic-typesetting.github.io/"; changelog = "https://github.com/tectonic-typesetting/tectonic/blob/tectonic@${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "tectonic"; maintainers = with lib.maintainers; [ lluchs diff --git a/pkgs/by-name/te/termusic/package.nix b/pkgs/by-name/te/termusic/package.nix index 9331153bc2f8..8ca793b8aaef 100644 --- a/pkgs/by-name/te/termusic/package.nix +++ b/pkgs/by-name/te/termusic/package.nix @@ -56,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Terminal Music Player TUI written in Rust"; homepage = "https://github.com/tramhao/termusic"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ devhell theeasternfurry diff --git a/pkgs/by-name/te/terrascan/package.nix b/pkgs/by-name/te/terrascan/package.nix index 03987ee9b31d..baae937e1de1 100644 --- a/pkgs/by-name/te/terrascan/package.nix +++ b/pkgs/by-name/te/terrascan/package.nix @@ -35,7 +35,7 @@ buildGoModule (finalAttrs: { ''; homepage = "https://github.com/accurics/terrascan"; changelog = "https://github.com/tenable/terrascan/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/te/tewisay/package.nix b/pkgs/by-name/te/tewisay/package.nix index db1402554eb3..9abcfaa6b35f 100644 --- a/pkgs/by-name/te/tewisay/package.nix +++ b/pkgs/by-name/te/tewisay/package.nix @@ -35,7 +35,7 @@ buildGoModule { meta = { homepage = "https://github.com/raymond-w-ko/tewisay"; description = "Cowsay replacement with unicode and partial ansi escape support"; - license = with lib.licenses; [ cc0 ]; + license = lib.licenses.cc0; mainProgram = "tewisay"; }; } diff --git a/pkgs/by-name/th/the-way/package.nix b/pkgs/by-name/th/the-way/package.nix index 2ca3a69a1a76..9430d1570775 100644 --- a/pkgs/by-name/th/the-way/package.nix +++ b/pkgs/by-name/th/the-way/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "the-way"; homepage = "https://github.com/out-of-cheese-error/the-way"; changelog = "https://github.com/out-of-cheese-error/the-way/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ numkem diff --git a/pkgs/by-name/th/theme-jade1/package.nix b/pkgs/by-name/th/theme-jade1/package.nix index 544fb224ddd9..69b009620132 100644 --- a/pkgs/by-name/th/theme-jade1/package.nix +++ b/pkgs/by-name/th/theme-jade1/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Based on Linux Mint theme with dark menus and more intensive green"; homepage = "https://github.com/madmaxms/theme-jade-1"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.romildo ]; }; diff --git a/pkgs/by-name/th/theme-obsidian2/package.nix b/pkgs/by-name/th/theme-obsidian2/package.nix index 26b45b64c8aa..38f9f38405e6 100644 --- a/pkgs/by-name/th/theme-obsidian2/package.nix +++ b/pkgs/by-name/th/theme-obsidian2/package.nix @@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation rec { meta = { description = "Gnome theme based upon Adwaita-Maia dark skin"; homepage = "https://github.com/madmaxms/theme-obsidian-2"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.romildo ]; }; diff --git a/pkgs/by-name/th/thumper/package.nix b/pkgs/by-name/th/thumper/package.nix index d28c4bdcdc06..33b492571112 100644 --- a/pkgs/by-name/th/thumper/package.nix +++ b/pkgs/by-name/th/thumper/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Tool to sync files from a local folder into a folder in a BunnyCDN Storage Zone"; homepage = "https://github.com/kaaveland/thumper"; changelog = "https://github.com/kaaveland/thumper/releases/tag/${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ stv0g ]; platforms = lib.platforms.all; mainProgram = "thumper"; diff --git a/pkgs/by-name/th/thunderkittens/package.nix b/pkgs/by-name/th/thunderkittens/package.nix index 794b9778cc6f..fc43e415d613 100644 --- a/pkgs/by-name/th/thunderkittens/package.nix +++ b/pkgs/by-name/th/thunderkittens/package.nix @@ -7,7 +7,7 @@ stdenvNoCC.mkDerivation { pname = "thunderkittens"; - version = "0-unstable-2026-06-15"; + version = "0-unstable-2026-07-13"; __structuredAttrs = true; strictDeps = true; @@ -15,8 +15,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "HazyResearch"; repo = "ThunderKittens"; - rev = "02e9acbd8c330564357a9e2df929e938ac67d6d0"; - hash = "sha256-GXrKCMKMDnQO7hNj4WZmmANSVJqEioIArwQWoE+/jVM="; + rev = "1c3920d993404dd49a6d4c7267ea11d583bd5c68"; + hash = "sha256-I/pzSZDx5eEimz8s+GQrQroqyQOEtNB+kas99LBM590="; }; dontBuild = true; diff --git a/pkgs/by-name/ti/timetagger_cli/package.nix b/pkgs/by-name/ti/timetagger_cli/package.nix index 07eaefc2bdaf..7bf782f15ae4 100644 --- a/pkgs/by-name/ti/timetagger_cli/package.nix +++ b/pkgs/by-name/ti/timetagger_cli/package.nix @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { meta = { description = "Track your time from the command-line"; homepage = "https://github.com/almarklein/timetagger_cli"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ matthiasbeyer ]; mainProgram = "timetagger"; }; diff --git a/pkgs/by-name/ti/tinty/package.nix b/pkgs/by-name/ti/tinty/package.nix index 77da2ee64e97..b23c654fe7f8 100644 --- a/pkgs/by-name/ti/tinty/package.nix +++ b/pkgs/by-name/ti/tinty/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage { description = "Base16 and base24 color scheme manager"; homepage = "https://github.com/tinted-theming/tinty"; changelog = "https://github.com/tinted-theming/tinty/blob/refs/tags/v${version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ pluiedev diff --git a/pkgs/by-name/ti/tiny-rdm/package.nix b/pkgs/by-name/ti/tiny-rdm/package.nix index f7068059afb8..acfac3947220 100644 --- a/pkgs/by-name/ti/tiny-rdm/package.nix +++ b/pkgs/by-name/ti/tiny-rdm/package.nix @@ -108,7 +108,7 @@ buildGoModule (finalAttrs: { description = "Modern, colorful, super lightweight Redis GUI client"; homepage = "https://github.com/tiny-craft/tiny-rdm"; mainProgram = "tiny-rdm"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ti/tinycc/package.nix b/pkgs/by-name/ti/tinycc/package.nix index bd589a616af7..95e29c1179a5 100644 --- a/pkgs/by-name/ti/tinycc/package.nix +++ b/pkgs/by-name/ti/tinycc/package.nix @@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: { With libtcc, you can use TCC as a backend for dynamic code generation. ''; - license = with lib.licenses; [ lgpl21Only ]; + license = lib.licenses.lgpl21Only; mainProgram = "tcc"; maintainers = with lib.maintainers; [ onemoresuza diff --git a/pkgs/by-name/ti/tinyxml-2/package.nix b/pkgs/by-name/ti/tinyxml-2/package.nix index 5445237a4511..2e90313055f5 100644 --- a/pkgs/by-name/ti/tinyxml-2/package.nix +++ b/pkgs/by-name/ti/tinyxml-2/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Simple, small, efficient, C++ XML parser"; homepage = "https://github.com/leethomason/tinyxml2"; changelog = "https://github.com/leethomason/tinyxml2/releases/tag/${finalAttrs.src.rev}"; - license = with lib.licenses; [ zlib ]; + license = lib.licenses.zlib; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/ti/tiscamera/package.nix b/pkgs/by-name/ti/tiscamera/package.nix index f2a3bddd28ef..2bf53fb1cc01 100644 --- a/pkgs/by-name/ti/tiscamera/package.nix +++ b/pkgs/by-name/ti/tiscamera/package.nix @@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Linux sources and UVC firmwares for The Imaging Source cameras"; homepage = "https://github.com/TheImagingSource/tiscamera"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ jraygauthier ]; }; diff --git a/pkgs/by-name/tl/tlaplus-toolbox/package.nix b/pkgs/by-name/tl/tlaplus-toolbox/package.nix index a2b6303402c3..a4d098c3a3ac 100644 --- a/pkgs/by-name/tl/tlaplus-toolbox/package.nix +++ b/pkgs/by-name/tl/tlaplus-toolbox/package.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { versions of your modules, run the TLC model checker, and run TLAPS, the TLA+ proof system. ''; # http://lamport.azurewebsites.net/tla/license.html - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; maintainers = [ ]; diff --git a/pkgs/by-name/to/tokio-console/package.nix b/pkgs/by-name/to/tokio-console/package.nix index c6de5a0b2d8a..49a481a1238b 100644 --- a/pkgs/by-name/to/tokio-console/package.nix +++ b/pkgs/by-name/to/tokio-console/package.nix @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Debugger for asynchronous Rust code"; homepage = "https://github.com/tokio-rs/console"; mainProgram = "tokio-console"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ max-niederman ]; }; }) diff --git a/pkgs/by-name/to/tomato-c/package.nix b/pkgs/by-name/to/tomato-c/package.nix index 2d39a0999c46..843a1991ef3e 100644 --- a/pkgs/by-name/to/tomato-c/package.nix +++ b/pkgs/by-name/to/tomato-c/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/gabrielzschmitz/Tomato.C"; description = "Pomodoro timer written in pure C"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ]; mainProgram = "tomato"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/to/tomboy-ng/package.nix b/pkgs/by-name/to/tomboy-ng/package.nix index 9a061507e249..8be2ec488ef5 100644 --- a/pkgs/by-name/to/tomboy-ng/package.nix +++ b/pkgs/by-name/to/tomboy-ng/package.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Note taking app that works and synchronises between Linux, Windows and macOS"; homepage = "https://github.com/tomboy-notes/tomboy-ng"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "tomboy-ng"; platforms = lib.platforms.unix ++ lib.platforms.windows; diff --git a/pkgs/by-name/to/toml2json/package.nix b/pkgs/by-name/to/toml2json/package.nix index 8a9fe91b00f7..dd66a532fed4 100644 --- a/pkgs/by-name/to/toml2json/package.nix +++ b/pkgs/by-name/to/toml2json/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Very small CLI for converting TOML to JSON"; mainProgram = "toml2json"; homepage = "https://github.com/woodruffw/toml2json"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ rvarago ]; }; }) diff --git a/pkgs/by-name/to/toss/package.nix b/pkgs/by-name/to/toss/package.nix index 228ff20dc444..cf7ebd8dfabd 100644 --- a/pkgs/by-name/to/toss/package.nix +++ b/pkgs/by-name/to/toss/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src.meta // { description = "Dead simple LAN file transfers from the command line"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/to/tox-node/package.nix b/pkgs/by-name/to/tox-node/package.nix index 23e54726ee64..b32442d36504 100644 --- a/pkgs/by-name/to/tox-node/package.nix +++ b/pkgs/by-name/to/tox-node/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Server application to run tox node written in pure Rust"; homepage = "https://github.com/tox-rs/tox"; - license = [ lib.licenses.gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ suhr diff --git a/pkgs/by-name/tp/tpm-luks/package.nix b/pkgs/by-name/tp/tpm-luks/package.nix index 6e43ef8a8d45..c823073f6d13 100644 --- a/pkgs/by-name/tp/tpm-luks/package.nix +++ b/pkgs/by-name/tp/tpm-luks/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { description = "LUKS key storage in TPM NVRAM"; homepage = "https://github.com/shpedoikal/tpm-luks/"; maintainers = [ ]; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/tr/traitor/package.nix b/pkgs/by-name/tr/traitor/package.nix index ac47c93b0de7..9abfc1c258a6 100644 --- a/pkgs/by-name/tr/traitor/package.nix +++ b/pkgs/by-name/tr/traitor/package.nix @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { ''; homepage = "https://github.com/liamg/traitor"; platforms = lib.platforms.linux; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/tr/trillian/package.nix b/pkgs/by-name/tr/trillian/package.nix index eba2bd270803..810028a124f6 100644 --- a/pkgs/by-name/tr/trillian/package.nix +++ b/pkgs/by-name/tr/trillian/package.nix @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://github.com/google/trillian"; description = "Transparent, highly scalable and cryptographically verifiable data store"; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/tr/triton-llvm/package.nix b/pkgs/by-name/tr/triton-llvm/package.nix index 1ede101acda8..96d0181b162d 100644 --- a/pkgs/by-name/tr/triton-llvm/package.nix +++ b/pkgs/by-name/tr/triton-llvm/package.nix @@ -230,7 +230,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = "https://github.com/llvm/llvm-project"; changelog = "https://github.com/llvm/llvm-project/releases/tag/llvmorg-${finalAttrs.version}"; - license = with lib.licenses; [ ncsa ]; + license = lib.licenses.ncsa; maintainers = with lib.maintainers; [ SomeoneSerge ]; diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix index 72f1b6263a66..5bb3877fb41c 100644 --- a/pkgs/by-name/tr/trufflehog/package.nix +++ b/pkgs/by-name/tr/trufflehog/package.nix @@ -46,7 +46,7 @@ buildGoModule (finalAttrs: { description = "Find credentials all over the place"; homepage = "https://github.com/trufflesecurity/trufflehog"; changelog = "https://github.com/trufflesecurity/trufflehog/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ agpl3Only ]; + license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ fab sarcasticadmin diff --git a/pkgs/by-name/tr/trunk-ng/package.nix b/pkgs/by-name/tr/trunk-ng/package.nix index f552242c07fb..30a972d2d14a 100644 --- a/pkgs/by-name/tr/trunk-ng/package.nix +++ b/pkgs/by-name/tr/trunk-ng/package.nix @@ -38,6 +38,6 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Build, bundle & ship your Rust WASM application to the web"; mainProgram = "trunk-ng"; maintainers = with lib.maintainers; [ ctron ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }) diff --git a/pkgs/by-name/tr/trunk/package.nix b/pkgs/by-name/tr/trunk/package.nix index 652e99be37a4..a0318ef1f310 100644 --- a/pkgs/by-name/tr/trunk/package.nix +++ b/pkgs/by-name/tr/trunk/package.nix @@ -29,6 +29,6 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Build, bundle & ship your Rust WASM application to the web"; mainProgram = "trunk"; maintainers = with lib.maintainers; [ ctron ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }) diff --git a/pkgs/by-name/tr/trustymail/package.nix b/pkgs/by-name/tr/trustymail/package.nix index 05e6c7fcc271..cc623258b609 100644 --- a/pkgs/by-name/tr/trustymail/package.nix +++ b/pkgs/by-name/tr/trustymail/package.nix @@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { description = "Tool to scan domains and return data based on trustworthy email best practices"; homepage = "https://github.com/cisagov/trustymail"; changelog = "https://github.com/cisagov/trustymail/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ cc0 ]; + license = lib.licenses.cc0; maintainers = with lib.maintainers; [ fab ]; mainProgram = "trustymail"; }; diff --git a/pkgs/by-name/tr/try/package.nix b/pkgs/by-name/tr/try/package.nix index fa6451dad9a2..9a2eb560d82d 100644 --- a/pkgs/by-name/tr/try/package.nix +++ b/pkgs/by-name/tr/try/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { pasqui23 ezrizhu ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/tt/tt-burnin/package.nix b/pkgs/by-name/tt/tt-burnin/package.nix index 646cfcec7333..001b4cca5bf9 100644 --- a/pkgs/by-name/tt/tt-burnin/package.nix +++ b/pkgs/by-name/tt/tt-burnin/package.nix @@ -37,6 +37,6 @@ python3Packages.buildPythonApplication (finalAttrs: { homepage = "https://github.com/tenstorrent/tt-burnin"; changelog = "https://github.com/tenstorrent/tt-burnin/blob/${finalAttrs.src.tag}/CHANGELOG.md"; maintainers = with lib.maintainers; [ RossComputerGuy ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }) diff --git a/pkgs/by-name/tt/tt-logger/package.nix b/pkgs/by-name/tt/tt-logger/package.nix index 8b5600377b6a..ddebe0b5cac3 100644 --- a/pkgs/by-name/tt/tt-logger/package.nix +++ b/pkgs/by-name/tt/tt-logger/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Flexible and performant C++ logging library for Tenstorrent projects"; homepage = "https://github.com/tenstorrent/tt-logger"; maintainers = with lib.maintainers; [ RossComputerGuy ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/tt/tt-metal/package.nix b/pkgs/by-name/tt/tt-metal/package.nix index 3733045c7d62..1647b5053f9f 100644 --- a/pkgs/by-name/tt/tt-metal/package.nix +++ b/pkgs/by-name/tt/tt-metal/package.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { description = "TT-NN operator library, and TT-Metalium low level kernel programming model"; homepage = "https://github.com/tenstorrent/tt-metal"; maintainers = with lib.maintainers; [ RossComputerGuy ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/tt/tt-smi/package.nix b/pkgs/by-name/tt/tt-smi/package.nix index 421c2e41bd56..4d5a6cba38c9 100644 --- a/pkgs/by-name/tt/tt-smi/package.nix +++ b/pkgs/by-name/tt/tt-smi/package.nix @@ -53,6 +53,6 @@ python3Packages.buildPythonApplication (finalAttrs: { homepage = "https://github.com/tenstorrent/tt-smi"; changelog = "https://github.com/tenstorrent/tt-smi/blob/${finalAttrs.src.tag}/CHANGELOG.md"; maintainers = with lib.maintainers; [ RossComputerGuy ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }) diff --git a/pkgs/by-name/tt/tt-system-tools/package.nix b/pkgs/by-name/tt/tt-system-tools/package.nix index 1932478f690d..81eebe663c7d 100644 --- a/pkgs/by-name/tt/tt-system-tools/package.nix +++ b/pkgs/by-name/tt/tt-system-tools/package.nix @@ -44,7 +44,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/tenstorrent/tt-system-tools"; changelog = "https://github.com/tenstorrent/tt-system-tools/blob/${finalAttrs.src.tag}/debian/changelog"; maintainers = with lib.maintainers; [ RossComputerGuy ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/tt/tt-topology/package.nix b/pkgs/by-name/tt/tt-topology/package.nix index 366fa0c3da0f..ba0ce62ffacf 100644 --- a/pkgs/by-name/tt/tt-topology/package.nix +++ b/pkgs/by-name/tt/tt-topology/package.nix @@ -60,6 +60,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/tenstorrent/tt-topology"; changelog = "https://github.com/tenstorrent/tt-topology/blob/${src.tag}/CHANGELOG.md"; maintainers = with lib.maintainers; [ RossComputerGuy ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; } diff --git a/pkgs/by-name/tt/tt-umd/package.nix b/pkgs/by-name/tt/tt-umd/package.nix index d18a3f7b11fe..1baef8f79876 100644 --- a/pkgs/by-name/tt/tt-umd/package.nix +++ b/pkgs/by-name/tt/tt-umd/package.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { description = "User-Mode Driver for Tenstorrent hardware"; homepage = "https://github.com/tenstorrent/tt-umd"; maintainers = with lib.maintainers; [ RossComputerGuy ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix index 9c70074b39f9..4b0726541d3b 100644 --- a/pkgs/by-name/tt/ttdl/package.nix +++ b/pkgs/by-name/tt/ttdl/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "CLI tool to manage todo lists in todo.txt format"; homepage = "https://github.com/VladimirMarkelov/ttdl"; changelog = "https://github.com/VladimirMarkelov/ttdl/blob/v${finalAttrs.version}/changelog"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ]; mainProgram = "ttdl"; }; diff --git a/pkgs/by-name/tt/ttfb/package.nix b/pkgs/by-name/tt/ttfb/package.nix index 2ae7d6ccf528..b6ee5ad448d0 100644 --- a/pkgs/by-name/tt/ttfb/package.nix +++ b/pkgs/by-name/tt/ttfb/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://github.com/phip1611/ttfb"; changelog = "https://github.com/phip1611/ttfb/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ phip1611 ]; }; }) diff --git a/pkgs/by-name/tu/tuifeed/package.nix b/pkgs/by-name/tu/tuifeed/package.nix index b3a908863599..604d6479ed31 100644 --- a/pkgs/by-name/tu/tuifeed/package.nix +++ b/pkgs/by-name/tu/tuifeed/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Terminal feed reader with a fancy UI"; mainProgram = "tuifeed"; homepage = "https://github.com/veeso/tuifeed"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ devhell ]; }; }) diff --git a/pkgs/by-name/tu/tuistash/package.nix b/pkgs/by-name/tu/tuistash/package.nix index e8501de2845c..f5dc085c2585 100644 --- a/pkgs/by-name/tu/tuistash/package.nix +++ b/pkgs/by-name/tu/tuistash/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Terminal User Interface for Logstash"; homepage = "https://github.com/edmocosta/tuistash"; changelog = "https://github.com/edmocosta/tuistash/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; maintainers = [ lib.maintainers.kpbaks ]; mainProgram = "tuistash"; }; diff --git a/pkgs/by-name/tu/tuliprox/package.nix b/pkgs/by-name/tu/tuliprox/package.nix index 450ac443448c..8b611a37a333 100644 --- a/pkgs/by-name/tu/tuliprox/package.nix +++ b/pkgs/by-name/tu/tuliprox/package.nix @@ -81,7 +81,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/euzu/tuliprox"; changelog = "https://github.com/euzu/tuliprox/blob/${finalAttrs.src.tag}/CHANGELOG.md"; mainProgram = "tuliprox"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ nyanloutre ]; }; }) diff --git a/pkgs/by-name/tw/twolame/package.nix b/pkgs/by-name/tw/twolame/package.nix index d452f8cb3e53..aa8e98d87e6f 100644 --- a/pkgs/by-name/tw/twolame/package.nix +++ b/pkgs/by-name/tw/twolame/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { code and portions of LAME. ''; homepage = "https://www.twolame.org/"; - license = with lib.licenses; [ lgpl2Plus ]; + license = lib.licenses.lgpl2Plus; platforms = with lib.platforms; unix; maintainers = [ ]; }; diff --git a/pkgs/by-name/ud/uddup/package.nix b/pkgs/by-name/ud/uddup/package.nix index d1b15d4a7fd9..65c295612394 100644 --- a/pkgs/by-name/ud/uddup/package.nix +++ b/pkgs/by-name/ud/uddup/package.nix @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { description = "Tool for de-duplication URLs"; mainProgram = "uddup"; homepage = "https://github.com/rotemreiss/uddup"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ue/uefisettings/package.nix b/pkgs/by-name/ue/uefisettings/package.nix index e5f2af9d32a5..5caaa445bad8 100644 --- a/pkgs/by-name/ue/uefisettings/package.nix +++ b/pkgs/by-name/ue/uefisettings/package.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage { meta = { description = "CLI tool to read/get/extract and write/change/modify BIOS/UEFI settings"; homepage = "https://github.com/linuxboot/uefisettings"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; mainProgram = "uefisettings"; maintainers = with lib.maintainers; [ surfaceflinger ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix b/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix index 5474f2b31caf..e857beb564c3 100644 --- a/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix +++ b/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/ryukau/UhhyouPluginsJuce"; description = "A collection of VST3 effect plugins"; - license = [ lib.licenses.agpl3Only ]; + license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ magnetophon ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/um/umpire/package.nix b/pkgs/by-name/um/umpire/package.nix index dad5b5493085..bc06de5c1d0f 100644 --- a/pkgs/by-name/um/umpire/package.nix +++ b/pkgs/by-name/um/umpire/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Application-focused API for memory management on NUMA & GPU architectures"; homepage = "https://github.com/LLNL/Umpire"; maintainers = with lib.maintainers; [ sheepforce ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/un/units/package.nix b/pkgs/by-name/un/units/package.nix index eb73ccab10e7..270ab53cb606 100644 --- a/pkgs/by-name/un/units/package.nix +++ b/pkgs/by-name/un/units/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { file to suit your needs. You can also use your own data file to supplement the standard data file. ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "units"; maintainers = with lib.maintainers; [ galen ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/un/unp/package.nix b/pkgs/by-name/un/unp/package.nix index 4b084bfb161b..2943ba9f65ab 100644 --- a/pkgs/by-name/un/unp/package.nix +++ b/pkgs/by-name/un/unp/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Command line tool for unpacking archives easily"; homepage = "https://packages.qa.debian.org/u/unp.html"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.timor ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/ur/urlhunter/package.nix b/pkgs/by-name/ur/urlhunter/package.nix index 975364bc4de1..563d8916b067 100644 --- a/pkgs/by-name/ur/urlhunter/package.nix +++ b/pkgs/by-name/ur/urlhunter/package.nix @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { exposed via shortener services such as bit.ly and goo.gl. ''; homepage = "https://github.com/utkusen/urlhunter"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ur/uroboros/package.nix b/pkgs/by-name/ur/uroboros/package.nix index c5f15f61b015..2f20a07870b9 100644 --- a/pkgs/by-name/ur/uroboros/package.nix +++ b/pkgs/by-name/ur/uroboros/package.nix @@ -21,7 +21,7 @@ buildGoModule rec { meta = { description = "Tool for monitoring and profiling single processes"; homepage = "https://github.com/evilsocket/uroboros"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/uu/uutils-procps/package.nix b/pkgs/by-name/uu/uutils-procps/package.nix index 4e5210441e66..f01fc6f23252 100644 --- a/pkgs/by-name/uu/uutils-procps/package.nix +++ b/pkgs/by-name/uu/uutils-procps/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uutils-procps"; - version = "0.0.1-unstable-2026-07-03"; + version = "0.0.1-unstable-2026-07-10"; src = fetchFromGitHub { owner = "uutils"; repo = "procps"; - rev = "84ad4732d48373cbdd09722afc06bb58b76e0855"; - hash = "sha256-l47J/6M+15uzR/Vh3zHbnsSL5ZgrayqXDzHyjLQbIC8="; + rev = "43414458b44617824ef44a0c5791839c3ab98f28"; + hash = "sha256-Eh8fzCsBIaOmz7Apm0HrBCx446s0ZHjCDQ9FlM2b/gQ="; }; - cargoHash = "sha256-GMKu/iTB8oWLMwmNdlGzf7WZsTg7TOdz+GacTB4kK80="; + cargoHash = "sha256-yffq2oZ53eNiey/u6kUbXeir0UJZ9LqCm/ysO86qwe0="; cargoBuildFlags = [ "--workspace" ]; diff --git a/pkgs/by-name/v2/v2ray/package.nix b/pkgs/by-name/v2/v2ray/package.nix index 85cb335f6836..9cbe1781c438 100644 --- a/pkgs/by-name/v2/v2ray/package.nix +++ b/pkgs/by-name/v2/v2ray/package.nix @@ -69,7 +69,7 @@ buildGoModule (finalAttrs: { homepage = "https://www.v2fly.org/en_US/"; description = "Platform for building proxies to bypass network restrictions"; mainProgram = "v2ray"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ servalcatty ryan4yin diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix index 2d19afbc481c..e5a704b42dc5 100644 --- a/pkgs/by-name/v2/v2rayn/package.nix +++ b/pkgs/by-name/v2/v2rayn/package.nix @@ -111,7 +111,7 @@ buildDotnetModule (finalAttrs: { description = "GUI client support Xray core and sing-box-core and others"; homepage = "https://github.com/2dust/v2rayN"; mainProgram = "v2rayN"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = [ "x86_64-linux" diff --git a/pkgs/by-name/va/vangers/clunk.nix b/pkgs/by-name/va/vangers/clunk.nix index 4f0c7fb94fdb..7f3ab731d1b7 100644 --- a/pkgs/by-name/va/vangers/clunk.nix +++ b/pkgs/by-name/va/vangers/clunk.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { description = "Clunk - real-time binaural sound generation library. Versions for Vangers game. Porting to SDL2 and fix some errors"; homepage = "https://github.com/stalkerg/clunk"; platforms = lib.platforms.all; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ]; }; diff --git a/pkgs/by-name/va/vangers/package.nix b/pkgs/by-name/va/vangers/package.nix index 78e60ba9bd30..51e4043987af 100644 --- a/pkgs/by-name/va/vangers/package.nix +++ b/pkgs/by-name/va/vangers/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation { homepage = "https://github.com/KranX/Vangers"; mainProgram = "vangers"; platforms = lib.platforms.all; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ]; }; } diff --git a/pkgs/by-name/va/vanillatd/package.nix b/pkgs/by-name/va/vanillatd/package.nix index f700ef09d791..88e0392e85e4 100644 --- a/pkgs/by-name/va/vanillatd/package.nix +++ b/pkgs/by-name/va/vanillatd/package.nix @@ -173,7 +173,7 @@ stdenv.mkDerivation (finalAttrs: { } ."${appName}"; homepage = "https://github.com/TheAssemblyArmada/Vanilla-Conquer"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; sourceProvenance = with lib.sourceTypes; [ fromSource ]; maintainers = with lib.maintainers; [ xiaoxiangmoe ]; platforms = with lib.platforms; darwin ++ linux; diff --git a/pkgs/by-name/va/vapoursynth-eedi3/package.nix b/pkgs/by-name/va/vapoursynth-eedi3/package.nix index bb1fc9c53bae..58a1d5a2e123 100644 --- a/pkgs/by-name/va/vapoursynth-eedi3/package.nix +++ b/pkgs/by-name/va/vapoursynth-eedi3/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { meta = { description = "Filter for VapourSynth"; homepage = "https://github.com/HomeOfVapourSynthEvolution/VapourSynth-EEDI3"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ snaki ]; platforms = lib.platforms.x86_64; }; diff --git a/pkgs/by-name/va/vapoursynth-nnedi3cl/package.nix b/pkgs/by-name/va/vapoursynth-nnedi3cl/package.nix index e64ae74b9d70..7161df33ccfd 100644 --- a/pkgs/by-name/va/vapoursynth-nnedi3cl/package.nix +++ b/pkgs/by-name/va/vapoursynth-nnedi3cl/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Filter for VapourSynth"; homepage = "https://github.com/HomeOfVapourSynthEvolution/VapourSynth-NNEDI3CL"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ snaki ]; platforms = lib.platforms.x86_64; }; diff --git a/pkgs/by-name/vd/vdo/package.nix b/pkgs/by-name/vd/vdo/package.nix index f2252a025d83..e0d8106c8b59 100644 --- a/pkgs/by-name/vd/vdo/package.nix +++ b/pkgs/by-name/vd/vdo/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { "powerpc64-linux" "powerpc64le-linux" ]; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = [ ]; }; } diff --git a/pkgs/by-name/ve/veilid/package.nix b/pkgs/by-name/ve/veilid/package.nix index 207124d7dae9..55674e3a1b11 100644 --- a/pkgs/by-name/ve/veilid/package.nix +++ b/pkgs/by-name/ve/veilid/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "veilid"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitLab { owner = "veilid"; repo = "veilid"; rev = "v${finalAttrs.version}"; - hash = "sha256-14jRIs2iE5JH1ZmC/1DGcg6cejsnmhUTkquXNmOEuQA="; + hash = "sha256-SBFCfIYfOicbUviIZMBXbfW1CESguEFLge6ssmYqm+A="; }; - cargoHash = "sha256-xuIw/RRKydanStS7dw1jK96bgEH0U5TDbayaBZq/OCg="; + cargoHash = "sha256-Rtk9ba/nwaL5oCsKZsFxCy3qUnq8vVrmllzYlgV0FDU="; nativeBuildInputs = [ capnproto diff --git a/pkgs/by-name/ve/venera/package.nix b/pkgs/by-name/ve/venera/package.nix index b8536ed9848c..b2cc5703af4e 100644 --- a/pkgs/by-name/ve/venera/package.nix +++ b/pkgs/by-name/ve/venera/package.nix @@ -92,7 +92,7 @@ flutter341.buildFlutterApplication (finalAttrs: { description = "Comic reader that support reading local and network comics"; homepage = "https://github.com/venera-app/venera"; mainProgram = "venera"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ve/verifpal/package.nix b/pkgs/by-name/ve/verifpal/package.nix index 39acb88195e6..cfe741c4f731 100644 --- a/pkgs/by-name/ve/verifpal/package.nix +++ b/pkgs/by-name/ve/verifpal/package.nix @@ -22,6 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Cryptographic protocol analysis for students and engineers"; mainProgram = "verifpal"; maintainers = with lib.maintainers; [ zimbatm ]; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; }; }) diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix index 45746fc8744e..c183555b6bff 100644 --- a/pkgs/by-name/vi/vicinae/package.nix +++ b/pkgs/by-name/vi/vicinae/package.nix @@ -21,13 +21,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vicinae"; - version = "0.22.3"; + version = "0.23.1"; src = fetchFromGitHub { owner = "vicinaehq"; repo = "vicinae"; tag = "v${finalAttrs.version}"; - hash = "sha256-1c6rl+PMI61l3H2a8Ks1qbFGW2psHs0FamJd/Vzq6NY="; + hash = "sha256-qFDb6I9w9F/KfRVHmwezykv7y/Tb8BjJQD2v5AxlEfU="; }; apiDeps = fetchNpmDeps { diff --git a/pkgs/by-name/vi/vimcats/package.nix b/pkgs/by-name/vi/vimcats/package.nix index b57d528f8583..78fc1e4505f5 100644 --- a/pkgs/by-name/vi/vimcats/package.nix +++ b/pkgs/by-name/vi/vimcats/package.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://github.com/mrcjkb/vimcats"; changelog = "https://github.com/mrcjkb/vimcats/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ mrcjkb ]; mainProgram = "vimcats"; }; diff --git a/pkgs/by-name/vi/vimix-icon-theme/package.nix b/pkgs/by-name/vi/vimix-icon-theme/package.nix index d7a6679ae3aa..73ec17473eae 100644 --- a/pkgs/by-name/vi/vimix-icon-theme/package.nix +++ b/pkgs/by-name/vi/vimix-icon-theme/package.nix @@ -71,7 +71,7 @@ lib.checkListOfEnum "vimix-icon-theme: color variants" meta = { description = "Material Design icon theme based on Paper icon theme"; homepage = "https://github.com/vinceliuice/vimix-icon-theme"; - license = with lib.licenses; [ cc-by-sa-40 ]; + license = lib.licenses.cc-by-sa-40; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ romildo ]; }; diff --git a/pkgs/by-name/vi/virtio-win/package.nix b/pkgs/by-name/vi/virtio-win/package.nix index e7efbd8f26aa..d0dc8831dac3 100644 --- a/pkgs/by-name/vi/virtio-win/package.nix +++ b/pkgs/by-name/vi/virtio-win/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Windows VirtIO Drivers"; homepage = "https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html"; changelog = "https://fedorapeople.org/groups/virt/virtio-win/CHANGELOG"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ anthonyroussel ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/vi/viskores/package.nix b/pkgs/by-name/vi/viskores/package.nix index 5b8d167dd4dd..6e48db339efb 100644 --- a/pkgs/by-name/vi/viskores/package.nix +++ b/pkgs/by-name/vi/viskores/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Visualization library for many-threaded devices"; homepage = "https://github.com/Viskores/viskores"; changelog = "https://github.com/Viskores/viskores/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ qbisi ]; }; diff --git a/pkgs/by-name/vk/vkd3d-proton/package.nix b/pkgs/by-name/vk/vkd3d-proton/package.nix index 4202ef4e44b2..726bb86fef07 100644 --- a/pkgs/by-name/vk/vkd3d-proton/package.nix +++ b/pkgs/by-name/vk/vkd3d-proton/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/HansKristian-Work/vkd3d-proton"; description = "Fork of VKD3D, which aims to implement the full Direct3D 12 API on top of Vulkan"; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; maintainers = [ ]; inherit (wine.meta) platforms; }; diff --git a/pkgs/by-name/vk/vkd3d/package.nix b/pkgs/by-name/vk/vkd3d/package.nix index fdb6bfadb549..cc2d5ed3ec83 100644 --- a/pkgs/by-name/vk/vkd3d/package.nix +++ b/pkgs/by-name/vk/vkd3d/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { If vkd3d is available when building Wine, then Wine will use it to support Direct3D 12 applications. ''; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; mainProgram = "vkd3d-compiler"; maintainers = with lib.maintainers; [ liberodark ]; inherit (wine.meta) platforms; diff --git a/pkgs/by-name/vk/vkmark/package.nix b/pkgs/by-name/vk/vkmark/package.nix index bba04b3ba4ad..856a5f66f375 100644 --- a/pkgs/by-name/vk/vkmark/package.nix +++ b/pkgs/by-name/vk/vkmark/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Extensible Vulkan benchmarking suite"; homepage = "https://github.com/vkmark/vkmark"; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ muscaln ]; mainProgram = "vkmark"; diff --git a/pkgs/by-name/vo/voicevox-core/package.nix b/pkgs/by-name/vo/voicevox-core/package.nix index a49e712280f6..424e95571834 100644 --- a/pkgs/by-name/vo/voicevox-core/package.nix +++ b/pkgs/by-name/vo/voicevox-core/package.nix @@ -109,7 +109,7 @@ rustPlatform.buildRustPackage (finalAttrs: { changelog = "https://github.com/VOICEVOX/voicevox_core/releases/tag/${finalAttrs.version}"; description = "Core library for the VOICEVOX speech synthesis software"; homepage = "https://github.com/VOICEVOX/voicevox_core"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ tomasajt eljamm diff --git a/pkgs/by-name/vo/volta/package.nix b/pkgs/by-name/vo/volta/package.nix index 4be2e6c84ec8..ad17125a085b 100644 --- a/pkgs/by-name/vo/volta/package.nix +++ b/pkgs/by-name/vo/volta/package.nix @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://volta.sh/"; changelog = "https://github.com/volta-cli/volta/blob/main/RELEASES.md"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fbrs ]; mainProgram = "volta"; }; diff --git a/pkgs/by-name/vp/vpl-gpu-rt/package.nix b/pkgs/by-name/vp/vpl-gpu-rt/package.nix index 83bb7cac0df3..262f788b358e 100644 --- a/pkgs/by-name/vp/vpl-gpu-rt/package.nix +++ b/pkgs/by-name/vp/vpl-gpu-rt/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { description = "oneAPI Video Processing Library Intel GPU implementation"; homepage = "https://github.com/intel/vpl-gpu-rt"; changelog = "https://github.com/intel/vpl-gpu-rt/releases/tag/${finalAttrs.src.rev}"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ evanrichter diff --git a/pkgs/by-name/vs/vst2-sdk/package.nix b/pkgs/by-name/vs/vst2-sdk/package.nix index 3f7986224c77..963b3ed36e73 100644 --- a/pkgs/by-name/vs/vst2-sdk/package.nix +++ b/pkgs/by-name/vs/vst2-sdk/package.nix @@ -21,6 +21,6 @@ fetchzip { VST2 is proprietary, and deprecated by Steinberg. As such, it should only be used for legacy reasons. ''; - license = [ lib.licenses.unfree ]; + license = lib.licenses.unfree; }; } diff --git a/pkgs/by-name/vt/vt323/package.nix b/pkgs/by-name/vt/vt323/package.nix index cb6c5710ddf2..7582ce144ebb 100644 --- a/pkgs/by-name/vt/vt323/package.nix +++ b/pkgs/by-name/vt/vt323/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/phoikoi/VT323/releases/tag/v${finalAttrs.version}"; description = "Monospaced typeface designed to look like the VT320 text terminal glyphs"; homepage = "https://github.com/phoikoi/VT323"; - license = with lib.licenses; [ ofl ]; + license = lib.licenses.ofl; maintainers = with lib.maintainers; [ marcel ]; }; }) diff --git a/pkgs/by-name/vx/vxl/package.nix b/pkgs/by-name/vx/vxl/package.nix index 66b394e582b5..fda48482e834 100644 --- a/pkgs/by-name/vx/vxl/package.nix +++ b/pkgs/by-name/vx/vxl/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://vxl.sourceforge.net"; # license appears contradictory; see https://github.com/vxl/vxl/issues/752 # (and see https://github.com/InsightSoftwareConsortium/ITK/pull/1920/files for potential patch) - license = [ lib.licenses.unfree ]; + license = lib.licenses.unfree; maintainers = [ ]; platforms = with lib.platforms; linux; }; diff --git a/pkgs/by-name/vy/vym/package.nix b/pkgs/by-name/vy/vym/package.nix index 9d42a69ef879..0ef8ae7ac292 100644 --- a/pkgs/by-name/vy/vym/package.nix +++ b/pkgs/by-name/vy/vym/package.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { drawn by hand or any drawing software vym offers much more features to work with such maps. ''; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "vym"; maintainers = [ ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/vz/vzic/package.nix b/pkgs/by-name/vz/vzic/package.nix index 91ee97fd9d75..6bb48f6dbf21 100644 --- a/pkgs/by-name/vz/vzic/package.nix +++ b/pkgs/by-name/vz/vzic/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Program to convert the IANA timezone database files into VTIMEZONE files compatible with the iCalendar specification"; changelog = "https://github.com/libical/vzic/blob/${finalAttrs.src.rev}/ChangeLog"; mainProgram = "vzic"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ moraxyc ]; broken = !stdenv.hostPlatform.emulatorAvailable buildPackages; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/wa/waagent/package.nix b/pkgs/by-name/wa/waagent/package.nix index 9332b3d5c426..82027a5c5c7d 100644 --- a/pkgs/by-name/wa/waagent/package.nix +++ b/pkgs/by-name/wa/waagent/package.nix @@ -90,7 +90,7 @@ python.pkgs.buildPythonApplication (finalAttrs: { Fabric Controller''; homepage = "https://github.com/Azure/WALinuxAgent"; maintainers = with lib.maintainers; [ codgician ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/wa/wambo/package.nix b/pkgs/by-name/wa/wambo/package.nix index 79d644b968df..f9a8be74e1aa 100644 --- a/pkgs/by-name/wa/wambo/package.nix +++ b/pkgs/by-name/wa/wambo/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://github.com/phip1611/wambo"; changelog = "https://github.com/phip1611/wambo/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ phip1611 ]; }; }) diff --git a/pkgs/by-name/wa/wapm/package.nix b/pkgs/by-name/wa/wapm/package.nix index 91616cc43fca..a12b3ccb34c7 100644 --- a/pkgs/by-name/wa/wapm/package.nix +++ b/pkgs/by-name/wa/wapm/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Package manager for WebAssembly modules"; mainProgram = "wapm"; homepage = "https://docs.wasmer.io/ecosystem/wapm"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.lucperkins ]; }; }) diff --git a/pkgs/by-name/wa/wasmedge/package.nix b/pkgs/by-name/wa/wasmedge/package.nix index 72a0b94fc30c..984bb3fd6d28 100644 --- a/pkgs/by-name/wa/wasmedge/package.nix +++ b/pkgs/by-name/wa/wasmedge/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://wasmedge.org/"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; description = "Lightweight, high-performance, and extensible WebAssembly runtime for cloud native, edge, and decentralized applications"; maintainers = [ ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/wa/wasynth/package.nix b/pkgs/by-name/wa/wasynth/package.nix index e30a4fcbf03f..048b089dd06f 100644 --- a/pkgs/by-name/wa/wasynth/package.nix +++ b/pkgs/by-name/wa/wasynth/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { * wasm2luau: translate WebAssembly Luau source code ''; homepage = "https://github.com/Rerumu/Wasynth"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/wa/watchexec/package.nix b/pkgs/by-name/wa/watchexec/package.nix index 880a3be99572..0bf91b22f52a 100644 --- a/pkgs/by-name/wa/watchexec/package.nix +++ b/pkgs/by-name/wa/watchexec/package.nix @@ -56,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Executes commands in response to file modifications"; homepage = "https://watchexec.github.io/"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ michalrus prince213 diff --git a/pkgs/by-name/wa/waydroid-helper/package.nix b/pkgs/by-name/wa/waydroid-helper/package.nix index 089e1f37332b..7ab04ae747e2 100644 --- a/pkgs/by-name/wa/waydroid-helper/package.nix +++ b/pkgs/by-name/wa/waydroid-helper/package.nix @@ -125,7 +125,7 @@ python3Packages.buildPythonApplication { changelog = "https://github.com/ayasa520/waydroid-helper/releases/tag/${src.tag}"; description = "User-friendly way to configure Waydroid and install extensions, including Magisk and ARM translation"; homepage = "https://github.com/ayasa520/waydroid-helper"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "waydroid-helper"; maintainers = [ ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/wa/wayland-logout/package.nix b/pkgs/by-name/wa/wayland-logout/package.nix index c5460756c0fd..365299129891 100644 --- a/pkgs/by-name/wa/wayland-logout/package.nix +++ b/pkgs/by-name/wa/wayland-logout/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "wayland-logout"; homepage = "https://github.com/soreau/wayland-logout"; maintainers = with lib.maintainers; [ quantenzitrone ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/wc/wchisp/package.nix b/pkgs/by-name/wc/wchisp/package.nix index b9f2952b9a71..4013ae728dd0 100644 --- a/pkgs/by-name/wc/wchisp/package.nix +++ b/pkgs/by-name/wc/wchisp/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Command-line implementation of WCHISPTool, for flashing ch32 MCUs"; homepage = "https://ch32-rs.github.io/wchisp/"; changelog = "https://github.com/ch32-rs/wchisp/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; platforms = with lib.platforms; linux ++ darwin ++ windows; broken = !stdenv.hostPlatform.isLinux; maintainers = with lib.maintainers; [ jwillikers ]; diff --git a/pkgs/by-name/we/weathr/package.nix b/pkgs/by-name/we/weathr/package.nix index 693d018b22ce..b91a2f6cf093 100644 --- a/pkgs/by-name/we/weathr/package.nix +++ b/pkgs/by-name/we/weathr/package.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Terminal weather app with ascii animation"; homepage = "https://github.com/veirt/weathr"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ sudo-mac phanirithvij diff --git a/pkgs/by-name/we/webcamoid/package.nix b/pkgs/by-name/we/webcamoid/package.nix index 0af42d57267d..ec7e3e6d6900 100644 --- a/pkgs/by-name/we/webcamoid/package.nix +++ b/pkgs/by-name/we/webcamoid/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { description = "Webcam Capture Software"; longDescription = "Webcamoid is a full featured and multiplatform webcam suite."; homepage = "https://github.com/webcamoid/webcamoid/"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ robaca ]; mainProgram = "webcamoid"; diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix index 95c75acd1da4..a09398e05dd0 100644 --- a/pkgs/by-name/we/wechat/package.nix +++ b/pkgs/by-name/we/wechat/package.nix @@ -24,42 +24,38 @@ let ]; }; - sources = - let - # https://dldir1.qq.com/weixin/mac/mac-release.xml - any-darwin = - let - version = "4.1.8.106-37335"; - version' = lib.replaceString "-" "_" version; - in - { - inherit version; - src = fetchurl { - url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg"; - hash = "sha256-lygjqWbNqh9fCnhbyfEhnRdKdfQ9MOwPv5unqwJJsvE="; - }; - }; - in - { - aarch64-darwin = any-darwin; - # use https://web.archive.org/save to archive the Linux versions - # add `if_` at the end of timestamps to avoid toolbar insertion - # for a more complicated guide, see https://en.wikipedia.org/wiki/Help:Using_the_Wayback_Machine - aarch64-linux = { - version = "4.1.1.4"; + sources = { + # https://dldir1.qq.com/weixin/mac/mac-release.xml + aarch64-darwin = + let + version = "4.1.8.106-37335"; + version' = lib.replaceString "-" "_" version; + in + { + inherit version; src = fetchurl { - url = "https://web.archive.org/web/20260311102559if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_arm64.AppImage"; - hash = "sha256-YlWJxT62tXDaNwYVpsPMC5elFH8fsbI1HjTQn6ePiPo="; + url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg"; + hash = "sha256-lygjqWbNqh9fCnhbyfEhnRdKdfQ9MOwPv5unqwJJsvE="; }; }; - x86_64-linux = { - version = "4.1.1.4"; - src = fetchurl { - url = "https://web.archive.org/web/20260311102439if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.AppImage"; - hash = "sha256-XxAvFnlljqurGPDgRr+DnuCKbdVvgXBPh02DLHY3Oz8="; - }; + # use https://web.archive.org/save to archive the Linux versions + # add `if_` at the end of timestamps to avoid toolbar insertion + # for a more complicated guide, see https://en.wikipedia.org/wiki/Help:Using_the_Wayback_Machine + aarch64-linux = { + version = "4.1.1.4"; + src = fetchurl { + url = "https://web.archive.org/web/20260311102559if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_arm64.AppImage"; + hash = "sha256-YlWJxT62tXDaNwYVpsPMC5elFH8fsbI1HjTQn6ePiPo="; }; }; + x86_64-linux = { + version = "4.1.1.4"; + src = fetchurl { + url = "https://web.archive.org/web/20260311102439if_/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.AppImage"; + hash = "sha256-XxAvFnlljqurGPDgRr+DnuCKbdVvgXBPh02DLHY3Oz8="; + }; + }; + }; in callPackage (if stdenvNoCC.hostPlatform.isDarwin then ./darwin.nix else ./linux.nix) { inherit pname meta; diff --git a/pkgs/by-name/we/weylus/package.nix b/pkgs/by-name/we/weylus/package.nix index 914e48afda06..f0b0022dbf0b 100644 --- a/pkgs/by-name/we/weylus/package.nix +++ b/pkgs/by-name/we/weylus/package.nix @@ -111,7 +111,7 @@ rustPlatform.buildRustPackage { description = "Use your tablet as graphic tablet/touch screen on your computer"; mainProgram = "weylus"; homepage = "https://github.com/H-M-H/Weylus"; - license = with lib.licenses; [ agpl3Only ]; + license = lib.licenses.agpl3Only; maintainers = [ ]; }; } diff --git a/pkgs/by-name/wi/wifi-qr/package.nix b/pkgs/by-name/wi/wifi-qr/package.nix index e85156efc646..467164e48321 100644 --- a/pkgs/by-name/wi/wifi-qr/package.nix +++ b/pkgs/by-name/wi/wifi-qr/package.nix @@ -92,7 +92,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "WiFi password sharing via QR codes"; homepage = "https://github.com/kokoye2007/wifi-qr"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ ambroisie ]; mainProgram = "wifi-qr"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/wi/wikiman/package.nix b/pkgs/by-name/wi/wikiman/package.nix index 2c4a8daeea9b..4f7742b6e112 100644 --- a/pkgs/by-name/wi/wikiman/package.nix +++ b/pkgs/by-name/wi/wikiman/package.nix @@ -60,7 +60,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Offline search engine for manual pages, Arch Wiki, Gentoo Wiki and other documentation"; homepage = "https://github.com/filiparag/wikiman"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "wikiman"; diff --git a/pkgs/by-name/wi/win-spice/package.nix b/pkgs/by-name/wi/win-spice/package.nix index 42001872fadb..7727d02339f2 100644 --- a/pkgs/by-name/wi/win-spice/package.nix +++ b/pkgs/by-name/wi/win-spice/package.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation { meta = { description = "Windows SPICE Drivers"; homepage = "https://www.spice-space.org/"; - license = [ lib.licenses.asl20 ]; # See https://github.com/vrozenfe/qxl-dod + license = lib.licenses.asl20; # See https://github.com/vrozenfe/qxl-dod maintainers = [ ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/wi/windsend-rs/package.nix b/pkgs/by-name/wi/windsend-rs/package.nix index a52b12bf4c6a..b3f5f3d83d34 100644 --- a/pkgs/by-name/wi/windsend-rs/package.nix +++ b/pkgs/by-name/wi/windsend-rs/package.nix @@ -83,7 +83,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Quickly and securely sync clipboard, transfer files and directories between devices"; homepage = "https://github.com/doraemonkeys/WindSend"; mainProgram = "wind_send"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/wi/windsend/package.nix b/pkgs/by-name/wi/windsend/package.nix index 95572f0b0c43..64a130f29ea1 100644 --- a/pkgs/by-name/wi/windsend/package.nix +++ b/pkgs/by-name/wi/windsend/package.nix @@ -71,7 +71,7 @@ flutter341.buildFlutterApplication (finalAttrs: { description = "Quickly and securely sync clipboard, transfer files and directories between devices"; homepage = "https://github.com/doraemonkeys/WindSend"; mainProgram = "WindSend"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/wi/wio/package.nix b/pkgs/by-name/wi/wio/package.nix index 2e8889e36e16..5c32f37c5756 100644 --- a/pkgs/by-name/wi/wio/package.nix +++ b/pkgs/by-name/wi/wio/package.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { Wio is a Wayland compositor for Linux and FreeBSD which has a similar look and feel to plan9's rio. ''; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; mainProgram = "wio"; maintainers = [ ]; inherit (wayland.meta) platforms; diff --git a/pkgs/by-name/wl/wlogout/package.nix b/pkgs/by-name/wl/wlogout/package.nix index fdf770a63fe7..a29d3ae42d4c 100644 --- a/pkgs/by-name/wl/wlogout/package.nix +++ b/pkgs/by-name/wl/wlogout/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/ArtsyMacaw/wlogout"; description = "Wayland based logout menu"; changelog = "https://github.com/ArtsyMacaw/wlogout/releases/tag/${finalAttrs.src.rev}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "wlogout"; maintainers = with lib.maintainers; [ iogamaster ]; inherit (wayland.meta) platforms; diff --git a/pkgs/by-name/wo/worker/package.nix b/pkgs/by-name/wo/worker/package.nix index 5122742e2e93..f28ceebd0ae8 100644 --- a/pkgs/by-name/wo/worker/package.nix +++ b/pkgs/by-name/wo/worker/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { directories by using history of accessed directories, live filtering, and access to commands by using the keyboard. ''; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "worker"; maintainers = [ ]; inherit (libx11.meta) platforms; diff --git a/pkgs/by-name/wo/worldpainter/package.nix b/pkgs/by-name/wo/worldpainter/package.nix index eb800c8405bd..168054ee0a63 100644 --- a/pkgs/by-name/wo/worldpainter/package.nix +++ b/pkgs/by-name/wo/worldpainter/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { homepage = "https://www.worldpainter.net/"; description = "Interactive map generator for Minecraft"; longDescription = "WorldPainter is an interactive map generator for Minecraft. It allows you to \"paint\" landscapes using similar tools as a regular paint program. Sculpt and mould the terrain, paint materials, trees, snow and ice, etc. onto it, and much more"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ eymeric ]; platforms = lib.platforms.linux; sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; diff --git a/pkgs/by-name/wo/wox/package.nix b/pkgs/by-name/wo/wox/package.nix index a35c3c2e31be..9eef12507260 100644 --- a/pkgs/by-name/wo/wox/package.nix +++ b/pkgs/by-name/wo/wox/package.nix @@ -111,7 +111,7 @@ buildGoModule (finalAttrs: { changelog = "https://github.com/Wox-launcher/Wox/blob/${finalAttrs.src.rev}/CHANGELOG.md"; mainProgram = "wox"; platforms = lib.platforms.linux; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ eljamm ]; }; }) diff --git a/pkgs/by-name/wp/wprecon/package.nix b/pkgs/by-name/wp/wprecon/package.nix index 0f85b2e7141a..3be96c1ae720 100644 --- a/pkgs/by-name/wp/wprecon/package.nix +++ b/pkgs/by-name/wp/wprecon/package.nix @@ -27,7 +27,7 @@ buildGoModule rec { homepage = "https://github.com/blackbinn/wprecon"; # License Zero Noncommercial Public License 2.0.1 # https://github.com/blackbinn/wprecon/blob/master/LICENSE - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/ws/wsjtx/package.nix b/pkgs/by-name/ws/wsjtx/package.nix index 38c063c47313..c8ccf4133d4f 100644 --- a/pkgs/by-name/ws/wsjtx/package.nix +++ b/pkgs/by-name/ws/wsjtx/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { contacts under extreme weak-signal conditions. ''; homepage = "https://wsjt.sourceforge.io"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ lasandell diff --git a/pkgs/by-name/wy/wyoming-piper/package.nix b/pkgs/by-name/wy/wyoming-piper/package.nix index 04263e12a46d..1520c528b8f7 100644 --- a/pkgs/by-name/wy/wyoming-piper/package.nix +++ b/pkgs/by-name/wy/wyoming-piper/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "wyoming-piper"; - version = "2.2.2"; + version = "2.3.1"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming-piper"; tag = "v${finalAttrs.version}"; - hash = "sha256-pk6HAzl0A8R5szI7d6ZFOQI5akkzWb0Nb/WuxKdIwg8="; + hash = "sha256-LKt1BNa9jrZIDUZxZvniZcPrAuUkwOs85uIiA5mFWyY="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/xa/xarcan/package.nix b/pkgs/by-name/xa/xarcan/package.nix index 953197d2a914..df3ccaf4a28d 100644 --- a/pkgs/by-name/xa/xarcan/package.nix +++ b/pkgs/by-name/xa/xarcan/package.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalPackages: rec { arcan-shmif to map Xlib/Xcb/X clients to a running arcan instance. It allows running an X session as a window under Arcan. ''; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/xc/xcode-install/package.nix b/pkgs/by-name/xc/xcode-install/package.nix index b4ddae6ce51b..04aeb82b1b11 100644 --- a/pkgs/by-name/xc/xcode-install/package.nix +++ b/pkgs/by-name/xc/xcode-install/package.nix @@ -16,6 +16,6 @@ bundlerApp { homepage = "https://github.com/xcpretty/xcode-install"; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ q3k ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/by-name/xd/xdiskusage/package.nix b/pkgs/by-name/xd/xdiskusage/package.nix index e5f2ded9efb7..e927755f66c2 100644 --- a/pkgs/by-name/xd/xdiskusage/package.nix +++ b/pkgs/by-name/xd/xdiskusage/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Program to show you what is using up all your disk space"; homepage = "https://xdiskusage.sourceforge.net/"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ fuzzdk ]; platforms = with lib.platforms; linux; mainProgram = "xdiskusage"; diff --git a/pkgs/by-name/xe/xedit/package.nix b/pkgs/by-name/xe/xedit/package.nix index 037f4540cd9b..8cf32e7bfe22 100644 --- a/pkgs/by-name/xe/xedit/package.nix +++ b/pkgs/by-name/xe/xedit/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple graphical text editor using Athena Widgets (Xaw)"; homepage = "https://gitlab.freedesktop.org/xorg/app/xedit"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.unix; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/xl/xlibinput-calibrator/package.nix b/pkgs/by-name/xl/xlibinput-calibrator/package.nix index cdd416124159..c80a2b9c1664 100644 --- a/pkgs/by-name/xl/xlibinput-calibrator/package.nix +++ b/pkgs/by-name/xl/xlibinput-calibrator/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "xlibinput_calibrator"; homepage = "https://github.com/kreijack/xlibinput_calibrator"; changelog = "https://github.com/kreijack/xlibinput_calibrator/blob/${finalAttrs.src.rev}/Changelog"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ atemu ]; }; }) diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix index 8cfa2b3adf9b..1d4e0faad00c 100644 --- a/pkgs/by-name/xo/xonsh/unwrapped.nix +++ b/pkgs/by-name/xo/xonsh/unwrapped.nix @@ -158,7 +158,7 @@ buildPythonPackage rec { homepage = "https://xon.sh/"; description = "Python-powered shell"; changelog = "https://github.com/xonsh/xonsh/blob/${version}/CHANGELOG.md"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; mainProgram = "xonsh"; maintainers = with lib.maintainers; [ samlukeyes123 ]; }; diff --git a/pkgs/by-name/xr/xray/package.nix b/pkgs/by-name/xr/xray/package.nix index 4ebd26870f5b..90a95f780c3f 100644 --- a/pkgs/by-name/xr/xray/package.nix +++ b/pkgs/by-name/xr/xray/package.nix @@ -59,7 +59,7 @@ buildGo126Module (finalAttrs: { description = "Platform for building proxies to bypass network restrictions. A replacement for v2ray-core, with XTLS support and fully compatible configuration"; mainProgram = "xray"; homepage = "https://github.com/XTLS/Xray-core"; - license = with lib.licenses; [ mpl20 ]; + license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ iopq ]; }; }) diff --git a/pkgs/by-name/xs/xscope/package.nix b/pkgs/by-name/xs/xscope/package.nix index 79ba960b0d41..580dfc3892e4 100644 --- a/pkgs/by-name/xs/xscope/package.nix +++ b/pkgs/by-name/xs/xscope/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Program to monitor X11/Client conversations"; homepage = "https://cgit.freedesktop.org/xorg/app/xscope/"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ crertel ]; platforms = lib.platforms.unix; mainProgram = "xscope"; diff --git a/pkgs/by-name/xt/xterm/package.nix b/pkgs/by-name/xt/xterm/package.nix index 10cc131d07d8..13827a86b3fd 100644 --- a/pkgs/by-name/xt/xterm/package.nix +++ b/pkgs/by-name/xt/xterm/package.nix @@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: { window whenever it is resized. ''; homepage = "https://invisible-island.net/xterm"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = with lib.platforms; linux ++ darwin; changelog = "https://invisible-island.net/xterm/xterm.log.html#xterm_${finalAttrs.version}"; mainProgram = "xterm"; diff --git a/pkgs/by-name/xu/xunit-viewer/package.nix b/pkgs/by-name/xu/xunit-viewer/package.nix index 4e3ccd52d7ba..0f2c0d477351 100644 --- a/pkgs/by-name/xu/xunit-viewer/package.nix +++ b/pkgs/by-name/xu/xunit-viewer/package.nix @@ -36,7 +36,7 @@ buildNpmPackage { meta = { description = "View your xunit results using JavaScript"; homepage = "https://lukejpreston.github.io/xunit-viewer"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ pluiedev ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/ya/yaml2json/package.nix b/pkgs/by-name/ya/yaml2json/package.nix index 531a2744b45b..80e193397c76 100644 --- a/pkgs/by-name/ya/yaml2json/package.nix +++ b/pkgs/by-name/ya/yaml2json/package.nix @@ -36,7 +36,7 @@ buildGoModule (finalAttrs: { changelog = "https://github.com/bronze1man/yaml2json/releases/tag/v${finalAttrs.version}"; description = "Convert yaml to json"; mainProgram = "yaml2json"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/ya/yay/package.nix b/pkgs/by-name/ya/yay/package.nix index 958a073161b8..2a5bea5bc5d3 100644 --- a/pkgs/by-name/ya/yay/package.nix +++ b/pkgs/by-name/ya/yay/package.nix @@ -66,7 +66,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/Jguer/yay"; mainProgram = "yay"; platforms = lib.platforms.linux; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/yg/yggdrasil-ng/package.nix b/pkgs/by-name/yg/yggdrasil-ng/package.nix index 04f621cbdbf5..94bc4a7f4feb 100644 --- a/pkgs/by-name/yg/yggdrasil-ng/package.nix +++ b/pkgs/by-name/yg/yggdrasil-ng/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage (oldAttrs: { pname = "yggdrasil-ng"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "Revertron"; repo = "Yggdrasil-ng"; tag = "v${oldAttrs.version}"; - hash = "sha256-Ic3r8xNeBMg+vN9C2JPRrpVRNHqT5XuDT+EoD493qdM="; + hash = "sha256-idhtzN1qJQ50u+1KjFVAxttR2pHKPp6iFvL6XTp3XFQ="; }; - cargoHash = "sha256-eA5tXPqZJnRIYQGxmjOA8esDV8u74afWMfZ9bn9PsWE="; + cargoHash = "sha256-qJrRz2JIkQD185XY3tSbJFKZWCY0+1heT6MhIeH/52A="; __structuredAttrs = true; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (oldAttrs: { mainProgram = "telemt"; description = "Yggdrasil Network rewritten in Rust"; homepage = "https://github.com/Revertron/Yggdrasil-ng"; - license = with lib.licenses; [ mpl20 ]; + license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ r4v3n6101 malik diff --git a/pkgs/by-name/yq/yq-go/package.nix b/pkgs/by-name/yq/yq-go/package.nix index 358a57af01d3..0b704772c8a9 100644 --- a/pkgs/by-name/yq/yq-go/package.nix +++ b/pkgs/by-name/yq/yq-go/package.nix @@ -55,7 +55,7 @@ buildGoModule (finalAttrs: { homepage = "https://mikefarah.gitbook.io/yq/"; changelog = "https://github.com/mikefarah/yq/raw/${finalAttrs.src.tag}/release_notes.txt"; mainProgram = "yq"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ lewo prince213 diff --git a/pkgs/by-name/yt/ytree/package.nix b/pkgs/by-name/yt/ytree/package.nix index cdb953a46a03..a0d2f861ccfe 100644 --- a/pkgs/by-name/yt/ytree/package.nix +++ b/pkgs/by-name/yt/ytree/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.han.de/~werner/ytree.html"; description = "Curses-based file manager similar to DOS Xtree(TM)"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "ytree"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/zd/zdns/package.nix b/pkgs/by-name/zd/zdns/package.nix index 94c24f404b2f..6c7310276db8 100644 --- a/pkgs/by-name/zd/zdns/package.nix +++ b/pkgs/by-name/zd/zdns/package.nix @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { description = "CLI DNS lookup tool"; mainProgram = "zdns"; homepage = "https://github.com/zmap/zdns"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ze/zellij-unwrapped/package.nix b/pkgs/by-name/ze/zellij-unwrapped/package.nix index c0331f24ac59..c3db4830ff1e 100644 --- a/pkgs/by-name/ze/zellij-unwrapped/package.nix +++ b/pkgs/by-name/ze/zellij-unwrapped/package.nix @@ -83,7 +83,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Terminal workspace with batteries included"; homepage = "https://zellij.dev/"; changelog = "https://github.com/zellij-org/zellij/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ therealansh _0x4A6F diff --git a/pkgs/by-name/ze/zesarux/package.nix b/pkgs/by-name/ze/zesarux/package.nix index 0614cb4a6636..37ff5eb0672a 100644 --- a/pkgs/by-name/ze/zesarux/package.nix +++ b/pkgs/by-name/ze/zesarux/package.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/chernandezba/zesarux"; description = "ZX Second-Emulator And Released for UniX"; mainProgram = "zesarux"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/zn/zn_poly/package.nix b/pkgs/by-name/zn/zn_poly/package.nix index dc8b0e9101e4..36a9255cfd77 100644 --- a/pkgs/by-name/zn/zn_poly/package.nix +++ b/pkgs/by-name/zn/zn_poly/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/"; description = "Polynomial arithmetic over Z/nZ"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; teams = [ lib.teams.sage ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/zo/zoxide/package.nix b/pkgs/by-name/zo/zoxide/package.nix index 80f6457629a4..8e8eec5f254f 100644 --- a/pkgs/by-name/zo/zoxide/package.nix +++ b/pkgs/by-name/zo/zoxide/package.nix @@ -69,7 +69,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Fast cd command that learns your habits"; homepage = "https://github.com/ajeetdsouza/zoxide"; changelog = "https://github.com/ajeetdsouza/zoxide/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ysndr cole-h diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix index 247e72ebbb65..1d8a1d17093b 100644 --- a/pkgs/by-name/zp/zpaqfranz/package.nix +++ b/pkgs/by-name/zp/zpaqfranz/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/fcorbelli/zpaqfranz/releases/tag/${finalAttrs.version}"; description = "Advanced multiversioned deduplicating archiver, with HW acceleration, encryption and paranoid-level tests"; mainProgram = "zpaqfranz"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/desktops/enlightenment/evisum/default.nix b/pkgs/desktops/enlightenment/evisum/default.nix index f5877f302aeb..a14f27897afc 100644 --- a/pkgs/desktops/enlightenment/evisum/default.nix +++ b/pkgs/desktops/enlightenment/evisum/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "System and process monitor written with EFL"; mainProgram = "evisum"; homepage = "https://git.enlightenment.org/enlightenment/evisum"; - license = with lib.licenses; [ isc ]; + license = lib.licenses.isc; platforms = lib.platforms.linux; teams = [ lib.teams.enlightenment ]; }; diff --git a/pkgs/desktops/lomiri/applications/lomiri-calendar-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-calendar-app/default.nix index 856f1fe00f7a..85ad305556a4 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-calendar-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-calendar-app/default.nix @@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Default Calendar application for Ubuntu Touch devices"; homepage = "https://gitlab.com/ubports/development/apps/lomiri-calendar-app"; changelog = "https://gitlab.com/ubports/development/apps/lomiri-calendar-app/-/blob/v${finalAttrs.version}/ChangeLog"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; mainProgram = "lomiri-calendar-app"; teams = [ lib.teams.lomiri ]; platforms = lib.platforms.linux; diff --git a/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix b/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix index 51d6f9e0a3a4..db31ea42bf57 100644 --- a/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix +++ b/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix @@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://gitlab.com/ubports/development/core/lomiri-wallpapers"; changelog = "https://gitlab.com/ubports/development/core/lomiri-wallpapers/-/blob/${finalAttrs.version}/ChangeLog"; # On update, recheck debian/copyright for which licenses apply to the installed images - license = with lib.licenses; [ cc-by-sa-30 ]; + license = lib.licenses.cc-by-sa-30; teams = [ lib.teams.lomiri ]; platforms = lib.platforms.all; }; diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index 0398ec748206..e2e8b3b2abb5 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -157,7 +157,7 @@ else ''; meta = { description = "Android NDK toolchain, tuned for other platforms"; - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; teams = [ lib.teams.android ]; }; }; diff --git a/pkgs/development/compilers/fbc/mac-bin.nix b/pkgs/development/compilers/fbc/mac-bin.nix deleted file mode 100644 index 13c95fe18aae..000000000000 --- a/pkgs/development/compilers/fbc/mac-bin.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - stdenvNoCC, - lib, - fetchzip, -}: - -stdenvNoCC.mkDerivation rec { - pname = "fbc-mac-bin"; - version = "1.06-darwin-wip20160505"; - - src = fetchzip { - url = "https://tmc.castleparadox.com/temp/fbc-${version}.tar.bz2"; - sha256 = "sha256-hD3SRUkk50sf0MhhgHNMvBoJHTKz/71lyFxaAXM4/qI="; - }; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -R * $out - - runHook postInstall - ''; - - meta = { - homepage = "https://rpg.hamsterrepublic.com/ohrrpgce/Compiling_in_Mac_OS_X"; - description = "FreeBASIC, a multi-platform BASIC Compiler (precompiled Darwin build by OHRRPGCE team)"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.gpl2Plus; # runtime & graphics libraries are LGPLv2+ w/ static linking exception - maintainers = with lib.maintainers; [ OPNA2608 ]; - platforms = [ ]; - }; -} diff --git a/pkgs/development/compilers/gcc/ng/common/common-let.nix b/pkgs/development/compilers/gcc/ng/common/common-let.nix index 95f14abd7679..970e9e143be8 100644 --- a/pkgs/development/compilers/gcc/ng/common/common-let.nix +++ b/pkgs/development/compilers/gcc/ng/common/common-let.nix @@ -11,7 +11,7 @@ rec { gcc_meta = { - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; teams = [ lib.teams.gcc ]; }; diff --git a/pkgs/development/compilers/mlton/20130715.nix b/pkgs/development/compilers/mlton/20130715.nix index ed460b7e5cfe..766111dc012a 100644 --- a/pkgs/development/compilers/mlton/20130715.nix +++ b/pkgs/development/compilers/mlton/20130715.nix @@ -29,11 +29,6 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.amd64-linux.tgz"; hash = "sha256-9vkSAJsJRrc6+I/18+cTtr5juHFpbiaXzPFWS1bn0Ds="; }) - else if stdenv.hostPlatform.system == "x86_64-darwin" then - (fetchurl { - url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.amd64-darwin.gmp-macports.tgz"; - hash = "sha256-qb//O8Wnk+hDBvmM1g8ZWoE5kCkA+W4QctE8CBO0nBA="; - }) else throw "Architecture not supported"; @@ -76,9 +71,6 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.cc.isClang '' sed -i "s_ patch -s -p0 =8,<9" "setuptools-scm" ''; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ jinja2 - ply - six packaging + ply ]; nativeCheckInputs = [ @@ -47,9 +51,9 @@ buildPythonPackage rec { meta = { description = "Official API Spec Language for Dropbox API V2"; homepage = "https://github.com/dropbox/stone"; - changelog = "https://github.com/dropbox/stone/releases/tag/${src.tag}"; + changelog = "https://github.com/dropbox/stone/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = [ ]; mainProgram = "stone"; }; -} +}) diff --git a/pkgs/development/python-modules/stop-words/default.nix b/pkgs/development/python-modules/stop-words/default.nix index 996f9745fb0d..48466975bb9c 100644 --- a/pkgs/development/python-modules/stop-words/default.nix +++ b/pkgs/development/python-modules/stop-words/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = { description = "Get list of common stop words in various languages in Python"; homepage = "https://github.com/Alir3z4/python-stop-words"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ lavafroth ]; }; } diff --git a/pkgs/development/python-modules/stopit/default.nix b/pkgs/development/python-modules/stopit/default.nix index f019bd83caa6..4160f45ded4a 100644 --- a/pkgs/development/python-modules/stopit/default.nix +++ b/pkgs/development/python-modules/stopit/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { broken = lib.versionAtLeast setuptools.version "82"; description = "Raise asynchronous exceptions in other thread, control the timeout of blocks or callables with a context manager or a decorator"; homepage = "https://github.com/glenfant/stopit"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/python-modules/streamlabswater/default.nix b/pkgs/development/python-modules/streamlabswater/default.nix index 5234cb7c5db6..0ab9594b4579 100644 --- a/pkgs/development/python-modules/streamlabswater/default.nix +++ b/pkgs/development/python-modules/streamlabswater/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = { description = "Python library for the StreamLabs API"; homepage = "https://github.com/streamlabswater/stream-python"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/strenum/default.nix b/pkgs/development/python-modules/strenum/default.nix index 0982ebe4d7d3..0f3d92031840 100644 --- a/pkgs/development/python-modules/strenum/default.nix +++ b/pkgs/development/python-modules/strenum/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { description = "Module for enum that inherits from str"; homepage = "https://github.com/irgeek/StrEnum"; changelog = "https://github.com/irgeek/StrEnum/releases/tag/v${version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/striprtf/default.nix b/pkgs/development/python-modules/striprtf/default.nix index 2c1aa3d5b918..232ce592a2ea 100644 --- a/pkgs/development/python-modules/striprtf/default.nix +++ b/pkgs/development/python-modules/striprtf/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "Simple library to convert rtf to text"; mainProgram = "striprtf"; maintainers = with lib.maintainers; [ aanderse ]; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/subzerod/default.nix b/pkgs/development/python-modules/subzerod/default.nix index d8d957fcc026..2c13ead5a466 100644 --- a/pkgs/development/python-modules/subzerod/default.nix +++ b/pkgs/development/python-modules/subzerod/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { description = "Python module to help with the enumeration of subdomains"; mainProgram = "subzerod"; homepage = "https://github.com/sanderfoobar/subzerod"; - license = with lib.licenses; [ wtfpl ]; + license = lib.licenses.wtfpl; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix index 761e079d76c4..800655fd57e7 100644 --- a/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix +++ b/pkgs/development/python-modules/syslog-rfc5424-formatter/default.nix @@ -32,7 +32,7 @@ buildPythonPackage (finalAttrs: { description = "Python logging formatter for emitting RFC5424 Syslog messages"; homepage = "https://github.com/easypost/syslog-rfc5424-formatter"; changelog = "https://github.com/EasyPost/syslog-rfc5424-formatter/blob/v${finalAttrs.version}/CHANGES.md"; - license = with lib.licenses; [ isc ]; + license = lib.licenses.isc; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/development/python-modules/tahoma-api/default.nix b/pkgs/development/python-modules/tahoma-api/default.nix index 89c94f8d86b7..17613c0bb39f 100644 --- a/pkgs/development/python-modules/tahoma-api/default.nix +++ b/pkgs/development/python-modules/tahoma-api/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Python module to interface with Tahoma REST API"; homepage = "https://github.com/philklei/tahoma-api/"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/tailer/default.nix b/pkgs/development/python-modules/tailer/default.nix index f51577891397..aa578fbb2f45 100644 --- a/pkgs/development/python-modules/tailer/default.nix +++ b/pkgs/development/python-modules/tailer/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { description = "Python implementation implementation of GNU tail and head"; mainProgram = "pytail"; homepage = "https://github.com/six8/pytailer"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/termplotlib/default.nix b/pkgs/development/python-modules/termplotlib/default.nix index 006404b68c34..a1a2192a7a19 100644 --- a/pkgs/development/python-modules/termplotlib/default.nix +++ b/pkgs/development/python-modules/termplotlib/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = { description = "Matplotlib for your terminal"; homepage = "https://github.com/nschloe/termplotlib"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index c0de041f8f84..df926cc31b41 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { description = "Python library to work with Tesla API"; homepage = "https://github.com/zabuldon/teslajsonpy"; changelog = "https://github.com/zabuldon/teslajsonpy/releases/tag/${src.tag}"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/testbook/default.nix b/pkgs/development/python-modules/testbook/default.nix index 87c21c8bd3c1..1f377ce8de64 100644 --- a/pkgs/development/python-modules/testbook/default.nix +++ b/pkgs/development/python-modules/testbook/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = { description = "Unit testing framework extension for testing code in Jupyter Notebooks"; homepage = "https://testbook.readthedocs.io/"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ djacu ]; }; } diff --git a/pkgs/development/python-modules/testrail-api/default.nix b/pkgs/development/python-modules/testrail-api/default.nix index 1af94a75f124..b1b17242357d 100644 --- a/pkgs/development/python-modules/testrail-api/default.nix +++ b/pkgs/development/python-modules/testrail-api/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { description = "Python wrapper of the TestRail API"; homepage = "https://github.com/tolstislon/testrail-api"; changelog = "https://github.com/tolstislon/testrail-api/releases/tag/${src.tag}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ aanderse ]; }; } diff --git a/pkgs/development/python-modules/timeago/default.nix b/pkgs/development/python-modules/timeago/default.nix index 88f565d1f1dc..61ce44252b99 100644 --- a/pkgs/development/python-modules/timeago/default.nix +++ b/pkgs/development/python-modules/timeago/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Python module to format past datetime output"; homepage = "https://github.com/hustcc/timeago"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/tmb/default.nix b/pkgs/development/python-modules/tmb/default.nix index 2481bdb8f71e..5c787c88d568 100644 --- a/pkgs/development/python-modules/tmb/default.nix +++ b/pkgs/development/python-modules/tmb/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = { description = "Python library that interacts with TMB API"; homepage = "https://github.com/alemuro/tmb"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/tololib/default.nix b/pkgs/development/python-modules/tololib/default.nix index ebf8aff02dc0..fea49a3821e8 100644 --- a/pkgs/development/python-modules/tololib/default.nix +++ b/pkgs/development/python-modules/tololib/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { description = "Python Library for Controlling TOLO Sauna/Steam Bath Devices"; homepage = "https://gitlab.com/MatthiasLohr/tololib"; changelog = "https://gitlab.com/MatthiasLohr/tololib/-/blob/v${version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "tolo-cli"; }; diff --git a/pkgs/development/python-modules/toonapi/default.nix b/pkgs/development/python-modules/toonapi/default.nix index e6fb3e6624c9..b6a334d6471a 100644 --- a/pkgs/development/python-modules/toonapi/default.nix +++ b/pkgs/development/python-modules/toonapi/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { description = "Python client for the Quby ToonAPI"; homepage = "https://github.com/frenck/python-toonapi"; changelog = "https://github.com/frenck/python-toonapi/releases/tag/v${version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix index 3f006e3e4384..f8d9d63a873b 100644 --- a/pkgs/development/python-modules/torch/source/default.nix +++ b/pkgs/development/python-modules/torch/source/default.nix @@ -14,7 +14,7 @@ autoAddDriverRunpath, effectiveMagma ? if cudaSupport then - magma-cuda-static + magma-cuda-static.override { inherit cudaPackages; } else if rocmSupport then magma-hip else @@ -81,7 +81,7 @@ # (dependencies without cuda support). # Instead we should rely on overlays and nixpkgsFun. # (@SomeoneSerge) - _tritonEffective ? if cudaSupport then triton-cuda else triton, + _tritonEffective ? if cudaSupport then triton-cuda.override { inherit cudaPackages; } else triton, triton-cuda, # Disable MKLDNN on aarch64-darwin, it negatively impacts performance, @@ -263,6 +263,9 @@ let "Magma cudaPackages does not match cudaPackages" = cudaSupport && (effectiveMagma.cudaPackages.cudaMajorMinorVersion != cudaPackages.cudaMajorMinorVersion); + "Triton cudaPackages does not match cudaPackages" = + cudaSupport + && (_tritonEffective.cudaPackages.cudaMajorMinorVersion != cudaPackages.cudaMajorMinorVersion); }; unroll-src = writeShellScript "unroll-src" '' diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix index 974bf23e7ec1..0db400402f72 100644 --- a/pkgs/development/python-modules/torchaudio/default.nix +++ b/pkgs/development/python-modules/torchaudio/default.nix @@ -28,12 +28,12 @@ torchaudio, cudaSupport ? torch.cudaSupport, - cudaPackages, rocmSupport ? torch.rocmSupport, }: let inherit (stdenv) hostPlatform; + inherit (torch) cudaCapabilities cudaPackages; in buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: { pname = "torchaudio"; @@ -53,7 +53,7 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: { # CUDA USE_CUDA = cudaSupport; - TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" torch.cudaCapabilities}"; + TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" cudaCapabilities}"; TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CUCTC_DECODER = 1; TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CUDA = 1; TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MULTIGPU_CUDA = 1; diff --git a/pkgs/development/python-modules/torchcodec/default.nix b/pkgs/development/python-modules/torchcodec/default.nix index db1d474a6be0..8523ebbe076c 100644 --- a/pkgs/development/python-modules/torchcodec/default.nix +++ b/pkgs/development/python-modules/torchcodec/default.nix @@ -20,10 +20,12 @@ torchvision, cudaSupport ? torch.cudaSupport, - cudaPackages, rocmSupport ? torch.rocmSupport, }: +let + inherit (torch) cudaCapabilities cudaPackages; +in buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: { pname = "torchcodec"; version = "0.14.0"; @@ -100,7 +102,7 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: { ENABLE_CUDA = cudaSupport; } // lib.optionalAttrs cudaSupport { - TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" torch.cudaCapabilities}"; + TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" cudaCapabilities}"; } // lib.optionalAttrs rocmSupport { ROCM_PATH = torch.rocmtoolkit_joined; diff --git a/pkgs/development/python-modules/torcheval/default.nix b/pkgs/development/python-modules/torcheval/default.nix index 12e28344f615..ee1f23c50bf9 100644 --- a/pkgs/development/python-modules/torcheval/default.nix +++ b/pkgs/development/python-modules/torcheval/default.nix @@ -44,7 +44,7 @@ buildPythonPackage { changelog = "https://github.com/meta-pytorch/torcheval/releases/tag/${version}"; platforms = lib.platforms.unix; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ lib.maintainers.bengsparks ]; }; } diff --git a/pkgs/development/python-modules/torrequest/default.nix b/pkgs/development/python-modules/torrequest/default.nix index adfaa1b59016..d89f50229ee0 100644 --- a/pkgs/development/python-modules/torrequest/default.nix +++ b/pkgs/development/python-modules/torrequest/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/erdiaker/torrequest"; description = "Simple Python interface for HTTP(s) requests over Tor"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ applePrincess ]; }; } diff --git a/pkgs/development/python-modules/tqdm-multiprocess/default.nix b/pkgs/development/python-modules/tqdm-multiprocess/default.nix index e01b5cc0fa0f..34b80ec4deea 100644 --- a/pkgs/development/python-modules/tqdm-multiprocess/default.nix +++ b/pkgs/development/python-modules/tqdm-multiprocess/default.nix @@ -38,7 +38,7 @@ buildPythonPackage { meta = { description = "Support multiple worker processes, each with multiple tqdm progress bars, displaying them cleanly through the main process"; homepage = "https://github.com/EleutherAI/tqdm-multiprocess"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.booxter ]; }; } diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 3780728f37c1..95438249b2b6 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { mainProgram = "tqdm"; homepage = "https://github.com/tqdm/tqdm"; changelog = "https://tqdm.github.io/releases/"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ miniharinn ]; }; } diff --git a/pkgs/development/python-modules/translatepy/default.nix b/pkgs/development/python-modules/translatepy/default.nix index 64d6973ec9c9..80cc4b1afbf5 100644 --- a/pkgs/development/python-modules/translatepy/default.nix +++ b/pkgs/development/python-modules/translatepy/default.nix @@ -42,7 +42,7 @@ buildPythonPackage (finalAttrs: { description = "Module grouping multiple translation APIs"; mainProgram = "translatepy"; homepage = "https://github.com/Animenosekai/translate"; - license = with lib.licenses; [ agpl3Only ]; + license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ emilytrau ]; }; }) diff --git a/pkgs/development/python-modules/translitcodec/default.nix b/pkgs/development/python-modules/translitcodec/default.nix index f07027619844..a4a9d2529ec1 100644 --- a/pkgs/development/python-modules/translitcodec/default.nix +++ b/pkgs/development/python-modules/translitcodec/default.nix @@ -28,7 +28,7 @@ buildPythonPackage { meta = { description = "Unicode to 8-bit charset transliteration codec"; homepage = "https://github.com/claudep/translitcodec"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ rycee ]; }; } diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix index 72e8df58f076..92c3d8a25d38 100644 --- a/pkgs/development/python-modules/triton/default.nix +++ b/pkgs/development/python-modules/triton/default.nix @@ -218,6 +218,7 @@ buildPythonPackage.override { stdenv = effectiveStdenv; } (finalAttrs: { ]; passthru = { + inherit cudaPackages; gpuCheck = effectiveStdenv.mkDerivation { pname = "triton-pytest"; inherit (triton) version src; diff --git a/pkgs/development/python-modules/trubar/default.nix b/pkgs/development/python-modules/trubar/default.nix index 6ef9e9c2f649..3c75addcebff 100644 --- a/pkgs/development/python-modules/trubar/default.nix +++ b/pkgs/development/python-modules/trubar/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { description = "Utility for translation of strings and f-strings in Python files"; homepage = "https://github.com/janezd/trubar"; changelog = "https://github.com/janezd/trubar/releases/tag/${version}"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/tstr/default.nix b/pkgs/development/python-modules/tstr/default.nix index cc1eb41c788b..648822f433a7 100644 --- a/pkgs/development/python-modules/tstr/default.nix +++ b/pkgs/development/python-modules/tstr/default.nix @@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "Backports of various template string utilities"; homepage = "https://github.com/ilotoki0804/tstr"; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ sigmanificient ]; }; }) diff --git a/pkgs/development/python-modules/tt-flash/default.nix b/pkgs/development/python-modules/tt-flash/default.nix index 30a84d5d9ce7..e0b496081b13 100644 --- a/pkgs/development/python-modules/tt-flash/default.nix +++ b/pkgs/development/python-modules/tt-flash/default.nix @@ -55,6 +55,6 @@ buildPythonPackage (finalAttrs: { downloadPage = "https://github.com/tenstorrent/tt-flash"; changelog = "https://github.com/tenstorrent/tt-flash/blob/${finalAttrs.src.tag}/CHANGELOG.md"; maintainers = with lib.maintainers; [ RossComputerGuy ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }) diff --git a/pkgs/development/python-modules/tt-tools-common/default.nix b/pkgs/development/python-modules/tt-tools-common/default.nix index f2f3914e87b5..0fdfa8c11e7e 100644 --- a/pkgs/development/python-modules/tt-tools-common/default.nix +++ b/pkgs/development/python-modules/tt-tools-common/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { description = "Helper library for common utilities shared across Tentorrent tools"; homepage = "https://github.com/tenstorrent/tt-tools-common"; maintainers = with lib.maintainers; [ RossComputerGuy ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/ttach/default.nix b/pkgs/development/python-modules/ttach/default.nix index 9da0fac62b2c..5984183b2dd4 100644 --- a/pkgs/development/python-modules/ttach/default.nix +++ b/pkgs/development/python-modules/ttach/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { meta = { description = "Image Test Time Augmentation with PyTorch"; homepage = "https://github.com/qubvel/ttach"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/ttstokenizer/default.nix b/pkgs/development/python-modules/ttstokenizer/default.nix index 621d1dc4a817..2ce756623f66 100644 --- a/pkgs/development/python-modules/ttstokenizer/default.nix +++ b/pkgs/development/python-modules/ttstokenizer/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = { description = "Tokenizer for Text to Speech (TTS) models"; homepage = "https://pypi.org/project/ttstokenizer"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ happysalada ]; }; } diff --git a/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix b/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix index 293151cadf49..eb49efb6a5dd 100644 --- a/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix +++ b/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = { description = "Tuya IoT Python SDK for Tuya Open API"; homepage = "https://github.com/tuya/tuya-iot-python-sdk"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/tuyaha/default.nix b/pkgs/development/python-modules/tuyaha/default.nix index 8dcc7e20b3d2..05937a2af6d5 100644 --- a/pkgs/development/python-modules/tuyaha/default.nix +++ b/pkgs/development/python-modules/tuyaha/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Python module with the Tuya API"; homepage = "https://github.com/PaulAnnekov/tuyaha"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/twinkly-client/default.nix b/pkgs/development/python-modules/twinkly-client/default.nix index fb6ed9b4d418..a2c38ebf2106 100644 --- a/pkgs/development/python-modules/twinkly-client/default.nix +++ b/pkgs/development/python-modules/twinkly-client/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = { description = "Python module to communicate with Twinkly LED strings"; homepage = "https://github.com/dr1rrb/py-twinkly-client"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/twitterapi/default.nix b/pkgs/development/python-modules/twitterapi/default.nix index 06370cf7deba..10f854ece49f 100644 --- a/pkgs/development/python-modules/twitterapi/default.nix +++ b/pkgs/development/python-modules/twitterapi/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { description = "Python wrapper for Twitter's REST and Streaming APIs"; homepage = "https://github.com/geduldig/TwitterAPI"; changelog = "https://github.com/geduldig/TwitterAPI/blob/v${version}/CHANGE.log"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/types-docopt/default.nix b/pkgs/development/python-modules/types-docopt/default.nix index ac1ae5695dac..143f2fda4a74 100644 --- a/pkgs/development/python-modules/types-docopt/default.nix +++ b/pkgs/development/python-modules/types-docopt/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Typing stubs for docopt"; homepage = "https://pypi.org/project/types-docopt/"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/ueagle/default.nix b/pkgs/development/python-modules/ueagle/default.nix index 3397be054181..d9f8b0c7d845 100644 --- a/pkgs/development/python-modules/ueagle/default.nix +++ b/pkgs/development/python-modules/ueagle/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = { description = "Python library Rainforest EAGLE devices"; homepage = "https://github.com/jcalbert/uEagle"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index 6306bf2c76cb..ca985614fabb 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -39,14 +39,14 @@ buildPythonPackage (finalAttrs: { pname = "uiprotect"; - version = "15.4.3"; + version = "15.12.2"; pyproject = true; src = fetchFromGitHub { owner = "uilibs"; repo = "uiprotect"; tag = "v${finalAttrs.version}"; - hash = "sha256-H5ymzsqdCcL9C4suW2Gk1Op7UmmwztqNrB1VeGIFUFE="; + hash = "sha256-YyIzDl0qSCoXs7k3lda3/q89gtXf2Do7EgXeTSmunoo="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/ulid-transform/default.nix b/pkgs/development/python-modules/ulid-transform/default.nix index 11778ceeefac..9e39b3357452 100644 --- a/pkgs/development/python-modules/ulid-transform/default.nix +++ b/pkgs/development/python-modules/ulid-transform/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { description = "Library to create and transform ULIDs"; homepage = "https://github.com/bdraco/ulid-transform"; changelog = "https://github.com/bdraco/ulid-transform/blob/${src.tag}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/umalqurra/default.nix b/pkgs/development/python-modules/umalqurra/default.nix index dc887510576b..0dce7dc7ce96 100644 --- a/pkgs/development/python-modules/umalqurra/default.nix +++ b/pkgs/development/python-modules/umalqurra/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { meta = { description = "Date Api that support Hijri Umalqurra calendar"; homepage = "https://github.com/tytkal/python-hijiri-ummalqura"; - license = with lib.licenses; [ publicDomain ]; + license = lib.licenses.publicDomain; }; } diff --git a/pkgs/development/python-modules/umodbus/default.nix b/pkgs/development/python-modules/umodbus/default.nix index ba718909179b..c0343724e9b3 100644 --- a/pkgs/development/python-modules/umodbus/default.nix +++ b/pkgs/development/python-modules/umodbus/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = { description = "Implementation of the Modbus protocol"; homepage = "https://github.com/AdvancedClimateSystems/uModbus/"; - license = with lib.licenses; [ mpl20 ]; + license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/unicode-segmentation-rs/default.nix b/pkgs/development/python-modules/unicode-segmentation-rs/default.nix index 59208abaee74..36faccdf9852 100644 --- a/pkgs/development/python-modules/unicode-segmentation-rs/default.nix +++ b/pkgs/development/python-modules/unicode-segmentation-rs/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { description = "Python bindings for the Rust unicode-segmentation and unicode-width crates"; homepage = "https://github.com/WeblateOrg/unicode-segmentation-rs/"; changelog = "https://github.com/WeblateOrg/unicode-segmentation-rs/releases/tag/${src.tag}"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ erictapen ]; }; } diff --git a/pkgs/development/python-modules/upnpy/default.nix b/pkgs/development/python-modules/upnpy/default.nix index 4e16b9e9da44..a2b6460746d6 100644 --- a/pkgs/development/python-modules/upnpy/default.nix +++ b/pkgs/development/python-modules/upnpy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "UPnP client library for Python"; homepage = "https://github.com/5kyc0d3r/upnpy"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/uptime-kuma-api/default.nix b/pkgs/development/python-modules/uptime-kuma-api/default.nix index bfe9f77cba58..97a6cdb8c775 100644 --- a/pkgs/development/python-modules/uptime-kuma-api/default.nix +++ b/pkgs/development/python-modules/uptime-kuma-api/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { description = "Python wrapper for the Uptime Kuma Socket.IO API"; homepage = "https://github.com/lucasheld/uptime-kuma-api"; changelog = "https://github.com/lucasheld/uptime-kuma-api/blob/${version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ julienmalka ]; }; } diff --git a/pkgs/development/python-modules/uptime-kuma-monitor/default.nix b/pkgs/development/python-modules/uptime-kuma-monitor/default.nix index 12603b8f2597..643571fc0d76 100644 --- a/pkgs/development/python-modules/uptime-kuma-monitor/default.nix +++ b/pkgs/development/python-modules/uptime-kuma-monitor/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = { description = "Python wrapper around UptimeKuma /metrics endpoint"; homepage = "https://github.com/meichthys/utptime_kuma_monitor"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/usb-devices/default.nix b/pkgs/development/python-modules/usb-devices/default.nix index 06714b6920b9..3034eb46cea3 100644 --- a/pkgs/development/python-modules/usb-devices/default.nix +++ b/pkgs/development/python-modules/usb-devices/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { description = "Library for for mapping, describing, and resetting USB devices"; homepage = "https://github.com/Bluetooth-Devices/usb-devices"; changelog = "https://github.com/Bluetooth-Devices/usb-devices/blob/v${version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/utils/default.nix b/pkgs/development/python-modules/utils/default.nix index ced84a781e69..73d8bb71b39a 100644 --- a/pkgs/development/python-modules/utils/default.nix +++ b/pkgs/development/python-modules/utils/default.nix @@ -33,7 +33,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "Python set of utility functions and objects"; homepage = "https://github.com/haaksmash/pyutils"; - license = with lib.licenses; [ lgpl3Only ]; + license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix index a7721b45febb..0f40dea6fa58 100644 --- a/pkgs/development/python-modules/vector/default.nix +++ b/pkgs/development/python-modules/vector/default.nix @@ -87,7 +87,7 @@ buildPythonPackage (finalAttrs: { description = "Library for 2D, 3D, and Lorentz vectors, especially arrays of vectors, to solve common physics problems in a NumPy-like way"; homepage = "https://github.com/scikit-hep/vector"; changelog = "https://github.com/scikit-hep/vector/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ veprbl ]; }; }) diff --git a/pkgs/development/python-modules/venstarcolortouch/default.nix b/pkgs/development/python-modules/venstarcolortouch/default.nix index 871c381848ad..4d560e6327e9 100644 --- a/pkgs/development/python-modules/venstarcolortouch/default.nix +++ b/pkgs/development/python-modules/venstarcolortouch/default.nix @@ -25,7 +25,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "Python interface for Venstar ColorTouch thermostats Resources"; homepage = "https://github.com/hpeyerl/venstar_colortouch"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/development/python-modules/vg/default.nix b/pkgs/development/python-modules/vg/default.nix index 478cb259250b..6ac879128c12 100644 --- a/pkgs/development/python-modules/vg/default.nix +++ b/pkgs/development/python-modules/vg/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { description = "Linear algebra for humans: a very good vector-geometry and linear-algebra toolbelt"; homepage = "https://github.com/lace/vg"; changelog = "https://github.com/lace/vg/blob/${version}/CHANGELOG.md"; - license = [ lib.licenses.bsd2 ]; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ clerie ]; }; } diff --git a/pkgs/development/python-modules/visions/default.nix b/pkgs/development/python-modules/visions/default.nix index c922b0be801b..a4cf6471cc02 100644 --- a/pkgs/development/python-modules/visions/default.nix +++ b/pkgs/development/python-modules/visions/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "visions"; - version = "0.8.1"; + version = "0.8.2"; pyproject = true; src = fetchFromGitHub { owner = "dylan-profiler"; repo = "visions"; tag = "v${version}"; - hash = "sha256-MHseb1XJ0t7jQ45VXKQclYPgddrzmJAC7cde8qqYhNQ="; + hash = "sha256-GcudMUF1N2W4OV9SYRiG7XN1RXJj/5zHPng3cRk+FnA="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/vsure/default.nix b/pkgs/development/python-modules/vsure/default.nix index f372bacd3055..9f271596bf9b 100644 --- a/pkgs/development/python-modules/vsure/default.nix +++ b/pkgs/development/python-modules/vsure/default.nix @@ -9,12 +9,12 @@ buildPythonPackage (finalAttrs: { pname = "vsure"; - version = "2.8.0"; + version = "2.9.0"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-FC2aRsfxBGO8HaEHGJWweKgZzz8UG/03oB/E+hOAe/w="; + hash = "sha256-OxvRt3Vn53lll8YhNBApi0GWo2AqZ5q3QZeWOjCKjDU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index a4a504976742..12cdeb137c12 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { description = "Python client library for VirusTotal"; homepage = "https://virustotal.github.io/vt-py/"; changelog = "https://github.com/VirusTotal/vt-py/releases/tag//${version}"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/wand/default.nix b/pkgs/development/python-modules/wand/default.nix index 47f6a52a0bcf..f12f3643ae2c 100644 --- a/pkgs/development/python-modules/wand/default.nix +++ b/pkgs/development/python-modules/wand/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { changelog = "https://docs.wand-py.org/en/${version}/changes.html"; description = "Ctypes-based simple MagickWand API binding for Python"; homepage = "http://wand-py.org/"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/waqiasync/default.nix b/pkgs/development/python-modules/waqiasync/default.nix index 369fe5e26226..a12987160cbf 100644 --- a/pkgs/development/python-modules/waqiasync/default.nix +++ b/pkgs/development/python-modules/waqiasync/default.nix @@ -33,7 +33,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "Python library for http://aqicn.org"; homepage = "https://github.com/andrey-git/waqi-async"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/development/python-modules/warble/default.nix b/pkgs/development/python-modules/warble/default.nix index c9d278e872e4..78206c183e08 100644 --- a/pkgs/development/python-modules/warble/default.nix +++ b/pkgs/development/python-modules/warble/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = { description = "Python bindings for MbientLab's Warble library"; homepage = "https://github.com/mbientlab/pywarble"; - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; maintainers = with lib.maintainers; [ stepbrobd ]; platforms = [ "aarch64-linux" diff --git a/pkgs/development/python-modules/warrant-lite/default.nix b/pkgs/development/python-modules/warrant-lite/default.nix index df012dfd8648..44a5c4ea31c9 100644 --- a/pkgs/development/python-modules/warrant-lite/default.nix +++ b/pkgs/development/python-modules/warrant-lite/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = { description = "Module for process SRP requests for AWS Cognito"; homepage = "https://github.com/capless/warrant-lite"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix index 118ad29b935c..b5858e59eda0 100644 --- a/pkgs/development/python-modules/webexteamssdk/default.nix +++ b/pkgs/development/python-modules/webexteamssdk/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { description = "Python module for Webex Teams APIs"; homepage = "https://github.com/CiscoDevNet/webexteamssdk"; changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v${version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/webrtcvad/default.nix b/pkgs/development/python-modules/webrtcvad/default.nix index 1613d10047e7..ae2995c95293 100644 --- a/pkgs/development/python-modules/webrtcvad/default.nix +++ b/pkgs/development/python-modules/webrtcvad/default.nix @@ -33,7 +33,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "Interface to the Google WebRTC Voice Activity Detector (VAD)"; homepage = "https://github.com/wiseman/py-webrtcvad"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ prusnak ]; }; }) diff --git a/pkgs/development/python-modules/webthing/default.nix b/pkgs/development/python-modules/webthing/default.nix index 1fad7df705ec..0a1198dd81f1 100644 --- a/pkgs/development/python-modules/webthing/default.nix +++ b/pkgs/development/python-modules/webthing/default.nix @@ -42,7 +42,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "Python implementation of a Web Thing server"; homepage = "https://github.com/WebThingsIO/webthing-python"; - license = with lib.licenses; [ mpl20 ]; + license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/development/python-modules/wfuzz/default.nix b/pkgs/development/python-modules/wfuzz/default.nix index 0d8d5585791a..91cfc896c839 100644 --- a/pkgs/development/python-modules/wfuzz/default.nix +++ b/pkgs/development/python-modules/wfuzz/default.nix @@ -87,7 +87,7 @@ buildPythonPackage (finalAttrs: { web application vulnerabilities. ''; homepage = "https://wfuzz.readthedocs.io"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ bad3r pamplemousse diff --git a/pkgs/development/python-modules/wget/default.nix b/pkgs/development/python-modules/wget/default.nix index 344592152e9a..51dc2d9ce639 100644 --- a/pkgs/development/python-modules/wget/default.nix +++ b/pkgs/development/python-modules/wget/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = { description = "Pure python download utility"; homepage = "https://bitbucket.org/techtonik/python-wget/"; - license = with lib.licenses; [ unlicense ]; + license = lib.licenses.unlicense; maintainers = with lib.maintainers; [ prusnak ]; }; } diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index 4aca9e5d587d..26d34354d33c 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { It should be noted that wheel is not intended to be used as a library, and as such there is no stable, public API. ''; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ siriobalmelli ]; }; } diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix index de0f86f9bf17..abbf69819133 100644 --- a/pkgs/development/python-modules/whois/default.nix +++ b/pkgs/development/python-modules/whois/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { description = "Python module/library for retrieving WHOIS information"; homepage = "https://github.com/DannyCork/python-whois/"; changelog = "https://github.com/DannyCork/python-whois/releases/tag/${version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/wiffi/default.nix b/pkgs/development/python-modules/wiffi/default.nix index 929f2ec335f7..5fd196c50944 100644 --- a/pkgs/development/python-modules/wiffi/default.nix +++ b/pkgs/development/python-modules/wiffi/default.nix @@ -33,7 +33,7 @@ buildPythonPackage (finalAttrs: { description = "Python module to interface with STALL WIFFI devices"; homepage = "https://github.com/mampfes/python-wiffi"; changelog = "https://github.com/mampfes/python-wiffi/blob/${finalAttrs.version}/HISTORY.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/development/python-modules/winacl/default.nix b/pkgs/development/python-modules/winacl/default.nix index c62525010612..34c71a1b2b62 100644 --- a/pkgs/development/python-modules/winacl/default.nix +++ b/pkgs/development/python-modules/winacl/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { description = "Python module for ACL/ACE/Security descriptor manipulation"; homepage = "https://github.com/skelsec/winacl"; changelog = "https://github.com/skelsec/winacl/releases/tag/${version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/winsspi/default.nix b/pkgs/development/python-modules/winsspi/default.nix index fdcb27c6c319..baae8550e97e 100644 --- a/pkgs/development/python-modules/winsspi/default.nix +++ b/pkgs/development/python-modules/winsspi/default.nix @@ -30,7 +30,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "Python module for ACL/ACE/Security descriptor manipulation"; homepage = "https://github.com/skelsec/winsspi"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/development/python-modules/word2number/default.nix b/pkgs/development/python-modules/word2number/default.nix index abafd5a46f77..8c6473b5180c 100644 --- a/pkgs/development/python-modules/word2number/default.nix +++ b/pkgs/development/python-modules/word2number/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { changelog = "https://github.com/akshaynagpal/w2n/releases/tag/${version}"; description = "Convert number words (eg. twenty one) to numeric digits (21)"; homepage = "http://w2n.readthedocs.io/"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.booxter ]; }; } diff --git a/pkgs/development/python-modules/xmind/default.nix b/pkgs/development/python-modules/xmind/default.nix index 406f5ec33dbf..8580615cbca2 100644 --- a/pkgs/development/python-modules/xmind/default.nix +++ b/pkgs/development/python-modules/xmind/default.nix @@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "Python module to create mindmaps"; homepage = "https://github.com/zhuifengshen/xmind"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/development/python-modules/xmljson/default.nix b/pkgs/development/python-modules/xmljson/default.nix index e4cf1e3e6d05..bd7f8e4b7af9 100644 --- a/pkgs/development/python-modules/xmljson/default.nix +++ b/pkgs/development/python-modules/xmljson/default.nix @@ -28,7 +28,7 @@ buildPythonPackage (finalAttrs: { description = "Converts XML into dictionary structures and vice-versa"; mainProgram = "xml2json"; homepage = "https://github.com/sanand0/xmljson"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ rakesh4g ]; }; }) diff --git a/pkgs/development/python-modules/xpath-expressions/default.nix b/pkgs/development/python-modules/xpath-expressions/default.nix index e60370884ac9..b7e29b0d78b7 100644 --- a/pkgs/development/python-modules/xpath-expressions/default.nix +++ b/pkgs/development/python-modules/xpath-expressions/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = { description = "Python module to handle XPath expressions"; homepage = "https://github.com/orf/xpath-expressions"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/yalesmartalarmclient/default.nix b/pkgs/development/python-modules/yalesmartalarmclient/default.nix index ec620caedb6d..6ed595a9451b 100644 --- a/pkgs/development/python-modules/yalesmartalarmclient/default.nix +++ b/pkgs/development/python-modules/yalesmartalarmclient/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { description = "Python module to interface with Yale Smart Alarm Systems"; homepage = "https://github.com/domwillcode/yale-smart-alarm-client"; changelog = "https://github.com/domwillcode/yale-smart-alarm-client/releases/tag/v${version}"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index f84f8ced4678..f52c9645c9ad 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -71,7 +71,7 @@ buildPythonPackage rec { description = "Python API for Yale Access (formerly August) Smart Lock and Doorbell"; homepage = "https://github.com/bdraco/yalexs"; changelog = "https://github.com/bdraco/yalexs/blob/${src.tag}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/youless-api/default.nix b/pkgs/development/python-modules/youless-api/default.nix index 80138d34e1cb..092531add06a 100644 --- a/pkgs/development/python-modules/youless-api/default.nix +++ b/pkgs/development/python-modules/youless-api/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { description = "Python library for YouLess sensors"; homepage = "https://github.com/gjong/youless-python-bridge"; changelog = "https://github.com/gjong/youless-python-bridge/releases/tag/${version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/zwave-me-ws/default.nix b/pkgs/development/python-modules/zwave-me-ws/default.nix index 006d22fdae46..d3e428104c9e 100644 --- a/pkgs/development/python-modules/zwave-me-ws/default.nix +++ b/pkgs/development/python-modules/zwave-me-ws/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { description = "Library to connect to a ZWave-Me instance"; homepage = "https://github.com/Z-Wave-Me/zwave-me-ws"; changelog = "https://github.com/Z-Wave-Me/zwave-me-ws/releases/tag/v${version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/rocm-modules/amdsmi/default.nix b/pkgs/development/rocm-modules/amdsmi/default.nix index 760b01e1c851..9662cfb18299 100644 --- a/pkgs/development/rocm-modules/amdsmi/default.nix +++ b/pkgs/development/rocm-modules/amdsmi/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "System management interface for AMD GPUs supported by ROCm"; homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/amdsmi"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ lovesegfault ]; teams = [ lib.teams.rocm ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/rocm-modules/aqlprofile/default.nix b/pkgs/development/rocm-modules/aqlprofile/default.nix index 2605fc8a38f0..cf221df55431 100644 --- a/pkgs/development/rocm-modules/aqlprofile/default.nix +++ b/pkgs/development/rocm-modules/aqlprofile/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "AQLPROFILE library for AMD HSA runtime API extension support"; homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/aqlprofile"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/clr/default.nix b/pkgs/development/rocm-modules/clr/default.nix index 9ea6f7e28156..297d4f66cea4 100644 --- a/pkgs/development/rocm-modules/clr/default.nix +++ b/pkgs/development/rocm-modules/clr/default.nix @@ -327,7 +327,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "AMD Common Language Runtime for hipamd, opencl, and rocclr"; homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/clr"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ lovesegfault ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/composable_kernel/base.nix b/pkgs/development/rocm-modules/composable_kernel/base.nix index da94466388c8..70b5a4cefe7c 100644 --- a/pkgs/development/rocm-modules/composable_kernel/base.nix +++ b/pkgs/development/rocm-modules/composable_kernel/base.nix @@ -193,7 +193,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Performance portable programming model for machine learning tensor operators"; homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/composablekernel"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; broken = true; # this base package shouldn't be built directly diff --git a/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix b/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix index a5b57743b8eb..d41ac17f8207 100644 --- a/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix +++ b/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix @@ -35,7 +35,7 @@ buildPythonPackage { meta = { description = "Pytorch inductor backend which uses composable_kernel universal GEMM implementations"; homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/composablekernel"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/half/default.nix b/pkgs/development/rocm-modules/half/default.nix index 3213c827c2be..cdd55d421d9d 100644 --- a/pkgs/development/rocm-modules/half/default.nix +++ b/pkgs/development/rocm-modules/half/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "C++ library for half precision floating point arithmetics"; homepage = "https://github.com/ROCm/half"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/rocm-modules/hip-common/default.nix b/pkgs/development/rocm-modules/hip-common/default.nix index 156e693efdfa..06b2f9947bf0 100644 --- a/pkgs/development/rocm-modules/hip-common/default.nix +++ b/pkgs/development/rocm-modules/hip-common/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "C++ Heterogeneous-Compute Interface for Portability"; homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/hip"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ lovesegfault ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/hipblas-common/default.nix b/pkgs/development/rocm-modules/hipblas-common/default.nix index 6335fef1d2e3..bb87c0f5fe30 100644 --- a/pkgs/development/rocm-modules/hipblas-common/default.nix +++ b/pkgs/development/rocm-modules/hipblas-common/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Common files shared by hipBLAS and hipBLASLt"; homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipblas-common"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/hipblas/default.nix b/pkgs/development/rocm-modules/hipblas/default.nix index 536f4d0db819..2269608ea83f 100644 --- a/pkgs/development/rocm-modules/hipblas/default.nix +++ b/pkgs/development/rocm-modules/hipblas/default.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "ROCm BLAS marshalling library"; homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipblas"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/hipblaslt/default.nix b/pkgs/development/rocm-modules/hipblaslt/default.nix index 4adc66cc4b44..dce0613d09da 100644 --- a/pkgs/development/rocm-modules/hipblaslt/default.nix +++ b/pkgs/development/rocm-modules/hipblaslt/default.nix @@ -249,7 +249,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Library that provides general matrix-matrix operations with a flexible API"; homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipblaslt"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/hipcc/default.nix b/pkgs/development/rocm-modules/hipcc/default.nix index ac8ab20eb637..f3cb9462e18d 100644 --- a/pkgs/development/rocm-modules/hipcc/default.nix +++ b/pkgs/development/rocm-modules/hipcc/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Compiler driver utility that calls clang or nvcc"; homepage = "https://github.com/ROCm/HIPCC"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ lovesegfault ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/hipcub/default.nix b/pkgs/development/rocm-modules/hipcub/default.nix index 34517595e273..9621afcac174 100644 --- a/pkgs/development/rocm-modules/hipcub/default.nix +++ b/pkgs/development/rocm-modules/hipcub/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Thin wrapper library on top of rocPRIM or CUB"; homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipcub"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/hipfft/default.nix b/pkgs/development/rocm-modules/hipfft/default.nix index 3362e768151d..b8634c392f6c 100644 --- a/pkgs/development/rocm-modules/hipfft/default.nix +++ b/pkgs/development/rocm-modules/hipfft/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "FFT marshalling library"; homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipfft"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/hipfort/default.nix b/pkgs/development/rocm-modules/hipfort/default.nix index dacce14205a9..e167ce3a09e5 100644 --- a/pkgs/development/rocm-modules/hipfort/default.nix +++ b/pkgs/development/rocm-modules/hipfort/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Fortran interfaces for ROCm libraries"; homepage = "https://github.com/ROCm/hipfort"; - license = with lib.licenses; [ mit ]; # mitx11 + license = lib.licenses.mit; # mitx11 teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/hipify/default.nix b/pkgs/development/rocm-modules/hipify/default.nix index 34452bb8f850..f833cada2dc8 100644 --- a/pkgs/development/rocm-modules/hipify/default.nix +++ b/pkgs/development/rocm-modules/hipify/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Convert CUDA to Portable C++ Code"; homepage = "https://github.com/ROCm/HIPIFY"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/hiprand/default.nix b/pkgs/development/rocm-modules/hiprand/default.nix index 0eb275ee4a8d..a57aa6c888fb 100644 --- a/pkgs/development/rocm-modules/hiprand/default.nix +++ b/pkgs/development/rocm-modules/hiprand/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "HIP wrapper for rocRAND and cuRAND"; homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hiprand"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/hipsolver/default.nix b/pkgs/development/rocm-modules/hipsolver/default.nix index 33dc5ba82caf..10c6a7164a1c 100644 --- a/pkgs/development/rocm-modules/hipsolver/default.nix +++ b/pkgs/development/rocm-modules/hipsolver/default.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "ROCm SOLVER marshalling library"; homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipsolver"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/hipsparse/default.nix b/pkgs/development/rocm-modules/hipsparse/default.nix index 22fee11fd997..749abeae27bc 100644 --- a/pkgs/development/rocm-modules/hipsparse/default.nix +++ b/pkgs/development/rocm-modules/hipsparse/default.nix @@ -141,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "ROCm SPARSE marshalling library"; homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipsparse"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/hipsparselt/default.nix b/pkgs/development/rocm-modules/hipsparselt/default.nix index c82c3d40ed67..424ec1e5c3e4 100644 --- a/pkgs/development/rocm-modules/hipsparselt/default.nix +++ b/pkgs/development/rocm-modules/hipsparselt/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "ROCm hipSPARSELt - a SPARSE marshalling library"; homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipsparselt"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/migraphx/default.nix b/pkgs/development/rocm-modules/migraphx/default.nix index 0528481e4023..5b79f8213d64 100644 --- a/pkgs/development/rocm-modules/migraphx/default.nix +++ b/pkgs/development/rocm-modules/migraphx/default.nix @@ -195,7 +195,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "AMD's graph optimization engine"; homepage = "https://github.com/ROCm/AMDMIGraphX"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/miopen/default.nix b/pkgs/development/rocm-modules/miopen/default.nix index 3c4c85c678a5..03875659e739 100644 --- a/pkgs/development/rocm-modules/miopen/default.nix +++ b/pkgs/development/rocm-modules/miopen/default.nix @@ -332,7 +332,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Machine intelligence library for ROCm"; homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/miopen"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/mivisionx/default.nix b/pkgs/development/rocm-modules/mivisionx/default.nix index 4c76482c5490..dd136895afe4 100644 --- a/pkgs/development/rocm-modules/mivisionx/default.nix +++ b/pkgs/development/rocm-modules/mivisionx/default.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Set of comprehensive computer vision and machine intelligence libraries, utilities, and applications"; homepage = "https://github.com/ROCm/MIVisionX"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; broken = useOpenCL; diff --git a/pkgs/development/rocm-modules/rdc/default.nix b/pkgs/development/rocm-modules/rdc/default.nix index 1411a41167bb..c343a1370686 100644 --- a/pkgs/development/rocm-modules/rdc/default.nix +++ b/pkgs/development/rocm-modules/rdc/default.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Simplifies administration and addresses infrastructure challenges in cluster and datacenter environments"; homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rdc"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/rocalution/default.nix b/pkgs/development/rocm-modules/rocalution/default.nix index 5bd37731db07..8dd80796326d 100644 --- a/pkgs/development/rocm-modules/rocalution/default.nix +++ b/pkgs/development/rocm-modules/rocalution/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Iterative sparse solvers for ROCm"; homepage = "https://github.com/ROCm/rocALUTION"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/rocblas/default.nix b/pkgs/development/rocm-modules/rocblas/default.nix index 3cd83c02d00a..af723802f044 100644 --- a/pkgs/development/rocm-modules/rocblas/default.nix +++ b/pkgs/development/rocm-modules/rocblas/default.nix @@ -201,7 +201,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "BLAS implementation for ROCm platform"; homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocblas"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/rocdbgapi/default.nix b/pkgs/development/rocm-modules/rocdbgapi/default.nix index cf407b26eb44..6cabdb339a36 100644 --- a/pkgs/development/rocm-modules/rocdbgapi/default.nix +++ b/pkgs/development/rocm-modules/rocdbgapi/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Debugger support for control of execution and inspection state of AMD's GPU architectures"; homepage = "https://github.com/ROCm/ROCdbgapi"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/rocfft/default.nix b/pkgs/development/rocm-modules/rocfft/default.nix index a306984f479d..17c67b623ca4 100644 --- a/pkgs/development/rocm-modules/rocfft/default.nix +++ b/pkgs/development/rocm-modules/rocfft/default.nix @@ -163,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "FFT implementation for ROCm"; homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocfft"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/rocm-bandwidth-test/default.nix b/pkgs/development/rocm-modules/rocm-bandwidth-test/default.nix index 43708495442a..3f1df9c06b91 100644 --- a/pkgs/development/rocm-modules/rocm-bandwidth-test/default.nix +++ b/pkgs/development/rocm-modules/rocm-bandwidth-test/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Bandwidth test for AMD GPUs supported by ROCm"; homepage = "https://github.com/ROCm/rocm_bandwidth_test"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fangpen ]; teams = [ lib.teams.rocm ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/rocm-modules/rocm-core/default.nix b/pkgs/development/rocm-modules/rocm-core/default.nix index a438dd1bc797..5a5890e73ed2 100644 --- a/pkgs/development/rocm-modules/rocm-core/default.nix +++ b/pkgs/development/rocm-modules/rocm-core/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Utility for getting the ROCm release version"; homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocm-core"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/rocm-runtime/default.nix b/pkgs/development/rocm-modules/rocm-runtime/default.nix index de511274b4ab..88073de2dca6 100644 --- a/pkgs/development/rocm-modules/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/rocm-runtime/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Platform runtime for ROCm"; homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocr-runtime"; - license = with lib.licenses; [ ncsa ]; + license = lib.licenses.ncsa; maintainers = with lib.maintainers; [ lovesegfault ]; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/rocm-modules/rocm-smi/default.nix b/pkgs/development/rocm-modules/rocm-smi/default.nix index d34829e8624f..c0044c938a9e 100644 --- a/pkgs/development/rocm-modules/rocm-smi/default.nix +++ b/pkgs/development/rocm-modules/rocm-smi/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "System management interface for AMD GPUs supported by ROCm"; homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocm-smi-lib"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ lovesegfault ]; teams = [ lib.teams.rocm ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/rocm-modules/rocmlir/default.nix b/pkgs/development/rocm-modules/rocmlir/default.nix index 1bf4f2932440..ef039a40d8e1 100644 --- a/pkgs/development/rocm-modules/rocmlir/default.nix +++ b/pkgs/development/rocm-modules/rocmlir/default.nix @@ -154,7 +154,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "MLIR-based convolution and GEMM kernel generator"; homepage = "https://github.com/ROCm/rocMLIR"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/rocprim/default.nix b/pkgs/development/rocm-modules/rocprim/default.nix index a3d3745ce1f3..d9dd9a370da3 100644 --- a/pkgs/development/rocm-modules/rocprim/default.nix +++ b/pkgs/development/rocm-modules/rocprim/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "ROCm parallel primitives"; homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocprim"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix b/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix index 902a49d300d2..bac33aa72990 100644 --- a/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix +++ b/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Library for decoding ROCm thread trace data"; homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocprof-trace-decoder"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/rocprofiler-register/default.nix b/pkgs/development/rocm-modules/rocprofiler-register/default.nix index eec7a614b15f..0577493ae599 100644 --- a/pkgs/development/rocm-modules/rocprofiler-register/default.nix +++ b/pkgs/development/rocm-modules/rocprofiler-register/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Profiling with perf-counters and derived metrics"; homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocprofiler-register"; - license = with lib.licenses; [ mit ]; # mitx11 + license = lib.licenses.mit; # mitx11 teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/rocprofiler/default.nix b/pkgs/development/rocm-modules/rocprofiler/default.nix index d49a8e2f50a8..21b5d4b0e320 100644 --- a/pkgs/development/rocm-modules/rocprofiler/default.nix +++ b/pkgs/development/rocm-modules/rocprofiler/default.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Profiling with perf-counters and derived metrics"; homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocprofiler"; - license = with lib.licenses; [ mit ]; # mitx11 + license = lib.licenses.mit; # mitx11 teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/rocr-debug-agent/default.nix b/pkgs/development/rocm-modules/rocr-debug-agent/default.nix index 4e3338ea0bae..dc10ed234714 100644 --- a/pkgs/development/rocm-modules/rocr-debug-agent/default.nix +++ b/pkgs/development/rocm-modules/rocr-debug-agent/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Library that provides some debugging functionality for ROCr"; homepage = "https://github.com/ROCm/rocr_debug_agent"; - license = with lib.licenses; [ ncsa ]; + license = lib.licenses.ncsa; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/rocrand/default.nix b/pkgs/development/rocm-modules/rocrand/default.nix index c1ce84ebdbaa..ba292a1f5f5b 100644 --- a/pkgs/development/rocm-modules/rocrand/default.nix +++ b/pkgs/development/rocm-modules/rocrand/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Generate pseudo-random and quasi-random numbers"; homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocrand"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/rocshmem/default.nix b/pkgs/development/rocm-modules/rocshmem/default.nix index c23e4b239945..b7bac8646f67 100644 --- a/pkgs/development/rocm-modules/rocshmem/default.nix +++ b/pkgs/development/rocm-modules/rocshmem/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "The ROCm OpenSHMEM (rocSHMEM) runtime"; homepage = "https://github.com/ROCm/rocSHMEM"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/rocsolver/default.nix b/pkgs/development/rocm-modules/rocsolver/default.nix index 1549ca241569..3185b204c1e2 100644 --- a/pkgs/development/rocm-modules/rocsolver/default.nix +++ b/pkgs/development/rocm-modules/rocsolver/default.nix @@ -127,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "ROCm LAPACK implementation"; homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocsolver"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; timeout = 14400; # 4 hours diff --git a/pkgs/development/rocm-modules/rocsparse/default.nix b/pkgs/development/rocm-modules/rocsparse/default.nix index e58e3aaab71a..b6712be8ffd4 100644 --- a/pkgs/development/rocm-modules/rocsparse/default.nix +++ b/pkgs/development/rocm-modules/rocsparse/default.nix @@ -152,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "ROCm SPARSE implementation"; homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocsparse"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/rocthrust/default.nix b/pkgs/development/rocm-modules/rocthrust/default.nix index 3be1b9f46f11..bcc6b125c2c5 100644 --- a/pkgs/development/rocm-modules/rocthrust/default.nix +++ b/pkgs/development/rocm-modules/rocthrust/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "ROCm parallel algorithm library"; homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocthrust"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/roctracer/default.nix b/pkgs/development/rocm-modules/roctracer/default.nix index 45d66b683a00..80fcac95cc4e 100644 --- a/pkgs/development/rocm-modules/roctracer/default.nix +++ b/pkgs/development/rocm-modules/roctracer/default.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Tracer callback/activity library"; homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/roctracer"; - license = with lib.licenses; [ mit ]; # mitx11 + license = lib.licenses.mit; # mitx11 teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/rocwmma/default.nix b/pkgs/development/rocm-modules/rocwmma/default.nix index a7e4bc5a8c46..95002721dfc8 100644 --- a/pkgs/development/rocm-modules/rocwmma/default.nix +++ b/pkgs/development/rocm-modules/rocwmma/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Mixed precision matrix multiplication and accumulation"; homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/rocwmma"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/rpp/default.nix b/pkgs/development/rocm-modules/rpp/default.nix index 78901c918ed1..ac26ace58a61 100644 --- a/pkgs/development/rocm-modules/rpp/default.nix +++ b/pkgs/development/rocm-modules/rpp/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Comprehensive high-performance computer vision library for AMD processors"; homepage = "https://github.com/ROCm/rpp"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/rocm-modules/tensile/default.nix b/pkgs/development/rocm-modules/tensile/default.nix index 7bfa22f63db6..617ab1b4fe3a 100644 --- a/pkgs/development/rocm-modules/tensile/default.nix +++ b/pkgs/development/rocm-modules/tensile/default.nix @@ -89,7 +89,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "GEMMs and tensor contractions"; homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/shared/tensile"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; teams = [ lib.teams.rocm ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix index 19e3046ab7f9..59dc914c3170 100644 --- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix +++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix @@ -46,6 +46,6 @@ buildGoModule rec { changelog = "https://github.com/terraform-linters/tflint-ruleset-aws/blob/v${version}/CHANGELOG.md"; description = "TFLint ruleset plugin for Terraform AWS Provider"; maintainers = with lib.maintainers; [ flokli ]; - license = with lib.licenses; [ mpl20 ]; + license = lib.licenses.mpl20; }; } diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix index 1f09717391f1..54462770cd6d 100644 --- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix +++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix @@ -40,6 +40,6 @@ buildGoModule rec { description = "TFLint ruleset plugin for Terraform Google Provider"; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ john-rodewald ]; - license = with lib.licenses; [ mpl20 ]; + license = lib.licenses.mpl20; }; } diff --git a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix index 46830e563a68..25e85d0acd4d 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { description = "Rust adapter for Buildkite Test Analytics"; mainProgram = "buildkite-test-collector"; homepage = "https://buildkite.com/test-analytics"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ jfroche ]; }; } diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index e1c25f8f2dc1..d2f27587f767 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -54,7 +54,6 @@ let inclyc Ruixi-rebirth aleksana - redyf ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index af24dcb64838..74fb790d56cb 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec { rust ffi declarations. ''; homepage = "https://github.com/rust-lang/rust-bindgen"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ johntitor ]; mainProgram = "bindgen"; platforms = lib.platforms.unix; diff --git a/pkgs/kde/misc/kdiagram/default.nix b/pkgs/kde/misc/kdiagram/default.nix index 48355004b761..553b78f0de80 100644 --- a/pkgs/kde/misc/kdiagram/default.nix +++ b/pkgs/kde/misc/kdiagram/default.nix @@ -19,5 +19,5 @@ mkKdeDerivation rec { qtsvg ]; - meta.license = [ lib.licenses.gpl2Only ]; + meta.license = lib.licenses.gpl2Only; } diff --git a/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix b/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix index aead489e80d4..d523ecb7d37c 100644 --- a/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix +++ b/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix @@ -15,5 +15,5 @@ mkKdeDerivation rec { extraNativeBuildInputs = [ doxygen ]; - meta.license = [ lib.licenses.gpl3Plus ]; + meta.license = lib.licenses.gpl3Plus; } diff --git a/pkgs/kde/misc/kio-fuse/default.nix b/pkgs/kde/misc/kio-fuse/default.nix index ec1fb884f853..060fa81c3178 100644 --- a/pkgs/kde/misc/kio-fuse/default.nix +++ b/pkgs/kde/misc/kio-fuse/default.nix @@ -17,5 +17,5 @@ mkKdeDerivation rec { extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ fuse3 ]; - meta.license = with lib.licenses; [ gpl3Plus ]; + meta.license = lib.licenses.gpl3Plus; } diff --git a/pkgs/kde/misc/marknote/default.nix b/pkgs/kde/misc/marknote/default.nix index b2698552c457..554ac2a8ba0c 100644 --- a/pkgs/kde/misc/marknote/default.nix +++ b/pkgs/kde/misc/marknote/default.nix @@ -23,5 +23,5 @@ mkKdeDerivation rec { kxmlgui ]; - meta.license = [ lib.licenses.gpl2Plus ]; + meta.license = lib.licenses.gpl2Plus; } diff --git a/pkgs/kde/misc/phonon-vlc/default.nix b/pkgs/kde/misc/phonon-vlc/default.nix index 88f278d92986..e8b5cfd47c4f 100644 --- a/pkgs/kde/misc/phonon-vlc/default.nix +++ b/pkgs/kde/misc/phonon-vlc/default.nix @@ -22,5 +22,5 @@ mkKdeDerivation rec { "-DPHONON_BUILD_QT6=1" ]; - meta.license = with lib.licenses; [ lgpl21Plus ]; + meta.license = lib.licenses.lgpl21Plus; } diff --git a/pkgs/kde/misc/plasma-pass/default.nix b/pkgs/kde/misc/plasma-pass/default.nix index 579d0cbe4676..f953ac313123 100644 --- a/pkgs/kde/misc/plasma-pass/default.nix +++ b/pkgs/kde/misc/plasma-pass/default.nix @@ -20,5 +20,5 @@ mkKdeDerivation rec { qgpgme ]; - meta.license = [ lib.licenses.lgpl21Plus ]; + meta.license = lib.licenses.lgpl21Plus; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix index 565fdbddfa3f..4522985c46fb 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix @@ -81,6 +81,6 @@ mkDerivation { meta = { platforms = lib.platforms.freebsd; - license = with lib.licenses; [ cddl ]; + license = lib.licenses.cddl; }; } diff --git a/pkgs/os-specific/darwin/by-name/ic/ICU/package.nix b/pkgs/os-specific/darwin/by-name/ic/ICU/package.nix index 300dd48f27f3..935dfd277a8d 100644 --- a/pkgs/os-specific/darwin/by-name/ic/ICU/package.nix +++ b/pkgs/os-specific/darwin/by-name/ic/ICU/package.nix @@ -85,7 +85,7 @@ let meta = { description = "Unicode and globalization support library with Apple customizations"; - license = [ lib.licenses.icu ]; + license = lib.licenses.icu; teams = [ lib.teams.darwin ]; platforms = lib.platforms.darwin; pkgConfigModules = [ diff --git a/pkgs/os-specific/linux/mstflint_access/default.nix b/pkgs/os-specific/linux/mstflint_access/default.nix index a13b4c9d43f7..b2c6a3c87831 100644 --- a/pkgs/os-specific/linux/mstflint_access/default.nix +++ b/pkgs/os-specific/linux/mstflint_access/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Kernel module for Nvidia NIC firmware update"; homepage = "https://github.com/Mellanox/mstflint"; - license = [ lib.licenses.gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ thillux ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/nct6687d/default.nix b/pkgs/os-specific/linux/nct6687d/default.nix index 80a309fa1619..b4d26d43aa7f 100644 --- a/pkgs/os-specific/linux/nct6687d/default.nix +++ b/pkgs/os-specific/linux/nct6687d/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = { description = "Kernel module for the Nuvoton NCT6687-R chipset found on many B550/B650 motherboards from ASUS and MSI"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; homepage = "https://github.com/Fred78290/nct6687d/"; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ atemu ]; diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix index 1959088b3436..72c3e812ddf1 100644 --- a/pkgs/os-specific/linux/ply/default.nix +++ b/pkgs/os-specific/linux/ply/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Dynamic tracing in Linux"; mainProgram = "ply"; homepage = "https://wkz.github.io/ply/"; - license = [ lib.licenses.gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ mic92 snu diff --git a/pkgs/os-specific/linux/rtw89/default.nix b/pkgs/os-specific/linux/rtw89/default.nix index 6c4317f8bac1..bf01f27a15ba 100644 --- a/pkgs/os-specific/linux/rtw89/default.nix +++ b/pkgs/os-specific/linux/rtw89/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = { description = "Driver for Realtek 8852AE, 8852BE, and 8853CE, 802.11ax devices"; homepage = "https://github.com/lwfinger/rtw89"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ tvorog ]; platforms = lib.platforms.linux; broken = kernel.kernelOlder "5.7"; diff --git a/pkgs/os-specific/linux/sgx/psw/default.nix b/pkgs/os-specific/linux/sgx/psw/default.nix index 534a9e98f13d..738406006b2a 100644 --- a/pkgs/os-specific/linux/sgx/psw/default.nix +++ b/pkgs/os-specific/linux/sgx/psw/default.nix @@ -277,6 +277,6 @@ stdenv.mkDerivation rec { citadelcore ]; platforms = [ "x86_64-linux" ]; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/os-specific/linux/system76-acpi/default.nix b/pkgs/os-specific/linux/system76-acpi/default.nix index 181695a948ed..1d75eca019da 100644 --- a/pkgs/os-specific/linux/system76-acpi/default.nix +++ b/pkgs/os-specific/linux/system76-acpi/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { maintainers = with lib.maintainers; [ ahoneybun ]; - license = [ lib.licenses.gpl2Only ]; + license = lib.licenses.gpl2Only; platforms = [ "i686-linux" "x86_64-linux" diff --git a/pkgs/os-specific/linux/system76/default.nix b/pkgs/os-specific/linux/system76/default.nix index aaf33eb2eff4..5e18d1ff39cb 100644 --- a/pkgs/os-specific/linux/system76/default.nix +++ b/pkgs/os-specific/linux/system76/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { maintainers = with lib.maintainers; [ ahoneybun ]; - license = [ lib.licenses.gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = [ "i686-linux" "x86_64-linux" diff --git a/pkgs/os-specific/linux/tt-kmd/default.nix b/pkgs/os-specific/linux/tt-kmd/default.nix index f8cc8f60ad1c..1e3923f6f787 100644 --- a/pkgs/os-specific/linux/tt-kmd/default.nix +++ b/pkgs/os-specific/linux/tt-kmd/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Tenstorrent Kernel Module"; homepage = "https://github.com/tenstorrent/tt-kmd"; maintainers = with lib.maintainers; [ RossComputerGuy ]; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/os-specific/linux/usbrelay/python.nix b/pkgs/os-specific/linux/usbrelay/python.nix index 95114b0ddb20..376e2bf61bf5 100644 --- a/pkgs/os-specific/linux/usbrelay/python.nix +++ b/pkgs/os-specific/linux/usbrelay/python.nix @@ -1,10 +1,16 @@ -{ buildPythonPackage, usbrelay }: +{ + buildPythonPackage, + setuptools, + usbrelay, +}: buildPythonPackage { - format = "setuptools"; pname = "usbrelay_py"; + pyproject = true; inherit (usbrelay) version src; + build-system = [ setuptools ]; + preConfigure = '' cd usbrelay_py ''; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 4a97f5fde2eb..779db0d0307a 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1691,7 +1691,8 @@ ]; "energieleser" = ps: with ps; [ - ]; # missing inputs: energieleser + energieleser + ]; "energy" = ps: with ps; [ fnv-hash-fast @@ -1726,7 +1727,8 @@ ]; "envertech_evt800" = ps: with ps; [ - ]; # missing inputs: pyenvertechevt800 + pyenvertechevt800 + ]; "environment_canada" = ps: with ps; [ env-canada @@ -2553,7 +2555,8 @@ ]; "helty" = ps: with ps; [ - ]; # missing inputs: pyhelty + pyhelty + ]; "heos" = ps: with ps; [ pyheos @@ -3002,7 +3005,8 @@ ]; "imou" = ps: with ps; [ - ]; # missing inputs: pyimouapi + pyimouapi + ]; "improv_ble" = ps: with ps; [ aioesphomeapi @@ -3241,7 +3245,8 @@ ]; "itach" = ps: with ps; [ - ]; # missing inputs: pyitachip2ir2 + pyitachip2ir2 + ]; "itunes" = ps: with ps; [ ]; @@ -3980,7 +3985,8 @@ ]; "melcloud_home" = ps: with ps; [ - ]; # missing inputs: aiomelcloudhome + aiomelcloudhome + ]; "melissa" = ps: with ps; [ py-melissa-climate @@ -7364,7 +7370,8 @@ ]; "wattwaechter" = ps: with ps; [ - ]; # missing inputs: aio-wattwaechter + aio-wattwaechter + ]; "waze_travel_time" = ps: with ps; [ pywaze @@ -8024,12 +8031,14 @@ "emulated_kasa" "emulated_roku" "energenie_power_sockets" + "energieleser" "energy" "energyid" "energyzero" "enigma2" "enocean" "enphase_envoy" + "envertech_evt800" "environment_canada" "envisalink" "epic_games_store" @@ -8160,6 +8169,7 @@ "hdfury" "hdmi_cec" "hegel" + "helty" "heos" "here_travel_time" "hikvision" @@ -8222,6 +8232,7 @@ "imeon_inverter" "imgw_pib" "immich" + "imou" "improv_ble" "incomfort" "indevolt" @@ -8257,6 +8268,7 @@ "iss" "ista_ecotrend" "isy994" + "itach" "ituran" "izone" "jellyfin" @@ -8351,6 +8363,7 @@ "media_player" "media_source" "melcloud" + "melcloud_home" "melissa" "melnor" "meraki" @@ -8856,6 +8869,7 @@ "watergate" "watts" "watttime" + "wattwaechter" "waze_travel_time" "weather" "weatherflow" diff --git a/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix b/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix index 2b944d5846e6..b414391cc1ba 100644 --- a/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix +++ b/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix @@ -29,7 +29,7 @@ buildHomeAssistantComponent rec { meta = { description = "Home Assistant custom component providing body metrics for Xiaomi Mi Scale 1 and 2"; homepage = "https://github.com/dckiller51/bodymiscale"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ justinas ]; }; } diff --git a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix index a294f47c40b8..6f7e85e3e3ba 100644 --- a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix +++ b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix @@ -17,13 +17,13 @@ buildHomeAssistantComponent rec { owner = "bramstroker"; domain = "powercalc"; - version = "1.21.2"; + version = "1.22.0"; src = fetchFromGitHub { inherit owner; repo = "homeassistant-powercalc"; tag = "v${version}"; - hash = "sha256-D8gFEhitQjryZLLcP2ZsXNqWLvPyayuoYGq5C0B2D5w="; + hash = "sha256-JToHHnteIH6uJEZSl22hBsUxkf7Cj0s1sPaAcKmaFao="; }; dependencies = [ numpy ]; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 9344a7310b45..52e09101fb9e 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -312,7 +312,7 @@ stdenv.mkDerivation { description = "Reverse proxy and lightweight webserver"; mainProgram = "nginx"; homepage = "https://nginx.org"; - license = [ lib.licenses.bsd2 ] ++ lib.concatMap (m: m.meta.license) modules; + license = [ lib.licenses.bsd2 ] ++ lib.concatMap (m: lib.toList m.meta.license) modules; broken = lib.any (m: m.meta.broken or false) modules; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index e4ba92fa0bf6..7bb9cf8f80a7 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -57,7 +57,7 @@ let meta = { description = "Forward proxy module for CONNECT request handling"; homepage = "https://github.com/chobits/ngx_http_proxy_connect_module"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -81,7 +81,7 @@ let meta = { description = "Validates Akamai v2 query string tokens"; homepage = "https://github.com/kaltura/nginx-akamai-token-validate-module"; - license = with lib.licenses; [ agpl3Only ]; + license = lib.licenses.agpl3Only; maintainers = [ ]; }; }; @@ -112,7 +112,7 @@ let meta = { description = "Integrate ARPA2 Resource ACLs into nginx"; homepage = "https://gitlab.com/arpa2/nginx-auth-a2aclr"; - license = with lib.licenses; [ isc ]; + license = lib.licenses.isc; maintainers = [ ]; }; }; @@ -130,7 +130,7 @@ let meta = { description = "Proxy to authenticated AWS services"; homepage = "https://github.com/anomalizer/ngx_aws_auth"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -158,7 +158,7 @@ let meta = { description = "Brotli compression"; homepage = "https://github.com/google/ngx_brotli"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -176,7 +176,7 @@ let meta = { description = "Adds ability to purge content from FastCGI, proxy, SCGI and uWSGI caches"; homepage = "https://github.com/nginx-modules/ngx_cache_purge"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -194,7 +194,7 @@ let meta = { description = "Collection of small and useful nginx add-ons"; homepage = "https://github.com/FRiCKLE/ngx_coolkit"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -214,7 +214,7 @@ let meta = { description = "WebDAV PROPFIND,OPTIONS,LOCK,UNLOCK support"; homepage = "https://github.com/arut/nginx-dav-ext-module"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -232,7 +232,7 @@ let meta = { description = "Adds additional generic tools that module developers can use in their own modules"; homepage = "https://github.com/vision5/ngx_devel_kit"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ ]; }; }; @@ -252,7 +252,7 @@ let meta = { description = "Brings echo, sleep, time, exec and more shell-style goodies to Nginx"; homepage = "https://github.com/openresty/echo-nginx-module"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -270,7 +270,7 @@ let meta = { description = "Fancy indexes module"; homepage = "https://github.com/aperezdc/ngx-fancyindex"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ aneeshusa ]; }; }; @@ -288,7 +288,7 @@ let meta = { description = "Fluentd data collector"; homepage = "https://github.com/fluent/nginx-fluentd-module"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = [ ]; }; }; @@ -308,7 +308,7 @@ let meta = { description = "Creates variables with values from the maxmind geoip2 databases"; homepage = "https://github.com/leev/ngx_http_geoip2_module"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ pinpox ]; }; }; @@ -342,7 +342,7 @@ let meta = { description = "IP address anonymizer"; homepage = "https://github.com/masonicboom/ipscrub"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ ]; }; }; @@ -360,7 +360,7 @@ let meta = { description = "Limit the total speed from the specific user"; homepage = "https://github.com/yaoweibin/nginx_limit_speed_module"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -378,7 +378,7 @@ let meta = { description = "HTTP live module"; homepage = "https://github.com/arut/nginx-live-module"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -414,7 +414,7 @@ let meta = { description = "Embed the Power of Lua"; homepage = "https://github.com/openresty/lua-nginx-module"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -435,7 +435,7 @@ let meta = { description = "Expose Lua API to ngx_lua for Nginx upstreams"; homepage = "https://github.com/openresty/lua-upstream-nginx-module"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -463,7 +463,7 @@ let meta = { description = "Open source, cross platform web application firewall (WAF)"; homepage = "https://github.com/SpiderLabs/ModSecurity"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = [ ]; }; }; @@ -481,7 +481,7 @@ let meta = { description = "Set, add, and clear arbitrary output headers"; homepage = "https://github.com/openresty/headers-more-nginx-module"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; }; @@ -499,7 +499,7 @@ let meta = { description = "MPEG-TS Live Module"; homepage = "https://github.com/arut/nginx-ts-module"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -519,7 +519,7 @@ let meta = { description = "Open-source, high performance, low rules maintenance WAF"; homepage = "https://github.com/nbs-system/naxsi"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = [ ]; }; }; @@ -554,7 +554,7 @@ let meta = { description = "Subset of the JavaScript language that allows extending nginx functionality"; homepage = "https://nginx.org/en/docs/njs/"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ jvanbruegge ]; }; }; @@ -594,7 +594,7 @@ let meta = { description = "Automatic PageSpeed optimization"; homepage = "https://github.com/apache/incubator-pagespeed-ngx"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = [ ]; }; }; @@ -614,7 +614,7 @@ let meta = { description = "Use PAM for simple http authentication"; homepage = "https://github.com/sto/ngx_http_auth_pam_module"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -632,7 +632,7 @@ let meta = { description = "Pinba module for nginx"; homepage = "https://github.com/tony2001/ngx_http_pinba_module"; - license = with lib.licenses; [ unfree ]; # no license in repo + license = lib.licenses.unfree; # no license in repo maintainers = [ ]; }; }; @@ -650,7 +650,7 @@ let meta = { description = "Pure stream http push technology"; homepage = "https://github.com/wandenberg/nginx-push-stream-module"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = [ ]; }; }; @@ -668,7 +668,7 @@ let meta = { description = "Media Streaming Server"; homepage = "https://github.com/arut/nginx-rtmp-module"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -689,7 +689,7 @@ let meta = { description = "Generates CDN tokens, either as a cookie or as a query string parameter"; homepage = "https://github.com/kaltura/nginx-secure-token-module"; - license = with lib.licenses; [ agpl3Only ]; + license = lib.licenses.agpl3Only; maintainers = [ ]; }; }; @@ -707,7 +707,7 @@ let meta = { description = "Various set_xxx directives added to the rewrite module (md5/sha1, sql/json quoting and many more)"; homepage = "https://github.com/openresty/set-misc-nginx-module"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -725,7 +725,7 @@ let meta = { description = "Shibboleth auth request"; homepage = "https://github.com/nginx-shib/nginx-http-shibboleth"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -743,7 +743,7 @@ let meta = { description = "Implements a collection of augmented statistics based on HTTP-codes and upstreams response time"; homepage = "https://github.com/goldenclone/nginx-sla"; - license = with lib.licenses; [ unfree ]; # no license in repo + license = lib.licenses.unfree; # no license in repo maintainers = [ ]; }; }; @@ -761,7 +761,7 @@ let meta = { description = "Adds ability to cache static files"; homepage = "https://github.com/friCKLE/ngx_slowfs_cache"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -779,7 +779,7 @@ let meta = { description = "Expose querystring parameters sorted in a variable"; homepage = "https://github.com/wandenberg/nginx-sorted-querystring-module"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; }; }; @@ -799,7 +799,7 @@ let meta = { description = "SPNEGO HTTP Authentication Module"; homepage = "https://github.com/stnoonan/spnego-http-auth-nginx-module"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ de11n despsyched @@ -820,7 +820,7 @@ let meta = { description = "Send statistics to statsd"; homepage = "https://github.com/harvesthq/nginx-statsd"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ ]; }; }; @@ -838,7 +838,7 @@ let meta = { description = "Stream server traffic status core module"; homepage = "https://github.com/vozlt/nginx-module-stream-sts"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -856,7 +856,7 @@ let meta = { description = "Stream server traffic status module"; homepage = "https://github.com/vozlt/nginx-module-sts"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -874,7 +874,7 @@ let meta = { description = "Filter module which can do both regular expression and fixed string substitutions"; homepage = "https://github.com/yaoweibin/ngx_http_substitutions_filter_module"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -892,7 +892,7 @@ let meta = { description = "Nginx sysguard module"; homepage = "https://github.com/vozlt/nginx-module-sysguard"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -910,7 +910,7 @@ let meta = { description = "Handle file uploads using multipart/form-data encoding and resumable uploads"; homepage = "https://github.com/fdintino/nginx-upload-module"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ ]; }; }; @@ -928,7 +928,7 @@ let meta = { description = "Support upstream health check"; homepage = "https://github.com/yaoweibin/nginx_upstream_check_module"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -951,7 +951,7 @@ let meta = { description = "Tarantool NginX upstream module (REST, JSON API, websockets, load balancing)"; homepage = "https://github.com/tarantool/nginx_upstream_module"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -969,7 +969,7 @@ let meta = { description = "URL encoding converting module"; homepage = "https://github.com/vozlt/nginx-module-url"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; }; @@ -993,7 +993,7 @@ let meta = { description = "Extract thumbs from a video file"; homepage = "https://github.com/wandenberg/nginx-video-thumbextractor-module"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = [ ]; }; }; @@ -1030,7 +1030,7 @@ let meta = { description = "VOD packager"; homepage = "https://github.com/kaltura/nginx-vod-module"; - license = with lib.licenses; [ agpl3Only ]; + license = lib.licenses.agpl3Only; maintainers = [ ]; }; }; @@ -1048,7 +1048,7 @@ let meta = { description = "Virtual host traffic status module"; homepage = "https://github.com/vozlt/nginx-module-vts"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; }; @@ -1066,7 +1066,7 @@ let meta = { description = "Streaming ZIP archiver for nginx"; homepage = "https://github.com/evanmiller/mod_zip"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; broken = stdenv.hostPlatform.isDarwin; maintainers = with lib.maintainers; [ DutchGerman @@ -1090,7 +1090,7 @@ let meta = { description = "Nginx modules for the Zstandard compression"; homepage = "https://github.com/tokers/zstd-nginx-module"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; }; diff --git a/pkgs/servers/monitoring/nagios-plugins/check_interfaces/default.nix b/pkgs/servers/monitoring/nagios-plugins/check_interfaces/default.nix index ce90058b04bf..87545ed5846a 100644 --- a/pkgs/servers/monitoring/nagios-plugins/check_interfaces/default.nix +++ b/pkgs/servers/monitoring/nagios-plugins/check_interfaces/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/NETWAYS/check_interfaces/releases/tag/v${version}"; description = "Icinga check plugin for network hardware interfaces"; homepage = "https://github.com/NETWAYS/check_interfaces/"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ jwillikers ]; mainProgram = "check_interfaces"; diff --git a/pkgs/servers/monitoring/nagios-plugins/manubulon-snmp-plugins/default.nix b/pkgs/servers/monitoring/nagios-plugins/manubulon-snmp-plugins/default.nix index 1a9899745b88..2bbdd7d5159f 100644 --- a/pkgs/servers/monitoring/nagios-plugins/manubulon-snmp-plugins/default.nix +++ b/pkgs/servers/monitoring/nagios-plugins/manubulon-snmp-plugins/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/SteScho/manubulon-snmp/releases/tag/v${version}"; description = "Set of Icinga/Nagios plugins to check hosts and hardware with the SNMP protocol"; homepage = "https://github.com/SteScho/manubulon-snmp"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ jwillikers ]; }; diff --git a/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix b/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix index 36ca174a8e66..0308e67ce4d4 100644 --- a/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix +++ b/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { changelog = "https://github.com/alexander-naumov/openbsd_snmp3_check/releases/tag/v${version}"; description = "SNMP v3 check for OpenBSD systems state monitoring"; homepage = "https://github.com/alexander-naumov/openbsd_snmp3_check"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ jwillikers ]; mainProgram = "openbsd_snmp3.py"; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 03c614cb66e9..03d06ce67bcf 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -157,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://facebook.github.io/zstd/"; changelog = "https://github.com/facebook/zstd/blob/v${finalAttrs.version}/CHANGELOG"; - license = with lib.licenses; [ bsd3 ]; # Or, at your opinion, GPL-2.0-only. + license = lib.licenses.bsd3; # Or, at your opinion, GPL-2.0-only. mainProgram = "zstd"; platforms = lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/tools/misc/bat-extras/modules/core.nix b/pkgs/tools/misc/bat-extras/modules/core.nix index 30de45679491..3d11b8c4a38f 100644 --- a/pkgs/tools/misc/bat-extras/modules/core.nix +++ b/pkgs/tools/misc/bat-extras/modules/core.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation { meta = { description = "Bash scripts that integrate bat with various command line tools"; homepage = "https://github.com/eth-p/bat-extras"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ bbigras PerchunPak diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix index 88fda3568660..96cae37b8977 100644 --- a/pkgs/tools/networking/telepresence/default.nix +++ b/pkgs/tools/networking/telepresence/default.nix @@ -58,7 +58,7 @@ pythonPackages.buildPythonPackage rec { homepage = "https://www.telepresence.io/"; description = "Local development against a remote Kubernetes or OpenShift cluster"; mainProgram = "telepresence"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = [ ]; }; } diff --git a/pkgs/tools/package-management/nix/README.md b/pkgs/tools/package-management/nix/README.md index a45e38f749bd..5682d4922810 100644 --- a/pkgs/tools/package-management/nix/README.md +++ b/pkgs/tools/package-management/nix/README.md @@ -4,7 +4,7 @@ Branch to merge into: **master** or **release-$nixos-version** -Build the affected Nix packages and run their tests on the following platforms: **x86_64-linux**, **aarch64-linux**, **x86_64-darwin**, and **aarch64-darwin**. +Build the affected Nix packages and run their tests on the following platforms: **x86_64-linux**, **aarch64-linux**, and **aarch64-darwin**. If you lack the necessary hardware for these platforms, you may need to ask others for assistance with the builds. Alternatively, you can request access to the Nix community builder for all platforms [here](https://github.com/NixOS/aarch64-build-box) and [here](https://nix-community.org/community-builder/). diff --git a/pkgs/tools/package-management/nix/modular/packaging/components.nix b/pkgs/tools/package-management/nix/modular/packaging/components.nix index 22a362c16d5f..fb6970ce68c0 100644 --- a/pkgs/tools/package-management/nix/modular/packaging/components.nix +++ b/pkgs/tools/package-management/nix/modular/packaging/components.nix @@ -125,8 +125,6 @@ let !(stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isCygwin) # build failure && !stdenv.hostPlatform.isStatic - # LTO breaks exception handling on x86-64-darwin. - && stdenv.system != "x86_64-darwin" ) '' case "$mesonBuildType" in diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 613abfc30bde..941f65a84f76 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -68,7 +68,7 @@ rustPlatform.buildRustPackage rec { description = "cat for markdown"; homepage = "https://github.com/swsnr/mdcat"; changelog = "https://github.com/swsnr/mdcat/releases/tag/mdcat-${version}"; - license = with lib.licenses; [ mpl20 ]; + license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e79e4dca30f..2e1dbc9d535c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3251,11 +3251,7 @@ with pkgs; }; fasm-bin = callPackage ../development/compilers/fasm/bin.nix { }; - fbc = - if stdenv.hostPlatform.isDarwin then - callPackage ../development/compilers/fbc/mac-bin.nix { } - else - callPackage ../development/compilers/fbc { }; + fbc = callPackage ../development/compilers/fbc { }; filecheck = with python3Packages; toPythonApplication filecheck; @@ -9312,11 +9308,7 @@ with pkgs; ringboard-wayland = callPackage ../by-name/ri/ringboard/package.nix { displayServer = "wayland"; }; - ripcord = - if stdenv.hostPlatform.isLinux then - qt5.callPackage ../applications/networking/instant-messengers/ripcord { } - else - callPackage ../applications/networking/instant-messengers/ripcord/darwin.nix { }; + ripcord = qt5.callPackage ../applications/networking/instant-messengers/ripcord { }; inherit (callPackage ../applications/networking/cluster/rke2 { }) rke2_1_33 diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 03b713f20ba9..059b36670216 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -136,7 +136,7 @@ with self; meta = { description = "Grep-like tool tailored to working with large trees of source code"; homepage = "https://beyondgrep.com"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = [ maintainers.asakura ]; }; }; @@ -444,7 +444,7 @@ with self; meta = { description = "Alien package for the GNU Multiple Precision library"; homepage = "https://metacpan.org/pod/Alien::GMP"; - license = with lib.licenses; [ lgpl3Plus ]; + license = lib.licenses.lgpl3Plus; }; }; @@ -1044,7 +1044,7 @@ with self; doCheck = false; meta = { description = "Test.pm wrapper with helpers for testing Apache"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }; @@ -1273,7 +1273,7 @@ with self; meta = { description = "Write object oriented scripts with ease"; homepage = "https://github.com/jhthorsen/applify"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -1388,7 +1388,7 @@ with self; meta = { description = "Manage perl installations in your $HOME"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "perlbrew"; }; }; @@ -1482,7 +1482,7 @@ with self; meta = { description = "Sensible database change management"; homepage = "https://sqitch.org"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "sqitch"; }; }; @@ -1500,7 +1500,7 @@ with self; meta = { description = "Simple Statistics"; homepage = "https://github.com/nferraz/st"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; mainProgram = "st"; }; @@ -1519,7 +1519,7 @@ with self; meta = { description = "Validate method/function parameters"; homepage = "https://metacpan.org/release/Params-Validate"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -1680,7 +1680,7 @@ with self; meta = { description = "Simple limitable FIFO array, with sum and average methods"; homepage = "https://github.com/dwburke/perl-Array-FIFO"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -1726,7 +1726,7 @@ with self; }; meta = { description = "Ping a huge number of servers in several seconds"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -1814,7 +1814,7 @@ with self; ]; meta = { description = "API wrapper around the 'tar' utility"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; }; }; @@ -1846,7 +1846,7 @@ with self; meta = { description = "Object-oriented interface to FITS HDUs"; homepage = "https://github.com/timj/perl-Astro-FITS-Header"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; }; }; @@ -1897,7 +1897,7 @@ with self; meta = { description = "Fast C metadata and tag reader for all common audio file formats, slimserver fork"; homepage = "https://github.com/Logitech/slimserver-vendor"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; }; }; @@ -1915,7 +1915,7 @@ with self; ]; meta = { description = "DEC VMS password hashing"; - license = with lib.licenses; [ gpl1Plus ]; + license = lib.licenses.gpl1Plus; }; }; @@ -1994,7 +1994,7 @@ with self; ''; meta = { description = "Perl extension for MIT Kerberos 5 admin interface"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; }; }; @@ -2090,7 +2090,7 @@ with self; ]; meta = { description = "Provide simple Radius client facilities"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -2155,7 +2155,7 @@ with self; meta = { description = "Salted Challenge Response Authentication Mechanism (RFC 5802)"; homepage = "https://github.com/dagolden/Authen-SCRAM"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = [ maintainers.sgo ]; }; }; @@ -2231,7 +2231,7 @@ with self; ]; meta = { description = "Call methods on native types"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -2262,7 +2262,7 @@ with self; which includes C, C++, Java, Perl, Python, and more. ''; homepage = "http://www.aarontrevena.co.uk/opensource/autodia/"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "autodia.pl"; }; }; @@ -2323,7 +2323,7 @@ with self; meta = { description = "Perl interface to the ZBar Barcode Reader"; homepage = "https://metacpan.org/pod/Barcode::ZBar"; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; }; }; @@ -2773,7 +2773,7 @@ with self; }; meta = { description = "BSD process resource limit and priority functions"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = with lib.maintainers; [ de11n despsyched @@ -2832,7 +2832,7 @@ with self; meta = { description = "Work with International Standard Book Numbers"; homepage = "https://github.com/briandfoy/business-isbn"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -2846,7 +2846,7 @@ with self; meta = { description = "Data pack for Business::ISBN"; homepage = "https://github.com/briandfoy/business-isbn-data"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -2861,7 +2861,7 @@ with self; meta = { description = "Work with International Standard Music Numbers"; homepage = "https://github.com/briandfoy/business-ismn"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -2875,7 +2875,7 @@ with self; meta = { description = "Perl extension for International Standard Serial Numbers"; homepage = "https://github.com/briandfoy/business-issn"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -3093,7 +3093,7 @@ with self; meta = { description = "Perl interface to the cairo 2d vector graphics library"; homepage = "https://gtk2-perl.sourceforge.net"; - license = with lib.licenses; [ lgpl21Only ]; + license = lib.licenses.lgpl21Only; }; }; @@ -3115,7 +3115,7 @@ with self; meta = { description = "Integrate Cairo into the Glib type system"; homepage = "https://gtk2-perl.sourceforge.net"; - license = with lib.licenses; [ lgpl21Only ]; + license = lib.licenses.lgpl21Only; }; }; @@ -3182,7 +3182,7 @@ with self; }; meta = { description = "Canary to check perl compatibility for schmorp's modules"; - license = with lib.licenses; [ gpl1Plus ]; + license = lib.licenses.gpl1Plus; }; }; @@ -3216,7 +3216,7 @@ with self; meta = { description = "Capture STDOUT and STDERR from Perl, XS or external programs"; homepage = "https://github.com/dagolden/Capture-Tiny"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }; @@ -3264,7 +3264,7 @@ with self; buildInputs = [ TestException ]; meta = { description = "Convenience assertions for common situations"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -3552,7 +3552,7 @@ with self; meta = { description = "Serves PODs right from your Catalyst application"; homepage = "https://search.cpan.org/dist/Catalyst-Controller-POD"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; }; }; @@ -4426,7 +4426,7 @@ with self; }; meta = { description = "Get the CDDB info for an audio cd"; - license = with lib.licenses; [ artistic1 ]; + license = lib.licenses.artistic1; maintainers = [ maintainers.endgame ]; mainProgram = "cddb.pl"; }; @@ -4441,7 +4441,7 @@ with self; }; meta = { description = "Parse a CDDB/freedb data file"; - license = with lib.licenses; [ artistic1 ]; + license = lib.licenses.artistic1; }; }; @@ -4466,7 +4466,7 @@ with self; meta = { description = "Handle Common Gateway Interface requests and responses"; homepage = "https://metacpan.org/module/CGI"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -4604,7 +4604,7 @@ with self; meta = { description = "Lightweight CGI form processing package"; homepage = "https://github.com/JerilynFranz/perl-CGI-Minimal"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -4635,7 +4635,7 @@ with self; propagatedBuildInputs = [ CGI ]; meta = { description = "Persistent session data in CGI applications"; - license = with lib.licenses; [ artistic1 ]; + license = lib.licenses.artistic1; }; }; @@ -4669,7 +4669,7 @@ with self; buildInputs = [ TestDeep ]; meta = { description = "Build structures from CGI data"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; }; }; @@ -4764,7 +4764,7 @@ with self; meta = { description = "Communicate with a smart card using PC/SC"; homepage = "https://pcsc-perl.apdu.fr/"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with maintainers; [ anthonyroussel ]; @@ -4780,7 +4780,7 @@ with self; }; meta = { description = "Package for creating Cisco IPPhone XML objects"; - license = with lib.licenses; [ artistic1 ]; + license = lib.licenses.artistic1; }; }; @@ -5088,7 +5088,7 @@ with self; }; meta = { description = "Another class and object builder"; - license = with lib.licenses; [ artistic1 ]; + license = lib.licenses.artistic1; }; }; @@ -5358,7 +5358,7 @@ with self; meta = { description = "Minimalist class construction"; homepage = "https://github.com/dagolden/Class-Tiny"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }; @@ -5402,7 +5402,7 @@ with self; meta = { description = "XS implementation of parts of Class::Load"; homepage = "https://github.com/moose/Class-Load-XS"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -5566,7 +5566,7 @@ with self; meta = { description = "Subroutines for making simple command line scripts"; homepage = "https://github.com/reyjrar/CLI-Helpers"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; }; }; @@ -5977,7 +5977,7 @@ with self; }; meta = { description = "Generic Config Module"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -6494,7 +6494,7 @@ with self; }; meta = { description = "Constant subs with deferred value calculation"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; }; }; @@ -6823,7 +6823,7 @@ with self; meta = { description = "Common library for searching CPAN modules, authors and distributions"; homepage = "https://github.com/Perl-Toolchain-Gang/CPAN-Common-Index"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }; @@ -6938,7 +6938,7 @@ with self; meta = { changelog = "https://github.com/Leont/crypt-argon2/blob/v0.031/Changes"; description = "Perl interface to the Argon2 key derivation functions"; - license = with lib.licenses; [ cc0 ]; + license = lib.licenses.cc0; }; }; @@ -6967,7 +6967,7 @@ with self; }; meta = { description = "Perl Blowfish encryption module"; - license = with lib.licenses; [ bsdOriginalShortened ]; + license = lib.licenses.bsdOriginalShortened; }; }; @@ -7040,7 +7040,7 @@ with self; ]; meta = { description = "Perl DES encryption module"; - license = with lib.licenses; [ bsdOriginalShortened ]; + license = lib.licenses.bsdOriginalShortened; }; }; @@ -7223,7 +7223,7 @@ with self; meta = { description = "Secure memorable password generator"; homepage = "http://www.bartb.ie/hsxkpasswd"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ maintainers.dannixon ]; mainProgram = "hsxkpasswd"; }; @@ -7241,7 +7241,7 @@ with self; }; meta = { description = "Perl interface to IDEA block cipher"; - license = with lib.licenses; [ bsdOriginalShortened ]; + license = lib.licenses.bsdOriginalShortened; }; }; @@ -7356,7 +7356,7 @@ with self; meta = { description = "Parse PKCS #10 certificate requests"; homepage = "https://github.com/openxpki/Crypt-PKCS10"; - license = with lib.licenses; [ gpl1Only ]; + license = lib.licenses.gpl1Only; }; }; @@ -7524,7 +7524,7 @@ with self; }; meta = { description = "Crypt::CBC compliant Rijndael encryption module"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; }; }; @@ -7592,7 +7592,7 @@ with self; }; meta = { description = "Perl-only implementation of lanman and nt md4 hash functions, for use in Samba style smbpasswd entries"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; }; }; @@ -7898,7 +7898,7 @@ with self; meta = { description = "Minimal Ed25519 bindings"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = [ maintainers.thoughtpolice ]; }; }; @@ -7922,7 +7922,7 @@ with self; ]; meta = { description = "OpenSSL support for LWP"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -7959,7 +7959,7 @@ with self; }; meta = { description = "Perl extension for minifying CSS"; - license = with lib.licenses; [ artistic1 ]; + license = lib.licenses.artistic1; }; }; @@ -8014,7 +8014,7 @@ with self; env.NIX_CFLAGS_LINK = "-L${pkgs.ncurses.out}/lib -lncurses"; meta = { description = "Perl bindings to ncurses"; - license = with lib.licenses; [ artistic1 ]; + license = lib.licenses.artistic1; }; }; @@ -8203,7 +8203,7 @@ with self; propagatedBuildInputs = [ IOInteractiveTiny ]; meta = { description = "Dump with recursive encoding"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; mainProgram = "edumper"; }; }; @@ -8397,7 +8397,7 @@ with self; meta = { description = "Pack and unpack big-endian IEEE754 floats and doubles"; homepage = "https://metacpan.org/release/Data-IEEE754"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -8841,7 +8841,7 @@ with self; ]; meta = { description = "Globally/Universally Unique Identifiers (GUIDs/UUIDs)"; - license = with lib.licenses; [ bsd0 ]; + license = lib.licenses.bsd0; }; }; @@ -8857,7 +8857,7 @@ with self; meta = { description = "Fast random UUID generator using the Mersenne Twister algorithm"; homepage = "https://metacpan.org/release/Data-UUID-MT"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }; @@ -9013,7 +9013,7 @@ with self; propagatedBuildInputs = [ DateSimple ]; meta = { description = "Work with a range of dates"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; }; }; @@ -9053,7 +9053,7 @@ with self; meta = { description = "Date and time object for Perl"; homepage = "https://metacpan.org/release/DateTime"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -9122,7 +9122,7 @@ with self; meta = { description = "Create DateTime parser classes and objects"; homepage = "https://metacpan.org/release/DateTime-Format-Builder"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -9329,7 +9329,7 @@ with self; meta = { description = "Parse and format strp and strf time patterns"; homepage = "https://metacpan.org/release/DateTime-Format-Strptime"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -9429,7 +9429,7 @@ with self; meta = { description = "Parse and format RFC3339 datetime strings"; homepage = "https://search.cpan.org/dist/DateTime-Format-RFC3339"; - license = with lib.licenses; [ cc0 ]; + license = lib.licenses.cc0; }; }; @@ -9764,7 +9764,7 @@ with self; }; meta = { description = "Print out each line before it is executed (like sh -x)"; - license = with lib.licenses; [ publicDomain ]; + license = lib.licenses.publicDomain; }; }; @@ -10539,7 +10539,7 @@ with self; }; meta = { description = "Simple detection of binary versus text in strings"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -10600,7 +10600,7 @@ with self; ]; meta = { description = "Perl side of the Perl debugger for IntelliJ IDEA and other JetBrains IDEs"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -10809,7 +10809,7 @@ with self; meta = { description = "Object representing a stack trace"; homepage = "https://metacpan.org/release/Devel-StackTrace"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -10872,7 +10872,7 @@ with self; }; meta = { description = "Module that calculates CRC sums of all sorts"; - license = with lib.licenses; [ publicDomain ]; + license = lib.licenses.publicDomain; }; }; @@ -10902,7 +10902,7 @@ with self; }; meta = { description = "Perl extension for 32 bit Jenkins Hashing Algorithm"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -11017,7 +11017,7 @@ with self; meta = { description = "Calculate and verify Subresource Integrity hashes (SRI)"; homepage = "https://github.com/haukex/Digest-SRI"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; }; }; @@ -11035,7 +11035,7 @@ with self; meta = { description = "Treat a directory and a manifest file as a hash/dictionary of keys to texts or blobs"; homepage = "https://metacpan.org/release/Dir-Manifest"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -11391,7 +11391,7 @@ with self; meta = { description = "Validate your CPAN META.json files"; homepage = "https://p3rl.org/Dist::Zilla::Plugin::Test::CPAN::Meta::JSON"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -11668,7 +11668,7 @@ with self; propagatedBuildInputs = [ DistZilla ]; meta = { description = "Release Test::Version tests"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -12159,7 +12159,7 @@ with self; meta = { description = "High speed Base32 encoding using GMP with BigInt and MD5 support"; homepage = "https://metacpan.org/release/Encode-Base32-GMP"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with maintainers; [ sgo ]; }; }; @@ -12208,7 +12208,7 @@ with self; }; meta = { description = "Extra sets of Chinese encodings"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -12428,7 +12428,7 @@ with self; propagatedBuildInputs = [ commonsense ]; meta = { description = "Perl interface to libev, a high performance full-featured event loop"; - license = with lib.licenses; [ gpl1Plus ]; + license = lib.licenses.gpl1Plus; }; }; @@ -12956,7 +12956,7 @@ with self; meta = { description = "Simplistic interface to pkg-config"; homepage = "https://gitlab.gnome.org/GNOME/perl-extutils-pkgconfig"; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; maintainers = [ lib.maintainers.fliegendewurst ]; }; }; @@ -13080,7 +13080,7 @@ with self; ''; meta = { description = "Fast CGI module"; - license = with lib.licenses; [ oml ]; + license = lib.licenses.oml; }; }; @@ -13115,7 +13115,7 @@ with self; }; meta = { description = "Perl-based FastCGI process manager"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; }; }; @@ -13327,7 +13327,7 @@ with self; ]; meta = { description = "Watch for changes to files, cross-platform style"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -13566,7 +13566,7 @@ with self; meta = { description = "Object oriented File::Find replacement"; homepage = "https://metacpan.org/release/File-Find-Object"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -13690,7 +13690,7 @@ with self; }; meta = { description = "File locking with fcntl(2)"; - license = with lib.licenses; [ artistic1 ]; + license = lib.licenses.artistic1; maintainers = with maintainers; [ das_j ]; }; }; @@ -13731,7 +13731,7 @@ with self; meta = { description = "FileHandle which supports multi-byte unget"; homepage = "https://github.com/coppit/filehandle-unget"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with maintainers; [ romildo ]; }; }; @@ -13915,7 +13915,7 @@ with self; }; meta = { description = "Guess file type from contents"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }; @@ -13969,7 +13969,7 @@ with self; }; meta = { description = "File-finding iterator"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -14043,7 +14043,7 @@ with self; meta = { description = "Change directory temporarily for a limited scope"; homepage = "https://github.com/dagolden/File-pushd"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }; @@ -14510,7 +14510,7 @@ with self; homepage = "https://finance-quote.sourceforge.net/"; changelog = "https://github.com/finance-quote/finance-quote/releases/tag/v${version}"; description = "Get stock and mutual fund quotes from various exchanges"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ nevivurn ]; }; }; @@ -14557,7 +14557,7 @@ with self; buildInputs = [ IOString ]; meta = { description = "TTF font support for Perl"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -14781,7 +14781,7 @@ with self; meta = { description = "Verify solutions for solitaire games"; homepage = "https://metacpan.org/release/Games-Solitaire-Verify"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "verify-solitaire-solution"; # Unsuccessful stat on filename containing newline at lib/perl5/5.40.0/File/Path.pm line 361. broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; @@ -14950,7 +14950,7 @@ with self; }; meta = { description = "Interpolates script options from files into @ARGV or another array"; - license = with lib.licenses; [ artistic1 ]; + license = lib.licenses.artistic1; maintainers = [ maintainers.pSub ]; }; }; @@ -15024,7 +15024,7 @@ with self; propagatedBuildInputs = [ Error ]; meta = { description = "This is the Git.pm, plus the other files in the perl/Git directory, from github's git/git"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ de11n despsyched @@ -15041,7 +15041,7 @@ with self; }; meta = { description = "Create fixup commits for topic branches"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = [ maintainers.DamienCassou ]; mainProgram = "git-autofixup"; }; @@ -15132,7 +15132,7 @@ with self; meta = { description = "Perl wrappers for the GLib utility and Object libraries"; homepage = "https://gtk2-perl.sourceforge.net"; - license = with lib.licenses; [ lgpl21Only ]; + license = lib.licenses.lgpl21Only; # Can't load module IO, dynamic loading not available in this perl. broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; }; @@ -15179,7 +15179,7 @@ with self; meta = { description = "Dynamically create Perl language bindings"; homepage = "https://gtk2-perl.sourceforge.net"; - license = with lib.licenses; [ lgpl21Only ]; + license = lib.licenses.lgpl21Only; }; }; @@ -15450,7 +15450,7 @@ with self; meta = { description = "Perl interface to the GraphViz graphing tool"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -15487,7 +15487,7 @@ with self; meta = { description = "Perl interface to the GraphViz graphing tool"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -15513,7 +15513,7 @@ with self; meta = { description = "Search mailboxes for mail matching a regular expression"; homepage = "https://github.com/coppit/grepmail"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with maintainers; [ romildo ]; }; }; @@ -15588,7 +15588,7 @@ with self; meta = { description = "Perl interface to the 2.x series of the Gimp Toolkit library"; homepage = "https://gtk2-perl.sourceforge.net"; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; }; }; @@ -15605,7 +15605,7 @@ with self; ]; meta = { description = "(DEPRECATED) Perl interface to the EggTrayIcon library"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gtk2TrayIcon.x86_64-darwin }; }; @@ -15629,7 +15629,7 @@ with self; doCheck = false; meta = { description = "Perl extension for libappindicator"; - license = with lib.licenses; [ artistic1 ]; + license = lib.licenses.artistic1; }; }; @@ -15651,7 +15651,7 @@ with self; doCheck = false; meta = { description = "Perl bindings for the GtkImageView widget"; - license = with lib.licenses; [ lgpl3Plus ]; + license = lib.licenses.lgpl3Plus; }; }; @@ -15700,7 +15700,7 @@ with self; ''; meta = { description = "Perl interface to the 3.x series of the gtk+ toolkit"; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; }; }; @@ -15750,7 +15750,7 @@ with self; meta = { description = "Simple interface to Gtk3's complex MVC list widget"; homepage = "https://github.com/soig/Gtk3-SimpleList"; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; }; }; @@ -15872,7 +15872,7 @@ with self; propagatedBuildInputs = [ LogTrace ]; meta = { description = "Flatten/unflatten complex data hashes"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; }; }; @@ -16215,7 +16215,7 @@ with self; meta = { description = "HTML to text formatting using external programs"; homepage = "https://user42.tuxfamily.org/html-formatexternal/index.html"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; }; }; @@ -16638,7 +16638,7 @@ with self; meta = { description = "(X)HTML validation in a Perl object"; homepage = "https://github.com/petdance/html-tidy"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; mainProgram = "webtidy"; }; }; @@ -16799,7 +16799,7 @@ with self; meta = { description = "Minimalist HTTP user agent cookie jar"; homepage = "https://github.com/dagolden/HTTP-CookieJar"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }; @@ -17435,7 +17435,7 @@ with self; ]; meta = { description = "Fast, high-quality fixed-point image resizing"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; }; }; @@ -17797,7 +17797,7 @@ with self; meta = { description = "Utilities for interactive I/O"; homepage = "https://github.com/briandfoy/io-interactive"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -17810,7 +17810,7 @@ with self; }; meta = { description = "Is_interactive() without large deps"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -18127,7 +18127,7 @@ with self; propagatedBuildInputs = [ GeographyCountries ]; meta = { description = "Fast lookup of country codes from IP addresses"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "ip2cc"; }; }; @@ -18141,7 +18141,7 @@ with self; }; meta = { description = "2-letter, 3-letter, and numerical codes for countries"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -18360,7 +18360,7 @@ with self; public methods have been defined. These classes and methods are available to the Perl program as if they had been written in Perl. ''; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.InlineJava.x86_64-darwin }; }; @@ -18581,7 +18581,7 @@ with self; meta = { description = "Validate data against a JSON schema"; homepage = "https://github.com/mojolicious/json-validator"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -18751,7 +18751,7 @@ with self; meta = { description = "Transforms TeX and LaTeX into XML/HTML/MathML"; homepage = "https://dlmf.nist.gov/LaTeXML/"; - license = with lib.licenses; [ publicDomain ]; + license = lib.licenses.publicDomain; maintainers = with maintainers; [ xworld21 ]; mainProgram = "latexmlc"; }; @@ -18877,7 +18877,7 @@ with self; __darwinAllowLocalNetworking = true; meta = { description = "Wrapper for libapreq2's module/handle API"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }; @@ -18890,7 +18890,7 @@ with self; }; meta = { description = "Portable l10n and i10n functions"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; }; }; @@ -18920,7 +18920,7 @@ with self; meta = { description = "Add paths relative to the current file to @INC"; homepage = "https://github.com/Grinnz/lib-relative"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -19090,7 +19090,7 @@ with self; ]; meta = { description = "Part-of-speech tagger for English natural language processing"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; }; }; @@ -19212,7 +19212,7 @@ with self; }; meta = { description = "Porters stemming algorithm for Denmark"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; }; }; @@ -19246,7 +19246,7 @@ with self; meta = { description = "Embed / expand oEmbed resources and other URL / links"; homepage = "https://github.com/jhthorsen/linkembedder"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = with maintainers; [ sgo ]; }; }; @@ -19283,7 +19283,7 @@ with self; meta = { description = "Fast parsing of the Linux desktop files"; homepage = "https://github.com/trizen/Linux-DesktopFiles"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -19376,7 +19376,7 @@ with self; meta = { description = "Combines List::Util, List::SomeUtils and List::UtilsBy in one bite-sized package"; homepage = "https://metacpan.org/release/List-AllUtils"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -19445,7 +19445,7 @@ with self; meta = { description = "Provide the stuff missing in List::Util in XS"; homepage = "https://metacpan.org/release/List-MoreUtils-XS"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }; @@ -19531,7 +19531,7 @@ with self; propagatedBuildInputs = [ LocaleMaketextLexicon ]; meta = { description = "PO file parser for Maketext"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -19573,7 +19573,7 @@ with self; }; meta = { description = "Maketext from already interpolated strings"; - license = with lib.licenses; [ cc0 ]; + license = lib.licenses.cc0; }; }; @@ -19587,7 +19587,7 @@ with self; meta = { description = "Use other catalog formats in Maketext"; homepage = "https://search.cpan.org/dist/Locale-Maketext-Lexicon"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "xgettext.pl"; }; }; @@ -19899,7 +19899,7 @@ with self; meta = { description = "Dispatches messages to one or more outputs"; homepage = "https://metacpan.org/release/Log-Dispatch"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -20023,7 +20023,7 @@ with self; }; meta = { description = "Provides a unified approach to tracing"; - license = with lib.licenses; [ gpl1Only ]; + license = lib.licenses.gpl1Only; }; }; @@ -20619,7 +20619,7 @@ with self; meta = { description = "Fast and simple mbox folder reader"; homepage = "https://github.com/coppit/mail-mbox-messageparser"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with maintainers; [ romildo ]; }; }; @@ -20719,7 +20719,7 @@ with self; }; meta = { description = "Perl extension for validating email addresses according to RFC822"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -20793,7 +20793,7 @@ with self; doCheck = false; # The main test performs network access meta = { description = "Object-oriented implementation of Sender Policy Framework"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; mainProgram = "spfquery"; }; }; @@ -20894,7 +20894,7 @@ with self; description = "Parse and evaluate mathematical expressions"; homepage = "https://github.com/Grinnz/Math-Calc-Parser"; broken = true; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = with maintainers; [ sgo ]; }; }; @@ -21019,7 +21019,7 @@ with self; }; meta = { description = "This module provides a few functions related to Fibonacci numbers"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -21038,7 +21038,7 @@ with self; env.NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp"; meta = { description = "High speed arbitrary size integer math"; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; }; }; @@ -21172,7 +21172,7 @@ with self; ]; meta = { description = "Points on a path through the 2-D plane"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; }; }; @@ -21289,7 +21289,7 @@ with self; propagatedBuildInputs = [ ObjectInsideOut ]; meta = { description = "Auto-seeded Mersenne Twister PRNGs"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; }; }; @@ -21312,7 +21312,7 @@ with self; meta = { description = "Cryptographically-secure, cross-platform replacement for rand()"; homepage = "https://github.com/frioux/Math-Random-Secure"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -21364,7 +21364,7 @@ with self; meta = { description = "Code shared by the MaxMind DB reader and writer modules"; homepage = "https://metacpan.org/release/MaxMind-DB-Common"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -21391,7 +21391,7 @@ with self; meta = { description = "Read MaxMind DB files and look up IP addresses"; homepage = "https://metacpan.org/release/MaxMind-DB-Reader"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -21417,7 +21417,7 @@ with self; meta = { description = "Fast XS implementation of MaxMind DB reader"; homepage = "https://metacpan.org/release/MaxMind-DB-Reader-XS"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -21711,7 +21711,7 @@ with self; homepage = "https://www.mhonarc.org/"; description = "Mail-to-HTML converter"; mainProgram = "mhonarc"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; }; }; @@ -21759,7 +21759,7 @@ with self; buildInputs = [ ProcWaitStat ]; meta = { description = "Construct and optionally mail MIME messages"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; }; # Nothing in mime-construct --help or mime-construct’s man page mentions # anything about mime-construct executing its arguments. @@ -21874,7 +21874,7 @@ with self; meta = { description = "High performance job queue for Perl"; homepage = "https://github.com/mojolicious/minion"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -21896,7 +21896,7 @@ with self; meta = { homepage = "https://github.com/Difegue/Minion-Backend-Redis"; description = "Redis backend for Minion job queue"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = with maintainers; [ tomasajt ]; }; }; @@ -21916,7 +21916,7 @@ with self; meta = { description = "SQLite backend for Minion job queue"; homepage = "https://github.com/Grinnz/Minion-Backend-SQLite"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -22393,7 +22393,7 @@ with self; meta = { description = "Loads one of several alternate underlying implementations for a module"; homepage = "https://metacpan.org/release/Module-Implementation"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -22741,7 +22741,7 @@ with self; buildInputs = [ IPCRun ]; meta = { description = "Module signature file manipulation"; - license = with lib.licenses; [ cc0 ]; + license = lib.licenses.cc0; mainProgram = "cpansign"; }; }; @@ -22806,7 +22806,7 @@ with self; meta = { description = "Minimalistic HTML/XML DOM parser with CSS selectors"; homepage = "https://github.com/Grinnz/Mojo-DOM58"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -22824,7 +22824,7 @@ with self; passthru.tests = nixosTests.mod_perl; meta = { description = "Embed a Perl interpreter in the Apache/2.x HTTP server"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; mainProgram = "mp2bug"; }; }; @@ -22839,7 +22839,7 @@ with self; meta = { description = "Real-time web framework"; homepage = "https://mojolicious.org"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = with maintainers; [ marcusramberg sgo @@ -22864,7 +22864,7 @@ with self; meta = { description = "Compress and convert css, less, sass, javascript and coffeescript files"; homepage = "https://github.com/jhthorsen/mojolicious-plugin-assetpack"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = with maintainers; [ sgo ]; }; }; @@ -22942,7 +22942,7 @@ with self; meta = { description = "OpenAPI / Swagger plugin for Mojolicious"; homepage = "https://github.com/jhthorsen/mojolicious-plugin-openapi"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -22983,7 +22983,7 @@ with self; meta = { description = "Mojolicious server status"; homepage = "https://mojolicious.org"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = [ maintainers.thoughtpolice ]; }; }; @@ -22999,7 +22999,7 @@ with self; meta = { description = "Plugin for enabling a Mojolicious app to log to syslog"; homepage = "https://github.com/jhthorsen/mojolicious-plugin-syslog"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -23020,7 +23020,7 @@ with self; meta = { homepage = "https://github.com/Grinnz/Mojolicious-Plugin-TemplateToolkit"; description = "Template Toolkit renderer plugin for Mojolicious"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = with maintainers; [ tomasajt ]; }; }; @@ -23036,7 +23036,7 @@ with self; meta = { description = "Render exceptions as text in command line user agents"; homepage = "https://github.com/marcusramberg/mojolicious-plugin-textexceptions"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -23055,7 +23055,7 @@ with self; meta = { description = "Mojolicious <3 Webpack"; homepage = "https://github.com/jhthorsen/mojolicious-plugin-webpack"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -23074,7 +23074,7 @@ with self; meta = { description = "Redis driver based on Mojo::IOLoop"; homepage = "https://github.com/jhthorsen/mojo-redis"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -23122,7 +23122,7 @@ with self; meta = { description = "Tiny Mojolicious wrapper for SQLite"; homepage = "https://github.com/Grinnz/Mojo-SQLite"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -23143,7 +23143,7 @@ with self; meta = { description = "Mojolicious and Async MySQL/MariaDB"; homepage = "https://github.com/jhthorsen/mojo-mysql"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -23160,7 +23160,7 @@ with self; meta = { description = "(DISCOURAGED) Promises/A+ and flow-control helpers"; homepage = "https://github.com/jberger/Mojo-IOLoop-Delay"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -23227,7 +23227,7 @@ with self; meta = { description = "Mojolicious ♥ PostgreSQL"; homepage = "https://mojolicious.org"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -23857,7 +23857,7 @@ with self; meta = { description = "PostgreSQL runner for tests"; homepage = "https://github.com/TJC/Test-postgresql"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -24246,7 +24246,7 @@ with self; meta = { description = "Mark overload code symbols as methods"; homepage = "https://metacpan.org/release/MooseX-MarkAsMethods"; - license = with lib.licenses; [ lgpl21Only ]; + license = lib.licenses.lgpl21Only; }; }; @@ -24441,7 +24441,7 @@ with self; propagatedBuildInputs = [ Moose ]; meta = { description = "Name your accessors foo() and set_foo()"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -24550,7 +24550,7 @@ with self; meta = { description = "Make your object constructors blow up on unknown attributes"; homepage = "https://metacpan.org/release/MooseX-StrictConstructor"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -24771,7 +24771,7 @@ with self; meta = { description = "Path::Tiny types and coercions for Moose"; homepage = "https://github.com/karenetheridge/moosex-types-path-tiny"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }; @@ -24804,7 +24804,7 @@ with self; meta = { description = "Moose type constraints for strings or string-like objects"; homepage = "https://github.com/dagolden/MooseX-Types-Stringlike"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }; @@ -24874,7 +24874,7 @@ with self; propagatedBuildInputs = [ AudioCuefileParser ]; meta = { description = "Split an MP3 file without gaps (based on pcutmp3)"; - license = with lib.licenses; [ artistic1 ]; + license = lib.licenses.artistic1; }; }; @@ -24912,7 +24912,7 @@ with self; outputs = [ "out" ]; meta = { description = "Module for reading tags of MP3 audio files"; - license = with lib.licenses; [ artistic1 ]; + license = lib.licenses.artistic1; }; }; @@ -24996,7 +24996,7 @@ with self; meta = { description = "Mozilla's CA cert bundle in PEM format"; homepage = "https://github.com/gisle/mozilla-ca"; - license = with lib.licenses; [ mpl20 ]; + license = lib.licenses.mpl20; }; }; @@ -25061,7 +25061,7 @@ with self; propagatedBuildInputs = [ pkgs.libdiscid ]; meta = { description = "- Perl interface for the MusicBrainz libdiscid library"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -25228,7 +25228,7 @@ with self; meta = { description = "Lookup the username on the remote end of a TCP/IP connection"; homepage = "https://github.com/toddr/Net-Ident"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -25322,7 +25322,7 @@ with self; doCheck = false; # wants network meta = { description = "Amazon Mechanical Turk SDK for Perl"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }; @@ -25661,7 +25661,7 @@ with self; makeMakerFlags = [ "--noonline-tests" ]; meta = { description = "Perl Interface to the Domain Name System"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -25734,7 +25734,7 @@ with self; preCheck = "rm t/13-gethostsubs.t"; # it performs DNS queries meta = { description = "Base framework for frame crafting"; - license = with lib.licenses; [ artistic1 ]; + license = lib.licenses.artistic1; }; }; @@ -25748,7 +25748,7 @@ with self; propagatedBuildInputs = [ NetFrame ]; meta = { description = "Internet Protocol v6 layer object"; - license = with lib.licenses; [ artistic1 ]; + license = lib.licenses.artistic1; }; }; @@ -25778,7 +25778,7 @@ with self; ]; meta = { description = "OOP Interface to FreeDB Server(s)"; - license = with lib.licenses; [ artistic1 ]; + license = lib.licenses.artistic1; broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.NetFreeDB.x86_64-darwin }; }; @@ -25957,7 +25957,7 @@ with self; meta = { homepage = "https://github.com/tomhrr/p5-Net-IP-XS"; description = "IPv4/IPv6 address library"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; }; }; @@ -26071,7 +26071,7 @@ with self; meta = { description = "Communicate with an MPD server"; homepage = "https://metacpan.org/pod/Net::MPD"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -26151,7 +26151,7 @@ with self; ]; meta = { description = "Patricia Trie perl module for fast IP address lookups"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; }; }; @@ -26296,7 +26296,7 @@ with self; ]; meta = { description = "Co-operative multithreaded server using Coro"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -26522,7 +26522,7 @@ with self; ''; meta = { description = "Perl bindings for OpenSSL and LibreSSL"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -26899,7 +26899,7 @@ with self; doCheck = false; meta = { description = "Access Ogg Vorbis info and comment fields"; - license = with lib.licenses; [ artistic1 ]; + license = lib.licenses.artistic1; }; }; @@ -26946,7 +26946,7 @@ with self; meta = { description = "Client for talking to an Open API powered server"; homepage = "https://github.com/jhthorsen/openapi-client"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -27007,7 +27007,7 @@ with self; ]; meta = { description = "Perl Open OpenDocument Connector"; - license = with lib.licenses; [ lgpl21Only ]; + license = lib.licenses.lgpl21Only; maintainers = [ maintainers.wentasah ]; }; }; @@ -27097,7 +27097,7 @@ with self; meta = { description = "Perl extension for Apache ZooKeeper"; homepage = "https://github.com/mark-5/p5-net-zookeeper"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ de11n despsyched @@ -27179,7 +27179,7 @@ with self; meta = { description = "Manage deprecation warnings for your distribution"; homepage = "https://metacpan.org/release/Package-DeprecationManager"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -27192,7 +27192,7 @@ with self; }; meta = { description = "Utilities to read and manipulate patches and CVS"; - license = with lib.licenses; [ artistic1 ]; + license = lib.licenses.artistic1; }; }; @@ -27291,7 +27291,7 @@ with self; meta = { description = "Layout and render international text"; homepage = "https://gtk2-perl.sourceforge.net"; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; }; }; @@ -27426,7 +27426,7 @@ with self; meta = { description = "Validate method/function parameters"; homepage = "https://metacpan.org/release/Params-Validate"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -27450,7 +27450,7 @@ with self; meta = { description = "Build an optimized subroutine parameter validator once, use it forever"; homepage = "https://metacpan.org/release/Params-ValidationCompiler"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -27815,7 +27815,7 @@ with self; meta = { description = "Iterative, recursive file finder"; homepage = "https://github.com/dagolden/Path-Iterator-Rule"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }; @@ -27836,7 +27836,7 @@ with self; meta = { description = "File path utility"; homepage = "https://github.com/dagolden/Path-Tiny"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }; @@ -27871,7 +27871,7 @@ with self; meta = { description = "Minimalist PBKDF2 (RFC 2898) with HMAC-SHA1 or HMAC-SHA2"; homepage = "https://github.com/dagolden/PBKDF2-Tiny"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = [ maintainers.sgo ]; }; }; @@ -27890,7 +27890,7 @@ with self; propagatedBuildInputs = [ FontTTF ]; meta = { description = "Create, modify, and examine PDF files"; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; }; }; @@ -27909,7 +27909,7 @@ with self; meta = { description = "Facilitates the creation and modification of PDF files"; homepage = "https://metacpan.org/pod/PDF::Builder"; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; }; }; @@ -28087,7 +28087,7 @@ with self; meta = { description = "Community-inspired Perl::Critic policies"; homepage = "https://github.com/Grinnz/Perl-Critic-Community"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -28106,7 +28106,7 @@ with self; meta = { description = "Policies for Perl::Critic concerned with using Moose"; homepage = "https://metacpan.org/release/Perl-Critic-Moose"; - license = with lib.licenses; [ artistic1 ]; + license = lib.licenses.artistic1; }; }; @@ -28159,7 +28159,7 @@ with self; meta = { description = "Some add-on policies for Perl::Critic"; homepage = "https://user42.tuxfamily.org/perl-critic-pulp/index.html"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; }; }; @@ -28373,7 +28373,7 @@ with self; ''; meta = { description = "Objected-oriented Perl interface to ImageMagick. Use it to read, manipulate, or write an image or image sequence from within a Perl script"; - license = with lib.licenses; [ imagemagick ]; + license = lib.licenses.imagemagick; }; }; @@ -28386,7 +28386,7 @@ with self; }; meta = { description = "Indent and reformat perl scripts"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "perltidy"; }; }; @@ -28804,7 +28804,7 @@ with self; meta = { description = "Determine minimum Perl version of POD directives"; homepage = "https://user42.tuxfamily.org/pod-minimumversion/index.html"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "pod-minimumversion"; }; }; @@ -29003,7 +29003,7 @@ with self; }; meta = { description = "Pattern-based Perl Recognizer"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = [ maintainers.artturin ]; }; }; @@ -29034,7 +29034,7 @@ with self; }; meta = { description = "Perl extension to access the unix process table"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -29238,7 +29238,7 @@ with self; meta = { description = "Optimized pure-perl Redis protocol parser/encoder"; homepage = "https://github.com/Grinnz/Protocol-Redis-Faster"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -29294,7 +29294,7 @@ with self; }; meta = { description = "Perl Web Server Gateway Interface Specification"; - license = with lib.licenses; [ cc-by-sa-25 ]; + license = lib.licenses.cc-by-sa-25; }; }; @@ -29616,7 +29616,7 @@ with self; }; meta = { description = "Modules for parsing/translating POD format documents"; - license = with lib.licenses; [ artistic1 ]; + license = lib.licenses.artistic1; mainProgram = "podselect"; }; }; @@ -29738,7 +29738,7 @@ with self; meta = { description = "Check POD L<> link references"; homepage = "https://user42.tuxfamily.org/podlinkcheck/index.html"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; }; }; @@ -29869,7 +29869,7 @@ with self; meta = { description = "Formatter for spellchecking Pod"; homepage = "https://github.com/perl-pod/Pod-Spell"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; mainProgram = "podspell"; }; }; @@ -30068,7 +30068,7 @@ with self; meta = { description = "Facility for creating read-only scalars, arrays, hashes"; homepage = "https://github.com/sanko/readonly"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -30086,7 +30086,7 @@ with self; meta = { description = "Faster facility for creating read-only scalars, arrays, hashes"; homepage = "https://github.com/sanko/readonly"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -30129,7 +30129,7 @@ with self; meta = { description = "Perl binding for Redis database"; homepage = "https://github.com/PerlRedis/perl-redis"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -30142,7 +30142,7 @@ with self; }; meta = { description = "Utility functions for checking references"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -30171,7 +30171,7 @@ with self; }; meta = { description = "Provide commonly requested regular expressions"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -30895,7 +30895,7 @@ with self; }; meta = { description = "Unordered collections (sets) of Perl Objects"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -30942,7 +30942,7 @@ with self; }; meta = { description = "Library for parsing the output from SGMLS and NSGMLS parsers"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "sgmlspl.pl"; }; }; @@ -31042,7 +31042,7 @@ with self; ''; meta = { description = "IPv6 related part of the C socket.h defines and structure manipulators"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; }; }; @@ -31103,7 +31103,7 @@ with self; meta = { description = "Software::License pack for Creative Commons' licenses"; homepage = "https://github.com/SineSwiper/Software-License-CCpack"; - license = with lib.licenses; [ lgpl3Plus ]; + license = lib.licenses.lgpl3Plus; }; }; @@ -31162,7 +31162,7 @@ with self; meta = { description = "Type constraints and coercions for Perl"; homepage = "https://metacpan.org/release/Specio"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -31184,7 +31184,7 @@ with self; meta = { description = "Path::Tiny types and coercions for Specio"; homepage = "https://metacpan.org/release/Specio-Library-Path-Tiny"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }; @@ -31381,7 +31381,7 @@ with self; meta = { description = "PostgreSQL features for SQL::Abstract"; homepage = "https://mojolicious.org"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -31602,7 +31602,7 @@ with self; propagatedBuildInputs = [ NumberFormat ]; meta = { description = "Collection of very basic statistics modules"; - license = with lib.licenses; [ lgpl2Only ]; + license = lib.licenses.lgpl2Only; }; }; @@ -31799,7 +31799,7 @@ with self; }; meta = { description = "Perl interface for cyclic redundancy check generation"; - license = with lib.licenses; [ publicDomain ]; + license = lib.licenses.publicDomain; }; }; @@ -31905,7 +31905,7 @@ with self; }; meta = { description = "Sprintf-like string formatting capabilities with arbitrary format definitions"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; }; }; @@ -31919,7 +31919,7 @@ with self; propagatedBuildInputs = [ SubExporter ]; meta = { description = "Build sprintf-like functions of your own"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; }; }; @@ -31933,7 +31933,7 @@ with self; meta = { # https://metacpan.org/pod/String::Interpolate description = "String::Interpolate - Wrapper for builtin the Perl interpolation engine"; - license = with lib.licenses; [ gpl1Plus ]; + license = lib.licenses.gpl1Plus; }; propagatedBuildInputs = [ PadWalker @@ -32037,7 +32037,7 @@ with self; doCheck = true; meta = { description = "Calculate the similarity of two strings"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; }; }; @@ -32644,7 +32644,7 @@ with self; meta = { description = "Use mmap to map in a file as a Perl variable"; maintainers = with maintainers; [ peterhoeg ]; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; }; }; @@ -32657,7 +32657,7 @@ with self; }; meta = { description = "Memory information"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = [ maintainers.pSub ]; }; }; @@ -32888,7 +32888,7 @@ with self; meta = { description = "Install the CPAN dependencies of the Freecell Solver test suite"; homepage = "https://metacpan.org/release/Task-FreecellSolver-Testing"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -32955,7 +32955,7 @@ with self; meta = { description = "Specifications for installing all the Test::Run"; homepage = "https://web-cpan.shlomifish.org/modules/Test-Run"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -33124,7 +33124,7 @@ with self; ]; meta = { description = "Adds a .json vmethod and a json filter"; - license = with lib.licenses; [ bsd0 ]; + license = lib.licenses.bsd0; }; }; @@ -33430,7 +33430,7 @@ with self; }; meta = { description = "Fully-featured shell-like command line environment"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -33529,7 +33529,7 @@ with self; }; meta = { description = "Class to emulate a DEC VT102 terminal"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -33659,7 +33659,7 @@ with self; meta = { description = "Fail if tests warn"; homepage = "https://metacpan.org/release/Test2-Plugin-NoWarnings"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -33793,7 +33793,7 @@ with self; ''; meta = { description = "Simple set of building blocks for both unit and runtime testing"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; }; }; @@ -33852,7 +33852,7 @@ with self; meta = { description = "Provides a bits_is() subroutine for testing binary data"; homepage = "https://metacpan.org/release/Test-Bits"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -34020,7 +34020,7 @@ with self; }; meta = { description = "Validate your CPAN META.json files"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -34034,7 +34034,7 @@ with self; propagatedBuildInputs = [ JSON ]; meta = { description = "Validate your CPAN META.json files"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -34055,7 +34055,7 @@ with self; meta = { description = "Split data-driven tests into several test scripts"; homepage = "https://metacpan.org/release/Test-Data-Split"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -34280,7 +34280,7 @@ with self; meta = { description = "Add test failures if warnings are caught"; homepage = "https://github.com/dagolden/Test-FailWarnings"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }; @@ -34341,7 +34341,7 @@ with self; meta = { description = "Test file attributes"; homepage = "https://github.com/briandfoy/test-file"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -34398,7 +34398,7 @@ with self; meta = { description = "Portable filename comparison"; homepage = "https://metacpan.org/release/Test-Filename"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }; @@ -34688,7 +34688,7 @@ with self; ]; meta = { description = "Verifies code hasn't left circular references"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -34745,7 +34745,7 @@ with self; ]; meta = { description = "Simulating other classes"; - license = with lib.licenses; [ lgpl2Plus ]; + license = lib.licenses.lgpl2Plus; }; }; @@ -35018,7 +35018,7 @@ with self; }; meta = { description = "Make sure you didn't emit any warnings while testing"; - license = with lib.licenses; [ lgpl21Only ]; + license = lib.licenses.lgpl21Only; }; }; @@ -35048,7 +35048,7 @@ with self; propagatedBuildInputs = [ CaptureTiny ]; meta = { description = "Utilities to test STDOUT and STDERR messages"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -35154,7 +35154,7 @@ with self; propagatedBuildInputs = [ PodCoverage ]; meta = { description = "Check for pod coverage in your distribution"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -35309,7 +35309,7 @@ with self; buildInputs = [ CaptureTiny ]; meta = { description = "Composable, reusable tests with roles and Moo"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }; @@ -35356,7 +35356,7 @@ with self; meta = { description = "Base class to run standard TAP scripts"; homepage = "https://web-cpan.shlomifish.org/modules/Test-Run"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -35380,7 +35380,7 @@ with self; meta = { description = "Analyze tests from the command line using Test::Run"; homepage = "http://web-cpan.berlios.de/modules/Test-Run"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "runprove"; }; }; @@ -35402,7 +35402,7 @@ with self; meta = { description = "Define different interpreters for different test scripts with Test::Run"; homepage = "https://web-cpan.shlomifish.org/modules/Test-Run"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -35423,7 +35423,7 @@ with self; meta = { description = "Stop processing the entire test suite"; homepage = "https://web-cpan.shlomifish.org/modules/Test-Run"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -35445,7 +35445,7 @@ with self; meta = { description = "Make the file verdict ('ok', 'NOT OK')"; homepage = "https://web-cpan.shlomifish.org/modules/Test-Run"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -35466,7 +35466,7 @@ with self; meta = { description = "Test::Run plugin that"; homepage = "https://web-cpan.shlomifish.org/modules/Test-Run"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -35487,7 +35487,7 @@ with self; meta = { description = "Trim the first components"; homepage = "https://web-cpan.shlomifish.org/modules/Test-Run"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -35503,7 +35503,7 @@ with self; meta = { description = "Tests that an external program is valgrind-clean"; homepage = "https://metacpan.org/release/Test-RunValgrind"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -35581,7 +35581,7 @@ with self; propagatedBuildInputs = [ TextDiff ]; meta = { description = "Test against data stored in automatically-named file"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -35687,7 +35687,7 @@ with self; meta = { description = "Temporary directories that stick around when tests fail"; homepage = "https://github.com/dagolden/Test-TempDir-Tiny"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }; @@ -35776,7 +35776,7 @@ with self; meta = { description = "Test for trailing space in source files"; homepage = "https://metacpan.org/release/Test-TrailingSpace"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -35886,7 +35886,7 @@ with self; meta = { description = "Testing-specific WWW::Mechanize subclass"; homepage = "https://github.com/libwww-perl/WWW-Mechanize"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -36011,7 +36011,7 @@ with self; meta = { description = "Module to align text"; homepage = "https://metacpan.org/release/Text-Aligner"; - license = with lib.licenses; [ isc ]; + license = lib.licenses.isc; }; }; @@ -36342,7 +36342,7 @@ with self; meta = { description = "Test environment setup for development with IDE"; homepage = "https://github.com/wchristian/Test-InDistDir"; - license = with lib.licenses; [ wtfpl ]; + license = lib.licenses.wtfpl; maintainers = [ maintainers.sgo ]; }; }; @@ -36433,7 +36433,7 @@ with self; meta = { description = "Interact with a t/test_manifest file"; homepage = "https://github.com/briandfoy/test-manifest"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -36451,7 +36451,7 @@ with self; ]; meta = { description = "Convert Markdown syntax to (X)HTML"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; mainProgram = "Markdown.pl"; }; }; @@ -36525,7 +36525,7 @@ with self; ]; meta = { description = "Convert MultiMarkdown syntax to (X)HTML"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; mainProgram = "MultiMarkdown.pl"; }; }; @@ -36540,7 +36540,7 @@ with self; meta = { description = "Compare the difference between numbers against a given tolerance"; homepage = "https://github.com/dagolden/Test-Number-Delta"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }; @@ -36586,7 +36586,7 @@ with self; propagatedBuildInputs = [ TextDiff ]; meta = { description = "Patches text with given patch"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; }; }; @@ -36645,7 +36645,7 @@ with self; buildInputs = [ TestException ]; meta = { description = "Read record-oriented files"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; }; }; @@ -36708,7 +36708,7 @@ with self; propagatedBuildInputs = [ UnicodeLineBreak ]; meta = { description = "Simple eyecandy ASCII tables"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -36739,7 +36739,7 @@ with self; meta = { description = "Sprintf-like function with named conversions"; homepage = "https://metacpan.org/release/Text-Sprintf-Named"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -36754,7 +36754,7 @@ with self; meta = { description = "Organize Data in Tables"; homepage = "https://metacpan.org/release/Text-Table"; - license = with lib.licenses; [ isc ]; + license = lib.licenses.isc; }; }; @@ -36767,7 +36767,7 @@ with self; }; meta = { description = "Display text in formatted table output"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; }; }; @@ -36841,7 +36841,7 @@ with self; propagatedBuildInputs = [ FileFindRulePerl ]; meta = { description = "Check to see that version's in modules are sane"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -36883,7 +36883,7 @@ with self; env.NIX_CFLAGS_COMPILE = "-DHAS_VPRINTF"; meta = { description = "Remove accents from a string"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TextUnaccent.x86_64-darwin }; }; @@ -36930,7 +36930,7 @@ with self; }; meta = { description = "Extract collocations and Ngrams from text"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = [ maintainers.bzizou ]; }; }; @@ -37079,7 +37079,7 @@ with self; propagatedBuildInputs = [ TieCacheLRU ]; meta = { description = "Extends Tie::Cache::LRU with expiring"; - license = with lib.licenses; [ artistic1 ]; + license = lib.licenses.artistic1; }; }; @@ -37093,7 +37093,7 @@ with self; meta = { description = "Cycle through a list of values via a scalar"; homepage = "https://github.com/briandfoy/tie-cycle"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -37161,7 +37161,7 @@ with self; meta = { description = "Tied handle that hides the beginning of a file"; homepage = "https://github.com/dagolden/tie-handle-offset"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }; @@ -37191,7 +37191,7 @@ with self; }; meta = { description = "Tied hash with specific methods overriden by callbacks"; - license = with lib.licenses; [ artistic1 ]; + license = lib.licenses.artistic1; }; }; @@ -37220,7 +37220,7 @@ with self; }; meta = { description = "Use regular expressions as hash keys"; - license = with lib.licenses; [ artistic1 ]; + license = lib.licenses.artistic1; }; }; @@ -37395,7 +37395,7 @@ with self; doCheck = false; meta = { description = "Parse and format time values"; - license = with lib.licenses; [ publicDomain ]; + license = lib.licenses.publicDomain; }; }; @@ -37477,7 +37477,7 @@ with self; doCheck = false; # Expects working X11. meta = { description = "Tk - a Graphical User Interface Toolkit"; - license = with lib.licenses; [ tcltk ]; + license = lib.licenses.tcltk; }; }; @@ -37569,7 +37569,7 @@ with self; meta = { description = "Minimal try/catch with proper preservation of $@"; homepage = "https://github.com/p5sagit/Try-Tiny"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -37917,7 +37917,7 @@ with self; meta = { description = "Build a URI from a set of named parameters"; homepage = "https://metacpan.org/release/URI-FromHash"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; }; }; @@ -38130,7 +38130,7 @@ with self; meta = { description = "UUIDs based on /dev/urandom or the Windows Crypto API"; homepage = "https://github.com/dagolden/UUID-URandom"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }; @@ -38250,7 +38250,7 @@ with self; meta = { description = "W3C Link Checker"; homepage = "https://validator.w3.org/checklink"; - license = with lib.licenses; [ w3c ]; + license = lib.licenses.w3c; mainProgram = "checklink"; }; }; @@ -38305,7 +38305,7 @@ with self; doCheck = false; # performs network access meta = { description = "Perl extension interface for libcurl"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -38641,7 +38641,7 @@ with self; doCheck = false; # requires an X server meta = { description = "Provides GUI testing/interaction routines"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; }; }; @@ -38734,7 +38734,7 @@ with self; meta = { description = "Bindings allowing Xapian to be used from Perl"; homepage = "https://xapian.org"; - license = [ lib.licenses.gpl2Plus ]; + license = lib.licenses.gpl2Plus; }; }; @@ -38803,7 +38803,7 @@ with self; ]; meta = { description = "Interface to XML::DOM toolset"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; }; }; @@ -38911,7 +38911,7 @@ with self; propagatedBuildInputs = [ libxml_perl ]; meta = { description = "Yet another Perl SAX XML Writer"; - license = with lib.licenses; [ gpl1Only ]; + license = lib.licenses.gpl1Only; mainProgram = "xmlpretty"; }; }; @@ -38994,7 +38994,7 @@ with self; }; meta = { description = "Perl implementation of the XML::Mini XML create/parse interface"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; }; }; @@ -39071,7 +39071,7 @@ with self; propagatedBuildInputs = [ XMLParser ]; meta = { description = "Parse and evaluate XPath statements"; - license = with lib.licenses; [ artistic2 ]; + license = lib.licenses.artistic2; mainProgram = "xpath"; }; }; @@ -39101,7 +39101,7 @@ with self; }; meta = { description = "Regular expressions for XML tokens"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; }; }; @@ -39369,7 +39369,7 @@ with self; }; meta = { description = "Module for creating a XML document object oriented with on the fly validating towards the given DTD"; - license = with lib.licenses; [ gpl1Only ]; + license = lib.licenses.gpl1Only; }; }; @@ -39507,7 +39507,7 @@ with self; meta = { description = "Fast, lightweight YAML loader and dumper"; homepage = "https://github.com/toddr/YAML-Syck"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }; @@ -39728,7 +39728,7 @@ with self; meta = { description = "Run Zonemaster tests from the command line"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ qbit ]; }; }; @@ -39773,7 +39773,7 @@ with self; meta = { description = "Tool to check the quality of a DNS zone"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; }; }; @@ -39805,7 +39805,7 @@ with self; ]; meta = { description = "Perl wrapper for the ldns DNS library"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; }; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b31b710d2c97..320f17c28d3f 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -87,6 +87,7 @@ mapAliases { amazon_kclpy = throw "'amazon_kclpy' has been renamed to/replaced by 'amazon-kclpy'"; # Converted to throw 2025-10-29 amqplib = throw "amqplib has been removed as it was unmaintained upstream"; # Added 2025-11-22 ancp-bids = ancpbids; # added 2026-06-18 + ansible-vault-rw = ansible-vault; # Added 2026-07-10 ansiconv = throw "ansiconv has been removed because it was archived upstream"; # Added 2026-01-14 ansiwrap = throw "ansiwrap has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03 apkit = throw "apkit was removed because it is unmaintained upstream and different from apkit on PyPI"; # added 2025-09-13 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 89d5536817eb..9fce50446f0e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -208,6 +208,8 @@ self: super: with self; { aio-pika = callPackage ../development/python-modules/aio-pika { }; + aio-wattwaechter = callPackage ../development/python-modules/aio-wattwaechter { }; + aioacaia = callPackage ../development/python-modules/aioacaia { }; aioairctrl = callPackage ../development/python-modules/aioairctrl { }; @@ -422,6 +424,8 @@ self: super: with self; { aiomealie = callPackage ../development/python-modules/aiomealie { }; + aiomelcloudhome = callPackage ../development/python-modules/aiomelcloudhome { }; + aiomisc = callPackage ../development/python-modules/aiomisc { }; aiomisc-pytest = callPackage ../development/python-modules/aiomisc-pytest { }; @@ -1139,7 +1143,7 @@ self: super: with self; { ansible-runner = callPackage ../development/python-modules/ansible-runner { }; - ansible-vault-rw = callPackage ../development/python-modules/ansible-vault-rw { }; + ansible-vault = callPackage ../development/python-modules/ansible-vault { }; ansicolor = callPackage ../development/python-modules/ansicolor { }; @@ -5425,6 +5429,8 @@ self: super: with self; { encutils = callPackage ../development/python-modules/encutils { }; + energieleser = callPackage ../development/python-modules/energieleser { }; + energyflip-client = callPackage ../development/python-modules/energyflip-client { }; energyflow = callPackage ../development/python-modules/energyflow { }; @@ -14474,6 +14480,8 @@ self: super: with self; { pyenphase = callPackage ../development/python-modules/pyenphase { }; + pyenvertechevt800 = callPackage ../development/python-modules/pyenvertechevt800 { }; + pyenvisalink = callPackage ../development/python-modules/pyenvisalink { }; pyephember2 = callPackage ../development/python-modules/pyephember2 { }; @@ -14702,6 +14710,8 @@ self: super: with self; { pyheck = callPackage ../development/python-modules/pyheck { }; + pyhelty = callPackage ../development/python-modules/pyhelty { }; + pyheos = callPackage ../development/python-modules/pyheos { }; pyhepmc = callPackage ../development/python-modules/pyhepmc { }; @@ -14742,6 +14752,8 @@ self: super: with self; { pyimgbox = callPackage ../development/python-modules/pyimgbox { }; + pyimouapi = callPackage ../development/python-modules/pyimouapi { }; + pyimpfuzzy = callPackage ../development/python-modules/pyimpfuzzy { inherit (pkgs) ssdeep; }; pyindego = callPackage ../development/python-modules/pyindego { }; @@ -14792,6 +14804,8 @@ self: super: with self; { pyitachip2ir = callPackage ../development/python-modules/pyitachip2ir { }; + pyitachip2ir2 = callPackage ../development/python-modules/pyitachip2ir2 { }; + pyituran = callPackage ../development/python-modules/pyituran { }; pyixapi = callPackage ../development/python-modules/pyixapi { };