diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 055857336729..e1f60b5be9dd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4578,6 +4578,13 @@ githubId = 1707779; name = "Chris Ertel"; }; + crimeminister = { + email = "robert@crimeminister.org"; + name = "Robert Medeiros"; + github = "crimeminister"; + githubId = 29072; + keys = [ { fingerprint = "E3BD A35E 590A 8D29 701A 9723 F448 7FA0 4BC6 44F2"; } ]; + }; crinklywrappr = { email = "crinklywrappr@pm.me"; name = "Daniel Fitzpatrick"; diff --git a/nixos/modules/services/misc/rmfakecloud.nix b/nixos/modules/services/misc/rmfakecloud.nix index 6cc87753aa25..d19a9969a3ff 100644 --- a/nixos/modules/services/misc/rmfakecloud.nix +++ b/nixos/modules/services/misc/rmfakecloud.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; @@ -6,18 +11,13 @@ let cfg = config.services.rmfakecloud; serviceDataDir = "/var/lib/rmfakecloud"; -in { +in +{ options = { services.rmfakecloud = { enable = mkEnableOption "rmfakecloud remarkable self-hosted cloud"; - package = mkPackageOption pkgs "rmfakecloud" { - extraDescription = '' - ::: {.note} - The default does not include the web user interface. - ::: - ''; - }; + package = mkPackageOption pkgs "rmfakecloud" { }; storageUrl = mkOption { type = types.str; @@ -36,7 +36,12 @@ in { }; logLevel = mkOption { - type = types.enum [ "info" "debug" "warn" "error" ]; + type = types.enum [ + "info" + "debug" + "warn" + "error" + ]; default = "info"; description = '' Logging level. @@ -46,7 +51,9 @@ in { extraSettings = mkOption { type = with types; attrsOf str; default = { }; - example = { DATADIR = "/custom/path/for/rmfakecloud/data"; }; + example = { + DATADIR = "/custom/path/for/rmfakecloud/data"; + }; description = '' Extra settings in the form of a set of key-value pairs. For tokens and secrets, use `environmentFile` instead. @@ -106,11 +113,9 @@ in { Type = "simple"; Restart = "always"; - EnvironmentFile = - mkIf (cfg.environmentFile != null) cfg.environmentFile; + EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile; - AmbientCapabilities = - mkIf (cfg.port < 1024) [ "CAP_NET_BIND_SERVICE" ]; + AmbientCapabilities = mkIf (cfg.port < 1024) [ "CAP_NET_BIND_SERVICE" ]; DynamicUser = true; PrivateDevices = true; @@ -128,7 +133,10 @@ in { ProtectProc = "invisible"; ProcSubset = "pid"; RemoveIPC = true; - RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 14a1439eeae7..47c1ce41671b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -876,6 +876,7 @@ in { retroarch = handleTest ./retroarch.nix {}; rke2 = handleTestOn ["aarch64-linux" "x86_64-linux"] ./rke2 {}; rkvm = handleTest ./rkvm {}; + rmfakecloud = runTest ./rmfakecloud.nix; robustirc-bridge = handleTest ./robustirc-bridge.nix {}; roundcube = handleTest ./roundcube.nix {}; rosenpass = handleTest ./rosenpass.nix {}; diff --git a/nixos/tests/rmfakecloud.nix b/nixos/tests/rmfakecloud.nix new file mode 100644 index 000000000000..f226c20b9577 --- /dev/null +++ b/nixos/tests/rmfakecloud.nix @@ -0,0 +1,67 @@ +{ pkgs, ... }: +{ + name = "rmfakecloud"; + meta = with pkgs.lib.maintainers; { + maintainers = [ martinetd ]; + }; + + nodes.machine = { + services.rmfakecloud = { + enable = true; + storageUrl = "https://local.appspot.com"; + }; + }; + + testScript = '' + machine.wait_for_unit("rmfakecloud.service") + machine.wait_for_open_port(3000) + + # first login creates user + login_token = machine.succeed(""" + curl -sSf -b cookie -c cookie -H "Content-Type: application/json" \ + -d'{"email":"test","password":"test"}' -X POST \ + http://localhost:3000/ui/api/login + """) + + # subsequent different pass or mail should fail, but same login works + machine.fail(""" + curl -sSf -H "Content-Type: application/json" \ + -d'{"email":"test","password":"test2"}' -X POST \ + http://localhost:3000/ui/api/login + """) + machine.fail(""" + curl -sSf -H "Content-Type: application/json" \ + -d'{"email":"test2","password":"test"}' -X POST + http://localhost:3000/ui/api/login + """) + machine.succeed(""" + curl -sSf -H "Content-Type: application/json" \ + -d'{"email":"test","password":"test"}' -X POST \ + http://localhost:3000/ui/api/login + """) + + # can get code from cookie or bearer + machine.succeed(""" + curl -sSf -b cookie -c cookie http://localhost:3000/ui/api/newcode + """) + newcode = machine.succeed(f""" + curl -sSf -H "Authorization: Bearer {login_token}" \ + http://localhost:3000/ui/api/newcode + """).strip('"') + + # ... but not junk + machine.fail(f""" + curl -sSf -H "Authorization: Bearer abc{login_token}" \ + http://localhost:3000/ui/api/newcode + """) + + # can connect "device" with said code + machine.succeed(f""" + curl -sSf -d '{{"code":"{newcode}", "deviceDesc": "desc", "deviceID":"rm100-123"}}' \ + http://localhost:3000/token/json/2/device/new + """) + + # for future improvements + machine.log(machine.execute("systemd-analyze security rmfakecloud.service")[1]) + ''; +} diff --git a/nixos/tests/technitium-dns-server.nix b/nixos/tests/technitium-dns-server.nix index 016c9d4ecead..12ee57ed52d2 100644 --- a/nixos/tests/technitium-dns-server.nix +++ b/nixos/tests/technitium-dns-server.nix @@ -12,9 +12,15 @@ import ./make-test-python.nix ({pkgs, lib, ...}: }; testScript = '' + import json + start_all() machine.wait_for_unit("technitium-dns-server.service") machine.wait_for_open_port(53) + curl_cmd = 'curl --fail-with-body -X GET "http://localhost:5380/api/user/login?user=admin&pass=admin"' + output = json.loads(machine.wait_until_succeeds(curl_cmd, timeout=10)) + print(output) + assert "ok" == output['status'], "status not ok" ''; meta.maintainers = with lib.maintainers; [ fabianrig ]; diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 087b415c241f..602f2a312675 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -7,13 +7,13 @@ let apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ]; in stdenv.mkDerivation rec { pname = "backintime-common"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "bit-team"; repo = "backintime"; rev = "v${version}"; - sha256 = "sha256-yfCSTzCmhXDBC1vYqwgVjsYUtc5VO1VW74BmIB0hHfE="; + sha256 = "sha256-byJyRsjZND0CQAfx45jQa3PNHhqzF2O0cFGSfN4o/QA="; }; nativeBuildInputs = [ makeWrapper gettext ]; diff --git a/pkgs/applications/version-management/gitqlient/default.nix b/pkgs/applications/version-management/gitqlient/default.nix index c6b1e82cc873..da140e1b887d 100644 --- a/pkgs/applications/version-management/gitqlient/default.nix +++ b/pkgs/applications/version-management/gitqlient/default.nix @@ -8,14 +8,14 @@ mkDerivation rec { pname = "gitqlient"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "francescmm"; repo = "gitqlient"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-fHrsDEHEUgQYkZdnSzJ/+gTsV0eX8tOqSlr7vNH6LVs="; + hash = "sha256-gfWky5KTSj+5FC++QIVTJbrDOYi/dirTzs6LvTnO74A="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/acpic/default.nix b/pkgs/by-name/ac/acpic/package.nix similarity index 100% rename from pkgs/applications/misc/acpic/default.nix rename to pkgs/by-name/ac/acpic/package.nix diff --git a/pkgs/by-name/ac/activemq/package.nix b/pkgs/by-name/ac/activemq/package.nix index 81a6b540f232..c691f398bb9c 100644 --- a/pkgs/by-name/ac/activemq/package.nix +++ b/pkgs/by-name/ac/activemq/package.nix @@ -5,7 +5,7 @@ }: let - version = "6.1.3"; + version = "6.1.4"; in stdenvNoCC.mkDerivation { pname = "activemq"; @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation { src = fetchurl { url = "https://archive.apache.org/dist/activemq/${version}/apache-activemq-${version}-bin.tar.gz"; - hash = "sha256-ytFOgW6ZDxMScJ6/wij0KJXYxUxlLTzVbwtRRWNdx5Q="; + hash = "sha256-8b0no0XUNOw3U2ULWtNW9R7DAWXtAajvh0nGuTkVNfM="; }; installPhase = '' diff --git a/pkgs/tools/audio/botamusique/catch-invalid-versions.patch b/pkgs/by-name/bo/botamusique/catch-invalid-versions.patch similarity index 100% rename from pkgs/tools/audio/botamusique/catch-invalid-versions.patch rename to pkgs/by-name/bo/botamusique/catch-invalid-versions.patch diff --git a/pkgs/tools/audio/botamusique/no-runtime-update.patch b/pkgs/by-name/bo/botamusique/no-runtime-update.patch similarity index 100% rename from pkgs/tools/audio/botamusique/no-runtime-update.patch rename to pkgs/by-name/bo/botamusique/no-runtime-update.patch diff --git a/pkgs/tools/audio/botamusique/default.nix b/pkgs/by-name/bo/botamusique/package.nix similarity index 100% rename from pkgs/tools/audio/botamusique/default.nix rename to pkgs/by-name/bo/botamusique/package.nix diff --git a/pkgs/tools/audio/botamusique/src.json b/pkgs/by-name/bo/botamusique/src.json similarity index 100% rename from pkgs/tools/audio/botamusique/src.json rename to pkgs/by-name/bo/botamusique/src.json diff --git a/pkgs/tools/audio/botamusique/unconditional-relative-state-paths.patch b/pkgs/by-name/bo/botamusique/unconditional-relative-state-paths.patch similarity index 100% rename from pkgs/tools/audio/botamusique/unconditional-relative-state-paths.patch rename to pkgs/by-name/bo/botamusique/unconditional-relative-state-paths.patch diff --git a/pkgs/by-name/ca/cardinal/package.nix b/pkgs/by-name/ca/cardinal/package.nix index a9d653b2f0f2..a0307bb8c7a4 100644 --- a/pkgs/by-name/ca/cardinal/package.nix +++ b/pkgs/by-name/ca/cardinal/package.nix @@ -1,28 +1,29 @@ -{ stdenv -, fetchurl -, cmake -, dbus -, fftwFloat -, file -, freetype -, jansson -, lib -, libGL -, libX11 -, libXcursor -, libXext -, libXrandr -, libarchive -, libjack2 -, liblo -, libsamplerate -, libsndfile -, makeWrapper -, pkg-config -, python3 -, speexdsp -, libglvnd -, headless ? false +{ + stdenv, + fetchurl, + cmake, + dbus, + fftwFloat, + file, + freetype, + jansson, + lib, + libGL, + libX11, + libXcursor, + libXext, + libXrandr, + libarchive, + libjack2, + liblo, + libsamplerate, + libsndfile, + makeWrapper, + pkg-config, + python3, + speexdsp, + libglvnd, + headless ? false, }: stdenv.mkDerivation rec { @@ -69,7 +70,13 @@ stdenv.mkDerivation rec { ]; hardeningDisable = [ "format" ]; - makeFlags = lib.optional headless "HEADLESS=true" ++ [ "SYSDEPS=true" "PREFIX=$(out)" ]; + makeFlags = + [ + "SYSDEPS=true" + "PREFIX=$(out)" + ] + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "CROSS_COMPILING=true" + ++ lib.optional headless "HEADLESS=true"; postInstall = '' wrapProgram $out/bin/Cardinal \ @@ -86,7 +93,10 @@ stdenv.mkDerivation rec { description = "Plugin wrapper around VCV Rack"; homepage = "https://github.com/DISTRHO/cardinal"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ magnetophon PowerUser64 ]; + maintainers = with lib.maintainers; [ + magnetophon + PowerUser64 + ]; mainProgram = "Cardinal"; platforms = lib.platforms.all; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs diff --git a/pkgs/applications/audio/castopod/default.nix b/pkgs/by-name/ca/castopod/package.nix similarity index 100% rename from pkgs/applications/audio/castopod/default.nix rename to pkgs/by-name/ca/castopod/package.nix diff --git a/pkgs/applications/audio/castopod/update.sh b/pkgs/by-name/ca/castopod/update.sh similarity index 100% rename from pkgs/applications/audio/castopod/update.sh rename to pkgs/by-name/ca/castopod/update.sh diff --git a/pkgs/applications/misc/cloak/default.nix b/pkgs/by-name/cl/cloak/package.nix similarity index 100% rename from pkgs/applications/misc/cloak/default.nix rename to pkgs/by-name/cl/cloak/package.nix diff --git a/pkgs/applications/misc/coltrane/Gemfile b/pkgs/by-name/co/coltrane/Gemfile similarity index 100% rename from pkgs/applications/misc/coltrane/Gemfile rename to pkgs/by-name/co/coltrane/Gemfile diff --git a/pkgs/applications/misc/coltrane/Gemfile.lock b/pkgs/by-name/co/coltrane/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/coltrane/Gemfile.lock rename to pkgs/by-name/co/coltrane/Gemfile.lock diff --git a/pkgs/applications/misc/coltrane/gemset.nix b/pkgs/by-name/co/coltrane/gemset.nix similarity index 100% rename from pkgs/applications/misc/coltrane/gemset.nix rename to pkgs/by-name/co/coltrane/gemset.nix diff --git a/pkgs/applications/misc/coltrane/default.nix b/pkgs/by-name/co/coltrane/package.nix similarity index 100% rename from pkgs/applications/misc/coltrane/default.nix rename to pkgs/by-name/co/coltrane/package.nix diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/by-name/co/cotp/package.nix similarity index 100% rename from pkgs/applications/misc/cotp/default.nix rename to pkgs/by-name/co/cotp/package.nix diff --git a/pkgs/by-name/dc/dcrwallet/package.nix b/pkgs/by-name/dc/dcrwallet/package.nix index 1773d45157ce..0450bbf6b0a0 100644 --- a/pkgs/by-name/dc/dcrwallet/package.nix +++ b/pkgs/by-name/dc/dcrwallet/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dcrwallet"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "decred"; repo = "dcrwallet"; rev = "release-v${version}"; - hash = "sha256-JKux64ANtoBumfVU2OyAyLgHDNZMe/bn+SMuQ8qV43M="; + hash = "sha256-0Sqv71G/hxk793kY/j9+HH4P1/W+/do87TZascd8UoI="; }; - vendorHash = "sha256-ic8328r3BpycC2NiErTiFtRIkQaBhYcBwRgq/t9hmT8="; + vendorHash = "sha256-UyU6aSgkHNIi8mP9IUHzD/o726l/XyfgBJOfdCksywo="; subPackages = [ "." ]; diff --git a/pkgs/applications/finance/denaro/deps.nix b/pkgs/by-name/de/denaro/deps.nix similarity index 100% rename from pkgs/applications/finance/denaro/deps.nix rename to pkgs/by-name/de/denaro/deps.nix diff --git a/pkgs/applications/finance/denaro/default.nix b/pkgs/by-name/de/denaro/package.nix similarity index 100% rename from pkgs/applications/finance/denaro/default.nix rename to pkgs/by-name/de/denaro/package.nix diff --git a/pkgs/applications/finance/denaro/update.sh b/pkgs/by-name/de/denaro/update.sh similarity index 100% rename from pkgs/applications/finance/denaro/update.sh rename to pkgs/by-name/de/denaro/update.sh diff --git a/pkgs/applications/misc/doing/Gemfile b/pkgs/by-name/do/doing/Gemfile similarity index 100% rename from pkgs/applications/misc/doing/Gemfile rename to pkgs/by-name/do/doing/Gemfile diff --git a/pkgs/applications/misc/doing/Gemfile.lock b/pkgs/by-name/do/doing/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/doing/Gemfile.lock rename to pkgs/by-name/do/doing/Gemfile.lock diff --git a/pkgs/applications/misc/doing/gemset.nix b/pkgs/by-name/do/doing/gemset.nix similarity index 100% rename from pkgs/applications/misc/doing/gemset.nix rename to pkgs/by-name/do/doing/gemset.nix diff --git a/pkgs/applications/misc/doing/default.nix b/pkgs/by-name/do/doing/package.nix similarity index 100% rename from pkgs/applications/misc/doing/default.nix rename to pkgs/by-name/do/doing/package.nix diff --git a/pkgs/by-name/fh/fheroes2/package.nix b/pkgs/by-name/fh/fheroes2/package.nix index c505970c964f..467411a8e71f 100644 --- a/pkgs/by-name/fh/fheroes2/package.nix +++ b/pkgs/by-name/fh/fheroes2/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - hash = "sha256-FSfA2gjJZWAbl2nTJwkAhWcJghbw5ulftU+6QBqljxY="; + hash = "sha256-YAjKdr40MTNEtdzSdsKZQlogZYgMFbTrnLLKOyNtLsM="; }; nativeBuildInputs = [ imagemagick ]; diff --git a/pkgs/by-name/fi/finamp/package.nix b/pkgs/by-name/fi/finamp/package.nix index b4b3668633e5..e3a58bc3c36f 100644 --- a/pkgs/by-name/fi/finamp/package.nix +++ b/pkgs/by-name/fi/finamp/package.nix @@ -1,5 +1,5 @@ { lib -, flutter324 +, flutter327 , mpv-unwrapped , xdg-user-dirs , patchelf @@ -8,16 +8,16 @@ , makeDesktopItem }: let - version = "0.9.11-beta"; + version = "0.9.12-beta"; in -flutter324.buildFlutterApplication { +flutter327.buildFlutterApplication { inherit version; pname = "finamp"; src = fetchFromGitHub { owner = "jmshrv"; repo = "finamp"; rev = version; - hash = "sha256-ruHjLM68c/k+Q64eeoezj5gmmniLBAOt3PEmmaO81xo="; + hash = "sha256-hY+1BMQEACrpjKZnVwPqWY5M4m4U/Ys/bcqhGMeCE6U="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/fi/finamp/pubspec.lock.json b/pkgs/by-name/fi/finamp/pubspec.lock.json index 1eb17a65728a..8c7af472635b 100644 --- a/pkgs/by-name/fi/finamp/pubspec.lock.json +++ b/pkgs/by-name/fi/finamp/pubspec.lock.json @@ -4,21 +4,27 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7", + "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834", "url": "https://pub.dev" }, "source": "hosted", - "version": "67.0.0" + "version": "72.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.2" }, "analyzer": { - "dependency": "transitive", + "dependency": "direct overridden", "description": { "name": "analyzer", - "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d", + "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.4.1" + "version": "6.7.0" }, "analyzer_plugin": { "dependency": "transitive", @@ -34,11 +40,11 @@ "dependency": "direct main", "description": { "name": "app_set_id", - "sha256": "455b04bc03fd9b1b66a50bbca74278d973ac4e6f2c03d5dd4707bb071613a7e5", + "sha256": "362d61e013f400666c6e0f57d56ab9d32505e011e4ca4dfb779fd80c9d9505b0", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.2.1" }, "archive": { "dependency": "transitive", @@ -134,11 +140,11 @@ "dependency": "direct main", "description": { "name": "background_downloader", - "sha256": "6a945db1a1c7727a4bc9c1d7c882cfb1a819f873b77e01d5e5dd6a3fb231cb28", + "sha256": "91448c0fcb41af14ede14485c33b8ca684fcd6c0ac0a439be9f83fa964753e13", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.5.5" + "version": "8.6.0" }, "balanced_text": { "dependency": "direct main", @@ -155,11 +161,11 @@ "dependency": "direct main", "description": { "name": "battery_plus", - "sha256": "ccc1322fee1153a0f89e663e0eac2f64d659da506454cf24dcad75eb08ae138b", + "sha256": "220c8f1961efb01d6870493b5ac5a80afaeaffc8757f7a11ed3025a8570d29e7", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.2" + "version": "6.2.0" }, "battery_plus_platform_interface": { "dependency": "transitive", @@ -235,21 +241,21 @@ "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7", + "sha256": "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.11" + "version": "2.4.13" }, "build_runner_core": { "dependency": "transitive", "description": { "name": "build_runner_core", - "sha256": "e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe", + "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.3.1" + "version": "7.3.2" }, "built_collection": { "dependency": "transitive", @@ -295,21 +301,21 @@ "dependency": "direct main", "description": { "name": "chopper", - "sha256": "6b2f5681f2bdca65a1fe2372922e797303fa058b6ead765afa88e40e0fd61071", + "sha256": "40899b729fb6d8969d967264b189efaf2452bc3ccf6ed0782d00f1d8a6161c31", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.2" + "version": "8.0.3" }, "chopper_generator": { "dependency": "direct dev", "description": { "name": "chopper_generator", - "sha256": "7d25ad17062a9b671020f96082ed5f8ee85e18137beb74aca4620137ae6ea523", + "sha256": "de438569cba1e2a2888e8d91e3c2ac60106574eea7f36823ed0334e96146328a", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.2" + "version": "8.0.3" }, "ci": { "dependency": "transitive", @@ -455,11 +461,11 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9", + "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.6" + "version": "2.3.7" }, "dartx": { "dependency": "transitive", @@ -485,11 +491,11 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074", + "sha256": "c4af09051b4f0508f6c1dc0a5c085bf014d5c9a4a0678ce1799c2b4d716387a0", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.1.2" + "version": "11.1.0" }, "device_info_plus_platform_interface": { "dependency": "transitive", @@ -515,11 +521,11 @@ "dependency": "transitive", "description": { "name": "fading_edge_scrollview", - "sha256": "c25c2231652ce774cc31824d0112f11f653881f43d7f5302c05af11942052031", + "sha256": "1f84fe3ea8e251d00d5735e27502a6a250e4aa3d3b330d3fdcb475af741464ef", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0" + "version": "4.1.1" }, "fake_async": { "dependency": "transitive", @@ -555,11 +561,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "825aec673606875c33cd8d3c4083f1a3c3999015a84178b317b7ef396b7384f3", + "sha256": "aac85f20436608e01a6ffd1fdd4e746a7f33c93a2c83752e626bdfaea139b877", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.7" + "version": "8.1.3" }, "file_sizes": { "dependency": "direct main", @@ -601,11 +607,11 @@ "dependency": "direct main", "description": { "name": "flutter_cache_manager", - "sha256": "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba", + "sha256": "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.1" + "version": "3.4.1" }, "flutter_gen_core": { "dependency": "transitive", @@ -631,21 +637,21 @@ "dependency": "direct dev", "description": { "name": "flutter_launcher_icons", - "sha256": "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea", + "sha256": "619817c4b65b322b5104b6bb6dfe6cda62d9729bd7ad4303ecc8b4e690a67a77", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.13.1" + "version": "0.14.1" }, "flutter_lints": { "dependency": "direct dev", "description": { "name": "flutter_lints", - "sha256": "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c", + "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "5.0.0" }, "flutter_localizations": { "dependency": "direct main", @@ -667,21 +673,21 @@ "dependency": "direct main", "description": { "name": "flutter_riverpod", - "sha256": "0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d", + "sha256": "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.1" + "version": "2.6.1" }, "flutter_rust_bridge": { "dependency": "transitive", "description": { "name": "flutter_rust_bridge", - "sha256": "e12415c3bce49bcbc3fed383f0ea41ad7d828f6cf0eccba0588ffa5a812fe522", + "sha256": "0ad5079de35d317650fec59b26cb4d0c116ebc2ce703a29f9367513b8a91c287", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.82.1" + "version": "2.5.0" }, "flutter_staggered_grid_view": { "dependency": "transitive", @@ -697,21 +703,31 @@ "dependency": "direct main", "description": { "name": "flutter_sticky_header", - "sha256": "017f398fbb45a589e01491861ca20eb6570a763fd9f3888165a978e11248c709", + "sha256": "7f76d24d119424ca0c95c146b8627a457e8de8169b0d584f766c2c545db8f8be", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.5" + "version": "0.7.0" + }, + "flutter_svg": { + "dependency": "direct main", + "description": { + "name": "flutter_svg", + "sha256": "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.10+1" }, "flutter_tabler_icons": { "dependency": "direct main", "description": { "name": "flutter_tabler_icons", - "sha256": "08581b2d87e41c86e3acb7cf48482f1a1775e4ed37febc02ca1b99a221836580", + "sha256": "657c2201e12fa9121a12ddb4edb74d69290f803868eb6526f04102e6d49ec882", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.40.0" + "version": "1.43.0" }, "flutter_test": { "dependency": "direct dev", @@ -958,12 +974,11 @@ "isar_generator": { "dependency": "direct dev", "description": { - "path": "packages/isar_generator", - "ref": "70a5abd2b36d265a2eef0141f98f312a8710e60c", - "resolved-ref": "70a5abd2b36d265a2eef0141f98f312a8710e60c", - "url": "https://github.com/ndelanou/isar.git" + "name": "isar_generator", + "sha256": "76c121e1295a30423604f2f819bc255bc79f852f3bc8743a24017df6068ad133", + "url": "https://pub.dev" }, - "source": "git", + "source": "hosted", "version": "3.1.0+1" }, "js": { @@ -1000,21 +1015,21 @@ "dependency": "direct main", "description": { "name": "just_audio", - "sha256": "d8e8aaf417d33e345299c17f6457f72bd4ba0c549dc34607abb5183a354edc4d", + "sha256": "b41646a8241688f1d99c2e69c4da2bb26aa4b3a99795f6ff205c2a165e033fda", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.40" + "version": "0.9.41" }, "just_audio_media_kit": { "dependency": "direct main", "description": { "name": "just_audio_media_kit", - "sha256": "7f57d317fafa04cb3e70b924e8f632ffb7eca7a97a369e1e44738ed89fbd5da1", + "sha256": "9f3517213dfc7bbaf6980656feb66c35600f114c7efc0b5b3f4476cd5c18b45e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.5" + "version": "2.0.6" }, "just_audio_platform_interface": { "dependency": "transitive", @@ -1030,11 +1045,11 @@ "dependency": "transitive", "description": { "name": "just_audio_web", - "sha256": "b163878529d9b028c53a6972fcd58cae2405bcd11cbfcea620b6fb9f151429d6", + "sha256": "9a98035b8b24b40749507687520ec5ab404e291d2b0937823ff45d92cb18d448", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.12" + "version": "0.4.13" }, "leak_tracker": { "dependency": "transitive", @@ -1070,11 +1085,11 @@ "dependency": "transitive", "description": { "name": "lints", - "sha256": "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235", + "sha256": "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "5.0.0" }, "locale_names": { "dependency": "direct main", @@ -1090,21 +1105,31 @@ "dependency": "direct main", "description": { "name": "logging", - "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.3.0" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2-main.4" }, "marquee": { "dependency": "direct main", "description": { "name": "marquee", - "sha256": "4b5243d2804373bdc25fc93d42c3b402d6ec1f4ee8d0bb72276edd04ae7addb8", + "sha256": "a87e7e80c5d21434f90ad92add9f820cf68be374b226404fe881d2bba7be0862", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.3" + "version": "2.3.0" }, "matcher": { "dependency": "transitive", @@ -1177,16 +1202,6 @@ "source": "hosted", "version": "1.0.6" }, - "mini_music_visualizer": { - "dependency": "direct main", - "description": { - "name": "mini_music_visualizer", - "sha256": "779a957424ce9a09cc00989a8cf9b7541ec22316d9781a43e701afa6acacf274", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.4" - }, "msix": { "dependency": "direct dev", "description": { @@ -1468,25 +1483,15 @@ "source": "hosted", "version": "1.3.0" }, - "puppeteer": { - "dependency": "transitive", - "description": { - "name": "puppeteer", - "sha256": "871140cbcc1bcbc6d8e4c2c6ca8fdeed5fae66dfef1efc4c271160a96e0823f9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.14.0" - }, "qs_dart": { "dependency": "transitive", "description": { "name": "qs_dart", - "sha256": "8dddeaf1d32fe407e253840b2c25c9ab5bf347d2761d82cb4ce010096565c9ff", + "sha256": "be73d060d29c0716ded88380ba32e87ce8105f0ba234edb3edefa0d74d47d64b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.3" + "version": "1.2.4" }, "recursive_regex": { "dependency": "transitive", @@ -1502,51 +1507,51 @@ "dependency": "transitive", "description": { "name": "riverpod", - "sha256": "f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d", + "sha256": "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.1" + "version": "2.6.1" }, "riverpod_analyzer_utils": { "dependency": "transitive", "description": { "name": "riverpod_analyzer_utils", - "sha256": "8b71f03fc47ae27d13769496a1746332df4cec43918aeba9aff1e232783a780f", + "sha256": "0dcb0af32d561f8fa000c6a6d95633c9fb08ea8a8df46e3f9daca59f11218167", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1" + "version": "0.5.6" }, "riverpod_annotation": { "dependency": "direct main", "description": { "name": "riverpod_annotation", - "sha256": "e5e796c0eba4030c704e9dae1b834a6541814963292839dcf9638d53eba84f5c", + "sha256": "e14b0bf45b71326654e2705d462f21b958f987087be850afd60578fcd502d1b8", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.5" + "version": "2.6.1" }, "riverpod_generator": { "dependency": "direct dev", "description": { "name": "riverpod_generator", - "sha256": "d451608bf17a372025fc36058863737636625dfdb7e3cbf6142e0dfeb366ab22", + "sha256": "851aedac7ad52693d12af3bf6d92b1626d516ed6b764eb61bf19e968b5e0b931", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "2.6.1" }, "riverpod_lint": { "dependency": "direct dev", "description": { "name": "riverpod_lint", - "sha256": "3c67c14ccd16f0c9d53e35ef70d06cd9d072e2fb14557326886bbde903b230a5", + "sha256": "0684c21a9a4582c28c897d55c7b611fa59a351579061b43f8c92c005804e63a8", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.10" + "version": "2.6.1" }, "rxdart": { "dependency": "direct main", @@ -1572,11 +1577,51 @@ "dependency": "transitive", "description": { "name": "screen_retriever", - "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90", + "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.9" + "version": "0.2.0" + }, + "screen_retriever_linux": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_linux", + "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_macos": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_macos", + "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_platform_interface": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_platform_interface", + "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_windows": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_windows", + "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" }, "scroll_to_index": { "dependency": "direct main", @@ -1592,21 +1637,21 @@ "dependency": "direct main", "description": { "name": "share_plus", - "sha256": "ef3489a969683c4f3d0239010cc8b7a2a46543a8d139e111c06c558875083544", + "sha256": "3af2cda1752e5c24f2fc04b6083b40f013ffe84fb90472f30c6499a9213d5442", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.0.0" + "version": "10.1.1" }, "share_plus_platform_interface": { "dependency": "transitive", "description": { "name": "share_plus_platform_interface", - "sha256": "0f9e4418835d1b2c3ae78fdb918251959106cefdbc4dd43526e182f80e82f6d4", + "sha256": "c57c0bbfec7142e3a0f55633be504b796af72e60e3c791b44d5a017b985f7a48", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "5.0.1" }, "shelf": { "dependency": "transitive", @@ -1618,16 +1663,6 @@ "source": "hosted", "version": "1.4.1" }, - "shelf_static": { - "dependency": "transitive", - "description": { - "name": "shelf_static", - "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.3" - }, "shelf_web_socket": { "dependency": "transitive", "description": { @@ -1668,11 +1703,11 @@ "dependency": "direct main", "description": { "name": "smtc_windows", - "sha256": "799bbe0f8e4436da852c5dcc0be482c97b8ae0f504f65c6b750cd239b4835aa0", + "sha256": "80f7c10867da485ffdf87f842bf27e6763589933c18c11af5dc1cd1e158c3154", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.2" + "version": "1.0.0" }, "source_gen": { "dependency": "transitive", @@ -1715,25 +1750,35 @@ "source": "git", "version": "3.2.1" }, + "sprintf": { + "dependency": "transitive", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, "sqflite": { "dependency": "transitive", "description": { "name": "sqflite", - "sha256": "a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d", + "sha256": "ff5a2436ef8ebdfda748fbfe957f9981524cb5ff11e7bafa8c42771840e8a788", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.3+1" + "version": "2.3.3+2" }, "sqflite_common": { "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4", + "sha256": "2d8e607db72e9cb7748c9c6e739e2c9618320a5517de693d5a24609c4671b1a4", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.4" + "version": "2.5.4+4" }, "stack_trace": { "dependency": "transitive", @@ -1789,11 +1834,11 @@ "dependency": "transitive", "description": { "name": "synchronized", - "sha256": "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558", + "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0+1" + "version": "3.3.0+3" }, "term_glyph": { "dependency": "transitive", @@ -1835,16 +1880,6 @@ "source": "hosted", "version": "1.0.1" }, - "tuple": { - "dependency": "transitive", - "description": { - "name": "tuple", - "sha256": "a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, "typed_data": { "dependency": "transitive", "description": { @@ -1899,21 +1934,21 @@ "dependency": "direct main", "description": { "name": "url_launcher", - "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3", + "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.0" + "version": "6.3.1" }, "url_launcher_android": { "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "f0c73347dfcfa5b3db8bc06e1502668265d39c08f310c29bff4e28eea9699f79", + "sha256": "e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.9" + "version": "6.3.10" }, "url_launcher_ios": { "dependency": "transitive", @@ -1939,11 +1974,11 @@ "dependency": "transitive", "description": { "name": "url_launcher_macos", - "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de", + "sha256": "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.0" + "version": "3.2.1" }, "url_launcher_platform_interface": { "dependency": "transitive", @@ -1979,21 +2014,31 @@ "dependency": "direct main", "description": { "name": "uuid", - "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313", + "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.7" + "version": "4.5.1" }, "value_layout_builder": { "dependency": "transitive", "description": { "name": "value_layout_builder", - "sha256": "98202ec1807e94ac72725b7f0d15027afde513c55c69ff3f41bcfccb950831bc", + "sha256": "c02511ea91ca5c643b514a33a38fa52536f74aa939ec367d02938b5ede6807fa", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.1" + "version": "0.4.0" + }, + "vector_graphics": { + "dependency": "transitive", + "description": { + "name": "vector_graphics", + "sha256": "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.11+1" }, "vector_graphics_codec": { "dependency": "transitive", @@ -2089,51 +2134,51 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1" + "version": "1.1.0" }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42", + "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.5" + "version": "2.4.0" }, "win32": { "dependency": "transitive", "description": { "name": "win32", - "sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a", + "sha256": "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.5.4" + "version": "5.5.5" }, "win32_registry": { "dependency": "transitive", "description": { "name": "win32_registry", - "sha256": "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6", + "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.4" + "version": "1.1.5" }, "window_manager": { "dependency": "direct main", "description": { "name": "window_manager", - "sha256": "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf", + "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.9" + "version": "0.4.3" }, "xdg_directories": { "dependency": "transitive", @@ -2159,11 +2204,11 @@ "dependency": "transitive", "description": { "name": "xxh3", - "sha256": "a92b30944a9aeb4e3d4f3c3d4ddb3c7816ca73475cd603682c4f8149690f56d7", + "sha256": "cbeb0e1d10f4c6bf67b650f395eac0cc689425b5efc2ba0cc3d3e069a0beaeec", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.1" + "version": "1.1.0" }, "yaml": { "dependency": "transitive", @@ -2177,7 +2222,7 @@ } }, "sdks": { - "dart": ">=3.4.0 <4.0.0", - "flutter": ">=3.22.0" + "dart": ">=3.5.0 <4.0.0", + "flutter": ">=3.24.0" } } diff --git a/pkgs/by-name/fi/fishnet/package.nix b/pkgs/by-name/fi/fishnet/package.nix index f7f2dac86085..77149af5d26c 100644 --- a/pkgs/by-name/fi/fishnet/package.nix +++ b/pkgs/by-name/fi/fishnet/package.nix @@ -6,10 +6,10 @@ let # These files can be found in Stockfish/src/evaluate.h - nnueBigFile = "nn-31337bea577c.nnue"; + nnueBigFile = "nn-1111cefa1111.nnue"; nnueBig = fetchurl { url = "https://tests.stockfishchess.org/api/nn/${nnueBigFile}"; - sha256 = "sha256-MTN76ld8W00LPlQYGGGJ7k9Yuq6rjX9vO9BXisp/d9k="; + sha256 = "sha256-ERHO+hERa3cWG9SxTatMUPJuWSDHVvSGFZK+Pc1t4XQ="; }; nnueSmallFile = "nn-37f18f62d772.nnue"; nnueSmall = fetchurl { @@ -18,13 +18,13 @@ let }; in rustPlatform.buildRustPackage rec { pname = "fishnet"; - version = "2.9.3"; + version = "2.9.4"; src = fetchFromGitHub { owner = "lichess-org"; repo = pname; rev = "v${version}"; - hash = "sha256-HlCnUJBhIhooBvQVz1SDfiifXIBkBlH2dEq+C9al7qI="; + hash = "sha256-JhllThFiHeC/5AAFwwZQ0mgbENIWP1cA7aD01DeDVL8="; fetchSubmodules = true; }; @@ -35,7 +35,7 @@ in rustPlatform.buildRustPackage rec { cp -v '${nnueSmall}' 'Fairy-Stockfish/src/${nnueSmallFile}' ''; - cargoHash = "sha256-Fb28XNhCt88PFnJ4s0I80L/rLJtBTEZ8Xd/68MYFoLs="; + cargoHash = "sha256-HuVEg8uJ1WbXzYaXCPBobmxhbhk+X8D/xFcM2wE8Lh0="; meta = with lib; { description = "Distributed Stockfish analysis for lichess.org"; diff --git a/pkgs/applications/misc/gollum/Gemfile b/pkgs/by-name/go/gollum/Gemfile similarity index 100% rename from pkgs/applications/misc/gollum/Gemfile rename to pkgs/by-name/go/gollum/Gemfile diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/by-name/go/gollum/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/gollum/Gemfile.lock rename to pkgs/by-name/go/gollum/Gemfile.lock diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/by-name/go/gollum/gemset.nix similarity index 100% rename from pkgs/applications/misc/gollum/gemset.nix rename to pkgs/by-name/go/gollum/gemset.nix diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/by-name/go/gollum/package.nix similarity index 100% rename from pkgs/applications/misc/gollum/default.nix rename to pkgs/by-name/go/gollum/package.nix diff --git a/pkgs/by-name/id/id3/package.nix b/pkgs/by-name/id/id3/package.nix new file mode 100644 index 000000000000..e0cd063141c5 --- /dev/null +++ b/pkgs/by-name/id/id3/package.nix @@ -0,0 +1,31 @@ +{ + fetchFromGitHub, + lib, + libiconv, + stdenv, +}: + +stdenv.mkDerivation rec { + pname = "id3"; + version = "0.81"; + + src = fetchFromGitHub { + owner = "squell"; + repo = "id3"; + rev = version; + hash = "sha256-+h1wwgTB7CpbjyUAK+9BNRhmy83D+1I+cZ70E1m3ENk="; + }; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + + makeFlags = [ "prefix=$(out)" ]; + + meta = { + description = "Portable command-line mass tagger"; + homepage = "https://squell.github.io/id3/"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ jecaro ]; + platforms = lib.platforms.unix; + mainProgram = "id3"; + }; +} diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile b/pkgs/by-name/je/jekyll/basic/Gemfile similarity index 100% rename from pkgs/applications/misc/jekyll/basic/Gemfile rename to pkgs/by-name/je/jekyll/basic/Gemfile diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/by-name/je/jekyll/basic/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/jekyll/basic/Gemfile.lock rename to pkgs/by-name/je/jekyll/basic/Gemfile.lock diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/by-name/je/jekyll/basic/gemset.nix similarity index 100% rename from pkgs/applications/misc/jekyll/basic/gemset.nix rename to pkgs/by-name/je/jekyll/basic/gemset.nix diff --git a/pkgs/applications/misc/jekyll/full/Gemfile b/pkgs/by-name/je/jekyll/full/Gemfile similarity index 100% rename from pkgs/applications/misc/jekyll/full/Gemfile rename to pkgs/by-name/je/jekyll/full/Gemfile diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/by-name/je/jekyll/full/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/jekyll/full/Gemfile.lock rename to pkgs/by-name/je/jekyll/full/Gemfile.lock diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/by-name/je/jekyll/full/gemset.nix similarity index 100% rename from pkgs/applications/misc/jekyll/full/gemset.nix rename to pkgs/by-name/je/jekyll/full/gemset.nix diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/by-name/je/jekyll/package.nix similarity index 100% rename from pkgs/applications/misc/jekyll/default.nix rename to pkgs/by-name/je/jekyll/package.nix diff --git a/pkgs/applications/misc/jekyll/update.sh b/pkgs/by-name/je/jekyll/update.sh similarity index 100% rename from pkgs/applications/misc/jekyll/update.sh rename to pkgs/by-name/je/jekyll/update.sh diff --git a/pkgs/by-name/ku/kubevirt/package.nix b/pkgs/by-name/ku/kubevirt/package.nix index efe4a7ffb018..ff222bfb9db4 100644 --- a/pkgs/by-name/ku/kubevirt/package.nix +++ b/pkgs/by-name/ku/kubevirt/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubevirt"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "kubevirt"; repo = "kubevirt"; rev = "v${version}"; - hash = "sha256-t6lIHuMvo8iqYkZ1mYVU6fgOP3Q6sqWaTcFLTqAIm5c="; + hash = "sha256-FMKug/V1R1SB75zcsOxNAdP6A/YeNEkore88j+38yF8="; }; vendorHash = null; diff --git a/pkgs/tools/audio/loudgain/fix-gcc-14.patch b/pkgs/by-name/lo/loudgain/fix-gcc-14.patch similarity index 100% rename from pkgs/tools/audio/loudgain/fix-gcc-14.patch rename to pkgs/by-name/lo/loudgain/fix-gcc-14.patch diff --git a/pkgs/tools/audio/loudgain/default.nix b/pkgs/by-name/lo/loudgain/package.nix similarity index 100% rename from pkgs/tools/audio/loudgain/default.nix rename to pkgs/by-name/lo/loudgain/package.nix diff --git a/pkgs/tools/audio/loudgain/support-ffmpeg-5.patch b/pkgs/by-name/lo/loudgain/support-ffmpeg-5.patch similarity index 100% rename from pkgs/tools/audio/loudgain/support-ffmpeg-5.patch rename to pkgs/by-name/lo/loudgain/support-ffmpeg-5.patch diff --git a/pkgs/tools/audio/loudgain/support-ffmpeg-7.patch b/pkgs/by-name/lo/loudgain/support-ffmpeg-7.patch similarity index 100% rename from pkgs/tools/audio/loudgain/support-ffmpeg-7.patch rename to pkgs/by-name/lo/loudgain/support-ffmpeg-7.patch diff --git a/pkgs/tools/audio/mpdcron/Gemfile b/pkgs/by-name/mp/mpdcron/Gemfile similarity index 100% rename from pkgs/tools/audio/mpdcron/Gemfile rename to pkgs/by-name/mp/mpdcron/Gemfile diff --git a/pkgs/tools/audio/mpdcron/Gemfile.lock b/pkgs/by-name/mp/mpdcron/Gemfile.lock similarity index 100% rename from pkgs/tools/audio/mpdcron/Gemfile.lock rename to pkgs/by-name/mp/mpdcron/Gemfile.lock diff --git a/pkgs/tools/audio/mpdcron/fix-canonicalize-conflict-with-glibc.patch b/pkgs/by-name/mp/mpdcron/fix-canonicalize-conflict-with-glibc.patch similarity index 100% rename from pkgs/tools/audio/mpdcron/fix-canonicalize-conflict-with-glibc.patch rename to pkgs/by-name/mp/mpdcron/fix-canonicalize-conflict-with-glibc.patch diff --git a/pkgs/tools/audio/mpdcron/gemset.nix b/pkgs/by-name/mp/mpdcron/gemset.nix similarity index 100% rename from pkgs/tools/audio/mpdcron/gemset.nix rename to pkgs/by-name/mp/mpdcron/gemset.nix diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/by-name/mp/mpdcron/package.nix similarity index 100% rename from pkgs/tools/audio/mpdcron/default.nix rename to pkgs/by-name/mp/mpdcron/package.nix diff --git a/pkgs/by-name/ov/overturemaps/package.nix b/pkgs/by-name/ov/overturemaps/package.nix new file mode 100644 index 000000000000..e0ef41b52945 --- /dev/null +++ b/pkgs/by-name/ov/overturemaps/package.nix @@ -0,0 +1,32 @@ +{ + lib, + python3Packages, + fetchPypi, +}: + +python3Packages.buildPythonPackage rec { + pname = "overturemaps"; + version = "0.9.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-JsgufE8Xmw7xXVypM+g3Vjmf5fL/FQRxddGSpQ762PQ="; + }; + + build-system = with python3Packages; [ poetry-core ]; + + dependencies = with python3Packages; [ + click + pyarrow + shapely + ]; + + meta = { + description = "Official command-line tool of the Overture Maps Foundation"; + homepage = "https://overturemaps.org/"; + mainProgram = "overturemaps"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ crimeminister ]; + }; +} diff --git a/pkgs/applications/misc/pdfposter/default.nix b/pkgs/by-name/pd/pdfposter/package.nix similarity index 100% rename from pkgs/applications/misc/pdfposter/default.nix rename to pkgs/by-name/pd/pdfposter/package.nix diff --git a/pkgs/applications/audio/psst/Cargo.lock b/pkgs/by-name/ps/psst/Cargo.lock similarity index 100% rename from pkgs/applications/audio/psst/Cargo.lock rename to pkgs/by-name/ps/psst/Cargo.lock diff --git a/pkgs/applications/audio/psst/make-build-reproducible.patch b/pkgs/by-name/ps/psst/make-build-reproducible.patch similarity index 100% rename from pkgs/applications/audio/psst/make-build-reproducible.patch rename to pkgs/by-name/ps/psst/make-build-reproducible.patch diff --git a/pkgs/applications/audio/psst/default.nix b/pkgs/by-name/ps/psst/package.nix similarity index 100% rename from pkgs/applications/audio/psst/default.nix rename to pkgs/by-name/ps/psst/package.nix diff --git a/pkgs/applications/audio/psst/update.sh b/pkgs/by-name/ps/psst/update.sh similarity index 100% rename from pkgs/applications/audio/psst/update.sh rename to pkgs/by-name/ps/psst/update.sh diff --git a/pkgs/applications/misc/pt/.bundle/config b/pkgs/by-name/pt/pt/.bundle/config similarity index 100% rename from pkgs/applications/misc/pt/.bundle/config rename to pkgs/by-name/pt/pt/.bundle/config diff --git a/pkgs/applications/misc/pt/Gemfile b/pkgs/by-name/pt/pt/Gemfile similarity index 100% rename from pkgs/applications/misc/pt/Gemfile rename to pkgs/by-name/pt/pt/Gemfile diff --git a/pkgs/applications/misc/pt/Gemfile.lock b/pkgs/by-name/pt/pt/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/pt/Gemfile.lock rename to pkgs/by-name/pt/pt/Gemfile.lock diff --git a/pkgs/applications/misc/pt/gemset.nix b/pkgs/by-name/pt/pt/gemset.nix similarity index 100% rename from pkgs/applications/misc/pt/gemset.nix rename to pkgs/by-name/pt/pt/gemset.nix diff --git a/pkgs/applications/misc/pt/default.nix b/pkgs/by-name/pt/pt/package.nix similarity index 100% rename from pkgs/applications/misc/pt/default.nix rename to pkgs/by-name/pt/pt/package.nix diff --git a/pkgs/by-name/rm/rmfakecloud/package.nix b/pkgs/by-name/rm/rmfakecloud/package.nix index 315ac8ec43b1..f68229b10a16 100644 --- a/pkgs/by-name/rm/rmfakecloud/package.nix +++ b/pkgs/by-name/rm/rmfakecloud/package.nix @@ -1,36 +1,54 @@ -{ lib, fetchFromGitHub, buildGoModule, callPackage, enableWebui ? true }: +{ + lib, + fetchFromGitHub, + buildGoModule, + callPackage, + enableWebui ? true, + nixosTests, +}: buildGoModule rec { pname = "rmfakecloud"; - version = "0.0.18"; + version = "0.0.21"; src = fetchFromGitHub { owner = "ddvk"; repo = pname; rev = "v${version}"; - hash = "sha256-J8oB5C5FYZTVq9zopHoL6WYpfTyiiyrQ4YSGu+2eaKw="; + hash = "sha256-Opx39FUo4Kzezi96D9iraA8gkqCPVfMf4LhxtVpsuNQ="; }; - vendorHash = "sha256-S43qNDAlDWhrkfSffCooveemR1Z7KXS18t97UoolgBM="; + vendorHash = "sha256-9tfxE03brUvCYusmewiqNpCkKyIS9qePqylrzDWrJLY="; ui = callPackage ./webui.nix { inherit version src; }; - postPatch = if enableWebui then '' - mkdir -p ui/build - cp -r ${ui}/* ui/build - '' else '' - sed -i '/go:/d' ui/assets.go - ''; + postPatch = + if enableWebui then + '' + mkdir -p ui/build + cp -r ${ui}/* ui/build + '' + else + '' + sed -i '/go:/d' ui/assets.go + ''; ldflags = [ - "-s" "-w" "-X main.version=v${version}" + "-s" + "-w" + "-X main.version=v${version}" ]; + passthru.tests.rmfakecloud = nixosTests.rmfakecloud; + meta = with lib; { description = "Host your own cloud for the Remarkable"; homepage = "https://ddvk.github.io/rmfakecloud/"; license = licenses.agpl3Only; - maintainers = with maintainers; [ pacien martinetd ]; + maintainers = with maintainers; [ + pacien + martinetd + ]; mainProgram = "rmfakecloud"; }; } diff --git a/pkgs/by-name/rm/rmfakecloud/webui.nix b/pkgs/by-name/rm/rmfakecloud/webui.nix index 91efa1c78d9d..928a624cba2b 100644 --- a/pkgs/by-name/rm/rmfakecloud/webui.nix +++ b/pkgs/by-name/rm/rmfakecloud/webui.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/ui/yarn.lock"; - hash = "sha256-JLCrpzytMKejmW+WlM6yybsoIZiimiJdPG5dSIn1L14="; + hash = "sha256-9//uQ4ZLLTf2N1WSwsOwFjBuDmThuMtMXU4SzMljAMM="; }; nativeBuildInputs = [ fixup-yarn-lock yarn nodejs ]; diff --git a/pkgs/by-name/sy/syshud/package.nix b/pkgs/by-name/sy/syshud/package.nix index 38aad6a345b2..46a1a32ad387 100644 --- a/pkgs/by-name/sy/syshud/package.nix +++ b/pkgs/by-name/sy/syshud/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "syshud"; - version = "0-unstable-2024-11-04"; + version = "0-unstable-2024-11-12"; src = fetchFromGitHub { owner = "System64fumo"; repo = "syshud"; - rev = "157b725a3f29d67f16c25fb3062b62ad6fec4e15"; - hash = "sha256-q04xYOdnnyUyiFc72Gzk65fWzQgYSOACPUXIk7kvIP8="; + rev = "734d632ca0665a288d1308f883d974462fa2d349"; + hash = "sha256-Rk0q/veBEJh8BHZZoFcGZ+Beh8mWGGi2OiuGlM0NEgs="; }; postPatch = '' diff --git a/pkgs/applications/misc/taskjuggler/Gemfile b/pkgs/by-name/ta/taskjuggler/Gemfile similarity index 100% rename from pkgs/applications/misc/taskjuggler/Gemfile rename to pkgs/by-name/ta/taskjuggler/Gemfile diff --git a/pkgs/applications/misc/taskjuggler/Gemfile.lock b/pkgs/by-name/ta/taskjuggler/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/taskjuggler/Gemfile.lock rename to pkgs/by-name/ta/taskjuggler/Gemfile.lock diff --git a/pkgs/applications/misc/taskjuggler/gemset.nix b/pkgs/by-name/ta/taskjuggler/gemset.nix similarity index 100% rename from pkgs/applications/misc/taskjuggler/gemset.nix rename to pkgs/by-name/ta/taskjuggler/gemset.nix diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/by-name/ta/taskjuggler/package.nix similarity index 100% rename from pkgs/applications/misc/taskjuggler/default.nix rename to pkgs/by-name/ta/taskjuggler/package.nix diff --git a/pkgs/by-name/te/technitium-dns-server/library-nuget-deps.nix b/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.nix similarity index 100% rename from pkgs/by-name/te/technitium-dns-server/library-nuget-deps.nix rename to pkgs/by-name/te/technitium-dns-server-library/nuget-deps.nix diff --git a/pkgs/by-name/te/technitium-dns-server-library/package.nix b/pkgs/by-name/te/technitium-dns-server-library/package.nix new file mode 100644 index 000000000000..1abde74faa6e --- /dev/null +++ b/pkgs/by-name/te/technitium-dns-server-library/package.nix @@ -0,0 +1,40 @@ +{ + lib, + buildDotnetModule, + fetchFromGitHub, + dotnetCorePackages, + nix-update-script, +}: +buildDotnetModule rec { + pname = "technitium-dns-server-library"; + version = "dns-server-v13.2"; + + src = fetchFromGitHub { + owner = "TechnitiumSoftware"; + repo = "TechnitiumLibrary"; + rev = "refs/tags/${version}"; + hash = "sha256-stfxYe0flE1daPuXw/GAgY52ZD7pkqnBIBvmSVPWWjI="; + name = "${pname}-${version}"; + }; + + dotnet-sdk = dotnetCorePackages.sdk_8_0; + + nugetDeps = ./nuget-deps.nix; + + projectFile = [ + "TechnitiumLibrary.ByteTree/TechnitiumLibrary.ByteTree.csproj" + "TechnitiumLibrary.Net/TechnitiumLibrary.Net.csproj" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/TechnitiumSoftware/DnsServer/blob/master/CHANGELOG.md"; + description = "Library for Authorative and Recursive DNS server for Privacy and Security"; + homepage = "https://github.com/TechnitiumSoftware/DnsServer"; + license = lib.licenses.gpl3Only; + mainProgram = "technitium-dns-server-library"; + maintainers = with lib.maintainers; [ fabianrig ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/te/technitium-dns-server/package.nix b/pkgs/by-name/te/technitium-dns-server/package.nix index ae5cccf2902e..283791658a1c 100644 --- a/pkgs/by-name/te/technitium-dns-server/package.nix +++ b/pkgs/by-name/te/technitium-dns-server/package.nix @@ -3,40 +3,19 @@ buildDotnetModule, fetchFromGitHub, dotnetCorePackages, + technitium-dns-server-library, nixosTests, + nix-update-script, }: -let - technitium-library = buildDotnetModule rec { - pname = "TechnitiumLibrary"; - version = "13.0.2"; - - src = fetchFromGitHub { - owner = "TechnitiumSoftware"; - repo = "TechnitiumLibrary"; - rev = "refs/tags/dns-server-v${version}"; - hash = "sha256-mMNZZvM/UvQTiyeOgPHXXFxmsiGPe4Jal1aSEMEM5Xc="; - name = "${pname}-${version}"; - }; - - dotnet-sdk = dotnetCorePackages.sdk_8_0; - - nugetDeps = ./library-nuget-deps.nix; - - projectFile = [ - "TechnitiumLibrary.ByteTree/TechnitiumLibrary.ByteTree.csproj" - "TechnitiumLibrary.Net/TechnitiumLibrary.Net.csproj" - ]; - }; -in buildDotnetModule rec { pname = "technitium-dns-server"; - version = "13.0.2"; + version = "13.2"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "DnsServer"; rev = "refs/tags/v${version}"; - hash = "sha256-2dFjr3f4ZlLBJzuObSYIkSdtcyZ8dC6M7/S1p7WoG0c="; + hash = "sha256-oxLMBs+XkzvlfSst6ZD56ZIgiXwm0Px8Tn3Trdd/6H8="; name = "${pname}-${version}"; }; @@ -50,7 +29,7 @@ buildDotnetModule rec { # move dependencies from TechnitiumLibrary to the expected directory preBuild = '' mkdir -p ../TechnitiumLibrary/bin - cp -r ${technitium-library}/lib/TechnitiumLibrary/* ../TechnitiumLibrary/bin/ + cp -r ${technitium-dns-server-library}/lib/${technitium-dns-server-library.pname}/* ../TechnitiumLibrary/bin/ ''; postFixup = '' @@ -61,6 +40,8 @@ buildDotnetModule rec { inherit (nixosTests) technitium-dns-server; }; + passthru.updateScript = nix-update-script { }; + meta = { changelog = "https://github.com/TechnitiumSoftware/DnsServer/blob/master/CHANGELOG.md"; description = "Authorative and Recursive DNS server for Privacy and Security"; diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix new file mode 100644 index 000000000000..d97f78c64895 --- /dev/null +++ b/pkgs/by-name/te/television/package.nix @@ -0,0 +1,49 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + testers, + television, + nix-update-script, +}: +rustPlatform.buildRustPackage rec { + pname = "television"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "alexpasmantier"; + repo = "television"; + rev = "refs/tags/" + version; + hash = "sha256-yi8lPm3zkmamN6gPlGfojNlIXM1cgSr1zL2zMNni5f0="; + }; + + cargoHash = "sha256-1SdyVtMjkfXH9iGew9i8xpx8WlUly4vIcKY3weeW3LQ="; + + passthru = { + tests.version = testers.testVersion { + package = television; + command = "XDG_DATA_HOME=$TMPDIR tv --version"; + }; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Television is a blazingly fast general purpose fuzzy finder"; + + longDescription = '' + Television is a blazingly fast general purpose fuzzy finder TUI written + in Rust. It is inspired by the neovim telescope plugin and is designed + to be fast, efficient, simple to use and easily extensible. It is built + on top of tokio, ratatui and the nucleo matcher used by the helix editor. + ''; + + homepage = "https://github.com/alexpasmantier/television"; + changelog = "https://github.com/alexpasmantier/television/releases/tag/${version}"; + license = lib.licenses.mit; + mainProgram = "tv"; + maintainers = with lib.maintainers; [ + louis-thevenet + getchoo + ]; + }; +} diff --git a/pkgs/by-name/wl/wl-crosshair/package.nix b/pkgs/by-name/wl/wl-crosshair/package.nix new file mode 100644 index 000000000000..1c993efa0898 --- /dev/null +++ b/pkgs/by-name/wl/wl-crosshair/package.nix @@ -0,0 +1,37 @@ +{ + lib, + fetchFromGitHub, + makeBinaryWrapper, + rustPlatform, +}: +rustPlatform.buildRustPackage { + pname = "wl-crosshair"; + version = "0.1.0-unstable-2024-05-09"; + + src = fetchFromGitHub { + owner = "lelgenio"; + repo = "wl-crosshair"; + rev = "39b716cf410a1b45006f50f32f8d63de5c43aedb"; + hash = "sha256-q5key9BWJjJQqECrhflso9ZTzULBeScvromo0S4fjqE="; + }; + + cargoHash = "sha256-+QAvwnMMADj8Guo1idWj4uqmdxTLK95CB2BwP4QeQ18="; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + postInstall = '' + mkdir -p $out/share + cp -r ./cursors $out/share/cursors + wrapProgram $out/bin/wl-crosshair \ + --set-default WL_CROSSHAIR_IMAGE_PATH $out/share/cursors/inverse-v.png + ''; + + meta = { + description = "A crosshair overlay for wlroots compositor"; + homepage = "https://github.com/lelgenio/wl-crosshair"; + license = lib.licenses.unfree; # didn't found a license + mainProgram = "wl-crosshair"; + maintainers = with lib.maintainers; [ Guanran928 ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix index ed0f3b0f30d3..173e47248b8e 100644 --- a/pkgs/by-name/xl/xlights/package.nix +++ b/pkgs/by-name/xl/xlights/package.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { pname = "xlights"; - version = "2024.16"; + version = "2024.18"; src = fetchurl { url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage"; - hash = "sha256-r9NtNuPmc8J1y3MxA4oSdRmPKDQeDQENdKbNVlcGwAI="; + hash = "sha256-zwOsZG7YU00wz2ZUbOVgGNQxRU81nURjW+B+XTruOuQ="; }; meta = { diff --git a/pkgs/applications/editors/xxe-pe/default.nix b/pkgs/by-name/xx/xxe-pe/package.nix similarity index 100% rename from pkgs/applications/editors/xxe-pe/default.nix rename to pkgs/by-name/xx/xxe-pe/package.nix diff --git a/pkgs/development/compilers/corretto/11.nix b/pkgs/development/compilers/corretto/11.nix index c1bf6347947c..6094f07057a0 100644 --- a/pkgs/development/compilers/corretto/11.nix +++ b/pkgs/development/compilers/corretto/11.nix @@ -26,12 +26,12 @@ let # Corretto, too. "--disable-warnings-as-errors" ]; - version = "11.0.24.8.1"; + version = "11.0.25.9.1"; src = fetchFromGitHub { owner = "corretto"; repo = "corretto-11"; rev = version; - sha256 = "sha256-MD/ipEulQCEgfqqa0QQrD6x6GQwirQfb8OT2UBDLYEE="; + hash = "sha256-ewGGj4BHmwoPdULeT3PSI0Fo9T3cFbTO7cZXhzuKISY="; }; }; in diff --git a/pkgs/development/compilers/corretto/17.nix b/pkgs/development/compilers/corretto/17.nix index 90ca350a355d..ec1c7d759798 100644 --- a/pkgs/development/compilers/corretto/17.nix +++ b/pkgs/development/compilers/corretto/17.nix @@ -21,12 +21,12 @@ let ; jdk = jdk17; gradle = gradle_7; - version = "17.0.12.7.1"; + version = "17.0.13.11.1"; src = fetchFromGitHub { owner = "corretto"; repo = "corretto-17"; rev = version; - sha256 = "sha256-aRn1hqaqNsBkp2jHHkwMKc8cNiBM+TYVm3tVMPJJ1YE="; + hash = "sha256-2jMre5aI02uDFjSgToTyVNriyb4EuZ01lKsNi822o5Q="; }; }; in diff --git a/pkgs/development/compilers/corretto/21.nix b/pkgs/development/compilers/corretto/21.nix index a5ab64d02c24..731eecca1fb3 100644 --- a/pkgs/development/compilers/corretto/21.nix +++ b/pkgs/development/compilers/corretto/21.nix @@ -21,12 +21,12 @@ let ; jdk = jdk21; gradle = gradle_7; - version = "21.0.4.7.1"; + version = "21.0.5.11.1"; src = fetchFromGitHub { owner = "corretto"; repo = "corretto-21"; rev = version; - sha256 = "sha256-EQqktd2Uz9PhkCaqvbuzmONcSiRppQ40tpLB3mqu2wo="; + hash = "sha256-Df2Pq2aPrTxD4FeqG12apE/USfQULmMGsDsgXrmCINc="; }; }; in diff --git a/pkgs/development/compilers/corretto/mk-corretto.nix b/pkgs/development/compilers/corretto/mk-corretto.nix index 0de05fb0f6c8..ae77a19385e9 100644 --- a/pkgs/development/compilers/corretto/mk-corretto.nix +++ b/pkgs/development/compilers/corretto/mk-corretto.nix @@ -117,14 +117,11 @@ jdk.overrideAttrs ( # Some of the OpenJDK derivation set their `pos` by hand. We need to # overwrite this in order to point to Corretto, not OpenJDK. pos = __curPos; - meta = - with lib; - oldAttrs.meta - // { - homepage = "https://aws.amazon.com/corretto"; - license = licenses.gpl2Only; - description = "Amazon's distribution of OpenJDK"; - maintainers = with maintainers; [ rollf ]; - }; + meta = oldAttrs.meta // { + homepage = "https://aws.amazon.com/corretto"; + license = lib.licenses.gpl2Only; + description = "Amazon's distribution of OpenJDK"; + maintainers = with lib.maintainers; [ rollf ]; + }; } ) diff --git a/pkgs/development/coq-modules/lemma-overloading/default.nix b/pkgs/development/coq-modules/lemma-overloading/default.nix new file mode 100644 index 000000000000..8f4f12b02ba4 --- /dev/null +++ b/pkgs/development/coq-modules/lemma-overloading/default.nix @@ -0,0 +1,32 @@ +{ lib, mkCoqDerivation, coq, mathcomp-ssreflect, version ? null }: + +mkCoqDerivation rec { + pname = "lemma-overloading"; + inherit version; + + defaultVersion = with lib.versions; + lib.switch [ coq.coq-version mathcomp-ssreflect.version ] [ + { cases = [ (range "8.10" "8.12") (range "1.7" "1.11") ]; out = "8.12.0"; } + { cases = [ (range "8.10" "8.11") (range "1.7" "1.11") ]; out = "8.11.0"; } + { cases = [ (range "8.8" "8.11") (range "1.7" "1.10") ]; out = "8.10.0"; } + { cases = [ (range "8.8" "8.9") (range "1.7" "1.8") ]; out = "8.9.0"; } + { cases = [ (isEq "8.8") (range "1.6.2" "1.7") ]; out = "8.8.0"; } + ] null; + + release = { + "8.12.0".sha256 = "sha256-ul1IhxFwhLTy3+rmo3gvjHI3Z8A8avN0Rzq0YDy2bjs="; + "8.11.0".sha256 = "sha256-RI3KdSEYxUbjfZWKO7atGdEqDU8WmLJSFeF6TLlgUFc="; + "8.10.0".sha256 = "sha256-qpHh/iz2fFtGwUedjJ6fuOh8uq1mlL4ETxc9zDJ6800="; + "8.9.0".sha256 = "sha256-dE9O94DvcF93TUTU7ky9pvGZgTtPZWz6826b6Js/nHc="; + "8.8.0".sha256 = "sha256-Iq3KfESMnZF8hhGKuvZHx+hAMEaoCP7MhhQEI6xfoO8="; + }; + releaseRev = v: "v${v}"; + + propagatedBuildInputs = [ mathcomp-ssreflect ]; + + meta = with lib; { + description = "Libraries demonstrating design patterns for programming and proving with canonical structures in Coq"; + maintainers = with lib.maintainers; [ cohencyril ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/development/python-modules/accuweather/default.nix b/pkgs/development/python-modules/accuweather/default.nix index e27c61766556..59c2f374c2d7 100644 --- a/pkgs/development/python-modules/accuweather/default.nix +++ b/pkgs/development/python-modules/accuweather/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "accuweather"; - version = "3.0.0"; + version = "4.0.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = "accuweather"; rev = "refs/tags/${version}"; - hash = "sha256-hnKwK0I8C8Xh7yn4yk2DqowqgyZYDB22IEllm5MeIGo="; + hash = "sha256-7k5aA9Pm9DWjPXwsmHP6jMhnobVJpsLGPgs3YCvnzco="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 4fd81b39ee74..a2513b2ff295 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2024.10.17"; + version = "2024.11.7"; pyproject = true; disabled = pythonOlder "3.12"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = "hahomematic"; rev = "refs/tags/${version}"; - hash = "sha256-7VCmZcs2WtS9rlWby40dZGXcFY8E+3q+QH2URJkOLLQ="; + hash = "sha256-9sCsddVgzfObmhSwfayuf7n7VNlDKKCLM8/dsMH91GA="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/nbdev/default.nix b/pkgs/development/python-modules/nbdev/default.nix index f3b766f086c5..7b5631cf830d 100644 --- a/pkgs/development/python-modules/nbdev/default.nix +++ b/pkgs/development/python-modules/nbdev/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "nbdev"; - version = "2.3.31"; + version = "2.3.32"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-a0BOBwzlZ1HFvpamqQHn8rtgghdkTfr9778wW84q7Xo="; + hash = "sha256-pyPUmITUIM2uwm9F7xm+yorXMwMsHctVc4936+J76a0="; }; diff --git a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix new file mode 100644 index 000000000000..e51f7d067f52 --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix @@ -0,0 +1,32 @@ +{ + lib, + callPackage, + fetchFromGitHub, +}: + +callPackage ../generic.nix rec { + pname = "tower-pixel-dungeon"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "FixAkaTheFix"; + repo = "Tower-Pixel-Dungeon"; + rev = "TPDv${lib.replaceStrings [ "." ] [ "" ] version}"; + hash = "sha256-ZyqrrSuA++L7FOUj6Ytk2lld0YMY4B7WOCzpohOKhdU="; + }; + + sourceRoot = src.name + "/pixel-towers-master"; + + desktopName = "Tower Pixel Dungeon"; + + # Sprite sources (Paint.NET files) interfere with the build process. + postPatch = '' + rm core/src/main/assets/{levelsplashes,sprites}/*.pdn + ''; + + meta = { + homepage = "https://github.com/FixAkaTheFix/Tower-Pixel-Dungeon"; + downloadPage = "https://github.com/FixAkaTheFix/Tower-Pixel-Dungeon/releases"; + description = "Turn-based tower defense game based on Shattered Pixel Dungeon"; + }; +} diff --git a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json b/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json new file mode 100644 index 000000000000..1448fe4b65f8 --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json @@ -0,0 +1,238 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://repo.maven.apache.org/maven2": { + "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.11.0": { + "jar": "sha256-my0CJorGB5QwSi4E5ep1H62fX5bsyvFdgCOm4LF6994=", + "module": "sha256-o7gpPFXSp2lb60LCcKrfKpQcK4NqQL8Ob4W6OOY0VwY=", + "pom": "sha256-wa55d83hp9muWlhfDe8Ap2d4LzcR5/+RYTX2UPA2HOo=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.11.0": { + "pom": "sha256-a5PHPPIyrqNpnueP5GEkJ14KwbsROJkXUcz96l8Au9c=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.11.0/natives-desktop": { + "jar": "sha256-9GCzmqhP9bnWC4mT4j/zKtpWellmThTrfha7VcWk9yE=" + }, + "com/badlogicgames/gdx#gdx-freetype/1.11.0": { + "jar": "sha256-u5hP1RQ13YCN0HaSWOqzJikXG19OnkPzmvRUPh7E3yI=", + "module": "sha256-n5oGuAY9dyn7H94+ippXm3vuPUqevY+xrDubsj78b/M=", + "pom": "sha256-xkjQNIE46uOtYmScUTA8R5rr5czpsbXQeLX3rkVQG+0=" + }, + "com/badlogicgames/gdx#gdx-jnigen-loader/2.3.1": { + "jar": "sha256-ZJDdoiWmHHYCwnu+xOSBE3/1lfjOCy3bpBTww0Bq7mA=", + "module": "sha256-nNWFK9nlHTbRJxrypGzZfOwk5XEHblQTbsmtNxhGua8=", + "pom": "sha256-7e2XZPzSpbw8peeAUEHppiAZ+ovkNLWZ8D1JR+KkQng=" + }, + "com/badlogicgames/gdx#gdx-platform/1.11.0": { + "pom": "sha256-8cBBk8LQnXP8lVNQL05ZFMIOgDWrdpoZ0z4bxJJ0AkA=" + }, + "com/badlogicgames/gdx#gdx-platform/1.11.0/natives-desktop": { + "jar": "sha256-yUFpxwl25LGMCL1qKWtETqiLtUlF67EtHy5DK5L4OTA=" + }, + "com/badlogicgames/gdx#gdx/1.11.0": { + "jar": "sha256-IxU8Z+GVYGROD6EjUjK12F7kHPKJKBwtp+yMKONXULk=", + "module": "sha256-twUVE1CLWninINOZQrsifRvrOrzgBpskstIAA2TPbbM=", + "pom": "sha256-2W6H3BZixRugifIY1Cy3/U3b3sZQiytosvCsZ5dvJSU=" + }, + "com/badlogicgames/gdx-controllers#gdx-controllers-core/2.2.3": { + "jar": "sha256-mONKsUmJoPsqyIG6IaxNEqbOTeQoPzmypPFlumEqOlA=", + "pom": "sha256-UFwJ02ifZMr31qLz/PeKizwEFLIuRH4BlTHJDBCqmGU=" + }, + "com/badlogicgames/gdx-controllers#gdx-controllers-desktop/2.2.3": { + "jar": "sha256-UkirjqKl+0SixFdVEQLsNAP/JYm6hKImCti8cv6X6oM=", + "pom": "sha256-yc9KDEo6Bu+vBLORaza3fL3F71YdCpy6GhdiPxH8Tt8=" + }, + "com/badlogicgames/jamepad#jamepad/2.0.20.0": { + "jar": "sha256-6fFqB9SpRCSs0DiOw6P+TsZLfhiWxlgUwv9rRisTs2Y=", + "module": "sha256-vXFX36GUJsdj2VgYbnHR3+lKnBRgBeEI9pwUameDrmY=", + "pom": "sha256-+gwaoDndosNqw/VslH3vLEOptLnkbCPhrqddHQaZ3eQ=" + }, + "com/badlogicgames/jlayer#jlayer/1.0.1-gdx": { + "jar": "sha256-qrze3C4/pBxOE4hwUj10MzfxiZMQgGMLoaIoVTjNAPs=", + "pom": "sha256-nGCRe2JnOIvFeWpSDswPF8ed2hVGUM0FQdTEE4ghv0k=" + }, + "org/jcraft#jorbis/0.0.17": { + "jar": "sha256-4GfymjcBQmtn7ZcwNpScbljKW7U+73JAsuceKG0lKp4=", + "pom": "sha256-GN47DZMq+Zgy202DL2g1B/vdWgsMJN1oDoTOb1cYLiQ=" + }, + "org/json#json/20170516": { + "jar": "sha256-gT835IIPGFTopOtPgN+UvxsfLsbDtyaS8jq5pVYlavY=", + "pom": "sha256-ZMFVQ6PV2yeaIK6w36A0oqecIVn4zUAd6kj/DyNMGN0=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1": { + "jar": "sha256-CLvDTrdS+GPjf4OrHHsMIvfLJtD4+wpKSoxgKKxFs4U=", + "pom": "sha256-TKQrQ8iqDodIWWB0d0C5lFqqH99+QTTm+iTo+d8cF2A=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1/natives-linux": { + "jar": "sha256-Ze0Ev/fQf+ybf958OxHEBShsjWbk609Mm3kuJn7OWwY=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1/natives-linux-arm32": { + "jar": "sha256-hOvo8klGPrF84PrpnYsto8G/kcjUEHOjtYNFd7dS4/s=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1/natives-linux-arm64": { + "jar": "sha256-IgDyzcENHaZ215o+oFybpVnaCZUFwbdWtu0iL2FagSA=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1/natives-macos": { + "jar": "sha256-G2z/nmSKci7gzBRmlhIFKqW6gJRp+os/sh8kw6vnDek=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1/natives-macos-arm64": { + "jar": "sha256-nHlVeHSNWPQtXUcu2A0ulpk71Psf/ABYztosYx7zmJo=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1/natives-windows": { + "jar": "sha256-nnROy4QCnXrO2uh24lV2WRhKKa/uVeRT9KslZzSb+Ek=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1/natives-windows-x86": { + "jar": "sha256-pYAgBm4ePVP/xMf7ShWMDLP/tPM6rrPlTSVScyGUxBI=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1": { + "jar": "sha256-7kn8Co2UVkUuVM1vd3gj7aZm4sY/wU1lsv0sws/tXb4=", + "pom": "sha256-+ZSGEVVV8RPaHOOs1f7LyWk7X9o1P/era9Lj1//dsn4=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-linux": { + "jar": "sha256-m3mvXH/Q2UkG7h0qU6NCCidQfWYiS0/0a59ncmRd7TQ=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-linux-arm32": { + "jar": "sha256-Bj8Lsu2V5d4q0G4Q0xJ/hJDdviBKyj5qOc5C3pF4TF8=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-linux-arm64": { + "jar": "sha256-X4nVRq4fr1Gv+/sMZBR60swze/ajLwv4fEbTTDQvxdU=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-macos": { + "jar": "sha256-B6qwMJQFjjiph2upM54IoiQDlO+Ii35/z9R2I1j22Wg=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-macos-arm64": { + "jar": "sha256-500OE6wC9BAsIMF/DUFmCK2FNDSV7K4wAp32VousLSc=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-windows": { + "jar": "sha256-Il8331UAYUZ1vprLYnjLbJyAo0kmR5iyz8fsQ08e1HI=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-windows-x86": { + "jar": "sha256-Y5uy113z3Vnqewv4uEfgr1cHRpTXk5ILoclTeJeyw9g=" + }, + "org/lwjgl#lwjgl-openal/3.3.1": { + "jar": "sha256-cyXuG5GooQwGJsabVXqI8t9qwb3KDlLiqS0yQknyytA=", + "pom": "sha256-+ZzowctqhyXSbdyzNFxAPNu8x8qO6WYIu/PCxP2WaiE=" + }, + "org/lwjgl#lwjgl-openal/3.3.1/natives-linux": { + "jar": "sha256-C3OB9R7cYQy2ByRdw0p2LSsht0R4FARAaKGmADu4eDg=" + }, + "org/lwjgl#lwjgl-openal/3.3.1/natives-linux-arm32": { + "jar": "sha256-PQ39lwowYdM7FdvxjT7u/PB83EFx6skgUU8DhkY4mmI=" + }, + "org/lwjgl#lwjgl-openal/3.3.1/natives-linux-arm64": { + "jar": "sha256-RPO9inlEGNtNU+51Rtkdl9nK9/QuE+ojU2PMM18u9ig=" + }, + "org/lwjgl#lwjgl-openal/3.3.1/natives-macos": { + "jar": "sha256-UYTKJLjf6XJVtstVjFKb1qOImBu+VeITcY4/0r2ehuQ=" + }, + "org/lwjgl#lwjgl-openal/3.3.1/natives-macos-arm64": { + "jar": "sha256-wi7Lzvj+5K7q+YEDLfPiy8MKkRqQJS7awfFJeX1YdXU=" + }, + "org/lwjgl#lwjgl-openal/3.3.1/natives-windows": { + "jar": "sha256-X35maqJMqLP7dY5ywD/7nYCbMEicantH6tZ8aXf/ZU4=" + }, + "org/lwjgl#lwjgl-openal/3.3.1/natives-windows-x86": { + "jar": "sha256-fVtbb61e+7Lowk80dgDHy8bv3RNh/TewtaEzGSMehR4=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1": { + "jar": "sha256-5DbSFE86Nv/3cv1kIzMWgJt5XzkN79TVVmD8aG58KDQ=", + "pom": "sha256-LL9XxnqNBGatgI4aJ/4908EQ6KwC3IqyushKhRl3VUE=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1/natives-linux": { + "jar": "sha256-vPzZ+N/SKUiK2ew1PUjHsC3lyiG63UCS8ZAiOaHtBpA=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1/natives-linux-arm32": { + "jar": "sha256-IDPJfXY+YL2sAX/bsI06Q7vlwXqjZ7QsU3ycw6tAYY8=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1/natives-linux-arm64": { + "jar": "sha256-EFjEunNUzavz75NZUeKT91tJYedT13/XU13ccy4oPyg=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1/natives-macos": { + "jar": "sha256-cR8plyiIUJJiqVfxsxOL+ptQVRnRHfbldj0cmj+LPF0=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1/natives-macos-arm64": { + "jar": "sha256-29EQBE6uitvKjjx6cwUpo1FVnnTOqIe7PNbvDcAW8pU=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1/natives-windows": { + "jar": "sha256-hRubWTysIeOvUd1MMD6N8/5qNEo/gda5vMGG5+VAv9o=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1/natives-windows-x86": { + "jar": "sha256-aD2K09DQl3puoYuIpMvn6P1PBsGrIbq+2riDCXQLzGA=" + }, + "org/lwjgl#lwjgl-stb/3.3.1": { + "jar": "sha256-ZOXMzi/Hy88Mg0pb6GQtniSYzj/jHBT/HfdBh4o/gSE=", + "pom": "sha256-dKgsbPvqhNIxAk2f2FgO2VumPCAafUeqsmO6hofDCVk=" + }, + "org/lwjgl#lwjgl-stb/3.3.1/natives-linux": { + "jar": "sha256-+BuZjoxdYj1XHi/NRvy4e30w7SXfd95jrsjP7bNMSnA=" + }, + "org/lwjgl#lwjgl-stb/3.3.1/natives-linux-arm32": { + "jar": "sha256-6xnGjFt5MUjKOT24bzHQ3pVALZ9MFOUADjkYSA9iKkc=" + }, + "org/lwjgl#lwjgl-stb/3.3.1/natives-linux-arm64": { + "jar": "sha256-XOyb0h8xIAJaLIOB3BCax+yI5o5xX9fK27kPXVVfZZs=" + }, + "org/lwjgl#lwjgl-stb/3.3.1/natives-macos": { + "jar": "sha256-oXjWYDA5nGmJeN/kqVALdVep2vTAYeg8iHAzfpsL0+c=" + }, + "org/lwjgl#lwjgl-stb/3.3.1/natives-macos-arm64": { + "jar": "sha256-DXoP8tto86vkFpFn4vSJ3/d72igvQvhuQelEvnxDbdg=" + }, + "org/lwjgl#lwjgl-stb/3.3.1/natives-windows": { + "jar": "sha256-/W/3om6GRa95oNIcpz6NyeRz80AtEzPlRKgdIcpQd+c=" + }, + "org/lwjgl#lwjgl-stb/3.3.1/natives-windows-x86": { + "jar": "sha256-v3PjtRu0MOWIvRWOlsyimOmMoS8p3FzxRFwfDFw5uhs=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.1": { + "jar": "sha256-SI9R7ZXw+sSNHYfLDjusCMAS3L9u88FohoXXCM28zVY=", + "pom": "sha256-78RtVita7rFRzJnBhn5KUeVLzwWs+2EwOtZUh45Nyq8=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-linux": { + "jar": "sha256-e9cLKCM/RiGdoZiaw+n27vcuvyEc43Uv8eZFzqQYpM8=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-linux-arm64": { + "jar": "sha256-pLai7OGbhNkzyXmwx1+46BgCpoLVJEmWXDP0xaH+cAw=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-macos": { + "jar": "sha256-H1yGorLASVqlahKnTHwvwsk1PMOKoAzBOjJAR2QcMk0=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-macos-arm64": { + "jar": "sha256-EY1ViXZdZobUeDcZwt6MpmWiSX2LncKK00/RDtU0P6o=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-windows": { + "jar": "sha256-7McVIQloBZdWnZsyIEXynBp93uxxgs9pGJ2uFUE4ucg=" + }, + "org/lwjgl#lwjgl/3.3.1": { + "jar": "sha256-z4P5DjL7lz/17fyk7zX1XKUbtwpXm2ofKQdE9VLo5IQ=", + "pom": "sha256-xMXHr6uOt4JTZqIwhsPf7droMIwRXF1iF6gm7DJLN+M=" + }, + "org/lwjgl#lwjgl/3.3.1/natives-linux": { + "jar": "sha256-Iu8q+jGhdAozfsnGgGxrjZfpMaY+LEMnDLrxT7P2/E4=" + }, + "org/lwjgl#lwjgl/3.3.1/natives-linux-arm32": { + "jar": "sha256-9rVYGOx25ewBfiW8OvbsTbe3ol56KhdW+i/6uojIZWQ=" + }, + "org/lwjgl#lwjgl/3.3.1/natives-linux-arm64": { + "jar": "sha256-T9lq94+cKTsXAAEcfbGg7AI3xNGIPjf6vgj3To0uAiQ=" + }, + "org/lwjgl#lwjgl/3.3.1/natives-macos": { + "jar": "sha256-9I5hCpgdylFbm75zRcx240UME0BLBS2Kw1fvCvjpCr8=" + }, + "org/lwjgl#lwjgl/3.3.1/natives-macos-arm64": { + "jar": "sha256-cZfomrgKKiGDtO6SXMtE5XLwy3V6kndq34JlJpIAo2o=" + }, + "org/lwjgl#lwjgl/3.3.1/natives-windows": { + "jar": "sha256-CT0T1ipkNLxla/EKOzfiUw/ZrzsLwg+OlUW+WGWdFEM=" + }, + "org/lwjgl#lwjgl/3.3.1/natives-windows-x86": { + "jar": "sha256-6QwfnPVwGu7ymC6/CQWiuZH0YiuKf4JQ6vCHO1oKAiM=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix index b186c90ddbd7..96c610b57c80 100644 --- a/pkgs/os-specific/linux/xpadneo/default.nix +++ b/pkgs/os-specific/linux/xpadneo/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation (finalAttrs: { export sourceRoot=$(pwd)/${finalAttrs.src.name}/hid-xpadneo/src ''; + patches = [ ./xpadneo-0.9.6-kernel-6.12.patch ]; + nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [ bluez ]; diff --git a/pkgs/os-specific/linux/xpadneo/xpadneo-0.9.6-kernel-6.12.patch b/pkgs/os-specific/linux/xpadneo/xpadneo-0.9.6-kernel-6.12.patch new file mode 100644 index 000000000000..3e0c8c605db9 --- /dev/null +++ b/pkgs/os-specific/linux/xpadneo/xpadneo-0.9.6-kernel-6.12.patch @@ -0,0 +1,20 @@ +--- a/hid-xpadneo.c ++++ b/hid-xpadneo.c +@@ -713,5 +713,9 @@ + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,12,0) + static u8 *xpadneo_report_fixup(struct hid_device *hdev, u8 *rdesc, unsigned int *rsize) ++#else ++static const u8 *xpadneo_report_fixup(struct hid_device *hdev, u8 *rdesc, unsigned int *rsize) ++#endif + { + struct xpadneo_devdata *xdata = hid_get_drvdata(hdev); +--- a/xpadneo.h ++++ b/xpadneo.h +@@ -13,4 +13,5 @@ + + #include ++#include + + #include "hid-ids.h" diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix index ffdd4f185840..40b99c6301f9 100644 --- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix +++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "danielperna84"; domain = "homematicip_local"; - version = "1.69.0"; + version = "1.71.0"; src = fetchFromGitHub { owner = "danielperna84"; repo = "custom_homematic"; rev = "refs/tags/${version}"; - hash = "sha256-WDppel1nbl35oKiJfudhdU9LU9ZATwju1nALtDBefYk="; + hash = "sha256-KJ9sckKOWHY2E1V/BmBxrg/1oStQ3h7iwQJ4fnV5yuc="; }; dependencies = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2714801933cc..f32c3949c90b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -290,10 +290,6 @@ with pkgs; stdenv = clangStdenv; }; - cloak = callPackage ../applications/misc/cloak { }; - - cotp = callPackage ../applications/misc/cotp { }; - cope = callPackage ../by-name/co/cope/package.nix { perl = perl538; perlPackages = perl538Packages; @@ -750,7 +746,6 @@ with pkgs; singularity-tools = callPackage ../build-support/singularity-tools { }; - srcOnly = callPackage ../build-support/src-only { }; substitute = callPackage ../build-support/substitute/substitute.nix { }; @@ -1356,8 +1351,6 @@ with pkgs; cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { }; - coltrane = callPackage ../applications/misc/coltrane { }; - dosbox = callPackage ../applications/emulators/dosbox { inherit (darwin.apple_sdk.frameworks ) OpenGL; SDL = if stdenv.hostPlatform.isDarwin then SDL else SDL_compat; @@ -1772,8 +1765,6 @@ with pkgs; blocksat-cli = with python3Packages; toPythonApplication blocksat-cli; - botamusique = callPackage ../tools/audio/botamusique { }; - bucklespring = bucklespring-x11; bucklespring-libinput = callPackage ../applications/audio/bucklespring { }; bucklespring-x11 = callPackage ../applications/audio/bucklespring { legacy = true; }; @@ -1781,8 +1772,6 @@ with pkgs; buildbotPackages = recurseIntoAttrs (python3.pkgs.callPackage ../development/tools/continuous-integration/buildbot { }); inherit (buildbotPackages) buildbot buildbot-ui buildbot-full buildbot-plugins buildbot-worker; - castopod = callPackage ../applications/audio/castopod { }; - certipy = with python3Packages; toPythonApplication certipy-ad; catcli = python3Packages.callPackage ../tools/filesystems/catcli { }; @@ -2614,8 +2603,6 @@ with pkgs; inherit (gst_all_1) gstreamer gst-plugins-base; }; - mpdcron = callPackage ../tools/audio/mpdcron { }; - mpd-sima = python3Packages.callPackage ../tools/audio/mpd-sima { }; nix-output-monitor = callPackage ../tools/nix/nix-output-monitor { }; @@ -3969,8 +3956,6 @@ with pkgs; jc = with python3Packages; toPythonApplication jc; - jekyll = callPackage ../applications/misc/jekyll { }; - jello = with python3Packages; toPythonApplication jello; jing = res.jing-trang; @@ -4148,8 +4133,6 @@ with pkgs; lolcat = callPackage ../tools/misc/lolcat { }; - loudgain = callPackage ../tools/audio/loudgain/default.nix { }; - lsyncd = callPackage ../applications/networking/sync/lsyncd { lua = lua5_2_compat; }; @@ -4576,7 +4559,6 @@ with pkgs; apps = lib.importJSON ../servers/nextcloud/packages/30.json; }; - nextcloud-client = qt6Packages.callPackage ../applications/networking/nextcloud-client { }; nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { }; @@ -4604,7 +4586,6 @@ with pkgs; nvfetcher = haskell.lib.compose.justStaticExecutables haskellPackages.nvfetcher; - mkgmap = callPackage ../applications/misc/mkgmap { }; mkgmap-splitter = callPackage ../applications/misc/mkgmap/splitter { }; @@ -4902,8 +4883,6 @@ with pkgs; pdd = python3Packages.callPackage ../tools/misc/pdd { }; - pdfposter = callPackage ../applications/misc/pdfposter { }; - pdfminer = with python3Packages; toPythonApplication pdfminer-six; pgsync = callPackage ../development/tools/database/pgsync { }; @@ -8635,7 +8614,6 @@ with pkgs; inherit (__splicedPackages.haskellPackages) ShellCheck; }; - # Minimal shellcheck executable for package checks. # Use shellcheck which does not include docs, as # pandoc takes long to build and documentation isn't needed for just running the cli @@ -8785,8 +8763,6 @@ with pkgs; xxdiff = libsForQt5.callPackage ../development/tools/misc/xxdiff { }; - xxe-pe = callPackage ../applications/editors/xxe-pe { }; - xxdiff-tip = xxdiff; ycmd = callPackage ../by-name/yc/ycmd/package.nix { @@ -9557,7 +9533,6 @@ with pkgs; gtk4 = callPackage ../development/libraries/gtk/4.x.nix { }; - # On darwin gtk uses cocoa by default instead of x11. gtk3-x11 = gtk3.override { cairo = cairo.override { x11Support = true; }; @@ -11351,7 +11326,6 @@ with pkgs; jdk = jdk8; }; - ### DEVELOPMENT / LIBRARIES / JAVASCRIPT ### DEVELOPMENT / BOWER MODULES (JAVASCRIPT) @@ -13345,8 +13319,6 @@ with pkgs; pdfstudioviewer ; - acpic = callPackage ../applications/misc/acpic/default.nix { }; - aeolus = callPackage ../applications/audio/aeolus { }; aeolus-stops = callPackage ../applications/audio/aeolus/stops.nix { }; @@ -13661,8 +13633,6 @@ with pkgs; plugins = []; }; - denaro = callPackage ../applications/finance/denaro { }; - inherit (callPackage ../development/tools/devpod { }) devpod devpod-desktop; dfasma = libsForQt5.callPackage ../applications/audio/dfasma { }; @@ -13703,7 +13673,6 @@ with pkgs; docker-compose = callPackage ../applications/virtualization/docker/compose.nix { }; docker-sbom = callPackage ../applications/virtualization/docker/sbom.nix { }; - drawio = callPackage ../applications/graphics/drawio { inherit (darwin) autoSignDarwinBinariesHook; }; @@ -14283,8 +14252,6 @@ with pkgs; inherit (darwin) libobjc; }; - gollum = callPackage ../applications/misc/gollum { }; - googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { }; gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { }; @@ -15240,7 +15207,6 @@ with pkgs; pythonPackages = python3Packages; }; - notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { }; muchsync = callPackage ../applications/networking/mailreaders/notmuch/muchsync.nix { }; @@ -15817,8 +15783,6 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - psst = callPackage ../applications/audio/psst { }; - squeezelite-pulse = callPackage ../by-name/sq/squeezelite/package.nix { audioBackend = "pulse"; }; @@ -15919,8 +15883,6 @@ with pkgs; teamspeak5_client = callPackage ../applications/networking/instant-messengers/teamspeak/client5.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; - taskjuggler = callPackage ../applications/misc/taskjuggler { }; - telegram-desktop = kdePackages.callPackage ../applications/networking/instant-messengers/telegram/telegram-desktop { stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_19.stdenv @@ -17291,6 +17253,7 @@ with pkgs; experienced-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/experienced-pixel-dungeon { }; summoning-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/summoning-pixel-dungeon { }; shorter-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/shorter-pixel-dungeon { }; + tower-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/tower-pixel-dungeon { }; # get binaries without data built by Hydra simutrans_binaries = lowPrio simutrans.binaries; @@ -17417,7 +17380,6 @@ with pkgs; xonotic-glx-unwrapped = xonotic-glx.xonotic-unwrapped; xonotic-dedicated-unwrapped = xonotic-dedicated.xonotic-unwrapped; - xpilot-ng = callPackage ../games/xpilot { }; bloodspilot-server = callPackage ../games/xpilot/bloodspilot-server.nix { }; bloodspilot-client = callPackage ../games/xpilot/bloodspilot-client.nix { }; @@ -17955,7 +17917,6 @@ with pkgs; gmp-static = gmp.override { withStatic = true; }; }; - inherit (callPackages ../applications/science/logic/z3 { python = python3; }) z3_4_12 z3_4_11 @@ -18644,8 +18605,6 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreFoundation Security; }; - pt = callPackage ../applications/misc/pt { }; - pyupgrade = with python3Packages; toPythonApplication pyupgrade; pwntools = with python3Packages; toPythonApplication pwntools; @@ -18966,7 +18925,6 @@ with pkgs; branch = "development"; }; - discord-screenaudio = qt6Packages.callPackage ../applications/networking/instant-messengers/discord-screenaudio { }; discordo = callPackage ../applications/networking/discordo/default.nix { }; @@ -19048,8 +19006,6 @@ with pkgs; openbsd = callPackage ../os-specific/bsd/openbsd { }; - doing = callPackage ../applications/misc/doing { }; - alibuild = callPackage ../development/tools/build-managers/alibuild { python = python3; }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index dbee4637a848..e757116796ab 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -87,6 +87,7 @@ let ITree = callPackage ../development/coq-modules/ITree { }; itree-io = callPackage ../development/coq-modules/itree-io { }; json = callPackage ../development/coq-modules/json {}; + lemma-overloading = callPackage ../development/coq-modules/lemma-overloading {}; LibHyps = callPackage ../development/coq-modules/LibHyps {}; ltac2 = callPackage ../development/coq-modules/ltac2 {}; math-classes = callPackage ../development/coq-modules/math-classes { };