Merge master into staging-next

This commit is contained in:
github-actions[bot]
2024-12-07 18:04:16 +00:00
committed by GitHub
124 changed files with 4376 additions and 765 deletions
@@ -6,5 +6,5 @@
./github-runner/service.nix
];
meta.maintainers = with lib.maintainers; [ veehaitch newam ];
meta.maintainers = with lib.maintainers; [ veehaitch ];
}
@@ -13,7 +13,13 @@ let
// lib.optionalAttrs (cfg.ddUrl != null) { dd_url = cfg.ddUrl; }
// lib.optionalAttrs (cfg.site != null) { site = cfg.site; }
// lib.optionalAttrs (cfg.tags != null ) { tags = lib.concatStringsSep ", " cfg.tags; }
// lib.optionalAttrs (cfg.enableLiveProcessCollection) { process_config = { enabled = "true"; }; }
// lib.optionalAttrs (cfg.enableLiveProcessCollection) {
process_config = {
dd_agent_bin = "${datadogPkg}/bin/agent";
process_collection.enabled = "true";
container_collection.enabled = "true";
};
}
// lib.optionalAttrs (cfg.enableTraceAgent) { apm_config = { enabled = true; }; }
// cfg.extraConfig;
+30 -26
View File
@@ -1,32 +1,36 @@
{ callPackage
, timeshift-unwrapped
, rsync
, coreutils
, mount
, umount
, psmisc
, cron
, btrfs-progs
, grubPackage
{
callPackage,
btrfs-progs,
coreutils,
cron,
grubPackage,
mount,
psmisc,
rsync,
timeshift-unwrapped,
umount,
}:
let
timeshift-wrapper = callPackage ./wrapper.nix { };
in
(timeshift-wrapper timeshift-unwrapped ([
rsync
coreutils
mount
umount
psmisc
cron
(timeshift-wrapper timeshift-unwrapped [
btrfs-progs
coreutils
cron
grubPackage
])).overrideAttrs (oldAttrs: {
meta = oldAttrs.meta // {
description = oldAttrs.meta.description;
longDescription = oldAttrs.meta.longDescription + ''
This package comes with runtime dependencies of command utilities provided by rsync, coreutils, mount, umount, psmisc, cron and btrfs.
If you want to use the commands provided by the system, use timeshift-minimal instead.
'';
};
})
mount
psmisc
rsync
umount
]).overrideAttrs
(oldAttrs: {
meta = oldAttrs.meta // {
description = oldAttrs.meta.description;
longDescription =
oldAttrs.meta.longDescription
+ ''
This package comes with runtime dependencies of command utilities provided by rsync, coreutils, mount, umount, psmisc, cron and btrfs.
If you want to use the commands provided by the system, use timeshift-minimal instead.
'';
};
})
@@ -1,5 +1,6 @@
{ callPackage
, timeshift-unwrapped
{
callPackage,
timeshift-unwrapped,
}:
let
timeshift-wrapper = callPackage ./wrapper.nix { };
@@ -7,9 +8,11 @@ in
(timeshift-wrapper timeshift-unwrapped [ ]).overrideAttrs (oldAttrs: {
meta = oldAttrs.meta // {
description = oldAttrs.meta.description + " (without runtime dependencies)";
longDescription = oldAttrs.meta.longDescription + ''
This package is a wrapped version of timeshift-unwrapped
without runtime dependencies of command utilities.
'';
longDescription =
oldAttrs.meta.longDescription
+ ''
This package is a wrapped version of timeshift-unwrapped
without runtime dependencies of command utilities.
'';
};
})
@@ -1,18 +1,19 @@
{ lib
, stdenv
, fetchFromGitHub
, gettext
, help2man
, meson
, ninja
, pkg-config
, vala
, gtk3
, json-glib
, libgee
, util-linux
, vte
, xapp
{
lib,
stdenv,
fetchFromGitHub,
gettext,
help2man,
meson,
ninja,
pkg-config,
vala,
gtk3,
json-glib,
libgee,
util-linux,
vte,
xapp,
}:
stdenv.mkDerivation rec {
@@ -65,6 +66,9 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/linuxmint/timeshift";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ ShamrockLee bobby285271 ];
maintainers = with maintainers; [
ShamrockLee
bobby285271
];
};
}
+17 -11
View File
@@ -1,22 +1,22 @@
{ stdenvNoCC
, lib
, wrapGAppsHook3
, gdk-pixbuf
, librsvg
, xorg
, shared-mime-info
{
stdenvNoCC,
lib,
wrapGAppsHook3,
gdk-pixbuf,
librsvg,
xorg,
shared-mime-info,
}:
timeshift-unwrapped:
runtimeDeps:
timeshift-unwrapped: runtimeDeps:
stdenvNoCC.mkDerivation {
inherit (timeshift-unwrapped) pname version;
dontUnpack = true;
nativeBuildInputs = [
xorg.lndir
wrapGAppsHook3
xorg.lndir
];
installPhase = ''
@@ -34,7 +34,13 @@ stdenvNoCC.mkDerivation {
)
gappsWrapperArgs+=(
# Thumbnailers
--prefix XDG_DATA_DIRS : "${lib.makeSearchPath "share" [ gdk-pixbuf librsvg shared-mime-info ]}"
--prefix XDG_DATA_DIRS : "${
lib.makeSearchPath "share" [
gdk-pixbuf
librsvg
shared-mime-info
]
}"
"''${makeWrapperArgs[@]}"
)
wrapProgram "$out/bin/timeshift" "''${makeWrapperArgs[@]}"
@@ -11,16 +11,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "electrs";
version = "0.10.6";
version = "0.10.7";
src = fetchFromGitHub {
owner = "romanz";
repo = pname;
rev = "v${version}";
hash = "sha256-yp9fKD7zH9Ne2+WQUupaxvUx39RWE8RdY4U6lHuDGSc=";
hash = "sha256-KDl+SV5U2aqsl3UMK8WWZiwkcqLpaRGmH/J8vBKTZcQ=";
};
cargoHash = "sha256-J+6aek1PcW7G6f4h6cQcx5CyliryZeSxkSIQUX3yz6s=";
cargoHash = "sha256-vcn+94KklWlYQw4fbH8KxhBnovk0dJc8Hkj+jJ+SeB0=";
# needed for librocksdb-sys
nativeBuildInputs = [ rustPlatform.bindgenHook ];
@@ -7,13 +7,13 @@
melpaBuild {
pname = "isearch-prop";
version = "0-unstable-2022-12-30";
version = "0-unstable-2024-10-13";
src = fetchFromGitHub {
owner = "emacsmirror";
repo = "isearch-prop";
rev = "5787fd57977c0d6c416ce71471c3b9da246dfb78";
hash = "sha256-Xli7TxBenl5cDMJv3Qz7ZELFpvJKStMploLpf9a+uoA=";
rev = "7b32697c16541036abadbbb4d65dd67a4f1d2812";
hash = "sha256-NmFkbxiRFAqi1TaOFfmAOgIs1QZMKXkJfMmXL9fsV14=";
};
passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
@@ -2312,8 +2312,8 @@ let
mktplcRef = {
name = "haskell";
publisher = "haskell";
version = "2.2.2";
hash = "sha256-zWdIVdz+kZg7KZQ7LeBCB4aB9wg8dUbkWfzGlM0Fq7Q=";
version = "2.4.4";
hash = "sha256-O7tfZ1bQmlMgZGoWuECjSno6DLCO0+CCteRhT6PjZBY=";
};
meta = {
license = lib.licenses.mit;
@@ -2706,8 +2706,8 @@ let
mktplcRef = {
name = "nix-ide";
publisher = "jnoortheen";
version = "0.3.1";
hash = "sha256-05oMDHvFM/dTXB6T3rcDK3EiNG2T0tBN9Au9b+Bk7rI=";
version = "0.3.5";
hash = "sha256-hiyFZVsZkxpc2Kh0zi3NGwA/FUbetAS9khWxYesxT4s=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog";
@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
name = "tinymist";
publisher = "myriad-dreamin";
inherit (tinymist) version;
hash = "sha256-dHxeyqVe7cA/xK0RpprWRt5xPViyLHHal0pO6xhq4aE=";
hash = "sha256-vkVH+CBGSEWqSIDel+Y2O+B17LvLZbOjpHzbGAvEmWg=";
};
nativeBuildInputs = [
@@ -6,28 +6,28 @@
}:
let
version = "0.13.0";
version = "0.13.1";
sources = {
"x86_64-linux" = {
arch = "linux-x64";
url = "https://download.visualjj.com/visualjj-linux-x64-${version}.vsix";
hash = "sha256-mhfn/Lw/W1T2PaIglwrO/7VacDutT6Tgs133ePHL7W4=";
hash = "sha256-vKlsRxqtEvx4Gu6tkBjERYHl4Xx0K9xnYkh1SMDOYl0=";
};
"x86_64-darwin" = {
arch = "darwin-x64";
url = "https://download.visualjj.com/visualjj-darwin-x64-${version}.vsix";
hash = "sha256-feghMmcqzFM/Ttk8s4fp8et9Suw2kKLocptzwEcB2Sw=";
hash = "sha256-hzKZYPL/ZCRP2a4EaZGRXmzVpUNlGh4gOQt7NvGkn4M=";
};
"aarch64-linux" = {
arch = "linux-arm64";
url = "https://download.visualjj.com/visualjj-linux-arm64-${version}.vsix";
hash = "sha256-bfBj/A41FFMwMAEVw77nEDyk0+fYvi2Tg1Ufihxi9F8=";
hash = "sha256-nvVeme/qRG1ObSeisIBQHka5zG2f7Bqsjmva5EevXxw=";
};
"aarch64-darwin" = {
arch = "darwin-arm64";
url = "https://download.visualjj.com/visualjj-darwin-arm64-${version}.vsix";
hash = "sha256-xzf3WrH7BTiaX6NC2n9nLCKuBlFzRDYaSR73VGM7Ldc=";
hash = "sha256-mW6zJq0XvliCAWuslHdnlMX7bgO0mS9kH7CIYXjlaCE=";
};
};
in
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
mainProgram = "winetricks";
license = lib.licenses.lgpl21;
homepage = "https://github.com/Winetricks/winetricks";
platforms = with lib.platforms; linux;
platforms = with lib.platforms; linux ++ darwin;
};
}
@@ -1,64 +0,0 @@
{ lib, stdenv, fetchurl, makeDesktopItem
, ghostscript, atk, gtk2, glib, fontconfig, freetype
, libgnomecanvas
, pango, libX11, xorgproto, zlib, poppler
, autoconf, automake, libtool, pkg-config}:
let
isGdkQuartzBackend = (gtk2.gdktarget == "quartz");
in
stdenv.mkDerivation rec {
version = "0.4.8.2016";
pname = "xournal";
src = fetchurl {
url = "mirror://sourceforge/xournal/xournal-${version}.tar.gz";
sha256 = "09i88v3wacmx7f96dmq0l3afpyv95lh6jrx16xzm0jd1szdrhn5j";
};
buildInputs = [
ghostscript atk gtk2 glib fontconfig freetype
libgnomecanvas
pango libX11 xorgproto zlib poppler
];
nativeBuildInputs = [ autoconf automake libtool pkg-config ];
NIX_LDFLAGS = "-lz"
+ lib.optionalString (!isGdkQuartzBackend) " -lX11";
desktopItem = makeDesktopItem {
name = "xournal-${version}";
exec = "xournal";
icon = "xournal";
desktopName = "Xournal";
comment = meta.description;
categories = [ "Office" "Graphics" ];
mimeTypes = [ "application/pdf" "application/x-xoj" ];
genericName = "PDF Editor";
};
postInstall=''
mkdir --parents $out/share/mime/packages
cat << EOF > $out/share/mime/packages/xournal.xml
<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
<mime-type type="application/x-xoj">
<comment>Xournal Document</comment>
<glob pattern="*.xoj"/>
</mime-type>
</mime-info>
EOF
cp --recursive ${desktopItem}/share/applications $out/share
mkdir --parents $out/share/icons
cp $out/share/xournal/pixmaps/xournal.png $out/share/icons
'';
meta = with lib; {
homepage = "https://xournal.sourceforge.net/";
description = "Note-taking application (supposes stylus)";
maintainers = [ maintainers.guibert ];
license = licenses.gpl2;
platforms = with platforms; linux ++ darwin;
mainProgram = "xournal";
};
}
@@ -62,6 +62,7 @@ let
url = "https://github.com/Reactive-Extensions/RxCpp/archive/v${rxcppVersion}.tar.gz";
sha256 = "sha256-UOc5WrG8KgAA3xJsaSCjbdPE7gSnFJay9MEK31DWUXg=";
};
gtest = fetchurl {
url = "https://github.com/google/googletest/archive/release-${gtestVersion}.tar.gz";
sha256 = "sha256-WKb0J3yivIVlIis7vVihd2CenEiOinJkk1m6UUUNt9g=";
@@ -69,7 +70,7 @@ let
};
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
inherit pname version;
outputs = [ "out" "dev" "doc" ];
@@ -132,32 +133,39 @@ stdenv.mkDerivation rec {
++ lib.optional opencvSupport opencv;
cmakeFlags = let
enableIf = cond: if cond then "ON" else "OFF";
excludeTestsRegex = lib.concatStringsSep "|" [
# sporadic segfault
# segfault
"SerializationXML"
"TrainedModelSerialization"
# broken by openblas 0.3.21
"mathematics_lapack"
# fails on aarch64
"LinearTimeMMD"
"QuadraticTimeMMD"
"SGVectorTest"
"Statistics"
# hangs on aarch64
"PRange"
# these take too long on CI
"evaluation_cross_validation"
"modelselection_combined_kernel"
"modelselection_grid_search"
];
in [
"-DBUILD_META_EXAMPLES=ON"
"-DCMAKE_DISABLE_FIND_PACKAGE_ARPACK=ON"
"-DCMAKE_DISABLE_FIND_PACKAGE_ARPREC=ON"
"-DCMAKE_DISABLE_FIND_PACKAGE_CPLEX=ON"
"-DCMAKE_DISABLE_FIND_PACKAGE_Mosek=ON"
"-DCMAKE_DISABLE_FIND_PACKAGE_TFLogger=ON"
"-DCMAKE_DISABLE_FIND_PACKAGE_ViennaCL=ON"
"-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;'${excludeTestsRegex}'"
"-DENABLE_TESTING=${enableIf doCheck}"
"-DDISABLE_META_INTEGRATION_TESTS=ON"
"-DTRAVIS_DISABLE_META_CPP=ON"
"-DINTERFACE_PYTHON=${enableIf pythonSupport}"
"-DOpenCV=${enableIf opencvSupport}"
"-DUSE_SVMLIGHT=${enableIf withSvmLight}"
(lib.cmakeBool "BUILD_META_EXAMPLES" true)
(lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_ARPACK" true)
(lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_ARPREC" true)
(lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_CPLEX" true)
(lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_Mosek" true)
(lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_TFLogger" true)
(lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_ViennaCL" true)
(lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'${excludeTestsRegex}'")
(lib.cmakeBool "ENABLE_TESTING" finalAttrs.doCheck)
(lib.cmakeBool "DISABLE_META_INTEGRATION_TESTS" true)
(lib.cmakeBool "TRAVIS_DISABLE_META_CPP" true)
(lib.cmakeBool "INTERFACE_PYTHON" pythonSupport)
(lib.cmakeBool "OpenCV" opencvSupport)
(lib.cmakeBool "USE_SVMLIGHT" withSvmLight)
];
CXXFLAGS = "-faligned-new";
@@ -196,7 +204,7 @@ stdenv.mkDerivation rec {
postFixup = ''
# CMake incorrectly calculates library path from dev prefix
substituteInPlace $dev/lib/cmake/shogun/ShogunTargets-release.cmake \
--replace "\''${_IMPORT_PREFIX}/lib/" "$out/lib/"
--replace-fail "\''${_IMPORT_PREFIX}/lib/" "$out/lib/"
'';
meta = with lib; {
@@ -205,4 +213,4 @@ stdenv.mkDerivation rec {
license = if withSvmLight then licenses.unfree else licenses.gpl3Plus;
maintainers = with maintainers; [ edwtjo smancill ];
};
}
})
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation {
pname = "ananicy-rules-cachyos";
version = "0-unstable-2024-10-25";
version = "0-unstable-2024-11-22";
src = fetchFromGitHub {
owner = "CachyOS";
repo = "ananicy-rules";
rev = "707b16506be2c54028546181461ebf47cfe72d83";
hash = "sha256-189eHlSLGgSgT2KIkj+c5pKpPZ34vacZzlYOFGfwEFM=";
rev = "7b660e4c0e3dccec7ddc4c4dafc1717cb06b7e1e";
hash = "sha256-7MwAveke3GL8tmOCxCgKRbllChST22FKWdbGsewCJdM=";
};
dontConfigure = true;
+2 -2
View File
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "astyle";
version = "3.6.4";
version = "3.6.5";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
hash = "sha256-HpS2T08GRh+QOdCUrv6dSyjGbTSRayekVgVefWLXNwI=";
hash = "sha256-8jHNZBBHrbbAGtslEVczJqi7eik9F7VMdwVQmT3q3os=";
};
nativeBuildInputs = [ cmake ];
+3 -3
View File
@@ -2,20 +2,20 @@
buildGoModule rec {
pname = "atlantis";
version = "0.28.5";
version = "0.30.0";
src = fetchFromGitHub {
owner = "runatlantis";
repo = "atlantis";
rev = "v${version}";
hash = "sha256-oyECtP/YeEhvsltWZq52YNq+Gbbpko9bbbUTh5NA/9c=";
hash = "sha256-hM4IycRE3/jiwFLqkU/jz9sPP9KTfeu8ouIJlqgPxmk=";
};
ldflags = [
"-X=main.version=${version}"
"-X=main.date=1970-01-01T00:00:00Z"
];
vendorHash = "sha256-oiRpmGfuc37s3ZD8R7L9EFieqJP7mYvDsiJBzruCSkA=";
vendorHash = "sha256-uH+Q5NXBL1+LFa6tw3x2CE1B5QElqK9KuFeYQpCFAW0=";
subPackages = [ "." ];
+3 -3
View File
@@ -15,16 +15,16 @@
buildNpmPackage rec {
pname = "balena-cli";
version = "19.0.13";
version = "20.0.9";
src = fetchFromGitHub {
owner = "balena-io";
repo = "balena-cli";
rev = "v${version}";
hash = "sha256-2U+P3LsxaRpktNbDn8iNhHQVjokiWZADYVDpJsDosZU=";
hash = "sha256-UmtTFSUCxz9oAep9+k0GBCxfFkHNDwoKvThIkFq93PQ=";
};
npmDepsHash = "sha256-CA6qs9Gk19dEK2yCFMVVKmJSoZVLdpnf4V6P5fv2Bcc=";
npmDepsHash = "sha256-hie3ZWbqBKB4CRZG46oXyiYC8A/JLjdHkTh6VdZe1Qo=";
postPatch = ''
ln -s npm-shrinkwrap.json package-lock.json
+6 -11
View File
@@ -2,21 +2,21 @@
lib,
stdenv,
fetchurl,
electron_30,
electron,
dpkg,
makeWrapper,
commandLineArgs ? "",
}:
let
version = "1.14.0-2";
version = "1.15.2-2";
srcs = {
x86_64-linux = fetchurl {
url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb";
hash = "sha256-QQMdEpKE7r/fPMaX/yEoaa7KjilhiPMYLRvGPkv1jds=";
hash = "sha256-juAhvdeLzjHDs59eS+wwUn3OmnDecC17Vclp0Q0LtJw=";
};
aarch64-linux = fetchurl {
url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_arm64.deb";
hash = "sha256-UaGI4BLhfoYluZpARsj+I0iEmFXYYNfl4JWhBWOOip0=";
hash = "sha256-8o0MX0Ih07KQ9wE+nonSZaupSOuUVyuoIbdHYmR29mc=";
};
};
src =
@@ -25,11 +25,6 @@ in
stdenv.mkDerivation {
pname = "bilibili";
inherit src version;
unpackPhase = ''
runHook preUnpack
dpkg -x $src ./
runHook postUnpack
'';
nativeBuildInputs = [
makeWrapper
@@ -43,7 +38,7 @@ stdenv.mkDerivation {
cp -r usr/share $out/share
sed -i "s|Exec=.*|Exec=$out/bin/bilibili|" $out/share/applications/*.desktop
cp -r opt/apps/io.github.msojocs.bilibili/files/bin/app $out/opt
makeWrapper ${lib.getExe electron_30} $out/bin/bilibili \
makeWrapper ${lib.getExe electron} $out/bin/bilibili \
--argv0 "bilibili" \
--add-flags "$out/opt/app.asar" \
--add-flags ${lib.escapeShellArg commandLineArgs}
@@ -67,7 +62,7 @@ stdenv.mkDerivation {
"x86_64-linux"
"aarch64-linux"
];
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
mainProgram = "bilibili";
};
}
@@ -1,4 +1,4 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }:
{ lib, stdenv, rustPlatform, fetchFromGitHub, apple-sdk_11 }:
rustPlatform.buildRustPackage rec {
pname = "cargo-deadlinks";
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
# assumes the target is x86_64-unknown-linux-gnu
"--skip simple_project::it_checks_okay_project_correctly";
buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security;
buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
meta = with lib; {
description = "Cargo subcommand to check rust documentation for broken links";
+3 -3
View File
@@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-hack";
version = "0.6.32";
version = "0.6.33";
src = fetchCrate {
inherit pname version;
hash = "sha256-XjubvjK+FySm0nqlzFsRhDQOI9M0enonwwPhZ/KFFlk=";
hash = "sha256-/O05q4osyQ30rHKe84oBQJTFuVmPGB5KKy6UM/TzY5Q=";
};
cargoHash = "sha256-sWXeGohH9iLMkmBgNjSfg25eDzZHSzWrOGgccuWPBLM=";
cargoHash = "sha256-vkvna8+1+qQh+ZXtQ/HJa8UnstuH1sKlFc4CEUZYc5E=";
# some necessary files are absent in the crate version
doCheck = false;
+3 -3
View File
@@ -9,14 +9,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-show-asm";
version = "0.2.41";
version = "0.2.42";
src = fetchCrate {
inherit pname version;
hash = "sha256-U9i/xp9WxMYf4GMsZB7qYOpuuuEw4mWZp+ZEyguGtQQ=";
hash = "sha256-3KdHEmoGdtfc5b5H7EQ1q5vqra0hRrROJYCIpiqxshk=";
};
cargoHash = "sha256-eUaEpex9x9bdqPJ4p5QvkWKaxs3ih4Gb9+4deGBZgXU=";
cargoHash = "sha256-GwzGdy6aWnKyaQbtgRB6t0cnWWiirN9j/GqhdBc5fHU=";
nativeBuildInputs = [
installShellFiles
+5 -5
View File
@@ -11,16 +11,16 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "clouddrive2";
version = "0.8.3";
version = "0.8.5";
src = fetchurl {
url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz";
hash =
{
x86_64-linux = "sha256-5vyWMoDASzRa9m2UueoyMbmK8JPUpplqk0/uv8fHPAU=";
aarch64-linux = "sha256-zfar/dZkSVSrnrRpfF4RnwvkPVzmdLJa4W9Ds8NNNaI=";
x86_64-darwin = "sha256-3jab0NxGH+cac2Ughq/l2ZAQLISD7z+WBtFFyiFc+5A=";
aarch64-darwin = "sha256-SO5L9aBMN5pYloBeVH1uQO0QeiHzDK+6kHVEg8uYnTo=";
x86_64-linux = "sha256-6zdP0d5XyBYG7+SGqb2DSaD6rJrBn8OjGr9BXfP1Ctc=";
aarch64-linux = "sha256-7u/AKZGL/AkUsakZexC/oxgjoayaxH7OiRE+xnH+Gus=";
x86_64-darwin = "sha256-/uDxZVlULl3PnuAaF7kWAyukaQoF7DV8m5gowTFdMEQ=";
aarch64-darwin = "sha256-xZ60pi2JYSLDLaR0Qe/fyEhzyu17U2fbDp1lo2qViIs=";
}
.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
};
+14 -4
View File
@@ -1,6 +1,8 @@
{ lib
, buildGoModule
, fetchFromGitHub
{
lib,
buildGoModule,
fetchFromGitHub,
versionCheckHook,
}:
buildGoModule rec {
@@ -16,17 +18,25 @@ buildGoModule rec {
vendorHash = "sha256-6J9AWONLP/FvR0dXt5Zx4n+kTpmnxF79HcWVFp9OZ0g=";
subPackages = [ "cmd/cloudlist/" ];
ldflags = [
"-w"
"-s"
];
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
versionCheckProgramArg = [ "--version" ];
meta = with lib; {
description = "Tool for listing assets from multiple cloud providers";
mainProgram = "cloudlist";
homepage = "https://github.com/projectdiscovery/cloudlist";
changelog = "https://github.com/projectdiscovery/cloudlist/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "cloudlist";
};
}
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cpp-utilities";
version = "5.26.1";
version = "5.27.0";
src = fetchFromGitHub {
owner = "Martchus";
repo = "cpp-utilities";
rev = "v${finalAttrs.version}";
sha256 = "sha256-ft8gusZ6We3nEAOwccGrUidxpO5tdWR5VNDQ/r5l2P8=";
sha256 = "sha256-pjEWTNcZwcrKUsXXHia8aLSCw7R8aEr6GBvD7yiYFXo=";
};
nativeBuildInputs = [ cmake ];
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "crd2pulumi";
version = "1.5.3";
version = "1.5.4";
src = fetchFromGitHub {
owner = "pulumi";
repo = "crd2pulumi";
rev = "v${version}";
sha256 = "sha256-sXZ5iImN+AwAEV6Xur4EbDZhzQEYJFf9AgaBf1wQAIA=";
sha256 = "sha256-PqEQrmSfcPH+GSGnuv6xpAm/2gAyTmLf81C+e25Un4s=";
};
vendorHash = "sha256-4L1KfpZ+KICPko74x3STRQFtkcNVU/5KFGhKEJ64+Jk=";
+3 -3
View File
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "dolt";
version = "1.43.1";
version = "1.43.15";
src = fetchFromGitHub {
owner = "dolthub";
repo = "dolt";
rev = "v${version}";
sha256 = "sha256-i+WW8udVjLQGMg0eu03hInfXaLZzVJ4liKE4eQ/KDww=";
sha256 = "sha256-dmRi+VZWmHPbTgkShS/zQ7/JaNJ2GSw0l1gGEC/zmkA=";
};
modRoot = "./go";
subPackages = [ "cmd/dolt" ];
vendorHash = "sha256-0SvM6I+zGelSUMlbeeqljfzITw0Cnl2BZHJ78n+m5ds=";
vendorHash = "sha256-FXVLvPoKzMuGpaXa3sDATURDwhrBwY6wUTnxcjEA0PU=";
proxyVendor = true;
doCheck = false;
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "extism-cli";
version = "1.6.0";
version = "1.6.1";
src = fetchFromGitHub {
owner = "extism";
repo = "cli";
rev = "refs/tags/v${version}";
hash = "sha256-FAnPyhCc1R6Xk195hTfO16WVtYVB6RPp7Ih7+uyRy2s=";
hash = "sha256-txwpFc1FQlZLAxbpO92Ei7z3vhXBrpdIJHAqnrKp9Bg=";
};
vendorHash = "sha256-w8XqHirHfswhlBH/oSrDKLyGdbaiFjQGEZcMH+WVLYo=";
vendorHash = "sha256-51/fzq2j55GHmEx2twb0DSi0AmBS4DbViZzo1c5Xn1M=";
nativeBuildInputs = [ installShellFiles ];
+2 -2
View File
@@ -5,10 +5,10 @@
let
pname = "fflogs";
version = "8.14.21";
version = "8.14.49";
src = fetchurl {
url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
hash = "sha256-sBC2qvtSje2uXzSZAYXBFmycKxf0B6/JZhOvWNyMp20=";
hash = "sha256-pgI6xiTz1Gm5OMUnJsXD/B2eBm3MkPKIYQ6DgyVdwYo=";
};
extracted = appimageTools.extractType2 { inherit pname version src; };
in
+3 -3
View File
@@ -6,13 +6,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "filesender";
version = "2.49";
version = "2.51";
src = fetchFromGitHub {
owner = "filesender";
repo = "filesender";
rev = "filesender-${finalAttrs.version}";
hash = "sha256-GNhborbwV9G2x7pLDyxGVCtTf4AIaMYQGAKNJPzedzo=";
tag = "filesender-${finalAttrs.version}";
hash = "sha256-HQ5/Df4F4Gwon0OhlIRTZ0NHTb9SJgQD+BDbH/aIeKw=";
};
patches = [
+1
View File
@@ -50,6 +50,7 @@ python.pkgs.buildPythonApplication rec {
"pyopenssl"
"pytz"
"sqlalchemy"
"ua-parser"
];
dependencies =
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "flarectl";
version = "0.108.0";
version = "0.111.0";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflare-go";
rev = "v${version}";
hash = "sha256-9pPDoXYZCcMnusBfQ1PQ8l/ZFvPNTOA8dRJALXY1Kho=";
hash = "sha256-/oIY7Sf7XNyoxMsaEqHgSPt8AxWDeMtMsVQ0r/vlICQ=";
};
vendorHash = "sha256-U6ogqAweU2DZb26Ct4K/1TnCGRn//p11nVkFKzC+tj0=";
vendorHash = "sha256-Zuk+WreO15tGrSYHkuu6h6ZpM3iL+dPyf13LIeVEz44=";
subPackages = [ "cmd/flarectl" ];
+8 -19
View File
@@ -4,7 +4,7 @@
fetchPypi,
procps,
qt5,
xvfb-run,
nix-update-script,
}:
python3Packages.buildPythonApplication rec {
pname = "flent";
@@ -25,28 +25,15 @@ python3Packages.buildPythonApplication rec {
qtpy
];
nativeCheckInputs = [
python3Packages.mock
xvfb-run
];
checkPhase = ''
runHook preCheck
nativeCheckInputs = [ python3Packages.unittestCheckHook ];
preCheck = ''
# we want the gui tests to always run
sed -i 's|self.skip|pass; #&|' unittests/test_gui.py
export XDG_RUNTIME_DIR=$(mktemp -d)
export HOME=$(mktemp -d)
cat >test-runner <<EOF
#!/bin/sh
${python3Packages.python.interpreter} -m unittest discover
EOF
chmod +x test-runner
wrapQtApp test-runner --prefix PYTHONPATH : $PYTHONPATH
xvfb-run -s '-screen 0 800x600x24' ./test-runner
runHook postCheck
# Dummy qt setup for gui tests
export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}"
export QT_QPA_PLATFORM=offscreen
'';
preFixup = ''
@@ -56,11 +43,13 @@ python3Packages.buildPythonApplication rec {
)
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "FLExible Network Tester";
homepage = "https://flent.org";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ mmlb ];
mainProgram = "flent";
badPlatforms = lib.platforms.darwin;
};
}
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "gatus";
version = "5.13.0";
version = "5.13.1";
src = fetchFromGitHub {
owner = "TwiN";
repo = "gatus";
rev = "v${version}";
hash = "sha256-+wXkB6QPAXerv8WKk4f7WA44eEaiw92Z+1bqhkZk9qQ=";
hash = "sha256-OY8f4FGlWeE5Jg4ESnVGo/oiTBVavBSXdGKB+uceC7U=";
};
vendorHash = "sha256-pM47Jy7WIS8+3mFEmPZdnyxcDjoxgdP46xuTmf4p2JM=";
vendorHash = "sha256-FAlf+tGI3ssugHf8PsNc2Fb+rH8MqgS3BWXaee+khZw=";
subPackages = [ "." ];
+3 -3
View File
@@ -6,13 +6,13 @@
python3Packages.buildPythonApplication rec {
pname = "gersemi";
version = "0.17.0";
version = "0.17.1";
src = fetchFromGitHub {
owner = "BlankSpruce";
repo = "gersemi";
rev = "refs/tags/${version}";
hash = "sha256-t9W27lwNKRFAraynAGEawFb1qCW9/b3RCm/jeb9zJXg=";
tag = version;
hash = "sha256-AphKC50O9ohywLagyQMfk8A6w4Cm0ceHHWSRAWOnoyM=";
};
propagatedBuildInputs = with python3Packages; [
@@ -18,6 +18,7 @@
, glib
, libbacktrace
, text-engine
, fetchpatch
}:
stdenv.mkDerivation rec {
@@ -54,6 +55,14 @@ stdenv.mkDerivation rec {
text-engine
];
patches = [
# fix black window when opened, remove in next release
(fetchpatch {
url = "https://github.com/mjakeman/extension-manager/commit/91d1c42a30e12131dc3c5afd8a709e7db2a95b70.patch";
hash = "sha256-NtsJeqclUx4L3wbyQ46ZCoo4IKSu4/HoT/FD20xriZ4=";
})
];
mesonFlags = [
(lib.mesonOption "package" "Nix")
(lib.mesonOption "distributor" "nixpkgs")
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "goawk";
version = "1.28.0";
version = "1.29.1";
src = fetchFromGitHub {
owner = "benhoyt";
repo = "goawk";
rev = "v${version}";
hash = "sha256-3i8czhGFk8XqYaenKTmsvXt2kRSss++rS6amLxfM2DE=";
hash = "sha256-PQtayS2403ldNiE/xMQ/Oy+BsZB1ixDALuZcjhRyxLY=";
};
vendorHash = null;
+3 -3
View File
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "gqlgenc";
version = "0.25.3";
version = "0.27.3";
src = fetchFromGitHub {
owner = "yamashou";
repo = "gqlgenc";
rev = "v${version}";
sha256 = "sha256-sIXPd/+BVaywAAt2myNOBaAjy/eTY6C8TdSuOoikr0E=";
sha256 = "sha256-Ep8wrb/s3mMAMNAl2sSRBwxs9Zifls8+12/D6CgCzXg=";
};
excludedPackages = [ "example" ];
vendorHash = "sha256-YGFMQrxghJIgmiwEPfEqaACH7OETVkD8O7oUhm9foJo=";
vendorHash = "sha256-ln26CHD0q+iPyAx5DalOGyCtVB1QR+7ls1ZjNK8APBU=";
meta = with lib; {
description = "Go tool for building GraphQL client with gqlgen";
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "gut";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "julien040";
repo = "gut";
rev = version;
hash = "sha256-l7yjZEcpsnVisd93EqIug1n0k18m4tUmCQFXC6b63cg=";
hash = "sha256-pjjeA0Nwc5M3LwxZLpBPnFqXJX0b6KDaj4YCPuGoUuU=";
};
vendorHash = "sha256-G9oDMHLmdv/vQfofTqKAf21xaGp+lvW+sedLmaj+A5A=";
+2 -2
View File
@@ -14,14 +14,14 @@ let
in
py.pkgs.buildPythonApplication rec {
pname = "healthchecks";
version = "3.6";
version = "3.7";
format = "other";
src = fetchFromGitHub {
owner = "healthchecks";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-aKt9L3ZgZ8HffcNNJaR+hAI38raWuLp2q/6+rvkl2pM=";
sha256 = "sha256-pPO1ktPeiXKNryUe74Zeqd7q92yDs3kplEkwEfuvNh8=";
};
propagatedBuildInputs = with py.pkgs; [
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "hyprgui";
version = "0.1.9";
version = "0.2.0";
src = fetchFromGitHub {
owner = "hyprutils";
repo = "hyprgui";
rev = "refs/tags/v${version}";
hash = "sha256-VP+6qWu4nv8h9LLjTnl8Mh1aAlIA+zuufRYoouxl2Tc=";
hash = "sha256-akV83bvPuSJUleP0mDcnAR1KFegOXyoKSD0CVyNDJmc=";
};
cargoHash = "sha256-t0HqraCA4q7K4EEtPS8J0ZmnhBB+Zf0aX+yXSUdKJzo=";
cargoHash = "sha256-SBI2Gk4FImGw8169xIV8L0fbfcKzn6PqvLg6XxbpurI=";
strictDeps = true;
+3 -3
View File
@@ -7,17 +7,17 @@
buildGoModule rec {
pname = "jfrog-cli";
version = "2.71.4";
version = "2.72.2";
src = fetchFromGitHub {
owner = "jfrog";
repo = "jfrog-cli";
rev = "refs/tags/v${version}";
hash = "sha256-pC56OlSo05nMH+Adkg1v0Lba7Vd+bXeHRP4+Phvhlu8=";
hash = "sha256-Vu57V6OiMZjR+g0afeLEkQcwGA0e8PZzYAJjR3/wNoI=";
};
proxyVendor = true;
vendorHash = "sha256-d1VloSjvXAt10MsZwVJ0Fkg9pN+tcOE5vURy7hatg30=";
vendorHash = "sha256-BSLBXHcowF2iVS/fMR3UIIdpbuLDgsPXYV4WK/oeHB4=";
postPatch = ''
# Patch out broken test cleanup.
+2 -2
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "keymapper";
version = "4.8.2";
version = "4.9.0";
src = fetchFromGitHub {
owner = "houmain";
repo = "keymapper";
rev = finalAttrs.version;
hash = "sha256-4LYGsqHD3msJNgkaInJyH7o+jebeQoh/rUAsvIsqkdM=";
hash = "sha256-GckqlKpF1N7Khq/9ju1IG1+jfPBuWhFAHhYnlCMC5Cw=";
};
# all the following must be in nativeBuildInputs
+17 -18
View File
@@ -93,14 +93,14 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "materialize";
version = "0.84.2";
MZ_DEV_BUILD_SHA = "9f8cf75b461d288335cb6a7a73aaa670bab4a466";
version = "0.87.2";
MZ_DEV_BUILD_SHA = "000000000000000000000000000000000000000000000000000";
src = fetchFromGitHub {
owner = "MaterializeInc";
repo = "materialize";
rev = "refs/tags/v${version}";
hash = "sha256-+cvTCiTbuaPYPIyDxQlMWdJA5/6cbMoiTcSmjj5KPjs=";
tag = "v${version}";
hash = "sha256-EHhN+avUxzwKU48MubiMM40W9J93yZlNqV+xeP44dl0=";
fetchSubmodules = true;
};
@@ -123,7 +123,7 @@ rustPlatform.buildRustPackage rec {
};
useFetchCargoVendor = true;
cargoHash = "sha256-EHVuwVYPZKaoP3GYtJpYJaKG3CLsy9CWuEmajF4P7Qc=";
cargoHash = "sha256-+OREisZ/vw3Oi5MNCYn7u06pZKtf+2trlGyn//uAGws=";
nativeBuildInputs =
[
@@ -156,16 +156,19 @@ rustPlatform.buildRustPackage rec {
# Skip tests that use the network
checkFlags = [
"--exact"
"--skip test_client"
"--skip test_client_errors"
"--skip test_client_all_subjects"
"--skip test_client_subject_and_references"
"--skip test_no_block"
"--skip test_safe_mode"
"--skip test_tls"
"--skip=test_client"
"--skip=test_client_errors"
"--skip=test_client_all_subjects"
"--skip=test_client_subject_and_references"
"--skip=test_no_block"
"--skip=test_safe_mode"
"--skip=test_tls"
];
cargoBuildFlags = [ "--bin environmentd --bin clusterd" ];
cargoBuildFlags = [
"--bin=clusterd"
"--bin=environmentd"
];
postInstall = ''
install --mode=444 -D ./misc/dist/materialized.service $out/etc/systemd/system/materialized.service
@@ -186,11 +189,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://materialize.com";
description = "Streaming SQL materialized view engine for real-time applications";
license = lib.licenses.bsl11;
platforms = [
"x86_64-linux"
"x86_64-darwin"
"aarch64-linux"
];
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ petrosagg ];
mainProgram = "environmentd";
};
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "micropython";
version = "1.24.0";
version = "1.24.1";
src = fetchFromGitHub {
owner = "micropython";
repo = "micropython";
rev = "v${version}";
hash = "sha256-cFoUa4ZpPy1MldlTeY9ISXi9ilulmhmaH5mapUDBzE8=";
hash = "sha256-Hn5TtLBKK9kn9x3U2ZcU9O2CS272rcDD0HA+Xva3G4w=";
fetchSubmodules = true;
# remove unused libraries from rp2 port's SDK. we leave this and the other
+2 -2
View File
@@ -5,13 +5,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "10.81";
version = "10.83";
pname = "monkeys-audio";
src = fetchzip {
url = "https://monkeysaudio.com/files/MAC_${
builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
hash = "sha256-sI2u+H/ewva9r+g5xSNqal0DMul+a9Y4FV6dEzulvSI=";
hash = "sha256-QPd3YlQ2IYAqIIau3RVb2FcdE4obQjg5bZi6CUsDyHU=";
stripRoot = false;
};
+2 -2
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "namespace-cli";
version = "0.0.394";
version = "0.0.396";
src = fetchFromGitHub {
owner = "namespacelabs";
repo = "foundation";
rev = "v${version}";
hash = "sha256-ktXpFhE/+DmlqIaH8R6zu4Y1I7sr8NYeZP8lWeNN0bA=";
hash = "sha256-hDCHu/RlZfuEL20wO5V7cBcKQKswoUBwTp531rlYN5A=";
};
vendorHash = "sha256-E9RhELIGOjFa+gDinl4xDR3ckTtdFLqVoAT0HQoI38I=";
+2 -2
View File
@@ -5,13 +5,13 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "nerdfetch";
version = "8.3.0";
version = "8.3.1";
src = fetchFromGitHub {
owner = "ThatOneCalculator";
repo = "NerdFetch";
rev = "v${finalAttrs.version}";
hash = "sha256-CQjIxXGuEUdUbbdclVKshsz/AdkgDTTACoNCVFrHqas=";
hash = "sha256-Ptd699Q2kX+04TGnChQK45dBf0W1QUFk7vHpRl3kFKo=";
};
dontUnpack = true;
+3 -3
View File
@@ -23,13 +23,13 @@
python3Packages.buildPythonApplication rec {
pname = "nwg-panel";
version = "0.9.50";
version = "0.9.53";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = "nwg-panel";
rev = "refs/tags/v${version}";
hash = "sha256-/WJpxFmQ6ED/PWW9/qIp5VheBgAukLIwRSdOxfPoyKM=";
tag = "v${version}";
hash = "sha256-hku5a2np7J/7jt9oL77GLasslFk1VRPe3cGG6xmQGwY=";
};
# No tests
+2 -2
View File
@@ -41,13 +41,13 @@ assert builtins.elem acceleration [
let
pname = "ollama";
# don't forget to invalidate all hashes each update
version = "0.4.7";
version = "0.5.0";
src = fetchFromGitHub {
owner = "ollama";
repo = "ollama";
rev = "v${version}";
hash = "sha256-X1xGo054+MpThvZzeg/F+IBczY1wn/gTjcq+j1JztDg=";
hash = "sha256-WbRs7CdPKIEqxJUZjPT4ZzuWBl+OfGu2dzwjNVrSgVw=";
fetchSubmodules = true;
};
+10
View File
@@ -4,6 +4,7 @@
coreutils,
curl,
fetchFromGitHub,
fetchpatch,
installShellFiles,
ldc,
libnotify,
@@ -27,6 +28,15 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-Lek1tW0alQQvlOHpz//M/y4iJY3PWRkcmXGLwjCLozk=";
};
patches = [
# remove when updating to v2.5.4
(fetchpatch {
name = "fix-openssl-version-check-error.patch";
url = "https://github.com/abraunegg/onedrive/commit/d956318b184dc119d65d7a230154df4097171a6d.patch";
hash = "sha256-LGmKqYgFpG4MPFrHXqvlDp7Cxe3cEGYeXXH9pCXtGkU=";
})
];
outputs = [
"out"
"doc"
+8 -5
View File
@@ -7,19 +7,19 @@
}:
let
pname = "open-webui";
version = "0.4.7";
version = "0.4.8";
src = fetchFromGitHub {
owner = "open-webui";
repo = "open-webui";
rev = "refs/tags/v${version}";
hash = "sha256-LQFedDcECmS142tGH9+/7ic+wKTeMuysK2fjGmvYPYQ=";
hash = "sha256-9N/t8hxODM6Dk/eMKS26/2Sh1lJVkq9pNkPcEtbXqb4=";
};
frontend = buildNpmPackage {
inherit pname version src;
npmDepsHash = "sha256-KeHMt51QvF5qfHKQpEbM0ukGm34xo3TFcXKeZ3CrmHM=";
npmDepsHash = "sha256-ThOGBurFjndBZcdpiGugdXpv1YCwCN7s3l2JjSk/hY0=";
# Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
# Until this is solved, running python packages from the browser will not work.
@@ -148,8 +148,11 @@ python312.pkgs.buildPythonApplication rec {
makeWrapperArgs = [ "--set FRONTEND_BUILD_DIR ${frontend}/share/open-webui" ];
passthru.tests = {
inherit (nixosTests) open-webui;
passthru = {
tests = {
inherit (nixosTests) open-webui;
};
updateScript = ./update.sh;
};
meta = {
+21
View File
@@ -0,0 +1,21 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p git curl jq common-updater-scripts prefetch-npm-deps
set -eou pipefail
nixpkgs="$(git rev-parse --show-toplevel)"
path="$nixpkgs/pkgs/by-name/op/open-webui/package.nix"
version="$(curl --silent "https://api.github.com/repos/open-webui/open-webui/releases" | jq '.[0].tag_name' --raw-output)"
update-source-version open-webui "${version:1}" --file="$path"
# Fetch npm deps
tmpdir=$(mktemp -d)
curl -O --output-dir $tmpdir "https://raw.githubusercontent.com/open-webui/open-webui/refs/tags/${version}/package-lock.json"
curl -O --output-dir $tmpdir "https://raw.githubusercontent.com/open-webui/open-webui/refs/tags/${version}/package.json"
pushd $tmpdir
npm_hash=$(prefetch-npm-deps package-lock.json)
sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' "$path"
popd
rm -rf $tmpdir
@@ -11,15 +11,15 @@
python3Packages.buildPythonApplication rec {
pname = "openapi-python-client";
version = "0.21.6";
version = "0.21.7";
pyproject = true;
src = fetchFromGitHub {
inherit version;
owner = "openapi-generators";
repo = "openapi-python-client";
rev = "refs/tags/v${version}";
hash = "sha256-hmVRPQ3+20ZBRCkQltX+S+pGGy2unsBSztyif93sKsw=";
tag = "v${version}";
hash = "sha256-V3tvAyojSSijbqVfsodk7eiyUBGZOjf1stkedfwTeOQ=";
};
nativeBuildInputs =
+50
View File
@@ -0,0 +1,50 @@
{
lib,
stdenv,
fetchurl,
qpdf,
libiconv,
libpaper,
asciidoc,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "paperjam";
version = "1.2.1";
src = fetchurl {
url = "https://mj.ucw.cz/download/linux/paperjam-${finalAttrs.version}.tar.gz";
hash = "sha256-vTjtNTkBHwfoRDshmFu1zZfGVuEtk2NXH5JdA5Ekg5s=";
};
buildInputs = [
qpdf
libpaper
asciidoc
] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
makeFlags = [
"PREFIX=$(out)"
# prevent real build date which is impure
"BUILD_DATE=\<unknown\>"
"BUILD_COMMIT=\<unknown\>"
];
# provide backward compatible PointerHolder, suppress deprecation warnings
env.NIX_CFLAGS_COMPILE = "-DPOINTERHOLDER_TRANSITION=1";
env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv";
meta = {
homepage = "https://mj.ucw.cz/sw/paperjam/";
description = "Program for transforming PDF files";
longDescription = ''
PaperJam is a program for transforming PDF files. It can re-arrange
pages, scale and rotate them, put multiple pages on a single sheet, draw
cropmarks, and many other tricks.
'';
license = lib.licenses.gpl2Plus;
mainProgram = "paperjam";
maintainers = with lib.maintainers; [ cbley ];
platforms = lib.platforms.all;
};
})
+2 -2
View File
@@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pekwm";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "pekdon";
repo = "pekwm";
rev = "release-${finalAttrs.version}";
hash= "sha256-hA+TBAs9NMcc5DKIkzyUHWck3Xht+yeCO54xJ6oXXuQ=";
hash= "sha256-l43xxCowSEBQjwg7hjpBwybFB12ESOep6hqdzSsD3YI=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -9,16 +9,16 @@
php.buildComposerProject2 (finalAttrs: {
pname = "phpunit";
version = "11.3.6";
version = "11.5.0";
src = fetchFromGitHub {
owner = "sebastianbergmann";
repo = "phpunit";
rev = finalAttrs.version;
hash = "sha256-bJdatRBrORR7KPcpRVIPYo2picQSfh8Pa0waeOZAH8Q=";
hash = "sha256-krlQu5zDxAjpM3zwaqty1p7ZJccnX8+Ru+AsXKSbcDY=";
};
vendorHash = "sha256-wRgYEwbvvEGCp7/Rat+WUkvv04JqFHssHXtJjeQZo3o=";
vendorHash = "sha256-kz8vSl9OO4kTSYlJa79fca5XVdhyUwVFCyvdJdbYLAQ=";
passthru = {
updateScript = nix-update-script { };
+126
View File
@@ -0,0 +1,126 @@
{
autoPatchelfHook,
lib,
fetchFromGitHub,
flutter324,
mpv,
libass,
ffmpeg,
libplacebo,
libunwind,
shaderc,
vulkan-loader,
lcms,
libdovi,
libdvdnav,
libdvdread,
mujs,
libbluray,
lua,
rubberband,
libuchardet,
zimg,
alsa-lib,
openal,
pipewire,
libpulseaudio,
libcaca,
libdrm,
mesa,
libXScrnSaver,
nv-codec-headers-11,
libXpresent,
libva,
libvdpau,
pkg-config,
makeDesktopItem,
wrapGAppsHook3,
copyDesktopItems,
xdg-user-dirs,
}:
flutter324.buildFlutterApplication rec {
pname = "pilipalax";
version = "1.0.22-beta.12+174";
src = fetchFromGitHub {
owner = "orz12";
repo = "PiliPalaX";
tag = version;
hash = "sha256-Qjqyg9y5R70hODGfVClS505dJwexL0BbUm6lXSHzhJs=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
desktopItems = [
(makeDesktopItem {
name = "pilipalax";
exec = "pilipala";
icon = "pilipalax";
genericName = "PiliPalaX";
desktopName = "PiliPalaX";
})
];
nativeBuildInputs = [
pkg-config
autoPatchelfHook
wrapGAppsHook3
copyDesktopItems
];
buildInputs = [
mpv
libass
ffmpeg
libplacebo
libunwind
shaderc
vulkan-loader
lcms
libdovi
libdvdnav
libdvdread
mujs
libbluray
lua
rubberband
libuchardet
zimg
alsa-lib
openal
pipewire
libpulseaudio
libcaca
libdrm
mesa
libXScrnSaver
libXpresent
nv-codec-headers-11
libva
libvdpau
];
gitHashes = {
ns_danmaku = "sha256-OHlKscybKSLS1Jd1S99rCjHMZfuJXjkQB8U2Tx5iWeA=";
auto_orientation = "sha256-0QOEW8+0PpBIELmzilZ8+z7ozNRxKgI0BzuBS8c1Fng=";
mime = "sha256-tqFOH85YTyxtp0LbknScx66CvN4SwYKU6YxYQMNeVs4=";
};
postInstall = ''
install -Dm644 ./assets/images/logo/logo_android_2.png $out/share/pixmaps/pilipalax.png
'';
extraWrapProgramArgs = ''
--prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib" \
--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]}
'';
meta = {
description = "Third-party BiliBili client developed with Flutter";
homepage = "https://github.com/orz12/PiliPalaX";
mainProgram = "pilipala";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
platforms = lib.platforms.linux;
};
}
File diff suppressed because it is too large Load Diff
+2 -3
View File
@@ -117,9 +117,8 @@ stdenv.mkDerivation rec {
'';
#--use-gl=egl for it to use hardware rendering it seems. Otherwise there are terrible framerates
postInstall = ''
substituteInPlace share/applications/Plasticity.desktop \
--replace-fail 'Exec=Plasticity %U' "Exec=Plasticity --use-gl=egl %U"
preFixup = ''
gappsWrapperArgs+=(--add-flags "--use-gl=egl")
'';
meta = with lib; {
+1
View File
@@ -94,6 +94,7 @@ python.pkgs.buildPythonApplication rec {
"redis"
"requests"
"sentry-sdk"
"ua-parser"
];
pythonRemoveDeps = [
+4 -4
View File
@@ -14,17 +14,17 @@
rustPlatform.buildRustPackage rec {
pname = "pylyzer";
version = "0.0.71";
version = "0.0.73";
src = fetchFromGitHub {
owner = "mtshiba";
repo = "pylyzer";
rev = "refs/tags/v${version}";
hash = "sha256-CzmfDOEh+3kUIl8dWYcxXH+6o+6zea/8hzZ09FaT8sw=";
tag = "v${version}";
hash = "sha256-rpF0xrk1PvgfJ0EOHWnCuSWfzLVzXErnKizbvFBP+pg=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-ZX3ql8GkgDLWFc3M1zIAu4QOYtZ/ryd1rrctkHpYmiU=";
cargoHash = "sha256-pU230ghfHsJEcADoZH8/yP+fYDv21FPlwA0//SvHJWY=";
nativeBuildInputs = [
git
@@ -0,0 +1,22 @@
From 7d62095b94f8df3891c984a1535026d2658bb177 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sat, 11 Apr 2020 16:59:35 -0400
Subject: [PATCH] meson: actually use systemd_systemunitdir
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 02e6c73..ba5ba1e 100644
--- a/meson.build
+++ b/meson.build
@@ -58,7 +58,7 @@ if policydir == ''
policydir = get_option('datadir') / 'polkit-1' / 'actions'
endif
-systemunitdir = ''
+systemunitdir = get_option('systemd_systemunitdir')
if systemunitdir == '' and systemd_dep.found()
systemunitdir = systemd_dep.get_pkgconfig_variable(
'systemdsystemunitdir',
@@ -0,0 +1,22 @@
From 98f70edd8f534c371cb4308b9720739c5178918d Mon Sep 17 00:00:00 2001
From: Felipe Sateler <fsateler@users.noreply.github.com>
Date: Sat, 11 Apr 2020 10:59:21 -0400
Subject: [PATCH] meson: fix librt find_library check
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 02e6c73..49da472 100644
--- a/meson.build
+++ b/meson.build
@@ -22,7 +22,7 @@ polkit_dep = dependency('polkit-gobject-1', required: false)
systemd_dep = dependency('systemd', required: false)
thread_dep = dependency('threads')
-librt_dep = cc.find_library('z')
+librt_dep = cc.find_library('rt')
cc.check_header('sched.h', dependencies: librt_dep)
cc.has_function('sched_setscheduler', dependencies: librt_dep)
+3 -17
View File
@@ -15,23 +15,9 @@ stdenv.mkDerivation rec {
};
patches = [
(fetchpatch {
name = "meson-actual-use-systemd_systemunitdir.patch";
url = "https://github.com/heftig/rtkit/pull/19/commits/7d62095b94f8df3891c984a1535026d2658bb177.patch";
sha256 = "17acv549zqcgh7sgprfagbf6drqsr0zdwvf1dsqda7wlqc2h9zn7";
})
(fetchpatch {
name = "meson-fix-librt-find_library-check.patch";
url = "https://github.com/heftig/rtkit/pull/18/commits/98f70edd8f534c371cb4308b9720739c5178918d.patch";
sha256 = "18mnjjsdjfr184nkzi01xyphpdngi31ry4bmkv9ysjxf9wilv4nl";
})
(fetchpatch {
name = "rtkit-daemon-dont-log-debug-messages-by-default.patch";
url = "https://github.com/heftig/rtkit/pull/33/commits/ad649ee491ed1a41537774ad11564a208e598a09.patch";
sha256 = "sha256-p+MdJVMv58rFd1uc1UFKtq83RquDSFZ3M6YfaBU12UU=";
})
./meson-actual-use-systemd_systemunitdir.patch
./meson-fix-librt-find_library-check.patch
./rtkit-daemon-dont-log-debug-messages-by-default.patch
];
nativeBuildInputs = [ meson ninja pkg-config unixtools.xxd ];
@@ -0,0 +1,73 @@
From 4880b9c67628a781bdb183dcdc69f12cb829817d Mon Sep 17 00:00:00 2001
From: Jean Delvare <jdelvare@suse.de>
Date: Sat, 15 Apr 2023 11:53:27 +0200
Subject: [PATCH] rtkit-daemon: Don't log debug messages by default
The rtkit-daemon service is a lot more verbose than other services
when it doesn't have anything to do. Stop logging the debug messages
by default to avoid flooding the system log.
This addresses issue #22.
---
rtkit-daemon.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/rtkit-daemon.c b/rtkit-daemon.c
index 17122fa..0c5d814 100644
--- a/rtkit-daemon.c
+++ b/rtkit-daemon.c
@@ -154,6 +154,9 @@ static bool canary_demote_unknown = FALSE;
/* Log to stderr? */
static bool log_stderr = FALSE;
+/* Also log debugging messages? */
+static bool log_debug = FALSE;
+
/* Scheduling policy to use */
static int sched_policy = SCHED_RR;
@@ -1876,6 +1879,7 @@ enum {
ARG_CANARY_DEMOTE_UNKNOWN,
ARG_CANARY_REFUSE_SEC,
ARG_STDERR,
+ ARG_DEBUG,
ARG_INTROSPECT
};
@@ -1905,6 +1909,7 @@ static const struct option long_options[] = {
{ "canary-demote-unknown", no_argument, 0, ARG_CANARY_DEMOTE_UNKNOWN },
{ "canary-refuse-sec", required_argument, 0, ARG_CANARY_REFUSE_SEC },
{ "stderr", no_argument, 0, ARG_STDERR },
+ { "debug", no_argument, 0, ARG_DEBUG },
{ "introspect", no_argument, 0, ARG_INTROSPECT },
{ NULL, 0, 0, 0}
};
@@ -1933,6 +1938,7 @@ static void show_help(const char *exe) {
" --version Show version\n\n"
"OPTIONS:\n"
" --stderr Log to STDERR in addition to syslog\n"
+ " --debug Also log debugging mssages\n"
" --user-name=USER Run daemon as user (%s)\n\n"
" --scheduling-policy=(RR|FIFO) Choose scheduling policy (%s)\n"
" --our-realtime-priority=[%i..%i] Realtime priority for the daemon (%u)\n"
@@ -2222,6 +2228,10 @@ static int parse_command_line(int argc, char *argv[], int *ret) {
log_stderr = TRUE;
break;
+ case ARG_DEBUG:
+ log_debug = TRUE;
+ break;
+
case ARG_INTROSPECT:
fputs(introspect_xml, stdout);
*ret = 0;
@@ -2251,6 +2261,9 @@ static int parse_command_line(int argc, char *argv[], int *ret) {
return -1;
}
+ if (!log_debug)
+ setlogmask(LOG_UPTO(LOG_INFO));
+
assert(our_realtime_priority >= (unsigned) sched_get_priority_min(sched_policy));
assert(our_realtime_priority <= (unsigned) sched_get_priority_max(sched_policy));
+21 -21
View File
@@ -1,40 +1,40 @@
{ lib
, python3
, fetchFromGitea
, gobject-introspection
, gtk3
, libhandy
, modemmanager
, wrapGAppsHook3
{
lib,
python3,
fetchFromGitea,
gobject-introspection,
libadwaita,
modemmanager,
wrapGAppsHook4,
}:
python3.pkgs.buildPythonApplication rec {
pname = "satellite";
version = "0.5.0";
version = "0.9.0";
pyproject = true;
src = fetchFromGitea {
domain ="codeberg.org";
domain = "codeberg.org";
owner = "tpikonen";
repo = "satellite";
rev = version;
hash = "sha256-61HCk0W07w0LybSVB4APvQX4PMSsqH9mKGzc+Rmno90=";
tag = version;
hash = "sha256-w0ZpH1joFoV7W7PH74//LGLUJQLCpAGcC6GlyTbdsTE=";
};
nativeBuildInputs = [
gobject-introspection
python3.pkgs.setuptools
wrapGAppsHook3
wrapGAppsHook4
];
build-system = with python3.pkgs; [ setuptools ];
buildInputs = [
gtk3
libhandy
libadwaita
modemmanager
];
propagatedBuildInputs = with python3.pkgs; [
dependencies = with python3.pkgs; [
gpxpy
pygobject3
pynmea2
@@ -42,16 +42,16 @@ python3.pkgs.buildPythonApplication rec {
strictDeps = true;
meta = with lib; {
meta = {
description = "Program for showing navigation satellite data";
longDescription = ''
Satellite is an adaptive GTK3 / libhandy application which displays global navigation satellite system (GNSS: GPS et al.) data obtained from ModemManager or gnss-share.
It can also save your position to a GPX-file.
'';
homepage = "https://codeberg.org/tpikonen/satellite";
license = licenses.gpl3Only;
license = lib.licenses.gpl3Only;
mainProgram = "satellite";
platforms = platforms.linux;
maintainers = with maintainers; [ Luflosi ];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ Luflosi ];
};
}
+2 -2
View File
@@ -7,11 +7,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "schemacrawler";
version = "16.22.2";
version = "16.22.3";
src = fetchzip {
url = "https://github.com/schemacrawler/SchemaCrawler/releases/download/v${finalAttrs.version}/schemacrawler-${finalAttrs.version}-bin.zip";
hash = "sha256-N08lKCTbpX4b05i4UcCEy6wycsiIJu5BRr7EZ3oZ1rA=";
hash = "sha256-bZXJvINVsDkGU+xR1tukK2qY93MAVIp2yGV5TZQoQsY=";
};
nativeBuildInputs = [ makeWrapper ];
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "sftpgo";
version = "2.6.2";
version = "2.6.3";
src = fetchFromGitHub {
owner = "drakkan";
repo = "sftpgo";
rev = "refs/tags/v${version}";
hash = "sha256-76P4njY/Wb9l4LG+sZwiwQVrvfXCtAELju30GLi7kBE=";
hash = "sha256-wkdc6nVJgpl1zizw3WJ3y3N4KzEW6WXSt5G/kOF2su8=";
};
vendorHash = "sha256-gBb+qpNFSFhCOYLxXkz3xmyx+3PvyOwLNqjT9zZQuc8=";
vendorHash = "sha256-VConM8zvpTTIQ5FIzI7yqDdhN0UPIAoDiudqU4k+5Vo=";
ldflags = [
"-s"
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sonivox";
version = "3.6.13";
version = "3.6.14";
src = fetchFromGitHub {
owner = "pedrolcl";
repo = pname;
rev = "v${version}";
hash = "sha256-QhXMmJbyqDxSJmT847Qbg1jbU3gLFsJ/FWVTy7MV2fE=";
hash = "sha256-4IlxXa9D65tGu8W5TXF9qoM/IEP9im0vbdde2SnZyX4=";
};
nativeBuildInputs = [ cmake ];
+3 -3
View File
@@ -13,16 +13,16 @@
buildGoModule rec {
pname = "step-ca";
version = "0.28.0";
version = "0.28.1";
src = fetchFromGitHub {
owner = "smallstep";
repo = "certificates";
rev = "refs/tags/v${version}";
hash = "sha256-FmhfsfRq6pxDhGDsNqY2IQczHk8NYEdxNaN2hfbhDYw=";
hash = "sha256-SFiGRmi8Bd0WEitvDvybfGMEw36gAVjtLrYbBpBAItU=";
};
vendorHash = "sha256-ZziypdQJaQHdL5/bcX6P5VHGVtbcl+twtlOg7DlmLZM=";
vendorHash = "sha256-t42TAjRuMo1AXq3IKbN2L7G50vJzi/2LmhPKrn5K1Io=";
ldflags = [
"-w"
+2 -2
View File
@@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "sudo-font";
version = "2.0.0";
version = "2.1";
src = fetchzip {
url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
hash = "sha256-WjhNWwAeb6f7tlvXMr6Q7mtNnaWbHSnBtXK6Ba3YOW4=";
hash = "sha256-ER+TpODf+Inqo+XWJRNOHumzGRL4Dms5N1E+BU7Tr94=";
};
installPhase = ''
+4 -4
View File
@@ -21,7 +21,7 @@ in
stdenv.mkDerivation {
pname = "tdlib";
version = "1.8.39";
version = "1.8.41";
src = fetchFromGitHub {
owner = "tdlib";
@@ -30,8 +30,8 @@ stdenv.mkDerivation {
# The tdlib authors do not set tags for minor versions, but
# external programs depending on tdlib constrain the minor
# version, hence we set a specific commit with a known version.
rev = "056963e48fa8d3f89556239c22d6ac843d3c8a5b";
hash = "sha256-pQ+uYnyBTH4L6RW3MqAttx7K3z8fyEbzRy8JSjbBL98=";
rev = "5b974c298d4ed551d3ad2c061ad7b8280d137c7e";
hash = "sha256-1TyGv2yMjX75+ccZSox/2m6SMmwEZAkShIhLfCeNmZg=";
};
buildInputs = [ gperf openssl readline zlib ];
@@ -56,6 +56,6 @@ stdenv.mkDerivation {
homepage = "https://core.telegram.org/tdlib/";
license = [ licenses.boost ];
platforms = platforms.unix;
maintainers = [ maintainers.vyorkin ];
maintainers = [ maintainers.vyorkin maintainers.vonfry ];
};
}
+4 -4
View File
@@ -15,17 +15,17 @@ rustPlatform.buildRustPackage rec {
pname = "tinymist";
# Please update the corresponding vscode extension when updating
# this derivation.
version = "0.12.8";
version = "0.12.10";
src = fetchFromGitHub {
owner = "Myriad-Dreamin";
repo = "tinymist";
rev = "refs/tags/v${version}";
hash = "sha256-yEvWPCFxdwc+fJOYRpxH1M5Fr+SedPm5fIE5tS1Fzhk=";
tag = "v${version}";
hash = "sha256-y+H1Q8TJa7XinVcsgZ9XCyeIUqQzvIAjlkgjia9rNso=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-k4X62J5SUDkg70acESbwlqQIF9mnQzNgA0pvHuxCwfs=";
cargoHash = "sha256-Fvd8PqT64HseoIIhsWittN6Trp2i4ravIc+ETwiY+xQ=";
nativeBuildInputs = [ pkg-config ];
+3 -3
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "trueseeing";
version = "2.2.4";
version = "2.2.5";
pyproject = true;
src = fetchFromGitHub {
owner = "alterakey";
repo = "trueseeing";
rev = "refs/tags/v${version}";
hash = "sha256-2KELqHa6lw9wdJBaC90vTZSjD7tfkr3K6yDNhqBQrR0=";
tag = "v${version}";
hash = "sha256-EDnE1BK/nl3nqkan4gmSsP7vqkuMNJ5+oN09ZnQzsy0=";
};
build-system = with python3.pkgs; [
+5 -5
View File
@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "typstyle";
version = "0.12.7";
version = "0.12.8";
src = fetchFromGitHub {
owner = "Enter-tainer";
repo = "typstyle";
rev = "refs/tags/v${version}";
hash = "sha256-sezpyp5Nev9i1pxCbFSQcm551VEHPmuP1ouCusNt7h8=";
tag = "v${version}";
hash = "sha256-JGRFZBPWG2pFur7K9JvQub5Fx4HvdyR+0hQFLI1tpo4=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-sm9U+Y21+m8Tmj5rhJ18iRSp1DACAisRUzNQpA+EG6g=";
cargoHash = "sha256-YmG2UO9dkdrEULVieSdzd+NgqFaYOHojnrjHUi2ME8Q=";
# Disabling tests requiring network access
checkFlags = [
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
};
meta = {
changelog = "https://github.com/Enter-tainer/typstyle/blob/${src.rev}/CHANGELOG.md";
changelog = "https://github.com/Enter-tainer/typstyle/blob/v${version}/CHANGELOG.md";
description = "Format your typst source code";
homepage = "https://github.com/Enter-tainer/typstyle";
license = lib.licenses.asl20;
+2 -2
View File
@@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation rec {
pname = "utm";
version = "4.6.2";
version = "4.6.3";
src = fetchurl {
url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg";
hash = "sha256-M4R0uSAX0MUTUCsPtdRMPESFET9AEQBtjvM7eTcRCas=";
hash = "sha256-LKSKbUx7rxNWBybEKA7ah/5esArs9TRFJexLlMlEqjs=";
};
nativeBuildInputs = [
+4 -4
View File
@@ -6,21 +6,21 @@
rustPlatform.buildRustPackage rec {
pname = "viddy";
version = "1.2.1";
version = "1.3.0";
src = fetchFromGitHub {
owner = "sachaos";
repo = "viddy";
rev = "v${version}";
hash = "sha256-lk992sI5kXo5Q8+rgBCKo/knV3/6uPs83Zj27JQcR6M=";
hash = "sha256-ZdDe0ymPkj0ZGiPLo1Y0qMDk2SsUcPsSStay+Tuf4p0=";
};
cargoHash = "sha256-9xXUlsRGKw0rvIYAr4pMDh6oD/ZjBYPaL0g6dCC5sCo=";
cargoHash = "sha256-d/wmjvbTITpcGCrMVZrkUcCFPDdas2CDDPlIqoVBl9k=";
# requires nightly features
env.RUSTC_BOOTSTRAP = 1;
env.VERGEN_BUILD_DATE = "2024-11-16"; # managed via the update script
env.VERGEN_BUILD_DATE = "2024-11-28"; # managed via the update script
env.VERGEN_GIT_DESCRIBE = "Nixpkgs";
passthru.updateScript.command = [ ./update.sh ];
+2 -2
View File
@@ -6,13 +6,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "vtm";
version = "0.9.99.35";
version = "0.9.99.55";
src = fetchFromGitHub {
owner = "netxs-group";
repo = "vtm";
rev = "v${finalAttrs.version}";
hash = "sha256-XPBInofzFNBMuJ0oP7ZooDuRukuXBWkEzdEq09MHykA=";
hash = "sha256-eF5z+w64uIY7k/g4Z2Ynuz8PGyxpy6cOFIyUtV2VkxU=";
};
nativeBuildInputs = [
+8 -7
View File
@@ -1,20 +1,21 @@
{ lib
, buildGoModule
, fetchFromGitHub
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "xsubfind3r";
version = "0.7.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "hueristiq";
repo = "xsubfind3r";
rev = "refs/tags/${version}";
hash = "sha256-tukynKPcIwDwpH0/SFyif6OGVZrmLVdXfhrFaaVd1d8=";
hash = "sha256-vmcuIa/ebCggLIALbfljJr92GE6veYEl3glm5gH9IZM=";
};
vendorHash = "sha256-0tX/s5a6PPQuEw3BTs6uW9c5OHqXryzIfDNPnQH5sS8=";
vendorHash = "sha256-PFeUO3LWNBF4KPSHBxRIczIMR002Xzydcy6FyjKP60A=";
ldflags = [
"-s"
@@ -23,10 +24,10 @@ buildGoModule rec {
meta = with lib; {
description = "CLI utility to find subdomains from curated passive online sources";
mainProgram = "xsubfind3r";
homepage = "https://github.com/hueristiq/xsubfind3r";
changelog = "https://github.com/hueristiq/xsubfind3r/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "xsubfind3r";
};
}
+4 -4
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "zizmor";
version = "0.7.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "woodruffw";
repo = "zizmor";
rev = "v${version}";
hash = "sha256-fZD8wXKS8bGh6P+KS2VM3pCuEDIEeNrK5iAykxzC/2Q=";
rev = "refs/tags/v${version}";
hash = "sha256-NNPY73G1DNxN6D/h73teldF8m1sObP0BufRRtlFI0xo=";
};
cargoHash = "sha256-n9VLK9i7YayiLD8pnEns19vbtlEktjFutYoKwpXgBCw=";
cargoHash = "sha256-I8kKSIRYLbSFGUNGXmBA1UfgJeMXZgBCKDTnqXkTJcE=";
buildInputs = [ openssl ];
@@ -97,7 +97,7 @@
},
{
"caskName": "comic-shanns-mono",
"description": "The very typeface you\u2019ve been trained to recognize since childhood",
"description": "The very typeface youve been trained to recognize since childhood",
"folderName": "ComicShannsMono",
"licenseId": "MIT",
"patchedName": "ComicShannsMono",
@@ -217,7 +217,7 @@
},
{
"caskName": "hack",
"description": "Dotted zero, short descenders, expands upon work done for Bitstream Vera &amp; DejaVu, legible at common sizes",
"description": "Dotted zero, short descenders, expands upon work done for Bitstream Vera & DejaVu, legible at common sizes",
"folderName": "Hack",
"licenseId": "Bitstream-Vera AND MIT",
"patchedName": "Hack",
@@ -281,7 +281,7 @@
},
{
"caskName": "intone-mono",
"description": "Expressive monospaced font family that\u2019s built with clarity, legibility, and the needs of developers in mind",
"description": "Expressive monospaced font family thats built with clarity, legibility, and the needs of developers in mind",
"folderName": "IntelOneMono",
"licenseId": "OFL-1.1-RFN",
"patchedName": "IntoneMono",
@@ -377,7 +377,7 @@
},
{
"caskName": "monoid",
"description": "Ligatures, distinguishable glyphs with short ascenders &amp; descenders, large operators &amp; punctuation",
"description": "Ligatures, distinguishable glyphs with short ascenders & descenders, large operators & punctuation",
"folderName": "Monoid",
"licenseId": "MIT OR OFL-1.1-no-RFN",
"patchedName": "Monoid",
@@ -513,7 +513,7 @@
},
{
"caskName": "ubuntu-mono",
"description": "Dotted zeros, used the `n`, `o`, `H` &amp; `O` Latin characters as a base for design",
"description": "Dotted zeros, used the `n`, `o`, `H` & `O` Latin characters as a base for design",
"folderName": "UbuntuMono",
"licenseId": "LicenseRef-UbuntuFont",
"patchedName": "UbuntuMono",
+3 -2
View File
@@ -3,6 +3,7 @@
import os
import urllib.request as ureq
import json
import html
if not all(
f"UPDATE_NIX_{v}" in os.environ
@@ -28,12 +29,12 @@ def fetchjson(url):
def storejson(path, obj):
with open(path, "w", encoding="utf-8") as f:
json.dump(obj, f, indent=2)
json.dump(obj, f, indent=2, ensure_ascii=False)
# Needed to satisfy EditorConfig's rules
f.write('\n')
def slicedict(d, ks):
return {k: d[k] for k in ks}
return {k: html.unescape(d[k]) for k in ks}
os.chdir(os.path.join(os.path.dirname(os.path.abspath(__file__)), "manifests"))
@@ -3,11 +3,11 @@
buildDunePackage rec {
pname = "cairo2";
version = "0.6.4";
version = "0.6.5";
src = fetchurl {
url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tbz";
sha256 = "sha256-QDVzUtcgXTpXNYVWQ4MMs0Xy24OP+dGaUyAYdg1GigU=";
sha256 = "sha256-JdxByUNtmrz1bKrZoQWUT/c0YEG4zGoqZUq4hItlc3I=";
};
minimalOCamlVersion = "4.02";
@@ -2,13 +2,13 @@
buildDunePackage rec {
pname = "sel";
version = "0.4.0";
version = "0.5.0";
minimalOCamlVersion = "4.07";
src = fetchurl {
url = "https://github.com/gares/sel/releases/download/v${version}/sel-${version}.tbz";
hash = "sha256-Sp0eSeKyFmMvOQrebqLKP+HbHQB0D0eAmEjDzxnFL1I=";
hash = "sha256-n4Z+Pe9fkHLnRzwCryxYNe165Q2Vds9+CduRbRJjqI0=";
};
buildInputs = [
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "django-stubs";
version = "5.1.0";
version = "5.1.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "django_stubs";
inherit version;
hash = "sha256-hhKMIotl5smoXl3FbrHG9BElkX2uDiHmz+zfGyfmMMU=";
hash = "sha256-Em01S73/SQbE6T5jYRl/b7+2Ixw99t74Wikdrm+fV3s=";
};
build-system = [ setuptools ];
@@ -29,14 +29,14 @@
buildPythonPackage rec {
pname = "dm-control";
version = "1.0.25";
version = "1.0.26";
pyproject = true;
src = fetchFromGitHub {
owner = "google-deepmind";
repo = "dm_control";
rev = "refs/tags/${version}";
hash = "sha256-eP85aKECvIu8nxPcSjc3PcCR9sWeTmaVJ7gBtVis0PY=";
tag = version;
hash = "sha256-CKBgBs0hLTvExkcGYtOZ+h+/Hh4HEgF9wT/jzRe0bV0=";
};
build-system = [
@@ -69,6 +69,12 @@ buildPythonPackage rec {
"hvplot/tests/testutil.py"
];
# need to set MPLBACKEND=agg for headless matplotlib for darwin
# https://github.com/matplotlib/matplotlib/issues/26292
preCheck = ''
export MPLBACKEND=agg
'';
pythonImportsCheck = [ "hvplot.pandas" ];
meta = {
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "knocki";
version = "0.4.1";
version = "0.4.2";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -24,8 +24,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "swan-solutions";
repo = "knocki-homeassistant";
rev = "refs/tags/v${version}";
hash = "sha256-Eh/ykTbR2NMZ9Mjgcc53OU3+2EsX6FWV93DmwCDvsRg=";
tag = "v${version}";
hash = "sha256-85w+fj00VW0miNt+xRMcU6szg/Z7QaeKLGw2BV7X0T4=";
};
postPatch = ''
@@ -4,6 +4,7 @@
buildPythonPackage,
defang,
dnspython,
eval-type-backport,
fetchFromGitHub,
playwrightcapture,
poetry-core,
@@ -11,13 +12,12 @@
pythonOlder,
redis,
requests,
sphinx,
ua-parser,
}:
buildPythonPackage rec {
pname = "lacuscore";
version = "1.12.5";
version = "1.12.6";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "ail-project";
repo = "LacusCore";
rev = "refs/tags/v${version}";
hash = "sha256-iozCgQ7VULQVlKaHmThxiFDZ2hly2yYMdIrXBFHFRfI=";
hash = "sha256-KiYpPgwMsIuIDUjQfw83ATiE5VI2XMaxGsnP5xEypqc=";
};
pythonRelaxDeps = [
@@ -37,18 +37,21 @@ buildPythonPackage rec {
build-system = [ poetry-core ];
dependencies = [
async-timeout
defang
dnspython
playwrightcapture
pydantic
redis
requests
sphinx
ua-parser
];
dependencies =
[
defang
dnspython
playwrightcapture
pydantic
redis
requests
ua-parser
]
++ playwrightcapture.optional-dependencies.recaptcha
++ redis.optional-dependencies.hiredis
++ ua-parser.optional-dependencies.regex
++ lib.optionals (pythonOlder "3.11") [ async-timeout ]
++ lib.optionals (pythonOlder "3.10") [ eval-type-backport ];
# Module has no tests
doCheck = false;
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "publicsuffixlist";
version = "1.0.2.20241205";
version = "1.0.2.20241207";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-1h6Zdt9TA/7os/Qe3kK8slJUTmErHhEyXlzW+OsB5Yg=";
hash = "sha256-K21wB0sAiG0wmOftX466jD0fPCQp647K+YNiWVSW3gQ=";
};
build-system = [ setuptools ];
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pylamarzocco";
version = "1.3.2";
version = "1.3.3";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "zweckj";
repo = "pylamarzocco";
rev = "refs/tags/v${version}";
hash = "sha256-ngTVm1tfs42pXGIQh8Hy8d7UY3D/skCZkbKr6AACYH0=";
hash = "sha256-sGjO1DuCYomYSWymtR4R49e1zwd0IM3WJwowoqvAApM=";
};
build-system = [ setuptools ];
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "python-linkplay";
version = "0.0.20";
version = "0.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "Velleman";
repo = "python-linkplay";
rev = "refs/tags/v${version}";
hash = "sha256-UIWubFLHtf43co/aYXh3rxkjLJ77E+Sgkx25UFC5vcg=";
tag = "v${version}";
hash = "sha256-upgiGAAopRoCYtWaGpYIpmb8nbSHr1iW7wGfBrC1yW4=";
};
build-system = [ setuptools ];
@@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "sarif-tools";
version = "3.0.2";
version = "3.0.4";
pyproject = true;
src = fetchFromGitHub {
owner = "microsoft";
repo = "sarif-tools";
rev = "refs/tags/v${version}";
hash = "sha256-VGdl4WBdIiCWPGfFxqcG4XlbLh0uiLQXdrhUa2OxaVY=";
tag = "v${version}";
hash = "sha256-Kb7kEntEdLOuIgBqeEolXirG8E1orzRz0vv8XK2oO3Y=";
};
disabled = pythonOlder "3.8";
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "total-connect-client";
version = "2024.5";
version = "2024.12";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -18,8 +18,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "craigjmidwinter";
repo = "total-connect-client";
rev = "refs/tags/${version}";
hash = "sha256-NGiI4gn59U7NiRYtB6UydxOu+lVtmbl8qF3nbAjiYwk=";
tag = version;
hash = "sha256-Pf1OFWbulrJeoWSJdI2QQ/ETd5TV6m8uhvCoKsx0bx8=";
};
build-system = [ setuptools ];
@@ -1,5 +1,6 @@
{
lib,
stdenv,
buildPythonPackage,
fetchFromGitHub,
@@ -68,6 +69,15 @@ buildPythonPackage rec {
hash = "sha256-TQQ+w+EH/KWLE7iaaAHGxfE74hCiLXcqlIr1TIBFGvo=";
};
# torch.distributed is not available on darwin
# Fix submitted upstream in https://github.com/huggingface/transformers/pull/35133
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace src/transformers/pytorch_utils.py \
--replace-fail \
'if is_torch_greater_or_equal("2.5"):' \
'if False:'
'';
build-system = [ setuptools ];
dependencies = [
@@ -0,0 +1,28 @@
{
buildPythonPackage,
hatchling,
pyyaml,
ua-parser,
versioningit,
}:
buildPythonPackage rec {
pname = "ua-parser-builtins";
inherit (ua-parser) version src;
pyproject = true;
sourceRoot = "${src.name}/ua-parser-builtins";
postPatch = ''
# break dependency cycle and don't use git to determine version
substituteInPlace pyproject.toml \
--replace-fail 'dependencies = ["ua-parser"]' "" \
--replace-fail 'dynamic = ["version"]' 'version = "${version}"'
'';
build-system = [
hatchling
pyyaml
versioningit
];
}
+865
View File
@@ -0,0 +1,865 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "aho-corasick"
version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
dependencies = [
"memchr",
]
[[package]]
name = "anes"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
[[package]]
name = "anstream"
version = "0.6.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
dependencies = [
"anstyle",
"anstyle-parse",
"anstyle-query",
"anstyle-wincon",
"colorchoice",
"is_terminal_polyfill",
"utf8parse",
]
[[package]]
name = "anstyle"
version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
[[package]]
name = "anstyle-parse"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
dependencies = [
"windows-sys 0.59.0",
]
[[package]]
name = "anstyle-wincon"
version = "3.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
dependencies = [
"anstyle",
"windows-sys 0.59.0",
]
[[package]]
name = "autocfg"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "bumpalo"
version = "3.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
[[package]]
name = "cast"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "ciborium"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
dependencies = [
"ciborium-io",
"ciborium-ll",
"serde",
]
[[package]]
name = "ciborium-io"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
[[package]]
name = "ciborium-ll"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
dependencies = [
"ciborium-io",
"half",
]
[[package]]
name = "clap"
version = "4.5.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
dependencies = [
"clap_builder",
"clap_derive",
]
[[package]]
name = "clap_builder"
version = "4.5.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
dependencies = [
"anstream",
"anstyle",
"clap_lex",
"strsim",
]
[[package]]
name = "clap_derive"
version = "4.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
dependencies = [
"heck",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "clap_lex"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
[[package]]
name = "colorchoice"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
[[package]]
name = "criterion"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
dependencies = [
"anes",
"cast",
"ciborium",
"clap",
"criterion-plot",
"is-terminal",
"itertools 0.10.5",
"num-traits",
"once_cell",
"oorandom",
"plotters",
"rayon",
"regex",
"serde",
"serde_derive",
"serde_json",
"tinytemplate",
"walkdir",
]
[[package]]
name = "criterion-plot"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
dependencies = [
"cast",
"itertools 0.10.5",
]
[[package]]
name = "crossbeam-deque"
version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
dependencies = [
"crossbeam-epoch",
"crossbeam-utils",
]
[[package]]
name = "crossbeam-epoch"
version = "0.9.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
dependencies = [
"crossbeam-utils",
]
[[package]]
name = "crossbeam-utils"
version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
[[package]]
name = "crunchy"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]]
name = "either"
version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
[[package]]
name = "equivalent"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "half"
version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
dependencies = [
"cfg-if",
"crunchy",
]
[[package]]
name = "hashbrown"
version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
[[package]]
name = "heck"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]]
name = "hermit-abi"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
[[package]]
name = "indexmap"
version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
dependencies = [
"equivalent",
"hashbrown",
]
[[package]]
name = "indoc"
version = "2.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
[[package]]
name = "is-terminal"
version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
dependencies = [
"hermit-abi",
"libc",
"windows-sys 0.52.0",
]
[[package]]
name = "is_terminal_polyfill"
version = "1.70.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
[[package]]
name = "itertools"
version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
dependencies = [
"either",
]
[[package]]
name = "itertools"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
dependencies = [
"either",
]
[[package]]
name = "itoa"
version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
[[package]]
name = "js-sys"
version = "0.3.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705"
dependencies = [
"once_cell",
"wasm-bindgen",
]
[[package]]
name = "libc"
version = "0.2.167"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc"
[[package]]
name = "log"
version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
[[package]]
name = "memchr"
version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "memoffset"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
dependencies = [
"autocfg",
]
[[package]]
name = "num-traits"
version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
dependencies = [
"autocfg",
]
[[package]]
name = "once_cell"
version = "1.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
[[package]]
name = "oorandom"
version = "11.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
[[package]]
name = "plotters"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
dependencies = [
"num-traits",
"plotters-backend",
"plotters-svg",
"wasm-bindgen",
"web-sys",
]
[[package]]
name = "plotters-backend"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
[[package]]
name = "plotters-svg"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
dependencies = [
"plotters-backend",
]
[[package]]
name = "portable-atomic"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
[[package]]
name = "proc-macro2"
version = "1.0.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
dependencies = [
"unicode-ident",
]
[[package]]
name = "pyo3"
version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f402062616ab18202ae8319da13fa4279883a2b8a9d9f83f20dbade813ce1884"
dependencies = [
"cfg-if",
"indoc",
"libc",
"memoffset",
"once_cell",
"portable-atomic",
"pyo3-build-config",
"pyo3-ffi",
"pyo3-macros",
"unindent",
]
[[package]]
name = "pyo3-build-config"
version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b14b5775b5ff446dd1056212d778012cbe8a0fbffd368029fd9e25b514479c38"
dependencies = [
"once_cell",
"target-lexicon",
]
[[package]]
name = "pyo3-ffi"
version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ab5bcf04a2cdcbb50c7d6105de943f543f9ed92af55818fd17b660390fc8636"
dependencies = [
"libc",
"pyo3-build-config",
]
[[package]]
name = "pyo3-macros"
version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fd24d897903a9e6d80b968368a34e1525aeb719d568dba8b3d4bfa5dc67d453"
dependencies = [
"proc-macro2",
"pyo3-macros-backend",
"quote",
"syn",
]
[[package]]
name = "pyo3-macros-backend"
version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36c011a03ba1e50152b4b394b479826cad97e7a21eb52df179cd91ac411cbfbe"
dependencies = [
"heck",
"proc-macro2",
"pyo3-build-config",
"quote",
"syn",
]
[[package]]
name = "quote"
version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2",
]
[[package]]
name = "rayon"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
dependencies = [
"either",
"rayon-core",
]
[[package]]
name = "rayon-core"
version = "1.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
dependencies = [
"crossbeam-deque",
"crossbeam-utils",
]
[[package]]
name = "regex"
version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
dependencies = [
"aho-corasick",
"memchr",
"regex-automata",
"regex-syntax",
]
[[package]]
name = "regex-automata"
version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
dependencies = [
"aho-corasick",
"memchr",
"regex-syntax",
]
[[package]]
name = "regex-filtered"
version = "0.2.0"
dependencies = [
"aho-corasick",
"clap",
"criterion",
"itertools 0.13.0",
"regex",
"regex-syntax",
]
[[package]]
name = "regex-syntax"
version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "ryu"
version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
[[package]]
name = "same-file"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
dependencies = [
"winapi-util",
]
[[package]]
name = "serde"
version = "1.0.215"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.215"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "serde_json"
version = "1.0.133"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
dependencies = [
"itoa",
"memchr",
"ryu",
"serde",
]
[[package]]
name = "serde_yaml"
version = "0.9.34+deprecated"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
dependencies = [
"indexmap",
"itoa",
"ryu",
"serde",
"unsafe-libyaml",
]
[[package]]
name = "strsim"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
name = "syn"
version = "2.0.90"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "target-lexicon"
version = "0.12.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "tinytemplate"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
dependencies = [
"serde",
"serde_json",
]
[[package]]
name = "ua-parser"
version = "0.2.0"
dependencies = [
"clap",
"regex",
"regex-filtered",
"serde",
"serde_json",
"serde_yaml",
]
[[package]]
name = "ua-parser-rs"
version = "0.1.2"
dependencies = [
"pyo3",
"ua-parser",
]
[[package]]
name = "unicode-ident"
version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
[[package]]
name = "unindent"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
[[package]]
name = "unsafe-libyaml"
version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
[[package]]
name = "utf8parse"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "walkdir"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
dependencies = [
"same-file",
"winapi-util",
]
[[package]]
name = "wasm-bindgen"
version = "0.2.97"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c"
dependencies = [
"cfg-if",
"once_cell",
"wasm-bindgen-macro",
]
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.97"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
"syn",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.97"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
]
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.97"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d"
dependencies = [
"proc-macro2",
"quote",
"syn",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.97"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49"
[[package]]
name = "web-sys"
version = "0.3.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c"
dependencies = [
"js-sys",
"wasm-bindgen",
]
[[package]]
name = "winapi-util"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
dependencies = [
"windows-sys 0.59.0",
]
[[package]]
name = "windows-sys"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
"windows-targets",
]
[[package]]
name = "windows-sys"
version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
dependencies = [
"windows-targets",
]
[[package]]
name = "windows-targets"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_gnullvm",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
"windows_x86_64_msvc",
]
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_i686_gnu"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
[[package]]
name = "windows_i686_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_x86_64_gnu"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
@@ -0,0 +1,42 @@
{
buildPythonPackage,
fetchFromGitHub,
lib,
rustPlatform,
}:
buildPythonPackage rec {
pname = "ua-parser-rs";
version = "0.1.2";
src = fetchFromGitHub {
owner = "ua-parser";
repo = "uap-rust";
rev = "refs/tags/ua-parser-rs-${version}";
hash = "sha256-+qAYNGZFOkQyHhzqZZGrxgKHrPTWolO/4KKuppIMSRE=";
fetchSubmodules = true;
};
postPatch = ''
ln -s ${./Cargo.lock} Cargo.lock
'';
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
};
buildAndTestSubdir = "ua-parser-py";
nativeBuildInputs = [
rustPlatform.cargoSetupHook
rustPlatform.maturinBuildHook
];
meta = {
description = "Native accelerator for ua-parser";
homepage = "https://github.com/ua-parser/uap-rust/tree/main/ua-parser-py";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ dotlambda ];
mainProgram = "ua-parser-rs";
};
}
@@ -2,42 +2,53 @@
lib,
buildPythonPackage,
fetchFromGitHub,
google-re2,
pyyaml,
pytestCheckHook,
setuptools,
setuptools-scm,
ua-parser-builtins,
ua-parser-rs,
}:
buildPythonPackage rec {
pname = "ua-parser";
version = "0.18.0";
format = "setuptools";
version = "1.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "ua-parser";
repo = "uap-python";
rev = version;
rev = "refs/tags/${version}";
fetchSubmodules = true;
hash = "sha256-GiuGPnyYL0HQ/J2OpDTD1/panZCuzKtD3mKW5op5lXA=";
hash = "sha256-byKtxmuYIsEYyuUmfnbLhfe7EKj0k7QGkK5HewiTiy4=";
};
patches = [ ./dont-fetch-submodule.patch ];
build-system = [
pyyaml
setuptools
setuptools-scm
];
nativeBuildInputs = [ pyyaml ];
dependencies = [
ua-parser-builtins
];
optional-dependencies = {
yaml = [ pyyaml ];
re2 = [ google-re2 ];
regex = [ ua-parser-rs ];
};
nativeCheckInputs = [ pytestCheckHook ];
preCheck = ''
# import from $out
rm ua_parser/__init__.py
'';
pythonImportsCheck = [ "ua_parser" ];
meta = with lib; {
meta = {
changelog = "https://github.com/ua-parser/uap-python/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
description = "Python implementation of the UA Parser";
homepage = "https://github.com/ua-parser/uap-python";
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ dotlambda ];
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ dotlambda ];
};
}

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