gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-07-20 06:05:57 +00:00
committed by GitHub
parent 535501273c c7e2e632fd
commit 12c9599dc2
41 changed files with 623 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix
+2 -2
View File
@@ -7,8 +7,8 @@ buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-wakatime";
publisher = "WakaTime";
version = "25.0.6";
hash = "sha256-arBd8ihYlyGPm0mrRnGJNzuhQmMqADH7TrqCwMR7R/U=";
version = "25.0.7";
hash = "sha256-lhqF71ekIUCBTho4F1yXGMwFr4bNTYGuNE4derMLnKI=";
};
meta = {
pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
+2 -2
View File
@@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "calva";
publisher = "betterthantomorrow";
version = "2.0.520";
hash = "sha256-OU/GZgTGVr+ZMhebMhAK0VDRm/qj+NLXOwc6FekjbgQ=";
version = "2.0.523";
hash = "sha256-gEAOocMSOmiPjEyayI8RjwMYDPGuZxPKB6S6R9fmGM4=";
};
nativeBuildInputs = [
pkgs/applications/editors/vscode/extensions/default.nix
+44 -44
View File
@@ -260,8 +260,8 @@ let
mktplcRef = {
name = "ng-template";
publisher = "Angular";
version = "20.0.1";
hash = "sha256-N+2uNX1gXGHAvkx2aff9DfB7vji8bXNLt86yaSYt0o0=";
version = "20.1.1";
hash = "sha256-fcJXyuGow39uep6Giexft+3a/nnoJSsKdwjtAQKTMj0=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog";
@@ -318,8 +318,8 @@ let
mktplcRef = {
name = "vscode-apollo";
publisher = "apollographql";
version = "2.5.6";
hash = "sha256-Uh3iFJXG8d0Ywjyx6sGpkYSD0Iy+y/0Uh0C6xYfQhKM=";
version = "2.6.2";
hash = "sha256-jS+YPE+D0Q3bw8BCMFseL4xdiW5f6LV7JosgMG3Huo8=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog";
@@ -493,8 +493,8 @@ let
mktplcRef = {
publisher = "banacorn";
name = "agda-mode";
version = "0.6.0";
hash = "sha256-C55ogw05iFmodYox/igaCu0MkEbvqpTPX1MSlcz8G50=";
version = "0.6.1";
hash = "sha256-Hd4pIjIUT1lAx6bjPu7LLL4RakRkjUtQ91mPI7iiquQ=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/banacorn.agda-mode/changelog";
@@ -788,8 +788,8 @@ let
mktplcRef = {
name = "vscode-tailwindcss";
publisher = "bradlc";
version = "0.14.24";
hash = "sha256-/JZ38KVIzxv3w6czb/9MNt2WcKuqBb1i2c4D2BYBSFU=";
version = "0.14.25";
hash = "sha256-NXA7UDSo6G0Did6tzwgIYnjR+ymoY7V5aUtaFzqlVik=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/bradlc.vscode-tailwindcss/changelog";
@@ -1212,8 +1212,8 @@ let
mktplcRef = {
publisher = "DanielSanMedium";
name = "dscodegpt";
version = "3.12.107";
hash = "sha256-rlLaOO5XccOe3Q3eKe+ybDw4dTUf9/N2ITpMTfVY1A0=";
version = "3.12.116";
hash = "sha256-BticW7EwDiNmiEIr9eFpQBPfhsUaebzucc2F8vEuSE8=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog";
@@ -1242,8 +1242,8 @@ let
mktplcRef = {
name = "dart-code";
publisher = "dart-code";
version = "3.114.0";
hash = "sha256-Ugr5pgIQUbnxvuqTxRrL+JXcVLHDm2crsmVLXhXyBiI=";
version = "3.114.2";
hash = "sha256-J/CrFUCgaGzZAeyS09Gz0m1nffNgfqCuRI6UoqdlmjM=";
};
meta.license = lib.licenses.mit;
@@ -1328,8 +1328,8 @@ let
mktplcRef = {
publisher = "denoland";
name = "vscode-deno";
version = "3.44.2";
hash = "sha256-fwQvAqyYXg2oAUXUef9nW/WzZGillx0XRyXd/cMy7Ho=";
version = "3.45.0";
hash = "sha256-U3oNoT0KZiYfebUSEav5MCoun9n2qugruUTWrOMxjXA=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/denoland.vscode-deno/changelog";
@@ -1478,8 +1478,8 @@ let
mktplcRef = {
publisher = "discloud";
name = "discloud";
version = "2.24.2";
hash = "sha256-0tuqF6dpU5fzW83K8mOb/Io/MAB7TZBeEU5SGTH+Tlg=";
version = "2.24.3";
hash = "sha256-OfkZdF5Qz3VketCIjWuwd08EI7e/II9c7G4a3O2mW+s=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog";
@@ -1507,8 +1507,8 @@ let
mktplcRef = {
name = "competitive-programming-helper";
publisher = "DivyanshuAgrawal";
version = "2025.5.1746344159";
hash = "sha256-gFzuZH5AYfBSdTFfSlz2XkrFR4yUv+DaG5j4MCDYkX8=";
version = "2025.7.1752155836";
hash = "sha256-vI30wuv8833sG0RZdStBSSYTPbtt5ZrsRX+1iAVI7yg=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/DivyanshuAgrawal.competitive-programming-helper/changelog";
@@ -2123,8 +2123,8 @@ let
mktplcRef = {
publisher = "github";
name = "vscode-pull-request-github";
version = "0.112.0";
hash = "sha256-L1xXgjhYmBEO+M7wZ7vkM5ktOflB9xrouAcWx9KKKT4=";
version = "0.114.2";
hash = "sha256-TLsvewvmqwKEBPsuzrlMhlsjdi3jbA7E1xz9B8aU1LA=";
};
meta = {
license = lib.licenses.mit;
@@ -2135,8 +2135,8 @@ let
mktplcRef = {
name = "gitlab-workflow";
publisher = "gitlab";
version = "6.32.2";
hash = "sha256-ZPfzCje8mAWr0Ntr1MEGvUsvCSi+ocPDVEXiezAI5N8=";
version = "6.33.2";
hash = "sha256-28J1PxqJgULkbO49gjMyJf79pSlN1ZeN9vN5clJ2wYo=";
};
meta = {
description = "GitLab extension for Visual Studio Code";
@@ -2520,8 +2520,8 @@ let
mktplcRef = {
name = "Ionide-fsharp";
publisher = "Ionide";
version = "7.26.2";
hash = "sha256-Ox2L39Q3XsnktThVaLP0JxqJlvvkJXaZsdBE2A2ntAc=";
version = "7.26.3";
hash = "sha256-xbMPx7FO7MplFO0SDpWhmctEZdHft2UPdlss3J0Bj10=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog";
@@ -3423,8 +3423,8 @@ let
mktplcRef = {
publisher = "ms-toolsai";
name = "jupyter-renderers";
version = "1.1.2025012901";
hash = "sha256-LWKSt0D3iFPKaYphN+8/1KJl1CIS2a3fMqrvoItjsvI=";
version = "1.3.0";
hash = "sha256-GBqHvXikCgLGW7Xm05Iq1xqs8j9H9k9c8iASsAjA87I=";
};
meta = {
license = lib.licenses.mit;
@@ -3471,8 +3471,8 @@ let
mktplcRef = {
publisher = "ms-vscode";
name = "cmake-tools";
version = "1.21.6";
hash = "sha256-Y+W5lknMiUTeKLnAIP/wAY9zn3QY+XvdPrl2GsdIb5o=";
version = "1.21.36";
hash = "sha256-IqgYnesIz46WmJ7kR8LYnr2kkD33oiupi7CrcV6rGRg=";
};
meta.license = lib.licenses.mit;
};
@@ -3587,8 +3587,8 @@ let
mktplcRef = {
name = "remote-containers";
publisher = "ms-vscode-remote";
version = "0.417.0";
hash = "sha256-kWen+uBzQg+N/cWKnS9UjWTbWdV/6NnZ0IgeW1QqRNM=";
version = "0.422.0";
hash = "sha256-UMXCZe8nvwOAkrHxNKq+L+AYMoMvq2ojDn5NrMdTONk=";
};
meta = {
description = "Open any folder or repository inside a Docker container";
@@ -3819,8 +3819,8 @@ let
mktplcRef = {
name = "ocaml-platform";
publisher = "ocamllabs";
version = "1.30.0";
hash = "sha256-pQkMhFjqdsrjfsrXz0IbpgR+vnGy8OVW9BC03Nr6SN8=";
version = "1.30.1";
hash = "sha256-N6GPqUKMW5VC2oxKvRQWQjKtcIlvvf7M00nj8O6e4xw=";
};
};
@@ -3940,8 +3940,8 @@ let
mktplcRef = {
name = "prisma";
publisher = "Prisma";
version = "6.11.1";
hash = "sha256-ev99UhjYYu0aozidnuy30sBSyeQiTFdzMjc3piIBscQ=";
version = "6.12.0";
hash = "sha256-X2Z+a270exSSVnfUkiGBO6C/Y4ndbzwQstJoUN/pa7c=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog";
@@ -4372,8 +4372,8 @@ let
mktplcRef = {
publisher = "shopify";
name = "ruby-lsp";
version = "0.9.28";
hash = "sha256-VJzj6a4CkZDoHGLds4qTkAJsccTFa9QWLIF7N4cDWp4=";
version = "0.9.29";
hash = "sha256-jxgEB8juWRZmBAmmBBDHu3sOKylsqSuSrnWsfOYPBmI=";
};
meta = {
description = "VS Code plugin for connecting with the Ruby LSP";
@@ -4489,8 +4489,8 @@ let
mktplcRef = {
publisher = "sonarsource";
name = "sonarlint-vscode";
version = "4.25.1";
hash = "sha256-ZDN2NMbFZO3xGJ/te8l1PH/wtt4YmoIVMJM+tRNsjYM=";
version = "4.26.0";
hash = "sha256-Mru3dz0Dl/oDHd0tB/0Ixd+EselC+e70Cn7sdu1gkwk=";
};
meta.license = lib.licenses.lgpl3Only;
};
@@ -4694,8 +4694,8 @@ let
mktplcRef = {
name = "tabnine-vscode";
publisher = "tabnine";
version = "3.293.0";
hash = "sha256-vDJ/X0qT37a2aoSceoVI7O8GT88JaXjAU6GpV2anhR8=";
version = "3.296.0";
hash = "sha256-LQzVo7NKJvjQ/eUOzXtDEDCSnSIjACPgZFwp87qG/JM=";
};
meta = {
license = lib.licenses.mit;
@@ -4931,8 +4931,8 @@ let
mktplcRef = {
name = "emacs-mcx";
publisher = "tuttieee";
version = "0.65.2";
hash = "sha256-zPiGOaEgickp/+5X3ta+Czgi3aHBIeEx6zMALxPoPu8=";
version = "0.73.0";
hash = "sha256-Fs/rGa6F9Jm4pvD+IIzEsG0TwHy88KkNCkD7I56IL4U=";
};
meta = {
changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md";
@@ -5319,8 +5319,8 @@ let
mktplcRef = {
name = "vspacecode";
publisher = "VSpaceCode";
version = "0.10.19";
hash = "sha256-4kyfoQ0VOPYFJwaTPRCIL7NIZ1/jx7THnc9UCHm0aWQ=";
version = "0.10.20";
hash = "sha256-UlEuCvsGgtKl1IaRuMn5ODm4NDe8NTbaMN8c476Z0g0=";
};
meta = {
license = lib.licenses.mit;
pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix
+2 -2
View File
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "basedpyright";
publisher = "detachhead";
version = "1.29.2";
hash = "sha256-RNX4UG+zHAFOhp8PI6iW3YaX1ODhpwGwjLFe1MkuzZs=";
version = "1.31.0";
hash = "sha256-ZwVtvjzrAlScj/dcYEG4XVi7dcRI/Lny052pFXbVmHc=";
};
meta = {
changelog = "https://github.com/detachhead/basedpyright/releases";
pkgs/applications/editors/vscode/extensions/github.copilot/default.nix
+2 -2
View File
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "github";
name = "copilot";
version = "1.338.0";
hash = "sha256-0VPal8sP3oS9XMk1H/2ptWRQ7vvLsSU0/vUMKqsPqP8=";
version = "1.342.0";
hash = "sha256-81whQKh8CNNYk0tzgK77XeTmTxK1tiRzeuCIQ+7EgU4=";
};
meta = {
pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
+5 -5
View File
@@ -16,19 +16,19 @@ let
{
x86_64-linux = {
arch = "linux-x64";
hash = "sha256-Bvk6ZVHtO4HdT5eNASE8kGhoSegyLR7lAAKEPVe3Upo=";
hash = "sha256-vGHRgaqoxRU14BjmQM68SVdhe6ElvJrp6NUQXkVU5OU=";
};
aarch64-linux = {
arch = "linux-arm64";
hash = "sha256-sOrLdZDk0/66vOJ1frFXemRx7eisnCeIBLCZ+jixcg0=";
hash = "sha256-aGRXxUpuOhsxULg7mAe1t04hfwLF5t4bSSthLlz7Mes=";
};
x86_64-darwin = {
arch = "darwin-x64";
hash = "sha256-AmlDd+deQ6qPduvvqLNZpQXqHmJpdvoU+TATtWM9+FM=";
hash = "sha256-e4+rr3k9SYIVH01wG0RxL+sush0rTuvkJu08cctXmYo=";
};
aarch64-darwin = {
arch = "darwin-arm64";
hash = "sha256-AZycfbWvVHZEkWbrCFIO+tbDzCyDi9lo3bn6PJ3mBus=";
hash = "sha256-iOF9aDk9okoZsHvaW4mDOulLPGxVViAk1TQkIH0XK+A=";
};
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
@@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "csdevkit";
publisher = "ms-dotnettools";
version = "1.30.32";
version = "1.30.44";
inherit (extInfo) hash arch;
};
sourceRoot = "extension"; # This has more than one folder.
pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix
+2 -2
View File
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "ms-pyright";
name = "pyright";
version = "1.1.402";
hash = "sha256-7xVqTsf54AePrYa21Mq21cYoJfL4GRPhd6KocBIjrng=";
version = "1.1.403";
hash = "sha256-t5YB1wO76XSnGCG8YKW1HR0aqv+JzefrtSBfVLzuDOU=";
};
meta = {
pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix
+2 -2
View File
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "debugpy";
publisher = "ms-python";
version = "2025.8.0";
hash = "sha256-sfQG5LgGruInheqA7C8YxdC0EhmmmKhbfyXhHUhCaNI=";
version = "2025.10.0";
hash = "sha256-NDCNiKLCU7/2VH43eTyOMBTZ3oxzA7JwCBit9+JHfmY=";
};
meta = {
pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
+2 -2
View File
@@ -15,8 +15,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = {
name = "python";
publisher = "ms-python";
version = "2025.8.0";
hash = "sha256-v+MjJmiFMStbVRmh1I7hJp1Fq262QwRyRt9m2f3yF0o=";
version = "2025.10.0";
hash = "sha256-8dc1uM/6iUNF+9y4yKH7w4/FsrzgVoOJlIFfQOvY8YM=";
};
buildInputs = [ icu ];
pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix
+2 -2
View File
@@ -9,8 +9,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "jupyter";
publisher = "ms-toolsai";
version = "2025.5.0";
hash = "sha256-3tMuPAyTjvryiHOk0ozIQ8KqIqBV/kxJM01fgC5ZMWE=";
version = "2025.6.0";
hash = "sha256-pJh+Iqgi6feFUPZ4/z7Ke6Hv76fmm6JvgU/e4iLvgmk=";
};
nativeBuildInputs = [
pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix
+2 -2
View File
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "shellcheck";
publisher = "timonwong";
version = "0.37.7";
sha256 = "sha256-i8cVY8EcKSxnmWmRWDiARF79pOEcYMc+y+7i4d8EDTo=";
version = "0.38.0";
sha256 = "sha256-Lei2zNAI0Fg/PRpDxaTqCa5aIWXiGa39yRmJ2b3wENc=";
};
nativeBuildInputs = [
jq
pkgs/applications/emulators/libretro/cores/bsnes.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "bsnes";
version = "0-unstable-2025-07-11";
version = "0-unstable-2025-07-18";
src = fetchFromGitHub {
owner = "libretro";
repo = "bsnes-libretro";
rev = "df64459ea3a6c3e6e112f81c56d1426074a78d2f";
hash = "sha256-eW9283UcE1wpP/dh/FYZ/oJwVgAefubnfcvQLTABB0k=";
rev = "28c358173a39d6311841c756ac0e82975d798048";
hash = "sha256-hRWc8jcpEHl15rESCLdoKXuQn8Jr5YJdOiJ7gOww6oM=";
};
makefile = "Makefile";
pkgs/by-name/ar/ario/package.nix
+4
View File
@@ -45,6 +45,10 @@ stdenv.mkDerivation rec {
taglib
];
preAutoreconf = ''
gettextize --force --copy
'';
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
for file in $out/lib/ario/plugins/*.dylib; do
ln -s $file $out/lib/ario/plugins/$(basename $file .dylib).so
pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix
+2
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
glib,
gobject-introspection,
xorg,
wrapGAppsHook3,
budgie-desktop,
@@ -20,6 +21,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [
glib
gobject-introspection.setupHook
wrapGAppsHook3
];
pkgs/by-name/bu/budgie-media-player-applet/package.nix
+10 -2
View File
@@ -8,17 +8,18 @@
ninja,
nix-update-script,
python3Packages,
xfce,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "budgie-media-player-applet";
version = "1.1.1";
version = "1.2.0";
src = fetchFromGitHub {
owner = "zalesyc";
repo = "budgie-media-player-applet";
tag = "v${finalAttrs.version}";
hash = "sha256-wmtO4Djs1xXBjimAEV6pvPo7zxDM+XQIOi/WOPRieQ8=";
hash = "sha256-FTc/cl4qjVYx45SuZPizOGC09JERIuifCo86+Tqu5hk=";
};
strictDeps = true;
@@ -31,6 +32,13 @@ stdenv.mkDerivation (finalAttrs: {
python3Packages.wrapPython
];
# To be passed to budgie-desktop-with-plugins.
buildInputs = [
glib
gtk3
xfce.libxfce4windowing
];
pythonPath = with python3Packages; [
requests
];
pkgs/by-name/es/eslint/package-lock.json
Generated
+413 -376
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/es/eslint/package.nix
+3 -3
View File
@@ -7,13 +7,13 @@
}:
buildNpmPackage rec {
pname = "eslint";
version = "9.30.1";
version = "9.31.0";
src = fetchFromGitHub {
owner = "eslint";
repo = "eslint";
tag = "v${version}";
hash = "sha256-IMML65KsmFLdTniciHWiw5ao0hSwILbHvz/Zx72+Mi8=";
hash = "sha256-kVYLQ1GXs7ytv3HEyEToiAktzHpbbPCaNA30pwC02FI=";
};
# NOTE: Generating lock-file
@@ -25,7 +25,7 @@ buildNpmPackage rec {
cp ${./package-lock.json} package-lock.json
'';
npmDepsHash = "sha256-EurssIJmb6g7CmsYkUqtEdyDfvCs4Sc3VO6/4jTeP5Y=";
npmDepsHash = "sha256-4CXfMQJCLxOAo/ZoAFs+nwFv2cRN1dPYIHqIGs6dybo=";
npmInstallFlags = [ "--omit=dev" ];
dontNpmBuild = true;
pkgs/by-name/gi/github-mcp-server/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule (finalAttrs: {
pname = "github-mcp-server";
version = "0.7.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "github";
repo = "github-mcp-server";
tag = "v${finalAttrs.version}";
hash = "sha256-9IEsoIq4cuHgcYRuGEEkx5CFHaJzp0pNTpb1pNedzCE=";
hash = "sha256-4OdDTis4vRPqzAVYm8TuFHlW1+1FdQbIdjNNeTVuuMw=";
};
vendorHash = "sha256-GYfK5QQH0DhoJqc4ynZBWuhhrG5t6KoGpUkZPSfWfEQ=";
vendorHash = "sha256-DeojCgMBwVclvoiEs462FoxIf3700XUjXvPbvRZE3CI=";
ldflags = [
"-s"
pkgs/by-name/io/iosevka/package.nix
+3 -3
View File
@@ -56,16 +56,16 @@ assert (extraParameters != null) -> set != null;
buildNpmPackage rec {
pname = "Iosevka${toString set}";
version = "33.2.6";
version = "33.2.7";
src = fetchFromGitHub {
owner = "be5invis";
repo = "iosevka";
rev = "v${version}";
hash = "sha256-X3oLe7CrPokvGsxaKuaaeHp9MIYHIMVASYUPpA1zcY0=";
hash = "sha256-LS4c79/QmBSgsgSY/Tddmf2M6U0LcISMapnWK7Eu1Ak=";
};
npmDepsHash = "sha256-GV/7/t/phSrxjcUizW7aNpp1yjA6P8NOiepNp8DrTaY=";
npmDepsHash = "sha256-DyExvgNJBRlz8iVezlrJfTyobK0L6CMQN+gIMGoYYrw=";
nativeBuildInputs =
[
pkgs/by-name/jo/josm/package.nix
+5
View File
@@ -63,6 +63,11 @@ stdenv.mkDerivation {
--prefix _JAVA_OPTIONS : "-Dawt.useSystemAAFontSettings=on"
'';
passthru = {
inherit srcs;
updateScript = ./update.sh;
};
meta = {
description = "Extensible editor for OpenStreetMap";
homepage = "https://josm.openstreetmap.de/";
pkgs/by-name/jo/josm/update.sh
Executable
+18
View File
@@ -0,0 +1,18 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl nurl pup common-updater-scripts
# partially taken from jitsi-meet/update.sh, as they both scrape an apt repo.
set -euo pipefail
version="$(curl https://josm.openstreetmap.de/apt/pool/universe/j/josm/ |
pup 'a[href] text{}' |
sed -nr 's/josm_[0-9]+.[0-9]+.svn([0-9]+)_all.deb/\1/p' |
sort -n |
tail -n1)"
pkgHash="$(nurl -H https://github.com/JOSM/josm "$version-tested")"
update-source-version josm "$version" --source-key=srcs.jar
update-source-version josm "$version" --ignore-same-version --source-key=srcs.macosx
update-source-version josm "$version" "$pkgHash" --ignore-same-version --source-key=srcs.pkg
pkgs/by-name/ju/just/package.nix
+3 -3
View File
@@ -19,7 +19,7 @@
rustPlatform.buildRustPackage rec {
pname = "just";
version = "1.42.2";
version = "1.42.3";
outputs =
[
"out"
@@ -33,11 +33,11 @@ rustPlatform.buildRustPackage rec {
owner = "casey";
repo = "just";
tag = version;
hash = "sha256-CbtaYXkpUQ9FgzSgm4j+7W0JibeHVHr1Wv9ObR75KOk=";
hash = "sha256-SinL3sdSTtE3oGHe54P4n1jWarJIwYXWp1kPNXGwKIA=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-nxIzxrMdSDNq46ouzcCDoqaNA5fAdqkbb+ovufwRXWM=";
cargoHash = "sha256-byE2ssjEy6etHzkbeYCuW69TC8ErkYhU7oTt0U107Ac=";
nativeBuildInputs =
lib.optionals (installShellCompletions || installManPages) [ installShellFiles ]
pkgs/by-name/k9/k9s/package.nix
+3 -3
View File
@@ -12,13 +12,13 @@
buildGoModule (finalAttrs: {
pname = "k9s";
version = "0.50.7";
version = "0.50.9";
src = fetchFromGitHub {
owner = "derailed";
repo = "k9s";
tag = "v${finalAttrs.version}";
hash = "sha256-K0JETHs2vOOfDUPw22x+2O5WN0rtkXsRxMnUHrCpkDg=";
hash = "sha256-wTQOBxJgrDPcWSiezCwHNgvfGa6oWBM+DNa7RC/9PJA=";
};
ldflags = [
@@ -32,7 +32,7 @@ buildGoModule (finalAttrs: {
proxyVendor = true;
vendorHash = "sha256-6Xyvgy+V0vLCqMgkUR+n6M6wGs7eU78ckLCKF9WrI2w=";
vendorHash = "sha256-SDl47tAYiE00gFpCvoBeiV8XL/E29457b1RQW3pogmM=";
# TODO investigate why some config tests are failing
doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64);
pkgs/by-name/li/libphonenumber/package.nix
+2 -2
View File
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libphonenumber";
version = "9.0.9";
version = "9.0.10";
src = fetchFromGitHub {
owner = "google";
repo = "libphonenumber";
tag = "v${finalAttrs.version}";
hash = "sha256-gkmAdiqXaaTzWMaByOKooCI7WnKZCbWi1LYG5AijDhs=";
hash = "sha256-b/TQhHG7qPzXcFtiFNXOu1hkFfT9KnZNPa+AB/Fmk0E=";
};
patches = [
pkgs/by-name/li/librewolf-bin-unwrapped/package.nix
+4 -4
View File
@@ -37,7 +37,7 @@ let
pname = "librewolf-bin-unwrapped";
version = "140.0.2-1";
version = "140.0.4-1";
in
stdenv.mkDerivation {
@@ -47,9 +47,9 @@ stdenv.mkDerivation {
url = "https://gitlab.com/api/v4/projects/44042130/packages/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz";
hash =
{
i686-linux = "sha256-yT0THuPV5kGqixPkP+lEWbsXzUQQaNVHXQ97TycLpTI=";
x86_64-linux = "sha256-CEH9ZPQ6H9o3YjH52fvy7RHRuQSGikpFG7BOEVft4oM=";
aarch64-linux = "sha256-7urFzyOQ5/KbIFdL34Fkb+Z6ORhDfXZFQoY8RkMcNao=";
i686-linux = "sha256-DrjlqCjQ6BJe9m/0/n9c4vvKBU9kVywVPHpWO7tTTUw=";
x86_64-linux = "sha256-KHwp8Lk1Y8FyJBbqKgYa5O+NvBvBCDp7fbOVfd93Lr4=";
aarch64-linux = "sha256-o8eM/49kmG6e0cnNZnKp1wAd2evMeXLxwC96cavwfmY=";
}
.${stdenv.hostPlatform.system} or throwSystem;
};
pkgs/by-name/me/media-downloader/package.nix
+2 -2
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "media-downloader";
version = "5.4.0";
version = "5.4.1";
src = fetchFromGitHub {
owner = "mhogomchungu";
repo = "media-downloader";
rev = finalAttrs.version;
hash = "sha256-OiFTY/3g4B23XFYT8kcJwFX/nLGVVB53E+vykBpN/Sw=";
hash = "sha256-J9TXjN/u/I8m5Boa8SE0uI5iExVEm3yCRQ6c0fzW+jM=";
};
nativeBuildInputs = [
pkgs/by-name/mu/museeks/package.nix
+2 -2
View File
@@ -16,11 +16,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "museeks";
version = "0.22.2";
version = "0.22.3";
src = fetchurl {
url = "https://github.com/martpie/museeks/releases/download/${finalAttrs.version}/Museeks_${finalAttrs.version}_amd64.deb";
hash = "sha256-yK29t0cMPuZ14NEPoM/ekknXVgY9rxNm8eulgDCg0uw=";
hash = "sha256-X9CVPFLCb038/CuPTVYCwdddzDSATbJaVtzodRHQL9o=";
};
nativeBuildInputs = [
pkgs/by-name/po/podman-desktop/package.nix
+3 -3
View File
@@ -22,7 +22,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "podman-desktop";
version = "1.20.1";
version = "1.20.2";
passthru.updateScript = _experimental-update-script-combinators.sequence [
(nix-update-script { })
@@ -55,13 +55,13 @@ stdenv.mkDerivation (finalAttrs: {
owner = "containers";
repo = "podman-desktop";
tag = "v${finalAttrs.version}";
hash = "sha256-diqlooa4SsFtmzl3A25PEaV0ALnghoj7htBGRgXn6As=";
hash = "sha256-+UdVTTm528Q9TIZwznzseBn8JazvQJOxJyjdzBmVUaA=";
};
pnpmDeps = pnpm_10.fetchDeps {
inherit (finalAttrs) pname version src;
fetcherVersion = 1;
hash = "sha256-8lNmCLfuAkXK1Du4iYYasRTozZf0HoAttf8Dfc6Jglw=";
hash = "sha256-GX33PE534jWX7v9jCwZALuCT6gQClBXlOTPZC09EuC8=";
};
patches = [
pkgs/by-name/rp/rpm-sequoia/package.nix
+3 -3
View File
@@ -11,17 +11,17 @@
rustPlatform.buildRustPackage rec {
pname = "rpm-sequoia";
version = "1.8.0";
version = "1.9.0";
src = fetchFromGitHub {
owner = "rpm-software-management";
repo = "rpm-sequoia";
tag = "v${version}";
hash = "sha256-Z2falZxewgMrrAyh8sDlIr9NfCzNs8GA+RHmfNYfzio=";
hash = "sha256-KYoxQwQTcc75VEwWXEhHd+GNowzC7JlcIf6r7WM4Els=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-LJyq2gWP/I6+4lArhsWmcAHlub0Ww76jkq2gagP86ao=";
cargoHash = "sha256-oKk768pgMYMJ3NTSlzqV1Y61fyu2DxY62JOpLKfUUY4=";
patches = [
./objdump.patch
pkgs/by-name/sa/sarasa-gothic/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "sarasa-gothic";
version = "1.0.31";
version = "1.0.32";
src = fetchurl {
# Use the 'ttc' files here for a smaller closure size.
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip";
hash = "sha256-6jVbe37lbpPmNzyiBb6fUfru3EZ71Eco9BuXNzgdQD8=";
hash = "sha256-XgWtuNtBqizk9HHiVyQRuUeCBrra2Hq9jnlvZdPjNTQ=";
};
sourceRoot = ".";
pkgs/by-name/sh/shopware-cli/package.nix
+3 -3
View File
@@ -10,12 +10,12 @@
buildGoModule rec {
pname = "shopware-cli";
version = "0.6.19";
version = "0.6.22";
src = fetchFromGitHub {
repo = "shopware-cli";
owner = "FriendsOfShopware";
tag = version;
hash = "sha256-alR7t0HgR3LrKDWPV2alWWThylvoBVnYuo6UmT81hcA=";
hash = "sha256-u5hFjDLGBXVvAp4WYWBb3HCzGDjkg9jj251LaV1zA8I=";
};
nativeBuildInputs = [
@@ -27,7 +27,7 @@ buildGoModule rec {
dart-sass
];
vendorHash = "sha256-sIABE9HrdaUIBZiCEpWKHHRnsHoF5ntO+CKg9YMsTIY=";
vendorHash = "sha256-Ckn6+DzHPX+UG5YxYqvkdaio/elRQssbDSR+zAfxzdE=";
postInstall = ''
installShellCompletion --cmd shopware-cli \
pkgs/by-name/st/starc/package.nix
+2 -2
View File
@@ -6,10 +6,10 @@
}:
let
pname = "starc";
version = "0.7.7";
version = "0.7.8";
src = fetchurl {
url = "https://github.com/story-apps/starc/releases/download/v${version}/starc-setup.AppImage";
hash = "sha256-jjas5vx+emdc4OUjXFAGYkKrR6cgb9BlabVv17KAaIQ=";
hash = "sha256-thW7BzbY0eR72sa0eQT8iTo+K193k2C5b+R0zyXni9Y=";
};
appimageContents = appimageTools.extract { inherit pname version src; };
pkgs/by-name/wi/wiremix/package.nix
+3 -3
View File
@@ -8,15 +8,15 @@
rustPlatform.buildRustPackage rec {
pname = "wiremix";
version = "0.5.0";
version = "0.6.2";
src = fetchCrate {
inherit pname version;
hash = "sha256-8pXpbW6/XYiWUqulL8b+kGqhTa/X8+tkgL8EWguWs6c=";
hash = "sha256-7O8B45ZJr0QDRnbcu4nV4kbH8hCz+tUbjyy2KDMUr3o=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-czhPbXkhuwUdwwP2uizU1Ob8t/x0nrJr3rquRO8Zktw=";
cargoHash = "sha256-Wb697rtP0s/eua69mDawT6/ZaxwjxmwuxZMgrrM2Vsg=";
nativeBuildInputs = [
pkg-config
pkgs/desktops/xfce/core/thunar/default.nix
+2 -2
View File
@@ -23,9 +23,9 @@
mkXfceDerivation {
category = "xfce";
pname = "thunar";
version = "4.20.3";
version = "4.20.4";
sha256 = "sha256-YOh7tuCja9F2VvzX+QqsKHJfebXWbhLqvcraq6PBOGo=";
sha256 = "sha256-0yDZI82ePjZSSd0aKlfjr2IVPyNkvSWqa4l6Dse98w8=";
nativeBuildInputs =
[
pkgs/development/ocaml-modules/magic-trace/default.nix
+6 -2
View File
@@ -5,6 +5,7 @@
ocaml-crunch,
angstrom,
async,
camlzip,
cohttp,
cohttp_static_handler ? null,
core,
@@ -14,11 +15,12 @@
ppx_jane,
re,
shell ? null,
zstandard ? null,
}:
buildDunePackage rec {
pname = "magic-trace";
version = "1.2.3";
version = "1.2.4";
minimalOCamlVersion = "4.12";
@@ -26,7 +28,7 @@ buildDunePackage rec {
owner = "janestreet";
repo = "magic-trace";
rev = "v${version}";
hash = "sha256-cAoaAXZOeWNQh6emm17a9oCis8s4jJxPQMI/NfiUa7g=";
hash = "sha256-LkhnlOd5rI8cbOYbVqrkRJ2qTcRn3Zzl6GjQEdjBjVA=";
};
nativeBuildInputs = [
@@ -35,6 +37,7 @@ buildDunePackage rec {
buildInputs = [
angstrom
async
camlzip
cohttp
cohttp_static_handler
core
@@ -44,6 +47,7 @@ buildDunePackage rec {
ppx_jane
re
shell
zstandard
];
meta = with lib; {
pkgs/development/ocaml-modules/reason-react/ppx.nix
+2 -6
View File
@@ -16,16 +16,12 @@ buildDunePackage {
url = "https://github.com/reasonml/reason-react/releases/download/${version}/reason-react-${version}.tbz";
hash = "sha256-+pPJo/b50vp4pAC/ygI1LHB5O0pDJ1xpcQZOdFP8Q80=";
};
buildInputs = [
ppxlib
];
buildInputs = [ ppxlib ];
doCheck = false; # Needs to run in reason-react, see default.nix
meta = {
description = "React.js JSX PPX";
homepage = "https://github.com/reasonml/reason-react";
license = lib.licenses.mit;
maintainers = [
lib.maintainers.vog
];
maintainers = [ lib.maintainers.vog ];
};
}
pkgs/development/python-modules/azure-keyvault-certificates/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "azure-keyvault-certificates";
version = "4.9.0";
version = "4.10.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "azure_keyvault_certificates";
inherit version;
hash = "sha256-ndBPj/5AkViCgut1SAuzHlhN2ZQNCfnepn+sg2Ppflk=";
hash = "sha256-AE/0enMVL59A9njloHcZt1OjyobwRgv+qvaiMwSHLgU=";
};
nativeBuildInputs = [ setuptools ];
pkgs/development/python-modules/azure-mgmt-dns/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "azure-mgmt-dns";
version = "8.2.0";
version = "9.0.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "azure_mgmt_dns";
inherit version;
hash = "sha256-Ynueo98L94qJWsrcUUjeyEwomAY7+qv/+LFLqpg7WW4=";
hash = "sha256-ifjE5GepQiS5e/Ft121b1ha/Ec7+cn93ZhilfMVIbjc=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/skops/default.nix
+5 -3
View File
@@ -20,8 +20,6 @@ buildPythonPackage rec {
version = "0.11.0";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "skops-dev";
repo = "skops";
@@ -61,7 +59,11 @@ buildPythonPackage rec {
# Segfaults on darwin
"skops/io/tests/test_persist.py"
];
pytestFlags = [
# Warning from scipy.optimize in skops/io/tests/test_persist.py::test_dump_and_load_with_file_wrapper
# https://github.com/skops-dev/skops/issues/479
"-Wignore::DeprecationWarning"
];
pythonImportsCheck = [ "skops" ];
meta = {
pkgs/os-specific/linux/device-tree/apply_overlays.py
+41 -30
View File
@@ -3,6 +3,7 @@ from dataclasses import dataclass
from functools import cached_property
import json
from pathlib import Path
import shutil
from libfdt import Fdt, FdtException, FDT_ERR_NOSPACE, FDT_ERR_NOTFOUND, fdt_overlay_apply
@@ -14,16 +15,16 @@ class Overlay:
dtbo_file: Path
@cached_property
def fdt(self):
def fdt(self) -> Fdt:
with self.dtbo_file.open("rb") as fd:
return Fdt(fd.read())
@cached_property
def compatible(self):
def compatible(self) -> set[str]:
return get_compatible(self.fdt)
def get_compatible(fdt):
def get_compatible(fdt) -> set[str]:
root_offset = fdt.path_offset("/")
try:
@@ -56,6 +57,33 @@ def apply_overlay(dt: Fdt, dto: Fdt) -> Fdt:
raise FdtException(err)
def process_dtb(rel_path: Path, source: Path, destination: Path, overlays_data: list[Overlay]):
source_dt = source / rel_path
print(f"Processing source device tree {rel_path}...")
with source_dt.open("rb") as fd:
dt = Fdt(fd.read())
for overlay in overlays_data:
if overlay.filter and overlay.filter not in str(rel_path):
print(f" Skipping overlay {overlay.name}: filter does not match")
continue
dt_compatible = get_compatible(dt)
if len(dt_compatible) == 0:
print(f" Device tree {rel_path} has no compatible string set. Assuming it's compatible with overlay")
elif not overlay.compatible.intersection(dt_compatible):
print(f" Skipping overlay {overlay.name}: {overlay.compatible} is incompatible with {dt_compatible}")
continue
print(f" Applying overlay {overlay.name}")
dt = apply_overlay(dt, overlay.fdt)
print(f"Saving final device tree {rel_path}...")
dest_path = destination / rel_path
dest_path.parent.mkdir(parents=True, exist_ok=True)
with dest_path.open("wb") as fd:
fd.write(dt.as_bytearray())
def main():
parser = ArgumentParser(description='Apply a list of overlays to a directory of device trees')
parser.add_argument("--source", type=Path, help="Source directory")
@@ -77,33 +105,16 @@ def main():
for item in json.load(fd)
]
for source_dt in source.glob("**/*.dtb"):
rel_path = source_dt.relative_to(source)
print(f"Processing source device tree {rel_path}...")
with source_dt.open("rb") as fd:
dt = Fdt(fd.read())
for overlay in overlays_data:
if overlay.filter and overlay.filter not in str(rel_path):
print(f" Skipping overlay {overlay.name}: filter does not match")
continue
dt_compatible = get_compatible(dt)
if len(dt_compatible) == 0:
print(f" Device tree {rel_path} has no compatible string set. Assuming it's compatible with overlay")
elif not overlay.compatible.intersection(dt_compatible):
print(f" Skipping overlay {overlay.name}: {overlay.compatible} is incompatible with {dt_compatible}")
continue
print(f" Applying overlay {overlay.name}")
dt = apply_overlay(dt, overlay.fdt)
print(f"Saving final device tree {rel_path}...")
dest_path = destination / rel_path
dest_path.parent.mkdir(parents=True, exist_ok=True)
with dest_path.open("wb") as fd:
fd.write(dt.as_bytearray())
for dirpath, dirnames, filenames in source.walk():
for filename in filenames:
rel_path = (dirpath / filename).relative_to(source)
if filename.endswith(".dtb"):
process_dtb(rel_path, source, destination, overlays_data)
else:
# Copy other files through
dest_path = destination / rel_path
dest_path.parent.mkdir(parents=True, exist_ok=True)
shutil.copy(source / rel_path, dest_path)
if __name__ == '__main__':
pkgs/top-level/ocaml-packages.nix
-1
View File
@@ -1799,7 +1799,6 @@ let
reason-native = lib.recurseIntoAttrs (callPackage ../development/ocaml-modules/reason-native { });
reason-react = callPackage ../development/ocaml-modules/reason-react { };
reason-react-ppx = callPackage ../development/ocaml-modules/reason-react/ppx.nix { };
rebez = callPackage ../development/ocaml-modules/rebez { };