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

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-03-24 18:01:19 +00:00 committed by GitHub
parent 363196bdee cba6cf337c
commit e3eacb46bc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
76 changed files with 6408 additions and 349 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -15023,6 +15023,12 @@
fingerprint = "E005 48D5 D6AC 812C AAD2 AFFA 9C42 B05E 5913 60DC";
}];
};
pbeucher = {
email = "pierre@crafteo.io";
github = "PierreBeucher";
githubId = 5041481;
name = "Pierre Beucher";
};
pblkt = {
email = "pebblekite@gmail.com";
github = "pblkt";

9
nixos/modules/profiles/all-hardware.nix
View File

@ -58,15 +58,7 @@ in
# Hyper-V support.
"hv_storvsc"
] ++ lib.optionals pkgs.stdenv.hostPlatform.isAarch [
# Most of the following falls into two categories:
# - early KMS / early display
# - early storage (e.g. USB) support
# Allows using framebuffer configured by the initial boot firmware
"simplefb"
# Allwinner support
# Required for early KMS
"sun4i-drm"
"sun8i-mixer" # Audio, but required for kms
@ -75,7 +67,6 @@ in
"pwm-sun4i"
# Broadcom
"vc4"
] ++ lib.optionals pkgs.stdenv.isAarch64 [
# Most of the following falls into two categories:

6
nixos/modules/services/misc/tandoor-recipes.nix
View File

@ -20,7 +20,10 @@ let
manage = pkgs.writeShellScript "manage" ''
set -o allexport # Export the following env vars
${lib.toShellVars env}
exec ${pkg}/bin/tandoor-recipes "$@"
eval "$(${config.systemd.package}/bin/systemctl show -pUID,GID,MainPID tandoor-recipes.service)"
exec ${pkgs.util-linux}/bin/nsenter \
-t $MainPID -m -S $UID -G $GID \
${pkg}/bin/tandoor-recipes "$@"
'';
in
{
@ -82,6 +85,7 @@ in
Restart = "on-failure";
User = "tandoor_recipes";
Group = "tandoor_recipes";
DynamicUser = true;
StateDirectory = "tandoor-recipes";
WorkingDirectory = "/var/lib/tandoor-recipes";

1
pkgs/applications/editors/vscode/extensions/default.nix
View File

@ -2843,6 +2843,7 @@ let
ms-ceintl = callPackage ./language-packs.nix { }; # non-English language packs
ms-dotnettools.csdevkit = callPackage ./ms-dotnettools.csdevkit { };
ms-dotnettools.csharp = callPackage ./ms-dotnettools.csharp { };
ms-kubernetes-tools.vscode-kubernetes-tools = buildVscodeMarketplaceExtension {

117
pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix Normal file
View File

@ -0,0 +1,117 @@
{ lib
, icu
, openssl
, patchelf
, stdenv
, vscode-utils
}:
let
inherit (stdenv.hostPlatform) system;
inherit (vscode-utils) buildVscodeMarketplaceExtension;
extInfo = {
x86_64-linux = {
arch = "linux-x64";
sha256 = "sha256-7m85Zl9oV40le3nkNPzoKu/AAf8XhQpI8sBMsQXmBg8=";
binaries = [
"components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/servicehub-controller-net60.linux-x64/Microsoft.ServiceHub.Controller"
"components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-code-servicehost.linux-x64/Microsoft.VisualStudio.Code.ServiceHost"
"components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-reliability-monitor.linux-x64/Microsoft.VisualStudio.Reliability.Monitor"
"components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-server.linux-x64/Microsoft.VisualStudio.Code.Server"
];
};
aarch64-linux = {
arch = "linux-arm64";
sha256 = "sha256-39D55EdwE4baDYbHc9GD/1XoxGbQkUkS1H2uysJHlxw=";
binaries = [
"components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/servicehub-controller-net60.linux-arm64/Microsoft.ServiceHub.Controller"
"components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-code-servicehost.linux-arm64/Microsoft.VisualStudio.Code.ServiceHost"
"components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-reliability-monitor.linux-arm64/Microsoft.VisualStudio.Reliability.Monitor"
"components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-server.linux-arm64/Microsoft.VisualStudio.Code.Server"
];
};
x86_64-darwin = {
arch = "darwin-x64";
sha256 = "sha256-gfhJX07R+DIw9FbzaEE0JZwEmDeifiq4vHyMHZZ1udM=";
binaries = [
"components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/servicehub-controller-net60.darwin-x64/Microsoft.ServiceHub.Controller"
"components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-x64/Microsoft.VisualStudio.Code.ServiceHost"
"components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-reliability-monitor.darwin-x64/Microsoft.VisualStudio.Reliability.Monitor"
"components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-server.darwin-x64/Microsoft.VisualStudio.Code.Server"
];
};
aarch64-darwin = {
arch = "darwin-arm64";
sha256 = "sha256-vogstgCWvI9csNF9JfJ41XPR1POy842g2yhWqIDoHLw=";
binaries = [
"components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/servicehub-controller-net60.darwin-arm64/Microsoft.ServiceHub.Controller"
"components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-arm64/Microsoft.VisualStudio.Code.ServiceHost"
"components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-reliability-monitor.darwin-arm64/Microsoft.VisualStudio.Reliability.Monitor"
"components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-server.darwin-arm64/Microsoft.VisualStudio.Code.Server"
];
};
}.${system} or (throw "Unsupported system: ${system}");
in
buildVscodeMarketplaceExtension {
mktplcRef = {
name = "csdevkit";
publisher = "ms-dotnettools";
version = "1.4.28";
inherit (extInfo) sha256 arch;
};
sourceRoot = "extension"; # This has more than one folder.
nativeBuildInputs = [
patchelf
];
postPatch = ''
declare ext_unique_id
ext_unique_id="$(basename "$out" | head -c 32)"
patchelf_add_icu_as_needed() {
declare elf="''${1?}"
declare icu_major_v="${
lib.head (lib.splitVersion (lib.getVersion icu.name))
}"
for icu_lib in icui18n icuuc icudata; do
patchelf --add-needed "lib''${icu_lib}.so.$icu_major_v" "$elf"
done
}
patchelf_common() {
declare elf="''${1?}"
patchelf_add_icu_as_needed "$elf"
patchelf --add-needed "libssl.so" "$elf"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${lib.makeLibraryPath [stdenv.cc.cc openssl icu.out]}:\$ORIGIN" \
"$elf"
}
substituteInPlace dist/extension.js \
--replace 'e.extensionPath,"cache"' 'require("os").tmpdir(),"'"$ext_unique_id"'"' \
--replace 't.setExecuteBit=async function(e){if("win32"!==process.platform){const t=i.join(e[a.SERVICEHUB_CONTROLLER_COMPONENT_NAME],"Microsoft.ServiceHub.Controller"),n=i.join(e[a.SERVICEHUB_HOST_COMPONENT_NAME],(0,a.getServiceHubHostEntrypointName)()),r=[(0,a.getServerPath)(e),t,n,(0,c.getReliabilityMonitorPath)(e)];await Promise.all(r.map((e=>(0,o.chmod)(e,"0755"))))}}' 't.setExecuteBit=async function(e){}'
''
+ (lib.concatStringsSep "\n" (map
(bin: ''
chmod +x "${bin}"
'')
extInfo.binaries))
+ lib.optionalString stdenv.isLinux (lib.concatStringsSep "\n" (map
(bin: ''
patchelf_common "${bin}"
'')
extInfo.binaries));
meta = {
changelog = "https://marketplace.visualstudio.com/items/ms-dotnettools.csdevkit/changelog";
description = "The official Visual Studio Code extension for C# from Microsoft";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csdevkit";
license = lib.licenses.unfree;
maintainers = [ lib.maintainers.ggg ];
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
};
}

5
pkgs/applications/graphics/sane/backends/default.nix
View File

@ -38,9 +38,6 @@ stdenv.mkDerivation {
url = "https://raw.githubusercontent.com/void-linux/void-packages/4b97cd2fb4ec38712544438c2491b6d7d5ab334a/srcpkgs/sane/patches/sane-desc-cross.patch";
sha256 = "sha256-y6BOXnOJBSTqvRp6LwAucqaqv+OLLyhCS/tXfLpnAPI=";
})
# generate hwdb entries for scanners handled by other backends like epkowa
# https://gitlab.com/sane-project/backends/-/issues/619
./sane-desc-generate-entries-unsupported-scanners.patch
];
postPatch = ''
@ -110,7 +107,7 @@ stdenv.mkDerivation {
in ''
mkdir -p $out/etc/udev/rules.d/ $out/etc/udev/hwdb.d
./tools/sane-desc -m udev+hwdb -s doc/descriptions:doc/descriptions-external > $out/etc/udev/rules.d/49-libsane.rules
./tools/sane-desc -m udev+hwdb -s doc/descriptions -m hwdb > $out/etc/udev/hwdb.d/20-sane.hwdb
./tools/sane-desc -m udev+hwdb -s doc/descriptions:doc/descriptions-external -m hwdb > $out/etc/udev/hwdb.d/20-sane.hwdb
# the created 49-libsane references /bin/sh
substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \
--replace "RUN+=\"/bin/sh" "RUN+=\"${runtimeShell}"

19
pkgs/applications/graphics/sane/backends/sane-desc-generate-entries-unsupported-scanners.patch
View File

@ -1,19 +0,0 @@
sane-desc does not include unsupported .desc entries like EPSON V300 PHOTO,
which can be supported by the (unfree) epkowa driver.
But we need those entries so that unprivileged users which have installed epkowa
can use the scanner.
diff --git a/tools/sane-desc.c b/tools/sane-desc.c
index 7a8645dea..9c9719fef 100644
--- a/tools/sane-desc.c
+++ b/tools/sane-desc.c
@@ -3243,10 +3243,6 @@ create_usbids_table (void)
for (model = mfg->model; model; model = model->next)
{
- if ((model->status == status_unsupported)
- || (model->status == status_unknown))
- continue;
-
if (model->usb_vendor_id && model->usb_product_id)
{
first_usbid = add_usbid (first_usbid, mfg->name,

2
pkgs/applications/maui/default.nix
View File

@ -15,7 +15,7 @@ See also `pkgs/applications/kde` as this is what this is based on.
# Updates
1. Update the URL in `./fetch.sh`.
2. Run `callPackage ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/maui`
2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/maui`
from the top of the Nixpkgs tree.
3. Use `nixpkgs-review wip` to check that everything builds.
4. Commit the changes and open a pull request.

192
pkgs/applications/maui/srcs.nix
View File

@ -4,59 +4,59 @@
{
agenda = {
version = "0.5.2";
version = "0.5.3";
src = fetchurl {
url = "${mirror}/stable/maui/agenda/0.5.2/agenda-0.5.2.tar.xz";
sha256 = "160y0pq3mj72wxyfnnl45488j4kpl26xpf83vlnfshiwvc6c0m3y";
name = "agenda-0.5.2.tar.xz";
url = "${mirror}/stable/maui/agenda/0.5.3/agenda-0.5.3.tar.xz";
sha256 = "0kx5adv8w0dm84hibaazik6y9bcxw7w7zikw546d4dlaq13pk97i";
name = "agenda-0.5.3.tar.xz";
};
};
arca = {
version = "0.5.2";
version = "0.5.3";
src = fetchurl {
url = "${mirror}/stable/maui/arca/0.5.2/arca-0.5.2.tar.xz";
sha256 = "0l0x24m55hc20yc40yjj0zx910yzh31qn911swdli39iy4c6mxk2";
name = "arca-0.5.2.tar.xz";
url = "${mirror}/stable/maui/arca/0.5.3/arca-0.5.3.tar.xz";
sha256 = "0mgn3y2jh9ifxg41fb6z14gp27f1pwfk9y8492qfp3wqfhhmycmk";
name = "arca-0.5.3.tar.xz";
};
};
bonsai = {
version = "1.1.2";
version = "1.1.3";
src = fetchurl {
url = "${mirror}/stable/maui/bonsai/1.1.2/bonsai-1.1.2.tar.xz";
sha256 = "0nzp0ixxap3q1llv42l71rygxv98hvcmqwqdw7690w650hja7zvj";
name = "bonsai-1.1.2.tar.xz";
url = "${mirror}/stable/maui/bonsai/1.1.3/bonsai-1.1.3.tar.xz";
sha256 = "0xyfqaihzjdbgcd0mg81qpd12w304zlhdw8mmiyqfamxh33xksql";
name = "bonsai-1.1.3.tar.xz";
};
};
booth = {
version = "1.1.2";
version = "1.1.3";
src = fetchurl {
url = "${mirror}/stable/maui/booth/1.1.2/booth-1.1.2.tar.xz";
sha256 = "06gg4zgpn8arnzmi54x7xbdg5wyc3a86v9z5x6y101imh6cwbhyw";
name = "booth-1.1.2.tar.xz";
url = "${mirror}/stable/maui/booth/1.1.3/booth-1.1.3.tar.xz";
sha256 = "0l7bjlpm3m2wc528c6y5s5yf9rlxrl5h0c1lk9s90zzkmyhzpxrl";
name = "booth-1.1.3.tar.xz";
};
};
buho = {
version = "3.0.2";
version = "3.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/buho/3.0.2/buho-3.0.2.tar.xz";
sha256 = "0sllffddngzxc2wi2wszjxzb75rca0a42bdylm7pxmr5p8mafn1l";
name = "buho-3.0.2.tar.xz";
url = "${mirror}/stable/maui/buho/3.1.0/buho-3.1.0.tar.xz";
sha256 = "0pw8ljnhb3xsbsls6ynihvb5vargk13bija02s963kkbyvcrka0a";
name = "buho-3.1.0.tar.xz";
};
};
clip = {
version = "3.0.2";
version = "3.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/clip/3.0.2/clip-3.0.2.tar.xz";
sha256 = "0pjqk1l1cwkvwrlv1lb113cl8kggppxqhdsild83wrzbfqx9nrva";
name = "clip-3.0.2.tar.xz";
url = "${mirror}/stable/maui/clip/3.1.0/clip-3.1.0.tar.xz";
sha256 = "1pcka3z5ik5s9hv0np83f6g1fp1pgzq14h83k4l38wfcvbmnjngb";
name = "clip-3.1.0.tar.xz";
};
};
communicator = {
version = "3.0.2";
version = "3.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/communicator/3.0.2/communicator-3.0.2.tar.xz";
sha256 = "0hmapwsgrlaiwvprpmllfy943w0sclnk4vg7sb6rys1i96f3yz6r";
name = "communicator-3.0.2.tar.xz";
url = "${mirror}/stable/maui/communicator/3.1.0/communicator-3.1.0.tar.xz";
sha256 = "0207jz891d8hs36ma51jbm9af53423lvfir41xmbw5k8j1wi925p";
name = "communicator-3.1.0.tar.xz";
};
};
era = {
@ -68,139 +68,139 @@
};
};
fiery = {
version = "1.1.2";
version = "1.1.3";
src = fetchurl {
url = "${mirror}/stable/maui/fiery/1.1.2/fiery-1.1.2.tar.xz";
sha256 = "0ba3bxhvfzkpwrrnfyhbvprlhdv2vmgmi41lpq2pian0d3nkc05s";
name = "fiery-1.1.2.tar.xz";
url = "${mirror}/stable/maui/fiery/1.1.3/fiery-1.1.3.tar.xz";
sha256 = "1wkvrp1b0y0b7mppwymxmlfrbczxqgxaws10y2001mdxryjf160b";
name = "fiery-1.1.3.tar.xz";
};
};
index-fm = {
version = "3.0.2";
version = "3.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/index/3.0.2/index-fm-3.0.2.tar.xz";
sha256 = "08ncjliqzx71scmfxl3h24w9s8dgrp6gd7nf6pczyn5arqf96d81";
name = "index-fm-3.0.2.tar.xz";
url = "${mirror}/stable/maui/index/3.1.0/index-fm-3.1.0.tar.xz";
sha256 = "13pvx4rildnc0yqb3km9r9spd2wf6vwayfh0i6bai2vfklv405yg";
name = "index-fm-3.1.0.tar.xz";
};
};
mauikit = {
version = "3.0.2";
version = "3.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit/3.0.2/mauikit-3.0.2.tar.xz";
sha256 = "19317xfbyy3cg9nm1dqknvypsj9kq8phz36srwvwfyxd26kaqs2s";
name = "mauikit-3.0.2.tar.xz";
url = "${mirror}/stable/maui/mauikit/3.1.0/mauikit-3.1.0.tar.xz";
sha256 = "1v7nas1mdkpfyz6580y1z1rk3ad0azh047y19bjy0rrpp75iclmz";
name = "mauikit-3.1.0.tar.xz";
};
};
mauikit-accounts = {
version = "3.0.2";
version = "3.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-accounts/3.0.2/mauikit-accounts-3.0.2.tar.xz";
sha256 = "1h876vz9vfyl44pryhf5s4lkzik00zwhjvyrv7f4b1zwjz3xbqai";
name = "mauikit-accounts-3.0.2.tar.xz";
url = "${mirror}/stable/maui/mauikit-accounts/3.1.0/mauikit-accounts-3.1.0.tar.xz";
sha256 = "0blzmjdv4cs2m4967mksj0pxpd1gvgjpkgwbwkhya36qc443yfya";
name = "mauikit-accounts-3.1.0.tar.xz";
};
};
mauikit-calendar = {
version = "3.0.2";
version = "3.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-calendar/3.0.2/mauikit-calendar-3.0.2.tar.xz";
sha256 = "098d2alw1dnhpqwkdy0wrl6cvanyb6vg8qy5aqmgmsk0hil1s8x1";
name = "mauikit-calendar-3.0.2.tar.xz";
url = "${mirror}/stable/maui/mauikit-calendar/3.1.0/mauikit-calendar-3.1.0.tar.xz";
sha256 = "13hf6z99ibly4cbaf4n4r54qc2vcbmf8i8qjndf35z6kxjc4iwpd";
name = "mauikit-calendar-3.1.0.tar.xz";
};
};
mauikit-documents = {
version = "3.0.2";
version = "3.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-documents/3.0.2/mauikit-documents-3.0.2.tar.xz";
sha256 = "1ln8nk6n2wcqdjd4l5pzam9291rx52mal7rdxs06f6fwszwifhyr";
name = "mauikit-documents-3.0.2.tar.xz";
url = "${mirror}/stable/maui/mauikit-documents/3.1.0/mauikit-documents-3.1.0.tar.xz";
sha256 = "1v1hbzb84rkva5icmynh87h979xgv8a8da6pfzlf1y7h6syw1wf4";
name = "mauikit-documents-3.1.0.tar.xz";
};
};
mauikit-filebrowsing = {
version = "3.0.2";
version = "3.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-filebrowsing/3.0.2/mauikit-filebrowsing-3.0.2.tar.xz";
sha256 = "03dcmpw8l19mziswhhsvyiiid07qx0c4ddh8986llsz6xngdnlib";
name = "mauikit-filebrowsing-3.0.2.tar.xz";
url = "${mirror}/stable/maui/mauikit-filebrowsing/3.1.0/mauikit-filebrowsing-3.1.0.tar.xz";
sha256 = "146iflqb4kq25f1azajlbwlbphbk754vvf6w7fzl75pdwhqsbxvp";
name = "mauikit-filebrowsing-3.1.0.tar.xz";
};
};
mauikit-imagetools = {
version = "3.0.2";
version = "3.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-imagetools/3.0.2/mauikit-imagetools-3.0.2.tar.xz";
sha256 = "1xryms7mc3lq8p67m2h3cxffyd9dk8m738ap30aq9ym62qq76psl";
name = "mauikit-imagetools-3.0.2.tar.xz";
url = "${mirror}/stable/maui/mauikit-imagetools/3.1.0/mauikit-imagetools-3.1.0.tar.xz";
sha256 = "1r7j9lg19s63325xyz6i8hzfn751s14mlpxym533mpzpx6yg784q";
name = "mauikit-imagetools-3.1.0.tar.xz";
};
};
mauikit-terminal = {
version = "3.0.2";
version = "3.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-terminal/3.0.2/mauikit-terminal-3.0.2.tar.xz";
sha256 = "0abywv56ljxbmsi5y3x9agbgbhvscnkznja9adwjj073pavvaf1g";
name = "mauikit-terminal-3.0.2.tar.xz";
url = "${mirror}/stable/maui/mauikit-terminal/3.1.0/mauikit-terminal-3.1.0.tar.xz";
sha256 = "0q2d8lxzhmncassnl043vrgz9am25yk060v7l7bwm6fp9vv5ix5f";
name = "mauikit-terminal-3.1.0.tar.xz";
};
};
mauikit-texteditor = {
version = "3.0.2";
version = "3.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-texteditor/3.0.2/mauikit-texteditor-3.0.2.tar.xz";
sha256 = "09wdvjy8c0b5lka0fj28kl99w5y3w0nvz2mnr3ic5kn825ay1wmy";
name = "mauikit-texteditor-3.0.2.tar.xz";
url = "${mirror}/stable/maui/mauikit-texteditor/3.1.0/mauikit-texteditor-3.1.0.tar.xz";
sha256 = "0fsjqfvg2fnfmrsz9hfcw20l5yv0pi5jiww2aqyqqpy09q7jxphv";
name = "mauikit-texteditor-3.1.0.tar.xz";
};
};
mauiman = {
version = "3.0.2";
version = "3.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/mauiman/3.0.2/mauiman-3.0.2.tar.xz";
sha256 = "0aqzgdkcs6cdlsbsyiyhadambcwwa0xj2q2yj5hv5d42q25ibfs1";
name = "mauiman-3.0.2.tar.xz";
url = "${mirror}/stable/maui/mauiman/3.1.0/mauiman-3.1.0.tar.xz";
sha256 = "1462j8xbla6jra3qpxgp5hi580lk53a6ry4fzmllqpzprwgiyx2w";
name = "mauiman-3.1.0.tar.xz";
};
};
nota = {
version = "3.0.2";
version = "3.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/nota/3.0.2/nota-3.0.2.tar.xz";
sha256 = "11lqdxwsdvf1vz9y1d9r38vxfsz4jfnin3c1ipsvjl0f0zn1glr6";
name = "nota-3.0.2.tar.xz";
url = "${mirror}/stable/maui/nota/3.1.0/nota-3.1.0.tar.xz";
sha256 = "0x9xaas86rhbqs7wsc7chxc4iijg73wnzj2125dgdwcridmdfxix";
name = "nota-3.1.0.tar.xz";
};
};
pix = {
version = "3.0.2";
version = "3.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/pix/3.0.2/pix-3.0.2.tar.xz";
sha256 = "0wlpqqbf4j7dlylxhfixrcjz0yz9csni4vnbqv9l5vkxxwf0mq4k";
name = "pix-3.0.2.tar.xz";
url = "${mirror}/stable/maui/pix/3.1.0/pix-3.1.0.tar.xz";
sha256 = "0j3xwdscjqyisv5zn8pb0mqarpfkknz3wxgzd7yl2g1gxdpl502h";
name = "pix-3.1.0.tar.xz";
};
};
shelf = {
version = "3.0.2";
version = "3.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/shelf/3.0.2/shelf-3.0.2.tar.xz";
sha256 = "1x27grdn9qa7ysxh4fb35h5376crpbl39vpd6hn0a7c3fk74w95q";
name = "shelf-3.0.2.tar.xz";
url = "${mirror}/stable/maui/shelf/3.1.0/shelf-3.1.0.tar.xz";
sha256 = "166l6f5ifv5yz3sgds50bi9swdr3zl7m499myy5x8ph2jw1i2dvq";
name = "shelf-3.1.0.tar.xz";
};
};
station = {
version = "3.0.2";
version = "3.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/station/3.0.2/station-3.0.2.tar.xz";
sha256 = "14i4z5lkj2rg7p5nkglqpzvrrxmf7b07kf49hh1jdk08753abc76";
name = "station-3.0.2.tar.xz";
url = "${mirror}/stable/maui/station/3.1.0/station-3.1.0.tar.xz";
sha256 = "0skwagzwd4v24ldrww727zs3chzfb1spbynzdjb0yc7pggzxn8nf";
name = "station-3.1.0.tar.xz";
};
};
strike = {
version = "1.1.2";
version = "1.1.3";
src = fetchurl {
url = "${mirror}/stable/maui/strike/1.1.2/strike-1.1.2.tar.xz";
sha256 = "01ak3h6n0z3l346nbzfabkgbzwbx1fm3l9g7myiip4518cb2n559";
name = "strike-1.1.2.tar.xz";
url = "${mirror}/stable/maui/strike/1.1.3/strike-1.1.3.tar.xz";
sha256 = "1b0n56mfchcf37j33i3kxp3pd9sc2f1fq5hjfhy1s34dk8gfv947";
name = "strike-1.1.3.tar.xz";
};
};
vvave = {
version = "3.0.2";
version = "3.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/vvave/3.0.2/vvave-3.0.2.tar.xz";
sha256 = "1py46ryi57757wyqfvxc2h02x33n11g1v04f0hac0zkjilp5l21k";
name = "vvave-3.0.2.tar.xz";
url = "${mirror}/stable/maui/vvave/3.1.0/vvave-3.1.0.tar.xz";
sha256 = "1ig6vzrqrq4h8y69xm6hxppzspa4vrawpn4rk6rva26j5qm7dh1l";
name = "vvave-3.1.0.tar.xz";
};
};
}

4
pkgs/applications/misc/gpxsee/default.nix
View File

@ -18,13 +18,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gpxsee";
version = "13.17";
version = "13.18";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = finalAttrs.version;
hash = "sha256-pk6PMQDPvyfUS5PMRu6pz/QrRrOfbq9oGsMk0ZDawDM=";
hash = "sha256-FetXV1D1aW7eanhPQkNzcGwKMMwzXLhBZjrzg1LD980=";
};
buildInputs = [

6
pkgs/applications/misc/process-compose/default.nix
View File

@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config";
in
buildGoModule rec {
pname = "process-compose";
version = "0.88.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "F1bonacc1";
repo = pname;
rev = "v${version}";
hash = "sha256-YiBo6p+eB7lY6ey/S/Glfj3egi1jL4Gjs681nTxEjE8=";
hash = "sha256-wr0cIp+TRDiz8CmFA4lEGyOLNaiKUYysbAmLtvl4pb4=";
# 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;
@ -43,7 +43,7 @@ buildGoModule rec {
installShellFiles
];
vendorHash = "sha256-KtktEq/5V/YE6VtWprUei0sIcwcirju+Yxj1yTgWmYY=";
vendorHash = "sha256-9G8GPTJRuPahNcEhAddZsUKc1fexp6IrCZlCGKW0T64=";
doCheck = false;

6
pkgs/applications/networking/cluster/atlantis/default.nix
View File

@ -2,20 +2,20 @@
buildGoModule rec {
pname = "atlantis";
version = "0.27.1";
version = "0.27.2";
src = fetchFromGitHub {
owner = "runatlantis";
repo = "atlantis";
rev = "v${version}";
hash = "sha256-qtfMkCI1vX9aKWFNAhqCrnc5mhE+4kh2pogzv4oRXnE=";
hash = "sha256-OAIxBCfSDNauThC4/W//DmkzwwsNGZxdj3gDjSWmoNU=";
};
ldflags = [
"-X=main.version=${version}"
"-X=main.date=1970-01-01T00:00:00Z"
];
vendorHash = "sha256-W3bX5fAxFvI1zQCx8ioNIc/yeDAXChpxNPYyaghnxxE=";
vendorHash = "sha256-ppg8AFS16Wg/J9vkqhiokUNOY601kI+oFSDI8IDJTI4=";
subPackages = [ "." ];

6
pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helm-unittest";
version = "0.4.3";
version = "0.4.4";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-2ymsh+GWCjpiTVRIuf0i9+wz6WnwpG0QP6tErabSEFk=";
hash = "sha256-C1aHnKNXgzlPT1qMngRcPZ6hYUOenU1xpeYLnhrvtnc=";
};
vendorHash = "sha256-ftD913mz9ziO3XWCdsbONrgMlBIc0uX4gq3NQmkXbs0=";
vendorHash = "sha256-nm1LFy2yqfQs+HmrAR1EsBjpm9w0u4einLbVFW1UitI=";
# NOTE: Remove the install and upgrade hooks.
postPatch = ''

6
pkgs/applications/networking/cluster/kuma/default.nix
View File

@ -15,17 +15,17 @@
buildGoModule rec {
inherit pname;
version = "2.6.1";
version = "2.6.2";
tags = lib.optionals enableGateway [ "gateway" ];
src = fetchFromGitHub {
owner = "kumahq";
repo = "kuma";
rev = version;
hash = "sha256-jSBuEDnb2KHAOhOldAzpxgqnDXH1N267Axs+clpo2uo=";
hash = "sha256-BYnrDB86O2I1DliHpDU65dDbGVmzBhfus4cgb2HpPQ4=";
};
vendorHash = "sha256-gvB3e9C5KnQwvn2eJPm0WYKlKSnOO9opGikgVA3WJN0=";
vendorHash = "sha256-p3r0LXqv7X7OyDIlZKfe964fD+E+5lmrToP4rqborlo=";
# no test files
doCheck = false;

4
pkgs/applications/video/dmlive/default.nix
View File

@ -5,6 +5,7 @@
, pkg-config
, makeWrapper
, openssl
, configd
, Security
, mpv
, ffmpeg
@ -27,7 +28,8 @@ rustPlatform.buildRustPackage rec {
OPENSSL_NO_VENDOR = true;
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ configd Security ];
postInstall = ''
wrapProgram "$out/bin/dmlive" --prefix PATH : "${lib.makeBinPath [ mpv ffmpeg nodejs ]}"

6
pkgs/by-name/cr/crawley/package.nix
View File

@ -6,18 +6,18 @@
buildGoModule rec {
pname = "crawley";
version = "1.7.2";
version = "1.7.3";
src = fetchFromGitHub {
owner = "s0rg";
repo = "crawley";
rev = "v${version}";
hash = "sha256-hQvmWob5zCM1dh9oIACjIndaus0gYSidrs4QZM5jtEg=";
hash = "sha256-sLeQl0/FY0NBfyhIyjcFqvI5JA1GSAfe7s2XrOjLZEY=";
};
nativeBuildInputs = [ installShellFiles ];
vendorHash = "sha256-u1y70ydfVG/aH1CVKOUDBmtZgTLlXXrQGt3mfGDibzs=";
vendorHash = "sha256-fOy4jYF01MoWFS/SecXhlO2+BTYzR5eRm55rp+YNUuU=";
ldflags = [ "-w" "-s" ];

6
pkgs/by-name/jn/jnv/package.nix
View File

@ -7,16 +7,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "jnv";
version = "0.1.2";
version = "0.1.3";
src = fetchFromGitHub {
owner = "ynqa";
repo = "jnv";
rev = "v${version}";
hash = "sha256-22aoK1s8DhKttGGR9ouNDIWhYCv6dghT/jfAC0VX8Sw=";
hash = "sha256-szPMbcR6fg9mgJ0oE07aYTJZHJKbguK3IFKhuV0D/rI=";
};
cargoHash = "sha256-CmupwWwopXpnPm8R17JVfAoGt4QEos5I+3qumDKEyM8=";
cargoHash = "sha256-vEyWawtWT/8GntlEUyrtBRXPcjgMg9oYemGzHSg50Hg=";
nativeBuildInputs = [
autoconf

4
pkgs/by-name/ki/kikit/default.nix
View File

@ -14,7 +14,7 @@
, pytestCheckHook
, commentjson
, wxpython
, pcbnew-transition
, pcbnewtransition
, pybars3
, versioneer
, shapely_1_8
@ -47,7 +47,7 @@ buildPythonApplication rec {
commentjson
# https://github.com/yaqwsx/KiKit/issues/575
wxpython
pcbnew-transition
pcbnewtransition
pybars3
# https://github.com/yaqwsx/KiKit/issues/574
shapely_1_8

6
pkgs/by-name/ni/nixseparatedebuginfod/package.nix
View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "nixseparatedebuginfod";
version = "0.3.3";
version = "0.3.4";
src = fetchFromGitHub {
owner = "symphorien";
repo = "nixseparatedebuginfod";
rev = "v${version}";
hash = "sha256-KQzMLAl/2JYy+EVBIhUTouOefOX6OCE3iIZONFMQivk=";
hash = "sha256-lbYU9gveZ4SkIpMMN8KRJItA3PZSDWcJAJs4WDoivBg=";
};
cargoHash = "sha256-UzPWJfkVLqCuMdNcAfQS38lgtWCO9HhCf5ZCqzWQ6jY=";
cargoHash = "sha256-iKmAOPxxuhIYRKQfOuqHrF+u3wtjOk7RJ9gzPFHGGqw=";
# tests need a working nix install with access to the internet
doCheck = false;

48
pkgs/by-name/no/novops/package.nix Normal file
View File

@ -0,0 +1,48 @@
{ lib
, fetchFromGitHub
, rustPlatform
, pkg-config
, openssl
, stdenv
, libiconv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "novops";
version = "0.12.1";
src = fetchFromGitHub {
owner = "PierreBeucher";
repo = pname;
rev = "v${version}";
hash = "sha256-iQFw3m7dpAii/Nc1UQ/ZXTuHvj5vGsp3SOqd14uHUpc=";
};
cargoHash = "sha256-mQ7Vm80S4FALWiEsV+68pNrah36aYu7PediRlJUXLAk=";
buildInputs = [
openssl # required for openssl-sys
] ++ lib.optional stdenv.isDarwin [
libiconv
darwin.apple_sdk.frameworks.SystemConfiguration
];
nativeBuildInputs = [
pkg-config # required for openssl-sys
];
cargoTestFlags = [
# Only run lib tests (unit tests)
# All other tests are integration tests which should not be run with Nix build
"--lib"
];
meta = with lib; {
description = "Cross-platform secret & config manager for development and CI environments";
homepage = "https://github.com/PierreBeucher/novops";
license = licenses.lgpl3;
maintainers = with maintainers; [ pbeucher ];
mainProgram = "novops";
};
}

6
pkgs/by-name/ov/overskride/package.nix
View File

@ -4,7 +4,7 @@
owner = "kaii-lb";
name = "overskride";
version = "0.5.6";
version = "0.5.7";
in rustPlatform.buildRustPackage {
@ -15,10 +15,10 @@ in rustPlatform.buildRustPackage {
inherit owner;
repo = name;
rev = "v${version}";
hash = "sha256-syQzHHT0s15oj8Yl2vhgyXlPI8UxOqIXGDqFeUc/dJQ=";
hash = "sha256-vuCpUTn/Re2wZIoCmKHwBRPdfpHDzNHi42iwvBFYjXo=";
};
cargoHash = "sha256-NEsqVfKZqXSLieRO0BvQGdggmXXYO15qVhbfgAFATPc=";
cargoHash = "sha256-hX3GHRiE/CbeT/zblQHzbxLPEc/grDddXgqoAe64zUM=";
nativeBuildInputs = [
pkg-config

6
pkgs/by-name/ow/owmods-cli/package.nix
View File

@ -16,16 +16,16 @@
rustPlatform.buildRustPackage rec {
pname = "owmods-cli";
version = "0.13.0";
version = "0.13.1";
src = fetchFromGitHub {
owner = "ow-mods";
repo = "ow-mod-man";
rev = "cli_v${version}";
hash = "sha256-JCPuKGO0pbhQaNmZUcZ95EZbXubrjZnw0qJmKCGuAoQ=";
hash = "sha256-atP2nUOWs4WBo7jjugPfELW0BDz6kETyTaWkR9tsmb8=";
};
cargoHash = "sha256-dTEEpjonvFYFv16e0eS71B4OMiYueYSfcs8gmSYeHPc=";
cargoHash = "sha256-PgPGSMvdvYKRgFc1zq1WN7Zu2ie8RwsupVnhW9Nw64Y=";
nativeBuildInputs = [
pkg-config

4
pkgs/by-name/pl/plasticity/package.nix
View File

@ -33,11 +33,11 @@
}:
stdenv.mkDerivation rec {
pname = "plasticity";
version = "1.4.15";
version = "1.4.18";
src = fetchurl {
url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm";
hash = "sha256-wiUpDsfGVkhyjoXVpxaw3fqpo1aAfi0AkkvlkAZxTYI=";
hash = "sha256-iSGYc8Ms6Kk4JhR2q/yUq26q1adbrZe4Gnpw5YAN1L4=";
};
passthru.updateScript = ./update.sh;

4
pkgs/by-name/pr/proton-ge-bin/package.nix
View File

@ -5,11 +5,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "proton-ge-bin";
version = "GE-Proton9-1";
version = "GE-Proton9-2";
src = fetchzip {
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
hash = "sha256-odpzRlzW7MJGRcorRNo784Rh97ssViO70/1azHRggf0=";
hash = "sha256-NqBzKonCYH+hNpVZzDhrVf+r2i6EwLG/IFBXjE2mC7s=";
};
outputs = [ "out" "steamcompattool" ];

4
pkgs/by-name/sa/sarasa-gothic/package.nix
View File

@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "sarasa-gothic";
version = "1.0.7";
version = "1.0.8";
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-R0mVOKYlxSk3s6zPG/h9ddKUZX+WJp47QCulFUO97YI=";
hash = "sha256-6JE1iuruaGrL8cwLvdZiOUXK02izOOpsQbXjdb9+VBU=";
};
sourceRoot = ".";

31
pkgs/by-name/ti/tinymembench/package.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib
, stdenv
, fetchFromGitHub
}:
stdenv.mkDerivation rec {
pname = "tinymembench";
version = "0.4";
src = fetchFromGitHub {
owner = "ssvb";
repo = "tinymembench";
rev = "v${version}";
hash = "sha256-N6jHRLqVSNe+Mk3WNfIEBGtVC7Y6/sERVaeAD68LQJc=";
};
installPhase = ''
runHook preInstall
install -D tinymembench $out/bin/tinymembench
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/ssvb/tinymembench";
description = "Simple benchmark for memory throughput and latency";
license = licenses.mit;
platforms = platforms.linux;
mainProgram = "tinymembench";
maintainers = with maintainers; [ lorenz ];
};
}

24
pkgs/tools/misc/yutto/default.nix → pkgs/by-name/yu/yutto/package.nix
View File

@ -1,29 +1,29 @@
{ lib
, python3
, fetchPypi
, python3Packages
, fetchFromGitHub
, ffmpeg
, nix-update-script
}:
with python3.pkgs;
buildPythonApplication rec {
python3Packages.buildPythonApplication {
pname = "yutto";
version = "2.0.0b35";
version = "2.0.0b36-unstable-2024-03-04";
format = "pyproject";
disabled = pythonOlder "3.9";
disabled = python3Packages.pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
hash = "sha256-r4Lc5PMkhwLMC6nKArvpf9M4N+eoV6OmZK2uhY6xZxA=";
src = fetchFromGitHub {
owner = "yutto-dev";
repo = "yutto";
rev = "f2d34f9e2a2d45ed8ed6ae4c2bf91af248da27f0";
hash = "sha256-/zTQt+/sCjnQPt8YyKvRXpWVpN/yi2LrhpFH4FPbeOc=";
};
nativeBuildInputs = [
nativeBuildInputs = with python3Packages; [
poetry-core
];
propagatedBuildInputs = [
propagatedBuildInputs = with python3Packages; [
httpx
aiofiles
biliass

4
pkgs/development/embedded/fpga/openfpgaloader/default.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "openfpgaloader";
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitHub {
owner = "trabucayre";
repo = "openFPGALoader";
rev = "v${finalAttrs.version}";
hash = "sha256-fe0g8+q/4r7h++7/Bk7pbOJn1CsAc+2IzXN6lqtY2vY=";
hash = "sha256-iJSTiOcW15q3mWmMhe5wmO11cu2xfAI9zCsoB33ujWQ=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/libressl/default.nix
View File

@ -111,7 +111,7 @@ in {
};
libressl_3_8 = generic {
version = "3.8.2";
hash = "sha256-bUuNW7slofgzZjnlbsUIgFLUOpUlZpeoXEzpEyPCWVQ=";
version = "3.8.3";
hash = "sha256-pl9A4+9uPJRRyDGObyxFTDZ+Z/CcDN4YSXMaTW7McnI=";
};
}

4
pkgs/development/libraries/science/astronomy/libxisf/default.nix
View File

@ -11,14 +11,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libxisf";
version = "0.2.11";
version = "0.2.12";
src = fetchFromGitea {
domain = "gitea.nouspiro.space";
owner = "nou";
repo = "libXISF";
rev = "v${finalAttrs.version}";
hash = "sha256-wXIbU9/xUyECluL6k1oKS3NBpoC/qjQdW9e485qmlgo=";
hash = "sha256-QhshgKyf9s5U5JMa5TZelIo1tpJGlsOQePPG1kEfbq8=";
};
patches = [

5856
pkgs/development/php-packages/phpinsights/composer.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

29
pkgs/development/php-packages/phpinsights/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ lib
, fetchFromGitHub
, php
}:
php.buildComposerProject (finalAttrs: {
pname = "phpinsights";
version = "2.11.0";
src = fetchFromGitHub {
owner = "nunomaduro";
repo = "phpinsights";
rev = "v${finalAttrs.version}";
hash = "sha256-7ATlfAlCFv78JSKg5cD/VcYoq/EAM/6/GjH3lkfVCJ8=";
};
vendorHash = "sha256-ykAv7laYMvzd+uD6raMRQiZmCEa0ELQj1hJPb8UvjCk=";
composerLock = ./composer.lock;
meta = {
changelog = "https://github.com/nunomaduro/phpinsights/releases/tag/v${finalAttrs.version}";
description = "Instant PHP quality checks from your console";
homepage = "https://phpinsights.com/";
license = lib.licenses.mit;
mainProgram = "phpinsights";
maintainers = with lib.maintainers; [ patka ];
};
})

4
pkgs/development/python-modules/lmcloud/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "lmcloud";
version = "1.1.4";
version = "1.1.5";
pyproject = true;
disabled = pythonOlder "3.11";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "zweckj";
repo = "lmcloud";
rev = "refs/tags/v${version}";
hash = "sha256-uiyZGFfSJrTjw0CvHrCor4Ef5hdkMbEHGHQH3+NxYWE=";
hash = "sha256-7w/7A66JDMu2Qn0V8GeUuBhDApTN/9SAriEUGJdKVEM=";
};
build-system = [

5
pkgs/development/python-modules/pcbnew-transition/default.nix → pkgs/development/python-modules/pcbnewtransition/default.nix
View File

@ -6,14 +6,15 @@
, versioneer
}:
buildPythonPackage rec {
pname = "pcbnewTransition";
pname = "pcbnewtransition";
version = "0.4.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
pname = "pcbnewTransition";
inherit version;
hash = "sha256-+mRExuDuEYxSSlrkEjSyPK+RRJZo+YJH7WnUVfjblRQ=";
};

8
pkgs/development/python-modules/tesla-fleet-api/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "tesla-fleet-api";
version = "0.5.0";
version = "0.5.1";
pyproject = true;
disabled = pythonOlder "3.10";
@ -18,14 +18,14 @@ buildPythonPackage rec {
owner = "Teslemetry";
repo = "python-tesla-fleet-api";
rev = "refs/tags/v${version}";
hash = "sha256-IRUH3qWRJoCEvzkkR8/qH5i735B030CLKKRRWO9DVuI=";
hash = "sha256-PbtOokzpJ58SpQOfpSyoDnUb8qcRvy0XPDR5cGMMbKU=";
};
nativeBuildInputs = [
build-system = [
setuptools
];
propagatedBuildInputs = [
dependencies = [
aiohttp
aiolimiter
];

23
pkgs/development/skaware-packages/build-skaware-package.nix
View File

@ -6,6 +6,8 @@
, version
# : string
, sha256 ? lib.fakeSha256
# : drv | null
, manpages ? null
# : string
, description
# : list Platform
@ -63,7 +65,15 @@ stdenv.mkDerivation {
inherit sha256;
};
inherit outputs;
outputs =
if manpages == null
then outputs
else
assert (lib.assertMsg (!lib.elem "man" outputs) "If you pass `manpages` to `skawarePackages.buildPackage`, you cannot have a `man` output already!");
# insert as early as posible, but keep the first element
if lib.length outputs > 0
then [(lib.head outputs) "man"] ++ lib.tail outputs
else ["man"];
dontDisableStatic = true;
enableParallelBuilding = true;
@ -97,6 +107,13 @@ stdenv.mkDerivation {
docFiles = commonMetaFiles;
}} $doc/share/doc/${pname}
${if manpages == null
then ''echo "no manpages for this package"''
else ''
echo "copying manpages"
cp -vr ${manpages} $man
''}
${postInstall}
'';
@ -104,6 +121,8 @@ stdenv.mkDerivation {
${cleanPackaging.checkForRemainingFiles}
'';
passthru = passthru // (if manpages == null then {} else { inherit manpages; });
meta = {
homepage = "https://skarnet.org/software/${pname}/";
inherit description platforms;
@ -112,6 +131,4 @@ stdenv.mkDerivation {
[ pmahoney Profpatsch qyliss ] ++ maintainers;
};
inherit passthru;
}

11
pkgs/development/skaware-packages/default.nix
View File

@ -10,7 +10,6 @@ lib.makeScope pkgs.newScope (self:
# execline
execline = callPackage ./execline { };
execline-man-pages = callPackage ./execline-man-pages { };
# servers & tools
mdevd = callPackage ./mdevd { };
@ -32,8 +31,10 @@ lib.makeScope pkgs.newScope (self:
s6-portable-utils = callPackage ./s6-portable-utils { };
s6-rc = callPackage ./s6-rc { };
s6-man-pages = callPackage ./s6-man-pages { };
s6-networking-man-pages = callPackage ./s6-networking-man-pages { };
s6-portable-utils-man-pages = callPackage ./s6-portable-utils-man-pages { };
s6-rc-man-pages = callPackage ./s6-rc-man-pages { };
# manpages (DEPRECATED, they are added directly to the packages now)
execline-man-pages = self.execline.passthru.manpages;
s6-man-pages = self.s6.passthru.manpages;
s6-networking-man-pages = self.s6-networking.passthru.manpages;
s6-portable-utils-man-pages = self.s6-portable-utils.passthru.manpages;
s6-rc-man-pages = self.s6-rc.passthru.manpages;
})

9
pkgs/development/skaware-packages/execline-man-pages/default.nix
View File

@ -1,9 +0,0 @@
{ lib, buildManPages }:
buildManPages {
pname = "execline-man-pages";
version = "2.9.3.0.5";
sha256 = "0fcjrj4xp7y7n1c55k45rxr5m7zpv6cbhrkxlxymd4j603i9jh6d";
description = "Port of the documentation for the execline suite to mdoc";
maintainers = [ lib.maintainers.sternenseemann ];
}

31
pkgs/development/skaware-packages/execline/default.nix
View File

@ -1,29 +1,30 @@
{ fetchFromGitHub, skawarePackages }:
{ lib, fetchFromGitHub, skawarePackages, skalibs }:
with skawarePackages;
let
version = "2.9.4.0";
in skawarePackages.buildPackage {
inherit version;
pname = "execline";
# ATTN: also check whether there is a new manpages version
sha256 = "mrVdVhU536dv9Kl5BvqZX8SiiOPeUiXLGp2PqenrxJs=";
# Maintainer of manpages uses following versioning scheme: for every
# upstream $version he tags manpages release as ${version}.1, and,
# in case of extra fixes to manpages, new tags in form ${version}.2,
# ${version}.3 and so on are created.
manpages = fetchFromGitHub {
owner = "flexibeast";
repo = "execline-man-pages";
rev = "v2.9.1.0.1";
sha256 = "nZzzQFMUPmIgPS3aAIgcORr/TSpaLf8UtzBUFD7blt8=";
manpages = skawarePackages.buildManPages {
pname = "execline-man-pages";
version = "2.9.3.0.5";
sha256 = "0fcjrj4xp7y7n1c55k45rxr5m7zpv6cbhrkxlxymd4j603i9jh6d";
description = "Port of the documentation for the execline suite to mdoc";
maintainers = [ lib.maintainers.sternenseemann ];
};
in buildPackage {
inherit version;
pname = "execline";
sha256 = "mrVdVhU536dv9Kl5BvqZX8SiiOPeUiXLGp2PqenrxJs=";
description = "A small scripting language, to be used in place of a shell in non-interactive scripts";
outputs = [ "bin" "man" "lib" "dev" "doc" "out" ];
outputs = [ "bin" "lib" "dev" "doc" "out" ];
# TODO: nsss support
configureFlags = [
@ -62,7 +63,5 @@ in buildPackage {
-o "$bin/bin/execlineb" \
${./execlineb-wrapper.c} \
-lskarnet
mkdir -p $man/share/
cp -vr ${manpages}/man* $man/share
'';
}

6
pkgs/development/skaware-packages/mdevd/default.nix
View File

@ -1,8 +1,6 @@
{ lib, skawarePackages }:
{ lib, skawarePackages, skalibs }:
with skawarePackages;
buildPackage {
skawarePackages.buildPackage {
pname = "mdevd";
version = "0.1.6.3";
sha256 = "9uzw73zUjQTvx1rLLa2WfYULyIFb2wCY8cnvBDOU1DA=";

6
pkgs/development/skaware-packages/nsss/default.nix
View File

@ -1,8 +1,6 @@
{ skawarePackages }:
{ skawarePackages, skalibs }:
with skawarePackages;
buildPackage {
skawarePackages.buildPackage {
pname = "nsss";
version = "0.2.0.4";
sha256 = "ObUE+FvY9rUj0zTlz6YsAqOV2zWZG3XyBt8Ku9Z2Gq0=";

6
pkgs/development/skaware-packages/s6-dns/default.nix
View File

@ -1,8 +1,6 @@
{ skawarePackages }:
{ skawarePackages, skalibs }:
with skawarePackages;
buildPackage {
skawarePackages.buildPackage {
pname = "s6-dns";
version = "2.3.7.1";
sha256 = "zwJYV07H1itlTgwq14r0x9Z6xMnLN/eBSA9ZflSzD20=";

6
pkgs/development/skaware-packages/s6-linux-init/default.nix
View File

@ -1,8 +1,6 @@
{ lib, skawarePackages }:
{ lib, skawarePackages, skalibs, execline, s6 }:
with skawarePackages;
buildPackage {
skawarePackages.buildPackage {
pname = "s6-linux-init";
version = "1.1.2.0";
sha256 = "sha256-Ea4I0KZiELXla2uu4Pa5sbafvtsF/aEoWxFaMcpGx38=";

6
pkgs/development/skaware-packages/s6-linux-utils/default.nix
View File

@ -1,8 +1,6 @@
{ lib, skawarePackages }:
{ lib, skawarePackages, skalibs }:
with skawarePackages;
buildPackage {
skawarePackages.buildPackage {
pname = "s6-linux-utils";
version = "2.6.2.0";
sha256 = "j5RGM8qH09I+DwPJw4PRUC1QjJusFtOMP79yOl6rK7c=";

9
pkgs/development/skaware-packages/s6-man-pages/default.nix
View File

@ -1,9 +0,0 @@
{ lib, buildManPages }:
buildManPages {
pname = "s6-man-pages";
version = "2.12.0.2.1";
sha256 = "sha256-fFU+cRwXb4SwHsI/r0ghuzCf6hEK/muPPp2XMvD8VtQ=";
description = "Port of the documentation for the s6 supervision suite to mdoc";
maintainers = [ lib.maintainers.sternenseemann ];
}

9
pkgs/development/skaware-packages/s6-networking-man-pages/default.nix
View File

@ -1,9 +0,0 @@
{ lib, buildManPages }:
buildManPages {
pname = "s6-networking-man-pages";
version = "2.5.1.3.3";
sha256 = "02ba5jyfpbib402mfl42pbbdxyjy2vhpiz1b2qdg4ax58yr4jzqk";
description = "Port of the documentation for the s6-networking suite to mdoc";
maintainers = [ lib.maintainers.sternenseemann ];
}

13
pkgs/development/skaware-packages/s6-networking/default.nix
View File

@ -1,11 +1,10 @@
{ lib, skawarePackages
{ lib, skawarePackages, skalibs, execline, s6, s6-dns
# Whether to build the TLS/SSL tools and what library to use
# acceptable values: "bearssl", "libressl", false
, sslSupport ? "bearssl" , libressl, bearssl
}:
with skawarePackages;
let
sslSupportEnabled = sslSupport != false;
sslLibs = {
@ -17,11 +16,19 @@ in
assert sslSupportEnabled -> sslLibs ? ${sslSupport};
buildPackage {
skawarePackages.buildPackage {
pname = "s6-networking";
version = "2.7.0.2";
sha256 = "wzxvGyvhb4miGvlGz9BiQqEvmBhMiYt1XdskM4ZxzrE=";
manpages = skawarePackages.buildManPages {
pname = "s6-networking-man-pages";
version = "2.5.1.3.3";
sha256 = "02ba5jyfpbib402mfl42pbbdxyjy2vhpiz1b2qdg4ax58yr4jzqk";
description = "Port of the documentation for the s6-networking suite to mdoc";
maintainers = [ lib.maintainers.sternenseemann ];
};
description = "A suite of small networking utilities for Unix systems";
outputs = [ "bin" "lib" "dev" "doc" "out" ];

9
pkgs/development/skaware-packages/s6-portable-utils-man-pages/default.nix
View File

@ -1,9 +0,0 @@
{ lib, buildManPages }:
buildManPages {
pname = "s6-portable-utils-man-pages";
version = "2.3.0.2.2";
sha256 = "0zbxr6jqrx53z1gzfr31nm78wjfmyjvjx7216l527nxl9zn8nnv1";
description = "Port of the documentation for the s6-portable-utils suite to mdoc";
maintainers = [ lib.maintainers.somasis ];
}

14
pkgs/development/skaware-packages/s6-portable-utils/default.nix
View File

@ -1,12 +1,18 @@
{ skawarePackages }:
{ lib, skawarePackages, skalibs }:
with skawarePackages;
buildPackage {
skawarePackages.buildPackage {
pname = "s6-portable-utils";
version = "2.3.0.3";
sha256 = "PkSSBV0WDCX7kBU/DvwnfX1Sv5gbvj6i6d/lHEk1Yf8=";
manpages = skawarePackages.buildManPages {
pname = "s6-portable-utils-man-pages";
version = "2.3.0.2.2";
sha256 = "0zbxr6jqrx53z1gzfr31nm78wjfmyjvjx7216l527nxl9zn8nnv1";
description = "Port of the documentation for the s6-portable-utils suite to mdoc";
maintainers = [ lib.maintainers.somasis ];
};
description = "A set of tiny general Unix utilities optimized for simplicity and small size";
outputs = [ "bin" "dev" "doc" "out" ];

9
pkgs/development/skaware-packages/s6-rc-man-pages/default.nix
View File

@ -1,9 +0,0 @@
{ lib, buildManPages }:
buildManPages {
pname = "s6-rc-man-pages";
version = "0.5.4.2.1";
sha256 = "Ywke3FG/xhhUd934auDB+iFRDCvy8IJs6IkirP6O/As=";
description = "mdoc(7) versions of the documentation for the s6-rc service manager";
maintainers = [ lib.maintainers.qyliss ];
}

14
pkgs/development/skaware-packages/s6-rc/default.nix
View File

@ -1,12 +1,18 @@
{ lib, stdenv, skawarePackages, targetPackages }:
{ lib, stdenv, skawarePackages, targetPackages, skalibs, execline, s6 }:
with skawarePackages;
buildPackage {
skawarePackages.buildPackage {
pname = "s6-rc";
version = "0.5.4.2";
sha256 = "AL36WW+nFhUS6XLskoKiq9j9DjHwkXe616K8PY8oOYI=";
manpages = skawarePackages.buildManPages {
pname = "s6-rc-man-pages";
version = "0.5.4.2.1";
sha256 = "Ywke3FG/xhhUd934auDB+iFRDCvy8IJs6IkirP6O/As=";
description = "mdoc(7) versions of the documentation for the s6-rc service manager";
maintainers = [ lib.maintainers.qyliss ];
};
description = "A service manager for s6-based systems";
platforms = lib.platforms.unix;

14
pkgs/development/skaware-packages/s6/default.nix
View File

@ -1,12 +1,18 @@
{ skawarePackages }:
{ lib, skawarePackages, skalibs, execline }:
with skawarePackages;
buildPackage {
skawarePackages.buildPackage {
pname = "s6";
version = "2.12.0.3";
sha256 = "gA0xIm9sJc3T7AtlJA+AtWzl7BNzQdCo0VTndjjlgQM=";
manpages = skawarePackages.buildManPages {
pname = "s6-man-pages";
version = "2.12.0.2.1";
sha256 = "sha256-fFU+cRwXb4SwHsI/r0ghuzCf6hEK/muPPp2XMvD8VtQ=";
description = "Port of the documentation for the s6 supervision suite to mdoc";
maintainers = [ lib.maintainers.sternenseemann ];
};
description = "skarnet.org's small & secure supervision software suite";
# NOTE lib: cannot split lib from bin at the moment,

4
pkgs/development/skaware-packages/sdnotify-wrapper/default.nix
View File

@ -1,6 +1,4 @@
{ stdenv, lib, runCommandCC, skawarePackages }:
with skawarePackages;
{ stdenv, lib, runCommandCC, skawarePackages, skalibs }:
let
# From https://skarnet.org/software/misc/sdnotify-wrapper.c,

4
pkgs/development/skaware-packages/skalibs/default.nix
View File

@ -4,9 +4,7 @@
, pkgs
}:
with skawarePackages;
buildPackage {
skawarePackages.buildPackage {
pname = "skalibs";
version = "2.14.1.1";
sha256 = "trebgW9LoLaAFnaw7UF5tZyMeAnu/+JttnLkBGNr78M=";

6
pkgs/development/skaware-packages/tipidee/default.nix
View File

@ -1,8 +1,6 @@
{ skawarePackages }:
{ skawarePackages, skalibs }:
with skawarePackages;
buildPackage {
skawarePackages.buildPackage {
pname = "tipidee";
version = "0.0.3.0";
sha256 = "0dk6k86UKgJ2ioX5H2Xoga9S+SwMy9NFrK2KEKoNxCA=";

6
pkgs/development/skaware-packages/utmps/default.nix
View File

@ -1,8 +1,6 @@
{ skawarePackages }:
{ skawarePackages, skalibs }:
with skawarePackages;
buildPackage {
skawarePackages.buildPackage {
pname = "utmps";
version = "0.1.2.2";
sha256 = "sha256-9/+jcUxllzu5X7zxUBwG/AR42TpRzqGzc+xoEcJCX1I=";

6
pkgs/development/tools/go-jet/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "go-jet";
version = "2.11.0";
version = "2.11.1";
src = fetchFromGitHub {
owner = pname;
repo = "jet";
rev = "v${version}";
sha256 = "sha256-xtWDfBryNQp3MSp5EjsbyIdEx4+KoqBe3Q6MukuYVRE=";
sha256 = "sha256-1ntvvbSIqeANZhz/FKXP9cD8UVs9luMHa8pgvc6RsqE=";
};
vendorHash = "sha256-z0NMG+fvbGe3KGxO9+3NLoptZ4wfWi0ls7SK+9miCWg=";
vendorHash = "sha256-7jcUSzz/EI30PUK41u4FUUAzzl/PUKvE46A/nYwx134=";
subPackages = [ "cmd/jet" ];

6
pkgs/development/tools/rust/cargo-public-api/default.nix
View File

@ -10,14 +10,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-public-api";
version = "0.33.1";
version = "0.34.0";
src = fetchCrate {
inherit pname version;
hash = "sha256-poS8s4rfktNKQ0co8G4RLXUJAeUAGcS8YIvb4W0IFNo=";
hash = "sha256-xD+0eplrtrTlYYnfl1R6zIO259jP18OAp9p8eg1CqbI=";
};
cargoHash = "sha256-+tmLUxDxI/W2g7cdQD/Ph5wBpW3QbZzH2M/oRXLzsgU=";
cargoHash = "sha256-EjMzOilTnPSC7FYxrNBxX+sugYvPIxiCzlwQcl3VMog=";
nativeBuildInputs = [ pkg-config ];

7
pkgs/kde/lib/mk-kde-derivation.nix
View File

@ -78,11 +78,15 @@ in
extraNativeBuildInputs ? [],
extraPropagatedBuildInputs ? [],
extraCmakeFlags ? [],
excludeDependencies ? [],
...
} @ args: let
depNames = dependencies.${pname} or [];
filteredDepNames = builtins.filter (dep: !(builtins.elem dep excludeDependencies)) depNames;
# FIXME(later): this is wrong for cross, some of these things really need to go into nativeBuildInputs,
# but cross is currently very broken anyway, so we can figure this out later.
deps = map (dep: self.${dep}) (dependencies.${pname} or []);
deps = map (dep: self.${dep}) filteredDepNames;
defaultArgs = {
inherit version src;
@ -109,6 +113,7 @@ in
"extraNativeBuildInputs"
"extraPropagatedBuildInputs"
"extraCmakeFlags"
"excludeDependencies"
"meta"
];

4
pkgs/kde/plasma/discover/default.nix
View File

@ -11,4 +11,8 @@ mkKdeDerivation {
extraNativeBuildInputs = [pkg-config];
extraBuildInputs = [qtwebview discount flatpak fwupd];
# The PackageKit backend doesn't work for us and causes Discover
# to freak out when loading. Disable it to not confuse users.
excludeDependencies = ["packagekit-qt"];
}

4
pkgs/os-specific/linux/esdm/default.nix
View File

@ -60,13 +60,13 @@ assert cryptoBackend == "openssl" || cryptoBackend == "botan" || cryptoBackend =
stdenv.mkDerivation rec {
pname = "esdm";
version = "1.0.2";
version = "1.1.0";
src = fetchFromGitHub {
owner = "smuellerDD";
repo = "esdm";
rev = "v${version}";
sha256 = "sha256-J7iVp6lLjR2JPdpppnqgV5Ke+X9TcZaS5V1ffejI5yE=";
sha256 = "sha256-UH6ws/hfHdcmbLETyZ0b4wDm8nHPdLsot3ZhIljpUlw=";
};
nativeBuildInputs = [ meson pkg-config ninja ];

6
pkgs/servers/dex/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dex";
version = "2.38.0";
version = "2.39.0";
src = fetchFromGitHub {
owner = "dexidp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-nk6llGXJSUA8BWz3S320klMJkOI9BE5oiKgPTuNZVyM=";
sha256 = "sha256-edU9jRvGRRmm46UuQ7GlapQ+4AGjy/5gFn5mU9HJjd0=";
};
vendorHash = "sha256-yQaoRV6nMHHNpyc2SgyYGJaeIR72dNAh1U3bPHlYEws=";
vendorHash = "sha256-vG82gW3AXYDND0JmzxJqqHgvxk4ey6yIXadwL0zPHD4=";
subPackages = [
"cmd/dex"

4
pkgs/servers/misc/shell2http/default.nix
View File

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "shell2http";
version = "1.16.0";
version = "1.17.0";
src = fetchFromGitHub {
owner = "msoap";
repo = "shell2http";
rev = "v${version}";
hash = "sha256-FHLClAQYCR6DMzHyAo4gjN2nCmMptYevKJbhEZ8AJyE=";
hash = "sha256-CU7ENLx5C1qCO1f9m0fl/AmUzmtmj6IjMlx9WNqAnS0=";
};
vendorHash = "sha256-K/0ictKvX0sl/5hFDKjTkpGMze0x9fJA98RXNsep+DM=";

6
pkgs/servers/pocketbase/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "pocketbase";
version = "0.22.4";
version = "0.22.6";
src = fetchFromGitHub {
owner = "pocketbase";
repo = "pocketbase";
rev = "v${version}";
hash = "sha256-IhqrPXQ430sfdI8HB4cLS8dntluYgstO3DBfZyd8Jrk=";
hash = "sha256-TbbfTPLV5R/XfKBxvjico2119iXJTh/9Grc9QfzeTDo=";
};
vendorHash = "sha256-iXcMxsiKyCY91a7zCl+OxkHwSIKx/AfT0HOEpZ8JgeM=";
vendorHash = "sha256-RSeYA8cmwj5OzgXBgU2zuOTwmEofmm3YRDSc/bKGBGk=";
# This is the released subpackage from upstream repo
subPackages = [ "examples/base" ];

6
pkgs/servers/spicedb/zed.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "zed";
version = "0.17.0";
version = "0.17.1";
src = fetchFromGitHub {
owner = "authzed";
repo = "zed";
rev = "v${version}";
hash = "sha256-C/vX8gocU7teSACqHBrYTPJryaUP4tuzEo/4TUEdNt0=";
hash = "sha256-Bbh57UQRB/G5r4FoExp+cJyraTM/jBf87Ylt4BgPVdQ=";
};
vendorHash = "sha256-qf1jGNCW/ewwqkbsU7fZdYvazhMYw+/DGWkdugQRrec=";
vendorHash = "sha256-AKp7A9WnN9fSGqr4fU53e1/rzBgbV4DJIZKxLms2WDk=";
meta = with lib; {
description = "Command line for managing SpiceDB";

4
pkgs/servers/unifi/default.nix
View File

@ -72,7 +72,7 @@ in rec {
};
unifi8 = generic {
version = "8.0.28";
sha256 = "sha256-RA3R/iR3u/V+qU2sQTNtaQhYOI8tCQw8TvMWPUlitrw=";
version = "8.1.113";
sha256 = "sha256-1knm+l8MSb7XKq2WIbehAnz7loRPjgnc+R98zpWKEAE=";
};
}

4
pkgs/tools/misc/fluent-bit/default.nix
View File

@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fluent-bit";
version = "2.2.2";
version = "3.0.0";
src = fetchFromGitHub {
owner = "fluent";
repo = "fluent-bit";
rev = "v${finalAttrs.version}";
hash = "sha256-+AkIoGIAwz5dqQGtTJQjz+a9jgtxU1zwDuivj862Rw0=";
hash = "sha256-wyRzMIAbv4aDUUiI3UxZDIsL6DpoxbWXNmsADRL425A=";
};
nativeBuildInputs = [ cmake flex bison ];

4
pkgs/tools/misc/github-backup/default.nix
View File

@ -7,12 +7,12 @@
python3.pkgs.buildPythonApplication rec {
pname = "github-backup";
version = "0.45.0";
version = "0.45.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-bT5eqhpSK9u6Q4hO8FTgbpjjv0x2am1m2fOw5OqxixQ=";
hash = "sha256-+dQVewMHSF0SnOKmgwc9pmqXAJGLjSqwS9YQHdvEmKo=";
};
nativeBuildInputs = with python3.pkgs; [

6
pkgs/tools/misc/ollama/default.nix
View File

@ -68,6 +68,10 @@ let
cudaPackages.cudatoolkit
cudaPackages.cuda_cudart
];
postBuild = ''
rm "$out/lib64"
ln -s "lib" "$out/lib64"
'';
};
runtimeLibs = lib.optionals enableRocm [
@ -166,7 +170,7 @@ goBuild ((lib.optionalAttrs enableRocm {
mv "$out/bin/ollama" "$out/bin/.ollama-unwrapped"
makeWrapper "$out/bin/.ollama-unwrapped" "$out/bin/ollama" \
--suffix LD_LIBRARY_PATH : '/run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs}' '' + lib.optionalString enableRocm ''\
--set-default HIP_PATH ${pkgs.rocmPackages.meta.rocm-hip-libraries}
--set-default HIP_PATH ${rocmPath}
'';
ldflags = [

6
pkgs/tools/networking/goflow2/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "goflow2";
version = "2.1.2";
version = "2.1.3";
src = fetchFromGitHub {
owner = "netsampler";
repo = pname;
rev = "v${version}";
hash = "sha256-eI5Czx721aty1b+rs8uHrx0IBM/DK7bkPck1QIYPcNI=";
hash = "sha256-wtvBkk+Y4koGDGN+N/w4FsdejgpCIio0g2QV35Pr/fo=";
};
ldflags = [
@ -20,7 +20,7 @@ buildGoModule rec {
"-X=main.version=${version}"
];
vendorHash = "sha256-9Ebrkizt/r60Kxh291CLzwKIkpdQqJuVYQ2umxih9lo=";
vendorHash = "sha256-qcWeIg278V2bgFGpWwUT5JCblxfBv0/gWV1oXul/nCQ=";
meta = with lib; {
description = "High performance sFlow/IPFIX/NetFlow Collector";

5
pkgs/tools/networking/ipv6calc/default.nix
View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "ipv6calc";
version = "4.1.0";
version = "4.2.0";
src = fetchFromGitHub {
owner = "pbiering";
repo = pname;
rev = version;
sha256 = "sha256-zpV3RpFPYICntNLVTC4FpkrxJ7nDh/KEzmNpg0ORWZQ=";
sha256 = "sha256-z4CfakCvFdCPwB52wfeooCMI51QY629nMDbCmR50fI4=";
};
buildInputs = [
@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--prefix=${placeholder "out"}"
"--libdir=${placeholder "out"}/lib"
"--datadir=${placeholder "out"}/share"
"--disable-bundled-getopt"
"--disable-bundled-md5"
"--disable-dynamic-load"

4
pkgs/tools/system/consul-template/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "consul-template";
version = "0.37.2";
version = "0.37.3";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "consul-template";
rev = "v${version}";
hash = "sha256-5BVOs73StkKiiLAoFjlsH/q+B4C+gCuu6ag2XJPwbIQ=";
hash = "sha256-WzI/w2hL8EDI8X6T7erIeSrxiSv3dryehCg6KyTkGj0=";
};
vendorHash = "sha256-oVauzk6vZJSeub55s1cTc+brDoUYwauiMSgFuN0xCw4=";

3
pkgs/top-level/all-packages.nix
View File

@ -25849,6 +25849,7 @@ with pkgs;
dmarc-metrics-exporter = callPackage ../servers/monitoring/prometheus/dmarc-metrics-exporter { };
dmlive = callPackage ../applications/video/dmlive {
inherit (darwin) configd;
inherit (darwin.apple_sdk.frameworks) Security;
};
@ -36229,8 +36230,6 @@ with pkgs;
ytmdl = callPackage ../tools/misc/ytmdl { };
yutto = callPackage ../tools/misc/yutto { };
yuview = libsForQt5.yuview;
wallust = callPackage ../applications/misc/wallust { };

2
pkgs/top-level/php-packages.nix
View File

@ -204,6 +204,8 @@ lib.makeScope pkgs.newScope (self: with self; {
php-parallel-lint = callPackage ../development/php-packages/php-parallel-lint { };
phpinsights = callPackage ../development/php-packages/phpinsights { };
phpmd = callPackage ../development/php-packages/phpmd { };
phpspy = callPackage ../development/php-packages/phpspy { };

1
pkgs/top-level/python-aliases.nix
View File

@ -302,6 +302,7 @@ mapAliases ({
pam = python-pam; # added 2020-09-07.
PasteDeploy = pastedeploy; # added 2021-10-07
pathpy = path; # added 2022-04-12
pcbnew-transition = pcbnewtransition; # added 2024-03-21
pdfposter = throw "pdfposter was promoted to a top-level attribute"; # Added 2023-06-29
pdfminer = pdfminer-six; # added 2022-05-25
pep257 = pydocstyle; # added 2022-04-12

2
pkgs/top-level/python-packages.nix
View File

@ -9354,7 +9354,7 @@ self: super: with self; {
inherit (pkgs) libpcap; # Avoid confusion with python package of the same name
};
pcbnew-transition = callPackage ../development/python-modules/pcbnew-transition { };
pcbnewtransition = callPackage ../development/python-modules/pcbnewtransition { };
pcodedmp = callPackage ../development/python-modules/pcodedmp { };