diff options
Diffstat (limited to 'pkgs')
134 files changed, 514 insertions, 346 deletions
diff --git a/pkgs/applications/audio/cider/default.nix b/pkgs/applications/audio/cider/default.nix index 96f0ab0f706a..315fa2c9a65b 100644 --- a/pkgs/applications/audio/cider/default.nix +++ b/pkgs/applications/audio/cider/default.nix @@ -23,7 +23,7 @@ appimageTools.wrapType2 rec { meta = with lib; { description = "A new look into listening and enjoying Apple Music in style and performance."; homepage = "https://github.com/ciderapp/Cider"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = [ maintainers.cigrainger ]; platforms = [ "x86_64-linux" ]; mainProgram = "cider"; diff --git a/pkgs/applications/audio/psst/default.nix b/pkgs/applications/audio/psst/default.nix index 46958b01bd1c..7abb8e78d161 100644 --- a/pkgs/applications/audio/psst/default.nix +++ b/pkgs/applications/audio/psst/default.nix @@ -16,7 +16,7 @@ let in rustPlatform.buildRustPackage rec { pname = "psst"; - version = "unstable-2024-03-04"; + version = "unstable-2024-02-11"; src = fetchFromGitHub { owner = "jpochyla"; diff --git a/pkgs/applications/audio/psst/update.sh b/pkgs/applications/audio/psst/update.sh index a504b61c2410..4ffa9417f040 100755 --- a/pkgs/applications/audio/psst/update.sh +++ b/pkgs/applications/audio/psst/update.sh @@ -24,7 +24,9 @@ if [ -z "$rev" ]; then rev="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/jpochyla/psst/commits?per_page=1" | jq -r '.[0].sha')" fi -version="unstable-$(date +%F)" +date="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/jpochyla/psst/commits/$rev" | jq -r '.commit.author.date' | cut -dT -f1)" + +version="unstable-$date" # Sources src_hash=$(nix-prefetch-github jpochyla psst --rev "$rev" | jq -r .hash) diff --git a/pkgs/applications/backup/urbackup-client/default.nix b/pkgs/applications/backup/urbackup-client/default.nix index ed5f59e2c41c..3e6158f69ab5 100644 --- a/pkgs/applications/backup/urbackup-client/default.nix +++ b/pkgs/applications/backup/urbackup-client/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "An easy to setup Open Source client/server backup system"; longDescription = "An easy to setup Open Source client/server backup system, that through a combination of image and file backups accomplishes both data safety and a fast restoration time"; homepage = "https://www.urbackup.org/index.html"; - license = licenses.agpl3; + license = licenses.agpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.mgttlinger ]; }; diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index e3348ceebfd7..8d535f6f5534 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { end-to-end encryption, powerful extensions, and open-source applications. ''; homepage = "https://standardnotes.org"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ mgregoire chuangzhu squalus ]; sourceProvenance = [ sourceTypes.binaryNativeCode ]; platforms = builtins.attrNames srcjson.deb; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3c0fb90c74cd..f2e3deb90e1a 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -102,6 +102,23 @@ let }; }; + "42crunch".vscode-openapi = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "42Crunch"; + name = "vscode-openapi"; + version = "4.25.1"; + sha256 = "+hKQUJp9c0oyhePFmQEXAqtqKL3fkQ1nhopUPnhRZc4="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/42Crunch.vscode-openapi/changelog"; + description = "A Visual Studio Code extension with rich support for the OpenAPI Specification (OAS)."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=42Crunch.vscode-openapi"; + homepage = "https://github.com/42Crunch/vscode-openapi"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.benhiemer ]; + }; + }; + a5huynh.vscode-ron = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-ron"; @@ -1576,8 +1593,8 @@ let mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "10.1.0"; - sha256 = "sha256-SQuf15Jq84MKBVqK6UviK04uo7gQw9yuw/WEBEXcQAc="; + version = "10.3.0"; + sha256 = "sha256-Oc46dxOI+55Y6hiJe0zTakdTM1sikcF7ISWkkVlaO1c="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; @@ -1743,8 +1760,8 @@ let mktplcRef = { name = "shell-format"; publisher = "foxundermoon"; - version = "7.1.0"; - sha256 = "09z72mdr5bfdcb67xyzlv7lb9vyjlc3k9ackj4jgixfk40c68cnj"; + version = "7.2.5"; + sha256 = "sha256-kfpRByJDcGY3W9+ELBzDOUMl06D/vyPlN//wPgQhByk="; }; nativeBuildInputs = [ jq moreutils ]; @@ -2216,8 +2233,8 @@ let mktplcRef = { name = "Ionide-fsharp"; publisher = "Ionide"; - version = "7.17.0"; - sha256 = "sha256-CC6ySeuO61O/mAkQYGoK/1cd4hlyS0vG+Lqv0HQ7K6c="; + version = "7.18.2"; + sha256 = "sha256-CEeTLiZktp5YzCRxDXa+s8W9N971iQla/FyCr8Co0SQ="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog"; @@ -3042,8 +3059,8 @@ let mktplcRef = { name = "remote-containers"; publisher = "ms-vscode-remote"; - version = "0.305.0"; - sha256 = "sha256-srSRD/wgDbQo9P1uJk8YtcXPZO62keG5kRnp1TmHqOc="; + version = "0.347.0"; + sha256 = "sha256-E9H1nPWG5JuzBxbYc/yWd8Y3azEWrd9whGirl0GK7kU="; }; meta = { description = "Open any folder or repository inside a Docker container."; @@ -3058,6 +3075,23 @@ let ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { }; + mshr-h.veriloghdl = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "veriloghdl"; + publisher = "mshr-h"; + version = "1.13.2"; + sha256 = "sha256-MOU8zf2qS7P2pQ29w3mvhDc2OvZiH4HNe530BjIiRAA="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/mshr-h.VerilogHDL/changelog"; + description = "A Visual Studio Code extension for supporting Verilog-HDL, SystemVerilog, Bluespec and SystemVerilog"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=mshr-h.VerilogHDL"; + homepage = "https://github.com/mshr-h/vscode-verilog-hdl-support"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.newam ]; + }; + }; + mskelton.one-dark-theme = buildVscodeMarketplaceExtension { mktplcRef = { name = "one-dark-theme"; @@ -3757,6 +3791,23 @@ let }; }; + smcpeak.default-keys-windows = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "default-keys-windows"; + publisher = "smcpeak"; + version = "0.0.10"; + sha256 = "sha256-v1JY5ZGWOfF14H235Y9CLlPwIvmNwCeRhIkdmcgCCFU="; + }; + meta = { + changelog = "https://github.com/smcpeak/vscode-default-keys-windows/blob/master/CHANGELOG.md"; + description = "VSCode extension that provides default Windows keybindings on any platform"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=smcpeak.default-keys-windows"; + homepage = "https://github.com/smcpeak/vscode-default-keys-windows"; + license = lib.licenses.mit; + maintainers = [ ]; + }; + }; + sonarsource.sonarlint-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "sonarlint-vscode"; 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 c6ad1dc42bf5..ad7fd06cb020 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix @@ -39,15 +39,17 @@ let ]; postFixup = '' - mkdir -p $out/share + mkdir -p $out/share/{adapter,formatters} # codelldb expects libcodelldb.so to be in the same # directory as the executable, and can't find it in $out/lib. # To make codelldb executable as a standalone, # we put all files in $out/share, and then wrap the binary in $out/bin. - mv $out/bin/* $out/share - cp $out/lib/* $out/share - ln -s ${lldb.lib} $out/lldb - makeWrapper $out/share/codelldb $out/bin/codelldb \ + mv $out/bin/* $out/share/adapter + cp $out/lib/* $out/share/adapter + cp -r adapter/scripts $out/share/adapter + cp -t $out/share/formatters formatters/*.py + ln -s ${lldb.lib} $out/share/lldb + makeWrapper $out/share/adapter/codelldb $out/bin/codelldb \ --set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server" ''; @@ -125,12 +127,9 @@ in stdenv.mkDerivation { mkdir -p $ext/{adapter,formatters} mv -t $ext vsix-extracted/extension/* - cp -t $ext/adapter ${adapter}/share/* - cp -r ../adapter/scripts $ext/adapter + cp -t $ext/ -r ${adapter}/share/* wrapProgram $ext/adapter/codelldb \ --set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server" - cp -t $ext/formatters ../formatters/*.py - ln -s ${lldb.lib} $ext/lldb # Mark that all components are installed. touch $ext/platform.ok diff --git a/pkgs/applications/graphics/pikopixel/default.nix b/pkgs/applications/graphics/pikopixel/default.nix index 586870527508..c65353143368 100644 --- a/pkgs/applications/graphics/pikopixel/default.nix +++ b/pkgs/applications/graphics/pikopixel/default.nix @@ -42,7 +42,7 @@ clangStdenv.mkDerivation rec { mainProgram = "PikoPixel"; homepage = "https://twilightedge.com/mac/pikopixel/"; downloadPage = "https://twilightedge.com/mac/pikopixel/"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix index 60559768994e..f58283564c13 100644 --- a/pkgs/applications/misc/bambu-studio/default.nix +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -169,7 +169,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PC Software for BambuLab's 3D printers"; homepage = "https://github.com/bambulab/BambuStudio"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ zhaofengli ]; mainProgram = "bambu-studio"; platforms = platforms.linux; diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix index 95d3a2aa9333..12f7920d3bf7 100644 --- a/pkgs/applications/misc/cura/plugins.nix +++ b/pkgs/applications/misc/cura/plugins.nix @@ -27,7 +27,7 @@ let meta = with lib; { description = "Enables printing directly to OctoPrint and monitoring the process"; homepage = "https://github.com/fieldOfView/Cura-OctoPrintPlugin"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ gebner ]; }; }; diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/applications/misc/curaengine/stable.nix index 27b180da7309..0de7e18f172d 100644 --- a/pkgs/applications/misc/curaengine/stable.nix +++ b/pkgs/applications/misc/curaengine/stable.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Engine for processing 3D models into 3D printing instructions"; mainProgram = "CuraEngine"; homepage = "https://github.com/Ultimaker/CuraEngine"; - license = licenses.agpl3; + license = licenses.agpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/gopacked/default.nix b/pkgs/applications/misc/gopacked/default.nix index 1af03a1528a2..aef599323b81 100644 --- a/pkgs/applications/misc/gopacked/default.nix +++ b/pkgs/applications/misc/gopacked/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { meta = with lib; { description = "A simple text-based Minecraft modpack manager"; - license = licenses.agpl3; + license = licenses.agpl3Plus; homepage = src.meta.homepage; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/applications/misc/klipperscreen/default.nix b/pkgs/applications/misc/klipperscreen/default.nix index 8589991ff522..789ab7c68828 100644 --- a/pkgs/applications/misc/klipperscreen/default.nix +++ b/pkgs/applications/misc/klipperscreen/default.nix @@ -48,7 +48,7 @@ meta = with lib; { description = "Touchscreen GUI for the Klipper 3D printer firmware"; homepage = "https://github.com/jordanruthe/KlipperScreen"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ cab404 ]; mainProgram = "KlipperScreen"; }; diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index af251385fceb..ff920edbc272 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -53,7 +53,7 @@ in meta = with lib; { description = "Marlin auto bed leveling control, mesh correction, and z probe handling"; homepage = "https://framagit.org/razer/Octoprint_ABL_Expert/"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ WhittlesJr ]; }; }; @@ -72,7 +72,7 @@ in meta = with lib; { description = "Displays 3D mesh of bed topography report"; homepage = "https://github.com/jneilliii/OctoPrint-BedLevelVisualizer"; - license = licenses.agpl3; + license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; }; }; @@ -110,7 +110,7 @@ in meta = with lib; { description = "Plugin for slicing via Cura Legacy from within OctoPrint"; homepage = "https://github.com/OctoPrint/OctoPrint-CuraEngineLegacy"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ gebner ]; }; }; @@ -148,7 +148,7 @@ in meta = with lib; { description = "OctoPrint-Plugin that sends the current progress of a print via M117 command"; homepage = "https://github.com/OllisGit/OctoPrint-DisplayLayerProgress"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ j0hax ]; }; }; @@ -186,7 +186,7 @@ in meta = with lib; { description = "Edit gcode on OctoPrint"; homepage = "https://github.com/ieatacid/OctoPrint-GcodeEditor"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ WhittlesJr ]; }; }; @@ -205,7 +205,7 @@ in meta = with lib; { description = "Displays GCode documentation for Marlin in the Octoprint terminal command line"; homepage = "https://github.com/costas-basdekis/MarlinGcodeDocumentation"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ lovesegfault ]; }; }; @@ -226,7 +226,7 @@ in meta = with lib; { description = "Publish printer status MQTT"; homepage = "https://github.com/OctoPrint/OctoPrint-MQTT"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ peterhoeg ]; }; }; @@ -256,7 +256,7 @@ in meta = with lib; { description = "Better print time estimation for OctoPrint"; homepage = "https://github.com/eyal0/OctoPrint-PrintTimeGenius"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ gebner ]; }; }; @@ -284,7 +284,7 @@ in meta = with lib; { description = "OctoPrint plugin to control ATX/AUX power supply"; homepage = "https://github.com/kantlivelong/OctoPrint-PSUControl"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ gebner ]; }; }; @@ -303,7 +303,7 @@ in meta = with lib; { description = "A simple plugin that add an emergency stop buton on NavBar of OctoPrint"; homepage = "https://github.com/Sebclem/OctoPrint-SimpleEmergencyStop"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ WhittlesJr ]; }; }; @@ -322,7 +322,7 @@ in meta = with lib; { description = "A simple stl viewer tab for OctoPrint"; homepage = "https://github.com/jneilliii/Octoprint-STLViewer"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ abbradar ]; }; }; @@ -362,7 +362,7 @@ in meta = with lib; { description = "Beautiful themes for OctoPrint"; homepage = "https://github.com/birkbjo/OctoPrint-Themeify"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ lovesegfault ]; }; }; @@ -381,7 +381,7 @@ in meta = with lib; { description = "Show printers status in window title"; homepage = "https://github.com/MoonshineSG/OctoPrint-TitleStatus"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ abbradar ]; }; }; @@ -400,7 +400,7 @@ in meta = with lib; { description = "Touch friendly interface for a small TFT module or phone for OctoPrint"; homepage = "https://github.com/BillyBlaze/OctoPrint-TouchUI"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ gebner ]; }; }; @@ -419,7 +419,7 @@ in meta = with lib; { description = "A plugin for a better integration of Klipper into OctoPrint"; homepage = "https://github.com/AliceGrey/OctoprintKlipperPlugin"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ lovesegfault ]; }; }; @@ -473,7 +473,7 @@ in meta = with lib; { description = "A dashboard for Octoprint"; homepage = "https://github.com/StefanCohen/OctoPrint-Dashboard"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ j0hax ]; }; }; diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/applications/misc/osmctools/default.nix index fc46ffb7ffac..230bc80d180a 100644 --- a/pkgs/applications/misc/osmctools/default.nix +++ b/pkgs/applications/misc/osmctools/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ]; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; - license = licenses.agpl3; + license = licenses.agpl3Only; }; } diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 0b5a5065cf12..0a9e0c23fae9 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -191,7 +191,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "G-code generator for 3D printer"; homepage = "https://github.com/prusa3d/PrusaSlicer"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ moredread tweber tmarkus ]; platforms = platforms.unix; } // lib.optionalAttrs (stdenv.isDarwin) { diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 88423e36a956..63e547619696 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -81,7 +81,7 @@ let meta = with lib; { inherit description; homepage = "https://github.com/supermerill/SuperSlicer"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ cab404 moredread tmarkus ]; mainProgram = "superslicer"; }; diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 5f0d83b078c8..6695f53e9932 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { slices (layers), generates toolpaths to fill them and calculates the amount of material to be extruded.''; homepage = "https://slic3r.org/"; - license = licenses.agpl3; + license = licenses.agpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor ]; }; diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/applications/networking/brig/default.nix index 8c659a99d0ff..e7204a68d14c 100644 --- a/pkgs/applications/networking/brig/default.nix +++ b/pkgs/applications/networking/brig/default.nix @@ -51,7 +51,7 @@ buildGoModule rec { ''; homepage = "https://brig.readthedocs.io"; changelog = "https://github.com/sahib/brig/releases/tag/${src.rev}"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ offline ]; mainProgram = "brig"; }; diff --git a/pkgs/applications/networking/circumflex/default.nix b/pkgs/applications/networking/circumflex/default.nix index bc1d81e7f956..bec25bf6f120 100644 --- a/pkgs/applications/networking/circumflex/default.nix +++ b/pkgs/applications/networking/circumflex/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { meta = with lib; { description = "A command line tool for browsing Hacker News in your terminal"; homepage = "https://github.com/bensadeh/circumflex"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ mktip ]; mainProgram = "clx"; }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e4fadde572a3..9a8e919c0999 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -776,7 +776,7 @@ "owner": "aminueza", "repo": "terraform-provider-minio", "rev": "v2.2.0", - "spdx": "AGPL-3.0", + "spdx": "AGPL-3.0-only", "vendorHash": "sha256-Uxexx5sK6D+EEEPWLnWFE0HPG1RKUsYnSJ/1bV9JBkw=" }, "mongodbatlas": { diff --git a/pkgs/applications/networking/mhost/default.nix b/pkgs/applications/networking/mhost/default.nix index ac02ca8f64c1..f4313187636c 100644 --- a/pkgs/applications/networking/mhost/default.nix +++ b/pkgs/applications/networking/mhost/default.nix @@ -1,19 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "mhost"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "lukaspustina"; repo = pname; rev = "v${version}"; - sha256 = "1j0378f8gj8hdcdhpj6lqlnriasmjxzri42wjj9pygzkmpd3ym86"; + sha256 = "sha256-6jn9jOCh96d9y2l1OZ5hgxg7sYXPUFzJiiT95OR7lD0="; }; - cargoSha256 = "0gqrya0bpdd67k2sxib7f4npnrx84d9r4hjq2sg2xz4j8pmgs018"; + cargoHash = "sha256-d2JYT/eJaGm8pfmjsuSZiQxlzcsypFH53F/9joW0J6I="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optionals stdenv.isDarwin [ + Security + SystemConfiguration + ]; CARGO_CRATE_NAME = "mhost"; diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/applications/networking/p2p/magnetico/default.nix index f3f089ff2746..6c09ae892e27 100644 --- a/pkgs/applications/networking/p2p/magnetico/default.nix +++ b/pkgs/applications/networking/p2p/magnetico/default.nix @@ -40,7 +40,7 @@ buildGoModule rec { broken = true; description = "Autonomous (self-hosted) BitTorrent DHT search engine suite"; homepage = "https://github.com/ireun/magnetico"; - license = licenses.agpl3; + license = licenses.agpl3Only; badPlatforms = platforms.darwin; maintainers = with maintainers; [ rnhmjoj ]; }; diff --git a/pkgs/applications/networking/ssb-patchwork/default.nix b/pkgs/applications/networking/ssb-patchwork/default.nix index 9e1f59f0bed6..75776f02150b 100644 --- a/pkgs/applications/networking/ssb-patchwork/default.nix +++ b/pkgs/applications/networking/ssb-patchwork/default.nix @@ -46,7 +46,7 @@ in sea-slang for gossip - a scuttlebutt is basically a watercooler on a ship. ''; homepage = "https://www.scuttlebutt.nz/"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ asymmetric picnoir cyplo ]; mainProgram = "ssb-patchwork"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index 947c9946e5d3..c3e080ad3d52 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Modular multi screen pdf presentation viewer"; homepage = "https://github.com/stiglers-eponym/BeamerPresenter"; - license = with licenses; [ agpl3 gpl3Plus ]; + license = with licenses; [ agpl3Only gpl3Plus ]; platforms = platforms.all; maintainers = with maintainers; [ pacien dotlambda ]; mainProgram = "beamerpresenter"; diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index bb927b0d8598..ab413ca82e38 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -81,7 +81,7 @@ gnuradio3_8.pkgs.mkDerivation rec { description = "SDR transceiver application for analog and digital modes"; mainProgram = "qradiolink"; homepage = "http://qradiolink.org/"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = [ maintainers.markuskowa ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/radio/srsran/default.nix b/pkgs/applications/radio/srsran/default.nix index 5d03f9bcfdfb..d5897fe32020 100644 --- a/pkgs/applications/radio/srsran/default.nix +++ b/pkgs/applications/radio/srsran/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.srslte.com/"; description = "Open-source 4G and 5G software radio suite."; - license = licenses.agpl3; + license = licenses.agpl3Plus; platforms = with platforms; linux ; maintainers = with maintainers; [ hexagonal-sun ]; }; diff --git a/pkgs/applications/science/biology/minia/default.nix b/pkgs/applications/science/biology/minia/default.nix index cc60fa4f7265..3665639a2cd9 100644 --- a/pkgs/applications/science/biology/minia/default.nix +++ b/pkgs/applications/science/biology/minia/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Short read genome assembler"; mainProgram = "minia"; homepage = "https://github.com/GATB/minia"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ jbedo ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index bff63f3b2d7e..e6bed51c5bc3 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -196,7 +196,7 @@ stdenv.mkDerivation rec { Just the build products, the libraries are passed via an env var in the wrapper, default.nix ''; homepage = "https://www.kicad.org/"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Plus; platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix index 3d4d5b8a197d..1de6d416a0e6 100644 --- a/pkgs/applications/science/math/msieve/default.nix +++ b/pkgs/applications/science/math/msieve/default.nix @@ -1,12 +1,13 @@ -{ lib, stdenv, fetchurl, zlib, gmp, ecm }: +{ lib, stdenv, fetchsvn, zlib, gmp, ecm }: stdenv.mkDerivation rec { pname = "msieve"; - version = "1.53"; + version = "r1050"; - src = fetchurl { - url = "mirror://sourceforge/msieve/msieve/Msieve%20v${version}/msieve${lib.replaceStrings ["."] [""] version}_src.tar.gz"; - sha256 = "1d1vv7j4rh3nnxsmvafi73qy7lw7n3akjlm5pjl3m936yapvmz65"; + src = fetchsvn { + url = "svn://svn.code.sf.net/p/msieve/code/trunk"; + rev = "1050"; + hash = "sha256-cn6OhE4zhrpB7BFrRdOnucjATbfo5mLkK7O0Usx1quE="; }; buildInputs = [ zlib gmp ecm ]; diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index e32d89c042ca..2f7defa3ee55 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { pname = "git-review"; - version = "2.3.1"; + version = "2.4.0"; # Manually set version because prb wants to get it from the git # upstream repository (and we are installing from tarball instead) @@ -18,9 +18,9 @@ buildPythonApplication rec { src = fetchFromGitea { domain = "opendev.org"; owner = "opendev"; - repo = pname; + repo = "git-review"; rev = version; - sha256 = "sha256-C8M4b/paHJB9geizc1eIhXsTuLeeS4dDisCfCQF1RuU="; + hash = "sha256-UfYc662NqnQt0+CKc+18jXnNTOcZv8urCNBsWd6x0VQ="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/by-name/ar/arrpc/package.nix b/pkgs/by-name/ar/arrpc/package.nix index b103718bb357..aefee98b0eac 100644 --- a/pkgs/by-name/ar/arrpc/package.nix +++ b/pkgs/by-name/ar/arrpc/package.nix @@ -3,15 +3,15 @@ , fetchFromGitHub }: buildNpmPackage rec { pname = "arrpc"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "OpenAsar"; repo = "arrpc"; # Release commits are not tagged # release: 3.3.0 - rev = "c6e23e7eb733ad396d3eebc328404cc656fed581"; - hash = "sha256-OeEFNbmGp5SWVdJJwXZUkkNrei9jyuPc+4E960l8VRA="; + rev = "b4796fffe3bf1b1361cc4781024349f7a4f9400e"; + hash = "sha256-iEfV85tRl2KyjodoaSxVHiqweBpLeiCAYWc8+afl/sA="; }; npmDepsHash = "sha256-YlSUGncpY0MyTiCfZcPsfcNx3fR+SCtkOFWbjOPLUzk="; diff --git a/pkgs/by-name/de/deskreen/package.nix b/pkgs/by-name/de/deskreen/package.nix index 746f813f2ea0..98f735703e1b 100644 --- a/pkgs/by-name/de/deskreen/package.nix +++ b/pkgs/by-name/de/deskreen/package.nix @@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Turn any device into a secondary screen for your computer"; homepage = "https://deskreen.com"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; mainProgram = "deskreen"; maintainers = with lib.maintainers; [ leo248 drupol ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ge/gerbolyze/package.nix b/pkgs/by-name/ge/gerbolyze/package.nix index ce177e6aa03b..0e61a64dd94b 100644 --- a/pkgs/by-name/ge/gerbolyze/package.nix +++ b/pkgs/by-name/ge/gerbolyze/package.nix @@ -37,7 +37,7 @@ let meta = with lib; { description = "svg-flatten SVG downconverter"; homepage = "https://github.com/jaseg/gerbolyze"; - license = with licenses; [ agpl3 ]; + license = with licenses; [ agpl3Plus ]; maintainers = with maintainers; [ wulfsta ]; mainProgram = "svg-flatten"; platforms = platforms.linux; @@ -84,7 +84,7 @@ in python3Packages.buildPythonApplication rec { meta = with lib; { description = "Directly render SVG overlays into Gerber and Excellon files"; homepage = "https://github.com/jaseg/gerbolyze"; - license = with licenses; [ agpl3 ]; + license = with licenses; [ agpl3Plus ]; maintainers = with maintainers; [ wulfsta ]; mainProgram = "gerbolyze"; platforms = platforms.linux; diff --git a/pkgs/by-name/gl/glasskube/package.nix b/pkgs/by-name/gl/glasskube/package.nix new file mode 100644 index 000000000000..e9130bb321da --- /dev/null +++ b/pkgs/by-name/gl/glasskube/package.nix @@ -0,0 +1,47 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +, installShellFiles +}: + +buildGoModule rec { + pname = "glasskube"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "glasskube"; + repo = "glasskube"; + rev = "refs/tags/v${version}"; + hash = "sha256-+5SinF85bU113C9B025DM83v8ApaXqLV4n1P9zZP3ns="; + }; + + vendorHash = "sha256-DBqO2EyB1TydsdK2GWJoFGGgTS+E62GogysPX4WtzYU="; + + CGO_ENABLED = 0; + + ldflags = [ "-s" "-w" "-X github.com/glasskube/glasskube/internal/config.Version=${version}" "-X github.com/glasskube/glasskube/internal/config.Commit=${src.rev}" ]; + + subPackages = [ "cmd/${pname}" "cmd/package-operator" ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + # Completions + installShellCompletion --cmd glasskube \ + --bash <($out/bin/glasskube completion bash) \ + --fish <($out/bin/glasskube completion fish) \ + --zsh <($out/bin/glasskube completion zsh) + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "The missing Package Manager for Kubernetes featuring a GUI and a CLI"; + homepage = "https://github.com/glasskube/glasskube"; + changelog = "https://github.com/glasskube/glasskube/releases/tag/v${version}"; + maintainers = with maintainers; [ jakuzure ]; + license = licenses.asl20; + mainProgram = "glasskube"; + }; +} diff --git a/pkgs/by-name/hd/hdrop/package.nix b/pkgs/by-name/hd/hdrop/package.nix index eca8847fd49b..23f9070a3125 100755 --- a/pkgs/by-name/hd/hdrop/package.nix +++ b/pkgs/by-name/hd/hdrop/package.nix @@ -46,7 +46,7 @@ stdenvNoCC.mkDerivation rec { description = "Emulate 'tdrop' in Hyprland (run, show and hide specific programs per keybind)"; homepage = "https://github.com/Schweber/hdrop"; changelog = "https://github.com/Schweber/hdrop/releases/tag/v${version}"; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ Schweber ]; mainProgram = "hdrop"; diff --git a/pkgs/by-name/ja/jasp-desktop/package.nix b/pkgs/by-name/ja/jasp-desktop/package.nix index 395b980da880..208589e45695 100644 --- a/pkgs/by-name/ja/jasp-desktop/package.nix +++ b/pkgs/by-name/ja/jasp-desktop/package.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation { changelog = "https://jasp-stats.org/release-notes"; description = "A complete statistical package for both Bayesian and Frequentist statistical methods"; homepage = "https://github.com/jasp-stats/jasp-desktop"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Plus; mainProgram = "JASP"; maintainers = with lib.maintainers; [ tomasajt ]; # JASP's cmake build steps are really different on Darwin diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix new file mode 100644 index 000000000000..bb81b8b70bff --- /dev/null +++ b/pkgs/by-name/jn/jnv/package.nix @@ -0,0 +1,35 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, autoconf +, automake +, libtool +}: +rustPlatform.buildRustPackage rec { + pname = "jnv"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "ynqa"; + repo = "jnv"; + rev = "v${version}"; + hash = "sha256-22aoK1s8DhKttGGR9ouNDIWhYCv6dghT/jfAC0VX8Sw="; + }; + + cargoHash = "sha256-CmupwWwopXpnPm8R17JVfAoGt4QEos5I+3qumDKEyM8="; + + nativeBuildInputs = [ + autoconf + automake + libtool + rustPlatform.bindgenHook + ]; + + meta = with lib; { + description = "Interactive JSON filter using jq"; + mainProgram = "jnv"; + homepage = "https://github.com/ynqa/jnv"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ nealfennimore nshalman ]; + }; +} diff --git a/pkgs/by-name/li/listmonk/package.nix b/pkgs/by-name/li/listmonk/package.nix index 6e652d280c40..0a111224161e 100644 --- a/pkgs/by-name/li/listmonk/package.nix +++ b/pkgs/by-name/li/listmonk/package.nix @@ -52,6 +52,6 @@ buildGoModule rec { homepage = "https://github.com/knadh/listmonk"; changelog = "https://github.com/knadh/listmonk/releases/tag/v${version}"; maintainers = with maintainers; [ raitobezarius ]; - license = licenses.agpl3; + license = licenses.agpl3Only; }; } diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix index 9b6cb00e7ef6..600af837b107 100644 --- a/pkgs/by-name/mo/movim/package.nix +++ b/pkgs/by-name/mo/movim/package.nix @@ -37,7 +37,7 @@ php.buildComposerProject (finalAttrs: { meta = { description = "a federated blogging & chat platform that acts as a web front end for the XMPP protocol"; homepage = "https://movim.eu"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ toastal ]; }; }) diff --git a/pkgs/by-name/ol/olvid/package.nix b/pkgs/by-name/ol/olvid/package.nix index 813d4ae4052e..1aaf472fef5a 100644 --- a/pkgs/by-name/ol/olvid/package.nix +++ b/pkgs/by-name/ol/olvid/package.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "The secure french messenger"; homepage = "https://www.olvid.io"; - license = licenses.agpl3; + license = licenses.agpl3Only; mainProgram = "olvid"; maintainers = with maintainers; [ rookeur ]; platforms = platforms.linux; diff --git a/pkgs/by-name/pd/pdfannots2json/package.nix b/pkgs/by-name/pd/pdfannots2json/package.nix index 15d2103893fc..9d32f9a7c92c 100644 --- a/pkgs/by-name/pd/pdfannots2json/package.nix +++ b/pkgs/by-name/pd/pdfannots2json/package.nix @@ -18,7 +18,7 @@ in meta = with lib; { homepage = "https://github.com/mgmeyers/pdfannots2json"; - license = licenses.agpl3; + license = licenses.agpl3Only; description = "A tool to convert PDF annotations to JSON"; mainProgram = "pdfannots2json"; maintainers = with maintainers; [ _0nyr ]; diff --git a/pkgs/by-name/si/signaturepdf/package.nix b/pkgs/by-name/si/signaturepdf/package.nix index 623f3a654fce..dfac73d89950 100644 --- a/pkgs/by-name/si/signaturepdf/package.nix +++ b/pkgs/by-name/si/signaturepdf/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { homepage = "https://pdf.24eme.fr/"; changelog = "https://github.com/24eme/signaturepdf/releases/tag/v${version}"; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = platforms.all; maintainers = with maintainers; [ DamienCassou ]; }; diff --git a/pkgs/development/compilers/stanc/default.nix b/pkgs/by-name/st/stanc/package.nix index 66671823d866..e5e6f79eb8cd 100644 --- a/pkgs/development/compilers/stanc/default.nix +++ b/pkgs/by-name/st/stanc/package.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, ocamlPackages +{ + lib, + fetchFromGitHub, + ocamlPackages, }: ocamlPackages.buildDunePackage rec { @@ -17,15 +18,8 @@ ocamlPackages.buildDunePackage rec { hash = "sha256-ixZCix3oLZhzs08JbmbNCO0lhAu1Jf+KnpHNKlU/FaA="; }; - # Error: This expression has type [ `Use_Sys_unix ] - postPatch = '' - substituteInPlace test/integration/run_bin_on_args.ml \ - --replace "if Sys.file_exists (to_windows path) then to_windows cmd else cmd" "cmd" - ''; + nativeBuildInputs = with ocamlPackages; [ menhir ]; - nativeBuildInputs = with ocamlPackages; [ - menhir - ]; buildInputs = with ocamlPackages; [ core_unix menhirLib diff --git a/pkgs/by-name/tr/treedome/package.nix b/pkgs/by-name/tr/treedome/package.nix index 2d50b8a60fa3..a7752abf0fd6 100644 --- a/pkgs/by-name/tr/treedome/package.nix +++ b/pkgs/by-name/tr/treedome/package.nix @@ -141,7 +141,7 @@ rustPlatform.buildRustPackage { meta = with lib; { description = "A local-first, encrypted, note taking application organized in tree-like structures"; homepage = " https://codeberg.org/solver-orgz/treedome"; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = [ "x86_64-linux" ]; mainProgram = "treedome"; maintainers = with maintainers; [ tengkuizdihar ]; diff --git a/pkgs/tools/typesetting/typstfmt/Cargo.lock b/pkgs/by-name/ty/typstfmt/Cargo.lock index ecfb8d4030f5..41ecc6fece65 100644 --- a/pkgs/tools/typesetting/typstfmt/Cargo.lock +++ b/pkgs/by-name/ty/typstfmt/Cargo.lock @@ -19,9 +19,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "bstr" @@ -36,9 +36,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", "serde", @@ -85,9 +85,9 @@ dependencies = [ [[package]] name = "console" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode", "lazy_static", @@ -117,18 +117,18 @@ dependencies = [ [[package]] name = "ecow" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1990d053cf6edf3f030682dba3b0eb65ef01fabb2686072765d8a17d6728e8" +checksum = "e6ea5e3f9cda726431da9d1a8d5a29785d544b31e98e1ca7a210906244002e02" dependencies = [ "serde", ] [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "encode_unicode" @@ -144,9 +144,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", @@ -171,9 +171,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", - "bstr 1.8.0", + "bstr 1.9.1", "log", - "regex-automata 0.4.3", + "regex-automata 0.4.5", "regex-syntax", ] @@ -185,9 +185,9 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" dependencies = [ "equivalent", "hashbrown", @@ -195,9 +195,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.34.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" +checksum = "7c985c1bef99cf13c58fade470483d81a2bfe846ebde60ed28cc2dddec2df9e2" dependencies = [ "console", "lazy_static", @@ -229,9 +229,9 @@ checksum = "baff4b617f7df3d896f97fe922b64817f6cd9a756bb81d40f8883f2f66dcb401" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libredox" @@ -239,7 +239,7 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "libc", "redox_syscall", ] @@ -258,9 +258,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "nu-ansi-term" @@ -274,9 +274,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "overload" @@ -292,18 +292,18 @@ checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -330,13 +330,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.5", "regex-syntax", ] @@ -348,9 +348,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -374,18 +374,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", @@ -394,9 +394,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -412,9 +412,9 @@ dependencies = [ [[package]] name = "similar" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" +checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" dependencies = [ "bstr 0.2.17", "unicode-segmentation", @@ -438,15 +438,15 @@ checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" -version = "2.0.39" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", @@ -455,18 +455,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", @@ -475,9 +475,9 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -585,8 +585,8 @@ dependencies = [ [[package]] name = "typst-syntax" -version = "0.7.0" -source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9" +version = "0.10.0" +source = "git+https://github.com/typst/typst.git?tag=v0.10.0#70ca0d257bb4ba927f63260e20443f244e0bb58c" dependencies = [ "comemo", "ecow", @@ -595,26 +595,20 @@ dependencies = [ "tracing", "unicode-ident", "unicode-math-class", + "unicode-script", "unicode-segmentation", "unscanny", ] [[package]] name = "typstfmt" -version = "0.2.7" +version = "0.2.9" dependencies = [ "confy", - "lexopt", - "typstfmt_lib", -] - -[[package]] -name = "typstfmt_lib" -version = "0.2.7" -dependencies = [ "globmatch", "insta", "itertools", + "lexopt", "regex", "serde", "similar-asserts", @@ -622,7 +616,7 @@ dependencies = [ "tracing", "tracing-subscriber", "typst-syntax", - "unicode-segmentation", + "unicode-width", ] [[package]] @@ -638,10 +632,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65" [[package]] +name = "unicode-script" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" + +[[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unscanny" @@ -704,18 +710,18 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.45.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ "windows-targets", ] [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -728,51 +734,51 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winnow" -version = "0.5.25" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e87b8dfbe3baffbe687eef2e164e32286eff31a5ee16463ce03d991643ec94" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] diff --git a/pkgs/tools/typesetting/typstfmt/default.nix b/pkgs/by-name/ty/typstfmt/package.nix index 2305998e94a2..25816151d583 100644 --- a/pkgs/tools/typesetting/typstfmt/default.nix +++ b/pkgs/by-name/ty/typstfmt/package.nix @@ -1,29 +1,32 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib +, rustPlatform +, fetchFromGitHub +}: rustPlatform.buildRustPackage rec { pname = "typstfmt"; - version = "0.2.7"; + version = "0.2.9"; src = fetchFromGitHub { owner = "astrale-sharp"; repo = "typstfmt"; rev = version; - hash = "sha256-LBYsTCjZ+U+lgd7Z3H1sBcWwseoHsuepPd66bWgfvhI="; + hash = "sha256-bSjUr6tHQrmni/YmApHrvY2cVz3xf1VKfg35BJjuOZM="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "typst-syntax-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg="; + "typst-syntax-0.10.0" = "sha256-qiskc0G/ZdLRZjTicoKIOztRFem59TM4ki23Rl55y9s="; }; }; - meta = with lib; { + meta = { + changelog = "https://github.com/astrale-sharp/typstfmt/blob/${src.rev}/CHANGELOG.md"; description = "A formatter for the Typst language"; homepage = "https://github.com/astrale-sharp/typstfmt"; - changelog = "https://github.com/astrale-sharp/typstfmt/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda geri1701 ]; + license = lib.licenses.mit; mainProgram = "typstfmt"; + maintainers = with lib.maintainers; [ figsoda geri1701 ]; }; } diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix index f8916d712b16..b8ad3c1192eb 100644 --- a/pkgs/development/compilers/ghc/9.6.3-binary.nix +++ b/pkgs/development/compilers/ghc/9.6.3-binary.nix @@ -403,5 +403,8 @@ stdenv.mkDerivation rec { # `pkgsMusl`. platforms = builtins.attrNames ghcBinDists.${distSetName}; maintainers = lib.teams.haskell.members; + # packages involving hsc2hs (clock) produce libraries our + # ld can't link against + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix index 84bb1660f7b5..1d76cfdbdd80 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix @@ -1,22 +1,22 @@ # Generated by update.sh script { - "version" = "23.1.2"; + "version" = "24.0.0"; "hashes" = { "aarch64-linux" = { - sha256 = "0ypzhi22q2d1dfl3qf3yfsaqdsrj8sksc2spa79rdqdr690li4y9"; - url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.2/graalpy-community-23.1.2-linux-aarch64.tar.gz"; + sha256 = "1hz56nvl7av3xvwm7bxrzyri289h6hbawxsacn4zr7nm1snjn7i0"; + url = "https://github.com/oracle/graalpython/releases/download/graal-24.0.0/graalpy-community-24.0.0-linux-aarch64.tar.gz"; }; "x86_64-linux" = { - sha256 = "1n99hzf1sidacv4qr5j2b3dpwrc6qb71alwfkdxjqx6xv7g7nmr7"; - url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.2/graalpy-community-23.1.2-linux-amd64.tar.gz"; + sha256 = "1ngqwrx1bc22jm12gmwqmqjfhhccpim1pai6885vg5xqsvc94y57"; + url = "https://github.com/oracle/graalpython/releases/download/graal-24.0.0/graalpy-community-24.0.0-linux-amd64.tar.gz"; }; "x86_64-darwin" = { - sha256 = "0g2xj5hiq8idacdm0jlg5lvvv98f38p6fjb839gfacsb25pmhkg7"; - url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.2/graalpy-community-23.1.2-macos-amd64.tar.gz"; + sha256 = "07bh2fgk3l7vpws91ah48dsbrvvlq8wzfq88wq6ywilbikmnp0bw"; + url = "https://github.com/oracle/graalpython/releases/download/graal-24.0.0/graalpy-community-24.0.0-macos-amd64.tar.gz"; }; "aarch64-darwin" = { - sha256 = "0qinxqkkm9bfnzr43p3yhs3alfnl4pppca6yahsk5bp8ngyzasfj"; - url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.2/graalpy-community-23.1.2-macos-aarch64.tar.gz"; + sha256 = "00kljb24835l51jrnzdfblbhf2psdfw3wg00rllcdhpmiji40mbz"; + url = "https://github.com/oracle/graalpython/releases/download/graal-24.0.0/graalpy-community-24.0.0-macos-aarch64.tar.gz"; }; }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix index 45028f3d544b..1ce3b864a6bf 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix @@ -1,22 +1,22 @@ # Generated by update.sh script { - "version" = "21.0.2"; + "version" = "22.0.0"; "hashes" = { "aarch64-linux" = { - sha256 = "0yndazvc4kyr9widfn8ql5vd57m4m5inqz2wcpsarw38rs8ycjx3"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.2/graalvm-community-jdk-21.0.2_linux-aarch64_bin.tar.gz"; + sha256 = "01097qag9kjjwh3q11j76bn79x80dm8h5rdd6gzwrsqhn48hx6ns"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.0/graalvm-community-jdk-22.0.0_linux-aarch64_bin.tar.gz"; }; "x86_64-linux" = { - sha256 = "0j5ffszcaqv3fq159hyb611jm8w1q4n1cywmbd7vi69smad0cj5h"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.2/graalvm-community-jdk-21.0.2_linux-x64_bin.tar.gz"; + sha256 = "0mq6vdsfgas8lhz1vdiz8qya37fy7qn0078q30zpa09ila3b9vp5"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.0/graalvm-community-jdk-22.0.0_linux-x64_bin.tar.gz"; }; "x86_64-darwin" = { - sha256 = "1qfrn1068idnkzd6mdpw1x17sqrj59rz9avphj8225sxlhzsk2ks"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.2/graalvm-community-jdk-21.0.2_macos-x64_bin.tar.gz"; + sha256 = "1l8h9ai7s4km8wx1x43s3barnbq7b6hzfr1mbbmiksng1d2p26v9"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.0/graalvm-community-jdk-22.0.0_macos-x64_bin.tar.gz"; }; "aarch64-darwin" = { - sha256 = "1dssa3nhix7bqygdkkfp0b9myjg5f91dlgm8mf6r7qf7mj9klpji"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.2/graalvm-community-jdk-21.0.2_macos-aarch64_bin.tar.gz"; + sha256 = "11ncf4wd5asr3jz21fs0j5w49zxrsdw3j42mpcczjy2z1j813cc7"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.0/graalvm-community-jdk-22.0.0_macos-aarch64_bin.tar.gz"; }; }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix index 331db1caf9b9..40e44e22954d 100644 --- a/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix @@ -1,22 +1,22 @@ # Generated by update.sh script { - "version" = "23.1.2"; + "version" = "24.0.0"; "hashes" = { "aarch64-linux" = { - sha256 = "0bmrpp88zny0hbq4hqhs4xajqr96qxj6p5nj12m7kcr8hzh2vkf3"; - url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.2/truffleruby-community-23.1.2-linux-aarch64.tar.gz"; + sha256 = "0nq2wnc7kb3x37m68b2ylay6c341fzv4453k150a47fnj0p4d85p"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-24.0.0/truffleruby-community-24.0.0-linux-aarch64.tar.gz"; }; "x86_64-linux" = { - sha256 = "0hrab1jrs59swpx33zg111wa4nv2215ygyckv47x6mmjibf30c86"; - url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.2/truffleruby-community-23.1.2-linux-amd64.tar.gz"; + sha256 = "1h8zqf9clxg3azma86gdm6yl8mif2sgmyhnvqdilap28vmj4mpns"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-24.0.0/truffleruby-community-24.0.0-linux-amd64.tar.gz"; }; "x86_64-darwin" = { - sha256 = "1y68wz6rv2vksbnhmf57zlk8smgv9954np07d8ywdls99a92217z"; - url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.2/truffleruby-community-23.1.2-macos-amd64.tar.gz"; + sha256 = "03c4bxdzdz5m7n1kkmzsb8x0m1h4ms6ah29p9m4wrz8pjsb8682l"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-24.0.0/truffleruby-community-24.0.0-macos-amd64.tar.gz"; }; "aarch64-darwin" = { - sha256 = "0za4ff3wlj2fgl2z3vzp2p4jf9x0fkvd98qwk1dm7lmffghfb14n"; - url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.2/truffleruby-community-23.1.2-macos-aarch64.tar.gz"; + sha256 = "0ph6ki66w4kqwnznbpgfd8k85xx6cgqslzy07v4sywhp9k246qld"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-24.0.0/truffleruby-community-24.0.0-macos-aarch64.tar.gz"; }; }; } diff --git a/pkgs/development/idris-modules/cube.nix b/pkgs/development/idris-modules/cube.nix index eac71fb8797c..60757ec1319b 100644 --- a/pkgs/development/idris-modules/cube.nix +++ b/pkgs/development/idris-modules/cube.nix @@ -16,7 +16,7 @@ build-idris-package { meta = { description = "An implementation of the Lambda Cube in Idris"; homepage = "https://github.com/aatxe/cube.idr"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/mapping.nix b/pkgs/development/idris-modules/mapping.nix index fbfb34ddbf9d..63b7a01bce14 100644 --- a/pkgs/development/idris-modules/mapping.nix +++ b/pkgs/development/idris-modules/mapping.nix @@ -16,7 +16,7 @@ build-idris-package { meta = { description = "Idris mapping library"; homepage = "https://github.com/zaoqi/Mapping.idr"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Plus; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/libraries/agda/1lab/default.nix b/pkgs/development/libraries/agda/1lab/default.nix index 89b0fb60c365..4d39fa0325f2 100644 --- a/pkgs/development/libraries/agda/1lab/default.nix +++ b/pkgs/development/libraries/agda/1lab/default.nix @@ -28,7 +28,7 @@ mkDerivation rec { description = "A formalised, cross-linked reference resource for mathematics done in Homotopy Type Theory "; homepage = src.meta.homepage; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = platforms.unix; maintainers = with maintainers; [ ncfavier ]; }; diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix index 0d8504c9234c..d92d28d094e6 100644 --- a/pkgs/development/libraries/db/db-6.0.nix +++ b/pkgs/development/libraries/db/db-6.0.nix @@ -3,7 +3,7 @@ import ./generic.nix (args // { version = "6.0.30"; sha256 = "1lhglbvg65j5slrlv7qv4vi3cvd7kjywa07gq1abzschycf4p3k0"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch diff --git a/pkgs/development/libraries/db/db-6.2.nix b/pkgs/development/libraries/db/db-6.2.nix index 2c1cb455feae..fd5a53253522 100644 --- a/pkgs/development/libraries/db/db-6.2.nix +++ b/pkgs/development/libraries/db/db-6.2.nix @@ -3,7 +3,7 @@ import ./generic.nix (args // { version = "6.2.32"; sha256 = "1yx8wzhch5wwh016nh0kfxvknjkafv6ybkqh6nh7lxx50jqf5id9"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch diff --git a/pkgs/development/libraries/dbxml/default.nix b/pkgs/development/libraries/dbxml/default.nix index c65e7ad93eca..b6dcf908c4f9 100644 --- a/pkgs/development/libraries/dbxml/default.nix +++ b/pkgs/development/libraries/dbxml/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.oracle.com/database/berkeley-db/xml.html"; description = "Embeddable XML database based on Berkeley DB"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix index 3e7bf0d21a2b..1ee66e008fef 100644 --- a/pkgs/development/libraries/funambol/default.nix +++ b/pkgs/development/libraries/funambol/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "SyncML client sdk by Funambol project"; homepage = "https://www.funambol.com"; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index b5dae80b9cc2..f0938df820bf 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://www.jbig2dec.com/"; description = "Decoder implementation of the JBIG2 image compression format"; mainProgram = "jbig2dec"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index eb1b8054fef9..9b498be3b7fa 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -89968,7 +89968,7 @@ in meta = { description = "A T-SQL formatting utility in JS, transpiled from the C# library of the same name."; homepage = "https://github.com/TaoK/poor-mans-t-sql-formatter-npm-cli#readme"; - license = "AGPL-3.0"; + license = "AGPL-3.0-only"; }; production = true; bypassCache = true; diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index e5de49d41582..e408d11590bd 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "androguard"; - version = "4.1.0"; + version = "3.4.0a1"; format = "setuptools"; src = fetchFromGitHub { repo = pname; owner = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-NJYiuAr/rfR24pAhQDysGWXH2bBuvTrJI1jkmrJS8+c="; + rev = "v${version}"; + sha256 = "1aparxiq11y0hbvkayp92w684nyxyyx7mi0n1x6x51g5z6c58vmy"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/audible/default.nix b/pkgs/development/python-modules/audible/default.nix index bd82dabbc83f..63b8e605086e 100644 --- a/pkgs/development/python-modules/audible/default.nix +++ b/pkgs/development/python-modules/audible/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "A(Sync) Interface for internal Audible API written in pure Python"; - license = licenses.agpl3; + license = licenses.agpl3Only; homepage = "https://github.com/mkb79/Audible"; maintainers = with maintainers; [ jvanbruegge ]; }; diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix index 57e9f4f7d082..4edc9e1524b4 100644 --- a/pkgs/development/python-modules/bsddb3/default.nix +++ b/pkgs/development/python-modules/bsddb3/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python bindings for Oracle Berkeley DB"; homepage = "https://www.jcea.es/programacion/pybsddb.htm"; - license = with licenses; [ agpl3 ]; # License changed from bsd3 to agpl3 since 6.x + license = with licenses; [ agpl3Only ]; # License changed from bsd3 to agpl3 since 6.x maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/dvc-http/default.nix b/pkgs/development/python-modules/dvc-http/default.nix index efe97c502cec..48fb723cbc54 100644 --- a/pkgs/development/python-modules/dvc-http/default.nix +++ b/pkgs/development/python-modules/dvc-http/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , dvc-objects , fsspec +, funcy , pythonOlder , pythonRelaxDepsHook , setuptools-scm @@ -12,25 +13,26 @@ buildPythonPackage rec { pname = "dvc-http"; version = "2.32.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "iterative"; - repo = pname; + repo = "dvc-http"; rev = "refs/tags/${version}"; hash = "sha256-ru/hOFv/RcS/7SBpTJU8xFxdllmaiH4dV1ouS6GGKkY="; }; - nativeBuildInputs = [ + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ + aiohttp-retry dvc-objects fsspec - aiohttp-retry + funcy ]; # Currently it's not possible to run the tests diff --git a/pkgs/development/python-modules/iso-639/default.nix b/pkgs/development/python-modules/iso-639/default.nix index e9226d4aaee5..22d66ef9f14f 100644 --- a/pkgs/development/python-modules/iso-639/default.nix +++ b/pkgs/development/python-modules/iso-639/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/noumar/iso639"; description = "ISO 639 library for Python"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ zraexy ]; }; } diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index f10ef51b99d8..4b323b25669d 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -47,12 +47,12 @@ let in buildPythonPackage rec { - pname = "OpenUSD"; + pname = "openusd"; version = "23.11"; src = fetchFromGitHub { owner = "PixarAnimationStudios"; - repo = pname; + repo = "OpenUSD"; rev = "refs/tags/v${version}"; hash = "sha256-5zQrfB14kXs75WbL3s4eyhxELglhLNxU2L2aVXiyVjg="; }; diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 71682cd62c41..23e0ae1aff94 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -126,7 +126,7 @@ buildPythonPackage rec { meta = with lib; { description = "Static site generator that requires no database or server-side logic"; homepage = "https://getpelican.com/"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ offline prikhi ]; }; } diff --git a/pkgs/development/python-modules/pyzufall/default.nix b/pkgs/development/python-modules/pyzufall/default.nix index 7ca619efa38d..71418c1607d0 100644 --- a/pkgs/development/python-modules/pyzufall/default.nix +++ b/pkgs/development/python-modules/pyzufall/default.nix @@ -1,11 +1,12 @@ { lib, fetchPypi, python, buildPythonPackage, nose, future, coverage }: buildPythonPackage rec { - pname = "PyZufall"; + pname = "pyzufall"; version = "0.13.2"; src = fetchPypi { - inherit pname version; + pname = "PyZufall"; + inherit version; sha256 = "1jffhi20m82fdf78bjhncbdxkfzcskrlipxlrqq9741xdvrn14b5"; }; diff --git a/pkgs/development/python-modules/radicale-infcloud/default.nix b/pkgs/development/python-modules/radicale-infcloud/default.nix index 214c1dcffe87..a59b8221f5d8 100644 --- a/pkgs/development/python-modules/radicale-infcloud/default.nix +++ b/pkgs/development/python-modules/radicale-infcloud/default.nix @@ -22,7 +22,7 @@ buildPythonPackage { meta = with lib; { homepage = "https://github.com/Unrud/RadicaleInfCloud/"; description = "Integrate InfCloud into Radicale's web interface"; - license = with licenses; [ agpl3 gpl3 ]; + license = with licenses; [ agpl3Plus gpl3 ]; maintainers = with maintainers; [ erictapen ]; }; } diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index b56be283c1d3..3e41c4c12dc4 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -19,24 +19,24 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "3.2.0"; - format = "pyproject"; + version = "3.3.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "iterative"; - repo = pname; + repo = "scmrepo"; rev = "refs/tags/${version}"; - hash = "sha256-A09nuT8qxganDYiJNXhdhmnFKUeeVNYQKdHdReSnnac="; + hash = "sha256-vAfqCr1/3S0yZ0wPDxSZ6b6NrcJxt7Lj7oCsTzAXX1k="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ asyncssh dulwich dvc-http diff --git a/pkgs/development/python-modules/soundcloud-v2/default.nix b/pkgs/development/python-modules/soundcloud-v2/default.nix index d5b0d73cc0ce..a5c6a4faa5d3 100644 --- a/pkgs/development/python-modules/soundcloud-v2/default.nix +++ b/pkgs/development/python-modules/soundcloud-v2/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "soundcloud-v2"; - version = "1.3.6"; + version = "1.3.7"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cHFxx/9fGQvpRuy0mGTUsh3CyU2xmE9frbd5+mnHo3Y="; + sha256 = "sha256-DiaCnIEXKSxyE4+MCq0KwdKWUGfWO3LAVwsMNEkOmqc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index ca44f746275b..0d58dc7a4b71 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.38.2"; + version = "4.39.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -62,7 +62,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-/rt2XHN46NcFwlM9MOygVvpQkfPVu2eCNybYmSj711M="; + hash = "sha256-iOypG9WRvZ3Y9wwW/wGlHGdQx246TGqvvml9qyI2vFk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 1947566a4c61..5d53bcbb7078 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "weasyprint"; - version = "61.1"; + version = "61.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "weasyprint"; - hash = "sha256-fLyCTcQCbYKpc2Jkd1X4N90VeZlJY5zIpCjdM9OFAJo="; + hash = "sha256-R99s/u/4xsKM8uTK+DfN4XcV7+RicIradLqi6zkbYFk="; }; patches = [ diff --git a/pkgs/development/python-modules/whenever/default.nix b/pkgs/development/python-modules/whenever/default.nix index 4642da2b3ace..732c22d09575 100644 --- a/pkgs/development/python-modules/whenever/default.nix +++ b/pkgs/development/python-modules/whenever/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "whenever"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ariebovenberg"; repo = "whenever"; rev = "refs/tags/${version}"; - hash = "sha256-vZRdt3Vxndp0iwA5uwMHSbzQZZZc5+tBWh3tMJYfIaU="; + hash = "sha256-5Ik9+i5T5ztb+2zqFZ+SBmrZFLDxji66e3lK0z2w92c="; }; postPatch = '' diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix index 093a825723c0..67dd66d8eeee 100644 --- a/pkgs/development/tools/build-managers/redo-sh/default.nix +++ b/pkgs/development/tools/build-managers/redo-sh/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Redo implementation in Bourne Shell"; homepage = "http://news.dieweltistgarnichtso.net/bin/redo-sh.html"; - license = licenses.agpl3; + license = licenses.agpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ sternenseemann ]; }; diff --git a/pkgs/development/tools/coder/default.nix b/pkgs/development/tools/coder/default.nix index e00fd43b3a24..b12247a76d6f 100644 --- a/pkgs/development/tools/coder/default.nix +++ b/pkgs/development/tools/coder/default.nix @@ -84,7 +84,7 @@ buildGoModule rec { meta = { description = "Provision software development environments via Terraform on Linux, macOS, Windows, X86, ARM, and of course, Kubernetes"; homepage = "https://coder.com"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.ghuntley lib.maintainers.urandom ]; }; } diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 666416ad03e4..071dd6740869 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.57.0"; + version = "1.57.1"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-mBdK6HhoTVTRTU8agKETTZTR7NAH2cBQ/YQpbI2tyN0="; + hash = "sha256-CDk0lmspteeewLzvixjIJr16M8Ko8uSgdnJZfJ1SqOA="; }; - vendorHash = "sha256-wTx4XbFKvpcZXQrloDWALf3yId1ANCBCvv0k3VwVoiM="; + vendorHash = "sha256-lBRVnsttq6M9gyZfV4I/EOwsp6yGARCSYYefRvZvHEA="; subPackages = [ "cmd/golangci-lint" ]; diff --git a/pkgs/games/brogue-ce/default.nix b/pkgs/games/brogue-ce/default.nix index 1f454b53b6f1..ee2862f9c445 100644 --- a/pkgs/games/brogue-ce/default.nix +++ b/pkgs/games/brogue-ce/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A community-lead fork of the minimalist roguelike game Brogue"; mainProgram = "brogue-ce"; homepage = "https://github.com/tmewett/BrogueCE"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ AndersonTorres fgaz ]; platforms = platforms.all; }; diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix index 326a04c8c840..f502c710afbf 100644 --- a/pkgs/games/brogue/default.nix +++ b/pkgs/games/brogue/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A roguelike game"; mainProgram = "brogue"; homepage = "https://sites.google.com/site/broguegame/"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ AndersonTorres fgaz ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/games/julius/default.nix b/pkgs/games/julius/default.nix index 9661113adea5..5e1f046d9710 100644 --- a/pkgs/games/julius/default.nix +++ b/pkgs/games/julius/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/bvschaik/julius"; description = "An open source re-implementation of Caesar III"; mainProgram = "julius"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ Thra11 ]; platforms = platforms.all; broken = stdenv.isDarwin; diff --git a/pkgs/games/maptool/default.nix b/pkgs/games/maptool/default.nix index 6eb9c76db487..1e95e376825c 100644 --- a/pkgs/games/maptool/default.nix +++ b/pkgs/games/maptool/default.nix @@ -27,7 +27,7 @@ let binaryBytecode binaryNativeCode ]; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ rhendric ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/games/mar1d/default.nix b/pkgs/games/mar1d/default.nix index f8feb291a0e1..b069e3fecc46 100644 --- a/pkgs/games/mar1d/default.nix +++ b/pkgs/games/mar1d/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { You must view the world as mario does, as a one dimensional line. ''; homepage = "https://mar1d.com"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ taeer ]; platforms = platforms.unix; }; diff --git a/pkgs/kde/lib/mk-kde-derivation.nix b/pkgs/kde/lib/mk-kde-derivation.nix index 08b956d38849..13f938d69040 100644 --- a/pkgs/kde/lib/mk-kde-derivation.nix +++ b/pkgs/kde/lib/mk-kde-derivation.nix @@ -112,16 +112,15 @@ in "meta" ]; - meta = let - pos = builtins.unsafeGetAttrPos "pname" args; - in { + meta = { description = projectInfo.${pname}.description; homepage = "https://invent.kde.org/${projectInfo.${pname}.repo_path}"; license = lib.filter (l: l != null) (map (l: licensesBySpdxId.${l}) licenseInfo.${pname}); maintainers = lib.teams.qt-kde.members; # Platforms are currently limited to what upstream tests in CI, but can be extended if there's interest. platforms = lib.platforms.linux ++ lib.platforms.freebsd; - position = "${pos.file}:${toString pos.line}"; } // (args.meta or { }); + + pos = builtins.unsafeGetAttrPos "pname" args; in - stdenv.mkDerivation (defaultArgs // cleanArgs // { inherit meta; }) + stdenv.mkDerivation (defaultArgs // cleanArgs // { inherit meta pos; }) diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index daf7758b1184..1420290055cb 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -188,7 +188,7 @@ stdenv.mkDerivation rec { operations in the PostScript language, and (iii) a wide variety of output drivers for various file formats and printers. ''; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Plus; platforms = lib.platforms.all; maintainers = [ lib.maintainers.viric ]; mainProgram = "gs"; diff --git a/pkgs/servers/akkoma/admin-fe/default.nix b/pkgs/servers/akkoma/admin-fe/default.nix index 08da604bfbae..20ffd3054762 100644 --- a/pkgs/servers/akkoma/admin-fe/default.nix +++ b/pkgs/servers/akkoma/admin-fe/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Admin interface for Akkoma"; homepage = "https://akkoma.dev/AkkomaGang/akkoma-fe/"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ mvs ]; }; } diff --git a/pkgs/servers/akkoma/akkoma-fe/default.nix b/pkgs/servers/akkoma/akkoma-fe/default.nix index 7cce84c2ab4f..2e3dd149140d 100644 --- a/pkgs/servers/akkoma/akkoma-fe/default.nix +++ b/pkgs/servers/akkoma/akkoma-fe/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Frontend for Akkoma"; homepage = "https://akkoma.dev/AkkomaGang/akkoma-fe/"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ mvs ]; }; } diff --git a/pkgs/servers/akkoma/default.nix b/pkgs/servers/akkoma/default.nix index 7aea0eaa2771..e9a9fa63ebc5 100644 --- a/pkgs/servers/akkoma/default.nix +++ b/pkgs/servers/akkoma/default.nix @@ -228,7 +228,7 @@ beamPackages.mixRelease rec { meta = with lib; { description = "ActivityPub microblogging server"; homepage = "https://akkoma.social"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ mvs ]; platforms = platforms.unix; }; diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 1116c5a36d6f..e52b0cb00bd4 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -64,7 +64,7 @@ buildGoModule rec { meta = with lib; { description = "Trezor address/account balance backend"; homepage = "https://github.com/trezor/blockbook"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ mmahut _1000101 ]; platforms = platforms.unix; mainProgram = "blockbook"; diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index 572d9a8e2b90..c1b03e1f667b 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -32,7 +32,7 @@ buildGoModule rec { meta = with lib; { description = "Open source Confluence alternative for internal & external docs built with Golang + EmberJS"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ ]; mainProgram = "documize"; homepage = "https://www.documize.com/"; diff --git a/pkgs/servers/filtron/default.nix b/pkgs/servers/filtron/default.nix index 768f3b204f2c..4b82e147cd4d 100644 --- a/pkgs/servers/filtron/default.nix +++ b/pkgs/servers/filtron/default.nix @@ -31,7 +31,7 @@ buildGoModule rec { meta = with lib; { description = "Reverse HTTP proxy to filter requests by different rules."; homepage = "https://github.com/asciimoo/filtron"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = [ maintainers.dasj19 ]; platforms = platforms.linux; mainProgram = "filtron"; diff --git a/pkgs/servers/home-assistant/custom-components/better_thermostat/default.nix b/pkgs/servers/home-assistant/custom-components/better_thermostat/default.nix index a4a514b2693c..d61d1850e13b 100644 --- a/pkgs/servers/home-assistant/custom-components/better_thermostat/default.nix +++ b/pkgs/servers/home-assistant/custom-components/better_thermostat/default.nix @@ -19,6 +19,6 @@ buildHomeAssistantComponent rec { "Smart TRV control integrates room-temp sensors, window/door sensors, weather forecasts, and ambient probes for efficient heating and calibration, enhancing energy savings and comfort."; homepage = "https://better-thermostat.org/"; maintainers = with maintainers; [ mguentner ]; - license = licenses.agpl3; + license = licenses.agpl3Only; }; } diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index ac631331fe71..978a1c854b38 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -77,7 +77,7 @@ let self = { meta = with lib; { description = "Validates Akamai v2 query string tokens"; homepage = "https://github.com/kaltura/nginx-akamai-token-validate-module"; - license = with licenses; [ agpl3 ]; + license = with licenses; [ agpl3Only ]; maintainers = with maintainers; [ ]; }; }; @@ -685,7 +685,7 @@ let self = { meta = with lib; { 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 licenses; [ agpl3 ]; + license = with licenses; [ agpl3Only ]; maintainers = with maintainers; [ ]; }; }; @@ -1004,7 +1004,7 @@ let self = { meta = with lib; { description = "VOD packager"; homepage = "https://github.com/kaltura/nginx-vod-module"; - license = with licenses; [ agpl3 ]; + license = with licenses; [ agpl3Only ]; maintainers = with maintainers; [ ]; }; }; diff --git a/pkgs/servers/invidious/default.nix b/pkgs/servers/invidious/default.nix index 6ca98eeeec8c..f659b75df443 100644 --- a/pkgs/servers/invidious/default.nix +++ b/pkgs/servers/invidious/default.nix @@ -109,7 +109,7 @@ crystal.buildCrystalPackage rec { description = "An open source alternative front-end to YouTube"; mainProgram = "invidious"; homepage = "https://invidious.io/"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ infinisil sbruder ]; }; } diff --git a/pkgs/servers/matrix-hebbot/default.nix b/pkgs/servers/matrix-hebbot/default.nix index 59e4ca1b1916..e8c0f7076a17 100644 --- a/pkgs/servers/matrix-hebbot/default.nix +++ b/pkgs/servers/matrix-hebbot/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { description = "A 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/v${version}"; - license = with licenses; [ agpl3 ]; + license = with licenses; [ agpl3Only ]; mainProgram = "hebbot"; maintainers = with maintainers; [ a-kenji ]; }; diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index a383bc3650b9..ca152079e073 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -77,7 +77,7 @@ buildGoModule rec { meta = with lib; { description = "Mattermost is an open source platform for secure collaboration across the entire software development lifecycle"; homepage = "https://www.mattermost.org"; - license = with licenses; [ agpl3 asl20 ]; + license = with licenses; [ agpl3Only asl20 ]; maintainers = with maintainers; [ ryantm numinit kranzes mgdelacroix ]; mainProgram = "mattermost"; }; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index d4812c449653..99846f7babfe 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -134,7 +134,7 @@ buildGoModule rec { meta = with lib; { description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"; - license = licenses.agpl3; + license = licenses.agpl3Only; homepage = "https://grafana.com"; maintainers = with maintainers; [ offline fpletz willibutz globin ma27 Frostman ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/servers/monitoring/phlare/default.nix b/pkgs/servers/monitoring/phlare/default.nix index 35d6d5fd80cf..bc2c7cee63e5 100644 --- a/pkgs/servers/monitoring/phlare/default.nix +++ b/pkgs/servers/monitoring/phlare/default.nix @@ -33,7 +33,7 @@ buildGoModule rec { meta = with lib; { description = "Grafana Phlare is an open source database that provides fast, scalable, highly available, and efficient storage and querying of profiling data."; - license = licenses.agpl3; + license = licenses.agpl3Only; homepage = "https://grafana.com/oss/phlare"; maintainers = with maintainers; [ cathalmullan ]; }; diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix index b7c4ccdf16c1..12cb89c2133e 100644 --- a/pkgs/servers/nosql/aerospike/default.nix +++ b/pkgs/servers/nosql/aerospike/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Flash-optimized, in-memory, NoSQL database"; mainProgram = "asd"; homepage = "https://aerospike.com/"; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kalbasit ]; }; diff --git a/pkgs/servers/onlyoffice-documentserver/default.nix b/pkgs/servers/onlyoffice-documentserver/default.nix index c19409efcd75..61ea3cf6fd94 100644 --- a/pkgs/servers/onlyoffice-documentserver/default.nix +++ b/pkgs/servers/onlyoffice-documentserver/default.nix @@ -143,7 +143,7 @@ let fully compatible with Office Open XML formats: .docx, .xlsx, .pptx and enabling collaborative editing in real time. ''; homepage = "ONLYOFFICE Document Server is an online office suite comprising viewers and editors"; - license = licenses.agpl3; + license = licenses.agpl3Plus; platforms = [ "x86_64-linux" ]; sourceProvenance = [ sourceTypes.binaryNativeCode ]; maintainers = with maintainers; [ SuperSandro2000 ]; diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index c57c1bad3d87..a1876b1fa374 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -163,7 +163,7 @@ beamPackages.mixRelease rec { meta = with lib; { description = "ActivityPub microblogging server"; homepage = "https://git.pleroma.social/pleroma/pleroma"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ picnoir yuka kloenk yayayayaka ]; platforms = platforms.unix; }; diff --git a/pkgs/servers/rainloop/default.nix b/pkgs/servers/rainloop/default.nix index 1c7c76b2bd43..f034f83f4835 100644 --- a/pkgs/servers/rainloop/default.nix +++ b/pkgs/servers/rainloop/default.nix @@ -54,7 +54,7 @@ description = "Simple, modern & fast web-based email client"; homepage = "https://www.rainloop.net"; downloadPage = "https://github.com/RainLoop/rainloop-webmail/releases"; - license = with licenses; if edition == "" then unfree else agpl3; + license = with licenses; if edition == "" then unfree else agpl3Only; platforms = platforms.all; maintainers = with maintainers; [ das_j ]; }; diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index 4e65ed11c0e2..4393e48d66ce 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = "https://snappymail.eu"; changelog = "https://github.com/the-djmaze/snappymail/blob/v${version}/CHANGELOG.md"; downloadPage = "https://github.com/the-djmaze/snappymail/releases"; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = platforms.all; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix index 705c5b935bfb..53907baed59d 100644 --- a/pkgs/servers/sozu/default.nix +++ b/pkgs/servers/sozu/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { "Open Source HTTP Reverse Proxy built in Rust for Immutable Infrastructures"; homepage = "https://www.sozu.io"; changelog = "https://github.com/sozu-proxy/sozu/releases/tag/${version}"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ Br1ght0ne gaelreyrol ]; mainProgram = "sozu"; # error[E0432]: unresolved import `std::arch::x86_64` diff --git a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix index 96dfaa7f29b7..7ef093e3f70d 100644 --- a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix +++ b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { The name of the plugin in TT-RSS is 'ff_instagram'. ''; - license = licenses.agpl3; + license = licenses.agpl3Plus; homepage = "https://github.com/wltb/ff_instagram"; maintainers = with maintainers; [ das_j ]; platforms = platforms.all; diff --git a/pkgs/servers/web-apps/hedgedoc/default.nix b/pkgs/servers/web-apps/hedgedoc/default.nix index 8191ec59075f..1992c14270e7 100644 --- a/pkgs/servers/web-apps/hedgedoc/default.nix +++ b/pkgs/servers/web-apps/hedgedoc/default.nix @@ -108,7 +108,7 @@ in stdenv.mkDerivation { meta = { description = "Realtime collaborative markdown notes on all platforms"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; homepage = "https://hedgedoc.org"; mainProgram = "hedgedoc"; maintainers = with lib.maintainers; [ SuperSandro2000 ]; diff --git a/pkgs/servers/web-apps/jirafeau/default.nix b/pkgs/servers/web-apps/jirafeau/default.nix index 8001e5804970..bf67125e1dab 100644 --- a/pkgs/servers/web-apps/jirafeau/default.nix +++ b/pkgs/servers/web-apps/jirafeau/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Website permitting upload of a file in a simple way and giving a unique link to it"; - license = licenses.agpl3; + license = licenses.agpl3Plus; homepage = "https://gitlab.com/mojo42/Jirafeau"; platforms = platforms.all; maintainers = with maintainers; [ davidtwco ]; diff --git a/pkgs/servers/web-apps/lemmy/package.json b/pkgs/servers/web-apps/lemmy/package.json index 813c77507225..97600d6801a2 100644 --- a/pkgs/servers/web-apps/lemmy/package.json +++ b/pkgs/servers/web-apps/lemmy/package.json @@ -3,7 +3,7 @@ "description": "An isomorphic UI for lemmy", "version": "0.19.3", "author": "Dessalines <tyhou13@gmx.com>", - "license": "AGPL-3.0", + "license": "AGPL-3.0-only", "scripts": { "analyze": "webpack --mode=none", "build:dev": "webpack --env COMMIT_HASH=$(git rev-parse --short HEAD) --mode=development", diff --git a/pkgs/servers/web-apps/morty/default.nix b/pkgs/servers/web-apps/morty/default.nix index ad233f23916b..b44d2e03bf16 100644 --- a/pkgs/servers/web-apps/morty/default.nix +++ b/pkgs/servers/web-apps/morty/default.nix @@ -24,6 +24,6 @@ buildGoModule { ''; homepage = "https://github.com/asciimoo/morty"; maintainers = with maintainers; [ leenaars SuperSandro2000 ]; - license = licenses.agpl3; + license = licenses.agpl3Only; }; } diff --git a/pkgs/servers/web-apps/slskd/default.nix b/pkgs/servers/web-apps/slskd/default.nix index a085edfb1e14..7a2a388086c1 100644 --- a/pkgs/servers/web-apps/slskd/default.nix +++ b/pkgs/servers/web-apps/slskd/default.nix @@ -20,7 +20,7 @@ let meta = with lib; { description = "A modern client-server application for the Soulseek file sharing network"; homepage = "https://github.com/slskd/slskd"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ ppom ]; platforms = platforms.linux; }; diff --git a/pkgs/shells/fzf-git-sh/default.nix b/pkgs/shells/fzf-git-sh/default.nix index 598c2d0eb0b2..8d7ce5d1e0f7 100644 --- a/pkgs/shells/fzf-git-sh/default.nix +++ b/pkgs/shells/fzf-git-sh/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "fzf-git-sh"; - version = "unstable-2022-09-30"; + version = "0-unstable-2024-03-17"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf-git.sh"; - rev = "9190e1bf7273d85f435fa759a5c3b20e588e9f7e"; - sha256 = "sha256-2CGjk1oTXip+eAJMuOk/X3e2KTwfwzcKTcGToA2xPd4="; + rev = "e4cba1fcf8aed9a2348e47b0ba64299122b81709"; + hash = "sha256-glI+TldLGGiXyI5ZghaEgjc+2DJCMdmBnho/Z7IgJoE="; }; dontBuild = true; diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/shells/liquidprompt/default.nix index 47e2e72c7ab7..acb34377d28d 100644 --- a/pkgs/shells/liquidprompt/default.nix +++ b/pkgs/shells/liquidprompt/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A full-featured & carefully designed adaptive prompt for Bash & Zsh"; homepage = "https://github.com/nojhan/liquidprompt"; - license = licenses.agpl3; + license = licenses.agpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ gerschtli ]; }; diff --git a/pkgs/shells/yash/default.nix b/pkgs/shells/yash/default.nix index 002109ee666a..4643898fec84 100644 --- a/pkgs/shells/yash/default.nix +++ b/pkgs/shells/yash/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "yash"; - version = "2.55"; + version = "2.56.1"; src = fetchFromGitHub { owner = "magicant"; repo = pname; rev = version; - hash = "sha256-raTIqklo69JEuhzdWUK3uywuLjqeQJCJ9nvnLRxlGr4="; + hash = "sha256-G4l0JmtrYaVKfQiJKTOiNWgpsKNhHtbAT0l/VboMJTc="; }; strictDeps = true; diff --git a/pkgs/tools/admin/hedgedoc-cli/default.nix b/pkgs/tools/admin/hedgedoc-cli/default.nix index 0af64919e746..ce1497b62c7c 100644 --- a/pkgs/tools/admin/hedgedoc-cli/default.nix +++ b/pkgs/tools/admin/hedgedoc-cli/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Hedgedoc CLI"; homepage = "https://github.com/hedgedoc/cli"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ drupol ]; }; } diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 65dd2c70daa2..d66fd7cb3a45 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -18,11 +18,11 @@ buildGoModule rec { pname = "lxd-unwrapped"; - version = "5.20"; + version = "5.21.0"; src = fetchurl { url = "https://github.com/canonical/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz"; - hash = "sha256-L5WLdX9M3mTQ81eNoL2p7lllo6cOwJVu3fgofRKQFn8="; + hash = "sha256-vnh+8Jm4Olg+VdAPpGboLSbChdnwsU84IgyzGe4ltg8="; }; vendorHash = null; @@ -87,7 +87,7 @@ buildGoModule rec { description = "Daemon based on liblxc offering a REST API to manage containers"; homepage = "https://ubuntu.com/lxd"; changelog = "https://github.com/canonical/lxd/releases/tag/lxd-${version}"; - license = with licenses; [ asl20 agpl3 ]; + license = with licenses; [ asl20 agpl3Plus ]; maintainers = teams.lxc.members; platforms = platforms.linux; }; diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index d78e75685f05..4684631efe9a 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "BURP - BackUp and Restore Program"; homepage = "https://burp.grke.org"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ arjan-s ]; platforms = platforms.all; }; diff --git a/pkgs/tools/misc/altserver-linux/default.nix b/pkgs/tools/misc/altserver-linux/default.nix index 701fe0d5afb9..30d528294901 100644 --- a/pkgs/tools/misc/altserver-linux/default.nix +++ b/pkgs/tools/misc/altserver-linux/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/NyaMisty/AltServer-Linux"; description = "AltServer for AltStore, but on-device. Requires root privileges as well as running a custom anisette server currently"; - license = licenses.agpl3; + license = licenses.agpl3Only; mainProgram = "alt-server"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index 26170d148943..cad2c4506374 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { - Option to ignore clipboard updates form certain applications. (filter_classes) - Ability to delete items in clipboard history. ''; - license = licenses.agpl3; + license = licenses.agpl3Only; homepage = "https://github.com/mrichar1/clipster"; platforms = platforms.linux; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix index 266ef9accca6..4e997c65565a 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ]; # AGPL with a lesser clause - license = licenses.agpl3; + license = licenses.agpl3Plus; }; } diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix index 5f56291f26f7..f14c19e0e474 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ asymmetric ]; # AGPL with a lesser clause - license = licenses.agpl3; + license = licenses.agpl3Plus; }; } diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix index ee9cb1da687f..bc4186c9b8e7 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ asymmetric ]; # AGPL with a lesser clause - license = licenses.agpl3; + license = licenses.agpl3Plus; }; } diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix index 57e55400aa27..6014c6c5c779 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ asymmetric ]; # AGPL with a lesser clause - license = licenses.agpl3; + license = licenses.agpl3Plus; }; } diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 70a0f9bff6ef..cebd5090bfe5 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ]; # AGPL with a lesser clause - license = licenses.agpl3; + license = licenses.agpl3Plus; }; } diff --git a/pkgs/tools/misc/pb/default.nix b/pkgs/tools/misc/pb/default.nix index 1cbe8eded5cb..061ca691af75 100644 --- a/pkgs/tools/misc/pb/default.nix +++ b/pkgs/tools/misc/pb/default.nix @@ -30,7 +30,7 @@ buildGoModule rec { homepage = "https://github.com/parseablehq/pb"; changelog = "https://github.com/parseablehq/pb/releases/tag/v${version}"; description = "CLI client for Parseable server"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ aaronjheng ]; mainProgram = "pb"; }; diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index 04e4593f1ebd..ef2b17828d80 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -41,7 +41,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://steampipe.io/"; description = "select * from cloud;"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ hardselius ]; changelog = "https://github.com/turbot/steampipe/blob/v${version}/CHANGELOG.md"; }; diff --git a/pkgs/tools/networking/curl-impersonate/default.nix b/pkgs/tools/networking/curl-impersonate/default.nix index 070aab8d53f2..f4373e09b052 100644 --- a/pkgs/tools/networking/curl-impersonate/default.nix +++ b/pkgs/tools/networking/curl-impersonate/default.nix @@ -11,7 +11,10 @@ , python3 , ninja , perl -, autoconf +# autoconf-2.71 fails on problematic configure: +# checking curl version... 7.84.0 +# ./configure: line 6713: syntax error near unexpected token `;;' +, autoconf269 , automake , libtool , darwin @@ -40,6 +43,10 @@ let ./curl-impersonate-0.5.2-fix-shebangs.patch ]; + # Disable blanket -Werror to fix build on `gcc-13` related to minor + # warnings on `boringssl`. + env.NIX_CFLAGS_COMPILE = "-Wno-error"; + strictDeps = true; nativeBuildInputs = lib.optionals stdenv.isDarwin [ @@ -52,7 +59,7 @@ let python3.pkgs.gyp ninja perl - autoconf + autoconf269 automake libtool unzip diff --git a/pkgs/tools/networking/ratman/default.nix b/pkgs/tools/networking/ratman/default.nix index a78840095d88..65f32add0f6b 100644 --- a/pkgs/tools/networking/ratman/default.nix +++ b/pkgs/tools/networking/ratman/default.nix @@ -87,7 +87,7 @@ rustPlatform.buildRustPackage rec { description = "A modular decentralised peer-to-peer packet router and associated tools"; homepage = "https://git.irde.st/we/irdest"; platforms = platforms.unix; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ spacekookie yuka ]; }; } diff --git a/pkgs/tools/networking/saldl/default.nix b/pkgs/tools/networking/saldl/default.nix index b7281d3a20a7..7f1551cd85b8 100644 --- a/pkgs/tools/networking/saldl/default.nix +++ b/pkgs/tools/networking/saldl/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "CLI downloader optimized for speed and early preview"; homepage = "https://saldl.github.io"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ zowoq ]; platforms = platforms.all; mainProgram = "saldl"; diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix index 0ee71eb1e651..c428b40547f1 100644 --- a/pkgs/tools/networking/wuzz/default.nix +++ b/pkgs/tools/networking/wuzz/default.nix @@ -25,7 +25,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/asciimoo/wuzz"; description = "Interactive cli tool for HTTP inspection"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ pradeepchhetri ]; mainProgram = "wuzz"; }; diff --git a/pkgs/tools/package-management/harmonia/default.nix b/pkgs/tools/package-management/harmonia/default.nix index a80f9636dd51..8e174cf68a89 100644 --- a/pkgs/tools/package-management/harmonia/default.nix +++ b/pkgs/tools/package-management/harmonia/default.nix @@ -12,25 +12,25 @@ rustPlatform.buildRustPackage rec { pname = "harmonia"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-72JMrXmxw/FuGjqXXxMIGiAbUUOqXEERdQwch+s3iwU="; + hash = "sha256-QqRq5maYk4hDl0MXkj9wOPWUta5b+kXG9e/kqRorNE4="; }; - cargoHash = "sha256-Q5Y5v7mmJpfZFGRgurTcRBRtbApFRrwqOBHdZTJbyzc="; + cargoHash = "sha256-dlmSn4cWU6RqEiUoQYNJFhxu3owplkxlbtszBxm+GbU="; nativeBuildInputs = [ - pkg-config nixVersions.nix_2_19 + pkg-config nixVersions.nix_2_21 ]; buildInputs = [ boost libsodium - nixVersions.nix_2_19 + nixVersions.nix_2_21 ]; passthru = { diff --git a/pkgs/tools/system/illum/default.nix b/pkgs/tools/system/illum/default.nix index 3d33be9ed635..81d8bbee7b8d 100644 --- a/pkgs/tools/system/illum/default.nix +++ b/pkgs/tools/system/illum/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "Daemon that wires button presses to screen backlight level"; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.dancek ]; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Plus; mainProgram = "illum-d"; }; } diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index bd36d6fa400e..319d3492b48e 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://mmonit.com/monit/"; description = "Monitoring system"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ raskin wmertens ryantm ]; platforms = with lib; platforms.linux ++ platforms.darwin; mainProgram = "monit"; diff --git a/pkgs/tools/virtualization/xen-guest-agent/default.nix b/pkgs/tools/virtualization/xen-guest-agent/default.nix index 52924b2b624f..2ddbbe45955a 100644 --- a/pkgs/tools/virtualization/xen-guest-agent/default.nix +++ b/pkgs/tools/virtualization/xen-guest-agent/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Xen agent running in Linux/BSDs (POSIX) VMs"; homepage = "https://gitlab.com/xen-project/xen-guest-agent"; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = platforms.unix; maintainers = with maintainers; [matdibu]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbecd5958f50..3c7aa60a14d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7273,11 +7273,9 @@ with pkgs; curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; - curl-impersonate = - builtins.mapAttrs (_: pin-to-gcc12-if-gcc13) - (darwin.apple_sdk_11_0.callPackage ../tools/networking/curl-impersonate { }); - curl-impersonate-ff = pin-to-gcc12-if-gcc13 curl-impersonate.curl-impersonate-ff; - curl-impersonate-chrome = pin-to-gcc12-if-gcc13 curl-impersonate.curl-impersonate-chrome; + curl-impersonate = darwin.apple_sdk_11_0.callPackage ../tools/networking/curl-impersonate { }; + curl-impersonate-ff = curl-impersonate.curl-impersonate-ff; + curl-impersonate-chrome = curl-impersonate.curl-impersonate-chrome; curlie = callPackage ../tools/networking/curlie { }; @@ -10598,7 +10596,9 @@ with pkgs; lxcfs = callPackage ../os-specific/linux/lxcfs { }; lxd = callPackage ../tools/admin/lxd/wrapper.nix { }; - lxd-unwrapped = callPackage ../tools/admin/lxd { }; + lxd-unwrapped = callPackage ../tools/admin/lxd { + buildGoModule = buildGo122Module; + }; lxd-image-server = callPackage ../tools/virtualization/lxd-image-server { }; @@ -10892,7 +10892,7 @@ with pkgs; metasploit = callPackage ../tools/security/metasploit { }; mhost = callPackage ../applications/networking/mhost { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; ms-sys = callPackage ../tools/misc/ms-sys { }; @@ -14110,8 +14110,6 @@ with pkgs; typos = callPackage ../development/tools/typos { }; - typstfmt = callPackage ../tools/typesetting/typstfmt { }; - typst-live = callPackage ../tools/typesetting/typst-live { }; tz = callPackage ../tools/misc/tz { }; @@ -17091,10 +17089,6 @@ with pkgs; stalin = callPackage ../development/compilers/stalin { }; - stanc = callPackage ../development/compilers/stanc { - ocamlPackages = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; - }; - metaBuildEnv = callPackage ../development/compilers/meta-environment/meta-build-env { }; svd2rust = callPackage ../development/tools/rust/svd2rust { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b757c630420f..b0c098ddcaa8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -298,6 +298,13 @@ in { packages.ghc963 else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then packages.ghc963 + else if stdenv.hostPlatform.isDarwin then + # it seems like the GHC 9.6.* bindists are built with a different + # toolchain than we are using (which I'm guessing from the fact + # that 9.6.4 bindists pass linker flags our ld doesn't support). + # With both 9.6.3 and 9.6.4 binary it is impossible to link against + # the clock package (probably a hsc2hs problem). + packages.ghc963 else packages.ghc963Binary; inherit (buildPackages.python3Packages) sphinx; @@ -316,6 +323,13 @@ in { packages.ghc963 else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then packages.ghc963 + else if stdenv.hostPlatform.isDarwin then + # it seems like the GHC 9.6.* bindists are built with a different + # toolchain than we are using (which I'm guessing from the fact + # that 9.6.4 bindists pass linker flags our ld doesn't support). + # With both 9.6.3 and 9.6.4 binary it is impossible to link against + # the clock package (probably a hsc2hs problem). + packages.ghc963 else packages.ghc963Binary; inherit (buildPackages.python3Packages) sphinx; @@ -335,6 +349,13 @@ in { packages.ghc963 else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then packages.ghc963 + else if stdenv.hostPlatform.isDarwin then + # it seems like the GHC 9.6.* bindists are built with a different + # toolchain than we are using (which I'm guessing from the fact + # that 9.6.4 bindists pass linker flags our ld doesn't support). + # With both 9.6.3 and 9.6.4 binary it is impossible to link against + # the clock package (probably a hsc2hs problem). + packages.ghc963 else packages.ghc963Binary; inherit (buildPackages.python3Packages) sphinx; |