Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-06-19 00:03:05 +00:00 committed by GitHub
commit 446fc5bdf3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
144 changed files with 727 additions and 510 deletions

View File

@ -81,7 +81,7 @@ let
&& final.parsed.kernel == platform.parsed.kernel;
isCompatible = _: throw "2022-05-23: isCompatible has been removed in favor of canExecute, refer to the 22.11 changelog for details";
# Derived meta-data
useLLVM = final.isFreeBSD;
useLLVM = final.isFreeBSD || final.isOpenBSD;
libc =
/**/ if final.isDarwin then "libSystem"

View File

@ -535,11 +535,9 @@ rec {
name = "riscv-multiplatform";
target = "Image";
autoModules = true;
preferBuiltin = true;
baseConfig = "defconfig";
DTB = true;
extraConfig = ''
SERIAL_OF_PLATFORM y
'';
};
};

View File

@ -16724,6 +16724,12 @@
githubId = 1922770;
name = "Tim Engler";
};
redhawk = {
email = "redhawk76767676@gmail.com";
github = "Redhawk18";
githubId = 77415970;
name = "Redhawk";
};
redvers = {
email = "red@infect.me";
github = "redvers";
@ -19621,12 +19627,6 @@
githubId = 2389333;
name = "Andy Tockman";
};
tcmal = {
email = "me@aria.rip";
github = "tcmal";
githubId = 4183876;
name = "Aria Shrimpton";
};
teatwig = {
email = "nix@teatwig.net";
name = "tea";

View File

@ -15,6 +15,8 @@
- [Quickwit](https://quickwit.io), sub-second search & analytics engine on cloud storage. Available as [services.quickwit](options.html#opt-services.quickwit).
- [Flood](https://flood.js.org/), a beautiful WebUI for various torrent clients. Available as [services.flood](options.html#opt-services.flood).
- [Renovate](https://github.com/renovatebot/renovate), a dependency updating tool for various git forges and language ecosystems. Available as [services.renovate](#opt-services.renovate.enable).
## Backward Incompatibilities {#sec-release-24.11-incompatibilities}

View File

@ -1316,6 +1316,7 @@
./services/system/zram-generator.nix
./services/torrent/deluge.nix
./services/torrent/flexget.nix
./services/torrent/flood.nix
./services/torrent/magnetico.nix
./services/torrent/opentracker.nix
./services/torrent/peerflix.nix

View File

@ -60,6 +60,7 @@ in {
config = mkIf cfg.enable {
services.qdrant.settings = {
service.static_content_dir = mkDefault pkgs.qdrant-web-ui;
storage.storage_path = mkDefault "/var/lib/qdrant/storage";
storage.snapshots_path = mkDefault "/var/lib/qdrant/snapshots";
# The following default values are the same as in the default config,

View File

@ -0,0 +1,85 @@
{ config, lib, pkgs, utils, ... }:
let
cfg = config.services.flood;
in
{
meta.maintainers = with lib.maintainers; [ thiagokokada ];
options.services.flood = {
enable = lib.mkEnableOption "flood";
package = lib.mkPackageOption pkgs "flood" { };
openFirewall = lib.mkEnableOption "" // {
description = "Whether to open the firewall for the port in {option}`services.flood.port`.";
};
port = lib.mkOption {
type = lib.types.int;
description = "Port to bind webserver.";
default = 3000;
example = 3001;
};
host = lib.mkOption {
type = lib.types.str;
description = "Host to bind webserver.";
default = "localhost";
example = "::";
};
extraArgs = lib.mkOption {
type = with lib.types; listOf str;
description = "Extra arguments passed to `flood`.";
default = [ ];
example = [ "--baseuri=/" ];
};
};
config = lib.mkIf cfg.enable {
systemd.services.flood = {
description = "A modern web UI for various torrent clients.";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
unitConfig = {
Documentation = "https://github.com/jesec/flood/wiki";
};
serviceConfig = {
Restart = "on-failure";
RestartSec = "3s";
ExecStart = utils.escapeSystemdExecArgs ([
(lib.getExe cfg.package)
"--host"
cfg.host
"--port"
(toString cfg.port)
"--rundir=/var/lib/flood"
] ++ cfg.extraArgs);
CapabilityBoundingSet = [ "" ];
DynamicUser = true;
LockPersonality = true;
NoNewPrivileges = true;
PrivateDevices = true;
PrivateTmp = true;
ProtectClock = true;
ProtectControlGroups = true;
ProtectHome = true;
ProtectHostname = true;
ProtectKernelLogs = true;
ProtectKernelModules = true;
ProtectKernelTunables = true;
ProtectProc = "invisible";
ProtectSystem = "strict";
RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
RestrictNamespaces = true;
RestrictRealtime = true;
RestrictSUIDSGID = true;
StateDirectory = "flood";
SystemCallArchitectures = "native";
SystemCallFilter = [ "@system-service" "@pkey" "~@privileged" ];
};
};
networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [
cfg.port
];
};
}

View File

@ -1136,6 +1136,6 @@ in {
};
};
meta.maintainers = with maintainers; [ mvs tcmal ];
meta.maintainers = with maintainers; [ mvs ];
meta.doc = ./akkoma.md;
}

View File

@ -323,15 +323,15 @@ in {
assertions = [
{
assertion = (hasPrefix "/" efi.efiSysMountPoint);
message = "The ESP mount point '${efi.efiSysMountPoint}' must be an absolute path";
message = "The ESP mount point '${toString efi.efiSysMountPoint}' must be an absolute path";
}
{
assertion = cfg.xbootldrMountPoint == null || (hasPrefix "/" cfg.xbootldrMountPoint);
message = "The XBOOTLDR mount point '${cfg.xbootldrMountPoint}' must be an absolute path";
message = "The XBOOTLDR mount point '${toString cfg.xbootldrMountPoint}' must be an absolute path";
}
{
assertion = cfg.xbootldrMountPoint != efi.efiSysMountPoint;
message = "The XBOOTLDR mount point '${cfg.xbootldrMountPoint}' cannot be the same as the ESP mount point '${efi.efiSysMountPoint}'";
message = "The XBOOTLDR mount point '${toString cfg.xbootldrMountPoint}' cannot be the same as the ESP mount point '${toString efi.efiSysMountPoint}'";
}
{
assertion = (config.boot.kernelPackages.kernel.features or { efiBootStub = true; }) ? efiBootStub;

View File

@ -328,6 +328,7 @@ in {
firewall-nftables = handleTest ./firewall.nix { nftables = true; };
fish = handleTest ./fish.nix {};
flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {};
flood = handleTest ./flood.nix {};
floorp = handleTest ./firefox.nix { firefoxPackage = pkgs.floorp; };
fluentd = handleTest ./fluentd.nix {};
fluidd = handleTest ./fluidd.nix {};

27
nixos/tests/flood.nix Normal file
View File

@ -0,0 +1,27 @@
import ./make-test-python.nix ({ pkgs, ... }:
let
port = 3001;
in
{
name = "flood";
meta = {
maintainers = with pkgs.lib.maintainers; [ thiagokokada ];
};
nodes.machine = { pkgs, ... }: {
services.flood = {
inherit port;
enable = true;
openFirewall = true;
extraArgs = [ "--baseuri=/" ];
};
};
testScript = /* python */ ''
machine.start()
machine.wait_for_unit("flood.service")
machine.wait_for_open_port(${toString port})
machine.succeed("curl --fail http://localhost:${toString port}")
'';
})

View File

@ -2,24 +2,25 @@
let
pname = "plexamp";
version = "4.8.3";
version = "4.10.1";
src = fetchurl {
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
name="${pname}-${version}.AppImage";
hash = "sha512-CrSXmRVatVSkMyB1QaNSL/tK60rQvT9JraRtYYLl0Fau3M1LJXK9yqvt77AjwIwIvi2Dm5SROG+c4rA1XtI4Yg==";
name = "${pname}-${version}.AppImage";
hash = "sha512-Y43W6aPnZEMnkBQwSHbT8PWjuhkfNxce79Y9cixEPnq4VybROHGb9s6ghV7kP81TSWkb9QruFhmXfuJRSkXxTw==";
};
appimageContents = appimageTools.extractType2 {
inherit pname version src;
};
in appimageTools.wrapType2 {
in
appimageTools.wrapType2 {
inherit pname version src;
extraInstallCommands = ''
install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop
install -m 444 -D ${appimageContents}/plexamp.png \
$out/share/icons/hicolor/512x512/apps/plexamp.png
install -m 444 -D ${appimageContents}/plexamp.svg \
$out/share/icons/hicolor/scalable/apps/plexamp.svg
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
'';
@ -29,9 +30,9 @@ in appimageTools.wrapType2 {
meta = with lib; {
description = "Beautiful Plex music player for audiophiles, curators, and hipsters";
homepage = "https://plexamp.com/";
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/53";
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/73";
license = licenses.unfree;
maintainers = with maintainers; [ killercup synthetica ];
maintainers = with maintainers; [ killercup redhawk synthetica ];
platforms = [ "x86_64-linux" ];
};
}

View File

@ -5,7 +5,7 @@
set -Eeuxo pipefail
cleanup() {
rm -rf "$TMPDIR"
rm -rf "$TMPDIR"
}
trap cleanup EXIT
@ -42,9 +42,10 @@ if diff "$DEFAULT_NIX" "$WORKING_NIX"; then
fi
# update sha hash (convenietly provided)
sed -i "s@sha.* = .*;@sha512 = \"$SHA512\";@g" "$WORKING_NIX"
sed -i "s@hash.* = .*;@hash = \"sha512-$SHA512\";@g" "$WORKING_NIX"
# update the changelog ("just" increment the number)
# manually check that the changelog corresponds to our Plexamp version
CHANGELOG_URL=$(rg --only-matching 'changelog = "(.+)";' --replace '$1' $WORKING_NIX)
CHANGELOG_NUMBER=$(rg --only-matching '.*/([0-9]+)' --replace '$1' <<< $CHANGELOG_URL)
NEXT_CHANGELOG=$(($CHANGELOG_NUMBER + 1))

View File

@ -484,6 +484,23 @@ let
};
};
banacorn.agda-mode = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "banacorn";
name = "agda-mode";
version = "0.4.7";
hash = "sha256-gNa3n16lP3ooBRvGaugTua4IXcIzpMk7jBYMJDQsY00=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/banacorn.agda-mode/changelog";
description = "agda-mode on VS Code";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=banacorn.agda-mode";
homepage = "https://github.com/banacorn/agda-mode-vscode";
maintainers = with lib.maintainers; [ Anillc ];
license = lib.licenses.mit;
};
};
batisteo.vscode-django = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "batisteo";
@ -2930,6 +2947,23 @@ let
};
};
mesonbuild.mesonbuild = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "mesonbuild";
name = "mesonbuild";
version = "1.24.0";
hash = "sha256-n7c2CUiTIej2Y/QMGWpv6anuCDjqpo2W+hJylfvvMVE=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/mesonbuild.mesonbuild/changelog";
description = "Meson language support for Visual Studio Code";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=mesonbuild.mesonbuild";
homepage = "https://github.com/mesonbuild/vscode-meson";
maintainers = with lib.maintainers; [ Anillc ];
license = lib.licenses.asl20;
};
};
mgt19937.typst-preview = callPackage ./mgt19937.typst-preview { };
mhutchie.git-graph = buildVscodeMarketplaceExtension {

View File

@ -11,7 +11,7 @@
, flann
, gdal
, gmp
, LASzip
, laszip
, mpfr
, pdal
, pcl
@ -48,7 +48,7 @@ mkDerivation rec {
flann
gdal
gmp
LASzip
laszip
mpfr
pdal
pcl

View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "tickrs";
version = "0.14.9";
version = "0.14.10";
src = fetchFromGitHub {
owner = "tarkah";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-cN5GtU3bmsdJvfjVdWvWAshiU3Ged7L9pc8wid8GQwA=";
hash = "sha256-6iMThVLIkFoNa7Z0MuyhUNGCwFtCfmG7jHvDfrEZE2I=";
};
cargoHash = "sha256-ngDA085V3+2oBH13Fs+pJez2W2/i1pEKoWdqJ4/3Q0I=";
cargoHash = "sha256-gfBmoN91xUcjBafxBoLP41Fl8FuH2taAu3P6sgJPNWI=";
nativeBuildInputs = [
pkg-config

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "tuckr";
version = "0.8.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "RaphGL";
repo = "Tuckr";
rev = version;
hash = "sha256-S4mHNCyK7WGYRBckxQkwA3+eu7QhUyKkOZ/KqhMJf+s=";
hash = "sha256-oQSuR0Zt1T8YU3O2Dq/qHl4ysVDl+3EVvp9r2mD3hRA=";
};
cargoHash = "sha256-aUhiMJUKV+Da3WLUY9Jr3oDB8yqcUm0pP05yKaITjM0=";
cargoHash = "sha256-ESDfUZsoqwBurXuwNIRSqxoDWnA2VpDZ9Q9GGaV8B4Y=";
doCheck = false; # test result: FAILED. 5 passed; 3 failed;

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "kubefirst";
version = "2.4.9";
version = "2.4.10";
src = fetchFromGitHub {
owner = "kubefirst";
repo = "kubefirst";
rev = "refs/tags/v${version}";
hash = "sha256-BuGE+SVLklToKnH7pptfuHqwddncUQq523RZtfmtkLg=";
hash = "sha256-EgJ+ymddMsB37ygREwdF6qmGcgJKPz06//dwwa1pXd0=";
};
vendorHash = "sha256-ZcZl4knlyKAwTsiyZvlkN5e2ox30B5aNzutI/2UEE9U=";
vendorHash = "sha256-5UdKjxs0f8dHTzWvHpMbYSCcIqTU5aT5anNVk0O94tw=";
ldflags = [
"-s"

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "temporal";
version = "1.24.1";
version = "1.24.2";
src = fetchFromGitHub {
owner = "temporalio";
repo = "temporal";
rev = "v${version}";
hash = "sha256-GEmlmVTxQPoKsb9RtS6RcHY/0iDZsj3jG/Les2VPMAc=";
hash = "sha256-hQkus8BZvtR2ObCJbtP2SZST9tRxuPjFwR+jKDYH8Bs=";
};
vendorHash = "sha256-u9xQFTwVKEGRPhBwcBgexCQhlNO91yP4m4vchCdBt9E=";

View File

@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "tftui";
version = "0.13.3";
version = "0.13.5";
pyproject = true;
src = fetchFromGitHub {
owner = "idoavrah";
repo = "terraform-tui";
rev = "refs/tags/v${version}";
hash = "sha256-ojmq5m2BRB2Jwvg4j4zc0/jtv4rg1OKJpQiUQoBn+s0=";
hash = "sha256-xOlPuPVwfVT7jfBJPqZ5FbOs80HE0k2ZqcA+Jcxh9p4=";
};
pythonRelaxDeps = [

View File

@ -1,6 +1,7 @@
{ lib
, buildNpmPackage
, fetchFromGitHub
, nixosTests
}:
buildNpmPackage rec {
@ -16,6 +17,10 @@ buildNpmPackage rec {
npmDepsHash = "sha256-md76I7W5QQvfbOmk5ODssMtJAVOj8nvaJ2PakEZ8WUA=";
passthru.tests = {
inherit (nixosTests) flood;
};
meta = with lib; {
description = "Modern web UI for various torrent clients with a Node.js backend and React frontend";
homepage = "https://flood.js.org";

View File

@ -43,13 +43,13 @@ let
in
stdenv.mkDerivation rec {
pname = "openmolcas";
version = "24.02";
version = "24.06";
src = fetchFromGitLab {
owner = "Molcas";
repo = "OpenMolcas";
rev = "v${version}";
hash = "sha256-4Ek0cnaRfLEbj1Nj31rRp9b2sois4rIFTcpOUq9h2mw=";
hash = "sha256-/y6vEvA1Zf+p7Z0WpcN4P5voLN8MmfbKz1FuthgVQp0=";
};
patches = [

View File

@ -3,23 +3,23 @@
{
"kicad" = {
kicadVersion = {
version = "8.0.2";
version = "8.0.3";
src = {
rev = "55a4d4f5e2f54be6ccf74a8919d04684c9df4c50";
sha256 = "069ycii9zvdxwxd73afd6bp975r1555yvifi9zdb77qyvn0d9nr9";
rev = "8ba5ba46af8502ea7a7d2a9754363167c2742399";
sha256 = "0hafvcjjwylgcpgyyasmb2q210k82wvcswvgjvwwh76bwshwcpwa";
};
};
libVersion = {
version = "8.0.2";
version = "8.0.3";
libSources = {
symbols.rev = "099ac0c8ac402a685fde00b1369e34a116e29661";
symbols.sha256 = "0w333f89yw2m0zlpkg0k6hfwlj10snm8laihdjnsb22asyz4pbhn";
templates.rev = "2e2da58e02707d327d59d4101c401a82dc9a26f6";
templates.sha256 = "073a6cyvzzy0vmkj3ip4ziq7b7pcizs70nm5acw838dxghjfyv3v";
footprints.rev = "e8c30550cde4945cbe1bf30cccf0b3c1e2bda6c6";
footprints.sha256 = "10j8qjljc1fv8k4zp3zn0da33g57hn6pgrgmbgp18dsa539xvxcz";
packages3d.rev = "249f7947587529026e1676cd70c8d7493a8d8162";
packages3d.sha256 = "04gvfb54jhnww2qwrxc27wpyrvmjasdc4xhr0ridl7dglh4qcp35";
symbols.rev = "2bc103c46a8daacbba2cded8b9f095b330ba928d";
symbols.sha256 = "1za0spq09bbj7xwfwr1abmwjnqfd3zx0crayaz7915ja0ifi75hd";
templates.rev = "0f57b59d365d1f8b8fdd0745e10beb035e88ba37";
templates.sha256 = "03idwrk3vj9h2az8j8lqpbdbnfxdbkzh4db68kq3644yj3cnlcza";
footprints.rev = "539ffd8c0898ad8c8c51c2ab85ba56bfd77271c7";
footprints.sha256 = "0ik4hjl5m65wnpaymg58zbvsfvchhyq5x3psvj6005mgv2hrican";
packages3d.rev = "3172a1cc0931c1734efad68623374d5277f8ab60";
packages3d.sha256 = "1yjlg7cxwhlzcdbxjqyqamr140sz8gvzi63k2401mhdbh88c9kii";
};
};
};

View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "gource";
version = "0.54";
version = "0.55";
src = fetchurl {
url = "https://github.com/acaudwell/Gource/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
hash = "sha256-HcvO32XSz01p/gtjPlTCApJsCLgpvK0Lc+r54pzW+uU=";
hash = "sha256-yCOSEtKLB1CNnkd2GZdoAmgWKPwl6z4E9mcRdwE8AUI=";
};
postPatch = ''

View File

@ -10,11 +10,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "tart";
version = "2.11.1";
version = "2.12.0";
src = fetchurl {
url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz";
hash = "sha256-LOU7nCJChXgYq10AeZVAMa/QSUD4AKUSLLUKUBrk4UA=";
hash = "sha256-+33Z7M9Y8fWFfCBNJrXHljwoAn7p70+yvTmBwx1X68M=";
};
sourceRoot = ".";

View File

@ -28,6 +28,11 @@ python3.pkgs.buildPythonApplication rec {
url = "https://github.com/virt-manager/virt-manager/commit/83fcc5b2e8f2cede84564387756fe8971de72188.patch";
hash = "sha256-yEk+md5EkwYpP27u3E+oTJ8thgtH2Uy1x3JIWPBhqeE=";
})
# fix crash with some cursor themes
(fetchpatch {
url = "https://github.com/virt-manager/virt-manager/commit/cc4a39ea94f42bc92765eb3bb56e2b7f9198be67.patch";
hash = "sha256-dw6yrMaAOnTh8Z6xJQQKmYelOkOl6EBAOfJQU9vQ8Ws=";
})
];
nativeBuildInputs = [

View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "ast-grep";
version = "0.22.6";
version = "0.23.0";
src = fetchFromGitHub {
owner = "ast-grep";
repo = "ast-grep";
rev = version;
hash = "sha256-QE8bTFlKlaxUeYJoaZyiuv/7zk+Pi3s64Er5YNTUh7I=";
hash = "sha256-QW3ZwALvfSTcvXuH/ploqUD1UJ5fGySIAc3N/TMlB4g=";
};
cargoHash = "sha256-tTEZUGC4RHjnAK+fMNkVqgsngBSdVAtoZ5ij3VbzKb4=";
cargoHash = "sha256-MUdHDP+1KQBXy2itOhW6pDuOTwIwXHy4oDfifDRdM94=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -0,0 +1,62 @@
{
lib,
python3Packages,
fetchFromGitHub,
meson,
ninja,
pkg-config,
gobject-introspection,
blueprint-compiler,
wrapGAppsHook4,
desktop-file-utils,
libadwaita,
gtksourceview5,
}:
python3Packages.buildPythonApplication rec {
pname = "escambo";
version = "0.1.2";
pyproject = false; # built with meson
src = fetchFromGitHub {
owner = "CleoMenezesJr";
repo = "escambo";
rev = version;
hash = "sha256-jMlix8nlCaVLZEhqzb6LRNrD3DUZMTIjqrRKo6nFbQA=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
gobject-introspection
blueprint-compiler
wrapGAppsHook4
desktop-file-utils
];
buildInputs = [
libadwaita
gtksourceview5
];
dependencies = with python3Packages; [
pygobject3
requests
];
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
meta = {
description = "HTTP-based APIs test application for GNOME";
homepage = "https://github.com/CleoMenezesJr/escambo";
license = lib.licenses.gpl3Plus;
mainProgram = "escambo";
maintainers = with lib.maintainers; [ aleksana ];
platforms = lib.platforms.linux;
};
}

View File

@ -5,10 +5,10 @@
let
pname = "fflogs";
version = "8.5.12";
version = "8.5.16";
src = fetchurl {
url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
hash = "sha256-mlqQm9o001+pSMfMbOwa+gKcIIC6SBg7Rott9+XkB2E=";
hash = "sha256-eUXri4aVMnZtXzCDL3NZTdCR7y0VD5kG4D9YfXQVuzo=";
};
extracted = appimageTools.extractType2 { inherit pname version src; };
in

View File

@ -2,71 +2,55 @@
, cargo
, rustc
, fetchFromGitHub
, glib
, gtk4
, libadwaita
, rustPlatform
, openssl
, pkg-config
, lib
, wrapGAppsHook4
, meson
, ninja
, gdk-pixbuf
, cmake
, desktop-file-utils
, gettext
, blueprint-compiler
, appstream-glib
, glib-networking
}:
stdenv.mkDerivation rec {
pname = "geopard";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "ranfdev";
repo = pname;
rev = version;
hash = "sha256-elHxtFEGkdhEPHxuJtcMYwWnvo6vDaHiOyN51EOzym0=";
repo = "geopard";
rev = "v${version}";
hash = "sha256-QHqhjoiKiwTBDMDhb7Agqe0/o2LyLDs2kl/HC4UfayY=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit pname version src;
hash = "sha256-80YujPjcmAxH1gITT4OJk8w4m8Z/pAYtBUpCPQOKe3E=";
hash = "sha256-AmGwsSRrZK+oSnkn9Xzmia/Kbkw19v0nb1kFJtymqOs=";
};
nativeBuildInputs = [
openssl
gettext
glib # for glib-compile-schemas
meson
ninja
pkg-config
wrapGAppsHook4
cmake
blueprint-compiler
desktop-file-utils
appstream-glib
blueprint-compiler
cargo
rustc
rustPlatform.cargoSetupHook
];
buildInputs = [
desktop-file-utils
gdk-pixbuf
glib
gtk4
libadwaita
openssl
glib-networking
];
meta = with lib; {
homepage = "https://github.com/ranfdev/Geopard";
description = "Colorful, adaptive gemini browser";
maintainers = with maintainers; [ jfvillablanca ];
maintainers = with maintainers; [ jfvillablanca aleksana ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
mainProgram = "geopard";

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gmid";
version = "2.0.4";
version = "2.0.5";
src = fetchFromGitHub {
owner = "omar-polo";
repo = pname;
rev = version;
hash = "sha256-ioyQS5jjOICAWtZG8no+WUmLybEVLvum6TFFFdnMdfY=";
hash = "sha256-xuA5yLtRu9GDrSr7FBlAwEjCjFVRmnOuBM62AHOHDhc=";
};
nativeBuildInputs = [ bison ];

View File

@ -39,7 +39,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "goofcord";
version = "1.4.2";
version = "1.4.3";
src =
let
@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
{
x86_64-linux = fetchurl {
url = "${base}/v${finalAttrs.version}/GoofCord-${finalAttrs.version}-linux-amd64.deb";
hash = "sha256-fUP/se3hOhs+aAoew25YhRyxnodYPrgqN68RIg1A1Kw=";
hash = "sha256-XO/T5O6+hJ6QT8MCVorrdXPZZlrywa6u0UKPk9WIQBE=";
};
aarch64-linux = fetchurl {
url = "${base}/v${finalAttrs.version}/GoofCord-${finalAttrs.version}-linux-arm64.deb";
hash = "sha256-hVpXmBSIgoON683f/sRtmpHwqxcO6IrFCCRPZjsUqjw=";
hash = "sha256-4mJ3kDQ+eh9LnyzxyNYvd2hMmgiJtBMXKup7ILlHk0Y=";
};
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

View File

@ -7,10 +7,10 @@
}:
stdenv.mkDerivation rec {
pname = "halo";
version = "2.16.2";
version = "2.16.3";
src = fetchurl {
url = "https://github.com/halo-dev/halo/releases/download/v${version}/${pname}-${version}.jar";
hash = "sha256-bHMcJvM+ZBjiGUAZzjnEupWW9L8viE/Ix8IK2y4KDoA=";
hash = "sha256-sl2b9zKugnCEMHyvEqBWZPidoANth5gRfh34NAaqg7A=";
};
nativeBuildInputs = [

View File

@ -5,16 +5,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "impala";
version = "0.1.1";
version = "0.2";
src = fetchFromGitHub {
owner = "pythops";
repo = "impala";
rev = "v${version}";
hash = "sha256-r/aWzSn/Dci69oS/yopG6Ro34U8hniHVanctyM7RvDw=";
hash = "sha256-7UMHkm3AtPqUILrsUnM0SbZT4Sq55dEElMN0KonjwtE=";
};
cargoHash = "sha256-IV1ftsRyM0CUlQMVmLip1FiqnouT5TsKASpF/KLARqY=";
cargoHash = "sha256-CtEirsSQAg2Fv44YoKKmSjQs85++QWFRcWoA4VrBbgU=";
meta = {
description = "TUI for managing wifi";

View File

@ -0,0 +1,58 @@
{
lib,
python3Packages,
fetchFromGitHub,
meson,
ninja,
pkg-config,
gobject-introspection,
wrapGAppsHook4,
desktop-file-utils,
libadwaita,
}:
python3Packages.buildPythonPackage rec {
pname = "iplookup-gtk";
version = "0.3.4";
pyproject = false; # Built with meson
src = fetchFromGitHub {
owner = "Bytezz";
repo = "IPLookup-gtk";
rev = "v${version}";
hash = "sha256-NqFE6vRdLpnlCzGAUE4iOfLmTnUgX3CHtoXfsbT3zm4=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
gobject-introspection
wrapGAppsHook4
desktop-file-utils
];
buildInputs = [
libadwaita
];
dependencies = with python3Packages; [
pygobject3
];
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
meta = {
description = "Find info about an IP address";
homepage = "https://github.com/Bytezz/IPLookup-gtk";
changelog = "https://github.com/Bytezz/IPLookup-gtk/releases/tag/${src.rev}";
license = lib.licenses.gpl3Plus;
mainProgram = "iplookup";
maintainers = with lib.maintainers; [ aleksana ];
platforms = lib.platforms.linux;
};
}

View File

@ -7,7 +7,7 @@
stdenv.mkDerivation (finalAttrs: {
version = "3.4.3";
pname = "LASzip";
pname = "laszip";
src = fetchFromGitHub {
owner = "LASzip";

View File

@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
version = "2.2.0";
pname = "LASzip";
pname = "laszip";
src = fetchFromGitHub {
owner = "LASzip";
repo = "LASzip";
rev = "v${version}";
rev = "v${finalAttrs.version}";
sha256 = "sha256-TXzse4oLjNX5R2xDR721iV+gW/rP5z3Zciv4OgxfeqA=";
};
@ -20,4 +20,4 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.michelk ];
platforms = platforms.unix;
};
}
})

View File

@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "liboqs";
version = "0.10.0";
version = "0.10.1";
src = fetchFromGitHub {
owner = "open-quantum-safe";
repo = "liboqs";
rev = finalAttrs.version;
hash = "sha256-BFDa5NUr02lFPcT4Hnb2rjGAi+2cXvh1SHLfqX/zLlI=";
hash = "sha256-zsSKFUs75K0Byxh3KVCZ8lIOf/vpbyMJXfk6fa2u+aE=";
};
patches = [

View File

@ -6,14 +6,14 @@
python3Packages.buildPythonApplication rec {
pname = "marcel";
version = "0.28";
version = "0.29.0";
pyproject = true;
src = fetchFromGitHub {
owner = "geophile";
repo = "marcel";
rev = "refs/tags/v${version}";
hash = "sha256-aJq8FAW1/Vo2x3st+/cxAzo4jHYPBDx/2i/2h1GVnrs=";
hash = "sha256-hUI5dUqelmRuk65s67rJXrZoPDWAcnNVIHlzxAgRExs=";
};
nativeBuildInputs = with python3Packages; [

View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "nhost-cli";
version = "1.18.2";
version = "1.18.3";
src = fetchFromGitHub {
owner = "nhost";
repo = "cli";
rev = "v${version}";
hash = "sha256-WIkuYmNXpKLsHY6de6PDa56NFTkgpXt1aGouJrEiyUo=";
hash = "sha256-TYi0Cth4GWEIT9QRUC4z3Uwnh4EmywY+XCOM5oJP+4g=";
};
vendorHash = null;

View File

@ -5,16 +5,16 @@
buildNpmPackage rec {
pname = "pm2";
version = "5.4.0";
version = "5.4.1";
src = fetchFromGitHub {
owner = "Unitech";
repo = "pm2";
rev = "v${version}";
hash = "sha256-hmciDjlmlIaqOWl9rYWQ6muq6LFzQb5tfpdzL0vV/ZM=";
hash = "sha256-LMBQ1+VyGjq76Qs5HtELSvEuml3XfzLBbvcuAFuJzw4=";
};
npmDepsHash = "sha256-je+GwPkUiGPWgKQgSPlx2OEWMbDKdwEM/idTjgINLHY=";
npmDepsHash = "sha256-hXP+rXXn0Ds81D2iLWVkgfFiFA3dDD5wrAoVivHaRHA=";
dontNpmBuild = true;

View File

@ -0,0 +1,35 @@
{
buildNpmPackage,
fetchFromGitHub,
lib,
}:
buildNpmPackage rec {
pname = "qdrant-web-ui";
version = "0.1.28";
src = fetchFromGitHub {
owner = "qdrant";
repo = "qdrant-web-ui";
rev = "refs/tags/v${version}";
hash = "sha256-jbr1PdoYcBxT7EOksLOPYNGz+GG5HVG406S+GRyWeiE=";
};
npmDepsHash = "sha256-8sk2QyunSrKE5/kjSoo0whdVbY9IXCF+n7ZIjP4Mgq8=";
npmBuildScript = "build-qdrant";
installPhase = ''
runHook preInstall
cp -r dist $out
runHook postInstall
'';
meta = {
description = "Self-hosted web UI for Qdrant";
homepage = "https://github.com/qdrant/qdrant-web-ui";
changelog = "https://github.com/qdrant/qdrant-web-ui/releases/tag/v${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ xzfc ];
platforms = lib.platforms.all;
};
}

View File

@ -5,11 +5,11 @@
renode.overrideAttrs (finalAttrs: _: {
pname = "renode-unstable";
version = "1.15.0+20240609git09f623310";
version = "1.15.1+20240615gitdd55f8ea4";
src = fetchurl {
url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz";
hash = "sha256-jbPvMzGXdBXT92aPXBQzw74hXW9JJeTZQgXKvILMlo0=";
hash = "sha256-CxV92sGxRlITi0jhi/O0J/FwLGyJVS7niIzlO3s3pis=";
};
passthru.updateScript =

View File

@ -15,14 +15,14 @@
python3Packages.buildPythonApplication rec {
pname = "rofimoji";
version = "6.3.1";
version = "6.3.2";
pyproject = true;
src = fetchFromGitHub {
owner = "fdw";
repo = "rofimoji";
rev = "refs/tags/${version}";
hash = "sha256-gYLUUbT6OHMo2nzJ//Pa0vZ9WPcHs6YnAjTKNO07VNk=";
hash = "sha256-LJJWHn3UnrCJaowHHuYksD2MHqClLc2MmYYXQfUxTgQ=";
};
nativeBuildInputs = [

View File

@ -7,16 +7,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "slumber";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "LucasPickering";
repo = "slumber";
rev = "v${version}";
hash = "sha256-sUCOuQ35wfbrLgiPdzw5wmr8BgzDinZDKfBJ3O9JrzI=";
hash = "sha256-7JXkyRhoSjGYhse+2/v3Ndogar10K4N3ZUZNGpMiQ/A=";
};
cargoHash = "sha256-geTQ/56nuPW9fVtz+YEP3VaYPdWVm83hsGslKCtj0Vo=";
cargoHash = "sha256-wZcnaT8EjbdSX6Y/UNS7v9/hQ9ISxkyRwRqRotXPCWU=";
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ];

View File

@ -14,9 +14,9 @@
}:
stdenv.mkDerivation (self: {
pname = "srm-cuarzo";
version = "0.5.6-2";
version = "0.5.7-1";
rev = "v${self.version}";
hash = "sha256-shYYmXTWa0cd0zTsdCDw536BkEtm6UdbUz/lQFURi90=";
hash = "sha256-TUYiReCWryNFfJ0lFBKNJiauil8ZwRSG8X9Bsdtwswc=";
src = fetchFromGitHub {
inherit (self) rev hash;

View File

@ -0,0 +1,29 @@
{
lib,
buildGoModule,
fetchFromGitHub,
}:
let
pname = "tparse";
version = "0.13.3";
in
buildGoModule {
inherit pname version;
src = fetchFromGitHub {
owner = "mfridman";
repo = pname;
rev = "v${version}";
hash = "sha256-MTaxEWRNAXem/DIirrd53YEHA/A5S4wNX4osuMV3gtc=";
};
vendorHash = "sha256-j+1B2zWONjFEGoyesX0EW964kD33Jy3O1aB1WEwlESA=";
meta = {
description = "CLI tool for summarizing go test output. Pipe friendly. CI/CD friendly";
mainProgram = "tparse";
homepage = "https://github.com/mfridman/tparse";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ obreitwi ];
};
}

View File

@ -1,7 +1,7 @@
{ lib
, buildNpmPackage
, fetchFromGitHub
, jq
, buildPackages
, libsecret
, pkg-config
, nodePackages
@ -23,12 +23,12 @@ buildNpmPackage rec {
npmDepsHash = "sha256-DfeaiqKadTnGzOObK01ctlavwqTMa0tqn59sLZMPvUM=";
nativeBuildInputs = [ pkg-config nodePackages.node-gyp jq ];
nativeBuildInputs = [ pkg-config nodePackages.node-gyp ];
buildInputs = [ libsecret ];
postPatch = ''
jq '
${lib.getExe buildPackages.jq} '
.scripts.postinstall |= empty | # tries to install playwright, not necessary for build
.scripts.build |= "gulp dapDebugServer" | # there is no build script defined
.bin |= "./dist/src/dapDebugServer.js" # there is no bin output defined

View File

@ -4,7 +4,7 @@
}:
let
pname = "wait4x";
version = "2.14.0";
version = "2.14.1";
in
buildGoModule {
inherit pname version;
@ -13,10 +13,10 @@ buildGoModule {
owner = "atkrad";
repo = pname;
rev = "v${version}";
hash = "sha256-4lv6nYeyjjGGQksi2Ffx+Yu0OazNsJ0QEZG5BfuyrJ8=";
hash = "sha256-7dm1KERBYkASuRWlCbpbLuHVc4uCMPWbSwegjZ8LwVU=";
};
vendorHash = "sha256-D8s42YArp0IGi7I6qB9eQEh1ZQptSrKLLVIIdqk5Kq0=";
vendorHash = "sha256-CYE5wvBgNLYzCiibd9SWubIQ+22nffr4jpwgwSxhtGo=";
# Tests make network access
doCheck = false;

View File

@ -1,10 +1,10 @@
{
"darwin": {
"hash": "sha256-fUGCbOQXT22VGFpnmLxDLfEaNOk7hJq4BF1PU54swYg=",
"version": "0.2024.06.11.08.02.stable_01"
"hash": "sha256-ZfW4pTFmEEA/IRBfEMfnVDOxWm3SxGqUCec2nC6MADA=",
"version": "0.2024.06.11.08.02.stable_03"
},
"linux": {
"hash": "sha256-5Ge6tNA4UnRfDhY7ki/3SIX3egkyWye9hHWEhObv/I8=",
"version": "0.2024.06.11.08.02.stable_01"
"hash": "sha256-xyE/Rc23+ael2oy0Hdq+kGzPYuq5+V8G3jAu3waA1Tk=",
"version": "0.2024.06.11.08.02.stable_03"
}
}

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }:
{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, libgeotiff, libtiff, laszip_2, fixDarwinDylibNames }:
stdenv.mkDerivation rec {
pname = "libLAS";
@ -35,13 +35,13 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ boost libgeotiff libtiff LASzip2 ];
buildInputs = [ boost libgeotiff libtiff laszip_2 ];
cmakeFlags = [
"-DWITH_LASZIP=ON"
# libLAS is currently not compatible with LASzip 3,
# see https://github.com/libLAS/libLAS/issues/144.
"-DLASZIP_INCLUDE_DIR=${LASzip2}/include"
"-DLASZIP_INCLUDE_DIR=${laszip_2}/include"
"-DCMAKE_EXE_LINKER_FLAGS=-pthread"
];

View File

@ -10,7 +10,7 @@
, curl
, gdal
, hdf5-cpp
, LASzip
, laszip
, libe57format
, libgeotiff
, libtiff
@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
curl
gdal
hdf5-cpp
LASzip
laszip
libgeotiff
libtiff
libxml2

View File

@ -32,6 +32,7 @@ buildPythonPackage rec {
];
pythonRelaxDeps = [
"build"
"packaging"
"readme-renderer"
"twine"

View File

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "dask-awkward";
version = "2024.3.0";
version = "2024.6.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -29,17 +29,17 @@ buildPythonPackage rec {
owner = "dask-contrib";
repo = "dask-awkward";
rev = "refs/tags/${version}";
hash = "sha256-Lkbp/XrDHOekMpT71pbxtuozgzU9iiGF2GJZ+tuV/yM=";
hash = "sha256-m/KvPo4IGn19sA5RcA/+OhLMCDBU+9BbMQtK3gHOoEc=";
};
pythonRelaxDeps = [ "awkward" ];
nativeBuildInputs = [
build-system = [
hatch-vcs
hatchling
];
propagatedBuildInputs = [
dependencies = [
awkward
cachetools
dask
@ -72,11 +72,11 @@ buildPythonPackage rec {
__darwinAllowLocalNetworking = true;
meta = with lib; {
meta = {
description = "Native Dask collection for awkward arrays, and the library to use it";
homepage = "https://github.com/dask-contrib/dask-awkward";
changelog = "https://github.com/dask-contrib/dask-awkward/releases/tag/${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ veprbl ];
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ veprbl ];
};
}

View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "dask-expr";
version = "1.1.2";
version = "1.1.3";
pyproject = true;
disabled = pythonOlder "3.9";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "dask";
repo = "dask-expr";
rev = "refs/tags/v${version}";
hash = "sha256-Gvib8fyogIiOllDp4SoVQkGcIPHMo9e9AfJWDaZ5sTU=";
hash = "sha256-20gVzmOnVWoPGrGcLp8nhAoiHWunaYZIXOxYho7ZhUs=";
};
postPatch = ''

View File

@ -41,7 +41,7 @@
let
self = buildPythonPackage rec {
pname = "dask";
version = "2024.5.2";
version = "2024.6.0";
pyproject = true;
disabled = pythonOlder "3.9";
@ -50,7 +50,7 @@ let
owner = "dask";
repo = "dask";
rev = "refs/tags/${version}";
hash = "sha256-8U+njWp1g+rmOEuUgh+qz1QyVCZ/gdEPky206cVp7fw=";
hash = "sha256-HtWxVWMk0G2OeBnZKLF5tuOohPbg20Ufl+VH/MX8vK0=";
};
build-system = [

View File

@ -25,7 +25,7 @@
buildPythonPackage rec {
pname = "distributed";
version = "2024.5.0";
version = "2024.6.0";
pyproject = true;
disabled = pythonOlder "3.9";
@ -34,7 +34,7 @@ buildPythonPackage rec {
owner = "dask";
repo = "distributed";
rev = "refs/tags/${version}";
hash = "sha256-9W5BpBQHw1ZXCOWiFPeIlMns/Yys1gtdwQ4Lhd7qjK8=";
hash = "sha256-8TShbpH+DB73G7D4pz8MHC/SPd3RaRttML0S4WaCE4k=";
};
postPatch = ''
@ -74,11 +74,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "distributed" ];
meta = with lib; {
meta = {
description = "Distributed computation in Python";
homepage = "https://distributed.readthedocs.io/";
changelog = "https://github.com/dask/distributed/blob/${version}/docs/source/changelog.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ teh ];
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ teh ];
};
}

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "galois";
version = "0.3.8";
version = "0.3.9";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "mhostetter";
repo = "galois";
rev = "refs/tags/v${version}";
hash = "sha256-Nfr9gD2FLZ+KvHh1mcpReUWnzFr/NxpvperzZPoFeT4=";
hash = "sha256-vgOsFEocgBvYba9Aq4HDYsnK1w+iQm1QDTzln68Tqss=";
};
nativeBuildInputs = [

View File

@ -2,18 +2,30 @@
lib,
buildPythonPackage,
fetchPypi,
fetchpatch2,
setuptools,
}:
buildPythonPackage rec {
pname = "humanfriendly";
version = "10.0";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
sha256 = "6b0b831ce8f15f7300721aa49829fc4e83921a9a301cc7f606be6686a2288ddc";
};
patches = [
(fetchpatch2 {
# https://github.com/xolox/python-humanfriendly/pull/75
url = "https://github.com/musicinmybrain/python-humanfriendly/commit/13d05b8057010121acd2a402a337ef4ee5834062.patch";
hash = "sha256-m7cySiIx0gNhh6KKhT71DJFOtFu2Copk9ic2yaiCulk=";
})
];
build-system = [ setuptools ];
# humanfriendly tests depends on coloredlogs which itself depends on
# humanfriendly. This lead to infinite recursion when trying to
# build this package so we have to disable the test suite :(

View File

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "jsonrpclib-pelix";
version = "0.4.3.2";
version = "0.4.3.3";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-6eCzPvqPog2BfdeN/Z5M2zlnyKXTy1p4O+HugcSonHw=";
hash = "sha256-xJT+cQCxE5sTEUacKLwy0cuS5P8fRRH7cdaAcgXcN3M=";
};
doCheck = false; # test_suite="tests" in setup.py but no tests in pypi.

View File

@ -7,7 +7,7 @@
scikit-build-core,
pybind11,
cmake,
LASzip,
laszip,
ninja,
pythonOlder,
}:
@ -48,7 +48,7 @@ buildPythonPackage rec {
dontUseCmakeConfigure = true;
buildInputs = [ LASzip ];
buildInputs = [ laszip ];
# There are no tests
doCheck = false;

View File

@ -30,14 +30,14 @@
buildPythonPackage rec {
pname = "niworkflows";
version = "1.10.1";
version = "1.10.2";
pyproject = true;
src = fetchFromGitHub {
owner = "nipreps";
repo = "niworkflows";
rev = "refs/tags/${version}";
hash = "sha256-ZOn3KSaPAA8zTdyexrjF9Wkb5C5qA/5eSJahg2DcX20=";
hash = "sha256-29ZxLuKrvgCIOMMCUpi0HHhlNlgqUrUrSCiikwecmKw=";
};
postPatch = ''

View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pipdeptree";
version = "2.22.0";
version = "2.23.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "tox-dev";
repo = "pipdeptree";
rev = "refs/tags/${version}";
hash = "sha256-Kvse8eSlhzIBJvvJ7KoV0FCf9muQHkFS4ozwWp0WLz0=";
hash = "sha256-Er47yUaRCtTYQOhttOMIaM2EFf0l5rMH5YV1kpMCDls=";
};
build-system = [

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "puremagic";
version = "1.23";
version = "1.24";
pyproject = true;
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "cdgriffith";
repo = "puremagic";
rev = "refs/tags/${version}";
hash = "sha256-DhOTx4Zpux2IiHkw/0nWwWfpnoqxrqqMJw4hrS4ZNGE=";
hash = "sha256-omVSSxMAQQm+Sy023xIGBYm55qrb1dbds1Jj9WCtNfw=";
};
build-system = [ setuptools ];

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "robotframework";
version = "7.0";
version = "7.0.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "robotframework";
repo = "robotframework";
rev = "refs/tags/v${version}";
hash = "sha256-IyOm2MTHj2rOew/IkyGIfI4XZSFU88+Tx8KHKIRT2G4=";
hash = "sha256-pr7x40ja1DwMPffmXQ2W53g1wuD0p63f+6ATfXhqGvE=";
};
nativeBuildInputs = [ setuptools ];

View File

@ -57,6 +57,7 @@ buildPythonPackage rec {
"click"
"cryptography"
"platformdirs"
"requests"
"typing-extensions"
];

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "weconnect";
version = "0.60.2";
version = "0.60.3";
pyproject = true;
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "tillsteinbach";
repo = "WeConnect-python";
rev = "refs/tags/v${version}";
hash = "sha256-VM4qCe+VMnfKXioUHTjOeBSniwpq44fvbN1k1jG6puk=";
hash = "sha256-eIGzcuSKzcpE6UPQKmv0kcFcIFizWOunfOJDHfcw7Yk=";
};
postPatch = ''

View File

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.137";
version = "3.2.138";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
rev = "refs/tags/${version}";
hash = "sha256-gI9x2QYrpludcIAmxSB1/Bhy/O+ZPt1EKI6FgNm85Yo=";
hash = "sha256-xgEVUZF6d/vmqaKVTxt0MtppqDBhPEzQcY37WVOR/EE=";
};
patches = [ ./flake8-compat-5.x.patch ];

View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "moon";
version = "1.25.1";
version = "1.25.6";
src = fetchFromGitHub {
owner = "moonrepo";
repo = pname;
rev = "v${version}";
hash = "sha256-LPQuP2OsR1TYnt7Qm8XRO0Ne7xliglJgQrMHNWnsYhM=";
hash = "sha256-DFBQryGbanytawHtD3ygSL9ypzM9hoxVoVB1H9ruPu4=";
};
cargoHash = "sha256-EWwUlKxsf0rZegxk1m11ZPIcfjwZKQ7C95l5UyGVFD0=";
cargoHash = "sha256-6Ipfz4649vf7qsavkif/zNbElMiZPEi/2ZXHbRcxRTw=";
env = {
RUSTFLAGS = "-C strip=symbols";

View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "cirrus-cli";
version = "0.119.0";
version = "0.119.1";
src = fetchFromGitHub {
owner = "cirruslabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BdCsm6ciQsfmrQOxOWPTfNbWXhnJzXBmHEUkPD/FobU=";
sha256 = "sha256-nEGeh0ZTYE4Ff0x+1G38KUFcUsr39kvM8QUfmHCFyK4=";
};
vendorHash = "sha256-rL4bXt6VBG2b9nZ1M2FF6E8ODPT3UF4aRHSJqpVWyTw=";

View File

@ -5,16 +5,16 @@
buildNpmPackage rec {
pname = "maizzle";
version = "1.5.8";
version = "1.5.9";
src = fetchFromGitHub {
owner = "maizzle";
repo = "cli";
rev = "v${version}";
hash = "sha256-cSAYicgCgFpJO+2vBAqfl3od7B07DTXvkW38x6y5VgM=";
hash = "sha256-r3HWqfm/BdOfENi5cGdau7ockvNLxnWufWcQepI/RFM=";
};
npmDepsHash = "sha256-K9EQxqOjFzgTw/VXG2ZGF90yUzYTNl13Ssq9oiC+F7A=";
npmDepsHash = "sha256-WlqWOGwmSab+cJWPUFIBWuFwMK4lFQm80PoUfEIIIH8=";
dontNpmBuild = true;

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "pyenv";
version = "2.4.2";
version = "2.4.3";
src = fetchFromGitHub {
owner = "pyenv";
repo = "pyenv";
rev = "refs/tags/v${version}";
hash = "sha256-hPbXKUg7jl4Dd4m29yaEJVX+jl8c/1oODEcRGTao58w=";
hash = "sha256-jYBKTrpc3KI1iW/VCw4Udk4TS8dXFGg5WgbEWZ+vWqE=";
};
nativeBuildInputs = [

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "typos";
version = "1.22.3";
version = "1.22.7";
src = fetchFromGitHub {
owner = "crate-ci";
repo = pname;
rev = "v${version}";
hash = "sha256-0al9U7UFqG/ljMtT2xJnyroRz4mGhvM7ZtIs/YkcNIs=";
hash = "sha256-417z9N8oC0kIqBs63fP/xdry5EFmlnyWDryKaJITtZQ=";
};
cargoHash = "sha256-Nn5ein7W4H58fIq8MZsGkwrF1zA5rTO95Uqe/VuL0W8=";
cargoHash = "sha256-Ol/pk3/9StHzEFHXcsSS9APUXf8hjnY7fwmF1mWtsVE=";
meta = with lib; {
description = "Source code spell checker";

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "unconvert";
version = "unstable-2022-09-18";
version = "0-unstable-2023-09-07";
src = fetchFromGitHub {
owner = "mdempsky";
repo = "unconvert";
rev = "3f84926d692329767c21c2aef3dfb7889c956832";
sha256 = "sha256-vcRHriFCT5b8SKjtRSg+kZDcCAKySC1cKVq+FMZb+9M=";
rev = "415706980c061b6f71ea923bd206aec88785638f";
hash = "sha256-MchA8uvy+MyQ/VaglBDTC7j/lNIKAtGeeECLoFfH6pI=";
};
vendorHash = "sha256-p77mLvGtohmC8J+bqqkM5kqc1pMPcFx7GhXOZ4q4jeM=";
vendorHash = "sha256-vZDk+ZNCMP5RRNrgeIowdOKPot7rqM84JhlbfvcQbB4=";
ldflags = [ "-s" "-w" ];

View File

@ -17,15 +17,7 @@ makeScopeWithSplicing' {
directory = ./pkgs;
}
// {
fetchNetBSD =
path: version: sha256:
fetchcvs {
cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot";
module = "src/${path}";
inherit sha256;
tag = "netbsd-${lib.replaceStrings [ "." ] [ "-" ] version}-RELEASE";
};
version = "9.2";
defaultMakeFlags = [
"MKSOFTFLOAT=${
@ -151,18 +143,18 @@ makeScopeWithSplicing' {
inherit (buildPackages.buildPackages) rsync;
};
_mainLibcExtraPaths = with self; [
common
i18n_module.src
sys.src
ld_elf_so.src
libpthread.src
libm.src
libresolv.src
librpcsvc.src
libutil.src
librt.src
libcrypt.src
_mainLibcExtraPaths = [
"common"
"lib/i18n_module"
"lib/libcrypt"
"lib/libm"
"lib/libpthread"
"lib/libresolv"
"lib/librpcsvc"
"lib/librt"
"lib/libutil"
"libexec/ld.elf_so"
"sys"
];
libc = self.callPackage ./pkgs/libc.nix {

View File

@ -2,7 +2,5 @@
mkDerivation {
path = "usr.bin/cksum";
version = "9.2";
sha256 = "0msfhgyvh5c2jmc6qjnf12c378dhw32ffsl864qz4rdb2b98rfcq";
meta.platforms = lib.platforms.netbsd;
}

View File

@ -1,7 +1,3 @@
{ mkDerivation }:
mkDerivation {
path = "usr.bin/column";
version = "9.2";
sha256 = "0r6b0hjn5ls3j3sv6chibs44fs32yyk2cg8kh70kb4cwajs4ifyl";
}
mkDerivation { path = "usr.bin/column"; }

View File

@ -1,3 +0,0 @@
{ fetchNetBSD }:
fetchNetBSD "common" "9.2" "1pfylz9r3ap5wnwwbwczbfjb1m5qdyspzbnmxmcdkpzz2zgj64b9"

View File

@ -14,19 +14,16 @@
netbsdSetupHook,
makeMinimal,
rsync,
fetchNetBSD,
_mainLibcExtraPaths,
version,
}:
mkDerivation (
let
version = "9.2";
commonDeps = [ zlib ];
in
{
path = "tools/compat";
sha256 = "1vsxg7136nlhc72vpa664vs22874xh7ila95nkmsd8crn3z3cyn0";
inherit version;
setupHooks = [
../../../../../build-support/setup-hooks/role.bash
@ -133,14 +130,12 @@ mkDerivation (
--subst-var-by version ${version}
'';
extraPaths = [
include.src
libc.src
libutil.src
(fetchNetBSD "external/bsd/flex" "9.2" "0h98jpfj7vx5zh7vd7bk6b1hmzgkcb757a8j6d9zgygxxv13v43m")
(fetchNetBSD "sys/sys" "9.2" "0zawhw51klaigqqwkx0lzrx3mim2jywrc24cm7c66qsf1im9awgd")
(fetchNetBSD "common/include/rpc/types.h" "9.2"
"0n2df12mlc3cbc48jxq35yzl1y7ghgpykvy7jnfh898rdhac7m9a"
)
include.path
libc.path
libutil.path
"external/bsd/flex"
"sys/sys"
"common/include/rpc/types.h"
] ++ libutil.extraPaths ++ _mainLibcExtraPaths;
}
)

View File

@ -13,8 +13,6 @@
}:
mkDerivation {
path = "usr.bin/config";
version = "9.2";
sha256 = "1yz3n4hncdkk6kp595fh2q5lg150vpqg8iw2dccydkyw4y3hgsjj";
env.NIX_CFLAGS_COMPILE = toString [ "-DMAKE_BOOTSTRAP" ];
nativeBuildInputs = [
bsdSetupHook
@ -27,5 +25,5 @@ mkDerivation {
rsync
];
buildInputs = compatIfNeeded;
extraPaths = [ cksum.src ];
extraPaths = [ cksum.path ];
}

View File

@ -22,8 +22,6 @@
mkDerivation {
path = "lib/csu";
version = "9.2";
sha256 = "0al5jfazvhlzn9hvmnrbchx4d0gm282hq5gp4xs2zmj9ycmf6d03";
meta.platforms = lib.platforms.netbsd;
nativeBuildInputs = [
bsdSetupHook
@ -43,7 +41,7 @@ mkDerivation {
];
buildInputs = [ headers ];
extraPaths = [
sys.src
ld_elf_so.src
sys.path
ld_elf_so.path
];
}

View File

@ -3,7 +3,5 @@
mkDerivation {
path = "share/dict";
noCC = true;
version = "9.2";
sha256 = "0svfc0byk59ri37pyjslv4c4rc7zw396r73mr593i78d39q5g3ad";
makeFlags = defaultMakeFlags ++ [ "BINDIR=$(out)/share" ];
}

View File

@ -4,14 +4,11 @@
netbsdSetupHook,
rsync,
compatIfNeeded,
fetchNetBSD,
}:
mkDerivation {
pname = "fts";
path = "include/fts.h";
sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77";
version = "9.2";
nativeBuildInputs = [
bsdSetupHook
netbsdSetupHook
@ -19,11 +16,9 @@ mkDerivation {
];
propagatedBuildInputs = compatIfNeeded;
extraPaths = [
(fetchNetBSD "lib/libc/gen/fts.c" "9.2" "1a8hmf26242nmv05ipn3ircxb0jqmmi66rh78kkyi9vjwkfl3qn7")
(fetchNetBSD "lib/libc/include/namespace.h" "9.2"
"0kksr3pdwdc1cplqf5z12ih4cml6l11lqrz91f7hjjm64y7785kc"
)
(fetchNetBSD "lib/libc/gen/fts.3" "9.2" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1")
"lib/libc/gen/fts.c"
"lib/libc/include/namespace.h"
"lib/libc/gen/fts.3"
];
skipIncludesPhase = true;
buildPhase = ''

View File

@ -1,7 +1,3 @@
{ mkDerivation }:
mkDerivation {
path = "usr.bin/genassym";
version = "9.2";
sha256 = "1acl1dz5kvh9h5806vkz2ap95rdsz7phmynh5i3x5y7agbki030c";
}
mkDerivation { path = "usr.bin/genassym"; }

View File

@ -1,7 +1,3 @@
{ mkDerivation }:
mkDerivation {
path = "usr.bin/gencat";
version = "9.2";
sha256 = "0gd463x1hg36bhr7y0xryb5jyxk0z0g7xvy8rgk82nlbnlnsbbwb";
}
mkDerivation { path = "usr.bin/gencat"; }

View File

@ -1,7 +1,3 @@
{ mkDerivation }:
mkDerivation {
path = "usr.bin/getconf";
sha256 = "122vslz4j3h2mfs921nr2s6m078zcj697yrb75rwp2hnw3qz4s8q";
version = "9.2";
}
mkDerivation { path = "usr.bin/getconf"; }

View File

@ -2,7 +2,5 @@
mkDerivation {
path = "usr.bin/getent";
sha256 = "1qngywcmm0y7nl8h3n8brvkxq4jw63szbci3kc1q6a6ndhycbbvr";
version = "9.2";
patches = [ ./getent.patch ];
}

View File

@ -6,8 +6,6 @@
mkDerivation {
path = "lib/i18n_module";
version = "9.2";
sha256 = "0w6y5v3binm7gf2kn7y9jja8k18rhnyl55cvvfnfipjqdxvxd9jd";
meta.platforms = lib.platforms.netbsd;
extraPaths = [ libc.src ];
extraPaths = [ libc.path ];
}

View File

@ -10,15 +10,12 @@
rsync,
nbperf,
rpcgen,
common,
defaultMakeFlags,
stdenv,
}:
mkDerivation {
path = "include";
version = "9.2";
sha256 = "0nxnmj4c8s3hb9n3fpcmd0zl3l1nmhivqgi9a35sis943qvpgl9h";
nativeBuildInputs = [
bsdSetupHook
netbsdSetupHook
@ -46,7 +43,7 @@ mkDerivation {
makeFlags=''${makeFlags/INCSDIR/INCSDIR0}
'';
extraPaths = [ common ];
extraPaths = [ "common" ];
headersOnly = true;
noCC = true;
meta.platforms = lib.platforms.netbsd;

View File

@ -26,11 +26,9 @@ let
in
mkDerivation {
path = "usr.bin/xinstall";
version = "9.2";
sha256 = "1f6pbz3qv1qcrchdxif8p5lbmnwl8b9nq615hsd3cyl4avd5bfqj";
extraPaths = [
mtree.src
make.src
mtree.path
make.path
];
nativeBuildInputs = [
bsdSetupHook

View File

@ -7,8 +7,6 @@
mkDerivation {
path = "libexec/ld.elf_so";
version = "9.2";
sha256 = "0ia9mqzdljly0vqfwflm5mzz55k7qsr4rw2bzhivky6k30vgirqa";
meta.platforms = lib.platforms.netbsd;
LIBC_PIC = "${libc}/lib/libc_pic.a";
# Hack to prevent a symlink being installed here for compatibility.
@ -18,5 +16,5 @@ mkDerivation {
"BINDIR=$(out)/libexec"
"CLIBOBJ=${libc}/lib"
];
extraPaths = [ libc.src ] ++ libc.extraPaths;
extraPaths = [ libc.path ] ++ libc.extraPaths;
}

View File

@ -2,7 +2,5 @@
mkDerivation {
path = "lib/libarch";
version = "9.2";
sha256 = "6ssenRhuSwp0Jn71ErT0PrEoCJ+cIYRztwdL4QTDZsQ=";
meta.platforms = lib.platforms.netbsd;
}

View File

@ -3,7 +3,6 @@
mkDerivation,
defaultMakeFlags,
_mainLibcExtraPaths,
fetchNetBSD,
bsdSetupHook,
netbsdSetupHook,
makeMinimal,
@ -26,13 +25,9 @@
mkDerivation {
path = "lib/libc";
version = "9.2";
sha256 = "1y9c13igg0kai07sqvf9cm6yqmd8lhfd8hq3q7biilbgs1l99as3";
USE_FORT = "yes";
MKPROFILE = "no";
extraPaths = _mainLibcExtraPaths ++ [
(fetchNetBSD "external/bsd/jemalloc" "9.2" "0cq704swa0h2yxv4gc79z2lwxibk9k7pxh3q5qfs7axx3jx3n8kb")
];
extraPaths = _mainLibcExtraPaths ++ [ "external/bsd/jemalloc" ];
nativeBuildInputs = [
bsdSetupHook
netbsdSetupHook

View File

@ -2,8 +2,6 @@
mkDerivation {
path = "lib/libcrypt";
version = "9.2";
sha256 = "0siqan1wdqmmhchh2n8w6a8x1abbff8n4yb6jrqxap3hqn8ay54g";
SHLIBINSTALLDIR = "$(out)/lib";
meta.platforms = lib.platforms.netbsd;
}

View File

@ -9,8 +9,6 @@
mkDerivation {
path = "lib/libcurses";
version = "9.2";
sha256 = "0pd0dggl3w4bv5i5h0s1wrc8hr66n4hkv3zlklarwfdhc692fqal";
buildInputs = [ libterminfo ];
env.NIX_CFLAGS_COMPILE = toString (
[

View File

@ -9,8 +9,6 @@
mkDerivation {
path = "lib/libedit";
version = "9.2";
sha256 = "1wqhngraxwqk4jgrf5f18jy195yrp7c06n1gf31pbplq79mg1bcj";
buildInputs = [
libterminfo
libcurses

View File

@ -6,9 +6,7 @@
mkDerivation {
path = "lib/libm";
version = "9.2";
sha256 = "1apwfr26shdmbqqnmg7hxf7bkfxw44ynqnnnghrww9bnhqdnsy92";
SHLIBINSTALLDIR = "$(out)/lib";
meta.platforms = lib.platforms.netbsd;
extraPaths = [ sys.src ];
extraPaths = [ sys.path ];
}

View File

@ -2,7 +2,5 @@
mkDerivation {
path = "lib/libossaudio";
version = "9.2";
sha256 = "16l3bfy6dcwqnklvh3x0ps8ld1y504vf57v9rx8f9adzhb797jh0";
meta.platforms = lib.platforms.netbsd;
}

View File

@ -7,9 +7,7 @@
mkDerivation {
pname = "libpci";
path = "lib/libpci";
version = "9.2";
sha256 = "+IOEO1Bw3/H3iCp3uk3bwsFZbvCqN5Ciz70irnPl8E8=";
env.NIX_CFLAGS_COMPILE = toString [ "-I." ];
meta.platforms = lib.platforms.netbsd;
extraPaths = [ sys.src ];
extraPaths = [ sys.path ];
}

View File

@ -1,5 +1 @@
{
path = "lib/libpthread";
version = "9.2";
sha256 = "0mlmc31k509dwfmx5s2x010wxjc44mr6y0cbmk30cfipqh8c962h";
}
{ path = "lib/libpthread"; }

Some files were not shown because too many files have changed in this diff Show More