diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 38c0a30d311a..cfb6aa672ecd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7240,6 +7240,11 @@ name = "Duncan Dean"; keys = [ { fingerprint = "9484 44FC E03B 05BA 5AB0 591E C37B 1C1D 44C7 86EE"; } ]; }; + DuskyElf = { + name = "jan Lemata"; + github = "DuskyElf"; + githubId = 91879372; + }; dustyhorizon = { name = "Kenneth Tan"; email = "i.am@kennethtan.xyz"; @@ -14278,6 +14283,13 @@ githubId = 80984519; name = "Kristian Alvestad Nedevold-Hansen"; }; + KristijanZic = { + name = "Kristijan Zic"; + github = "KristijanZic"; + githubId = 10299892; + email = "maintainer@zic.email"; + matrix = "@kristijan.zic:matrix.org"; + }; kristoff3r = { email = "k.soeholm@gmail.com"; github = "kristoff3r"; diff --git a/nixos/tests/kanidm.nix b/nixos/tests/kanidm.nix index 4ee6ce4cd1da..3594a25c8407 100644 --- a/nixos/tests/kanidm.nix +++ b/nixos/tests/kanidm.nix @@ -68,10 +68,10 @@ in verify_ca = true; verify_hostnames = true; }; - unix = { - enable = true; - kanidm.pam_allowed_login_groups = [ "shell" ]; - }; + }; + unix = { + enable = true; + settings.kanidm.pam_allowed_login_groups = [ "shell" ]; }; }; diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix index ce5208afcd85..ad298d02ba89 100644 --- a/pkgs/applications/editors/vim/plugins/aliases.nix +++ b/pkgs/applications/editors/vim/plugins/aliases.nix @@ -41,8 +41,10 @@ mapAliases ( { # keep-sorted start case=no blueballs-neovim = throw "`blueballs-neovim` has been removed"; # added 2025-06-17 + coc-go = throw "`vimPlugins.coc-go` was removed, as it was unmaintained"; # added 2026-02-12 coc-rls = throw "coc-rls has been removed, as rls has been archived since 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01 coc-sumneko-lua = throw "'vimPlugins.coc-sumneko-lua' was removed, as it is unmaintained and broken. You should switch to lua_ls"; # added 2026-02-04 + coc-tsserver = throw "`vimPlugins.coc-tsserver` was removed, as it was unmaintained"; # added 2026-02-12 coc-vetur = throw "coc-vetur was removed, as vetur is unmaintained by Vue. You should switch to Volar, which supports Vue 3"; # added 2025-10-01 completion-treesitter = throw "completion-treesitter has been archived since 2024-01"; # Added 2025-12-18 feline-nvim = throw "feline.nvim has been removed: upstream deleted repository. Consider using lualine"; # Added 2025-02-09 diff --git a/pkgs/applications/editors/vim/plugins/default.nix b/pkgs/applications/editors/vim/plugins/default.nix index b2d7e051a8ad..9630944dc0d3 100644 --- a/pkgs/applications/editors/vim/plugins/default.nix +++ b/pkgs/applications/editors/vim/plugins/default.nix @@ -27,10 +27,6 @@ let inherit (neovimUtils) buildNeovimPlugin; }; - nodePackagePlugins = callPackage ./nodePackagePlugins.nix { - inherit buildVimPlugin; - }; - nonGeneratedPlugins = self: super: let @@ -65,7 +61,6 @@ lib.pipe initialPackages [ (extends plugins) (extends cocPlugins) (extends luaPackagePlugins) - (extends nodePackagePlugins) (extends nonGeneratedPlugins) (extends corePlugins) (extends overrides) diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix deleted file mode 100644 index b86c1ac2eb5e..000000000000 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - lib, - buildVimPlugin, - nodePackages, -}: -final: prev: -let - nodePackageNames = [ - # # keep-sorted start case=no - "coc-go" - "coc-tsserver" - # keep-sorted end - ]; -in -lib.genAttrs nodePackageNames ( - name: - buildVimPlugin { - pname = name; - inherit (nodePackages.${name}) version meta; - src = "${nodePackages.${name}}/lib/node_modules/${name}"; - } -) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix b/pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix index 9fdb529db1df..c4d970a15d92 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "obs-media-controls"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-media-controls"; tag = finalAttrs.version; - hash = "sha256-r9fqpg0G9rzGSqq5FUS8ul58rj0796aGZIND8PCJ9jk="; + hash = "sha256-CElK9e+wpnMiup6DwdQpQfVMm6atXvz+JYHsGnv3lFo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/build-support/php/builders/v2/build-composer-project.nix b/pkgs/build-support/php/builders/v2/build-composer-project.nix index b22750a75eac..f3cff848ddab 100644 --- a/pkgs/build-support/php/builders/v2/build-composer-project.nix +++ b/pkgs/build-support/php/builders/v2/build-composer-project.nix @@ -107,8 +107,7 @@ let # Projects providing a lockfile from upstream can be automatically updated. passthru = passthru // { updateScript = - args.passthru.updateScript - or (if finalAttrs.composerVendor.composerLock == null then nix-update-script { } else null); + args.passthru.updateScript or (if composerLock == null then nix-update-script { } else null); }; meta = meta // { diff --git a/pkgs/by-name/am/amp-cli/update.sh b/pkgs/by-name/am/amp-cli/update.sh index 07c32a5e35be..6bc4baf55545 100755 --- a/pkgs/by-name/am/amp-cli/update.sh +++ b/pkgs/by-name/am/amp-cli/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nodePackages.npm nix-update +#!nix-shell -i bash -p nodejs nix-update set -euo pipefail diff --git a/pkgs/by-name/as/ascii/package.nix b/pkgs/by-name/as/ascii/package.nix index 12cdc6f6f89f..386729bb5288 100644 --- a/pkgs/by-name/as/ascii/package.nix +++ b/pkgs/by-name/as/ascii/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ascii"; - version = "3.30"; + version = "3.31"; src = fetchFromGitLab { owner = "esr"; repo = "ascii"; tag = finalAttrs.version; - hash = "sha256-TE9YR5Va9tXaf2ZyNxz7d8lZRTgnD4Lz7FyqRDl1HNY="; + hash = "sha256-fXVREwjiSpLdwNAm6hbuPiCNFqFlpeBiwKsXGaMiY6s="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix index 38a2770f30c4..037acc0c1c7d 100644 --- a/pkgs/by-name/c2/c2patool/package.nix +++ b/pkgs/by-name/c2/c2patool/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "c2patool"; - version = "0.26.9"; + version = "0.26.26"; src = fetchFromGitHub { owner = "contentauth"; repo = "c2pa-rs"; tag = "c2patool-v${finalAttrs.version}"; - hash = "sha256-hSt+BfcFtV0ooWk9z9mw2m9Lw9vvi9r6XNkbEskL8yU="; + hash = "sha256-IKWvUAhEzHjXb0oAa8SKfsvinqb/Mb4oWorGcxOLjDI="; }; - cargoHash = "sha256-hlFthmanwTYOmw8Vu7eS7xQdvyKDEyT4joQYJNEnmK8="; + cargoHash = "sha256-AJa90o5lDxf8BGnMS2bz1X+nDe9inZMIqMqstP+LT4U="; # use the non-vendored openssl env.OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/ca/cabal2nix/package.nix b/pkgs/by-name/ca/cabal2nix/package.nix new file mode 100644 index 000000000000..91493bc558f3 --- /dev/null +++ b/pkgs/by-name/ca/cabal2nix/package.nix @@ -0,0 +1,21 @@ +{ + lib, + symlinkJoin, + cabal2nix-unwrapped, + makeWrapper, + nix-prefetch-scripts, +}: + +symlinkJoin { + inherit (cabal2nix-unwrapped) pname version meta; + nativeBuildInputs = [ makeWrapper ]; + paths = [ cabal2nix-unwrapped ]; + postBuild = '' + wrapProgram $out/bin/cabal2nix \ + --prefix PATH ":" "${ + lib.makeBinPath [ + nix-prefetch-scripts + ] + }" + ''; +} diff --git a/pkgs/by-name/cu/curl-impersonate/package.nix b/pkgs/by-name/cu/curl-impersonate/package.nix index ee93a60d52f4..9ff6df7795e8 100644 --- a/pkgs/by-name/cu/curl-impersonate/package.nix +++ b/pkgs/by-name/cu/curl-impersonate/package.nix @@ -27,7 +27,7 @@ }: stdenv.mkDerivation rec { pname = "curl-impersonate"; - version = "1.4.2"; + version = "1.4.3"; outputs = [ "out" @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "lexiforest"; repo = "curl-impersonate"; tag = "v${version}"; - hash = "sha256-c24KaYc0cH6b+92kg02mMtTp7ZVu36LeDpW5xjxuzk4="; + hash = "sha256-HMJqc7eoV8+Dn19mOfWaQsNYtWmFDSYNIJOrWGUlGBw="; }; # Disable blanket -Werror to fix build on `gcc-13` related to minor diff --git a/pkgs/by-name/de/devcontainer/package.nix b/pkgs/by-name/de/devcontainer/package.nix index 455fdc7aed08..e60629d2117b 100644 --- a/pkgs/by-name/de/devcontainer/package.nix +++ b/pkgs/by-name/de/devcontainer/package.nix @@ -19,18 +19,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "devcontainer"; - version = "0.82.0"; + version = "0.83.0"; src = fetchFromGitHub { owner = "devcontainers"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-ztHlP3LxjxNDPnNWZqSkAN4+AiRA6j5cwDZrmwB4PDM="; + hash = "sha256-rFp7u+swJdA3wKR6bAfPUIXomwyN5v1oKfu/Y/hflx0="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-bK8M2oZJT0Jr6nqHPOixg+22OWALFiPORiBmd3CHV08="; + hash = "sha256-aVjhIb46CjUS+IEfS5O7I2apAC51UfjPj16q/GNsIzI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/en/endless-sky/package.nix b/pkgs/by-name/en/endless-sky/package.nix index f19a62b90bbb..17fdd6fc4410 100644 --- a/pkgs/by-name/en/endless-sky/package.nix +++ b/pkgs/by-name/en/endless-sky/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "endless-sky"; - version = "0.10.16"; + version = "0.11.0"; src = fetchFromGitHub { owner = "endless-sky"; repo = "endless-sky"; tag = "v${finalAttrs.version}"; - hash = "sha256-QO7Yv8H7hvavyOG/G9+HZh+a7XlCAf7fyPlszvOF91M="; + hash = "sha256-zeLM3n6pm5FxT+GO3dtJwDFKHs8boUuQBShU/PDCeFA="; }; patches = [ diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix index 1cc781123a73..5ee44bff56ac 100644 --- a/pkgs/by-name/fa/fabric-ai/package.nix +++ b/pkgs/by-name/fa/fabric-ai/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "fabric-ai"; - version = "1.4.400"; + version = "1.4.404"; src = fetchFromGitHub { owner = "danielmiessler"; repo = "fabric"; tag = "v${finalAttrs.version}"; - hash = "sha256-pkB11lNOxpu9n5keG4m+veyiH+CCq4Myc3IqnA9MZg8="; + hash = "sha256-RkcbKRSXKsW4nyAtSD63fwZDoaDpqg1LgTRTICD4INs="; }; - vendorHash = "sha256-kL1aCWNEgacKiYQf8LJYxCqmzlAgHi1ulcjrMOw513U="; + vendorHash = "sha256-dG4RPmsAB7yqZyJNBt1N+S9vwhgxdO6p3TeAdIJKMBk="; # Fabric introduced plugin tests that fail in the nix build sandbox. doCheck = false; diff --git a/pkgs/by-name/fo/fosrl-pangolin/package.nix b/pkgs/by-name/fo/fosrl-pangolin/package.nix index b14e5ad3bdaf..60ee7a0916c9 100644 --- a/pkgs/by-name/fo/fosrl-pangolin/package.nix +++ b/pkgs/by-name/fo/fosrl-pangolin/package.nix @@ -29,16 +29,16 @@ in buildNpmPackage (finalAttrs: { pname = "pangolin"; - version = "1.15.1"; + version = "1.15.3"; src = fetchFromGitHub { owner = "fosrl"; repo = "pangolin"; tag = finalAttrs.version; - hash = "sha256-SItYudhY+4JQ8Qrm2FgR5se9blETE5y0i1nnjZNQli4="; + hash = "sha256-UGfwbFbuQ0ljipCjnPxZ/Is2hh1vjZJb97Lo/43sWeg="; }; - npmDepsHash = "sha256-4uGIR0KnVl0SvTnD14bavqlv00aX91s2caPPLPdlhO4="; + npmDepsHash = "sha256-kfgwU5QusUNWVcRXlYCS3ES1Av/phCHG8nFBj0yjz2Q="; nativeBuildInputs = [ esbuild @@ -60,15 +60,15 @@ buildNpmPackage (finalAttrs: { ''; preBuild = '' + npm run set:${db false} npm run set:oss - npm run set:${db true} - npx drizzle-kit generate --dialect ${db true} --schema ./server/db/${db false}/schema/ --name migration --out init + npm run db:${db false}:generate ''; buildPhase = '' runHook preBuild - npm run build:${db false} + npm run build npm run build:cli runHook postBuild @@ -79,21 +79,19 @@ buildNpmPackage (finalAttrs: { installPhase = '' runHook preInstall - cp -r node_modules $out/share/pangolin - - cp -r .next/standalone/.next $out/share/pangolin - cp .next/standalone/package.json $out/share/pangolin - + cp -r node_modules $out/share/pangolin/node_modules + cp -r .next/standalone/. $out/share/pangolin cp -r .next/static $out/share/pangolin/.next/static - cp -r public $out/share/pangolin/public - cp -r dist $out/share/pangolin/dist - cp -r init $out/share/pangolin/dist/init + cp -r server/migrations $out/share/pangolin/dist/init + cp package.json $out/share/pangolin/package.json cp server/db/names.json $out/share/pangolin/dist/names.json cp server/db/ios_models.json $out/share/pangolin/dist/ios_models.json cp server/db/mac_models.json $out/share/pangolin/dist/mac_models.json + cp -r public $out/share/pangolin/public + runHook postInstall ''; diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index af481e2aefbe..8c2e8e005ebd 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -62,14 +62,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gamescope"; - version = "3.16.19"; + version = "3.16.20"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "gamescope"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-Bwj781MVeQexjYnHfDArgjVjl7eQW+CzbdKrLdcAKkg="; + hash = "sha256-o/mzamXrKxhxlGlYy9zW2VfVh4gHL/eNw4PuK138WYc="; }; patches = [ diff --git a/pkgs/by-name/ge/gef/package.nix b/pkgs/by-name/ge/gef/package.nix index ee5b1b03cb39..ca500bd270ec 100644 --- a/pkgs/by-name/ge/gef/package.nix +++ b/pkgs/by-name/ge/gef/package.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gef"; - version = "2025.01"; + version = "2026.01"; src = fetchFromGitHub { owner = "hugsy"; repo = "gef"; rev = finalAttrs.version; - sha256 = "sha256-JM9zH1wWEdjpBafnxMIFtePjXWf3UOXhBSWZCXEOzKw="; + sha256 = "sha256-KHPX4mGo+yy56Rmjd5yx8U5doXrACV2/ZCh+NeQxB0Y="; }; dontBuild = true; diff --git a/pkgs/by-name/ge/gerrit/package.nix b/pkgs/by-name/ge/gerrit/package.nix index db43704d7967..a3a4f0c0691c 100644 --- a/pkgs/by-name/ge/gerrit/package.nix +++ b/pkgs/by-name/ge/gerrit/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "gerrit"; - version = "3.13.2"; + version = "3.13.3"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${finalAttrs.version}.war"; - hash = "sha256-FVfmruKxPR6SQQsbGD0QTOzaAxdZkJaPky4PSEgWTQ8="; + hash = "sha256-kWS7bNE3WARqBGVesZIAvMAqjaJEvnAfwf9qihZ7nlI="; }; buildCommand = '' diff --git a/pkgs/by-name/ha/ha-mcp/package.nix b/pkgs/by-name/ha/ha-mcp/package.nix new file mode 100644 index 000000000000..c7a62aee4860 --- /dev/null +++ b/pkgs/by-name/ha/ha-mcp/package.nix @@ -0,0 +1,50 @@ +{ + lib, + python3Packages, + fetchFromGitHub, +}: + +python3Packages.buildPythonApplication (finalAttrs: { + pname = "ha-mcp"; + version = "6.6.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "homeassistant-ai"; + repo = "ha-mcp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-yAJbvfIH5ewRTip8whbOKxE479qAihESaiLFTnhpRkY="; + }; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = + with python3Packages; + [ + cryptography + fastmcp + httpx + jq + pydantic + python-dotenv + truststore + websockets + ] + ++ httpx.optional-dependencies.socks; + + # Tests require a running Home Assistant instance + doCheck = false; + + pythonImportsCheck = [ "ha_mcp" ]; + + meta = { + description = "MCP server for controlling Home Assistant via natural language"; + homepage = "https://github.com/homeassistant-ai/ha-mcp"; + changelog = "https://github.com/homeassistant-ai/ha-mcp/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + mainProgram = "ha-mcp"; + }; +}) diff --git a/pkgs/by-name/li/linkwarden/package.nix b/pkgs/by-name/li/linkwarden/package.nix index d25eab008b58..5088e4bdb769 100644 --- a/pkgs/by-name/li/linkwarden/package.nix +++ b/pkgs/by-name/li/linkwarden/package.nix @@ -57,13 +57,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "linkwarden"; - version = "2.13.4"; + version = "2.13.5"; src = fetchFromGitHub { owner = "linkwarden"; repo = "linkwarden"; tag = "v${finalAttrs.version}"; - hash = "sha256-Z5yf9EyKoAeSauTst3BT/M/J2jrrTvnlJmJaYB9SIaw="; + hash = "sha256-S6MjWXiB3eJLy5V1kQsGD1zzce/trIGUwadDlDxZMiE="; }; patches = [ diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix index 25611febd675..3d88c5900e66 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix @@ -14,19 +14,19 @@ python3Packages.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.146.0"; + version = "1.147.1"; pyproject = true; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-XeDXXiGmY4Lsn5qNVvsBUdQYlTz40fuVVus7jRsUNW4="; + hash = "sha256-PD+XyUk1DyhqQ100uJYwXdT6FjhRXuafajH0TM8zJOI="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-CnytwGtv/ZoJl03XFLLMTHDiRhWDgWlJD8L/QRiebyM="; + hash = "sha256-nB7gLPDK8sB65xZkTn5W4MCqx4QwWKDUr8hB8KIu0qY="; }; build-system = @@ -52,8 +52,6 @@ python3Packages.buildPythonApplication rec { libiconv ]; - pythonRemoveDeps = [ "setuptools-rust" ]; - dependencies = with python3Packages; [ diff --git a/pkgs/by-name/my/mymake/package.nix b/pkgs/by-name/my/mymake/package.nix index 9d7907a58b51..0e0c05837fa6 100644 --- a/pkgs/by-name/my/mymake/package.nix +++ b/pkgs/by-name/my/mymake/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mymake"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "fstromback"; repo = "mymake"; tag = "v${finalAttrs.version}"; - hash = "sha256-FVY6Ep6619W3fMDRYdU/FdnltNUahkY33aVhz8kXEGU="; + hash = "sha256-JV9WGSCYWdqSD7jbGd4NlFVEZ8Rzh6l9h14O0qzzIw0="; }; buildPhase = '' diff --git a/pkgs/by-name/n-/n-m3u8dl-re/deps.json b/pkgs/by-name/n-/n-m3u8dl-re/deps.json index 2aa2b24a72db..cdfb8b05ee22 100644 --- a/pkgs/by-name/n-/n-m3u8dl-re/deps.json +++ b/pkgs/by-name/n-/n-m3u8dl-re/deps.json @@ -1,17 +1,642 @@ [ + { + "pname": "coverlet.collector", + "version": "6.0.0", + "hash": "sha256-IEmweTMapcPhFHpmJsPXfmMhravYOrWupgjeOvMmQ4o=" + }, + { + "pname": "DiffEngine", + "version": "11.3.0", + "hash": "sha256-aZbLawtOytbKPrF2DQ3dZOwgxjuaGsXKC0LwmlAw6V0=" + }, + { + "pname": "EmptyFiles", + "version": "4.4.0", + "hash": "sha256-2ej6ZYSr/KSz/Mmh0RavjIMMyHzzTVtyjd9nbW17IwY=" + }, + { + "pname": "Microsoft.CodeCoverage", + "version": "17.8.0", + "hash": "sha256-cv/wAXfTNS+RWEsHWNKqRDHC7LOQSSdFJ1a9cZuSfJw=" + }, + { + "pname": "Microsoft.NET.Test.Sdk", + "version": "17.8.0", + "hash": "sha256-uz7QvW+NsVRsp8FR1wjnGEOkUaPX4JyieywvCN6g2+s=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.0", + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + }, + { + "pname": "Microsoft.TestPlatform.ObjectModel", + "version": "17.8.0", + "hash": "sha256-9TwGrjVvbtyetw67Udp3EMK5MX8j0RFRjduxPCs9ESw=" + }, + { + "pname": "Microsoft.TestPlatform.TestHost", + "version": "17.8.0", + "hash": "sha256-+CTYFu631uovLCO47RKe86YaAqfoLA4r73vKORJUsjg=" + }, + { + "pname": "Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" + }, + { + "pname": "NETStandard.Library", + "version": "1.6.1", + "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw=" + }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.1", + "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=" + }, { "pname": "NiL.JS", - "version": "2.5.1684", - "hash": "sha256-lxFTYyuj0SuNzIQGq+rK9s0tAqxqQg8PBj/YdktJunw=" + "version": "2.6.1706", + "hash": "sha256-FKiACRlFcm/XKVqMcEQ8IqWUFaZZoJ/lg4XPkIb8eKE=" + }, + { + "pname": "NuGet.Frameworks", + "version": "6.5.0", + "hash": "sha256-ElqfN4CcKxT3hP2qvxxObb4mnBlYG89IMxO0Sm5oZ2g=" + }, + { + "pname": "runtime.any.System.Collections", + "version": "4.3.0", + "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" + }, + { + "pname": "runtime.any.System.Diagnostics.Tools", + "version": "4.3.0", + "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=" + }, + { + "pname": "runtime.any.System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" + }, + { + "pname": "runtime.any.System.Globalization", + "version": "4.3.0", + "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" + }, + { + "pname": "runtime.any.System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" + }, + { + "pname": "runtime.any.System.IO", + "version": "4.3.0", + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" + }, + { + "pname": "runtime.any.System.Reflection", + "version": "4.3.0", + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" + }, + { + "pname": "runtime.any.System.Reflection.Extensions", + "version": "4.3.0", + "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" + }, + { + "pname": "runtime.any.System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" + }, + { + "pname": "runtime.any.System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" + }, + { + "pname": "runtime.any.System.Runtime", + "version": "4.3.0", + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" + }, + { + "pname": "runtime.any.System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" + }, + { + "pname": "runtime.any.System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" + }, + { + "pname": "runtime.any.System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" + }, + { + "pname": "runtime.any.System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" + }, + { + "pname": "runtime.any.System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" + }, + { + "pname": "runtime.any.System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" + }, + { + "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" + }, + { + "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" + }, + { + "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" + }, + { + "pname": "runtime.native.System", + "version": "4.3.0", + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" + }, + { + "pname": "runtime.native.System.IO.Compression", + "version": "4.3.0", + "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" + }, + { + "pname": "runtime.native.System.Net.Http", + "version": "4.3.0", + "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" + }, + { + "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" + }, + { + "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" + }, + { + "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" + }, + { + "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" + }, + { + "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" + }, + { + "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" + }, + { + "pname": "runtime.unix.Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" + }, + { + "pname": "runtime.unix.System.Console", + "version": "4.3.0", + "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=" + }, + { + "pname": "runtime.unix.System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" + }, + { + "pname": "runtime.unix.System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" + }, + { + "pname": "runtime.unix.System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" + }, + { + "pname": "runtime.unix.System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" + }, + { + "pname": "runtime.unix.System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" + }, + { + "pname": "runtime.unix.System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" + }, + { + "pname": "Shouldly", + "version": "4.3.0", + "hash": "sha256-7pYi2aGqPIHzyhJelXWRLVCLzBxTiQr0DCTY325q6O8=" }, { "pname": "Spectre.Console", - "version": "0.49.2-preview.0.50", - "hash": "sha256-ivFyHTfQxPf/RIin+aftmd+G4PcrqmJXmdu0u/RU6YA=" + "version": "0.52.1-preview.0.5", + "hash": "sha256-2ujBLvbtDcvtJblpvwf9mkW+1jUTIOwTqKviIT8rafo=" + }, + { + "pname": "System.AppContext", + "version": "4.3.0", + "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" + }, + { + "pname": "System.Buffers", + "version": "4.3.0", + "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" + }, + { + "pname": "System.CodeDom", + "version": "6.0.0", + "hash": "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ=" + }, + { + "pname": "System.Collections", + "version": "4.3.0", + "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" + }, + { + "pname": "System.Collections.Concurrent", + "version": "4.3.0", + "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" }, { "pname": "System.CommandLine", - "version": "2.0.0-beta4.22272.1", - "hash": "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc=" + "version": "2.0.0-rc.2.25502.107", + "hash": "sha256-aa8dUxLHZxU4bDs1NJ70VhlvwmkxiP/yPHAXaSnT4Uw=" + }, + { + "pname": "System.Console", + "version": "4.3.0", + "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" + }, + { + "pname": "System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "4.3.0", + "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" + }, + { + "pname": "System.Diagnostics.Tools", + "version": "4.3.0", + "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y=" + }, + { + "pname": "System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" + }, + { + "pname": "System.Globalization", + "version": "4.3.0", + "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" + }, + { + "pname": "System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" + }, + { + "pname": "System.Globalization.Extensions", + "version": "4.3.0", + "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" + }, + { + "pname": "System.IO", + "version": "4.3.0", + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" + }, + { + "pname": "System.IO.Compression", + "version": "4.3.0", + "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=" + }, + { + "pname": "System.IO.Compression.ZipFile", + "version": "4.3.0", + "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" + }, + { + "pname": "System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" + }, + { + "pname": "System.IO.FileSystem.Primitives", + "version": "4.3.0", + "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" + }, + { + "pname": "System.Linq", + "version": "4.3.0", + "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" + }, + { + "pname": "System.Linq.Expressions", + "version": "4.3.0", + "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" + }, + { + "pname": "System.Management", + "version": "6.0.1", + "hash": "sha256-g7bjwQv6af0kWiYtpXE8qgr1YMdD6Rf97TbhK5TxQG0=" + }, + { + "pname": "System.Net.Http", + "version": "4.3.0", + "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=" + }, + { + "pname": "System.Net.NameResolution", + "version": "4.3.0", + "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=" + }, + { + "pname": "System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" + }, + { + "pname": "System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" + }, + { + "pname": "System.ObjectModel", + "version": "4.3.0", + "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" + }, + { + "pname": "System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" + }, + { + "pname": "System.Reflection", + "version": "4.3.0", + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" + }, + { + "pname": "System.Reflection.Emit", + "version": "4.3.0", + "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" + }, + { + "pname": "System.Reflection.Emit.ILGeneration", + "version": "4.3.0", + "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" + }, + { + "pname": "System.Reflection.Emit.Lightweight", + "version": "4.3.0", + "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" + }, + { + "pname": "System.Reflection.Extensions", + "version": "4.3.0", + "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "1.6.0", + "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" + }, + { + "pname": "System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" + }, + { + "pname": "System.Reflection.TypeExtensions", + "version": "4.3.0", + "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" + }, + { + "pname": "System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" + }, + { + "pname": "System.Runtime", + "version": "4.3.0", + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" + }, + { + "pname": "System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" + }, + { + "pname": "System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" + }, + { + "pname": "System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" + }, + { + "pname": "System.Runtime.InteropServices.RuntimeInformation", + "version": "4.3.0", + "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" + }, + { + "pname": "System.Runtime.Numerics", + "version": "4.3.0", + "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" + }, + { + "pname": "System.Security.Claims", + "version": "4.3.0", + "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=" + }, + { + "pname": "System.Security.Cryptography.Algorithms", + "version": "4.3.0", + "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" + }, + { + "pname": "System.Security.Cryptography.Cng", + "version": "4.3.0", + "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" + }, + { + "pname": "System.Security.Cryptography.Csp", + "version": "4.3.0", + "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" + }, + { + "pname": "System.Security.Cryptography.Encoding", + "version": "4.3.0", + "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" + }, + { + "pname": "System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" + }, + { + "pname": "System.Security.Cryptography.Primitives", + "version": "4.3.0", + "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" + }, + { + "pname": "System.Security.Cryptography.X509Certificates", + "version": "4.3.0", + "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" + }, + { + "pname": "System.Security.Principal", + "version": "4.3.0", + "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "4.3.0", + "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" + }, + { + "pname": "System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" + }, + { + "pname": "System.Text.RegularExpressions", + "version": "4.3.0", + "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=" + }, + { + "pname": "System.Threading", + "version": "4.3.0", + "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" + }, + { + "pname": "System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.3.0", + "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" + }, + { + "pname": "System.Threading.ThreadPool", + "version": "4.3.0", + "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" + }, + { + "pname": "System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" + }, + { + "pname": "System.Xml.ReaderWriter", + "version": "4.3.0", + "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=" + }, + { + "pname": "System.Xml.XDocument", + "version": "4.3.0", + "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" + }, + { + "pname": "xunit", + "version": "2.5.3", + "hash": "sha256-X4TkN9y/572LnqOX+fiX6dqsqKe/HbAWZq6PhdD0qGM=" + }, + { + "pname": "xunit.abstractions", + "version": "2.0.3", + "hash": "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM=" + }, + { + "pname": "xunit.analyzers", + "version": "1.4.0", + "hash": "sha256-2m8ikSNvEzQ53rtqhruTpQZpJ+nzI9lhLj0x9w5FKO0=" + }, + { + "pname": "xunit.assert", + "version": "2.5.3", + "hash": "sha256-+cbNHWwm1no316xMJsdzO7TAV7bIlm3dz8dvKHQ66CU=" + }, + { + "pname": "xunit.core", + "version": "2.5.3", + "hash": "sha256-TEL6tBUxWDU9rVOj4KaxBpL+uZQ/3kcZWVDDueeQkhw=" + }, + { + "pname": "xunit.extensibility.core", + "version": "2.5.3", + "hash": "sha256-IjyXgVi/AAnilPsD4IrnqtSrr7Ugu75DguPnI2bVSFs=" + }, + { + "pname": "xunit.extensibility.execution", + "version": "2.5.3", + "hash": "sha256-zN7R4kZGsujpo8aAn4OHdtA0u/r5aeiZaw6A53B69KU=" + }, + { + "pname": "xunit.runner.visualstudio", + "version": "2.5.3", + "hash": "sha256-GZN1E9rOGorQvVSbGTsmXgJxj2TtJwJxCuo+oh+NEBI=" } ] diff --git a/pkgs/by-name/n-/n-m3u8dl-re/package.nix b/pkgs/by-name/n-/n-m3u8dl-re/package.nix index 513f7a5c8c84..80a0f8b43820 100644 --- a/pkgs/by-name/n-/n-m3u8dl-re/package.nix +++ b/pkgs/by-name/n-/n-m3u8dl-re/package.nix @@ -4,18 +4,19 @@ fetchFromGitHub, dotnetCorePackages, }: -buildDotnetModule rec { +buildDotnetModule (finalAttrs: { pname = "n-m3u8dl-re"; - version = "0.3.0-beta"; + version = "0.5.1-beta"; src = fetchFromGitHub { owner = "nilaoda"; repo = "N_m3u8DL-RE"; - tag = "v${version}"; - sha256 = "sha256-AVLO7pxD1LCoogsJPPN5aoOmVBIm3Y/EVsiQWdYI6QU="; + tag = "v${finalAttrs.version}"; + sha256 = "sha256-LLBlSalYqOEPTttEMK/pBoxwiHXeAxFIUm/yuLb1WRo="; }; + patches = [ + # error: PublishTrimmed is implied by native compilation and cannot be disabled ./publish-fix.patch - ./reverse-arr.patch ]; # from openutau/default.nix @@ -36,11 +37,12 @@ buildDotnetModule rec { ''; meta = { + changelog = "https://github.com/nilaoda/N_m3u8DL-RE/releases/tag/v{finalAttrs.version}"; description = "Cross-Platform, modern and powerful stream downloader for MPD/M3U8/ISM"; homepage = "https://github.com/nilaoda/N_m3u8DL-RE"; license = lib.licenses.mit; mainProgram = "n-m3u8dl-re"; maintainers = with lib.maintainers; [ phanirithvij ]; - platforms = lib.platforms.linux ++ lib.platforms.unix; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/n-/n-m3u8dl-re/reverse-arr.patch b/pkgs/by-name/n-/n-m3u8dl-re/reverse-arr.patch deleted file mode 100644 index 1372adfc6414..000000000000 --- a/pkgs/by-name/n-/n-m3u8dl-re/reverse-arr.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/src/N_m3u8DL-RE.Common/Entity/WebVttSub.cs b/src/N_m3u8DL-RE.Common/Entity/WebVttSub.cs -index 6b6d284..b57fc24 100644 ---- a/src/N_m3u8DL-RE.Common/Entity/WebVttSub.cs -+++ b/src/N_m3u8DL-RE.Common/Entity/WebVttSub.cs -@@ -201,7 +201,8 @@ public partial class WebVttSub - time += Convert.ToInt32(parts.Last().PadRight(3, '0')); - str = parts.First(); - } -- var t = str.Split(':').Reverse().ToList(); -+ var t = str.Split(':').ToList(); -+ t.Reverse(); - for (int i = 0; i < t.Count; i++) - { - time += (long)Math.Pow(60, i) * Convert.ToInt32(t[i]) * 1000; -@@ -265,4 +266,4 @@ public partial class WebVttSub - - return srt; - } --} -\ No newline at end of file -+} -diff --git a/src/N_m3u8DL-RE/Util/OtherUtil.cs b/src/N_m3u8DL-RE/Util/OtherUtil.cs -index b2487f3..4eab23f 100644 ---- a/src/N_m3u8DL-RE/Util/OtherUtil.cs -+++ b/src/N_m3u8DL-RE/Util/OtherUtil.cs -@@ -70,7 +70,8 @@ internal static partial class OtherUtil - var hours = -1; - var mins = -1; - var secs = -1; -- arr.Reverse().Select(i => Convert.ToInt32(i)).ToList().ForEach(item => -+ arr.Reverse(); -+ arr.Select(i => Convert.ToInt32(i)).ToList().ForEach(item => - { - if (secs == -1) secs = item; - else if (mins == -1) mins = item; -@@ -170,4 +171,4 @@ internal static partial class OtherUtil - - [GeneratedRegex(@"^(?:(\d+)h)?(?:(\d+)m)?(?:(\d+)s)?$")] - private static partial Regex TimeStrRegex(); --} -\ No newline at end of file -+} diff --git a/pkgs/by-name/ni/niks3/package.nix b/pkgs/by-name/ni/niks3/package.nix new file mode 100644 index 000000000000..258932f3bfe4 --- /dev/null +++ b/pkgs/by-name/ni/niks3/package.nix @@ -0,0 +1,51 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + makeWrapper, + nix, +}: + +buildGoModule (finalAttrs: { + pname = "niks3"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "Mic92"; + repo = "niks3"; + tag = "v${finalAttrs.version}"; + hash = "sha256-taQgMTbC+k/b+9mJH5vx7BMM3gKSI+MZWL26ZhePThk="; + }; + + vendorHash = "sha256-MoYTq1rY1GMmBBP/ypx6DqrHLGtccgsHa+2rpoztI4U="; + + subPackages = [ + "cmd/niks3" + "cmd/niks3-server" + ]; + + nativeBuildInputs = [ makeWrapper ]; + + ldflags = [ + "-s" + "-w" + ]; + + # The niks3 client shells out to `nix path-info` which differs between Nix and Lix; pinning Nix + # here allows the format to be consistent. See https://github.com/Mic92/niks3/issues/181 + postInstall = '' + wrapProgram $out/bin/niks3 --prefix PATH : ${lib.makeBinPath [ nix ]} + ''; + + meta = { + description = "S3-backed Nix binary cache with garbage collection"; + homepage = "https://github.com/Mic92/niks3"; + changelog = "https://github.com/Mic92/niks3/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + mic92 + philiptaron + ]; + mainProgram = "niks3"; + }; +}) diff --git a/pkgs/by-name/ni/nixpkgs-review/package.nix b/pkgs/by-name/ni/nixpkgs-review/package.nix index 4a37d17b7acc..8b134dc85e0c 100644 --- a/pkgs/by-name/ni/nixpkgs-review/package.nix +++ b/pkgs/by-name/ni/nixpkgs-review/package.nix @@ -63,10 +63,16 @@ python3Packages.buildPythonApplication (finalAttrs: { ++ lib.optional withGlow glow; in [ - "--prefix PATH : ${lib.makeBinPath binPath}" - "--set-default NIX_SSL_CERT_FILE ${cacert}/etc/ssl/certs/ca-bundle.crt" + "--prefix" + "PATH" + ":" + (lib.makeBinPath binPath) + "--set-default" + "NIX_SSL_CERT_FILE" + "${cacert}/etc/ssl/certs/ca-bundle.crt" # we don't have any runtime deps but nixpkgs-review shells might inject unwanted dependencies - "--unset PYTHONPATH" + "--unset" + "PYTHONPATH" ]; postInstall = lib.optionalString withAutocomplete '' diff --git a/pkgs/by-name/op/openapi-python-client/package.nix b/pkgs/by-name/op/openapi-python-client/package.nix index 272962d1757a..cd39d85e0efd 100644 --- a/pkgs/by-name/op/openapi-python-client/package.nix +++ b/pkgs/by-name/op/openapi-python-client/package.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "openapi-python-client"; - version = "0.28.1"; + version = "0.28.2"; pyproject = true; src = fetchFromGitHub { @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "openapi-generators"; repo = "openapi-python-client"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZzZLrxeJtT4rgxlcANKcrw7nRlTF8vRV/lItyH7x95o="; + hash = "sha256-egeT/XTUTq+HbwX7PpfygDNNKgBkExM0neMEu/mfErw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/opencode-desktop/package.nix b/pkgs/by-name/op/opencode-desktop/package.nix index 7e2915964ca1..eb81fc2913d3 100644 --- a/pkgs/by-name/op/opencode-desktop/package.nix +++ b/pkgs/by-name/op/opencode-desktop/package.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ; cargoRoot = "packages/desktop/src-tauri"; - cargoHash = "sha256-6ScxLZVldKL8ChDoH13Q55W3Zqz9kNshWzAGOij5jqs="; + cargoHash = "sha256-Sfw/1380knqusED8OJcCn0D7erkX1sLtQq9m6Dd0v4Y="; buildAndTestSubdir = finalAttrs.cargoRoot; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 4dca7467566d..8323f6d51177 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -14,12 +14,12 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "1.1.59"; + version = "1.1.65"; src = fetchFromGitHub { owner = "anomalyco"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-+vvNQzfhuP91mK/BjBufWGdS+2vHJAtB8iDl14z4y48="; + hash = "sha256-U8hx8MeyhCe+o3uj3GL3LbkkFkduvxVtPgZeVGoIE0s="; }; node_modules = stdenvNoCC.mkDerivation { @@ -70,9 +70,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { outputHash = if stdenvNoCC.hostPlatform.isDarwin then - "sha256-BMTXCu31OBxHF0hz/NVEs5a7M6CytXwe7fOlDgnECk4=" + "sha256-KlE4U87sVWoB2eXngUU7w+Z3F7oqh3NPhoCRHQqQm1s=" else - "sha256-lPGQxvK8WUqBQs25I+U8V+0y12jCZumEFGHMkEmOR34="; + "sha256-yza9eeMOWAd9ggGPMDs6ALjg7ptfk4iuN5y1rcUTIpc="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; @@ -166,6 +166,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ delafthi graham33 + DuskyElf ]; sourceProvenance = with lib.sourceTypes; [ fromSource ]; platforms = [ diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/by-name/pa/palemoon-bin/package.nix similarity index 100% rename from pkgs/applications/networking/browsers/palemoon/bin.nix rename to pkgs/by-name/pa/palemoon-bin/package.nix diff --git a/pkgs/applications/networking/browsers/palemoon/zz-disableUpdater.js b/pkgs/by-name/pa/palemoon-bin/zz-disableUpdater.js similarity index 100% rename from pkgs/applications/networking/browsers/palemoon/zz-disableUpdater.js rename to pkgs/by-name/pa/palemoon-bin/zz-disableUpdater.js diff --git a/pkgs/by-name/pa/palemoon-gtk2-bin/package.nix b/pkgs/by-name/pa/palemoon-gtk2-bin/package.nix new file mode 100644 index 000000000000..67f265c42e77 --- /dev/null +++ b/pkgs/by-name/pa/palemoon-gtk2-bin/package.nix @@ -0,0 +1,7 @@ +{ + palemoon-bin, +}: + +palemoon-bin.override { + withGTK3 = false; +} diff --git a/pkgs/by-name/sc/scitokens-cpp/package.nix b/pkgs/by-name/sc/scitokens-cpp/package.nix index 324edc7b1218..c29a72349d44 100644 --- a/pkgs/by-name/sc/scitokens-cpp/package.nix +++ b/pkgs/by-name/sc/scitokens-cpp/package.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation { pname = "scitokens-cpp"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "scitokens"; repo = "scitokens-cpp"; - rev = "v1.2.0"; - hash = "sha256-Sc3+g2MMxVnPNI4V/f8Ss8Z3SOQScC9fj8woJDm2O/A="; + rev = "v1.3.0"; + hash = "sha256-C+7tS7Mbcjt4i2SHyinNTqjO+ODsyg9zFdX8HRhhPLk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/se/serverpod_cli/package.nix b/pkgs/by-name/se/serverpod_cli/package.nix new file mode 100644 index 000000000000..51d03f98c952 --- /dev/null +++ b/pkgs/by-name/se/serverpod_cli/package.nix @@ -0,0 +1,69 @@ +{ + lib, + buildDartApplication, + fetchFromGitHub, + yq-go, + versionCheckHook, + writableTmpDirAsHomeHook, +}: +buildDartApplication rec { + pname = "serverpod_cli"; + version = "3.3.1"; + + # Fetch the whole monorepo + src = fetchFromGitHub { + owner = "serverpod"; + repo = "serverpod"; + rev = version; + hash = "sha256-4vpZiqvzhcAziElfzssw4bLYTO5/dhai3C8LEpn0eAo="; + }; + + sourceRoot = "${src.name}/tools/serverpod_cli"; + + dartEntryPoints = { + "bin/serverpod" = "bin/serverpod_cli.dart"; + }; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + nativeBuildInputs = [ yq-go ]; + + nativeInstallCheckInputs = [ + versionCheckHook + writableTmpDirAsHomeHook + ]; + + doInstallCheck = true; + + versionCheckKeepEnvironment = "HOME"; + + preBuild = '' + # Set productionMode to true. + substituteInPlace lib/src/generated/version.dart \ + --replace-fail "const productionMode = false;" "const productionMode = true;" + + # Remove the dependency_overrides section. + # Relative path overrides in the monorepo break the Nix build which expects + # all dependencies to be resolved via the lockfile. + yq -i 'del(.dependency_overrides)' pubspec.yaml + ''; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + mainProgram = "serverpod"; + homepage = "https://serverpod.dev"; + description = "Command line tools for Serverpod"; + longDescription = '' + Serverpod is a next-generation app and web server, + built for the Flutter community. + It allows you to write your server-side code in Dart, + automatically generate your APIs, and hook up your + database with minimal effort. Serverpod is open-source, + and you can host your server anywhere. + ''; + changelog = "https://raw.githubusercontent.com/serverpod/serverpod/${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with lib.maintainers; [ KristijanZic ]; + }; +} diff --git a/pkgs/by-name/se/serverpod_cli/pubspec.lock.json b/pkgs/by-name/se/serverpod_cli/pubspec.lock.json new file mode 100644 index 000000000000..e7e11d51ad03 --- /dev/null +++ b/pkgs/by-name/se/serverpod_cli/pubspec.lock.json @@ -0,0 +1,837 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "796d97d925add7ffcdf5595f33a2066a6e3cee97971e6dbef09b76b7880fd760", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "94.0.0" + }, + "analyzer": { + "dependency": "direct main", + "description": { + "name": "analyzer", + "sha256": "9c8ebb304d72c0a0c8764344627529d9503fc83d7d73e43ed727dc532f822e4b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.2" + }, + "archive": { + "dependency": "direct main", + "description": { + "name": "archive", + "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.7" + }, + "args": { + "dependency": "direct main", + "description": { + "name": "args", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.0" + }, + "async": { + "dependency": "direct main", + "description": { + "name": "async", + "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.13.0" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "built_collection": { + "dependency": "direct main", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "7931c90b84bc573fef103548e354258ae4c9d28d140e41961df6843c5d60d4d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.12.3" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.4" + }, + "ci": { + "dependency": "direct main", + "description": { + "name": "ci", + "sha256": "145d095ce05cddac4d797a158bc4cf3b6016d1fe63d8c3d2fbd7212590adca13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0" + }, + "cli_config": { + "dependency": "transitive", + "description": { + "name": "cli_config", + "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "cli_tools": { + "dependency": "direct main", + "description": { + "name": "cli_tools", + "sha256": "af507d13e9522e207aeacddb1fcb84814f36eed46dd536010d1ee78ef0f99449", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.0" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "code_builder": { + "dependency": "direct main", + "description": { + "name": "code_builder", + "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.11.1" + }, + "collection": { + "dependency": "direct main", + "description": { + "name": "collection", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.1" + }, + "config": { + "dependency": "direct main", + "description": { + "name": "config", + "sha256": "7ab448e904baf3991878881be208b4298b2c1737852529238340dc780c575bda", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.4" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "coverage": { + "dependency": "transitive", + "description": { + "name": "coverage", + "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.7" + }, + "dart_mappable": { + "dependency": "transitive", + "description": { + "name": "dart_mappable", + "sha256": "0e219930c9f7b9e0f14ae7c1de931c401875110fd5c67975b6b9492a6d3a531b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.6.1" + }, + "dart_style": { + "dependency": "direct main", + "description": { + "name": "dart_style", + "sha256": "15a7db352c8fc6a4d2bc475ba901c25b39fe7157541da4c16eacce6f8be83e49", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.5" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "flutter_lints": { + "dependency": "transitive", + "description": { + "name": "flutter_lints", + "sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.0" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.2" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.20.2" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "805fa86df56383000f640384b282ce0cb8431f1a7a2396de92fb66186d8c57df", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.10.0" + }, + "json_rpc_2": { + "dependency": "direct main", + "description": { + "name": "json_rpc_2", + "sha256": "3c46c2633aec07810c3d6a2eb08d575b5b4072980db08f1344e66aeb53d6e4a7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.0" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "lsp_server": { + "dependency": "direct main", + "description": { + "name": "lsp_server", + "sha256": "81fc68ade179fa6a23b46354fe019e8d492a724548ec909657020db750e31376", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.0" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.18" + }, + "meta": { + "dependency": "direct main", + "description": { + "name": "meta", + "sha256": "9f29b9bcc8ee287b1a31e0d01be0eae99a930dbffdaecf04b3f3d82a969f296f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.1" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "node_preamble": { + "dependency": "transitive", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "oauth2": { + "dependency": "transitive", + "description": { + "name": "oauth2", + "sha256": "890a032ba1b44fa8dcfeba500e613df0ecbe16aeace13bb0fe1d25eb42cda5b8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.5" + }, + "package_config": { + "dependency": "direct main", + "description": { + "name": "package_config", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.2" + }, + "posix": { + "dependency": "transitive", + "description": { + "name": "posix", + "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.3" + }, + "pub_api_client": { + "dependency": "direct main", + "description": { + "name": "pub_api_client", + "sha256": "bb0338393897235fdf689551e2b49b13e24b432b2da559b00229e784d9a5e680", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" + }, + "pub_semver": { + "dependency": "direct main", + "description": { + "name": "pub_semver", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "pubspec_parse": { + "dependency": "direct main", + "description": { + "name": "pubspec_parse", + "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "recase": { + "dependency": "direct main", + "description": { + "name": "recase", + "sha256": "e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "rfc_6901": { + "dependency": "transitive", + "description": { + "name": "rfc_6901", + "sha256": "6a43b1858dca2febaf93e15639aa6b0c49ccdfd7647775f15a499f872b018154", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1" + }, + "serverpod_client": { + "dependency": "transitive", + "description": { + "name": "serverpod_client", + "sha256": "e936d6fa951f548cf2a16f75a526d645162c3b88437ff57550fb596835266a00", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.1" + }, + "serverpod_lints": { + "dependency": "direct dev", + "description": { + "name": "serverpod_lints", + "sha256": "610e7c69109e412891ba2a4d2fe6cd70c0d5f01c39873471fcc2c3ca52e5c25e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.1" + }, + "serverpod_serialization": { + "dependency": "direct main", + "description": { + "name": "serverpod_serialization", + "sha256": "b1422d3e99a26e8c5fc9cf09785cb2f6c10713cb08d46b2b86dd7054e9e7decd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.1" + }, + "serverpod_service_client": { + "dependency": "direct main", + "description": { + "name": "serverpod_service_client", + "sha256": "b70fa027dfea546835864d24e3bb712394876d612bbb48e1729cb480f0393480", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.1" + }, + "serverpod_shared": { + "dependency": "direct main", + "description": { + "name": "serverpod_shared", + "sha256": "01a9dbf24f1e6c61d90c606cba3c40ec3582f3ef3c477fa159f4c70126d548b4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.1" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_packages_handler": { + "dependency": "transitive", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "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": { + "name": "shelf_web_socket", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "source_map_stack_trace": { + "dependency": "transitive", + "description": { + "name": "source_map_stack_trace", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "source_maps": { + "dependency": "transitive", + "description": { + "name": "source_maps", + "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.13" + }, + "source_span": { + "dependency": "direct main", + "description": { + "name": "source_span", + "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.2" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.1" + }, + "stream_channel": { + "dependency": "direct main", + "description": { + "name": "stream_channel", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "super_string": { + "dependency": "direct main", + "description": { + "name": "super_string", + "sha256": "ba41acf9fbb318b3fc0d57c9235779100394d85d83f45ab533615df1f3146ea7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.3" + }, + "term_glyph": { + "dependency": "direct dev", + "description": { + "name": "term_glyph", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "test": { + "dependency": "direct dev", + "description": { + "name": "test", + "sha256": "54c516bbb7cee2754d327ad4fca637f78abfc3cbcc5ace83b3eda117e42cd71a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.29.0" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.9" + }, + "test_core": { + "dependency": "transitive", + "description": { + "name": "test_core", + "sha256": "394f07d21f0f2255ec9e3989f21e54d3c7dc0e6e9dbce160e5a9c1a6be0e2943", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.15" + }, + "test_descriptor": { + "dependency": "direct dev", + "description": { + "name": "test_descriptor", + "sha256": "9ce468c97ae396e8440d26bb43763f84e2a2a5331813ee5a397cb4da481aaf9a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "type_plus": { + "dependency": "transitive", + "description": { + "name": "type_plus", + "sha256": "d5d1019471f0d38b91603adb9b5fd4ce7ab903c879d2fbf1a3f80a630a03fcc9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "uuid": { + "dependency": "direct main", + "description": { + "name": "uuid", + "sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.2" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "15.0.2" + }, + "watcher": { + "dependency": "direct main", + "description": { + "name": "watcher", + "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "webkit_inspection_protocol": { + "dependency": "transitive", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "yaml": { + "dependency": "direct main", + "description": { + "name": "yaml", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + }, + "yaml_edit": { + "dependency": "direct main", + "description": { + "name": "yaml_edit", + "sha256": "07c9e63ba42519745182b88ca12264a7ba2484d8239958778dfe4d44fe760488", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.4" + } + }, + "sdks": { + "dart": ">=3.9.0 <4.0.0" + } +} \ No newline at end of file diff --git a/pkgs/by-name/se/serverpod_cli/update.sh b/pkgs/by-name/se/serverpod_cli/update.sh new file mode 100755 index 000000000000..44d18ed69ede --- /dev/null +++ b/pkgs/by-name/se/serverpod_cli/update.sh @@ -0,0 +1,56 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils jq yq-go git nix-prefetch-github common-updater-scripts dart + +set -euo pipefail + +PACKAGE_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" +NIX_FILE="$PACKAGE_DIR/package.nix" + +echo "Checking for latest serverpod version..." +latest_version=$(git ls-remote --tags https://github.com/serverpod/serverpod.git | \ + grep -v "\^{}" | \ + cut -f2 | \ + sed 's/refs\/tags\///' | \ + grep -E '^[0-9]+\.[0-9]+\.[0-9]+$' | \ + sort -V | \ + tail -n 1) + +current_version=$(sed -n 's/^[[:space:]]*version = "\(.*\)";/\1/p' "$NIX_FILE") + +if [[ "$latest_version" == "$current_version" ]]; then + echo "serverpod_cli is already up to date ($current_version)" + exit 0 +fi + +echo "Updating serverpod_cli from $current_version to $latest_version" + +echo "Prefetching source for $latest_version..." +PREFETCH_OUT=$(nix-prefetch-github serverpod serverpod --rev "$latest_version") +echo "Prefetch output: $PREFETCH_OUT" +new_hash=$(echo "$PREFETCH_OUT" | jq -r .hash) +echo "New hash: $new_hash" + +update-source-version serverpod_cli "$latest_version" "$new_hash" --version-key=version --file="$NIX_FILE" + +echo "Generating fresh pubspec.lock.json..." +TMPDIR=$(mktemp -d) +trap 'rm -rf "$TMPDIR"' EXIT + +src=$(nix-build --no-link . -A serverpod_cli.src) + +cp -r "$src/tools/serverpod_cli/"* "$TMPDIR/" +chmod -R +w "$TMPDIR" +cd "$TMPDIR" + +# Remove dependency_overrides as in the nix build +yq -i 'del(.dependency_overrides)' pubspec.yaml + +# Generate lockfile because it's not included in the source +if ! test -f pubspec.lock; then + dart pub get +fi + +# Convert to JSON +yq -o=json . pubspec.lock > "$PACKAGE_DIR/pubspec.lock.json" + +echo "Update complete: $current_version -> $latest_version" diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix index 372c2dea4433..3db9fbcefd72 100644 --- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix +++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix @@ -24,23 +24,23 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "libsignal-node"; - version = "0.86.12"; + version = "0.86.16"; src = fetchFromGitHub { owner = "signalapp"; repo = "libsignal"; tag = "v${finalAttrs.version}"; - hash = "sha256-XVq1fvhUF0WqSs1lJRCBRuhOW4idY6Nm21UdX4/6TE8="; + hash = "sha256-rpZdT0nkOhdf9YFG5eDxSLQPv5CtUuX9+y6V7GxzvaA="; }; - cargoHash = "sha256-vat7vjL9HDY/m7CLUJNpU3NZ79nCVHxLO5tEtaEDBnE="; + cargoHash = "sha256-TrsxEe4+qCBYK+6/YN3T/fD+m6U0Hor98M5sTpdFk7Q="; npmRoot = "node"; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-npm-deps"; inherit (finalAttrs) version src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}"; - hash = "sha256-O2dMH45YfPlwgqYtQK7HGBgAtfePb6YIrnwqbGIGcnA="; + hash = "sha256-0YimfYIKxlljERPnseQ8j3hpS1XPXINNhBnrAdnkEfM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index 5ef621d952a8..c5cd14cbb745 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -54,13 +54,13 @@ let ''; }); - version = "7.88.0"; + version = "7.89.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-uKN6zandxyc2VUCq3uINMgeniPyJiE9lskT/Opz1WMA="; + hash = "sha256-2/cmbNDeFqq+VtJvMIfC/Yg31Mc7AlH+TJGI2Vp+SuY="; }; sticker-creator = stdenv.mkDerivation (finalAttrs: { @@ -147,15 +147,15 @@ stdenv.mkDerivation (finalAttrs: { fetcherVersion = 1; hash = if withAppleEmojis then - "sha256-NWzGyoj1BafRe9LxLkhpWWjGaT0gfQGHnxYDMpvRLYE=" + "sha256-QBiKYgiSUoHOxr2jZv3DxP56/VMW8rAZzEQlMQDk2VA=" else - "sha256-XZ0XivOvZ4yormMgLK5vtV63t4CtNaZ1l0eexTUbbPg="; + "sha256-ELbzV97TOGC3MLB/Cs5xk1MBPXXUYKAClji8oEiMP5Y="; }; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1770233682; + SOURCE_DATE_EPOCH = 1770853842; }; preBuild = '' diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix index 1f0f43d907db..48f1e9613028 100644 --- a/pkgs/by-name/si/signal-desktop/ringrtc.nix +++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix @@ -19,16 +19,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "ringrtc"; - version = "2.62.0"; + version = "2.64.1"; src = fetchFromGitHub { owner = "signalapp"; repo = "ringrtc"; tag = "v${finalAttrs.version}"; - hash = "sha256-wNtaN6z+Q7zVzaoeoUUDr6+syxKi6gcdhtJ1c2XrhgM="; + hash = "sha256-+OcWA7qluHM7ZUDKmO6afG2Vi6W7M8mTCI8NQL98R3A="; }; - cargoHash = "sha256-zB5Xt5NeKUIa4W2MZrltINXyvm0+UXs6Fm0gm1MGRD0="; + cargoHash = "sha256-cLZvnnNqvSBBO1sAoYyNB2mWhiNhSYfQxQK4wkjus8U="; preConfigure = '' # Check for matching webrtc version diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json index 36529a592cd7..8864557d8bc7 100644 --- a/pkgs/by-name/si/signal-desktop/webrtc-sources.json +++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json @@ -1,10 +1,10 @@ { "src": { "args": { - "hash": "sha256-TmiD7c4pIqjaN9pMSUJMJggSKNbRcsz13Y8YnRjw4t0=", + "hash": "sha256-z+hCmu9BxN/hPIWWtjl3NY8IcAxMmZWG/Y3QsylL6H8=", "owner": "signalapp", "repo": "webrtc", - "tag": "7444c" + "tag": "7444f" }, "fetcher": "fetchFromGitHub" }, diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix index e99dd893ee80..55512775eead 100644 --- a/pkgs/by-name/un/unciv/package.nix +++ b/pkgs/by-name/un/unciv/package.nix @@ -12,7 +12,7 @@ nix-update-script, }: let - version = "4.19.11"; + version = "4.19.12"; desktopItem = makeDesktopItem { name = "unciv"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-GLIgiCx+bpBWKi+IewXUNIG6SDAKNvAjGie1XmFzF04="; + hash = "sha256-rswc0ssIAF4AAGiGlGu2ls2ZG1oPzjJnd5j5CQb+Hsc="; }; dontUnpack = true; diff --git a/pkgs/by-name/we/webhook/package.nix b/pkgs/by-name/we/webhook/package.nix index a3821b841471..f8b24e7b845e 100644 --- a/pkgs/by-name/we/webhook/package.nix +++ b/pkgs/by-name/we/webhook/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "webhook"; - version = "2.8.2"; + version = "2.8.3"; src = fetchFromGitHub { owner = "adnanh"; repo = "webhook"; rev = finalAttrs.version; - sha256 = "sha256-3Ew72ADGTlvp6w37nYbCng7HHCZ0a7kVf3DNRNyCkZU="; + sha256 = "sha256-P+uLVv0YMlTXrbWVapXRXc+VvQZxUiimLG0EX9tDxpM="; }; vendorHash = null; diff --git a/pkgs/by-name/wh/wheelwizard/deps.json b/pkgs/by-name/wh/wheelwizard/deps.json index 54158417541b..40cc7d8c0a7b 100644 --- a/pkgs/by-name/wh/wheelwizard/deps.json +++ b/pkgs/by-name/wh/wheelwizard/deps.json @@ -294,6 +294,11 @@ "version": "17.13.0", "hash": "sha256-sc2wvyV8cGm1FrNP2GGHEI584RCvRPu15erYCsgw5QY=" }, + { + "pname": "Microsoft.NETCore.App.Host.win-x64", + "version": "8.0.23", + "hash": "sha256-vIDCQTTBNhOchF0H7voWbnaiJNM5z7ivJOjHyLdtvAs=" + }, { "pname": "Microsoft.TestPlatform.ObjectModel", "version": "17.13.0", diff --git a/pkgs/by-name/wh/wheelwizard/package.nix b/pkgs/by-name/wh/wheelwizard/package.nix index 8b7a0b441a16..cc4cf1b7f85e 100644 --- a/pkgs/by-name/wh/wheelwizard/package.nix +++ b/pkgs/by-name/wh/wheelwizard/package.nix @@ -14,13 +14,13 @@ }: buildDotnetModule rec { pname = "wheelwizard"; - version = "2.3.3"; + version = "2.3.5"; src = fetchFromGitHub { owner = "TeamWheelWizard"; repo = "WheelWizard"; tag = version; - hash = "sha256-DuEI6bmvNP6wRuZX9Do0FGDsu80ldy0SCefBk6gqT9s="; + hash = "sha256-VEoj0h+YTEPWmYz2jtFnLzcMbMNeSt8yTuOwbfNt9t0="; }; postPatch = '' rm .config/dotnet-tools.json diff --git a/pkgs/by-name/xm/xmedcon/package.nix b/pkgs/by-name/xm/xmedcon/package.nix index af94d8759138..8a06c87174da 100644 --- a/pkgs/by-name/xm/xmedcon/package.nix +++ b/pkgs/by-name/xm/xmedcon/package.nix @@ -1,6 +1,7 @@ { stdenv, lib, + buildPackages, fetchurl, gtk3, glib, @@ -12,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xmedcon"; - version = "0.25.3"; + version = "0.26.1"; src = fetchurl { url = "mirror://sourceforge/xmedcon/xmedcon-${finalAttrs.version}.tar.bz2"; - sha256 = "sha256-9VrTQP614tIrmZRm9bSpmlXqCbMPzqvhv222eFiKS4M="; + sha256 = "sha256-mf424qgt1FqqnwDQU7b8XLQNJsesLQi07T0LdP1cdPg="; }; buildInputs = [ @@ -31,6 +32,13 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook3 ]; + # xmedcon looks also for a host c compiler when cross-compiling + # otherwise you obtain following error message: + # "error: no acceptable C compiler found in $PATH" + depsBuildBuild = [ + buildPackages.stdenv.cc + ]; + meta = { description = "Open source toolkit for medical image conversion"; homepage = "https://xmedcon.sourceforge.net/"; diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index cea8a38b575e..3411863730c6 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -41,8 +41,8 @@ let with lib.versions; lib.switch coq.version [ { - case = range "8.15" "9.0"; - out = "3.16"; + case = range "8.15" "9.1"; + out = "3.17"; } { case = range "8.14" "8.20"; @@ -73,6 +73,7 @@ let "3.14".sha256 = "sha256-QXJMpp/BaPiK5okHeo2rcmXENToXKjB51UqljMHTDgw="; "3.15".sha256 = "sha256-QFTueGZd0hAWUj+c5GZL/AyNpfN4FuJiIzCICmwRXJ8="; "3.16".sha256 = "sha256-Ep8bcSFs3Cu+lV5qgo89JJU2vh4TTq66Or0c4evo3gM="; + "3.17".hash = "sha256-RRc39FUe2sHQdO/ybwA3B7o31qfxcUkgah6I20i0ElE="; }; strictDeps = true; @@ -316,6 +317,19 @@ let }) ]; } + { + cases = [ + (isGe "9.0") + (isEq "3.17") + ]; + out = [ + # Support for Coq 9.0.1 & Coq 9.1.1 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/6e5d40fb028d787249cd897fe4a1b96420addb8b.patch"; + hash = "sha256-YBDsvhfup1IMc5GcW7BdsHUKGCv3A1eGIeb4Wal4x7A="; + }) + ]; + } ] [ ]; }); diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bcbcf3ba0f12..5464ac65bac5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2870,12 +2870,12 @@ with haskellLib; doJailbreak # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275 (overrideSrc rec { - version = "14.2"; + version = "14.5"; src = pkgs.fetchFromGitHub { owner = "PostgREST"; repo = "postgrest"; rev = "v${version}"; - hash = "sha256-wvE3foz2miOzA3hZ1Ar5XR0FUvP5EqAk010dXp8hiz0="; + hash = "sha256-qeFBq+d8AjwXp4YleOa0hLnBppI5+Tm1OEgB1QHWqY8="; }; }) ]; diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix index 53a961748361..3b1fcbd893c9 100644 --- a/pkgs/development/interpreters/php/8.4.nix +++ b/pkgs/development/interpreters/php/8.4.nix @@ -4,8 +4,8 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.4.17"; - hash = "sha256-6mfYPXLdbzq6rq5/Uy94/RIZKGHZarqOnso7LdreQtI="; + version = "8.4.18"; + hash = "sha256-WGsy2Szrz7yklcX2rRozZAVT0KnAv9LmcVM02VnPmFg="; } ); in diff --git a/pkgs/development/interpreters/php/8.5.nix b/pkgs/development/interpreters/php/8.5.nix index bf44a1aad7b7..6eecaf1b72cd 100644 --- a/pkgs/development/interpreters/php/8.5.nix +++ b/pkgs/development/interpreters/php/8.5.nix @@ -4,8 +4,8 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.5.2"; - hash = "sha256-9+/ezMOoELGJIGkjBlNrmaO6hmENvQeVopbPd9P7OgY="; + version = "8.5.3"; + hash = "sha256-/F7KvBg862TZ/KPc04e9KbK2dEgyavmY/eADEkkWgjs="; } ); in diff --git a/pkgs/development/ocaml-modules/ca-certs/default.nix b/pkgs/development/ocaml-modules/ca-certs/default.nix index 354f92a4febf..8c741e1931b9 100644 --- a/pkgs/development/ocaml-modules/ca-certs/default.nix +++ b/pkgs/development/ocaml-modules/ca-certs/default.nix @@ -14,14 +14,14 @@ fmt, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ca-certs"; version = "1.0.1"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-${version}.tbz"; + url = "https://github.com/mirage/ca-certs/releases/download/v${finalAttrs.version}/ca-certs-${finalAttrs.version}.tbz"; hash = "sha256-0818j1SLrs7yCNQlh3qBHYmOx9HZxL3qb3hlLHyDYcw="; }; @@ -48,4 +48,4 @@ buildDunePackage rec { license = lib.licenses.isc; homepage = "https://github.com/mirage/ca-certs"; }; -} +}) diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix index 769386333fba..6aa25bf47dd2 100644 --- a/pkgs/development/ocaml-modules/calendar/default.nix +++ b/pkgs/development/ocaml-modules/calendar/default.nix @@ -5,24 +5,24 @@ re, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "calendar"; version = "3.0.0"; minimalOCamlVersion = "4.03"; src = fetchFromGitHub { owner = "ocaml-community"; - repo = pname; - rev = "v${version}"; + repo = "calendar"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-+VQzi6pEMqzV1ZR84Yjdu4jsJEWtx+7bd6PQGX7TiEs="; }; propagatedBuildInputs = [ re ]; meta = { - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; description = "Library for handling dates and times"; license = lib.licenses.lgpl21Plus; maintainers = [ lib.maintainers.gal_bolle ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/callipyge/default.nix b/pkgs/development/ocaml-modules/callipyge/default.nix index 40a3caaa61ce..d2037ab911f5 100644 --- a/pkgs/development/ocaml-modules/callipyge/default.nix +++ b/pkgs/development/ocaml-modules/callipyge/default.nix @@ -7,12 +7,12 @@ fmt, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "callipyge"; version = "0.2"; src = fetchurl { - url = "https://github.com/oklm-wsh/Callipyge/releases/download/v${version}/${pname}-${version}.tbz"; + url = "https://github.com/oklm-wsh/Callipyge/releases/download/v${finalAttrs.version}/callipyge-${finalAttrs.version}.tbz"; hash = "sha256-T/94a88xvK51TggjXecdKc9kyTE9aIyueIt5T24sZB0="; }; @@ -34,4 +34,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fufexan ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index 9676e4e817e2..a918c6b3757f 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -10,7 +10,7 @@ stdio, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "camlimages"; version = "5.0.5"; @@ -18,8 +18,8 @@ buildDunePackage rec { src = fetchFromGitLab { owner = "camlspotter"; - repo = pname; - rev = version; + repo = "camlimages"; + rev = finalAttrs.version; hash = "sha256-/Dkj8IBVPjGCJCXrLOuJtuaa+nD/a9e8/N+TN9ukw4k="; }; @@ -37,7 +37,7 @@ buildDunePackage rec { meta = { branch = "5.0"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; description = "OCaml image processing library"; license = lib.licenses.lgpl2; maintainers = [ @@ -45,4 +45,4 @@ buildDunePackage rec { lib.maintainers.mt-caret ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/camlp-streams/default.nix b/pkgs/development/ocaml-modules/camlp-streams/default.nix index cabccf89e7fc..9457682b189e 100644 --- a/pkgs/development/ocaml-modules/camlp-streams/default.nix +++ b/pkgs/development/ocaml-modules/camlp-streams/default.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "camlp-streams"; version = "5.0.1"; src = fetchFromGitHub { owner = "ocaml"; - repo = pname; - rev = "v${version}"; + repo = "camlp-streams"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-kHuFBqu0mjFv53sOtmFZcX2reo5ToaOpItP7P53bfGQ="; }; @@ -21,4 +21,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/capnp/default.nix b/pkgs/development/ocaml-modules/capnp/default.nix index e81c1252edc3..4d854924faba 100644 --- a/pkgs/development/ocaml-modules/capnp/default.nix +++ b/pkgs/development/ocaml-modules/capnp/default.nix @@ -12,7 +12,7 @@ stdio, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "capnp"; version = "3.6.0"; @@ -21,7 +21,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "capnproto"; repo = "capnp-ocaml"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-G4B1llsHnGcuGIarDB248QMaRBvS47IEQB5B93wY7nA="; }; @@ -50,8 +50,8 @@ buildDunePackage rec { meta = { description = "OCaml code generation plugin for the Cap'n Proto serialization framework"; homepage = "https://github.com/capnproto/capnp-ocaml"; - changelog = "https://github.com/capnproto/capnp-ocaml/blob/${version}/CHANGES.md"; + changelog = "https://github.com/capnproto/capnp-ocaml/blob/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ sixstring982 ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/caqti/default.nix b/pkgs/development/ocaml-modules/caqti/default.nix index a43fa6f0182a..200ca7bc07a3 100644 --- a/pkgs/development/ocaml-modules/caqti/default.nix +++ b/pkgs/development/ocaml-modules/caqti/default.nix @@ -17,14 +17,14 @@ darwin, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "caqti"; version = "2.2.4"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/paurkedal/ocaml-caqti/releases/download/v${version}/caqti-v${version}.tbz"; + url = "https://github.com/paurkedal/ocaml-caqti/releases/download/v${finalAttrs.version}/caqti-v${finalAttrs.version}.tbz"; hash = "sha256-uOpDKCAVTsCVEyxPeyRLBs2FU+CyA1GFuETZxPMK+Ls="; }; @@ -56,4 +56,4 @@ buildDunePackage rec { maintainers = with lib.maintainers; [ bcc32 ]; homepage = "https://github.com/paurkedal/ocaml-caqti"; }; -} +}) diff --git a/pkgs/development/ocaml-modules/carton/default.nix b/pkgs/development/ocaml-modules/carton/default.nix index 12c35025e7da..1a14a9c37f4a 100644 --- a/pkgs/development/ocaml-modules/carton/default.nix +++ b/pkgs/development/ocaml-modules/carton/default.nix @@ -30,14 +30,14 @@ replaceVars, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "carton"; version = "0.7.0"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/git-${pname}-v${version}.tbz"; + url = "https://github.com/mirage/ocaml-git/releases/download/carton-v${finalAttrs.version}/git-carton-v${finalAttrs.version}.tbz"; hash = "sha256-vWkBJdP4ZpRCEwzrFMzsdHay4VyiXix/+1qzk+7yDvk="; }; @@ -93,4 +93,4 @@ buildDunePackage rec { homepage = "https://github.com/mirage/ocaml-git"; maintainers = [ lib.maintainers.sternenseemann ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/cbor/default.nix b/pkgs/development/ocaml-modules/cbor/default.nix index 09287676de68..bf9abd34ab74 100644 --- a/pkgs/development/ocaml-modules/cbor/default.nix +++ b/pkgs/development/ocaml-modules/cbor/default.nix @@ -6,14 +6,14 @@ yojson, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "cbor"; version = "0.5"; minimalOCamlVersion = "4.07.0"; src = fetchurl { - url = "https://github.com/ygrek/ocaml-cbor/releases/download/${version}/ocaml-cbor-${version}.tar.gz"; + url = "https://github.com/ygrek/ocaml-cbor/releases/download/${finalAttrs.version}/ocaml-cbor-${finalAttrs.version}.tar.gz"; hash = "sha256-4mpm/fv9X5uFRQO8XqBhOpxYwZreEtJ3exIwN6YulKM="; }; @@ -32,4 +32,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ infinidoge ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/cfstream/default.nix b/pkgs/development/ocaml-modules/cfstream/default.nix index 9deb440b2bac..7e46d885ca7a 100644 --- a/pkgs/development/ocaml-modules/cfstream/default.nix +++ b/pkgs/development/ocaml-modules/cfstream/default.nix @@ -8,7 +8,7 @@ ounit, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "cfstream"; version = "1.3.2"; @@ -16,8 +16,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "biocaml"; - repo = pname; - rev = version; + repo = "cfstream"; + rev = finalAttrs.version; hash = "sha256-iSg0QsTcU0MT/Cletl+hW6bKyH0jkp7Jixqu8H59UmQ="; }; @@ -36,9 +36,9 @@ buildDunePackage rec { doCheck = true; meta = { - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; description = "Simple Core-inspired wrapper for standard library Stream module"; maintainers = [ lib.maintainers.bcdarwin ]; license = lib.licenses.lgpl21; }; -} +}) diff --git a/pkgs/development/ocaml-modules/checkseum/default.nix b/pkgs/development/ocaml-modules/checkseum/default.nix index e72edc46e4f7..c1c86eac9df0 100644 --- a/pkgs/development/ocaml-modules/checkseum/default.nix +++ b/pkgs/development/ocaml-modules/checkseum/default.nix @@ -13,14 +13,14 @@ alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { version = "0.5.2"; pname = "checkseum"; minimalOCamlVersion = "4.07"; src = fetchurl { - url = "https://github.com/mirage/checkseum/releases/download/v${version}/checkseum-${version}.tbz"; + url = "https://github.com/mirage/checkseum/releases/download/v${finalAttrs.version}/checkseum-${finalAttrs.version}.tbz"; hash = "sha256-nl5P1EBctKi03wCHdUMlGDPgimSZ70LMuNulgt8Nr8g="; }; @@ -47,4 +47,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; mainProgram = "checkseum.checkseum"; }; -} +}) diff --git a/pkgs/development/ocaml-modules/clap/default.nix b/pkgs/development/ocaml-modules/clap/default.nix index 8ea75a2c7c70..7735cf2d6249 100644 --- a/pkgs/development/ocaml-modules/clap/default.nix +++ b/pkgs/development/ocaml-modules/clap/default.nix @@ -4,7 +4,7 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "clap"; version = "0.3.0"; @@ -12,8 +12,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "rbardou"; - repo = pname; - rev = version; + repo = "clap"; + rev = finalAttrs.version; hash = "sha256-IEol27AVYs55ntvNprBxOk3/EsBKAdPkF3Td3w9qOJg="; }; @@ -21,4 +21,4 @@ buildDunePackage rec { description = "Command-Line Argument Parsing, imperative style with a consumption mechanism"; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/development/ocaml-modules/colors/default.nix b/pkgs/development/ocaml-modules/colors/default.nix index 765af72b9d2d..c368c6ea3af3 100644 --- a/pkgs/development/ocaml-modules/colors/default.nix +++ b/pkgs/development/ocaml-modules/colors/default.nix @@ -6,14 +6,14 @@ mdx, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "colors"; version = "0.0.1"; minimalOCamlVersion = "4.13"; src = fetchurl { - url = "https://github.com/leostera/colors/releases/download/${version}/colors-${version}.tbz"; + url = "https://github.com/leostera/colors/releases/download/${finalAttrs.version}/colors-${finalAttrs.version}.tbz"; hash = "sha256-fY1j9FODVnifwsI8qkKm0QSmssgWqYFXJ7y8o7/KmEY="; }; @@ -30,8 +30,8 @@ buildDunePackage rec { meta = { description = "Pure OCaml library for manipulating colors across color spaces"; homepage = "https://github.com/leostera/colors"; - changelog = "https://github.com/leostera/colors/blob/${version}/CHANGES.md"; + changelog = "https://github.com/leostera/colors/blob/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index d131b7cb5754..2aa8f7aeaaaf 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -10,14 +10,14 @@ ipaddr-sexp, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "conduit"; version = "8.0.0"; minimalOCamlVersion = "4.13"; src = fetchurl { - url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz"; + url = "https://github.com/mirage/ocaml-conduit/releases/download/v${finalAttrs.version}/conduit-${finalAttrs.version}.tbz"; hash = "sha256-CmPZEIZbVHOJOhcM2lH2E4j0iOz0xLLtf+nsTiz2b2E="; }; @@ -39,4 +39,4 @@ buildDunePackage rec { ]; homepage = "https://github.com/mirage/ocaml-conduit"; }; -} +}) diff --git a/pkgs/development/ocaml-modules/config/default.nix b/pkgs/development/ocaml-modules/config/default.nix index 8971f66d2036..a3d4f39bfab2 100644 --- a/pkgs/development/ocaml-modules/config/default.nix +++ b/pkgs/development/ocaml-modules/config/default.nix @@ -7,12 +7,12 @@ spices, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "config"; version = "0.0.3"; src = fetchurl { - url = "https://github.com/ocaml-sys/config.ml/releases/download/${version}/config-${version}.tbz"; + url = "https://github.com/ocaml-sys/config.ml/releases/download/${finalAttrs.version}/config-${finalAttrs.version}.tbz"; hash = "sha256-bcRCfLX2ro8vnQTJiX2aYGJC+eD26vkPynMYg817YFM="; }; @@ -32,4 +32,4 @@ buildDunePackage rec { homepage = "https://github.com/ocaml-sys/config.ml"; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/development/ocaml-modules/cow/default.nix b/pkgs/development/ocaml-modules/cow/default.nix index 5b9a624625b3..dc7c729bebdf 100644 --- a/pkgs/development/ocaml-modules/cow/default.nix +++ b/pkgs/development/ocaml-modules/cow/default.nix @@ -9,14 +9,14 @@ ezjsonm, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { version = "2.5.0"; pname = "cow"; minimalOCamlVersion = "4.03"; src = fetchurl { - url = "https://github.com/mirage/ocaml-cow/releases/download/v${version}/cow-${version}.tbz"; + url = "https://github.com/mirage/ocaml-cow/releases/download/v${finalAttrs.version}/cow-${finalAttrs.version}.tbz"; hash = "sha256-8rNK+5oWUbi91gXvdz/66YQu5+iXp0Co8wk0Isv6b9Y="; }; @@ -40,4 +40,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = with lib.maintainers; [ sternenseemann ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/cry/default.nix b/pkgs/development/ocaml-modules/cry/default.nix index f3630901617c..8cdf29df618c 100644 --- a/pkgs/development/ocaml-modules/cry/default.nix +++ b/pkgs/development/ocaml-modules/cry/default.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "cry"; version = "1.0.3"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-cry"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ea6f2xTVmYekPmzAKasA9mNG4Voxw2MCkfZ9LB9gwbo="; }; @@ -27,4 +27,4 @@ buildDunePackage rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ dandellion ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/csexp/default.nix b/pkgs/development/ocaml-modules/csexp/default.nix index 7f377db546ef..5e678aec876a 100644 --- a/pkgs/development/ocaml-modules/csexp/default.nix +++ b/pkgs/development/ocaml-modules/csexp/default.nix @@ -5,12 +5,12 @@ liquidsoap, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "csexp"; version = "1.5.2"; src = fetchurl { - url = "https://github.com/ocaml-dune/csexp/releases/download/${version}/csexp-${version}.tbz"; + url = "https://github.com/ocaml-dune/csexp/releases/download/${finalAttrs.version}/csexp-${finalAttrs.version}.tbz"; hash = "sha256-GhTdBLtDeaQZkCSFUGKMd5E6nAfzw1wTcLaWDml3h/8="; }; @@ -23,8 +23,8 @@ buildDunePackage rec { meta = { description = "Minimal support for Canonical S-expressions"; homepage = "https://github.com/ocaml-dune/csexp"; - changelog = "https://github.com/ocaml-dune/csexp/raw/${version}/CHANGES.md"; + changelog = "https://github.com/ocaml-dune/csexp/raw/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index 8fac97fde6c9..38bfe8236153 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -7,7 +7,7 @@ crowbar, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "cstruct"; version = "6.2.0"; @@ -15,7 +15,7 @@ buildDunePackage rec { duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-${version}.tbz"; + url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${finalAttrs.version}/cstruct-${finalAttrs.version}.tbz"; hash = "sha256-mngHM5JYDoNJFI+jq0sbLpidydMNB0AbBMlrfGDwPmI="; }; @@ -33,4 +33,4 @@ buildDunePackage rec { homepage = "https://github.com/mirage/ocaml-cstruct"; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix index f3aa531ddefe..cc59bdb6b049 100644 --- a/pkgs/development/ocaml-modules/csv/default.nix +++ b/pkgs/development/ocaml-modules/csv/default.nix @@ -4,12 +4,12 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "csv"; version = "2.4"; src = fetchurl { - url = "https://github.com/Chris00/ocaml-${pname}/releases/download/${version}/csv-${version}.tbz"; + url = "https://github.com/Chris00/ocaml-csv/releases/download/${finalAttrs.version}/csv-${finalAttrs.version}.tbz"; sha256 = "13m9n8mdss6jfbiw7d5bybxn4n85vmg4zw7dc968qrgjfy0w9zhk"; }; @@ -25,4 +25,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; homepage = "https://github.com/Chris00/ocaml-csv"; }; -} +}) diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index 9e2c2d43ed01..0b6ef25b89fb 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -9,14 +9,14 @@ ounit2, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ctypes"; version = "0.24.0"; src = fetchFromGitHub { owner = "ocamllabs"; repo = "ocaml-ctypes"; - rev = version; + rev = finalAttrs.version; hash = "sha256-Wlpk+/MSWmnIRsJfVQMTCYDRixuqLzDpdFNpkQyscA8="; }; @@ -36,4 +36,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.ericbmerritt ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/cudf/default.nix b/pkgs/development/ocaml-modules/cudf/default.nix index 7f09ce7e77ed..6c739d817243 100644 --- a/pkgs/development/ocaml-modules/cudf/default.nix +++ b/pkgs/development/ocaml-modules/cudf/default.nix @@ -7,7 +7,7 @@ ounit2, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "cudf"; version = "0.10"; @@ -15,8 +15,8 @@ buildDunePackage rec { src = fetchFromGitLab { owner = "irill"; - repo = pname; - rev = "v${version}"; + repo = "cudf"; + rev = "v${finalAttrs.version}"; hash = "sha256-E4KXKnso/Q3ZwcYpKPgvswNR9qd/lafKljPMxfStedM="; }; @@ -36,4 +36,4 @@ buildDunePackage rec { license = lib.licenses.lgpl3; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/curly/default.nix b/pkgs/development/ocaml-modules/curly/default.nix index cffaf7514b13..dac26094ec70 100644 --- a/pkgs/development/ocaml-modules/curly/default.nix +++ b/pkgs/development/ocaml-modules/curly/default.nix @@ -11,7 +11,7 @@ cacert, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "curly"; version = "0.3.0"; @@ -20,7 +20,7 @@ buildDunePackage rec { duneVersion = "3"; src = fetchurl { - url = "https://github.com/rgrinberg/curly/releases/download/${version}/curly-${version}.tbz"; + url = "https://github.com/rgrinberg/curly/releases/download/${finalAttrs.version}/curly-${finalAttrs.version}.tbz"; hash = "sha256-Qn/PKBNOcMt3dk2f7uJD8x0yo4RHobXSjTQck7fcXTw="; }; @@ -52,4 +52,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.sternenseemann ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix index dea0a2f0d985..fc16e9ac7f1f 100644 --- a/pkgs/development/ocaml-modules/curses/default.nix +++ b/pkgs/development/ocaml-modules/curses/default.nix @@ -7,7 +7,7 @@ pkg-config, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "curses"; version = "1.0.11"; @@ -16,7 +16,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "mbacarella"; repo = "curses"; - rev = version; + rev = finalAttrs.version; hash = "sha256-tjBOv7RARDzBShToNLL9LEaU/Syo95MfwZunFsyN4/Q="; }; @@ -29,7 +29,7 @@ buildDunePackage rec { description = "OCaml Bindings to curses/ncurses"; homepage = "https://github.com/mbacarella/curses"; license = lib.licenses.lgpl21Plus; - changelog = "https://github.com/mbacarella/curses/raw/${version}/CHANGES"; + changelog = "https://github.com/mbacarella/curses/raw/${finalAttrs.version}/CHANGES"; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/dap/default.nix b/pkgs/development/ocaml-modules/dap/default.nix index c10229c62d3f..3d549e5a7a4f 100644 --- a/pkgs/development/ocaml-modules/dap/default.nix +++ b/pkgs/development/ocaml-modules/dap/default.nix @@ -12,12 +12,12 @@ react, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "dap"; version = "1.0.6"; duneVersion = "3"; src = fetchurl { - url = "https://github.com/hackwaly/ocaml-dap/releases/download/${version}/dap-${version}.tbz"; + url = "https://github.com/hackwaly/ocaml-dap/releases/download/${finalAttrs.version}/dap-${finalAttrs.version}.tbz"; sha256 = "1zq0f8429m38a4x3h9n3rv7n1vsfjbs72pfi5902a89qwyilkcp0"; }; @@ -42,4 +42,4 @@ buildDunePackage rec { homepage = "https://github.com/hackwaly/ocaml-dap"; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/development/ocaml-modules/dates_calc/default.nix b/pkgs/development/ocaml-modules/dates_calc/default.nix index 4cfeeb34956f..dd9a956fcfb3 100644 --- a/pkgs/development/ocaml-modules/dates_calc/default.nix +++ b/pkgs/development/ocaml-modules/dates_calc/default.nix @@ -6,7 +6,7 @@ qcheck, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "dates_calc"; version = "0.0.6"; @@ -16,7 +16,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "catalalang"; repo = "dates-calc"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-B4li8vIK6AnPXJ1QSJ8rtr+JOcy4+h5sc1SH97U+Vgw="; }; @@ -34,4 +34,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.niols ]; homepage = "https://github.com/catalalang/dates-calc"; }; -} +}) diff --git a/pkgs/development/ocaml-modules/dbf/default.nix b/pkgs/development/ocaml-modules/dbf/default.nix index c6149db9dc17..fa5271c78de0 100644 --- a/pkgs/development/ocaml-modules/dbf/default.nix +++ b/pkgs/development/ocaml-modules/dbf/default.nix @@ -8,7 +8,7 @@ core_kernel, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "dbf"; version = "0.2.0"; @@ -19,7 +19,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "pveber"; repo = "dbf"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-096GodM3J/4dsVdylG+6xz/p6ogUkhDGdFjiPwl/jLQ="; }; @@ -36,4 +36,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.deltadelta ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/decoders-bencode/default.nix b/pkgs/development/ocaml-modules/decoders-bencode/default.nix index 6e2198ff2b6d..6117dfab67d1 100644 --- a/pkgs/development/ocaml-modules/decoders-bencode/default.nix +++ b/pkgs/development/ocaml-modules/decoders-bencode/default.nix @@ -7,7 +7,7 @@ ounit2, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "decoders-bencode"; # sub-package built separately from the same source @@ -29,8 +29,8 @@ buildDunePackage rec { meta = { description = "Bencode backend for decoders"; homepage = "https://github.com/mattjbray/ocaml-decoders"; - changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md"; + changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ infinidoge ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/decoders-cbor/default.nix b/pkgs/development/ocaml-modules/decoders-cbor/default.nix index 067beb013cb2..c93b5cd38625 100644 --- a/pkgs/development/ocaml-modules/decoders-cbor/default.nix +++ b/pkgs/development/ocaml-modules/decoders-cbor/default.nix @@ -7,7 +7,7 @@ ounit2, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "decoders-cbor"; # sub-package built separately from the same source @@ -29,8 +29,8 @@ buildDunePackage rec { meta = { description = "CBOR backend for decoders"; homepage = "https://github.com/mattjbray/ocaml-decoders"; - changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md"; + changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ infinidoge ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/decoders-ezjsonm/default.nix b/pkgs/development/ocaml-modules/decoders-ezjsonm/default.nix index acb5c16cffa7..71ea3a104b73 100644 --- a/pkgs/development/ocaml-modules/decoders-ezjsonm/default.nix +++ b/pkgs/development/ocaml-modules/decoders-ezjsonm/default.nix @@ -7,7 +7,7 @@ ounit2, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "decoders-ezjsonm"; # sub-package built separately from the same source @@ -29,8 +29,8 @@ buildDunePackage rec { meta = { description = "Ezjsonm backend for decoders"; homepage = "https://github.com/mattjbray/ocaml-decoders"; - changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md"; + changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ infinidoge ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/decoders-ezxmlm/default.nix b/pkgs/development/ocaml-modules/decoders-ezxmlm/default.nix index 685265dddff1..e6c4f567d0b3 100644 --- a/pkgs/development/ocaml-modules/decoders-ezxmlm/default.nix +++ b/pkgs/development/ocaml-modules/decoders-ezxmlm/default.nix @@ -6,7 +6,7 @@ containers, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "decoders-ezxmlm"; # sub-package built separately from the same source @@ -27,8 +27,8 @@ buildDunePackage rec { meta = { description = "Ezxmlm backend for decoders"; homepage = "https://github.com/mattjbray/ocaml-decoders"; - changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md"; + changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ infinidoge ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/decoders-jsonaf/default.nix b/pkgs/development/ocaml-modules/decoders-jsonaf/default.nix index d6e01a3273c5..a7dacffc8464 100644 --- a/pkgs/development/ocaml-modules/decoders-jsonaf/default.nix +++ b/pkgs/development/ocaml-modules/decoders-jsonaf/default.nix @@ -7,7 +7,7 @@ ounit2, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "decoders-jsonaf"; # sub-package built separately from the same source @@ -29,8 +29,8 @@ buildDunePackage rec { meta = { description = "Jsonaf backend for decoders"; homepage = "https://github.com/mattjbray/ocaml-decoders"; - changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md"; + changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ infinidoge ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/decoders-jsonm/default.nix b/pkgs/development/ocaml-modules/decoders-jsonm/default.nix index c354ae20d076..031ff6796c45 100644 --- a/pkgs/development/ocaml-modules/decoders-jsonm/default.nix +++ b/pkgs/development/ocaml-modules/decoders-jsonm/default.nix @@ -7,7 +7,7 @@ ounit2, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "decoders-jsonm"; # sub-package built separately from the same source @@ -29,8 +29,8 @@ buildDunePackage rec { meta = { description = "Jsonm backend for decoders"; homepage = "https://github.com/mattjbray/ocaml-decoders"; - changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md"; + changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ infinidoge ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/decoders-msgpck/default.nix b/pkgs/development/ocaml-modules/decoders-msgpck/default.nix index 6004a2503aac..14e2fcf3d544 100644 --- a/pkgs/development/ocaml-modules/decoders-msgpck/default.nix +++ b/pkgs/development/ocaml-modules/decoders-msgpck/default.nix @@ -7,7 +7,7 @@ ounit2, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "decoders-msgpck"; # sub-package built separately from the same source @@ -29,8 +29,8 @@ buildDunePackage rec { meta = { description = "Msgpck backend for decoders"; homepage = "https://github.com/mattjbray/ocaml-decoders"; - changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md"; + changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ infinidoge ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/decoders-sexplib/default.nix b/pkgs/development/ocaml-modules/decoders-sexplib/default.nix index 5b12b422fded..d2ca0652cfb3 100644 --- a/pkgs/development/ocaml-modules/decoders-sexplib/default.nix +++ b/pkgs/development/ocaml-modules/decoders-sexplib/default.nix @@ -8,7 +8,7 @@ ounit2, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "decoders-sexplib"; # sub-package built separately from the same source @@ -31,8 +31,8 @@ buildDunePackage rec { meta = { description = "sexplib backend for decoders"; homepage = "https://github.com/mattjbray/ocaml-decoders"; - changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md"; + changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ infinidoge ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/decoders-yojson/default.nix b/pkgs/development/ocaml-modules/decoders-yojson/default.nix index 8da0e05a69ff..0a6bd35ce951 100644 --- a/pkgs/development/ocaml-modules/decoders-yojson/default.nix +++ b/pkgs/development/ocaml-modules/decoders-yojson/default.nix @@ -7,7 +7,7 @@ ounit2, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "decoders-yojson"; # sub-package built separately from the same source @@ -29,8 +29,8 @@ buildDunePackage rec { meta = { description = "Yojson backend for decoders"; homepage = "https://github.com/mattjbray/ocaml-decoders"; - changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md"; + changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ infinidoge ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/decoders/default.nix b/pkgs/development/ocaml-modules/decoders/default.nix index 42e68503ac8d..c7ec127e4e92 100644 --- a/pkgs/development/ocaml-modules/decoders/default.nix +++ b/pkgs/development/ocaml-modules/decoders/default.nix @@ -5,14 +5,14 @@ containers, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "decoders"; version = "1.0.0"; minimalOCamlVersion = "4.03.0"; src = fetchurl { - url = "https://github.com/mattjbray/ocaml-decoders/releases/download/v${version}/${pname}-${version}.tbz"; + url = "https://github.com/mattjbray/ocaml-decoders/releases/download/v${finalAttrs.version}/decoders-${finalAttrs.version}.tbz"; hash = "sha256-R/55xBAtD3EO/zzq7zExANnfPHlFg00884o5dCpXNZc="; }; @@ -24,8 +24,8 @@ buildDunePackage rec { meta = { description = "Elm-inspired decoders for Ocaml"; homepage = "https://github.com/mattjbray/ocaml-decoders"; - changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${version}/CHANGES.md"; + changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ infinidoge ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix index 470d357997b5..8e6ef34a1578 100644 --- a/pkgs/development/ocaml-modules/decompress/default.nix +++ b/pkgs/development/ocaml-modules/decompress/default.nix @@ -17,14 +17,14 @@ bos, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "decompress"; version = "1.5.3"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-${version}.tbz"; + url = "https://github.com/mirage/decompress/releases/download/v${finalAttrs.version}/decompress-${finalAttrs.version}.tbz"; hash = "sha256-+R5peL7/P8thRA0y98mcmfHoZUtPsYQIdB02A1NzrGA="; }; @@ -54,4 +54,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; mainProgram = "decompress.pipe"; }; -} +}) diff --git a/pkgs/development/ocaml-modules/dedukti/default.nix b/pkgs/development/ocaml-modules/dedukti/default.nix index 6e56eab01494..e1f376d88fc9 100644 --- a/pkgs/development/ocaml-modules/dedukti/default.nix +++ b/pkgs/development/ocaml-modules/dedukti/default.nix @@ -6,7 +6,7 @@ menhir, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "dedukti"; version = "2.7"; @@ -14,8 +14,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "Deducteam"; - repo = pname; - rev = "v${version}"; + repo = "dedukti"; + rev = "v${finalAttrs.version}"; hash = "sha256-SFxbgq2znO+OCEFzuekVquvtOEuCQanseKy+iZAeWbc="; }; @@ -28,7 +28,7 @@ buildDunePackage rec { homepage = "https://deducteam.github.io"; description = "Logical framework based on the λΠ-calculus modulo rewriting"; license = lib.licenses.cecill-b; - changelog = "https://github.com/Deducteam/Dedukti/raw/${version}/CHANGELOG.md"; + changelog = "https://github.com/Deducteam/Dedukti/raw/${finalAttrs.version}/CHANGELOG.md"; maintainers = with lib.maintainers; [ bcdarwin ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/diet/default.nix b/pkgs/development/ocaml-modules/diet/default.nix index 0547bd8f6568..f064a83cb471 100644 --- a/pkgs/development/ocaml-modules/diet/default.nix +++ b/pkgs/development/ocaml-modules/diet/default.nix @@ -7,12 +7,12 @@ ounit, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "diet"; version = "0.4"; src = fetchurl { - url = "https://github.com/mirage/ocaml-diet/releases/download/v${version}/diet-v${version}.tbz"; + url = "https://github.com/mirage/ocaml-diet/releases/download/v${finalAttrs.version}/diet-v${finalAttrs.version}.tbz"; sha256 = "96acac2e4fdedb5f47dd8ad2562e723d85ab59cd1bd85554df21ec907b071741"; }; @@ -28,4 +28,4 @@ buildDunePackage rec { description = "Simple implementation of Discrete Interval Encoding Trees"; license = lib.licenses.isc; }; -} +}) diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/pkgs/development/ocaml-modules/digestif/default.nix index 4787a0b82e8a..f10a4bb70397 100644 --- a/pkgs/development/ocaml-modules/digestif/default.nix +++ b/pkgs/development/ocaml-modules/digestif/default.nix @@ -12,14 +12,14 @@ fpath, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "digestif"; version = "1.3.0"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mirage/digestif/releases/download/v${version}/digestif-${version}.tbz"; + url = "https://github.com/mirage/digestif/releases/download/v${finalAttrs.version}/digestif-${finalAttrs.version}.tbz"; hash = "sha256-mmzcszJTnIf0cj/DvXNiayZ1p7EWH98P7TCRhs4Y9Cc="; }; @@ -44,4 +44,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/dispatch/default.nix b/pkgs/development/ocaml-modules/dispatch/default.nix index b5546a406c3d..e924f715f0de 100644 --- a/pkgs/development/ocaml-modules/dispatch/default.nix +++ b/pkgs/development/ocaml-modules/dispatch/default.nix @@ -7,7 +7,7 @@ result, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "dispatch"; version = "0.5.0"; @@ -16,7 +16,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "inhabitedtype"; repo = "ocaml-dispatch"; - rev = version; + rev = finalAttrs.version; sha256 = "12r39ylbxc297cbwjadhd1ghxnwwcdzfjk68r97wim8hcgzxyxv4"; }; @@ -27,10 +27,10 @@ buildDunePackage rec { doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = { - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = lib.licenses.bsd3; description = "Path-based dispatching for client- and server-side applications"; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/dolmen/default.nix b/pkgs/development/ocaml-modules/dolmen/default.nix index 5bb495f8335a..f61905b64cd5 100644 --- a/pkgs/development/ocaml-modules/dolmen/default.nix +++ b/pkgs/development/ocaml-modules/dolmen/default.nix @@ -9,14 +9,14 @@ qcheck, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "dolmen"; version = "0.10"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/Gbury/dolmen/releases/download/v${version}/dolmen-${version}.tbz"; + url = "https://github.com/Gbury/dolmen/releases/download/v${finalAttrs.version}/dolmen-${finalAttrs.version}.tbz"; hash = "sha256-xchfd+OSTzeOjYLxZu7+QTG04EG/nN7KRnQQ8zxx+mE="; }; @@ -37,4 +37,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; homepage = "https://github.com/Gbury/dolmen"; }; -} +}) diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix index c5c9323de4e0..827108243b46 100644 --- a/pkgs/development/ocaml-modules/dolog/default.nix +++ b/pkgs/development/ocaml-modules/dolog/default.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "dolog"; version = "6.0.0"; src = fetchFromGitHub { owner = "UnixJunkie"; - repo = pname; - rev = "v${version}"; + repo = "dolog"; + rev = "v${finalAttrs.version}"; hash = "sha256-g68260mcb4G4wX8y4T0MTaXsYnM9wn2d0V1VCdSFZjY="; }; @@ -21,4 +21,4 @@ buildDunePackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/domain-local-await/default.nix b/pkgs/development/ocaml-modules/domain-local-await/default.nix index 96c52e5dbdc6..3aa70d81f44a 100644 --- a/pkgs/development/ocaml-modules/domain-local-await/default.nix +++ b/pkgs/development/ocaml-modules/domain-local-await/default.nix @@ -9,7 +9,7 @@ thread-table, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "domain-local-await"; version = "1.0.1"; @@ -21,7 +21,7 @@ buildDunePackage rec { }; src = fetchurl { - url = "https://github.com/ocaml-multicore/${pname}/releases/download/${version}/${pname}-${version}.tbz"; + url = "https://github.com/ocaml-multicore/domain-local-await/releases/download/${finalAttrs.version}/domain-local-await-${finalAttrs.version}.tbz"; hash = "sha256-KVIRPFPLB+KwVLLchs5yk5Ex2rggfI8xOa2yPmTN+m8="; }; @@ -43,10 +43,10 @@ buildDunePackage rec { ]; meta = { - homepage = "https://github.com/ocaml-multicore/ocaml-${pname}"; - changelog = "https://github.com/ocaml-multicore/ocaml-${pname}/raw/v${version}/CHANGES.md"; + homepage = "https://github.com/ocaml-multicore/ocaml-domain-local-await"; + changelog = "https://github.com/ocaml-multicore/ocaml-domain-local-await/raw/v${finalAttrs.version}/CHANGES.md"; description = "Scheduler independent blocking mechanism"; license = with lib.licenses; [ isc ]; maintainers = with lib.maintainers; [ toastal ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/domain-local-timeout/default.nix b/pkgs/development/ocaml-modules/domain-local-timeout/default.nix index e289f3ad7940..75825d94a25b 100644 --- a/pkgs/development/ocaml-modules/domain-local-timeout/default.nix +++ b/pkgs/development/ocaml-modules/domain-local-timeout/default.nix @@ -11,14 +11,14 @@ domain-local-await, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "domain-local-timeout"; version = "1.0.1"; minimalOCamlVersion = "4.12"; src = fetchurl { - url = "https://github.com/ocaml-multicore/domain-local-timeout/releases/download/${version}/domain-local-timeout-${version}.tbz"; + url = "https://github.com/ocaml-multicore/domain-local-timeout/releases/download/${finalAttrs.version}/domain-local-timeout-${finalAttrs.version}.tbz"; hash = "sha256-6sCqUkOjN8E+7OLUwVQntkv0vrQDkGDV8KNqDhVm0d8="; }; @@ -42,4 +42,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/domain_shims/default.nix b/pkgs/development/ocaml-modules/domain_shims/default.nix index 32373e0fb407..4a05c1e11c41 100644 --- a/pkgs/development/ocaml-modules/domain_shims/default.nix +++ b/pkgs/development/ocaml-modules/domain_shims/default.nix @@ -4,14 +4,14 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "domain_shims"; version = "0.1.0"; src = fetchFromGitLab { owner = "gasche"; repo = "domain-shims"; - rev = version; + rev = finalAttrs.version; hash = "sha256-/5Cw+M0A1rnT7gFqzryd4Z0tylN0kZgSBXtn9jr8u1c="; }; @@ -23,4 +23,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/domainslib/default.nix b/pkgs/development/ocaml-modules/domainslib/default.nix index ca5c00d68acb..bf004b2cf66c 100644 --- a/pkgs/development/ocaml-modules/domainslib/default.nix +++ b/pkgs/development/ocaml-modules/domainslib/default.nix @@ -9,14 +9,14 @@ qcheck-stm, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "domainslib"; version = "0.5.2"; minimalOCamlVersion = "5.0"; src = fetchurl { - url = "https://github.com/ocaml-multicore/domainslib/releases/download/${version}/domainslib-${version}.tbz"; + url = "https://github.com/ocaml-multicore/domainslib/releases/download/${finalAttrs.version}/domainslib-${finalAttrs.version}.tbz"; hash = "sha256-pyDs4stBsqWRrRpEotuezVVz6Le1ES6NRtDydfmvHK8="; }; @@ -38,4 +38,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/dose3/default.nix b/pkgs/development/ocaml-modules/dose3/default.nix index fa47617cafda..3df30b0052c4 100644 --- a/pkgs/development/ocaml-modules/dose3/default.nix +++ b/pkgs/development/ocaml-modules/dose3/default.nix @@ -13,14 +13,14 @@ ounit, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "dose3"; version = "7.0.0"; src = fetchFromGitLab { owner = "irill"; repo = "dose3"; - rev = version; + rev = finalAttrs.version; hash = "sha256-K0fYSAWV48Rers/foDrEIqieyJ0PvpXkuYrFrZGBkkE="; }; @@ -60,4 +60,4 @@ buildDunePackage rec { * dose-deb-coinstall, a Debian-specific tool for checking whether a set of packages can be installed all together. ''; }; -} +}) diff --git a/pkgs/development/ocaml-modules/dream/default.nix b/pkgs/development/ocaml-modules/dream/default.nix index f7ca3b73e406..957636bc9b62 100644 --- a/pkgs/development/ocaml-modules/dream/default.nix +++ b/pkgs/development/ocaml-modules/dream/default.nix @@ -32,11 +32,11 @@ }: let - mirage-crypto-rng-lwt = buildDunePackage rec { + mirage-crypto-rng-lwt = buildDunePackage (finalAttrs: { pname = "mirage-crypto-rng-lwt"; version = "1.2.0"; src = fetchurl { - url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-${version}.tbz"; + url = "https://github.com/mirage/mirage-crypto/releases/download/v${finalAttrs.version}/mirage-crypto-${finalAttrs.version}.tbz"; hash = "sha256-CVQrzZbB02j/m6iFMQX0wXgdjJTCQA3586wGEO4H5n4="; }; doCheck = true; @@ -47,7 +47,7 @@ let mtime lwt ]; - }; + }); in buildDunePackage { diff --git a/pkgs/development/ocaml-modules/dream/pure.nix b/pkgs/development/ocaml-modules/dream/pure.nix index 884715f67cf3..b22846938242 100644 --- a/pkgs/development/ocaml-modules/dream/pure.nix +++ b/pkgs/development/ocaml-modules/dream/pure.nix @@ -10,12 +10,12 @@ uri, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "dream-pure"; version = "1.0.0-alpha8"; src = fetchurl { - url = "https://github.com/aantron/dream/releases/download/${version}/dream-${version}.tar.gz"; + url = "https://github.com/aantron/dream/releases/download/${finalAttrs.version}/dream-${finalAttrs.version}.tar.gz"; hash = "sha256-I+2BKJDAP+XJl0pJYano5iEmvte8fX0UQLhGUslc8pY="; }; @@ -35,4 +35,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/dscheck/default.nix b/pkgs/development/ocaml-modules/dscheck/default.nix index e5ef2ea3549e..70bd80043c77 100644 --- a/pkgs/development/ocaml-modules/dscheck/default.nix +++ b/pkgs/development/ocaml-modules/dscheck/default.nix @@ -7,14 +7,14 @@ alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "dscheck"; version = "0.5.0"; minimalOCamlVersion = "5.0"; src = fetchurl { - url = "https://github.com/ocaml-multicore/dscheck/releases/download/${version}/dscheck-${version}.tbz"; + url = "https://github.com/ocaml-multicore/dscheck/releases/download/${finalAttrs.version}/dscheck-${finalAttrs.version}.tbz"; hash = "sha256-9Rm2DmdvVeCkgAWCvkYdQTj94wmU7JkY8UI3fReIaG0="; }; @@ -32,4 +32,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix index 50d04572c5a1..6c5bdefeb851 100644 --- a/pkgs/development/ocaml-modules/dtoa/default.nix +++ b/pkgs/development/ocaml-modules/dtoa/default.nix @@ -7,12 +7,12 @@ ounit2, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "dtoa"; version = "0.3.3"; src = fetchurl { - url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + url = "https://github.com/flowtype/ocaml-dtoa/releases/download/v${finalAttrs.version}/dtoa-${finalAttrs.version}.tbz"; hash = "sha256-2PRgjJ6Ssp4l6jHzv1/MqzlomQlJkKLVnRXG6KPJ7j4="; }; @@ -28,4 +28,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.eqyiel ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/dtools/default.nix b/pkgs/development/ocaml-modules/dtools/default.nix index fdaa74d7e2e4..3915e3ff08d3 100644 --- a/pkgs/development/ocaml-modules/dtools/default.nix +++ b/pkgs/development/ocaml-modules/dtools/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "dtools"; version = "0.4.6"; @@ -13,7 +13,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-dtools"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-MIZM/IlPWPa/r/f8EXkhU8gZctOZeAIGZgxoGMF2IkE="; }; @@ -23,4 +23,4 @@ buildDunePackage rec { license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ dandellion ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/duff/default.nix b/pkgs/development/ocaml-modules/duff/default.nix index 271399161757..adf4c7f02b3a 100644 --- a/pkgs/development/ocaml-modules/duff/default.nix +++ b/pkgs/development/ocaml-modules/duff/default.nix @@ -9,7 +9,7 @@ bigstringaf, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "duff"; version = "0.5"; @@ -17,7 +17,7 @@ buildDunePackage rec { duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/duff/releases/download/v${version}/duff-${version}.tbz"; + url = "https://github.com/mirage/duff/releases/download/v${finalAttrs.version}/duff-${finalAttrs.version}.tbz"; sha256 = "sha256-+UU89Ko7aFDv6MxvE/BT6+XyER+vF3zqv7sD5dmtbt4="; }; @@ -37,4 +37,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/dum/default.nix b/pkgs/development/ocaml-modules/dum/default.nix index 679b0c24e357..b4b9f738e483 100644 --- a/pkgs/development/ocaml-modules/dum/default.nix +++ b/pkgs/development/ocaml-modules/dum/default.nix @@ -5,12 +5,12 @@ fetchurl, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "dum"; version = "1.0.3"; src = fetchurl { - url = "https://github.com/mjambon/dum/releases/download/${version}/dum-${version}.tbz"; + url = "https://github.com/mjambon/dum/releases/download/${finalAttrs.version}/dum-${finalAttrs.version}.tbz"; hash = "sha256-ZFojUD/IoxVTDfGyh2wveFsSz4D19pKkHrNuU+LFJlE="; }; @@ -35,4 +35,4 @@ buildDunePackage rec { license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ alexfmpe ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/duppy/default.nix b/pkgs/development/ocaml-modules/duppy/default.nix index 6a2d79f49c7e..172f550008f8 100644 --- a/pkgs/development/ocaml-modules/duppy/default.nix +++ b/pkgs/development/ocaml-modules/duppy/default.nix @@ -5,7 +5,7 @@ re, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "duppy"; version = "0.9.5"; @@ -14,7 +14,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-duppy"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-hWR7utYMxMjz8Cw0j6cgoHlUj4Jc7Q4vJHD5kGHN4Rc="; }; @@ -26,4 +26,4 @@ buildDunePackage rec { license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ dandellion ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/duration/default.nix b/pkgs/development/ocaml-modules/duration/default.nix index 137edf6f8d2a..ba42a8b3af17 100644 --- a/pkgs/development/ocaml-modules/duration/default.nix +++ b/pkgs/development/ocaml-modules/duration/default.nix @@ -6,14 +6,14 @@ alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "duration"; version = "0.2.1"; duneVersion = "3"; src = fetchurl { - url = "https://github.com/hannesm/duration/releases/download/v${version}/duration-${version}.tbz"; + url = "https://github.com/hannesm/duration/releases/download/v${finalAttrs.version}/duration-${finalAttrs.version}.tbz"; hash = "sha256-xzjB84z7mYIMEhzT3fgZ3ksiKPDVDqy9HMPOmefHHis="; }; @@ -27,4 +27,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/earlybird/default.nix b/pkgs/development/ocaml-modules/earlybird/default.nix index 1f8aad31337b..50f7e67c30b3 100644 --- a/pkgs/development/ocaml-modules/earlybird/default.nix +++ b/pkgs/development/ocaml-modules/earlybird/default.nix @@ -18,7 +18,7 @@ gitUpdater, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "earlybird"; version = "1.3.4"; @@ -27,7 +27,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "hackwaly"; repo = "ocamlearlybird"; - tag = version; + tag = finalAttrs.version; hash = "sha256-uwx8N4GDs7NT2fEmNlvdBe2cIZGVPQpoaiiKROFa+kk="; }; @@ -56,4 +56,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.romildo ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/easy-format/default.nix b/pkgs/development/ocaml-modules/easy-format/default.nix index ddbe68fe779c..e85b5cd76b2f 100644 --- a/pkgs/development/ocaml-modules/easy-format/default.nix +++ b/pkgs/development/ocaml-modules/easy-format/default.nix @@ -19,12 +19,12 @@ let }; in -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "easy-format"; inherit (params) version; src = fetchurl { - url = "https://github.com/ocaml-community/easy-format/releases/download/${version}/easy-format-${version}.tbz"; + url = "https://github.com/ocaml-community/easy-format/releases/download/${finalAttrs.version}/easy-format-${finalAttrs.version}.tbz"; inherit (params) hash; }; @@ -55,4 +55,4 @@ buildDunePackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/eio-ssl/default.nix b/pkgs/development/ocaml-modules/eio-ssl/default.nix index 01834cfb612c..185f409598b2 100644 --- a/pkgs/development/ocaml-modules/eio-ssl/default.nix +++ b/pkgs/development/ocaml-modules/eio-ssl/default.nix @@ -6,12 +6,12 @@ ssl, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "eio-ssl"; version = "0.3.0"; src = fetchurl { - url = "https://github.com/anmonteiro/eio-ssl/releases/download/${version}/eio-ssl-${version}.tbz"; + url = "https://github.com/anmonteiro/eio-ssl/releases/download/${finalAttrs.version}/eio-ssl-${finalAttrs.version}.tbz"; hash = "sha256-m4CiUQtXVSMfLthbDsAftpiOsr24I5IGiU1vv7Rz8go="; }; @@ -25,4 +25,4 @@ buildDunePackage rec { description = "OpenSSL binding to EIO"; license = lib.licenses.lgpl21; }; -} +}) diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index dd058c0eecc4..582a4644d695 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -17,14 +17,14 @@ ocsipersist, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "eliom"; version = "11.1.1"; src = fetchFromGitHub { owner = "ocsigen"; repo = "eliom"; - rev = version; + rev = finalAttrs.version; hash = "sha256-ALuoyO6axNQEeBteBVIFwdoSrbLxxcaSTObAcLPGIvo="; }; @@ -72,4 +72,4 @@ buildDunePackage rec { broken = true; maintainers = [ lib.maintainers.gal_bolle ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/emile/default.nix b/pkgs/development/ocaml-modules/emile/default.nix index 392c25b8f11d..7205fcdeeb41 100644 --- a/pkgs/development/ocaml-modules/emile/default.nix +++ b/pkgs/development/ocaml-modules/emile/default.nix @@ -11,7 +11,7 @@ cmdliner, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "emile"; version = "1.1"; @@ -19,7 +19,7 @@ buildDunePackage rec { duneVersion = "3"; src = fetchurl { - url = "https://github.com/dinosaure/emile/releases/download/v${version}/emile-v${version}.tbz"; + url = "https://github.com/dinosaure/emile/releases/download/v${finalAttrs.version}/emile-v${finalAttrs.version}.tbz"; hash = "sha256:0r1141makr0b900aby1gn0fccjv1qcqgyxib3bzq8fxmjqwjan8p"; }; @@ -42,4 +42,4 @@ buildDunePackage rec { homepage = "https://github.com/dinosaure/emile"; maintainers = [ lib.maintainers.sternenseemann ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/encore/default.nix b/pkgs/development/ocaml-modules/encore/default.nix index 0932d3cdf726..c93d6cb60ba9 100644 --- a/pkgs/development/ocaml-modules/encore/default.nix +++ b/pkgs/development/ocaml-modules/encore/default.nix @@ -8,14 +8,14 @@ alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "encore"; version = "0.8.1"; minimalOCamlVersion = "4.07"; src = fetchurl { - url = "https://github.com/mirage/encore/releases/download/v${version}/encore-${version}.tbz"; + url = "https://github.com/mirage/encore/releases/download/v${finalAttrs.version}/encore-${finalAttrs.version}.tbz"; hash = "sha256-qg6heSBc6OSfb7vZxEi4rrKh+nx+ffnsCfVvhVR3yY0="; }; @@ -35,8 +35,8 @@ buildDunePackage rec { an internal encoder from a shared description. The goal is to ensure a dual isomorphism between them. ''; - changelog = "https://raw.githubusercontent.com/mirage/encore/refs/tags/v${version}/CHANGES.md"; + changelog = "https://raw.githubusercontent.com/mirage/encore/refs/tags/v${finalAttrs.version}/CHANGES.md"; license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/eqaf/default.nix b/pkgs/development/ocaml-modules/eqaf/default.nix index 1833f44518a2..9337c9f3a3c7 100644 --- a/pkgs/development/ocaml-modules/eqaf/default.nix +++ b/pkgs/development/ocaml-modules/eqaf/default.nix @@ -4,13 +4,13 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { minimalOCamlVersion = "4.07"; pname = "eqaf"; version = "0.10"; src = fetchurl { - url = "https://github.com/mirage/eqaf/releases/download/v${version}/eqaf-${version}.tbz"; + url = "https://github.com/mirage/eqaf/releases/download/v${finalAttrs.version}/eqaf-${finalAttrs.version}.tbz"; hash = "sha256-Z9E2nFfE0tFKENAmMtReNVIkq+uYrsCJecC65YQwku4="; }; @@ -21,4 +21,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/ethernet/default.nix b/pkgs/development/ocaml-modules/ethernet/default.nix index d91e270291f0..d003b7186138 100644 --- a/pkgs/development/ocaml-modules/ethernet/default.nix +++ b/pkgs/development/ocaml-modules/ethernet/default.nix @@ -9,14 +9,14 @@ mirage-net, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ethernet"; version = "3.2.0"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + url = "https://github.com/mirage/ethernet/releases/download/v${finalAttrs.version}/ethernet-${finalAttrs.version}.tbz"; hash = "sha256-TB2nAhQiHZ1Dk6n/3i49s9HKNH92yNUl3xl94hByrAk="; }; @@ -34,4 +34,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.sternenseemann ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index 467a9188f9e3..51c9dc8c3b0c 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -5,12 +5,12 @@ cppo, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "extlib"; version = "1.8.0"; src = fetchurl { - url = "https://github.com/ygrek/ocaml-extlib/releases/download/${version}/extlib-${version}.tar.gz"; + url = "https://github.com/ygrek/ocaml-extlib/releases/download/${finalAttrs.version}/extlib-${finalAttrs.version}.tar.gz"; hash = "sha256-lkJ38AEoCo7d/AjgcB1Zygxr3F0FIxOz5A5QiPbUXXA="; }; @@ -24,4 +24,4 @@ buildDunePackage rec { license = lib.licenses.lgpl21Only; maintainers = [ lib.maintainers.sternenseemann ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/ezjsonm-encoding/default.nix b/pkgs/development/ocaml-modules/ezjsonm-encoding/default.nix index 26423ea19995..190a406725e8 100644 --- a/pkgs/development/ocaml-modules/ezjsonm-encoding/default.nix +++ b/pkgs/development/ocaml-modules/ezjsonm-encoding/default.nix @@ -5,12 +5,12 @@ ezjsonm, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ezjsonm-encoding"; version = "2.1.0"; src = fetchurl { - url = "https://github.com/lthms/ezjsonm-encoding/releases/download/${version}/ezjsonm-encoding-${version}.tbz"; + url = "https://github.com/lthms/ezjsonm-encoding/releases/download/${finalAttrs.version}/ezjsonm-encoding-${finalAttrs.version}.tbz"; hash = "sha256-qR8Nn3pL1K33qTBLkElaqsTjLjudtI8IMe0GEK08qW4="; }; @@ -22,4 +22,4 @@ buildDunePackage rec { license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ fgaz ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix index 1f468bb2a3bc..eac0636fc98e 100644 --- a/pkgs/development/ocaml-modules/ezjsonm/default.nix +++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix @@ -7,14 +7,14 @@ sexplib0, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ezjsonm"; version = "1.3.0"; duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/ezjsonm/releases/download/v${version}/ezjsonm-${version}.tbz"; + url = "https://github.com/mirage/ezjsonm/releases/download/v${finalAttrs.version}/ezjsonm-${finalAttrs.version}.tbz"; hash = "sha256-CGM+Dw52eoroGTXKfnTxaTuFp5xFAtVo7t/1Fw8M13s="; }; @@ -30,4 +30,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = with lib.maintainers; [ vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/faad/default.nix b/pkgs/development/ocaml-modules/faad/default.nix index 9a5de20d7eac..90f76802ed50 100644 --- a/pkgs/development/ocaml-modules/faad/default.nix +++ b/pkgs/development/ocaml-modules/faad/default.nix @@ -7,14 +7,14 @@ pkg-config, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "faad"; version = "0.5.1"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-faad"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-3ayKZhgJAgsoOqn0InSrM5f3TImRHOQMtWETICo4t3o="; }; @@ -28,4 +28,4 @@ buildDunePackage rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ dandellion ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/faraday/default.nix b/pkgs/development/ocaml-modules/faraday/default.nix index c7507ee38f7c..3b083aaf151c 100644 --- a/pkgs/development/ocaml-modules/faraday/default.nix +++ b/pkgs/development/ocaml-modules/faraday/default.nix @@ -6,7 +6,7 @@ bigstringaf, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "faraday"; version = "0.8.2"; @@ -15,8 +15,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "inhabitedtype"; - repo = pname; - rev = version; + repo = "faraday"; + rev = finalAttrs.version; sha256 = "sha256-wR4kDocR1t3OLRuudXH8IccYde552O6Gvo5BHNxRbAI="; }; @@ -28,6 +28,6 @@ buildDunePackage rec { description = "Serialization library built for speed and memory efficiency"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; }; -} +}) diff --git a/pkgs/development/ocaml-modules/farith/default.nix b/pkgs/development/ocaml-modules/farith/default.nix index 3840f7881fc1..376b6f286918 100644 --- a/pkgs/development/ocaml-modules/farith/default.nix +++ b/pkgs/development/ocaml-modules/farith/default.nix @@ -7,7 +7,7 @@ zarith, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "farith"; version = "0.1"; @@ -17,7 +17,7 @@ buildDunePackage rec { domain = "git.frama-c.com"; owner = "pub"; repo = "farith"; - tag = version; + tag = finalAttrs.version; hash = "sha256-9TGKeL3DXKEf2RLpkjOTC8aDQeLKSM9QUIiSkFCQW+8="; }; @@ -35,4 +35,4 @@ buildDunePackage rec { license = lib.licenses.lgpl2Only; maintainers = with lib.maintainers; [ ethancedwards8 ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/fdkaac/default.nix b/pkgs/development/ocaml-modules/fdkaac/default.nix index ccabbfcc2a5d..214d428e85ad 100644 --- a/pkgs/development/ocaml-modules/fdkaac/default.nix +++ b/pkgs/development/ocaml-modules/fdkaac/default.nix @@ -6,13 +6,13 @@ fdk_aac, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "fdkaac"; version = "0.3.3"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-fdkaac"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-cTPPQKBq0EFo35eK7TXlszbodHYIg1g7v+yQ/rG7Y9I="; }; @@ -21,7 +21,7 @@ buildDunePackage rec { meta = { description = "OCaml binding for the fdk-aac library"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.vbgl @@ -29,4 +29,4 @@ buildDunePackage rec { ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/ff/sig.nix b/pkgs/development/ocaml-modules/ff/sig.nix index 9aab1f066078..b398a8d057e3 100644 --- a/pkgs/development/ocaml-modules/ff/sig.nix +++ b/pkgs/development/ocaml-modules/ff/sig.nix @@ -5,13 +5,13 @@ zarith, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ff-sig"; version = "0.6.2"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "cryptography/ocaml-ff"; - rev = version; + rev = finalAttrs.version; hash = "sha256-IoUH4awMOa1pm/t8E5io87R0TZsAxJjGWaXhXjn/w+Y="; }; @@ -24,9 +24,9 @@ buildDunePackage rec { doCheck = true; meta = { - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; description = "Minimal finite field signatures"; license = lib.licenses.mit; maintainers = [ lib.maintainers.ulrikstrid ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/fiber/default.nix b/pkgs/development/ocaml-modules/fiber/default.nix index 37e008884d1d..fc9eafe6d088 100644 --- a/pkgs/development/ocaml-modules/fiber/default.nix +++ b/pkgs/development/ocaml-modules/fiber/default.nix @@ -7,12 +7,12 @@ stdune, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "fiber"; version = "3.7.0"; src = fetchurl { - url = "https://github.com/ocaml-dune/fiber/releases/download/${version}/fiber-lwt-${version}.tbz"; + url = "https://github.com/ocaml-dune/fiber/releases/download/${finalAttrs.version}/fiber-lwt-${finalAttrs.version}.tbz"; hash = "sha256-hkihWuk/5pQpmc42iHQpo5E7YoKcRxTlIMwOehw7loI="; }; @@ -33,4 +33,4 @@ buildDunePackage rec { maintainers = [ ]; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix index 18d6c28ee223..fd71817929fe 100644 --- a/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/pkgs/development/ocaml-modules/fileutils/default.nix @@ -8,12 +8,12 @@ ounit2, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "fileutils"; version = "0.6.6"; src = fetchurl { - url = "https://github.com/gildor478/ocaml-fileutils/releases/download/v${version}/fileutils-${version}.tbz"; + url = "https://github.com/gildor478/ocaml-fileutils/releases/download/v${finalAttrs.version}/fileutils-${finalAttrs.version}.tbz"; hash = "sha256-eW1XkeK/ezv/IAz1BXp6GHhDnrzXTtDxCIz4Z1bVK+Y="; }; @@ -35,4 +35,4 @@ buildDunePackage rec { license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/fix/default.nix b/pkgs/development/ocaml-modules/fix/default.nix index 8dbac6ff25a6..b276f86cc415 100644 --- a/pkgs/development/ocaml-modules/fix/default.nix +++ b/pkgs/development/ocaml-modules/fix/default.nix @@ -4,7 +4,7 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "fix"; version = "20250919"; @@ -12,7 +12,7 @@ buildDunePackage rec { domain = "gitlab.inria.fr"; owner = "fpottier"; repo = "fix"; - tag = version; + tag = finalAttrs.version; hash = "sha256-CVxOLlSKKX1kb1bi6IbSo7SH5GsVynI4de0c5NUmq+s="; }; @@ -24,4 +24,4 @@ buildDunePackage rec { license = lib.licenses.lgpl2Only; maintainers = with lib.maintainers; [ vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/frei0r/default.nix b/pkgs/development/ocaml-modules/frei0r/default.nix index 573b7ddf2b85..499b3277153f 100644 --- a/pkgs/development/ocaml-modules/frei0r/default.nix +++ b/pkgs/development/ocaml-modules/frei0r/default.nix @@ -7,14 +7,14 @@ frei0r, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "frei0r"; version = "0.1.2"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-frei0r"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-eh/ymZO/3a1z6uvZdnXgma/7AU2NBVs2lddA+R/kuQA="; }; @@ -28,4 +28,4 @@ buildDunePackage rec { license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ dandellion ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/gd/default.nix b/pkgs/development/ocaml-modules/gd/default.nix index 5b924af2bbb7..66671eb2d78f 100644 --- a/pkgs/development/ocaml-modules/gd/default.nix +++ b/pkgs/development/ocaml-modules/gd/default.nix @@ -6,14 +6,14 @@ gd, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "gd"; version = "1.1"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-gd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-78cqxVEappTybRLk7Y6vW1POvZKFIxtGNVcmkKq9GEE="; }; @@ -26,4 +26,4 @@ buildDunePackage rec { license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ dandellion ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix index c46efbbf766b..90001fb79834 100644 --- a/pkgs/development/ocaml-modules/gen/default.nix +++ b/pkgs/development/ocaml-modules/gen/default.nix @@ -8,7 +8,7 @@ ounit2, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { version = "1.1"; pname = "gen"; minimalOCamlVersion = "4.03"; @@ -17,7 +17,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "c-cube"; repo = "gen"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ZytPPGhmt/uANaSgkgsUBOwyQ9ka5H4J+5CnJpEdrNk="; }; @@ -34,4 +34,4 @@ buildDunePackage rec { description = "Simple, efficient iterators for OCaml"; license = lib.licenses.bsd3; }; -} +}) diff --git a/pkgs/development/ocaml-modules/gen_js_api/default.nix b/pkgs/development/ocaml-modules/gen_js_api/default.nix index 0d7438949493..aafae7b6ff9e 100644 --- a/pkgs/development/ocaml-modules/gen_js_api/default.nix +++ b/pkgs/development/ocaml-modules/gen_js_api/default.nix @@ -9,14 +9,14 @@ nodejs, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "gen_js_api"; version = "1.1.5"; src = fetchFromGitHub { owner = "LexiFi"; - repo = pname; - rev = "v${version}"; + repo = "gen_js_api"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-baK+/y0s08hHC8/+P7RKOboFnALQpndxBMuhI1WKf2o="; }; @@ -46,4 +46,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.bcc32 ]; }; -} +}) diff --git a/pkgs/development/python-modules/bx-py-utils/default.nix b/pkgs/development/python-modules/bx-py-utils/default.nix index c954dfbf14da..828fc5644da0 100644 --- a/pkgs/development/python-modules/bx-py-utils/default.nix +++ b/pkgs/development/python-modules/bx-py-utils/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "bx-py-utils"; - version = "114"; + version = "115"; pyproject = true; src = fetchFromGitHub { owner = "boxine"; repo = "bx_py_utils"; tag = "v${version}"; - hash = "sha256-AAn1e5HuSngEnCoCpOvVjxavZbiH2YL+38gXxhqLLBo="; + hash = "sha256-CTVjpXlypalhzyFEQOqs5Zf5HMcBX+AyF9QCVe5WbwA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index ae1029b6dfe7..febf318d656d 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -6,24 +6,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "goodwe"; - version = "0.4.8"; + version = "0.4.9"; pyproject = true; src = fetchFromGitHub { owner = "marcelblijleven"; repo = "goodwe"; - tag = "v${version}"; - hash = "sha256-EsMv4hzGsAV9OTFo2b/omM4hx7XxUcdO6rrMzQ3DmNQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-WHLvfAlwhcA0JFSWfwUPsJ9dWmadIjyonXEP3Bb6WKE="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace-fail "'marcelblijleven@gmail.com" "marcelblijleven@gmail.com" \ - --replace-fail "version: file: VERSION" "version = ${version}" - ''; - build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -33,8 +27,8 @@ buildPythonPackage rec { meta = { description = "Python library for connecting to GoodWe inverter"; homepage = "https://github.com/marcelblijleven/goodwe"; - changelog = "https://github.com/marcelblijleven/goodwe/releases/tag/v${version}"; + changelog = "https://github.com/marcelblijleven/goodwe/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/jsonschema-rs/default.nix b/pkgs/development/python-modules/jsonschema-rs/default.nix index 892dcfa5819c..26103de5e110 100644 --- a/pkgs/development/python-modules/jsonschema-rs/default.nix +++ b/pkgs/development/python-modules/jsonschema-rs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "jsonschema-rs"; - version = "0.38.1"; + version = "0.39.0"; pyproject = true; @@ -18,12 +18,12 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "jsonschema_rs"; - hash = "sha256-zkbJ5DgntAnrqthloCPAPoaEx3+hc8BAicttgQXKG9w="; + hash = "sha256-K+7QayZF5O6cO6fl23CnYCi6jJl4plSwdl5nji1sbfM="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-DqUBqpFFnxth5b1wvwWVFbhUeTBJEHTfCYZoJyhIfgU="; + hash = "sha256-2YNunqzejzDCj7mv9S8g/kY+t39YtQQ2jMeeTwc+NCs="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/moyopy/default.nix b/pkgs/development/python-modules/moyopy/default.nix index 6d6a2f2eaad9..4512eba4afbe 100644 --- a/pkgs/development/python-modules/moyopy/default.nix +++ b/pkgs/development/python-modules/moyopy/default.nix @@ -14,19 +14,19 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "moyopy"; - version = "0.7.4"; + version = "0.7.7"; pyproject = true; src = fetchFromGitHub { owner = "spglib"; repo = "moyo"; - tag = "v${version}"; - hash = "sha256-3NL2++a2OxasgoEZbyo9/bfKDxH7e1J/kaKiwvygAZY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-+esZ6LiPJG1Oof+6e3i6wZCLEYPdKfTbgXXucJW01sc="; }; - sourceRoot = "${src.name}/moyopy"; + sourceRoot = "${finalAttrs.src.name}/moyopy"; cargoRoot = ".."; nativeBuildInputs = with rustPlatform; [ @@ -39,14 +39,14 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit + inherit (finalAttrs) pname version src sourceRoot cargoRoot ; - hash = "sha256-nNKc+U3T6Iv8UqrkKlgCsehBGzjCjvEhTJMLRge27h4="; + hash = "sha256-xVSAEEbqZ5Z7CnLECyFw1OMPmjiHtdnzoI65sESd8D8="; }; build-system = [ @@ -73,8 +73,8 @@ buildPythonPackage rec { meta = { description = "Python interface of moyo, a fast and robust crystal symmetry finder"; homepage = "https://spglib.github.io/moyo/python/"; - changelog = "https://github.com/spglib/moyo/releases/tag/v${version}"; + changelog = "https://github.com/spglib/moyo/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix index 0dd7db856b8d..7aacaac98521 100644 --- a/pkgs/development/python-modules/oelint-data/default.nix +++ b/pkgs/development/python-modules/oelint-data/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "oelint-data"; - version = "1.3.6"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-data"; tag = finalAttrs.version; - hash = "sha256-l7UJ5pHhHI22dLOJD4kj40gW7EZFwBn5krTDVYY08Dw="; + hash = "sha256-OrKwf7ADi0WUsFgsroFJvQxVB5RRsqjyZn6aZTixmFA="; }; build-system = [ diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 8026a606c7f6..054e36058943 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "4.13.0"; + version = "4.13.1"; pyproject = true; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-engineio"; tag = "v${version}"; - hash = "sha256-lNVy2Q14+F43TfV1iXqCy1rm4DGjt5IgNVHzMOeOZ5s="; + hash = "sha256-WX3UyKypx5hE7x7rA6waELEnAXg95zEd4vX27Tni2/c="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-snoo/default.nix b/pkgs/development/python-modules/python-snoo/default.nix index 044b5491edab..305f317d657b 100644 --- a/pkgs/development/python-modules/python-snoo/default.nix +++ b/pkgs/development/python-modules/python-snoo/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "python-snoo"; - version = "0.10.0"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { owner = "Lash-L"; repo = "python-snoo"; tag = "v${version}"; - hash = "sha256-p0cKIDdSQwryagvHGjydSTR4O5lAPO7UMhw+tSIxZrY="; + hash = "sha256-IbBNdtRZdXrN6dyR0cdKsrx3kxxBTUmfAxmuJy4p5x4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/specfile/default.nix b/pkgs/development/python-modules/specfile/default.nix index e17d9f361951..d935ff3fac65 100644 --- a/pkgs/development/python-modules/specfile/default.nix +++ b/pkgs/development/python-modules/specfile/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "specfile"; - version = "0.38.0"; + version = "0.39.0"; pyproject = true; src = fetchFromGitHub { owner = "packit"; repo = "specfile"; tag = finalAttrs.version; - hash = "sha256-cqHQIzgxfWHSDIIx72RIwt0o3MEJHXRzMNSgQ0VCWms="; + hash = "sha256-CVzGdfsJeWqC3SwQZX2lCIefEFdSp+Xep/Kqw1dGrrc="; }; build-system = [ diff --git a/pkgs/development/python-modules/sphinx-design/default.nix b/pkgs/development/python-modules/sphinx-design/default.nix index dad95e81b4a3..76c2186f13f7 100644 --- a/pkgs/development/python-modules/sphinx-design/default.nix +++ b/pkgs/development/python-modules/sphinx-design/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sphinx-design"; - version = "0.6.1"; + version = "0.7.0"; pyproject = true; src = fetchPypi { inherit version; pname = "sphinx_design"; - hash = "sha256-tE7qNxk4bQTXZcGoJXysorPm+EIdezpedCwP1F+E5jI="; + hash = "sha256-0qP1sZwkuRattS+XxfAO+rQAnKM3gSABEJCEp0Dsm3o="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix index 6e088a1921f5..fcc9e19d3dc8 100644 --- a/pkgs/development/python-modules/triton/default.nix +++ b/pkgs/development/python-modules/triton/default.nix @@ -277,6 +277,13 @@ buildPythonPackage (finalAttrs: { # ptxas fatal : Unknown option 'sass' "python/test/unit/tools/test_disasm.py" + + # assert 'mma.sync.aligned.m16n8k16.row.col.f32.f16.f16.f32' in ptx + # AssertionError: assert 'mma.sync.aligned.m16n8k16.row.col.f32.f16.f16.f32' in ... + "python/test/unit/language/test_core.py::test_dot[1-1-2-32-1-False-False-None-ieee-float8e5-float32-1-None]" + + # AssertionError: Tensor-likes are not close! + "python/test/unit/language/test_core.py::test_scaled_dot[64-128-128-True-False-True-e4m3-fp16-4-16-1]" ]; enabledTestPaths = [ diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index eea3b26bc9ce..bcda85c9fcc3 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,11 +2,11 @@ "6.12": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-v6.12.66-hardened1.patch", - "sha256": "056zy8yk98v639qpap5ym2k7iy4lsx7kglnqz540zgw012289f5h", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.66-hardened1/linux-hardened-v6.12.66-hardened1.patch" + "name": "linux-hardened-v6.12.69-hardened1.patch", + "sha256": "15zgha5qvn8a6ibx4b8mn5bwsm9z4xnpx3kz49ncpnk3iagcr2vw", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.69-hardened1/linux-hardened-v6.12.69-hardened1.patch" }, - "sha256": "1bvfadb5149sh927f8cbr1rnypn7v0h6znjdrc1mmc30q2hrff5s", - "version": "6.12.66" + "sha256": "0rbnbynhm7w4ig8snq97px4ljr5k4zq1a97jqhwk4w0qy9bkcjab", + "version": "6.12.69" } } diff --git a/pkgs/os-specific/linux/kernel/htmldocs.nix b/pkgs/os-specific/linux/kernel/htmldocs.nix index bfd7de475e17..af43f3162783 100644 --- a/pkgs/os-specific/linux/kernel/htmldocs.nix +++ b/pkgs/os-specific/linux/kernel/htmldocs.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { patchShebangs \ Documentation/sphinx/parse-headers.pl \ scripts/{get_abi.pl,get_feat.pl,kernel-doc,sphinx-pre-install} \ + tools/docs/sphinx-pre-install \ tools/net/ynl/pyynl/ynl_gen_rst.py ''; diff --git a/pkgs/servers/home-assistant/custom-components/ha_mcp_tools/package.nix b/pkgs/servers/home-assistant/custom-components/ha_mcp_tools/package.nix new file mode 100644 index 000000000000..675e0fc180e1 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/ha_mcp_tools/package.nix @@ -0,0 +1,26 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, +}: + +buildHomeAssistantComponent rec { + owner = "homeassistant-ai"; + domain = "ha_mcp_tools"; + version = "6.6.1"; + + src = fetchFromGitHub { + owner = "homeassistant-ai"; + repo = "ha-mcp"; + tag = "v${version}"; + hash = "sha256-yAJbvfIH5ewRTip8whbOKxE479qAihESaiLFTnhpRkY="; + }; + + meta = { + changelog = "https://github.com/homeassistant-ai/ha-mcp/releases/tag/v${version}"; + description = "Home Assistant custom component for the MCP (Model Context Protocol) server"; + homepage = "https://github.com/homeassistant-ai/ha-mcp"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/thewatchman/package.nix b/pkgs/servers/home-assistant/custom-components/thewatchman/package.nix index b6844bdeaed4..a29cee8ff3b7 100644 --- a/pkgs/servers/home-assistant/custom-components/thewatchman/package.nix +++ b/pkgs/servers/home-assistant/custom-components/thewatchman/package.nix @@ -11,21 +11,18 @@ buildHomeAssistantComponent rec { owner = "dummylabs"; domain = "watchman"; - version = "0.7.0-beta.1"; + version = "0.8.3"; src = fetchFromGitHub { owner = "dummylabs"; repo = "thewatchman"; tag = "v${version}"; - hash = "sha256-U2AYxQ37XQocHcnY2Uv9Lhu0LmEZhhcGdO29i565tBM="; + hash = "sha256-5BXIKh8uPKuxsLbxu0fUbuCR2LYOXk1HpOvrqehg0u0="; }; postPatch = '' substituteInPlace custom_components/watchman/manifest.json \ --replace-fail "prettytable==3.12.0" "prettytable" - - substituteInPlace tests/{__init__,test_{action,regex,report}}.py \ - --replace-fail "/workspaces/thewatchman/" "" ''; dontBuild = true; @@ -40,6 +37,11 @@ buildHomeAssistantComponent rec { pytestCheckHook ]; + disabledTests = [ + # the test relies on NOT changing the hass config_dir and tries to write into the nix store + "test_status_sensor_safe_mode" + ]; + meta = { description = "Keep track of missing entities and services in your config files"; homepage = "https://github.com/dummylabs/thewatchman"; diff --git a/pkgs/servers/kanidm/1_9.nix b/pkgs/servers/kanidm/1_9.nix new file mode 100644 index 000000000000..dc28c164a77c --- /dev/null +++ b/pkgs/servers/kanidm/1_9.nix @@ -0,0 +1,5 @@ +import ./generic.nix { + version = "1.9.0-pre"; + hash = "sha256-p+dZWG9czUtK7IaifM/1CbXfpLhKPBflL/uDqHtHwHA="; + cargoHash = "sha256-razlbe5VEiWz427dShvWT/rVuvBh5Re/z1vXsVQGOgM="; +} diff --git a/pkgs/servers/kanidm/generic.nix b/pkgs/servers/kanidm/generic.nix index d5346c519607..dfaf78ba4b86 100644 --- a/pkgs/servers/kanidm/generic.nix +++ b/pkgs/servers/kanidm/generic.nix @@ -85,11 +85,18 @@ rustPlatform.buildRustPackage (finalAttrs: { } // lib.optionalAttrs (lib.versionAtLeast finalAttrs.version "1.8") { resolver_service_account_token_path = "/etc/kanidm/token"; + } + // lib.optionalAttrs (lib.versionAtLeast finalAttrs.version "1.9") { + server_migration_path = "/etc/kanidm/migrations.d"; }; in '' cp ${format profile} libs/profiles/${finalAttrs.env.KANIDM_BUILD_PROFILE}.toml substituteInPlace libs/profiles/${finalAttrs.env.KANIDM_BUILD_PROFILE}.toml --replace-fail '@htmx_ui_pkg_path@' "$out/ui/hpkg" + '' + + lib.optionalString (lib.versionAtLeast finalAttrs.version "1.9") '' + substituteInPlace Cargo.toml \ + --replace-fail 'rust-version = "1.93"' 'rust-version = "1.91"' ''; nativeBuildInputs = [ diff --git a/pkgs/servers/kanidm/provision-patches/1_9/oauth2-basic-secret-modify.patch b/pkgs/servers/kanidm/provision-patches/1_9/oauth2-basic-secret-modify.patch new file mode 100644 index 000000000000..c6ba31323669 --- /dev/null +++ b/pkgs/servers/kanidm/provision-patches/1_9/oauth2-basic-secret-modify.patch @@ -0,0 +1,159 @@ +From bebd0ae51344eba2bc9bb8e8bd88f279daf09581 Mon Sep 17 00:00:00 2001 +From: oddlama +Date: Mon, 10 Nov 2025 19:58:39 +0100 +Subject: [PATCH 1/2] oauth2 basic secret modify + +--- + server/core/src/actors/v1_write.rs | 42 +++++++++++++++++++++++++++++ + server/core/src/https/v1.rs | 6 ++++- + server/core/src/https/v1_oauth2.rs | 29 ++++++++++++++++++++ + server/lib/src/server/migrations.rs | 16 +++++++++++ + 4 files changed, 92 insertions(+), 1 deletion(-) + +diff --git a/server/core/src/actors/v1_write.rs b/server/core/src/actors/v1_write.rs +index 732e826c8..a2b8e503f 100644 +--- a/server/core/src/actors/v1_write.rs ++++ b/server/core/src/actors/v1_write.rs +@@ -324,6 +324,48 @@ impl QueryServerWriteV1 { + .and_then(|_| idms_prox_write.commit().map(|_| ())) + } + ++ #[instrument( ++ level = "info", ++ skip_all, ++ fields(uuid = ?eventid) ++ )] ++ pub async fn handle_oauth2_basic_secret_write( ++ &self, ++ client_auth_info: ClientAuthInfo, ++ filter: Filter, ++ new_secret: String, ++ eventid: Uuid, ++ ) -> Result<(), OperationError> { ++ // Given a protoEntry, turn this into a modification set. ++ let ct = duration_from_epoch_now(); ++ let mut idms_prox_write = self.idms.proxy_write(ct).await?; ++ let ident = idms_prox_write ++ .validate_client_auth_info_to_ident(client_auth_info, ct) ++ .map_err(|e| { ++ admin_error!(err = ?e, "Invalid identity"); ++ e ++ })?; ++ ++ let modlist = ModifyList::new_purge_and_set( ++ Attribute::OAuth2RsBasicSecret, ++ Value::SecretValue(new_secret), ++ ); ++ ++ let mdf = ++ ModifyEvent::from_internal_parts(ident, &modlist, &filter, &idms_prox_write.qs_write) ++ .map_err(|e| { ++ admin_error!(err = ?e, "Failed to begin modify during handle_oauth2_basic_secret_write"); ++ e ++ })?; ++ ++ trace!(?mdf, "Begin modify event"); ++ ++ idms_prox_write ++ .qs_write ++ .modify(&mdf) ++ .and_then(|_| idms_prox_write.commit()) ++ } ++ + #[instrument( + level = "info", + skip_all, +diff --git a/server/core/src/https/v1.rs b/server/core/src/https/v1.rs +index 7d5beb1f0..210147e0a 100644 +--- a/server/core/src/https/v1.rs ++++ b/server/core/src/https/v1.rs +@@ -10,7 +10,7 @@ use axum::extract::{Path, State}; + use axum::http::{HeaderMap, HeaderValue}; + use axum::middleware::from_fn; + use axum::response::{IntoResponse, Response}; +-use axum::routing::{delete, get, post, put}; ++use axum::routing::{delete, get, post, put, patch}; + use axum::{Extension, Json, Router}; + use axum_extra::extract::cookie::{Cookie, CookieJar, SameSite}; + use compact_jwt::{Jwk, Jws, JwsSigner}; +@@ -3113,6 +3113,10 @@ pub(crate) fn route_setup(state: ServerState) -> Router { + "/v1/oauth2/{rs_name}/_basic_secret", + get(super::v1_oauth2::oauth2_id_get_basic_secret), + ) ++ .route( ++ "/v1/oauth2/{rs_name}/_basic_secret", ++ patch(super::v1_oauth2::oauth2_id_patch_basic_secret), ++ ) + .route( + "/v1/oauth2/{rs_name}/_scopemap/{group}", + post(super::v1_oauth2::oauth2_id_scopemap_post) +diff --git a/server/core/src/https/v1_oauth2.rs b/server/core/src/https/v1_oauth2.rs +index f399539bc..ffad9921e 100644 +--- a/server/core/src/https/v1_oauth2.rs ++++ b/server/core/src/https/v1_oauth2.rs +@@ -151,6 +151,35 @@ pub(crate) async fn oauth2_id_get_basic_secret( + .map_err(WebError::from) + } + ++#[utoipa::path( ++ patch, ++ path = "/v1/oauth2/{rs_name}/_basic_secret", ++ request_body=ProtoEntry, ++ responses( ++ DefaultApiResponse, ++ ), ++ security(("token_jwt" = [])), ++ tag = "v1/oauth2", ++ operation_id = "oauth2_id_patch_basic_secret" ++)] ++/// Overwrite the basic secret for a given OAuth2 Resource Server. ++#[instrument(level = "info", skip(state, new_secret))] ++pub(crate) async fn oauth2_id_patch_basic_secret( ++ State(state): State, ++ Extension(kopid): Extension, ++ VerifiedClientInformation(client_auth_info): VerifiedClientInformation, ++ Path(rs_name): Path, ++ Json(new_secret): Json, ++) -> Result, WebError> { ++ let filter = oauth2_id(&rs_name); ++ state ++ .qe_w_ref ++ .handle_oauth2_basic_secret_write(client_auth_info, filter, new_secret, kopid.eventid) ++ .await ++ .map(Json::from) ++ .map_err(WebError::from) ++} ++ + #[utoipa::path( + patch, + path = "/v1/oauth2/{rs_name}", +diff --git a/server/lib/src/server/migrations.rs b/server/lib/src/server/migrations.rs +index a916eced2..94327e938 100644 +--- a/server/lib/src/server/migrations.rs ++++ b/server/lib/src/server/migrations.rs +@@ -172,6 +172,22 @@ impl QueryServer { + reload_required = true; + }; + ++ // secret provisioning: allow idm_admin to modify OAuth2RsBasicSecret. ++ write_txn.internal_modify_uuid( ++ UUID_IDM_ACP_OAUTH2_MANAGE_V1, ++ &ModifyList::new_append( ++ Attribute::AcpCreateAttr, ++ Attribute::OAuth2RsBasicSecret.into(), ++ ), ++ )?; ++ write_txn.internal_modify_uuid( ++ UUID_IDM_ACP_OAUTH2_MANAGE_V1, ++ &ModifyList::new_append( ++ Attribute::AcpModifyPresentAttr, ++ Attribute::OAuth2RsBasicSecret.into(), ++ ), ++ )?; ++ + // Execute whatever operations we have batched up and ready to go. This is needed + // to preserve ordering of the operations - if we reloaded after a remigrate then + // we would have skipped the patch level fix which needs to have occurred *first*. +-- +2.51.0 + diff --git a/pkgs/servers/kanidm/provision-patches/1_9/recover-account.patch b/pkgs/servers/kanidm/provision-patches/1_9/recover-account.patch new file mode 100644 index 000000000000..0757b4fbb5d6 --- /dev/null +++ b/pkgs/servers/kanidm/provision-patches/1_9/recover-account.patch @@ -0,0 +1,122 @@ +From 29dab03201185675d116dd5da6928c6ca3ad30ff Mon Sep 17 00:00:00 2001 +From: oddlama +Date: Mon, 10 Nov 2025 20:01:07 +0100 +Subject: [PATCH 2/2] recover account + +--- + server/core/src/actors/internal.rs | 5 +++-- + server/core/src/admin.rs | 6 +++--- + server/daemon/src/main.rs | 23 ++++++++++++++++++++++- + server/daemon/src/opt.rs | 7 +++++++ + 4 files changed, 35 insertions(+), 6 deletions(-) + +diff --git a/server/core/src/actors/internal.rs b/server/core/src/actors/internal.rs +index b3708f36d..6a52735fc 100644 +--- a/server/core/src/actors/internal.rs ++++ b/server/core/src/actors/internal.rs +@@ -186,17 +186,18 @@ impl QueryServerWriteV1 { + + #[instrument( + level = "info", +- skip(self, eventid), ++ skip(self, password, eventid), + fields(uuid = ?eventid) + )] + pub(crate) async fn handle_admin_recover_account( + &self, + name: String, ++ password: Option, + eventid: Uuid, + ) -> Result { + let ct = duration_from_epoch_now(); + let mut idms_prox_write = self.idms.proxy_write(ct).await?; +- let pw = idms_prox_write.recover_account(name.as_str(), None)?; ++ let pw = idms_prox_write.recover_account(name.as_str(), password.as_deref())?; + + idms_prox_write.commit().map(|()| pw) + } +diff --git a/server/core/src/admin.rs b/server/core/src/admin.rs +index b74cc90c5..660e3de8f 100644 +--- a/server/core/src/admin.rs ++++ b/server/core/src/admin.rs +@@ -24,7 +24,7 @@ pub use kanidm_proto::internal::{ + + #[derive(Serialize, Deserialize, Debug)] + pub enum AdminTaskRequest { +- RecoverAccount { name: String }, ++ RecoverAccount { name: String, password: Option }, + DisableAccount { name: String }, + ShowReplicationCertificate, + RenewReplicationCertificate, +@@ -334,8 +334,8 @@ async fn handle_client( + + let resp = async { + match req { +- AdminTaskRequest::RecoverAccount { name } => { +- match server_rw.handle_admin_recover_account(name, eventid).await { ++ AdminTaskRequest::RecoverAccount { name, password } => { ++ match server_rw.handle_admin_recover_account(name, password, eventid).await { + Ok(password) => AdminTaskResponse::RecoverAccount { password }, + Err(e) => { + error!(err = ?e, "error during recover-account"); +diff --git a/server/daemon/src/main.rs b/server/daemon/src/main.rs +index 2ad7830cc..52fa8d2d9 100644 +--- a/server/daemon/src/main.rs ++++ b/server/daemon/src/main.rs +@@ -832,13 +832,34 @@ async fn kanidm_main(config: Configuration, opt: KanidmdParser) -> ExitCode { + .await; + } + } +- KanidmdOpt::RecoverAccount { name } => { ++ KanidmdOpt::RecoverAccount { name, from_environment } => { + info!("Running account recovery ..."); + let output_mode: ConsoleOutputMode = opt.output_mode.into(); ++ let password = if *from_environment { ++ match std::env::var("KANIDM_RECOVER_ACCOUNT_PASSWORD_FILE") { ++ Ok(path) => match tokio::fs::read_to_string(&path).await { ++ Ok(contents) => Some(contents), ++ Err(e) => { ++ error!("Failed to read password file '{}': {}", path, e); ++ return ExitCode::FAILURE; ++ } ++ }, ++ Err(_) => match std::env::var("KANIDM_RECOVER_ACCOUNT_PASSWORD") { ++ Ok(val) => Some(val), ++ Err(_) => { ++ error!("Neither KANIDM_RECOVER_ACCOUNT_PASSWORD_FILE nor KANIDM_RECOVER_ACCOUNT_PASSWORD was set"); ++ return ExitCode::FAILURE; ++ } ++ } ++ } ++ } else { ++ None ++ }; + submit_admin_req( + config.adminbindpath.as_str(), + AdminTaskRequest::RecoverAccount { + name: name.to_owned(), ++ password, + }, + output_mode, + ) +diff --git a/server/daemon/src/opt.rs b/server/daemon/src/opt.rs +index 05c5b9fb3..834b8f9cf 100644 +--- a/server/daemon/src/opt.rs ++++ b/server/daemon/src/opt.rs +@@ -158,6 +158,13 @@ enum KanidmdOpt { + #[clap(value_parser)] + /// The account name to recover credentials for. + name: String, ++ /// Use a password given via an environment variable. ++ /// - `KANIDM_RECOVER_ACCOUNT_PASSWORD_FILE` takes precedence and reads the desired ++ /// password from the given file ++ /// - `KANIDM_RECOVER_ACCOUNT_PASSWORD` directly takes a ++ /// password - beware that this will leave the password in the environment ++ #[clap(long = "from-environment")] ++ from_environment: bool, + }, + #[clap(name = "disable-account")] + /// Disable an account so that it can not be used. This can be reset with `recover-account`. +-- +2.51.0 + diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 913990c6e1b1..927dffaeba4b 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.80.2"; + version = "1.81.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-ZWRIDPvR+72zINp027zbPUMQYiZyL6L2SbTjqTRQqN8="; + sha256 = "sha256-liczKP4WlG2jGaKGJGoRSi6JKQ0Z6b8RENQHivaTXfY="; }; - vendorHash = "sha256-6xOcOBPve4snD7xzGx59HiqZMbQCwS4xQCuoKzyAxu8="; + vendorHash = "sha256-+Adb5fXQSNccVKWtJsLiyPShCdv600vrca0UAOuThyA="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 6dcffd02e67f..59d08dab8ef3 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -53,14 +53,14 @@ let in { nextcloud31 = generic { - version = "31.0.13"; - hash = "sha256-kt8INpRn6Bwj1/2Zevt1bq5Ezkfv8MhcXU0nIS6+KD4="; + version = "31.0.14"; + hash = "sha256-0JZessv2gQV0PLvm7vQEyJCSz5LEDa7iycuc9u32NhM="; packages = nextcloud31Packages; }; nextcloud32 = generic { - version = "32.0.5"; - hash = "sha256-jdC8j44tJi7a0RGX1KB695m1H+hy7i2SWf+hm0PlQ60="; + version = "32.0.6"; + hash = "sha256-RLwz/A4xplC7UguxI8CqplGbf3uThhM9Vhred+U/cTA="; packages = nextcloud32Packages; }; diff --git a/pkgs/servers/nextcloud/packages/31.json b/pkgs/servers/nextcloud/packages/31.json index e5cc987596a8..24cc9c81e0ec 100644 --- a/pkgs/servers/nextcloud/packages/31.json +++ b/pkgs/servers/nextcloud/packages/31.json @@ -30,9 +30,9 @@ ] }, "collectives": { - "hash": "sha256-DFyyXpUxqC9wI0SUTTkBtur6JfzFlACPrMjIoeQ0wlU=", - "url": "https://github.com/nextcloud/collectives/releases/download/v3.5.0/collectives-3.5.0.tar.gz", - "version": "3.5.0", + "hash": "sha256-E40twWESLa11AuIfTjpqE2RF3WT9cZB4PgSyJDJFmeQ=", + "url": "https://github.com/nextcloud/collectives/releases/download/v3.6.1/collectives-3.6.1.tar.gz", + "version": "3.6.1", "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* πŸ‘₯ **Collective and non-hierarchical workflow by heart**: Collectives are\n tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n owned by the collective.\n* πŸ“ **Collaborative page editing** like known from Etherpad thanks to the\n [Text app](https://github.com/nextcloud/text).\n* πŸ”€ **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **Β»AppsΒ«**, find the\n**Β»TeamsΒ«** and **Β»CollectivesΒ«** apps and enable them.", "homepage": "https://github.com/nextcloud/collectives", "licenses": [ @@ -40,9 +40,9 @@ ] }, "contacts": { - "hash": "sha256-eWV+M+yWymUwWonSqy/eQ8EuQy+1ZojIL2DWVMOFAjY=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.3.12/contacts-v7.3.12.tar.gz", - "version": "7.3.12", + "hash": "sha256-LOFfHKt0+DUYLyzbzihaggytQQpFcipce0KaoAVCL1E=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.3.13/contacts-v7.3.13.tar.gz", + "version": "7.3.13", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* πŸš€ **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* πŸŽ‰ **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* πŸ‘₯ **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* πŸ™ˆ **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -93,7 +93,7 @@ "hash": "sha256-rVIB/pCv5tMLMFpyIQCQ0/0bHIrgnE/s5J3ZIvu3Ktg=", "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v1.17.1/end_to_end_encryption-v1.17.1.tar.gz", "version": "1.17.1", - "description": "This app provides all the necessary APIs to implement End-to-End encryption on the client side.\nAdditionally it implements Secure FileDrop and makes sure that End-to-End encrypted files are neither accessible via the web interface nor other WebDAV clients.", + "description": "## **End-to-End Encryption**\n\n### For End Users\n\n**Protect your most sensitive files with strong encryption.**\n\nThe End-to-End Encryption app gives you complete control over your data privacy.\nWith this app, you can encrypt specific folders so that only you (and those you trust) can access their contents.\nYour files are encrypted on your device before they reach the server, ensuring that no oneβ€”not even the server administratorβ€”can read them.\n\n**Benefits:**\n- πŸ”’ **True privacy**: Files are encrypted on your device and can only be decrypted by you\n- πŸ“± **Works across all platforms**: Fully supported on desktop, Android, iOS clients, and as you wish even in the browser\n- 🎯 **Selective encryption**: Choose which folders to encrypt\n- πŸ›‘οΈ **Secure sharing**: Share encrypted files with other users or even secure public upload using the encrypted file drop\n\n---\n\n### For Administrators\n\n**Enterprise-ready end-to-end encryption infrastructure for your Nextcloud instance.**\n\nThis app provides all the necessary server-side APIs and infrastructure to enable End-to-End encryption (E2EE) for your users.\nIt ensures that encrypted data remains secure throughout its lifecycle on your server.\n\n**Technical highlights:**\n- πŸ” **Complete API suite**: Provides all client-side APIs needed for E2EE implementation\n- πŸ”’ **Secure FileDrop integration**: Enables secure file sharing with encryption\n- πŸ›‘οΈ **Zero-knowledge architecture**: Server never has access to encryption keys\n- βš™οΈ **Group restrictions**: Limit app usage to specific user groups if needed\n- πŸ”„ **Background job management**: Automatic rollback handling for failed operations\n\n### Setup\nThis application provides the server-side infrastructure for end-to-end encryption, but it requires client support to function.\nTo enable end-to-end encryption, users will need to install the corresponding client-side app on their devices (desktop, Android, iOS) or use the web client.\n\nUsing the web interface, after enabling it in the personal settings, allows you to encrypt files and folders directly in the browser,\nproviding a seamless experience without needing additional software. But also requires some kind of trust in the server as the code is delivered by the server and could be manipulated.\n\nOnce enable through clients or the web interface, you can create encrypted folders and upload or move files into them.\nThe clients and the web interface will handle the encryption and decryption processes automatically.\n\n⚠️ This comes with some limitations and caveats, as only normal file operations can be handled.\nMeaning that some apps in the web interface do not work with encrypted files.", "homepage": "https://github.com/nextcloud/end_to_end_encryption", "licenses": [ "agpl" @@ -200,9 +200,9 @@ ] }, "mail": { - "hash": "sha256-+Lulu5ZJcQnhp1hcT94UxbaYHmwqrOwx7Z0Kz6Mrc8s=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.6.10/mail-v5.6.10.tar.gz", - "version": "5.6.10", + "hash": "sha256-7d95EVvFsfv66clvBjBhS0/O0b/nWyRopx/CL9XkqDg=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.6.12/mail-v5.6.12.tar.gz", + "version": "5.6.12", "description": "**πŸ’Œ A mail app for Nextcloud**\n\n- **πŸš€ Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **πŸ“₯ Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **πŸ”’ Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **πŸ™ˆ We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **πŸ“¬ Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟒/🟑/🟠/πŸ”΄\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -300,10 +300,10 @@ ] }, "previewgenerator": { - "hash": "sha256-ZZl3Zt1lOmEWgX0zSegXKGiAyF9Uz0ZE3GXfX7Ex41I=", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.11.0/previewgenerator-v5.11.0.tar.gz", - "version": "5.11.0", - "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", + "hash": "sha256-KZP/MK4JbqbTKAL5VllC8tcPB9HD/suLB0MxqpdUvq8=", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.12.1/previewgenerator-v5.12.1.tar.gz", + "version": "5.12.1", + "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**occ preview:generate-all -vvv**\n\nThe preview queue will be processed automatically by a background job if the system cron background job mode is configured in Nextcloud. Additionally, you may run **occ preview:pre-generate -vvv** to a process the queue of pending previews immediately.", "homepage": "https://github.com/nextcloud/previewgenerator", "licenses": [ "agpl" @@ -340,9 +340,9 @@ ] }, "repod": { - "hash": "sha256-fjGlFyZJAuD6nd8NaVFLu8c7p0U3rzQBowetCQ7jknk=", - "url": "https://git.crystalyx.net/Xefir/repod/releases/download/3.9.0/repod.tar.gz", - "version": "3.9.0", + "hash": "sha256-FFTRr6RH2t5Z/pV4+Sh621SSIzwzxlvRJWxP+DRgXRo=", + "url": "https://git.crystalyx.net/Xefir/repod/releases/download/4.0.0/repod.tar.gz", + "version": "4.0.0", "description": "## Features\n- πŸ” Browse and subscribe huge collection of podcasts\n- πŸ”Š Listen to episodes directly in Nextcloud\n- 🌐 Sync your activity with [AntennaPod](https://antennapod.org/) and [other apps](https://git.crystalyx.net/Xefir/repod#clients-supporting-sync-of-gpoddersync)\n- πŸ“± Mobile friendly interface\n- πŸ“‘ Import and export your subscriptions\n- ➑️ Full features comparison [here](https://git.crystalyx.net/Xefir/repod#comparaison-with-similar-apps-for-nextcloud)\n\n## Requirements\nYou need to have [GPodderSync](https://apps.nextcloud.com/apps/gpoddersync) installed to use this app!", "homepage": "https://git.crystalyx.net/Xefir/repod", "licenses": [ @@ -360,9 +360,9 @@ ] }, "sociallogin": { - "hash": "sha256-1wyQlxuyYFbAB9KLq2VSWZ/8zbdGmzq7UlkAYuZUgJc=", - "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.3.0/release.tar.gz", - "version": "6.3.0", + "hash": "sha256-BBl1zvZvggoznheW/p7re3/8dUYyybOhCYVLNLnAA64=", + "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.3.1/release.tar.gz", + "version": "6.3.1", "description": "# Social Login\n\nMake it possible to create users and log in via Telegram, OAuth, or OpenID.\n\nFor OAuth, you must create an app with certain providers. Login buttons will appear on the login page if an app ID is specified. Settings are located in the \"Social login\" section of the settings page.\n\n## Installation\n\nLog in to your Nextcloud installation as an administrator. Under \"Apps\", click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n## Custom OAuth2/OIDC Groups\n\nYou can use groups from your custom provider. For this, specify the \"Groups claim\" in the custom OAuth2/OIDC provider settings. This claim should be returned from the provider in the `id_token` or at the user info endpoint. The format should be an `array` or a comma-separated string. E.g., (with a claim named `roles`):\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nNested claims are also supported. For example, `resource_access.client-id.roles` for:\n\n```json\n\"resource_access\": {\n \"client-id\": {\n \"roles\": [\n \"client-role-1\",\n \"client-role-2\"\n ]\n }\n}\n```\n\n**DisplayName** support is also available:\n```json\n{\"roles\": [{\"gid\": 1, \"displayName\": \"admin\"}, {\"gid\": 2, \"displayName\": \"user\"}]}\n```\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing Nextcloud groups.\n2. Create provider groups in Nextcloud and associate them with users (if the appropriate option is enabled).\n\nTo sync groups on every login, ensure the \"Update user profile every login\" setting is checked.\n\n## Examples for Groups\n\n* Configure WSO2IS to return a roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff).\n* [GitLab OIDC configuration to allow specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md).\n\n## Built-in OAuth Providers\n\nCopy the link from a specific login button to get the correct \"redirect URL\" for OAuth app settings.\n\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Apple](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/apple.md)\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n* [Discord](#configure-discord)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [GitHub](https://github.com/settings/developers)\n* [GitLab](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Keycloak](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/keycloak.md)\n* [Mail.ru](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/mailru.md)\n* **PlexTv**: Use any title as the app ID.\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n\nFor details about Google's \"Allow login only from specified domain\" setting, see [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44). Use a comma-separated list for multiple domains.\n\n## Configuration\n\nAdd `'social_login_auto_redirect' => true` to `config.php` to automatically redirect unauthorized users to social login if only one provider is configured. To temporarily disable this (e.g., for local admin login), add `noredir=1` to the login URL: `https://cloud.domain.com/login?noredir=1`.\n\nConfigure HTTP client options using:\n```php\n 'social_login_http_client' => [\n 'timeout' => 45,\n 'proxy' => 'socks4://127.0.0.1:9050', // See for allowed formats\n ],\n```\nin `config.php`.\n\n### Configure a Provider via CLI\n\nUse the `occ` utility to configure providers via the command line. Replace variables and URLs with your deployment values:\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nFor Docker, prepend `docker exec -t -uwww-data CONTAINER_NAME` to the command or run interactively via `docker exec -it -uwww-data CONTAINER_NAME sh`.\n\nTo inspect configurations:\n```sql\nmysql -u nextcloud -p nextcloud\nPassword: \n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\nOr run:\n```bash\ndocker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers\n```\n\n### Configure Discord\n\n1. Create a Discord application at [Discord Developer Portal](https://discord.com/developers/applications).\n2. Navigate to `Settings > OAuth2 > General`. Add a redirect URL: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy the `CLIENT ID` and generate a `CLIENT SECRET`.\n4. In Nextcloud, go to `Settings > Social Login`. Paste the `CLIENT ID` into \"App id\" and `CLIENT SECRET` into \"Secret\".\n5. Select a default group for new users.\n6. For group mapping, see [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395).\n\n## Hint\n\n### Callback (Reply) URL\nCopy the link from a login button on the Nextcloud login page and use it as the callback URL on your provider's site. To make the button visible temporarily, fill provider settings with placeholder data and update later.\n\nIf you encounter callback URL errors despite correct settings, ensure your Nextcloud server generates HTTPS URLs by adding `'overwriteprotocol' => 'https'` to `config.php`.", "homepage": "https://github.com/zorn-v/nextcloud-social-login", "licenses": [ @@ -370,9 +370,9 @@ ] }, "spreed": { - "hash": "sha256-MrzQQB+GCVhLIWpLgxb6fMx+ZfAJJNFX1ssraZrImeg=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v21.1.8/spreed-v21.1.8.tar.gz", - "version": "21.1.8", + "hash": "sha256-BpRdTq9MYZwcTC8gTNuynVm1lLh58Jbj/L530paUYYQ=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v21.1.9/spreed-v21.1.9.tar.gz", + "version": "21.1.9", "description": "Chat, video & audio-conferencing using WebRTC\n\n* πŸ’¬ **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* πŸ‘₯ **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* πŸ’» **Screen sharing!** Share your screen with the participants of your call.\n* πŸš€ **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* πŸŒ‰ **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -380,9 +380,9 @@ ] }, "tables": { - "hash": "sha256-ejjmOawjeAFPOrl9myorm9ZLaNVS7obx6ojWi/qy8BI=", - "url": "https://github.com/nextcloud-releases/tables/releases/download/v1.0.3/tables-v1.0.3.tar.gz", - "version": "1.0.3", + "hash": "sha256-VjTNJ79LNZ5oBff2mAILiYnGB843V2LgN+Wxb0yG1XU=", + "url": "https://github.com/nextcloud-releases/tables/releases/download/v1.0.4/tables-v1.0.4.tar.gz", + "version": "1.0.4", "description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n- Users, groups and teams\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.", "homepage": "https://github.com/nextcloud/tables", "licenses": [ @@ -480,9 +480,9 @@ ] }, "whiteboard": { - "hash": "sha256-8NlFJF3DBCH7fBqNJiv37/xQw2IiYogE6ZYbp4WiLuQ=", - "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.5.5/whiteboard-v1.5.5.tar.gz", - "version": "1.5.5", + "hash": "sha256-thJL8fZCh7pIOt+GZT5TNVlVshyaxkPufIcHUdiVeRY=", + "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.5.6/whiteboard-v1.5.6.tar.gz", + "version": "1.5.6", "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- πŸ“ Real-time collaboration\n- πŸ–ΌοΈ Add images with drag and drop\n- πŸ“Š Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- πŸ“¦ Image export\n- πŸ’ͺ Strong foundation: We use Excalidraw as our base library", "homepage": "https://github.com/nextcloud/whiteboard", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/32.json b/pkgs/servers/nextcloud/packages/32.json index ddf5fa10aad4..6d381b23637e 100644 --- a/pkgs/servers/nextcloud/packages/32.json +++ b/pkgs/servers/nextcloud/packages/32.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "hash": "sha256-OPPJTfYjrvcqFCeQBCSyXRlamlf9gPGG5Mnq71TOIck=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v6.1.6/calendar-v6.1.6.tar.gz", - "version": "6.1.6", + "hash": "sha256-bj84s8bIDZp1/Buz2/5UPPMoM4FX5O3POr7NSX0aLsI=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v6.2.0/calendar-v6.2.0.tar.gz", + "version": "6.2.0", "description": "A Calendar app for Nextcloud. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* πŸš€ **Integration with other Nextcloud apps!** Like Contacts, Talk, Tasks, Deck and Circles\n* 🌐 **WebCal Support!** Want to see your favorite team's matchdays in your calendar? No problem!\n* πŸ™‹ **Attendees!** Invite people to your events\n* ⌚ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* πŸ” **Search!** Find your events at ease\n* β˜‘οΈ **Tasks!** See tasks or Deck cards with a due date directly in the calendar\n* πŸ”ˆ **Talk rooms!** Create an associated Talk room when booking a meeting with just one click\n* πŸ“† **Appointment booking** Send people a link so they can book an appointment with you [using this app](https://apps.nextcloud.com/apps/appointments)\n* πŸ“Ž **Attachments!** Add, upload and view event attachments\n* πŸ™ˆ **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "collectives": { - "hash": "sha256-DFyyXpUxqC9wI0SUTTkBtur6JfzFlACPrMjIoeQ0wlU=", - "url": "https://github.com/nextcloud/collectives/releases/download/v3.5.0/collectives-3.5.0.tar.gz", - "version": "3.5.0", + "hash": "sha256-E40twWESLa11AuIfTjpqE2RF3WT9cZB4PgSyJDJFmeQ=", + "url": "https://github.com/nextcloud/collectives/releases/download/v3.6.1/collectives-3.6.1.tar.gz", + "version": "3.6.1", "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* πŸ‘₯ **Collective and non-hierarchical workflow by heart**: Collectives are\n tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n owned by the collective.\n* πŸ“ **Collaborative page editing** like known from Etherpad thanks to the\n [Text app](https://github.com/nextcloud/text).\n* πŸ”€ **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **Β»AppsΒ«**, find the\n**Β»TeamsΒ«** and **Β»CollectivesΒ«** apps and enable them.", "homepage": "https://github.com/nextcloud/collectives", "licenses": [ @@ -30,9 +30,9 @@ ] }, "contacts": { - "hash": "sha256-hzeEPYIT1A60ucrehlk3PwpxzCRBdUDnH2OvG214WtY=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.3.1/contacts-v8.3.1.tar.gz", - "version": "8.3.1", + "hash": "sha256-08JNQ2K6EC4AWoodOD5moAKWTQrKTWS9cHEQoLh1mvU=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.3.2/contacts-v8.3.2.tar.gz", + "version": "8.3.2", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* πŸš€ **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* πŸŽ‰ **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* πŸ‘₯ **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* πŸ™ˆ **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -83,7 +83,7 @@ "hash": "sha256-eYn9IexP1pZsHKR5DnZ81bTFMta1FNB67fVfvejEtik=", "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v1.18.1/end_to_end_encryption-v1.18.1.tar.gz", "version": "1.18.1", - "description": "This app provides all the necessary APIs to implement End-to-End encryption on the client side.\nAdditionally it implements Secure FileDrop and makes sure that End-to-End encrypted files are neither accessible via the web interface nor other WebDAV clients.", + "description": "## **End-to-End Encryption**\n\n### For End Users\n\n**Protect your most sensitive files with strong encryption.**\n\nThe End-to-End Encryption app gives you complete control over your data privacy.\nWith this app, you can encrypt specific folders so that only you (and those you trust) can access their contents.\nYour files are encrypted on your device before they reach the server, ensuring that no oneβ€”not even the server administratorβ€”can read them.\n\n**Benefits:**\n- πŸ”’ **True privacy**: Files are encrypted on your device and can only be decrypted by you\n- πŸ“± **Works across all platforms**: Fully supported on desktop, Android, iOS clients, and as you wish even in the browser\n- 🎯 **Selective encryption**: Choose which folders to encrypt\n- πŸ›‘οΈ **Secure sharing**: Share encrypted files with other users or even secure public upload using the encrypted file drop\n\n---\n\n### For Administrators\n\n**Enterprise-ready end-to-end encryption infrastructure for your Nextcloud instance.**\n\nThis app provides all the necessary server-side APIs and infrastructure to enable End-to-End encryption (E2EE) for your users.\nIt ensures that encrypted data remains secure throughout its lifecycle on your server.\n\n**Technical highlights:**\n- πŸ” **Complete API suite**: Provides all client-side APIs needed for E2EE implementation\n- πŸ”’ **Secure FileDrop integration**: Enables secure file sharing with encryption\n- πŸ›‘οΈ **Zero-knowledge architecture**: Server never has access to encryption keys\n- βš™οΈ **Group restrictions**: Limit app usage to specific user groups if needed\n- πŸ”„ **Background job management**: Automatic rollback handling for failed operations\n\n### Setup\nThis application provides the server-side infrastructure for end-to-end encryption, but it requires client support to function.\nTo enable end-to-end encryption, users will need to install the corresponding client-side app on their devices (desktop, Android, iOS) or use the web client.\n\nUsing the web interface, after enabling it in the personal settings, allows you to encrypt files and folders directly in the browser,\nproviding a seamless experience without needing additional software. But also requires some kind of trust in the server as the code is delivered by the server and could be manipulated.\n\nOnce enable through clients or the web interface, you can create encrypted folders and upload or move files into them.\nThe clients and the web interface will handle the encryption and decryption processes automatically.\n\n⚠️ This comes with some limitations and caveats, as only normal file operations can be handled.\nMeaning that some apps in the web interface do not work with encrypted files.", "homepage": "https://github.com/nextcloud/end_to_end_encryption", "licenses": [ "agpl" @@ -180,9 +180,9 @@ ] }, "mail": { - "hash": "sha256-+Lulu5ZJcQnhp1hcT94UxbaYHmwqrOwx7Z0Kz6Mrc8s=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.6.10/mail-v5.6.10.tar.gz", - "version": "5.6.10", + "hash": "sha256-7d95EVvFsfv66clvBjBhS0/O0b/nWyRopx/CL9XkqDg=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.6.12/mail-v5.6.12.tar.gz", + "version": "5.6.12", "description": "**πŸ’Œ A mail app for Nextcloud**\n\n- **πŸš€ Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **πŸ“₯ Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **πŸ”’ Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **πŸ™ˆ We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **πŸ“¬ Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟒/🟑/🟠/πŸ”΄\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -270,10 +270,10 @@ ] }, "previewgenerator": { - "hash": "sha256-ZZl3Zt1lOmEWgX0zSegXKGiAyF9Uz0ZE3GXfX7Ex41I=", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.11.0/previewgenerator-v5.11.0.tar.gz", - "version": "5.11.0", - "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", + "hash": "sha256-KZP/MK4JbqbTKAL5VllC8tcPB9HD/suLB0MxqpdUvq8=", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.12.1/previewgenerator-v5.12.1.tar.gz", + "version": "5.12.1", + "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**occ preview:generate-all -vvv**\n\nThe preview queue will be processed automatically by a background job if the system cron background job mode is configured in Nextcloud. Additionally, you may run **occ preview:pre-generate -vvv** to a process the queue of pending previews immediately.", "homepage": "https://github.com/nextcloud/previewgenerator", "licenses": [ "agpl" @@ -310,9 +310,9 @@ ] }, "repod": { - "hash": "sha256-fjGlFyZJAuD6nd8NaVFLu8c7p0U3rzQBowetCQ7jknk=", - "url": "https://git.crystalyx.net/Xefir/repod/releases/download/3.9.0/repod.tar.gz", - "version": "3.9.0", + "hash": "sha256-FFTRr6RH2t5Z/pV4+Sh621SSIzwzxlvRJWxP+DRgXRo=", + "url": "https://git.crystalyx.net/Xefir/repod/releases/download/4.0.0/repod.tar.gz", + "version": "4.0.0", "description": "## Features\n- πŸ” Browse and subscribe huge collection of podcasts\n- πŸ”Š Listen to episodes directly in Nextcloud\n- 🌐 Sync your activity with [AntennaPod](https://antennapod.org/) and [other apps](https://git.crystalyx.net/Xefir/repod#clients-supporting-sync-of-gpoddersync)\n- πŸ“± Mobile friendly interface\n- πŸ“‘ Import and export your subscriptions\n- ➑️ Full features comparison [here](https://git.crystalyx.net/Xefir/repod#comparaison-with-similar-apps-for-nextcloud)\n\n## Requirements\nYou need to have [GPodderSync](https://apps.nextcloud.com/apps/gpoddersync) installed to use this app!", "homepage": "https://git.crystalyx.net/Xefir/repod", "licenses": [ @@ -330,9 +330,9 @@ ] }, "sociallogin": { - "hash": "sha256-1wyQlxuyYFbAB9KLq2VSWZ/8zbdGmzq7UlkAYuZUgJc=", - "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.3.0/release.tar.gz", - "version": "6.3.0", + "hash": "sha256-BBl1zvZvggoznheW/p7re3/8dUYyybOhCYVLNLnAA64=", + "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.3.1/release.tar.gz", + "version": "6.3.1", "description": "# Social Login\n\nMake it possible to create users and log in via Telegram, OAuth, or OpenID.\n\nFor OAuth, you must create an app with certain providers. Login buttons will appear on the login page if an app ID is specified. Settings are located in the \"Social login\" section of the settings page.\n\n## Installation\n\nLog in to your Nextcloud installation as an administrator. Under \"Apps\", click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n## Custom OAuth2/OIDC Groups\n\nYou can use groups from your custom provider. For this, specify the \"Groups claim\" in the custom OAuth2/OIDC provider settings. This claim should be returned from the provider in the `id_token` or at the user info endpoint. The format should be an `array` or a comma-separated string. E.g., (with a claim named `roles`):\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nNested claims are also supported. For example, `resource_access.client-id.roles` for:\n\n```json\n\"resource_access\": {\n \"client-id\": {\n \"roles\": [\n \"client-role-1\",\n \"client-role-2\"\n ]\n }\n}\n```\n\n**DisplayName** support is also available:\n```json\n{\"roles\": [{\"gid\": 1, \"displayName\": \"admin\"}, {\"gid\": 2, \"displayName\": \"user\"}]}\n```\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing Nextcloud groups.\n2. Create provider groups in Nextcloud and associate them with users (if the appropriate option is enabled).\n\nTo sync groups on every login, ensure the \"Update user profile every login\" setting is checked.\n\n## Examples for Groups\n\n* Configure WSO2IS to return a roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff).\n* [GitLab OIDC configuration to allow specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md).\n\n## Built-in OAuth Providers\n\nCopy the link from a specific login button to get the correct \"redirect URL\" for OAuth app settings.\n\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Apple](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/apple.md)\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n* [Discord](#configure-discord)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [GitHub](https://github.com/settings/developers)\n* [GitLab](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Keycloak](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/keycloak.md)\n* [Mail.ru](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/mailru.md)\n* **PlexTv**: Use any title as the app ID.\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n\nFor details about Google's \"Allow login only from specified domain\" setting, see [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44). Use a comma-separated list for multiple domains.\n\n## Configuration\n\nAdd `'social_login_auto_redirect' => true` to `config.php` to automatically redirect unauthorized users to social login if only one provider is configured. To temporarily disable this (e.g., for local admin login), add `noredir=1` to the login URL: `https://cloud.domain.com/login?noredir=1`.\n\nConfigure HTTP client options using:\n```php\n 'social_login_http_client' => [\n 'timeout' => 45,\n 'proxy' => 'socks4://127.0.0.1:9050', // See for allowed formats\n ],\n```\nin `config.php`.\n\n### Configure a Provider via CLI\n\nUse the `occ` utility to configure providers via the command line. Replace variables and URLs with your deployment values:\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nFor Docker, prepend `docker exec -t -uwww-data CONTAINER_NAME` to the command or run interactively via `docker exec -it -uwww-data CONTAINER_NAME sh`.\n\nTo inspect configurations:\n```sql\nmysql -u nextcloud -p nextcloud\nPassword: \n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\nOr run:\n```bash\ndocker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers\n```\n\n### Configure Discord\n\n1. Create a Discord application at [Discord Developer Portal](https://discord.com/developers/applications).\n2. Navigate to `Settings > OAuth2 > General`. Add a redirect URL: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy the `CLIENT ID` and generate a `CLIENT SECRET`.\n4. In Nextcloud, go to `Settings > Social Login`. Paste the `CLIENT ID` into \"App id\" and `CLIENT SECRET` into \"Secret\".\n5. Select a default group for new users.\n6. For group mapping, see [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395).\n\n## Hint\n\n### Callback (Reply) URL\nCopy the link from a login button on the Nextcloud login page and use it as the callback URL on your provider's site. To make the button visible temporarily, fill provider settings with placeholder data and update later.\n\nIf you encounter callback URL errors despite correct settings, ensure your Nextcloud server generates HTTPS URLs by adding `'overwriteprotocol' => 'https'` to `config.php`.", "homepage": "https://github.com/zorn-v/nextcloud-social-login", "licenses": [ @@ -340,9 +340,9 @@ ] }, "spreed": { - "hash": "sha256-FR2T4cFhRa9Yef6sIkQEZ7XiVQhpQeW6hqYXtnid/mM=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v22.0.8/spreed-v22.0.8.tar.gz", - "version": "22.0.8", + "hash": "sha256-BEBjYaYuv3W9/agAO5ZF8T6MvDNt7qH0H+mWhfHPihA=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v22.0.9/spreed-v22.0.9.tar.gz", + "version": "22.0.9", "description": "Chat, video & audio-conferencing using WebRTC\n\n* πŸ’¬ **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* πŸ‘₯ **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* πŸ’» **Screen sharing!** Share your screen with the participants of your call.\n* πŸš€ **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* πŸŒ‰ **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -350,9 +350,9 @@ ] }, "tables": { - "hash": "sha256-ejjmOawjeAFPOrl9myorm9ZLaNVS7obx6ojWi/qy8BI=", - "url": "https://github.com/nextcloud-releases/tables/releases/download/v1.0.3/tables-v1.0.3.tar.gz", - "version": "1.0.3", + "hash": "sha256-VjTNJ79LNZ5oBff2mAILiYnGB843V2LgN+Wxb0yG1XU=", + "url": "https://github.com/nextcloud-releases/tables/releases/download/v1.0.4/tables-v1.0.4.tar.gz", + "version": "1.0.4", "description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n- Users, groups and teams\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.", "homepage": "https://github.com/nextcloud/tables", "licenses": [ @@ -440,9 +440,9 @@ ] }, "whiteboard": { - "hash": "sha256-8NlFJF3DBCH7fBqNJiv37/xQw2IiYogE6ZYbp4WiLuQ=", - "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.5.5/whiteboard-v1.5.5.tar.gz", - "version": "1.5.5", + "hash": "sha256-thJL8fZCh7pIOt+GZT5TNVlVshyaxkPufIcHUdiVeRY=", + "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.5.6/whiteboard-v1.5.6.tar.gz", + "version": "1.5.6", "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- πŸ“ Real-time collaboration\n- πŸ–ΌοΈ Add images with drag and drop\n- πŸ“Š Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- πŸ“¦ Image export\n- πŸ’ͺ Strong foundation: We use Excalidraw as our base library", "homepage": "https://github.com/nextcloud/whiteboard", "licenses": [ diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 6b1158e06aa0..e7dacf2fdfb7 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -555,65 +555,65 @@ let (withBlocksize == null && withWalBlocksize == null); installCheckTarget = "check-world"; - passthru = - let - this = self.callPackage generic args; - in - { - inherit dlSuffix; + passthru = { + inherit dlSuffix; - psqlSchema = lib.versions.major version; + psqlSchema = lib.versions.major version; - withJIT = if jitSupport then this.withPackages (_: [ this.jit ]) else null; - withoutJIT = this; + withJIT = + if jitSupport then + finalAttrs.finalPackage.withPackages (_: [ finalAttrs.finalPackage.jit ]) + else + null; + withoutJIT = finalAttrs.finalPackage; - pkgs = - let - scope = { - inherit - jitSupport - pythonSupport - perlSupport - tclSupport - ; - inherit (llvmPackages) llvm; - postgresql = this; - stdenv = stdenv'; - postgresqlTestExtension = newSuper.callPackage ./postgresqlTestExtension.nix { }; - postgresqlBuildExtension = newSuper.callPackage ./postgresqlBuildExtension.nix { }; - }; - newSelf = self // scope; - newSuper = { - callPackage = newScope (scope // this.pkgs); - }; - in - import ./ext.nix newSelf newSuper; - - withPackages = postgresqlWithPackages { - inherit buildEnv lib makeBinaryWrapper; - postgresql = this; - }; - - pg_config = buildPackages.callPackage ./pg_config.nix { - inherit (finalAttrs) finalPackage; - outputs = { - out = lib.getOutput "out" finalAttrs.finalPackage; - man = lib.getOutput "man" finalAttrs.finalPackage; + pkgs = + let + scope = { + inherit + jitSupport + pythonSupport + perlSupport + tclSupport + ; + inherit (llvmPackages) llvm; + postgresql = finalAttrs.finalPackage; + stdenv = stdenv'; + postgresqlTestExtension = newSuper.callPackage ./postgresqlTestExtension.nix { }; + postgresqlBuildExtension = newSuper.callPackage ./postgresqlBuildExtension.nix { }; }; - }; + newSelf = self // scope; + newSuper = { + callPackage = newScope (scope // finalAttrs.finalPackage.pkgs); + }; + in + import ./ext.nix newSelf newSuper; - tests = { - postgresql = nixosTests.postgresql.postgresql.passthru.override finalAttrs.finalPackage; - postgresql-replication = nixosTests.postgresql.postgresql-replication.passthru.override finalAttrs.finalPackage; - postgresql-tls-client-cert = nixosTests.postgresql.postgresql-tls-client-cert.passthru.override finalAttrs.finalPackage; - postgresql-wal-receiver = nixosTests.postgresql.postgresql-wal-receiver.passthru.override finalAttrs.finalPackage; - pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - } - // lib.optionalAttrs jitSupport { - postgresql-jit = nixosTests.postgresql.postgresql-jit.passthru.override finalAttrs.finalPackage; + withPackages = postgresqlWithPackages { + inherit buildEnv lib makeBinaryWrapper; + postgresql = finalAttrs.finalPackage; + }; + + pg_config = buildPackages.callPackage ./pg_config.nix { + inherit (finalAttrs) finalPackage; + outputs = { + out = lib.getOutput "out" finalAttrs.finalPackage; + man = lib.getOutput "man" finalAttrs.finalPackage; }; }; + tests = { + postgresql = nixosTests.postgresql.postgresql.passthru.override finalAttrs.finalPackage; + postgresql-replication = nixosTests.postgresql.postgresql-replication.passthru.override finalAttrs.finalPackage; + postgresql-tls-client-cert = nixosTests.postgresql.postgresql-tls-client-cert.passthru.override finalAttrs.finalPackage; + postgresql-wal-receiver = nixosTests.postgresql.postgresql-wal-receiver.passthru.override finalAttrs.finalPackage; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + } + // lib.optionalAttrs jitSupport { + postgresql-jit = nixosTests.postgresql.postgresql-jit.passthru.override finalAttrs.finalPackage; + }; + }; + meta = { homepage = "https://www.postgresql.org"; description = "Powerful, open source object-relational database system"; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 2145b5640177..0a512f703b49 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -15,6 +15,7 @@ let elemAt extendDerivation filter + filterAttrs getDev head imap1 @@ -709,8 +710,12 @@ let ]; } // ( + let + attrsOutputChecks = makeOutputChecks attrs; + attrsOutputChecksFiltered = filterAttrs (_: v: v != null) attrsOutputChecks; + in if !__structuredAttrs then - makeOutputChecks attrs + attrsOutputChecks else { outputChecks = builtins.listToAttrs ( @@ -719,7 +724,7 @@ let value = let raw = zipAttrsWith (_: builtins.concatLists) [ - (makeOutputChecks attrs) + attrsOutputChecksFiltered (makeOutputChecks attrs.outputChecks.${name} or { }) ]; in diff --git a/pkgs/test/overriding.nix b/pkgs/test/overriding.nix index 9d2d0612d23a..e207e8280545 100644 --- a/pkgs/test/overriding.nix +++ b/pkgs/test/overriding.nix @@ -68,6 +68,16 @@ let }).pname; expected = "hello-no-final-attrs-overridden"; }; + structuredAttrs-allowedRequisites-nullability = { + expr = + lib.hasPrefix builtins.storeDir + (pkgs.stdenv.mkDerivation { + __structuredAttrs = true; + inherit (pkgs.hello) pname version src; + allowedRequisites = null; + }).drvPath; + expected = true; + }; }; test-extendMkDerivation = diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index f620fdfcc18b..a2f914593e4e 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -20,7 +20,7 @@ let pkg_path = "$out/lib/ghidra"; pname = "ghidra"; - version = "12.0"; + version = "12.0.2"; isMacArm64 = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; @@ -30,7 +30,7 @@ let owner = "NationalSecurityAgency"; repo = "Ghidra"; rev = "Ghidra_${version}_build"; - hash = "sha256-eDYbvD3Ln7twGCOBQsP8UfWAjyJUO/ofr/oitaEtCu4="; + hash = "sha256-sJINXAV43oKFOqEiVSfNcJXooLlju0GsogZ5bQoXewc="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index 03e7931b800e..da616e1ded35 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation rec { pname = "ghidra"; - version = "12.0"; - versiondate = "20251205"; + version = "12.0.2"; + versiondate = "20260129"; src = fetchzip { url = "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_${version}_build/ghidra_${version}_PUBLIC_${versiondate}.zip"; - hash = "sha256-uNFI24UIFfoHjX/xTlr0tuVvesTuf4WkTC9NtVb8UlI="; + hash = "sha256-E2edj1psLK1hrKCDcjQbQZaYls8iq5ZG3vdwSUUJts8="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/ghidra/deps.json b/pkgs/tools/security/ghidra/deps.json index f0f5057041e0..0521d981ebb6 100644 --- a/pkgs/tools/security/ghidra/deps.json +++ b/pkgs/tools/security/ghidra/deps.json @@ -10,6 +10,9 @@ "05/71/590b2a91b43763aa27eac2c63803542a2878a4d8c600b81aa694d3fde919/jpype1-1.5.2-cp39-cp39-macosx_10_9_x86_64": { "whl": "sha256-i3XTPpOjvGVD3fl8JO4K21qGpp+2fw5PT6HIw5cLv5g=" }, + "0b/2c/87f3254fd8ffd29e4c02732eee68a83a1d3c346ae39bc6822dcbcb697f2b/wheel-0.45.1-py3-none-any": { + "whl": "sha256-cI50gcyAF5rw5Va78MwAuERMcyHicAuNhYAjHRMBckg=" + }, "0b/7d/9fdbbc1a574be43f9820735ca8df0caf8b159856201d9b21fd73932342bc/jpype1-1.5.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64": { "whl": "sha256-uQDhVIJqB2EY0HQWZZbx2BfhE+BwhL8MnEPYBkqGq3c=" }, @@ -19,15 +22,15 @@ "0e/b9/4dfb38a7f4efb21f71df7344944a8d9a23e30d0503574e455af6ce4f1a56/jpype1-1.5.2-cp311-cp311-win_amd64": { "whl": "sha256-Cg0Y1DhLPfLlUoJUVzffzxjGBFBPE4KtFPiAvvlg8mU=" }, + "20/12/38679034af332785aac8774540895e234f4d07f7545804097de4b666afd8/packaging-25.0-py3-none-any": { + "whl": "sha256-KVcu8rHxdYEEazoiJ9XGEfsl7HDKG6hVSySw5pMxpIQ=" + }, "20/a3/00a265d424f7d47e0dc547df2320225ce0143fec671faf710def41404b8c/jpype1-1.5.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64": { "whl": "sha256-wISAx9GBJWZKEr8KJEuWtJwFEFMGtlk32+/rBatLKEc=" }, "22/18/0a51845ca890ffdc72f4d71a0c2be334b887c5bb6812207efe5ad45afcb3/jpype1-1.5.2-cp310-cp310-win_amd64": { "whl": "sha256-kksKDPk9Pd2z95KG++QPjJAceO1hIW7b4QhmYjTfQ+A=" }, - "27/d6/003e593296a85fd6ed616ed962795b2f87709c3eee2bca4f6d0fe55c6d00/wheel-0.37.1-py2.py3-none-any": { - "whl": "sha256-S9zX2EATgIYSbNCSVNxhlftPxvAcBQodcjbyYw2x0io=" - }, "35/a0/638186a75026a02286041e4a0449b1dff799a3914dc1c0716ef9b9367b73/jpype1-1.5.2-cp311-cp311-macosx_10_9_universal2": { "whl": "sha256-yfarjdKEwW4mF6aX1Uw9AwSwgCCjc4btlhA6EpORotk=" }, @@ -64,15 +67,15 @@ "97/0a/cbe03759331c640aa5862f974028122a862b08935a0b11b8fa6f6e46c26b/jpype1-1.5.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64": { "whl": "sha256-zcqTzHT42x9gTS6mrbdk3sTexoUo8e5oMI+j1SQJVzk=" }, + "a3/dc/17031897dae0efacfea57dfd3a82fdd2a2aeb58e0ff71b77b87e44edc772/setuptools-80.9.0-py3-none-any": { + "whl": "sha256-Bi00IirRPgzDEqTALXPwWehqSsv73qj492soyZ8waSI=" + }, "bd/68/47fa634cbd0418cbca86355e9421425f5892ee994f7338106327e49f9117/jpype1-1.5.2": { "tar.gz": "sha256-dKQuzPIdMDlMGDKuw5haFJZfpTINoIe2UCnRcsDOxDs=" }, "c0/c6/63538d160c17e837f62d29ba4163bc444cef08c29cd3f3b8090691c1869c/jpype1-1.5.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64": { "whl": "sha256-/PxcHUXWsQiADRcuqBe9pYXbfxZG1qmNFNqaymbg60Q=" }, - "c7/42/be1c7bbdd83e1bfb160c94b9cafd8e25efc7400346cf7ccdbdb452c467fa/setuptools-68.0.0-py3-none-any": { - "whl": "sha256-EeUsZ0FaOB0Q1rRiztnPuXBmF58OhxOZ4AbEqxAfyF8=" - }, "c7/f2/b2efcad1ea5a541f125218e4eb1529ebb8ca18941264c879f3e89a36dc35/jpype1-1.5.2-cp310-cp310-macosx_10_9_universal2": { "whl": "sha256-ey2pjBQoEspAoYpzWzPkfGURsD3r8el5Yw9M9HO2ioc=" }, @@ -88,9 +91,6 @@ "e5/cf/344e1f81f1e8c651ec23dfa9fe4b91f6e1d699b36f610a547ba85ee7fb16/jpype1-1.5.2-cp39-cp39-win_amd64": { "whl": "sha256-aOHRGCAPxG9OpL8gkACBWH7ATeSEA3yZewo7fF63H+M=" }, - "ec/1a/610693ac4ee14fcdf2d9bf3c493370e4f2ef7ae2e19217d7a237ff42367d/packaging-23.2-py3-none-any": { - "whl": "sha256-jEkRkAM6mvfh2THQtdrMLvR1CbNN0N5n7SCbUgP8iMc=" - }, "ee/01/1ed1d482960a5718fd99c82f6d79120181947cfd4667ec3944d448ed44a3/protobuf-6.31.0-py3-none-any": { "whl": "sha256-asLoJVboIsF6jSOqEZC7wdBu+5wmGYHalcccnaCeniM=" }, @@ -104,40 +104,40 @@ } }, "https://github.com": { - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0/Debugger/dbgmodel": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/Debugger/dbgmodel": { "tlb": "sha256-jPXzouuBFgqjSQVqXKTCxyaxtumL8wl81BNRRxYzQ8c=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0/FunctionID/vs2012_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2012_x64": { "fidb": "sha256-1OmKs/eQuDF5MhhDC7oNiySl+/TaZbDB/6jLDPvrDNw=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0/FunctionID/vs2012_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2012_x86": { "fidb": "sha256-pJDtfi7SHlh0Wf6urOcDa37eTOhOcuEN/YxXQ0ppGLY=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0/FunctionID/vs2015_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2015_x64": { "fidb": "sha256-4E6eQPnstgHIX02E7Zv2a0U2O+HR6CwWLkyZArjLUI8=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0/FunctionID/vs2015_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2015_x86": { "fidb": "sha256-tm7mlmU+LtNlkZ3qrviFEDEgx5LiLnmvcNEgnX4dhkQ=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0/FunctionID/vs2017_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2017_x64": { "fidb": "sha256-1fpfaXKYF0+lPSR9NZnmoSiEYFrRgce5VOI4DsHwvYk=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0/FunctionID/vs2017_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2017_x86": { "fidb": "sha256-04nLjXb/SlnKNfiRuFIccq1fDfluJTlzotIahhSkzIE=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0/FunctionID/vs2019_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2019_x64": { "fidb": "sha256-FQAHeW/DakBpZgrWJEmq2q890Rs4ZKXvIeeYMcnOkRg=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0/FunctionID/vs2019_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vs2019_x86": { "fidb": "sha256-62MKNvqlhqNx63NNwLvY0TzK72l/PbWHJZY1jz3SQyo=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0/FunctionID/vsOlder_x64": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vsOlder_x64": { "fidb": "sha256-jDtR9GYM0n4aDWEKnz8tX7yDOmasnuQ5PuLySB6FWGY=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0/FunctionID/vsOlder_x86": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/FunctionID/vsOlder_x86": { "fidb": "sha256-mGBca2uSFKlF2ETkHIWGDVRkmkW8p4c+9pkcDpNyB4c=" }, - "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0/lib/java-sarif-2.1-modified": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.2/lib/java-sarif-2.1-modified": { "jar": "sha256-f3NlZklHVtJxql5LGvbIncUNB0qxxjdKR9+CImQiawE=" }, "Z3Prover/z3/releases/download/z3-4.13.0/z3-4.13.0-arm64-osx-11.0": { @@ -154,6 +154,10 @@ } }, "https://repo.maven.apache.org/maven2": { + "biz/aQute/bnd#biz.aQute.bnd.annotation/7.1.0": { + "jar": "sha256-9pwt46aVwRPRJayAU8kqaAo86dAuolhFCVzy1GJqdmM=", + "pom": "sha256-WCLfSRg9+SK6Wa53Oi2Mzrhq4eIPQfGYcxMd0YJJT3o=" + }, "biz/aQute/bnd#biz.aQute.bnd.util/7.0.0": { "jar": "sha256-OVddFQJJliqcbUbM5+Zy53fIqGIKHS0iDH8sCnmediM=", "pom": "sha256-+dgDJLl2Hp3ipFoP6naPWZRH9AxuQZ8gje2MrxIYAMU=" @@ -166,6 +170,15 @@ "jar": "sha256-FWvnNhmcmQMh2f93CQsZlinPyYZeLWwT980pG7FkGBc=", "pom": "sha256-F84MMunPlTZ4+CCuXyrZLu85bYQPZn/JnyOtwK0l0yg=" }, + "com/fasterxml#oss-parent/68": { + "pom": "sha256-Jer9ltriQra1pxCPVbLBQBW4KNqlq+I0KJ/W53Shzlc=" + }, + "com/fasterxml/jackson#jackson-bom/2.19.1": { + "pom": "sha256-um1o7qs6HME6d6it4hl/+aMqoc/+rHKEfUm63YLhuc4=" + }, + "com/fasterxml/jackson#jackson-parent/2.19.2": { + "pom": "sha256-Y5orY90F2k44EIEwOYXKrfu3rZ+FsdIyBjj2sR8gg2U=" + }, "com/formdev#flatlaf/3.5.4": { "jar": "sha256-PDS2rrLxcKlUxDWGR+tDtotEeiw1H/MRBy9xV6XU4v4=", "module": "sha256-Rjx10DAKwDblv9OLBqPx8Ua/17YdoyYael79bebtqdU=", @@ -205,12 +218,19 @@ "jar": "sha256-0fPGaqkaxSVJ4Arjsgi6S5r31y1o8jBkNVO+s45hGKw=", "pom": "sha256-9ZiID+766p1nTcQdsTqzcAS/A3drW7IcBN7ejpIMHxI=" }, + "com/google/errorprone#error_prone_annotations/2.38.0": { + "jar": "sha256-ZmHVM1CQpfxh3YadIJW8bB4hVuOqR6bkq6vfZMmaeIk=", + "pom": "sha256-MAe++K/zro6hLYHD/qy08Vl5ss9cPjj8kYmpjeoUEWc=" + }, "com/google/errorprone#error_prone_parent/2.2.0": { "pom": "sha256-xGCQLd9ezmiDLGsnHOUqCSiwXPOmrIGo9UjHPL1UETg=" }, "com/google/errorprone#error_prone_parent/2.21.1": { "pom": "sha256-MrsLX/JB/Wuh/upEiuu5zt7xaZvnPLbzGTZTh7gr+Sw=" }, + "com/google/errorprone#error_prone_parent/2.38.0": { + "pom": "sha256-5iRYpqPmMIG8fFezwPrJ8E92zjL2BlMttp/is9R7k0w=" + }, "com/google/gradle#osdetector-gradle-plugin/1.7.0": { "jar": "sha256-29oheMFO1rk6GEsay/ONchBwAiUmaMERz0EeyjfkHKY=", "pom": "sha256-6BYywu6apI5+zwVHUSwcOGVgwNRqlY7lBVD3693xNRc=" @@ -316,14 +336,17 @@ "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" }, - "commons-io#commons-io/2.11.0": { - "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", - "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" - }, "commons-io#commons-io/2.19.0": { "jar": "sha256-gkJokZtLYvn0DwjFQ4HeWZOwePWGZ+My0XNIrgGdcrk=", "pom": "sha256-VCt6UC7WGVDRuDEStRsWF9NAfjpN9atWqY12Dg+MWVA=" }, + "commons-io#commons-io/2.21.0": { + "jar": "sha256-fWQ6Kv6osFi3YqpvuQ5bJW9scpc5+LN4TDNw3cYJ6I0=", + "pom": "sha256-rkd5XnIYA+yP8d7tdL4oqBGgJxO9WjqwrGfCtYy2Nas=" + }, + "commons-io#commons-io/2.8.0": { + "pom": "sha256-18hkGjfW5282+56B/BQg4moJ1j+jLwD3R2TeBnyoNH0=" + }, "commons-lang#commons-lang/2.6": { "jar": "sha256-UPEbCfh3wpTVbyRGP0fSj5Kc9QRPZIZhwPDPuumi9Jw=", "pom": "sha256-7Xa4iRwwtWYonHQ2Vvik1DWYaYJDjUDFZ8YmIzJH5xE=" @@ -361,10 +384,35 @@ "module": "sha256-0KGW3NUxqnpbEZCwyypcG6BhF137Ey2S3P5a0pCpF9s=", "pom": "sha256-YQbcNXGfyXyPjDoBP0w3Dn4genKLKQu8bdSwiaezL5s=" }, + "io/github/lisa-analyzer#lisa-analyses/0.1": { + "jar": "sha256-E+Iw7IikfZ/RT5JPCYuXg4h47w3b7zZgXGk8JzSrX7g=", + "module": "sha256-phcHsnJAzErfgAkTgaCDnDulxkRyI76z4WVol5L9tgQ=", + "pom": "sha256-8Kk4ysWUUIyGhMLh491zFDpno88OoqhwkBQ4eyS6qRE=" + }, + "io/github/lisa-analyzer#lisa-program/0.1": { + "jar": "sha256-XS2r33G+1tgUZrZfH5Et6DPF9sOrRlCk831Hh32DUKY=", + "module": "sha256-vwMTR6oc9lY9dEB9p2bgyePBYVTyHZ1mFv8fIySyKnk=", + "pom": "sha256-385hFoKY0jMZ0eBwQ6wGdTbZJmkCXDcit2WLr/wiBI4=" + }, + "io/github/lisa-analyzer#lisa-sdk/0.1": { + "jar": "sha256-7lvWkndEVIj4PPBQp46oih66WzzxRP2MrSM3doUuGsQ=", + "module": "sha256-GOP5TzstThn2smC6rK2YS2UvJFw25Ff7IkdDW6+DCqk=", + "pom": "sha256-4U/ASmxQu+zIk3RMF2nVv0v5u9mHwQP+5jQCLbCiSLE=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, "javax/help#javahelp/2.0.05": { "jar": "sha256-/PSSLTj/hRhPHSMoMXu2CCbhTalIq9YG7j1bjGpw3r0=", "pom": "sha256-uIEr4lGsoTl/S2pCO/Tt06KERONFOyIDtTSTNrmVgik=" }, + "joda-time#joda-time/2.14.0": { + "jar": "sha256-Hi2m+etl8gol2aMYaDHtKz+xT3pI4e+CBhNe5YyxQ9M=", + "pom": "sha256-YvxXQ2db0rn6tYOmQIC2UIVMKYIU084qocCzlL0IndE=" + }, "junit#junit/4.13.2": { "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" @@ -468,6 +516,9 @@ "org/apache#apache/33": { "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" }, + "org/apache#apache/35": { + "pom": "sha256-6il9zRFBNui46LYwIw1Sp2wvxp9sXbJdZysYVwAHKLg=" + }, "org/apache#apache/7": { "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" }, @@ -490,9 +541,9 @@ "org/apache/commons#commons-lang3/3.11": { "pom": "sha256-mA1mXYP+0EZlE08FeOUHRCoOdQaRBzeEORsKeYhySnU=" }, - "org/apache/commons#commons-lang3/3.17.0": { - "jar": "sha256-bucx31yOWil2ocoCO2uzIOqNNTn75kyKHVy3ZRJ8M7Q=", - "pom": "sha256-NRxuSUDpObHzMN9H9g8Tujg9uB7gCBga9UHzoqbSpWw=" + "org/apache/commons#commons-lang3/3.20.0": { + "jar": "sha256-aeXJ+jXaelGl/SCZ3+VqLY0yzyM+L213DnlhRkQCY/Q=", + "pom": "sha256-fKg7JwnB56ngO1ds1BQiGQN5SJqAhm5UL4yLlVQRoqo=" }, "org/apache/commons#commons-lang3/3.9": { "pom": "sha256-pAIkKbmEJbQwGBkVchJ5pS9hDzRki9rEh9TKy76N/rU=" @@ -527,15 +578,18 @@ "org/apache/commons#commons-parent/72": { "pom": "sha256-Q0Xev8dnsa6saKvdcvxn0YtSHUs5A3KhG2P/DFhrIyA=" }, - "org/apache/commons#commons-parent/73": { - "pom": "sha256-TtRFYLB/hEhHnf0eg6Qiuk6D5gs25RsocaxQKm1cG+o=" - }, "org/apache/commons#commons-parent/79": { "pom": "sha256-Yo3zAUis08SRz8trc8euS1mJ5VJqsTovQo3qXUrRDXo=" }, "org/apache/commons#commons-parent/81": { "pom": "sha256-NI1OfBMb5hFMhUpxnOekQwenw5vTZghJd7JP0prQ7bQ=" }, + "org/apache/commons#commons-parent/91": { + "pom": "sha256-0vi2/UgAtqrxIPWjgibV+dX8bbg3r5ni+bMwZ4aLmHI=" + }, + "org/apache/commons#commons-parent/92": { + "pom": "sha256-lPbAJ7FfZAKZXdGyx+o1v+HryItoMrMTQ2i0GZhyGVM=" + }, "org/apache/commons#commons-pool2/2.11.1": { "jar": "sha256-6gUF7nUV5YsawOaG5NGl2ffYCOJRphvDcaoFlbmWP4M=", "pom": "sha256-wbsCmUpK34loDfepitujPFUnaDAUJy1liFuzA27NSMM=" @@ -557,19 +611,25 @@ "jar": "sha256-q6cpMsX/5S0a6ftzVBVHS8gwX9BPBQ6FHzqPZ9oYNP0=", "pom": "sha256-CBAm1JP4dt+OsPPxyPhdpyy+N99VeDPpaLQMMNrL/Kk=" }, - "org/apache/logging#logging-parent/3": { - "pom": "sha256-djouwrgJTUFh3rbCZLEmIIW5vjC/OjHCzhNyQuV3Iqc=" + "org/apache/groovy#groovy-bom/4.0.27": { + "module": "sha256-1sIlTINHuEzahMr3SRShh8Lzd+QoTo2Ls/kBUhgQqos=", + "pom": "sha256-qkTrUr/f5h0ns+RQ0rNI2I3qo0N6tNnUmoQJU0j59vs=" }, - "org/apache/logging/log4j#log4j-api/2.17.1": { - "jar": "sha256-sNikyKtPuLGIjQCVgicDsObUeTxBlVAgPanmkZYWHeQ=", - "pom": "sha256-HirO8yILKb4QrgmXKLFYsY2UP5Ghk8xFAbtC+SnB6Io=" + "org/apache/logging/log4j#log4j-api/2.25.3": { + "jar": "sha256-6IZoKSD6D7nW62OV3LTeCIRD+GRsicXlhG4WjjJ/QG8=", + "module": "sha256-W+T3N0jWz53pXLci63n8rVvCQnk6l4p+cmbyNZGBHAw=", + "pom": "sha256-MoS+ZXOuuDNGz/a3RvoyXSPq3Z0JyOKG7R11kEoS3W4=" }, - "org/apache/logging/log4j#log4j-core/2.17.1": { - "jar": "sha256-yWfyI0h5gLk2TpSnx/mooB/T7nwZvb8LD5+MuFEfPUE=", - "pom": "sha256-C7s79tTSKhv6PDwJJ8KUEK8UoPsm47Ark3JvXH6Yqv0=" + "org/apache/logging/log4j#log4j-bom/2.25.3": { + "pom": "sha256-ZleICHEo/mw6+dAlJEhTKvl4cRdmSB20k5a/AyWibK0=" }, - "org/apache/logging/log4j#log4j/2.17.1": { - "pom": "sha256-lnq8AkRDqcsJaTVVmvXprW8P9hN1+Esn1EDS+nCAawk=" + "org/apache/logging/log4j#log4j-core/2.25.3": { + "jar": "sha256-Nit/y2W3OqRsxLxTq/TrIW9ESoO10aA3y2/f/wrp8Pk=", + "module": "sha256-ChRnoKtPxLJSc7VVHGCL15UguZ/SgRGgM9M4jwJVYwA=", + "pom": "sha256-ysGDRqDJErAmrVF/SE78POgyZ/LPambKhGmRL/GYaw0=" + }, + "org/apache/logging/log4j#log4j/2.25.3": { + "pom": "sha256-pbdIJFris5b1vKlHpJbtwI29vfeWmuLMsattS0lznn8=" }, "org/bouncycastle#bcpkix-jdk18on/1.80": { "jar": "sha256-T0umqSYX6hncGD8PpdtJLu5Cb93ioKLWyUd3/9GvZBM=", @@ -595,10 +655,10 @@ "module": "sha256-clinadyqJrmBVNIp2FzHLls2ZrC8tjfS2vFuxJiVZjg=", "pom": "sha256-AjkvvUziGQH5RWFUcrHU1NNZGzqr3wExBfXJLsMstPA=" }, - "org/checkerframework#checker-qual/3.49.3": { - "jar": "sha256-Nn7b8v6fYGwf21qLpuHJwnYlmT4f+VTjho3nC8xkFrc=", - "module": "sha256-dv9CWNsfoaC8bOeur0coPfEGD9Q3oJvm7zxcMmnqWtM=", - "pom": "sha256-i+QBdkYoXZFCx/sibPuARFwXfcfBNjsj2UH6bJuwXc8=" + "org/checkerframework#checker-qual/3.52.0": { + "jar": "sha256-C1uxpL3E5LEhdIL+WY78qrTh+6ezf5QSY5F4/IEW/AU=", + "module": "sha256-jf8ytk0eoRGkV9QR4CxKvHJGH9q6rIzll2bb1+fSpsg=", + "pom": "sha256-CWX2sKmMP6+NvCpu9x2GAWyeJKGQVwp3Gb2kq2CHkmU=" }, "org/codehaus#codehaus-parent/3": { "pom": "sha256-UOslOs0LbuBI9DLZ/Do7NiZO+z2h/6f7B/bE1LeoyjE=" @@ -642,6 +702,9 @@ "jar": "sha256-spUGEYOcwMDG4lwIPjprIpXrwyeDLsBzPn2bvJTnTrM=", "pom": "sha256-3mdvxdpEpo0CntlaCSuJPVbo/ElogKIx5HHl1bKzvhY=" }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, "org/fusesource#fusesource-pom/1.12": { "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE=" }, @@ -721,9 +784,10 @@ "jar": "sha256-EhJRcOeVUZum3IAQwHC1PHaq6StIXB43Uw5Uq13QjUM=", "pom": "sha256-EMo7z1F48YUH8hCmOtljeJaFM0OtHBKRoBmhFvIWpUg=" }, - "org/junit#junit-bom/5.11.0": { - "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=", - "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0=" + "org/jspecify#jspecify/1.0.0": { + "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=", + "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=", + "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y=" }, "org/junit#junit-bom/5.11.0-M2": { "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=", @@ -733,9 +797,13 @@ "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" }, - "org/junit#junit-bom/5.7.2": { - "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", - "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" + "org/junit#junit-bom/5.13.2": { + "module": "sha256-7WfhUiFASsQrXlmBAu33Yt1qlS3JUAHpwMTudKBOgoM=", + "pom": "sha256-Q7EQT7P9TvS3KpdR1B4Jwp8AHIvgD/OXIjjcFppzS0k=" + }, + "org/junit#junit-bom/5.13.4": { + "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=", + "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI=" }, "org/junit#junit-bom/5.8.0-M1": { "module": "sha256-vgUUcTA6UD9MIkZwdbJ0kEE3fd1tWoywc53tZ9kW2C0=", @@ -749,10 +817,29 @@ "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/osgi#org.osgi.annotation.bundle/2.0.0": { + "jar": "sha256-uclUbsW+PrwuhbpJGRUK121kWUgFKC/IlRM6R9Jkp64=", + "pom": "sha256-i5z4pBKev1J48mNNNQnDcig5Ya0P3MhaJFuzXXoipcg=" + }, + "org/osgi#org.osgi.annotation.versioning/1.1.2": { + "jar": "sha256-9R8jXoDfj/vDDvG1V7bqOKaWYy1nVATsEX6VKXi4uGM=", + "pom": "sha256-sdMBKr/6K3/Eo9C67oeESUwHOYawANZVp4j6YXqqK8g=" + }, "org/osgi#org.osgi.core/5.0.0": { "jar": "sha256-tEDGv/KGMyr89crgZ7YGli52HA3wDl/Yp0bwsxJlYZs=", "pom": "sha256-4AHZl0MYUeq4uTOLW32f5eaOGutDpYV5JLChWIbuNjk=" }, + "org/osgi#org.osgi.resource/1.0.0": { + "jar": "sha256-gfxQ8fHTikryjhMZB9Sv4hMkmqsFBgSE7coOYMSvm0o=", + "pom": "sha256-g6zfIl/7mkp7xYL1OkFFofLDvbtCjgM8AJZvY8YQ6CA=" + }, + "org/osgi#org.osgi.service.serviceloader/1.0.0": { + "jar": "sha256-j4ds4qmqTpWx8ZUpUCVRA+JIdCUFCmVPMoVEe6YBwVQ=", + "pom": "sha256-dVdRq2w3oaMa+1ueSllcDdLv0rUNcDshJVuCfFDtYVM=" + }, "org/osgi#org.osgi.util.promise/1.3.0": { "jar": "sha256-cFPFfn19iP7GuQl5o68SXh0ruEcmijKKLx7WWtCkwYU=", "pom": "sha256-rcyK9ce+Z7BSEF4Mncq43ibaxvGbxamrcpRqMydscQA=" @@ -795,9 +882,9 @@ "jar": "sha256-jK3UOsXrbQneBfrsyji5F6BAu5E5x+3rTMgcdAtxMoE=", "pom": "sha256-cimwOzCnPukQCActnkVppR2FR/roxQ9SeEGu9MGwuqg=" }, - "org/postgresql#postgresql/42.7.6": { - "jar": "sha256-8qHMA1LdXlxvZdut/ye+4Awy5DLGrQMNB0R/ilmDxCo=", - "pom": "sha256-SfNzCJO2khPK99foymodjHaf9mhCHVJS3gBSvFVGp8c=" + "org/postgresql#postgresql/42.7.9": { + "jar": "sha256-iPH8OZLoDsOwSPeYAw6aAUqkeDxAr7VtPnqH7grfFm8=", + "pom": "sha256-UYbVaAzMRJZ49CxRC6Le7caVimN9rU8CyA/c6VpCKKY=" }, "org/python#jython-standalone/2.7.4": { "jar": "sha256-H7oXae/8yLGfXhBDa8gnShWM6YhVnyV5J8JMc7sTfzw=", @@ -835,6 +922,10 @@ "org/sonatype/oss#oss-parent/9": { "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" }, + "org/springframework#spring-framework-bom/5.3.39": { + "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", + "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" + }, "org/tribuo#tribuo-classification-core/4.2.0": { "jar": "sha256-+vv5OnIrmrVC7oeaX09lF5bkyuobZ5gNVWL+jdjbqeY=", "pom": "sha256-gLgGCPTPN93HLmioPGBRyupwvqF+96hTCfWeqdpzBPE=" @@ -888,8 +979,8 @@ "pydev/files/pydev/PyDev%209.3.0/PyDev%209.3.0": { "zip": "sha256-RTmO3yrbVgeKgLyIqRmUFXjwwLNj773QEb/RWKmbES4=" }, - "yajsw/files/yajsw/yajsw-stable-13.12/yajsw-stable-13.12": { - "zip": "sha256-xvxZgV04ANFOyXeSaor9P2BqDr100s/WBgFndGbt6qI=" + "yajsw/files/yajsw/yajsw-stable-13.18/yajsw-stable-13.18": { + "zip": "sha256-ULNOmBfFSylw+lEf9FhPZVbBefaYM6qLmx/2SFthaE8=" } }, "https://storage.googleapis.com": { diff --git a/pkgs/tools/security/nitrokey-app2/default.nix b/pkgs/tools/security/nitrokey-app2/default.nix index b0f66d776454..a7942093436a 100644 --- a/pkgs/tools/security/nitrokey-app2/default.nix +++ b/pkgs/tools/security/nitrokey-app2/default.nix @@ -22,14 +22,14 @@ in buildPythonApplication rec { pname = "nitrokey-app2"; - version = "2.4.3"; + version = "2.5.2"; pyproject = true; src = fetchFromGitHub { owner = "Nitrokey"; repo = "nitrokey-app2"; tag = "v${version}"; - hash = "sha256-mwcYjkyEP2itwdQ/xAG50uvw6zHfUacAecbDh86GNGA="; + hash = "sha256-HkGdu8A8xpZheO+2NcKkTPXZGln28CnhRQzdpwRUlRE="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a786b2e13f0..02a6366c631c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1595,20 +1595,6 @@ with pkgs; haskellPackages.generateOptparseApplicativeCompletions [ "cabal2nix" ] haskellPackages.cabal2nix ); - cabal2nix = symlinkJoin { - inherit (cabal2nix-unwrapped) name meta; - nativeBuildInputs = [ buildPackages.makeWrapper ]; - paths = [ cabal2nix-unwrapped ]; - postBuild = '' - wrapProgram $out/bin/cabal2nix \ - --prefix PATH ":" "${ - lib.makeBinPath [ - nix-prefetch-scripts - ] - }" - ''; - }; - stack2nix = with haskell.lib; overrideCabal (justStaticExecutables haskellPackages.stack2nix) (_: { @@ -8307,14 +8293,20 @@ with pkgs; kanidm_1_8 = callPackage ../servers/kanidm/1_8.nix { kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_8; }; + kanidm_1_9 = callPackage ../servers/kanidm/1_9.nix { + kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_8; + }; kanidmWithSecretProvisioning_1_7 = kanidm_1_7.override { enableSecretProvisioning = true; }; kanidmWithSecretProvisioning_1_8 = kanidm_1_8.override { enableSecretProvisioning = true; }; + kanidmWithSecretProvisioning_1_9 = kanidm_1_9.override { enableSecretProvisioning = true; }; }) kanidm_1_7 kanidm_1_8 + kanidm_1_9 kanidmWithSecretProvisioning_1_7 kanidmWithSecretProvisioning_1_8 + kanidmWithSecretProvisioning_1_9 ; leafnode = callPackage ../servers/news/leafnode { }; @@ -10645,9 +10637,6 @@ with pkgs; }; }; - palemoon-bin = callPackage ../applications/networking/browsers/palemoon/bin.nix { }; - palemoon-gtk2-bin = palemoon-bin.override { withGTK3 = false; }; - pantalaimon = callPackage ../applications/networking/instant-messengers/pantalaimon { }; pantalaimon-headless = callPackage ../applications/networking/instant-messengers/pantalaimon {