Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
Martin Weinelt 2024-08-11 21:20:35 +02:00
commit 038dfb6969
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
39 changed files with 2040 additions and 1333 deletions

View File

@ -3033,10 +3033,11 @@
name = "Roman Gerasimenko";
};
builditluc = {
email = "builditluc@icloud.com";
email = "git@builditluc.eu";
github = "Builditluc";
githubId = 37375448;
name = "Buildit";
name = "Builditluc";
keys = [ { fingerprint = "FF16E475723B8C1E57A6B2569374074AE2D6F20E"; } ];
};
buurro = {
email = "marcoburro98@gmail.com";

View File

@ -66,6 +66,12 @@
# Add pi3 specific files
cp ${pkgs.ubootRaspberryPi3_64bit}/u-boot.bin firmware/u-boot-rpi3.bin
cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2710-rpi-2-b.dtb firmware/
cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2710-rpi-3-b.dtb firmware/
cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2710-rpi-3-b-plus.dtb firmware/
cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2710-rpi-cm3.dtb firmware/
cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2710-rpi-zero-2.dtb firmware/
cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2710-rpi-zero-2-w.dtb firmware/
# Add pi4 specific files
cp ${pkgs.ubootRaspberryPi4_64bit}/u-boot.bin firmware/u-boot-rpi4.bin

View File

@ -160,7 +160,7 @@ in {
description = "Set of files that have to be linked into the initrd";
example = literalExpression ''
{
"/etc/hostname".text = "mymachine";
"/etc/machine-id".source = /etc/machine-id;
}
'';
default = {};
@ -444,6 +444,9 @@ in {
"/etc/os-release".source = config.boot.initrd.osRelease;
"/etc/initrd-release".source = config.boot.initrd.osRelease;
# For systemd-journald's _HOSTNAME field; needs to be set early, cannot be backfilled.
"/etc/hostname".text = config.networking.hostName;
} // optionalAttrs (config.environment.etc ? "modprobe.d/nixos.conf") {
"/etc/modprobe.d/nixos.conf".source = config.environment.etc."modprobe.d/nixos.conf".source;
};

View File

@ -2,12 +2,12 @@
let
pname = "plexamp";
version = "4.11.0";
version = "4.11.1";
src = fetchurl {
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
name = "${pname}-${version}.AppImage";
hash = "sha512-t5ImqZvwKrZoobXFHX8wfQBQBPnAp4rJq4p1GLG/6CxAeKYuYMTPr7+xjwVqhGm/DGw7vSVY9sdMyFodq8rJ2A==";
hash = "sha512-miZACuT5kswIgdaYSFnYeoIUFtF6IRXKbLLrpOVga4UULgwnzinGehSNDd6feSyuDoKQhXIbDB/8eI4jERTS1A==";
};
appimageContents = appimageTools.extractType2 {
@ -30,7 +30,7 @@ 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/74";
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/75";
license = licenses.unfree;
maintainers = with maintainers; [ killercup redhawk synthetica ];
platforms = [ "x86_64-linux" ];

View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "nwg-dock-hyprland";
version = "0.1.9";
version = "0.2.0";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = "nwg-dock-hyprland";
rev = "v${version}";
hash = "sha256-pzOdWv98tHZg6Xn58z5DlM1H0IOQ+ohfXEZRLZr8mz0=";
hash = "sha256-AB9YOHJCgjR70JNvWzDROWGVGFrjZycEKMV4XmDVcpY=";
};
vendorHash = "sha256-bK3SpydIO943e7zti6yWQ+JqmdF4NkAAtelNBt4Q/+s=";
vendorHash = "sha256-6AevEnesGZCXHUX8yq3mBA5ug+zb5qyriHdqGBKbbEs=";
ldflags = [ "-s" "-w" ];

View File

@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config";
in
buildGoModule rec {
pname = "process-compose";
version = "1.9.0";
version = "1.18.0";
src = fetchFromGitHub {
owner = "F1bonacc1";
repo = pname;
rev = "v${version}";
hash = "sha256-vZYPbvMt0z08KoN75w3v9Vu0NcpcSz8WpX1CJeO1YbU=";
hash = "sha256-S4MmE1LeX23dBceWoOPpd5xp+A0IxACzb9RSxtkf5tg=";
# 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-9tSNqdngkx2Tbb5m6UByu8Q+UYeWnwdGmm5De6ITw3k=";
vendorHash = "sha256-xGQf6E5QQyFdCUoFkPhWMlE6RQnQEJ/P6fBtUsaRz/Y=";
doCheck = false;

View File

@ -1,4 +1,5 @@
{ appstream-glib
, blueprint-compiler
, desktop-file-utils
, fetchFromGitHub
, gettext
@ -13,22 +14,24 @@
, ninja
, pkg-config
, python3
, python3Packages
, stdenv
, wrapGAppsHook4
}:
stdenv.mkDerivation (finalAttrs: {
pname = "webfont-kit-generator";
version = "1.0.3";
version = "1.1.1";
src = fetchFromGitHub {
owner = "rafaelmardojai";
repo = "webfont-kit-generator";
rev = finalAttrs.version;
hash = "sha256-aD/1moWIiU4zpLTW+VHH9n/sj10vCZ8UzB2ey3mR0/k=";
hash = "sha256-RrmzHgRnpgQUNECgYA/AJfoxKpX1HQ5I1Pqjb3MK+P4=";
};
nativeBuildInputs = [
appstream-glib
blueprint-compiler
desktop-file-utils
gettext
gobject-introspection
@ -46,11 +49,17 @@ stdenv.mkDerivation (finalAttrs: {
libadwaita
libsoup_3
(python3.withPackages (ps: with ps; [
brotli
fonttools
pygobject3
]))
];
propagatedBuildInputs = [
python3Packages.pygobject3
python3Packages.brotli
];
meta = with lib; {
description = "Webfont Kit Generator is a simple utility that allows you to generate woff, woff2 and the necessary CSS boilerplate from non-web font formats (otf & ttf)";
mainProgram = "webfontkitgenerator";

View File

@ -21,13 +21,13 @@ with lib;
python3Packages.buildPythonApplication rec {
pname = "tryton";
version = "7.2.3";
version = "7.2.4";
disabled = !python3Packages.isPy3k;
src = fetchPypi {
inherit pname version;
hash = "sha256-W5DXOLUr4c9w9Zcp9i5esNjSSIMewe+NJGh+h3PiD30=";
hash = "sha256-LYebXgAvIG3pUF7GpRjeQvP6S83yPjPO/lZg9r0X+Kc=";
};
nativeBuildInputs = [

View File

@ -0,0 +1,52 @@
{
lib,
buildGoModule,
fetchFromGitHub,
git,
}:
buildGoModule rec {
pname = "codecrafters-cli";
version = "34";
src = fetchFromGitHub {
owner = "codecrafters-io";
repo = "cli";
rev = "v${version}";
hash = "sha256-+daBduhjUt7lrjTdXgm1qpZN1oEHC3Nx+ZiOLoO5+s4=";
# A shortened git commit hash is part of the version output, and is
# needed at build time. Use the `.git` directory to retrieve the
# commit SHA, and remove the directory afterwards since it is not needed
# after that.
leaveDotGit = true;
postFetch = ''
git -C $"$out" rev-parse --short=7 HEAD > $out/COMMIT
rm -rf $out/.git
'';
};
vendorHash = "sha256-TQcxzfiqKeCQZUKLHnPjBa/0WsYJhER3fmr4cRGFknw=";
ldflags = [
"-s"
"-w"
"-X github.com/codecrafters-io/cli/internal/utils.Version=${version}"
];
# ldflags based on metadata from git
preBuild = ''
ldflags+=" -X github.com/codecrafters-io/cli/internal/utils.Commit=$(cat COMMIT)"
'';
doCheck = true;
nativeBuildInputs = [ git ];
meta = with lib; {
description = "CodeCrafters CLI to run tests";
mainProgram = "codecrafters";
homepage = "https://github.com/codecrafters-io/cli";
maintainers = with maintainers; [ builditluc ];
license = licenses.mit;
};
}

View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "lc0";
version = "0.31.0";
version = "0.31.1";
src = fetchFromGitHub {
owner = "LeelaChessZero";
repo = "lc0";
rev = "refs/tags/v${version}";
hash = "sha256-kHLO6xM1q/CQIBcGIFXVkvtGEx75sqA7atGYfvnJcso=";
hash = "sha256-VbWNc41CgsS0I64QHNp+k9cM/IEai9b3SyHorfmwvsE=";
fetchSubmodules = true;
};

View File

@ -31,11 +31,11 @@ let
in
stdenv.mkDerivation rec {
pname = "PortfolioPerformance";
version = "0.69.1";
version = "0.70.3";
src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
hash = "sha256-Q36pQkxFMwwb6qHZYqer/em6G4TlFmFwtFhB0YUsOlw=";
hash = "sha256-mT8cIoWTVzXyEktuybkC9sTtwlNCftiaMeyHYcyHV8A=";
};
nativeBuildInputs = [

File diff suppressed because it is too large Load Diff

View File

@ -25,7 +25,7 @@
flutterRustBridge = rustPlatform.buildRustPackage rec {
pname = "flutter_rust_bridge_codegen";
version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.2.6/.github/workflows/bridge.yml#L10
version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.2.7/.github/workflows/bridge.yml#L10
src = fetchFromGitHub {
owner = "fzyzcjy";
@ -43,27 +43,26 @@
in flutter316.buildFlutterApplication rec {
pname = "rustdesk";
version = "1.2.6";
version = "1.2.7";
src = fetchFromGitHub {
owner = "rustdesk";
repo = "rustdesk";
rev = version;
hash = "sha256-dEHWMtNmYeg2FSocNnzYbcW0f07zhC09G2uSC0yMZcY=";
hash = "sha256-o4YFixxKTCtL0umIkO64Etn3JnXIro3RYWcyV0RBJyg=";
};
strictDeps = true;
# Configure the Flutter/Dart build
sourceRoot = "${src.name}/flutter";
# curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.2.6/flutter/pubspec.lock | yq
# curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.2.7/flutter/pubspec.lock | yq > pubspec.lock.json
pubspecLock = lib.importJSON ./pubspec.lock.json;
gitHashes = {
dash_chat_2 = "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow=";
desktop_multi_window = "sha256-YXIvTuMDj1Tx8NGtOD2Tpxy1fiQw0p5fbOMZYfKUkXQ=";
desktop_multi_window = "sha256-6nbOUmGTmJQx3Dr4MI6cKWwB1jEgUFUeHx24gpCkWY0=";
dynamic_layouts = "sha256-eFp1YVI6vI2HRgtE5nTqGZIylB226H0O8kuxy9ypuf8=";
flutter_gpu_texture_renderer = "sha256-0znIHlZ0ashRTev2kAXU179eq/V1RJC9Hp4jAfiPh5Q=";
flutter_improved_scrolling = "sha256-fKs1+JmhDVVfjyhr6Fl17pc6n++mCTjBo1PT3l/DUnc=";
uni_links_desktop = "sha256-h3wlo31XnHELCCPlk7OSLglm9Xn/969yT1lp5UkGY98=";
window_manager = "sha256-CUTcSl+W7Wz/Og5k9ujOdAlhKWv/gIYe58wurf9CJH4=";
window_size = "sha256-+lqY46ZURT0qcqPvHFXUnd83Uvfq79Xr+rw1AHqrpak=";
};
@ -76,18 +75,19 @@ in flutter316.buildFlutterApplication rec {
lockFile = ./Cargo.lock;
outputHashes = {
"android-wakelock-0.1.0" = "sha256-09EH/U1BBs3l4galQOrTKmPUYBgryUjfc/rqPZhdYc4=";
"arboard-3.3.1" = "sha256-Pj111rxyed4/UPtB2w2yDs4R1oZktgGkbEog4o1g5IQ=";
"arboard-3.4.0" = "sha256-bFpxyJ9Ykx2Y8iFr/JG9DFbf3FL9RzcM+vUfZ4mQ+1o=";
"cacao-0.4.0-beta2" = "sha256-U5tCLeVxjmZCm7ti1u71+i116xmozPaR69pCsA4pxrM=";
"clipboard-master-4.0.0-beta.6" = "sha256-FddUlvOuG2ClcDDAaVcVXZQlQ1CACeCHuudULUC0F00=";
"confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU=";
"core-foundation-0.9.3" = "sha256-iB4OVmWZhuWbs9RFWvNc+RNut6rip2/50o5ZM6c0c3g=";
"evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0=";
"hwcodec-0.4.18" = "sha256-RTo83aWx6ZKgWCDic1IFneZZ2TC+ZCfanULeHTfOiec=";
"hwcodec-0.6.0" = "sha256-pnpowWQRjeoS6RapTXsqU6ybKA2N+xzleTl82gh+u0s=";
"impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI=";
"keepawake-0.4.3" = "sha256-wDLjjhKWbCeaWbA896a5E5UMB0B/xI/84QRCUYNKX7I=";
"keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4=";
"machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE=";
"magnum-opus-0.4.0" = "sha256-T4qaYOl8lCK1h9jWa9KqGvnVfDViT9Ob5R+YgnSw2tg=";
"mouce-0.2.1" = "sha256-3PtNEmVMXgqKV4r3KiKTkk4oyCt4BKynniJREE+RyFk=";
"pam-0.7.0" = "sha256-aF3TkRkYuRpBcgg8RyherSfcspKNotvvxRhlg9yGwjk=";
"mouce-0.2.1" = "sha256-0+k5dQeM4CCeYcvG8PzJ3YVjMZresmUPmVaPYvTV4gY=";
"pam-0.7.0" = "sha256-o47tVoFlW9RiL7O8Lvuwz7rMYQHO+5TG27XxkAdHEOE=";
"pam-sys-1.0.0-alpha4" = "sha256-5HIErVWnanLo5054NgU+DEKC2wwyiJ8AHvbx0BGbyWo=";
"parity-tokio-ipc-0.7.3-4" = "sha256-PKw2Twd2ap+tRrQxqg8T1FvpoeKn0hvBqn1Z44F1LcY=";
"rdev-0.5.0-2" = "sha256-KrzNa4sKyuVw3EV/Ec9VBNRyJy7QFR2Gu4c2WkltwUw=";
@ -98,7 +98,7 @@ in flutter316.buildFlutterApplication rec {
"tao-0.25.0" = "sha256-kLmx1z9Ybn/hDt2OcszEjtZytQIE+NKTIn9zNr9oEQk=";
"tfc-0.6.1" = "sha256-ukxJl7Z+pUXCjvTsG5Q0RiXocPERWGsnAyh3SIWm0HU=";
"tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI=";
"tray-icon-0.11.3" = "sha256-pzvrqv+R2AD8fOsTyYItLaJLa19w+lWDa8vNVGczZdY=";
"tray-icon-0.14.3" = "sha256-dSX7LucZaLplRrh6zLwmFzyZN4ZtwIXzAEdZzlu3gQg=";
"wallpaper-3.2.0" = "sha256-p9NRmusdA0wvF6onp1UTL0/4t7XnEAc19sqyGDnfg/Q=";
"webm-1.1.0" = "sha256-p4BMej7yvb8c/dJynRWZmwo2hxAAY96Qx6Qx2DbT8hE=";
"x11-2.19.0" = "sha256-GDCeKzUtvaLeBDmPQdyr499EjEfT6y4diBMzZVEptzc=";
@ -112,7 +112,6 @@ in flutter316.buildFlutterApplication rec {
"flutter"
"hwcodec"
"linux-pkg-config"
"unix-file-copy-paste"
];
nativeBuildInputs = [
@ -149,7 +148,7 @@ in flutter316.buildFlutterApplication rec {
patchFlags = [ "-p1" "-d" ".." ];
postPatch = ''
substituteInPlace ../Cargo.toml --replace ", \"staticlib\", \"rlib\"" ""
substituteInPlace ../Cargo.toml --replace-fail ", \"staticlib\", \"rlib\"" ""
# The supplied Cargo.lock doesn't work with our fetcher so copy over the fixed version
cp ${./Cargo.lock} ../Cargo.lock
chmod +w ../Cargo.lock

View File

@ -416,7 +416,7 @@
"description": {
"path": ".",
"ref": "HEAD",
"resolved-ref": "60773827434eefe6d01eefa814dca9a032b970b3",
"resolved-ref": "336308d86ec8b9640504a371b50ba500eb779363",
"url": "https://github.com/rustdesk-org/rustdesk_desktop_multi_window"
},
"source": "git",

View File

@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
desktopItems = [
(makeDesktopItem {
desktopName = "Youtube Music Desktop App";
desktopName = "YouTube Music Desktop App";
exec = "ytmdesktop";
icon = "ytmdesktop";
name = "ytmdesktop";
@ -27,6 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
"Audio"
];
startupNotify = true;
startupWMClass = "YouTube Music Desktop App";
})
];

View File

@ -23,7 +23,7 @@ let
workDir = "console";
bufArgs = "../proto --include-imports --include-wkt";
outputPath = "src/app/proto";
hash = "sha256-BBXFt4f2SQphr106sQ0eEL4Z2ooAI8fxXhu2rKqhjb4=";
hash = "sha256-n6BJ1gSSm66yOGdHcSea/nQbjiHZX2YX2zbFT4o75/4=";
};
in
mkYarnPackage rec {
@ -35,18 +35,19 @@ mkYarnPackage rec {
packageJSON = ./package.json;
offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-cfo2WLSbfU8tYADjF7j9zTLNsboVThF6MUBrb49MrII=";
hash = "sha256-MWATjfhIbo3cqpzOdXP52f/0Td60n99OTU1Qk6oWmXU=";
};
postPatch = ''
substituteInPlace src/styles.scss \
--replace "/node_modules/flag-icons" "flag-icons"
--replace-fail "/node_modules/flag-icons" "flag-icons"
substituteInPlace angular.json \
--replace "./node_modules/tinycolor2" "../../node_modules/tinycolor2"
--replace-fail "./node_modules/tinycolor2" "../../node_modules/tinycolor2"
'';
buildPhase = ''
ln -s "${zitadelRepo}/docs" deps/docs
mkdir deps/console/src/app/proto
cp -r ${protobufGenerated}/* deps/console/src/app/proto/
yarn --offline build

View File

@ -29,6 +29,7 @@
"@fortawesome/fontawesome-svg-core": "^6.4.2",
"@fortawesome/free-brands-svg-icons": "^6.4.2",
"@grpc/grpc-js": "^1.9.3",
"@netlify/framework-info": "^9.8.10",
"@ngx-translate/core": "^15.0.0",
"angular-oauth2-oidc": "^15.0.1",
"angularx-qrcode": "^16.0.0",
@ -36,11 +37,11 @@
"codemirror": "^5.65.8",
"cors": "^2.8.5",
"file-saver": "^2.0.5",
"flag-icons": "^6.7.0",
"flag-icons": "^7.1.0",
"google-proto-files": "^4.0.0",
"google-protobuf": "^3.21.2",
"grpc-web": "^1.4.1",
"i18n-iso-countries": "^7.6.0",
"i18n-iso-countries": "^7.7.0",
"libphonenumber-js": "^1.10.49",
"material-design-icons-iconfont": "^6.1.1",
"moment": "^2.29.4",
@ -49,8 +50,8 @@
"rxjs": "~7.8.0",
"tinycolor2": "^1.6.0",
"tslib": "^2.6.2",
"uuid": "^9.0.0",
"zone.js": "~0.13.1"
"uuid": "^9.0.1",
"zone.js": "~0.13.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "^16.2.2",
@ -65,13 +66,13 @@
"@bufbuild/buf": "^1.23.1",
"@types/file-saver": "^2.0.7",
"@types/google-protobuf": "^3.15.3",
"@types/jasmine": "~4.3.6",
"@types/jasminewd2": "~2.0.10",
"@types/jasmine": "~5.1.4",
"@types/jasminewd2": "~2.0.13",
"@types/jsonwebtoken": "^9.0.5",
"@types/node": "^20.7.0",
"@types/opentype.js": "^1.3.4",
"@types/opentype.js": "^1.3.8",
"@types/qrcode": "^1.5.2",
"@types/uuid": "^9.0.2",
"@types/uuid": "^9.0.7",
"@typescript-eslint/eslint-plugin": "^5.59.11",
"@typescript-eslint/parser": "^5.60.1",
"codelyzer": "^6.0.2",
@ -83,8 +84,8 @@
"karma-coverage-istanbul-reporter": "^3.0.3",
"karma-jasmine": "^5.1.0",
"karma-jasmine-html-reporter": "^2.1.0",
"prettier": "^3.0.3",
"prettier-plugin-organize-imports": "^3.2.2",
"prettier": "^3.1.1",
"prettier-plugin-organize-imports": "^3.2.4",
"protractor": "~7.0.0",
"typescript": "^5.1.6"
}

View File

@ -15,14 +15,14 @@
}:
let
version = "2.42.10";
version = "2.58.3";
zitadelRepo = fetchFromGitHub {
owner = "zitadel";
repo = "zitadel";
rev = "v${version}";
hash = "sha256-Uv0iEIFkTdBAi0WDBQHf0ATs4L2FOU4NmiE9p1MHSa0=";
hash = "sha256-RXcJwGO8OQ38lbuy2uLTSkh6yUbyqY42FpwgMXC3g6c=";
};
goModulesHash = "sha256-thd1bhbPVedYd+Yq1IYYUJFr66AWRTzA3DceCXFTEQo=";
goModulesHash = "sha256-gp17dP67HX7Tx3Gq+kEu9xCYkfs/rGpqLFiKT7cKlrc=";
buildZitadelProtocGen = name:
buildGoModule {
@ -64,11 +64,10 @@ let
src = zitadelRepo;
patches = [ ./console-use-local-protobuf-plugins.patch ];
nativeBuildInputs = nativeBuildInputs ++ [ buf ];
nativeBuildInputs = nativeBuildInputs ++ [ buf cacert ];
buildPhase = ''
cd ${workDir}
export SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt"
HOME=$TMPDIR buf generate ${bufArgs}
'';
@ -92,7 +91,7 @@ let
protoc-gen-zitadel
];
outputPath = ".artifacts";
hash = "sha256-ntIKudNFBs7kHjK7cfzbOfDCA6J8uvJRUbCTa6afK/I=";
hash = "sha256-KRf11PNn7LtVFjG3NYUtPEJtLNbnxfzR4B69US07B3k=";
};
in
buildGoModule rec {
@ -148,6 +147,6 @@ buildGoModule rec {
platforms = platforms.linux ++ platforms.darwin;
license = licenses.asl20;
sourceProvenance = [ sourceTypes.fromSource ];
maintainers = [ ];
maintainers = [ maintainers.nrabulinski ];
};
}

View File

@ -1,18 +1,41 @@
{ stdenv, lib, fetchurl, pkg-config, texinfo, libiconv, gdbm, openssl, zlib
, mbedtls, cacert }:
{
stdenv,
lib,
fetchurl,
pkg-config,
texinfo,
libiconv,
gdbm,
openssl,
zlib,
mbedtls,
cacert,
}:
stdenv.mkDerivation rec {
pname = "gauche-bootstrap";
version = "0.9.12";
version = "0.9.15";
src = fetchurl {
url = "https://github.com/shirok/Gauche/releases/download/release${lib.replaceStrings ["."] ["_"] version}/Gauche-${version}.tgz";
hash = "sha256-tK5kkhsHqWZhaV69WqwN7IE9GmjlRqYWCRE9eEP1thc=";
url = "https://github.com/shirok/Gauche/releases/download/release${
lib.replaceStrings [ "." ] [ "_" ] version
}/Gauche-${version}.tgz";
hash = "sha256-NkPie8fIgiz9b7KJLbGF9ljo42STi8LM/O2yOeNa94M=";
};
nativeBuildInputs = [ pkg-config texinfo ];
nativeBuildInputs = [
pkg-config
texinfo
];
buildInputs = [ libiconv gdbm openssl zlib mbedtls cacert ];
buildInputs = [
libiconv
gdbm
openssl
zlib
mbedtls
cacert
];
postPatch = ''
patchShebangs .
@ -34,8 +57,9 @@ stdenv.mkDerivation rec {
doCheck = false;
meta = with lib; {
description = "R7RS Scheme scripting engine";
description = "R7RS Scheme scripting engine (released version)";
homepage = "https://practical-scheme.net/gauche/";
mainProgram = "gosh";
maintainers = with maintainers; [ mnacamura ];
license = licenses.bsd3;
platforms = platforms.unix;

View File

@ -1,20 +1,46 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, gaucheBootstrap, pkg-config, texinfo
, libiconv, gdbm, openssl, zlib, mbedtls, cacert, CoreServices }:
{
stdenv,
lib,
fetchFromGitHub,
autoreconfHook,
gaucheBootstrap,
pkg-config,
texinfo,
libiconv,
gdbm,
openssl,
zlib,
mbedtls,
cacert,
CoreServices,
}:
stdenv.mkDerivation rec {
pname = "gauche";
version = "0.9.13";
version = "0.9.15";
src = fetchFromGitHub {
owner = "shirok";
repo = pname;
rev = "release${lib.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-XD4zJzCktGi/E9sA6BVm9JVQBVrG5119EjZNbP1pVJU=";
hash = "sha256-M2vZqTMkob+WxUnCo4NDxS4pCVNleVBqkiiRp9nG/KA=";
};
nativeBuildInputs = [ gaucheBootstrap pkg-config texinfo autoreconfHook ];
nativeBuildInputs = [
gaucheBootstrap
pkg-config
texinfo
autoreconfHook
];
buildInputs = [ libiconv gdbm openssl zlib mbedtls cacert ] ++ lib.optionals stdenv.isDarwin [ CoreServices ];
buildInputs = [
libiconv
gdbm
openssl
zlib
mbedtls
cacert
] ++ lib.optionals stdenv.isDarwin [ CoreServices ];
autoreconfPhase = ''
./DIST gen

View File

@ -19,13 +19,13 @@
}@inputs:
(if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv).mkDerivation rec {
pname = "dlib";
version = "19.24.5";
version = "19.24.6";
src = fetchFromGitHub {
owner = "davisking";
repo = "dlib";
rev = "v${version}";
sha256 = "sha256-ge35ZytgEbUVG2IWEPp6o9qhQ6z8UnuBR1k7sMRr4j0=";
rev = "refs/tags/v${version}";
sha256 = "sha256-BpE7ZrtiiaDqwy1G4IHOQBJMr6sAadFbRxsdObs1SIY=";
};
postPatch = ''

View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "ndn-cxx";
version = "0.8.1";
version = "0.9.0";
src = fetchFromGitHub {
owner = "named-data";
repo = "ndn-cxx";
rev = "${pname}-${version}";
sha256 = "sha256-nnnxlkYVTSRB6ZcuIUDFol999+amGtqegHXK+06ITK8=";
sha256 = "sha256-u9+QxqdCET1f5B54HF+Jk/YuQvhcYWsPNIVHi5l0XTM=";
};
nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ];

View File

@ -0,0 +1,49 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
numpy,
pytestCheckHook,
hypothesis,
nix-update-script,
}:
buildPythonPackage rec {
pname = "array-api-strict";
version = "2.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "data-apis";
repo = "array-api-strict";
rev = "refs/tags/${version}";
hash = "sha256-sGuMhtxhXXFD6KAiujuWdDe2+gKYN3ijiXvi07a2AgA=";
};
build-system = [ setuptools ];
dependencies = [ numpy ];
nativeCheckInputs = [
pytestCheckHook
hypothesis
];
pythonImportsCheck = [ "array_api_strict" ];
disabledTests = [
"test_disabled_extensions"
"test_environment_variables"
];
passthru.updateScript = nix-update-script { };
meta = with lib; {
homepage = "https://data-apis.org/array-api-strict";
changelog = "https://github.com/data-apis/array-api-strict/releases/tag/${version}";
description = "A strict, minimal implementation of the Python array API";
license = licenses.bsd3;
maintainers = [ maintainers.berquist ];
};
}

View File

@ -6,18 +6,18 @@
fetchPypi,
od,
pygments,
pytestCheckHook,
pythonOlder,
python-dateutil,
pythonOlder,
repeated-test,
setuptools-scm,
sigtools,
unittestCheckHook,
}:
buildPythonPackage rec {
pname = "clize";
version = "5.0.2";
format = "pyproject";
pyproject = true;
disabled = pythonOlder "3.7";
@ -26,23 +26,23 @@ buildPythonPackage rec {
hash = "sha256-BH9aRHNgJxirG4VnKn4VMDOHF41agcJ13EKd+sHstRA=";
};
nativeBuildInputs = [ setuptools-scm ];
build-system = [ setuptools-scm ];
propagatedBuildInputs = [
dependencies = [
attrs
docutils
od
sigtools
];
passthru.optional-dependencies = {
optional-dependencies = {
datetime = [ python-dateutil ];
};
nativeCheckInputs = [
pytestCheckHook
python-dateutil
pygments
unittestCheckHook
python-dateutil
repeated-test
];
@ -51,6 +51,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Command-line argument parsing for Python";
homepage = "https://github.com/epsy/clize";
changelog = "https://github.com/epsy/clize/releases/tag/v${version}";
license = licenses.mit;
maintainers = [ ];
};

View File

@ -52,13 +52,13 @@
buildPythonPackage rec {
pname = "datalad";
version = "1.1.2";
version = "1.1.3";
src = fetchFromGitHub {
owner = "datalad";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-HBHz1z34GFurDROm2goDxm3G2ml3SYOOTU2cQE36VYg=";
hash = "sha256-Y7P9vRfFUJ5ZhVRTAYeImI9cv1LtWVAeBoBl6wANnrc=";
};
postPatch = ''

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "fakeredis";
version = "2.23.4";
version = "2.23.5";
pyproject = true;
disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "dsoftwareinc";
repo = "fakeredis-py";
rev = "refs/tags/v${version}";
hash = "sha256-SZyYtXwd5ofE2rlRw9Nl24VYMlPIuzrnoyE2ayapZww=";
hash = "sha256-gwTOtwBOHl6FNL0ekOq2rewwT/XoQ31+cyxU/OCBOTA=";
};
build-system = [ poetry-core ];

View File

@ -0,0 +1,57 @@
{
buildPythonPackage,
docopt,
fetchFromGitHub,
lib,
markdown2,
pytest-cov-stub,
pytestCheckHook,
setuptools,
weasyprint,
}:
buildPythonPackage rec {
pname = "md2pdf";
version = "1.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "jmaupetit";
repo = "md2pdf";
rev = "refs/tags/${version}";
hash = "sha256-9B1vVfcBHk+xdE2Xouu95j3Hp4xm9d5DgPv2zKwCvHY=";
};
postPatch = ''
substituteInPlace setup.py \
--replace-fail '"pytest-runner",' ""
'';
build-system = [ setuptools ];
dependencies = [
docopt
markdown2
weasyprint
];
pythonImportsCheck = [ "md2pdf" ];
nativeCheckInputs = [
pytest-cov-stub
pytestCheckHook
];
preCheck = ''
export PATH="$out/bin:$PATH"
'';
meta = {
changelog = "https://github.com/jmaupetit/md2pdf/blob/${src.rev}/CHANGELOG.md";
description = "Markdown to PDF conversion tool";
homepage = "https://github.com/jmaupetit/md2pdf";
license = lib.licenses.mit;
mainProgram = "md2pdf";
maintainers = with lib.maintainers; [ dotlambda ];
};
}

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "numpydoc";
version = "1.7.0";
version = "1.8.0";
pyproject = true;
disabled = isPy27;
@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname;
inherit version;
hash = "sha256-hm5a5bZQnc+HP8Y4ESD1wxrPE7E1Y2wagdaMFmqV+SE=";
hash = "sha256-AiOQq3RkpE+HN/efizHOHTz6S0r3nMqhqsXoNo21h/s=";
};
postPatch = ''

View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "prefixed";
version = "0.7.1";
version = "0.8.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-0QrJCs/EzBTYLBQIszCy/ahe187CIGqADUOJn4w4UmU=";
hash = "sha256-E1uT1NGKLKSSQ8xbYvegKWl1nhcBNc0BIXWfSmZs02k=";
};
nativeCheckInputs = [ pytestCheckHook ];

View File

@ -10,25 +10,18 @@
buildPythonPackage rec {
pname = "python-hosts";
version = "1.0.6";
version = "1.0.7";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-LfWfBzJ3UyArcHxrIUDsIa8pIr1WkUikf6F6v+IVLG4=";
pname = "python_hosts";
inherit version;
hash = "sha256-TFaZHiL2v/woCWgz3nh/kjUOhbfN1ghnBnJcVcTwSrk=";
};
# win_inet_pton is required for Windows support
prePatch = ''
substituteInPlace setup.py \
--replace "install_requires=['win_inet_pton']," ""
substituteInPlace python_hosts/utils.py \
--replace "import win_inet_pton" ""
'';
nativeBuildInputs = [ setuptools ];
build-system = [ setuptools ];
nativeCheckInputs = [
pyyaml

View File

@ -4,39 +4,44 @@
fetchFromGitHub,
poetry-core,
pyrate-limiter,
requests,
pytestCheckHook,
pythonOlder,
requests-mock,
requests,
requests-cache,
}:
buildPythonPackage rec {
pname = "requests-ratelimiter";
version = "0.6.0";
version = "0.7.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "JWCook";
repo = "requests-ratelimiter";
rev = "refs/tags/v${version}";
hash = "sha256-ctCD+vlV90KCO7DdPUZJipBC/lz6NXx0gYuHHrs22IY=";
hash = "sha256-DS4BzS8AD4axniyV6jVYXWZ6cQLvMPp8tdGoBhYu51o=";
};
nativeBuildInputs = [ poetry-core ];
build-system = [ poetry-core ];
propagatedBuildInputs = [
dependencies = [
pyrate-limiter
requests
];
nativeCheckInputs = [
pytestCheckHook
requests-cache
requests-mock
];
pythonImportsCheck = [ "requests_ratelimiter" ];
meta = with lib; {
description = "Easy rate-limiting for python requests";
description = "Module for rate-limiting for requests";
homepage = "https://github.com/JWCook/requests-ratelimiter";
changelog = "https://github.com/JWCook/requests-ratelimiter/blob/${src.rev}/HISTORY.md";
license = licenses.mit;

View File

@ -27,7 +27,7 @@
buildPythonPackage rec {
pname = "zigpy";
version = "0.65.3";
version = "0.65.2";
pyproject = true;
disabled = pythonOlder "3.8";
@ -36,7 +36,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zigpy";
rev = "refs/tags/${version}";
hash = "sha256-zE8Hqha1yv7OsaXYrKzf3o2JLO/RcDSAxixWoMj2T3M=";
hash = "sha256-rNqo4NtIdg9MoOKde26/RUcfX/VYiVkNj97v/RJcB4E=";
};
postPatch = ''

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ent-go";
version = "0.13.1";
version = "0.14.0";
src = fetchFromGitHub {
owner = "ent";
repo = "ent";
rev = "v${version}";
sha256 = "sha256-OEQWNWGVs0QYhPuCGEFgAVaUnfswmvWVt+e0cAdkBKE=";
sha256 = "sha256-Jq5txpjv2JxypOXYA8JKT0CNMIaJksMUIdnbwflVMZA=";
};
vendorHash = "sha256-9KdSGIyi95EVQq9jGoVqK8aq3JXlQXB+Qwlh/Kfz4Oc=";

View File

@ -5,17 +5,17 @@
rustPlatform.buildRustPackage rec {
pname = "pokeget-rs";
version = "1.4.2-2";
version = "1.5.1";
src = fetchFromGitHub {
owner = "talwat";
repo = "pokeget-rs";
rev = version;
hash = "sha256-RPdtwHJsXdjIAeJP/LPdJ7GjwdIngM3eZO/A8InTpXQ=";
hash = "sha256-pP6iIgpY3wI2Yhtu9NXAyB5tQgKqC9yzbC0IwalzhiI=";
fetchSubmodules = true;
};
cargoHash = "sha256-JeRSBG1HswttHOGyiNseFf2KiWkumrzEIw76A80nQHM=";
cargoHash = "sha256-DBbcfq2ON05BXGRgtZ4Sze8rAz4Eu23pOk1AEYScVbg=";
meta = with lib; {
description = "Better rust version of pokeget";

View File

@ -40,13 +40,13 @@
stdenv.mkDerivation rec {
pname = "rpm-ostree";
version = "2024.6";
version = "2024.7";
outputs = [ "out" "dev" "man" "devdoc" ];
src = fetchurl {
url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
hash = "sha256-8jHT4ZQ8vcZ4S3qBNMhCPKSHbFIJCCXNWZVmgsLWxSs=";
hash = "sha256-Ehh6304Uhhom7aAvSDS2UYKyyJKr4XQF70CX7Pk3yAg=";
};
nativeBuildInputs = [

View File

@ -2,10 +2,10 @@
let
pname = "buttercup-desktop";
version = "2.27.0";
version = "2.28.0";
src = fetchurl {
url = "https://github.com/buttercup/buttercup-desktop/releases/download/v${version}/Buttercup-linux-x86_64.AppImage";
sha256 = "sha256-zpb5c3qGfBoRX9V1lVRX8607hBEHgjR8ZWJizfYNgUM=";
sha256 = "sha256-A1HoJ9MdBPQ9HNkMPOBKe2SEFMqQ0nxBLd6bhUyRMD8=";
};
appimageContents = appimageTools.extractType2 { inherit pname src version; };

View File

@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "quark-engine";
version = "24.7.1";
version = "24.8.1";
pyproject = true;
src = fetchFromGitHub {
owner = "quark-engine";
repo = "quark-engine";
rev = "refs/tags/v${version}";
hash = "sha256-Tk+pp6Bvc+fcrFp78UQCPLA/svMJIJ4FQlJ6D9jkMqg=";
hash = "sha256-oeVjUbw6RKSZLFBuPy1goraiqtwjeuq1hy81ibpcuus=";
};
build-system = with python3.pkgs; [ setuptools ];

View File

@ -9616,6 +9616,8 @@ with pkgs;
md2gemini = with python3.pkgs; toPythonApplication md2gemini;
md2pdf = with python3Packages; toPythonApplication md2pdf;
mdbook-emojicodes = callPackage ../tools/text/mdbook-emojicodes { };
mdbook-epub = callPackage ../tools/text/mdbook-epub {

View File

@ -773,6 +773,8 @@ self: super: with self; {
arnparse = callPackage ../development/python-modules/arnparse { };
array-api-strict = callPackage ../development/python-modules/array-api-strict { };
array-record = callPackage ../development/python-modules/array-record { };
arrayqueues = callPackage ../development/python-modules/arrayqueues { };
@ -7580,6 +7582,8 @@ self: super: with self; {
md2gemini = callPackage ../development/python-modules/md2gemini { };
md2pdf = callPackage ../development/python-modules/md2pdf { };
mdformat = callPackage ../development/python-modules/mdformat { };
mdformat-admon = callPackage ../development/python-modules/mdformat-admon { };
mdformat-beautysh = callPackage ../development/python-modules/mdformat-beautysh { };