Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2025-01-12 00:16:40 +00:00
committed by GitHub
98 changed files with 3807 additions and 2616 deletions
+13
View File
@@ -7024,6 +7024,13 @@
githubId = 2544204;
name = "Erik Skytthe";
};
esrh = {
name = "Eshan Ramesh";
email = "esrh@esrh.me";
github = "eshrh";
githubId = 16175276;
keys = [ { fingerprint = "E4CE B0F0 B2EC 09A3 9678 F294 CC7A 7E3C 6CF3 1343"; } ];
};
ethancedwards8 = {
email = "ethan@ethancedwards.com";
github = "ethancedwards8";
@@ -7926,6 +7933,12 @@
githubId = 248148;
name = "Sigrid Solveig Haflínudóttir";
};
ftsimas = {
name = "Filippos Tsimas";
email = "filippos.tsimas@outlook.com";
github = "ftsimas";
githubId = 47324723;
};
fuerbringer = {
email = "severin@fuerbringer.info";
github = "fuerbringer";
@@ -3113,6 +3113,42 @@ final: prev:
meta.homepage = "https://github.com/Shougo/ddc-filter-sorter_rank/";
};
ddc-fuzzy = buildVimPlugin {
pname = "ddc-fuzzy";
version = "2025-01-07";
src = fetchFromGitHub {
owner = "tani";
repo = "ddc-fuzzy";
rev = "963f18c14bdb19f3925af0f7f775725be4438f3b";
sha256 = "0gwxicn3bpci0q0yb802wf2fzbmxggk6d74vgqr62fvlxhwamggk";
};
meta.homepage = "https://github.com/tani/ddc-fuzzy/";
};
ddc-source-around = buildVimPlugin {
pname = "ddc-source-around";
version = "2024-12-28";
src = fetchFromGitHub {
owner = "Shougo";
repo = "ddc-source-around";
rev = "32d54dc188b50bcd64f7b410c04aa4ec567ae47f";
sha256 = "0a18prpd7znn3gj7g16yldq8ya8iyph2lfxx7yhm11m3rjx286m7";
};
meta.homepage = "https://github.com/Shougo/ddc-source-around/";
};
ddc-source-file = buildVimPlugin {
pname = "ddc-source-file";
version = "2024-09-24";
src = fetchFromGitHub {
owner = "LumaKernel";
repo = "ddc-source-file";
rev = "34b362d45957183b4ec99d618a19a5f5f517c365";
sha256 = "070k693x8di1safyrb1dbki626akmnpi25wzvjnjd4vvvknzwbj8";
};
meta.homepage = "https://github.com/LumaKernel/ddc-source-file/";
};
ddc-source-lsp = buildVimPlugin {
pname = "ddc-source-lsp";
version = "2025-01-04";
@@ -7203,6 +7239,18 @@ final: prev:
meta.homepage = "https://github.com/echasnovski/mini.sessions/";
};
mini-snippets = buildVimPlugin {
pname = "mini.snippets";
version = "2025-01-11";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.snippets";
rev = "72920f62e3dd1330720e94e8f5d42592f3a1ecf8";
sha256 = "0lyyv95zzwa6kn3gz7sah6v7jqj635c45n88my2sx8wknadkv30y";
};
meta.homepage = "https://github.com/echasnovski/mini.snippets/";
};
mini-splitjoin = buildVimPlugin {
pname = "mini.splitjoin";
version = "2024-07-01";
File diff suppressed because it is too large Load Diff
@@ -257,6 +257,9 @@ https://github.com/rizzatti/dash.vim/,HEAD,
https://github.com/nvimdev/dashboard-nvim/,,
https://github.com/Shougo/ddc-filter-matcher_head/,HEAD,
https://github.com/Shougo/ddc-filter-sorter_rank/,HEAD,
https://github.com/tani/ddc-fuzzy/,HEAD,
https://github.com/Shougo/ddc-source-around/,HEAD,
https://github.com/LumaKernel/ddc-source-file/,HEAD,
https://github.com/Shougo/ddc-source-lsp/,HEAD,
https://github.com/Shougo/ddc-ui-native/,HEAD,
https://github.com/Shougo/ddc-ui-pum/,HEAD,
@@ -597,6 +600,7 @@ https://github.com/echasnovski/mini.operators/,HEAD,
https://github.com/echasnovski/mini.pairs/,HEAD,
https://github.com/echasnovski/mini.pick/,HEAD,
https://github.com/echasnovski/mini.sessions/,HEAD,
https://github.com/echasnovski/mini.snippets/,HEAD,
https://github.com/echasnovski/mini.splitjoin/,HEAD,
https://github.com/echasnovski/mini.starter/,HEAD,
https://github.com/echasnovski/mini.statusline/,HEAD,
@@ -6,8 +6,7 @@
, cmake
, pkg-config
, wrapGAppsHook3
, boost
, boost183
, boost186
, cereal
, cgal
, curl
@@ -72,14 +71,6 @@ let
patches = [
];
# Build requires at least Boost v1.83. If the mainline package satisfies
# that, just use the mainline package, otherwise use an explicitly versioned
# package.
boost183OrBetter =
if lib.versionAtLeast boost.version "1.83"
then boost
else boost183;
in
stdenv.mkDerivation (finalAttrs: {
pname = "prusa-slicer";
@@ -111,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
binutils
boost183OrBetter
boost186 # does not build with 1.87, see https://github.com/prusa3d/PrusaSlicer/issues/13799
cereal
cgal
curl
@@ -9,11 +9,11 @@
buildMozillaMach rec {
pname = "firefox-beta";
version = "133.0b9";
version = "135.0b3";
applicationName = "Mozilla Firefox Beta";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "2c950f04730666387a84b25cfe3afbd93b53988608345a062c8b538619e895c274049fe557a604e86f7ea5744ae2a50dc9c448a20664f0d7308949422a453ae9";
sha512 = "2d6f04b929257532ac3883f6c16f063718c66acaf0c131d1f449f4a0de947d061ca772a3388f02b9122649ba27474500db287a9b4b7a0cc53a1639805c7f3064";
};
meta = {
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "graphia";
version = "5.1";
version = "5.2";
src = fetchFromGitHub {
owner = "graphia-app";
repo = "graphia";
rev = version;
sha256 = "sha256-gAJwAz3iKa4auRtsrPS9dz3ieiB09FeL6VN5Psq1i8Y=";
sha256 = "sha256-tS5oqpwpqvWGu67s8OuA4uQR3Zb5VzHTY/GnfVQki6k=";
};
nativeBuildInputs = [
+4
View File
@@ -43,6 +43,10 @@ stdenv.mkDerivation rec {
"--with-c-client-target=slx"
];
# Fixes https://github.com/NixOS/nixpkgs/issues/372699
# See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1074804
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-incompatible-pointer-types" ];
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
meta = with lib; {
@@ -1,9 +1,9 @@
{
lib,
stdenv,
rustPlatform,
darwin,
fetchFromGitHub,
Security,
rustPlatform,
}:
rustPlatform.buildRustPackage rec {
@@ -15,18 +15,19 @@ rustPlatform.buildRustPackage rec {
owner = "fpco";
repo = "amber";
rev = "v${version}";
sha256 = "sha256-nduSnDhLvHpZD7Y1zeZC4nNL7P1qfLWc0yMpsdqrKHM=";
hash = "sha256-nduSnDhLvHpZD7Y1zeZC4nNL7P1qfLWc0yMpsdqrKHM=";
};
cargoHash = "sha256-DxTsbJ51TUMvc/NvsUYhRG9OxxEGrWfEPYCOYaG9PXo=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
meta = with lib; {
meta = {
description = "Manage secret values in-repo via public key cryptography";
homepage = "https://github.com/fpco/amber";
license = licenses.mit;
maintainers = with maintainers; [ psibi ];
changelog = "https://github.com/fpco/amber/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ psibi ];
mainProgram = "amber";
};
}
@@ -1,33 +1,30 @@
{
lib,
buildPythonApplication,
fetchPypi,
fetchFromGitHub,
gitUpdater,
python3,
}:
python3.pkgs.buildPythonApplication rec {
pname = "badchars";
version = "0.4.0";
version = "0.5.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-4neV1S5gwQ03kEXEyZezNSj+PVXJyA5MO4lyZzGKE/c=";
src = fetchFromGitHub {
owner = "cytopia";
repo = "badchars";
tag = version;
hash = "sha256-VWe3k34snEviBK7VBCDTWAu3YjZfh1gXHXjlnFlefJw=";
};
postPatch = ''
substituteInPlace setup.py \
--replace-fail "argparse" ""
'';
build-system = with python3.pkgs; [
setuptools
];
build-system = with python3.pkgs; [ setuptools ];
# no tests are available and it can't be imported (it's only a script, not a module)
doCheck = false;
meta = with lib; {
passthru.updateScript = gitUpdater { };
meta = {
description = "HEX badchar generator for different programming languages";
longDescription = ''
A HEX bad char generator to instruct encoders such as shikata-ga-nai to
@@ -35,8 +32,8 @@ python3.pkgs.buildPythonApplication rec {
'';
homepage = "https://github.com/cytopia/badchars";
changelog = "https://github.com/cytopia/badchars/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "badchars";
};
}
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
pkg-config,
libuuid,
libsodium,
@@ -37,6 +38,14 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-w55Fs1RZ4c55vTvb3jArPcmBLij1nuLi2MUHMMXPhng=";
};
patches = [
# backport patch to fix build with latest liburcu
(fetchpatch {
url = "https://github.com/koverstreet/bcachefs-tools/commit/634c812a1ed05de8e3d1dc146eed95b942e1e38d.patch";
hash = "sha256-AL+nflQHKIwzI35NXZG2rniNjUfgLmv3osHHdpB1cGs=";
})
];
nativeBuildInputs = [
pkg-config
cargo
+9 -3
View File
@@ -58,9 +58,15 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
# fix static build
postPatch = ''
substituteInPlace makefile.in --replace-fail "ar rc" '$(AR) rc'
'';
postPatch =
''
substituteInPlace makefile.in --replace-fail "ar rc" '$(AR) rc'
''
# Racy/flaky tests that sometimes spontaneously combust on darwin.
+ lib.optionalString (stdenv.hostPlatform.isDarwin && (lib.versionAtLeast version "2.1.1")) ''
substituteInPlace test/api/run.sh --replace-fail 'run parcompwrite' ""
substituteInPlace test/api/run.sh --replace-fail 'run example_tracer' ""
'';
# the configure script is not generated by autotools and does not accept the
# arguments that the default configurePhase passes like --prefix and --libdir
+3 -3
View File
@@ -13,17 +13,17 @@
rustPlatform.buildRustPackage rec {
pname = "tauri";
version = "2.2.0";
version = "2.2.1";
src = fetchFromGitHub {
owner = "tauri-apps";
repo = "tauri";
tag = "tauri-v${version}";
hash = "sha256-lkTkRNJIdGMJCkqxpBAM4r3JzO55nCjl2l+1xjsCtRI=";
hash = "sha256-v9o+oqs6OZWhHv+PExo9juzTt7W80YOTkynzwvxpHGM=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-fZ3SGF+iIeu9TIyJvKm8vAo2PUT1VREyTKUpcqyC5vo=";
cargoHash = "sha256-SmM3G0WpNcb+B5uo+2Nczg/Htx5eY5JnxF0Tkwz8k0M=";
nativeBuildInputs = [ pkg-config ];
@@ -0,0 +1,41 @@
{
lib,
rustPlatform,
fetchFromGitHub,
versionCheckHook,
nix-update-script,
cosmic-comp,
}:
let
version = "1.1.0";
in
rustPlatform.buildRustPackage {
pname = "cosmic-ext-ctl";
inherit version;
src = fetchFromGitHub {
owner = "cosmic-utils";
repo = "cosmic-ctl";
tag = "v${version}";
hash = "sha256-dcUzrJcwJpzbYPuqdHgm43NYbaowsFmFP4sS0cfzNAg=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-EReo2hkBaIO1YOBx4D9rQSXlx+3NK5VQtj59jfZZI/0=";
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgram = "${placeholder "out"}/bin/cosmic-ctl";
passthru.updateScript = nix-update-script { };
meta = {
description = "CLI for COSMIC Desktop configuration management";
changelog = "https://github.com/cosmic-utils/cosmic-ctl/releases/tag/v${version}";
homepage = "https://github.com/cosmic-utils/cosmic-ctl";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ HeitorAugustoLN ];
mainProgram = "cosmic-ctl";
inherit (cosmic-comp.meta) platforms;
};
}
+2 -2
View File
@@ -7,7 +7,7 @@
buildGoModule rec {
pname = "dnscrypt-proxy";
version = "2.1.5";
version = "2.1.7";
vendorHash = null;
@@ -17,7 +17,7 @@ buildGoModule rec {
owner = "DNSCrypt";
repo = "dnscrypt-proxy";
rev = version;
sha256 = "sha256-A9Cu4wcJxrptd9CpgXw4eyMX2nmNAogYBRDeeAjpEZY=";
sha256 = "sha256-s0ooICual87+y/DMppuTQtNzZRRCg/42SQImDrPVRng=";
};
passthru.tests = { inherit (nixosTests) dnscrypt-proxy2; };
+2 -2
View File
@@ -17,14 +17,14 @@ let
in
flutter324.buildFlutterApplication rec {
pname = "ente-auth";
version = "4.2.3";
version = "4.2.4";
src = fetchFromGitHub {
owner = "ente-io";
repo = "ente";
sparseCheckout = [ "auth" ];
tag = "auth-v${version}";
hash = "sha256-G+uSEEJUD8mq8d7FJRKSHjpcFsILZJmtpgBmtpQYP58=";
hash = "sha256-bjFCmMPD983iY6X3lFSeQXmVArSMw80yAW5D6Viwofs=";
};
sourceRoot = "${src.name}/auth";
+12 -2
View File
@@ -561,11 +561,11 @@
"dependency": "direct main",
"description": {
"name": "file_picker",
"sha256": "167bb619cdddaa10ef2907609feb8a79c16dfa479d3afaf960f8e223f754bf12",
"sha256": "c904b4ab56d53385563c7c39d8e9fa9af086f91495dfc48717ad84a42c3cf204",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.1.2"
"version": "8.1.7"
},
"file_saver": {
"dependency": "direct main",
@@ -1623,6 +1623,16 @@
"source": "hosted",
"version": "4.1.0"
},
"scan": {
"dependency": "direct main",
"description": {
"name": "scan",
"sha256": "b343ec36f863a88d41eb4c174b810c055c6bd1f1822b2188ab31aab684fb7cdb",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.6.0"
},
"screen_retriever": {
"dependency": "transitive",
"description": {
+4 -17
View File
@@ -5,8 +5,6 @@
cups,
fetchpatch,
dos2unix,
automake115x,
autoconf,
}:
let
@@ -29,17 +27,10 @@ stdenv.mkDerivation {
];
sha256 = "sha256-hVbX4OXPe4y37Szju3uVdXlVdjX4DFSN/A2Emz3eCcQ=";
};
# DOS Line Endings in /lib directory and UNIX Line endings in /src directory.
# So convert everything to UNIX style line endings.
# Since the files are modified, autoconf and automake is required
postUnpack = ''
dir=''${src%-*}
cd ''${dir#*-}
local f
for f in $(find ./ -type f || die); do
${dos2unix}/bin/dos2unix $f
done
cd ..
# the patches above are expecting unix line endings, but one of the files
# being patched has dos line endings in the source tarball
prePatch = ''
${dos2unix}/bin/dos2unix lib/epson-escpr-api.h
'';
patches = [
@@ -59,10 +50,6 @@ stdenv.mkDerivation {
"-p1"
];
buildInputs = [ cups ];
nativeBuildInputs = [
automake115x
autoconf
];
meta = with lib; {
homepage = "http://download.ebz.epson.net/dsc/search/01/search/";
+3 -3
View File
@@ -7,7 +7,7 @@
let
pname = "erigon";
version = "2.60.10";
version = "2.61.0";
in
buildGoModule {
inherit pname version;
@@ -16,11 +16,11 @@ buildGoModule {
owner = "ledgerwatch";
repo = pname;
rev = "v${version}";
hash = "sha256-14s3Dfo1sqQlNZSdjByUCAsYzbv6xjPcCsBxEmoY3pU=";
hash = "sha256-B9FDGBx5ac1v0PqVK/2LhDH2seRthZxtaGu3G9flo0A=";
fetchSubmodules = true;
};
vendorHash = "sha256-I4rdz8dswA9/w4S9BNS43VTD9iDsH+cNK2haWowhBO4=";
vendorHash = "sha256-bGVHIrICYWyHPgWWgEAIT+J/IIPjcWqTHeuqbT6lung=";
proxyVendor = true;
# Build errors in mdbx when format hardening is enabled:
+9 -2
View File
@@ -25,7 +25,11 @@ stdenv.mkDerivation rec {
sha256 = "sha256-m2RaZMYT6JGwa3sOUVsBIzCdZetTbiygaInQWoJ4m1o=";
};
nativeBuildInputs = [ autoreconfHook ];
nativeBuildInputs = [
autoreconfHook
lua
swig
];
buildInputs = [
wxGTK32
boost
@@ -35,7 +39,10 @@ stdenv.mkDerivation rec {
xylib
readline
gnuplot
swig
];
configureFlags = [
"--with-wx-config=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}"
];
env.NIX_CFLAGS_COMPILE = toString [
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "hishtory";
version = "0.321";
version = "0.324";
src = fetchFromGitHub {
owner = "ddworken";
repo = pname;
rev = "v${version}";
hash = "sha256-97+36uM6c9yDOnTaBnF3X0jDF6n+vJAnR4havXlXpF4=";
hash = "sha256-CcRRMHUvLVrJ0fWsAH+SUxcSB2koOShlqBnnhKtrCts=";
};
vendorHash = "sha256-xDdK91/lQRpY7i13jnLwX2eVMb5mibHchnz7ASNzXmM=";
vendorHash = "sha256-A975ensuezz75I4KrFcl8wi9HjZqlfEHeJVAyA69V9k=";
ldflags = [ "-X github.com/ddworken/hishtory/client/lib.Version=${version}" ];
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hyprutils";
version = "0.3.2";
version = "0.3.3";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprutils";
tag = "v${finalAttrs.version}";
hash = "sha256-7D5j2sh3Miw2CRdmx8ftepb342pl36kDFJy+3aVfDVc=";
hash = "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "i2pd";
version = "2.54.0";
version = "2.55.0";
src = fetchFromGitHub {
owner = "PurpleI2P";
repo = pname;
rev = version;
sha256 = "sha256-neoIDZNBBDq3tqz1ET3/CS/zb0Lret9niyuU7iWoNIE=";
sha256 = "sha256-mdjt2+h+IWjHBRDUpx85ku6s6gKHjxUBuhv+gJK7QhU=";
};
buildInputs = [
+35
View File
@@ -0,0 +1,35 @@
{
lib,
fetchFromGitHub,
rustPlatform,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "inori";
version = "0.2.2";
src = fetchFromGitHub {
owner = "eshrh";
repo = "inori";
tag = "v${version}";
hash = "sha256-yd1kIlPepVbeTEFzjxTDWEh8o4m6dh/ya9GitqYHHT8=";
};
cargoHash = "sha256-mmzJXIl0wfcyEaYc2wZfA22ZEbTQXG5LVqxEQ4+x76M=";
passthru.updateScript = nix-update-script { };
meta = {
description = "Client for the Music Player Daemon (MPD)";
homepage = "https://github.com/eshrh/inori";
changelog = "https://github.com/eshrh/inori/releases/tag/${src.tag}";
license = lib.licenses.gpl3Only;
platforms = lib.platforms.unix ++ lib.platforms.windows;
mainProgram = "inori";
maintainers = with lib.maintainers; [
stephen-huan
esrh
];
};
}
+94
View File
@@ -0,0 +1,94 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
nasm,
pkg-config,
copyDesktopItems,
alsa-lib,
glew,
glib,
gtk3,
libmad,
libogg,
libpulseaudio,
libusb-compat-0_1,
libvorbis,
libXtst,
udev,
makeWrapper,
makeDesktopItem,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "itgmania";
version = "0.9.0";
src = fetchFromGitHub {
owner = "itgmania";
repo = "itgmania";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-SAEYkAPNUjGNfNnHfwyOj65i2SpEX0ct/fREob5/6fI=";
};
nativeBuildInputs = [
cmake
nasm
pkg-config
makeWrapper
copyDesktopItems
];
buildInputs = [
alsa-lib
glew
glib
gtk3
libmad
libogg
libpulseaudio
libusb-compat-0_1
libvorbis
libXtst
udev
];
cmakeFlags = lib.optionals (!stdenv.hostPlatform.isx86) [ "-DWITH_MINIMAID=off" ];
postInstall = ''
makeWrapper $out/itgmania/itgmania $out/bin/itgmania \
--chdir $out/itgmania
mkdir -p $out/share/icons/hicolor/scalable/apps/
ln -s $out/itgmania/Data/logo.svg $out/share/icons/hicolor/scalable/apps/itgmania.svg
'';
desktopItems = [
(makeDesktopItem {
name = "itgmania";
desktopName = "ITGmania";
genericName = "Rhythm and dance game";
tryExec = "itgmania";
exec = "itgmania";
terminal = false;
icon = "itgmania";
type = "Application";
comment = "A cross-platform rhythm video game.";
categories = [
"Game"
"ArcadeGame"
];
})
];
meta = {
homepage = "https://www.itgmania.com/";
description = "Fork of StepMania 5.1, improved for the post-ITG community";
platforms = lib.platforms.linux;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ftsimas ];
mainProgram = "itgmania";
};
})
+2 -2
View File
@@ -11,7 +11,7 @@
# runtime
withMysql ? stdenv.buildPlatform.system == stdenv.hostPlatform.system,
withPostgres ? stdenv.buildPlatform.system == stdenv.hostPlatform.system,
boost,
boost186,
libmysqlclient,
log4cplus,
openssl,
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
sphinxRoot = "doc/sphinx";
buildInputs = [
boost
boost186 # does not build with 1.87 yet, see https://gitlab.isc.org/isc-projects/kea/-/merge_requests/2523
libmysqlclient
log4cplus
openssl
+2 -2
View File
@@ -8,13 +8,13 @@
# Regression in go1.23 see https://github.com/jesseduffield/lazygit/issues/4002
buildGo122Module rec {
pname = "lazygit";
version = "0.44.1";
version = "0.45.0";
src = fetchFromGitHub {
owner = "jesseduffield";
repo = pname;
tag = "v${version}";
hash = "sha256-BP5PMgRq8LHLuUYDrWaX1PgfT9VEhj3xeLE2aDMAPF0=";
hash = "sha256-hGJDsx0klccbueP7h5HtcYioFLL4gf3W3lbOHIA36FA=";
};
vendorHash = null;
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lib60870";
version = "2.3.2";
version = "2.3.3";
src = fetchFromGitHub {
owner = "mz-automation";
repo = "lib60870";
rev = "v${finalAttrs.version}";
hash = "sha256-9o+gWQbpCJb+UZzPNmzGqpWD0QbGjg41is/f1POUEQs=";
hash = "sha256-me+EYS2XDITRdI4okMj/ZqeewUS2bKj8Opecu6/1+Cs=";
};
sourceRoot = "${finalAttrs.src.name}/lib60870-C";
+17 -25
View File
@@ -1,32 +1,24 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
fetchpatch,
pkg-config,
libiconv,
darwin,
testers,
llm-ls,
versionCheckHook,
nix-update-script,
}:
let
rustPlatform.buildRustPackage rec {
pname = "llm-ls";
version = "0.5.3";
in
rustPlatform.buildRustPackage {
inherit pname version;
src = fetchFromGitHub {
owner = "huggingface";
repo = "llm-ls";
rev = version;
tag = version;
hash = "sha256-ICMM2kqrHFlKt2/jmE4gum1Eb32afTJkT3IRoqcjJJ8=";
};
cargoHash = "sha256-m/w9aJZCCh1rgnHlkGQD/pUDoWn2/WRVt5X4pFx9nC4=";
cargoPatches = [
# https://github.com/huggingface/llm-ls/pull/102
./fix-time-compilation-failure.patch
@@ -36,29 +28,29 @@ rustPlatform.buildRustPackage {
hash = "sha256-4gXasfMqlrrP8II+FiV/qGfO7a9qFkDQMiax7yEua5E=";
})
];
cargoHash = "sha256-m/w9aJZCCh1rgnHlkGQD/pUDoWn2/WRVt5X4pFx9nC4=";
buildAndTestSubdir = "crates/llm-ls";
nativeBuildInputs = [ pkg-config ];
buildInputs =
[
libiconv
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Security
];
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
doInstallCheck = true;
passthru.tests.version = testers.testVersion {
package = llm-ls;
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
meta = {
description = "LSP server leveraging LLMs for code completion (and more?)";
homepage = "https://github.com/huggingface/llm-ls";
license = licenses.asl20;
maintainers = with maintainers; [ jfvillablanca ];
platforms = platforms.all;
changelog = "https://github.com/huggingface/llm-ls/releases/tag/${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ jfvillablanca ];
platforms = lib.platforms.all;
mainProgram = "llm-ls";
};
}
+2 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "modelscan";
version = "0.8.1";
version = "0.8.3";
pyproject = true;
src = fetchFromGitHub {
owner = "protectai";
repo = "modelscan";
tag = "v${version}";
hash = "sha256-90VnIVQFjtKgLCHc+tmOtDdgJP8aaH4h5ZiOOejnXgQ=";
hash = "sha256-MhwXarjIHZgSC7G7+XevVyCflM/SiaNagJMhzLvs1Uc=";
};
build-system = with python3.pkgs; [
+2 -2
View File
@@ -10,14 +10,14 @@
python3Packages.buildPythonApplication rec {
pname = "nix-fast-build";
version = "1.0.0";
version = "1.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "Mic92";
repo = "nix-fast-build";
rev = "refs/tags/${version}";
hash = "sha256-8zW6eWvE9T03cMpo/hY8RRZIsSCfs1zmsJOkEZzuYwM=";
hash = "sha256-HkaJeIFgxncLm8MC1BaWRTkge9b1/+mjPcbzXTRshoM=";
};
build-system = [ python3Packages.setuptools ];
+8 -3
View File
@@ -10,15 +10,20 @@ let
nim2 = nim-2_0;
};
in
buildNimPackage' (finalAttrs: {
buildNimPackage' (finalAttrs: rec {
pname = "nph";
version = "0.6.0";
version = "0.6.1";
postPatch = ''
substituteInPlace src/nph.nim \
--replace-fail 'git describe --long --dirty --always --tags' "echo ${version}"
'';
src = fetchFromGitHub {
owner = "arnetheduck";
repo = "nph";
rev = "v${finalAttrs.version}";
hash = "sha256-9t5VeGsxyytGdu7+Uv/J+x6bmeB5+eQapbyp30iPxqs=";
hash = "sha256-RIuggg09l7jZDg91FPrjwdoE+gCxgb7c8fEvCiwQk5U=";
};
lockFile = ./lock.json;
+3 -3
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "openasar";
version = "0-unstable-2024-11-13";
version = "0-unstable-2025-01-10";
src = fetchFromGitHub {
owner = "GooseMod";
repo = "OpenAsar";
rev = "ef4470849624032a8eb7265eabd23158aa5a2356";
hash = "sha256-U9wYKen5MfE/WTKL0SICN0v3DPMLqblMYQVAbkZnfjY=";
rev = "4ed9e52d42501927b60354fcc456da50ed41cde2";
hash = "sha256-3b31iEmNUlBLc47Cw7EtMMgc+oPr1V6oqNTKRemXJfA=";
};
postPatch = ''
+122
View File
@@ -0,0 +1,122 @@
{
lib,
libsoup_3,
dbus,
glib,
glib-networking,
librsvg,
webkitgtk_4_1,
pkg-config,
wrapGAppsHook3,
makeDesktopItem,
copyDesktopItems,
rustPlatform,
buildNpmPackage,
fetchFromGitHub,
mono,
wrapWithMono ? true,
}:
rustPlatform.buildRustPackage rec {
pname = "owmods-gui";
version = "0.15.0";
src = fetchFromGitHub {
owner = "ow-mods";
repo = "ow-mod-man";
tag = "gui_v${version}";
hash = "sha256-rTANG+yHE8YfWYUyELoKgj4El+1ZW6vI9NkgADD40pw=";
};
cargoHash = "sha256-rFkh2G7kFuQI7nlZIwaqvt7x9bKLqmWU21YwZu2+wUA=";
buildFeatures = [
"tauri/custom-protocol"
];
nativeBuildInputs = [
pkg-config
copyDesktopItems
wrapGAppsHook3
];
buildInputs = [
dbus
libsoup_3
glib
librsvg
glib-networking
webkitgtk_4_1
];
buildAndTestSubdir = "owmods_gui/backend";
preFixup = lib.optionalString wrapWithMono "gappsWrapperArgs+=(--prefix PATH : '${mono}/bin')";
postPatch =
let
frontend = buildNpmPackage {
inherit version;
env.VITE_VERSION_SUFFIX = "-nix";
pname = "owmods-gui-ui";
src = "${src}/owmods_gui/frontend";
packageJSON = "${src}/owmods_gui/frontend/package.json";
npmDepsHash = "sha256-h6e+hQzd52G3XtufioEYlBuXNu6I+ZTQcNgJaQdaAck=";
postBuild = ''
cp -r ../dist/ $out
'';
distPhase = "true";
dontInstall = true;
installInPlace = true;
distDir = "../dist";
meta = {
description = "Web frontend for the Outer Wilds Mod Manager";
homepage = "https://github.com/ow-mods/ow-mod-man/tree/main/owmods_gui/frontend";
license = lib.licenses.gpl3Plus;
};
};
in
''
substituteInPlace owmods_gui/backend/tauri.conf.json \
--replace-fail '"frontendDist": "../dist"' '"frontendDist": "${frontend}"'
'';
postInstall = ''
install -DT owmods_gui/backend/icons/128x128@2x.png $out/share/icons/hicolor/256x256@2/apps/outer-wilds-mod-manager.png
install -DT owmods_gui/backend/icons/128x128.png $out/share/icons/hicolor/128x128/apps/outer-wilds-mod-manager.png
install -DT owmods_gui/backend/icons/32x32.png $out/share/icons/hicolor/32x32/apps/outer-wilds-mod-manager.png
mv $out/bin/owmods_gui $out/bin/outer-wilds-mod-manager
'';
desktopItems = [
(makeDesktopItem {
name = "outer-wilds-mod-manager";
exec = "outer-wilds-mod-manager %u";
icon = "outer-wilds-mod-manager";
desktopName = "Outer Wilds Mod Manager";
categories = [ "Game" ];
comment = "Manage Outer Wilds Mods";
mimeTypes = [ "x-scheme-handler/owmods" ];
})
];
meta = {
description = "GUI version of the mod manager for Outer Wilds Mod Loader";
homepage = "https://github.com/ow-mods/ow-mod-man/tree/main/owmods_gui";
downloadPage = "https://github.com/ow-mods/ow-mod-man/releases/tag/gui_v${version}";
changelog = "https://github.com/ow-mods/ow-mod-man/releases/tag/gui_v${version}";
mainProgram = "outer-wilds-mod-manager";
platforms = lib.platforms.linux;
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [
bwc9876
locochoco
spoonbaker
];
};
}
@@ -0,0 +1,24 @@
diff --git a/Makefile b/Makefile
index eca86a9..f11931b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
# Common variables
-CFLAGS = -g -static -O2 -D_GNU_SOURCE -DARCH_LITTLE_ENDIAN=1
+CFLAGS = -g -O2 -D_GNU_SOURCE -DARCH_LITTLE_ENDIAN=1
TARGET = rar2hashcat
# Variables for Linux target
diff --git a/base64_convert.c b/base64_convert.c
index 0d2635d..b101e3c 100644
--- a/base64_convert.c
+++ b/base64_convert.c
@@ -163,7 +163,7 @@ static char *strnzcpy(char *dst, const char *src, int size)
return dst;
}
-#ifdef __linux__
+#if defined(__linux__) || defined(__APPLE__)
static char *strupr(char *s)
{
unsigned char *ptr = (unsigned char *)s;
+46
View File
@@ -0,0 +1,46 @@
{
lib,
stdenv,
fetchFromGitHub,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "rar2hashcat";
version = "1.0";
src = fetchFromGitHub {
owner = "hashstation";
repo = "rar2hashcat";
rev = finalAttrs.version;
hash = "sha256-GVh4Gyjn84xAwO7wKXYe2DPnpb8gnxGIMH5Szce+XpY=";
};
patches = [
./darwin-support.patch
];
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration -Wno-error=int-conversion";
makeFlags = [
"CC_LINUX=${stdenv.cc.targetPrefix}cc"
"rar2hashcat"
];
installPhase = ''
runHook preInstall
install -D rar2hashcat $out/bin/rar2hashcat
runHook postInstall
'';
meta = {
changelog = "https://github.com/hashstation/rar2hashcat/releases/tag/${finalAttrs.version}";
description = "Processes input RAR files into a format suitable for use with hashcat";
homepage = "https://github.com/hashstation/rar2hashcat";
license = lib.licenses.mit;
mainProgram = "rar2hashcat";
maintainers = with lib.maintainers; [ emilytrau ];
platforms = lib.platforms.unix;
};
})
+16 -16
View File
@@ -991,7 +991,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]]
name = "spade"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"clap",
"codespan",
@@ -1025,7 +1025,7 @@ dependencies = [
[[package]]
name = "spade-ast"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"itertools",
"num",
@@ -1034,7 +1034,7 @@ dependencies = [
[[package]]
name = "spade-ast-lowering"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"itertools",
"local-impl",
@@ -1052,7 +1052,7 @@ dependencies = [
[[package]]
name = "spade-common"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"codespan",
"codespan-reporting 0.12.0",
@@ -1077,7 +1077,7 @@ dependencies = [
[[package]]
name = "spade-diagnostics"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"codespan",
"codespan-reporting 0.12.0",
@@ -1088,7 +1088,7 @@ dependencies = [
[[package]]
name = "spade-hir"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"colored",
"itertools",
@@ -1104,7 +1104,7 @@ dependencies = [
[[package]]
name = "spade-hir-lowering"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"colored",
"itertools",
@@ -1125,7 +1125,7 @@ dependencies = [
[[package]]
name = "spade-macros"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"proc-macro2",
"quote",
@@ -1135,7 +1135,7 @@ dependencies = [
[[package]]
name = "spade-mir"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"codespan",
"codespan-reporting 0.12.0",
@@ -1154,7 +1154,7 @@ dependencies = [
[[package]]
name = "spade-parser"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"codespan",
"colored",
@@ -1172,7 +1172,7 @@ dependencies = [
[[package]]
name = "spade-python"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"codespan-reporting 0.12.0",
"color-eyre",
@@ -1201,7 +1201,7 @@ dependencies = [
[[package]]
name = "spade-simulation-ext"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"codespan-reporting 0.12.0",
"color-eyre",
@@ -1230,7 +1230,7 @@ dependencies = [
[[package]]
name = "spade-tests"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"codespan-reporting 0.12.0",
"colored",
@@ -1258,7 +1258,7 @@ dependencies = [
[[package]]
name = "spade-typeinference"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"assert_matches",
"colored",
@@ -1278,7 +1278,7 @@ dependencies = [
[[package]]
name = "spade-types"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"num",
"serde",
@@ -1287,7 +1287,7 @@ dependencies = [
[[package]]
name = "spade-wordlength-inference"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"num",
"spade-common",
+2 -2
View File
@@ -14,13 +14,13 @@
rustPlatform.buildRustPackage rec {
pname = "spade";
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitLab {
owner = "spade-lang";
repo = "spade";
rev = "v${version}";
hash = "sha256-JqKcW6xrb9XBHuwR0/EytZmYUV++N69R7wBNoHv9xJU=";
hash = "sha256-AarFH0D0ApZ+i6qtKy7zM2iwg/QeYoLwOHbg+d6Q78k=";
# only needed for vatch, which contains test data
fetchSubmodules = true;
};
+2242 -1855
View File
File diff suppressed because it is too large Load Diff
+4 -4
View File
@@ -18,13 +18,13 @@
}:
rustPlatform.buildRustPackage rec {
pname = "surfer";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitLab {
owner = "surfer-project";
repo = "surfer";
rev = "v${version}";
hash = "sha256-C5jyWLs7fdEn2oW5BORZYazQwjXNxf8ketYFwlVkHpA";
hash = "sha256-mvHyljAEVi1FMkEbKsPmCNx2Cg0/Ydw3ZQCZsowEKGc=";
fetchSubmodules = true;
};
@@ -55,8 +55,8 @@ rustPlatform.buildRustPackage rec {
lockFile = ./Cargo.lock;
outputHashes = {
"codespan-0.12.0" = "sha256-3F2006BR3hyhxcUTaQiOjzTEuRECKJKjIDyXonS/lrE=";
"egui_skia-0.5.0" = "sha256-dpkcIMPW+v742Ov18vjycLDwnn1JMsvbX6qdnuKOBC4=";
"tracing-tree-0.2.0" = "sha256-/JNeAKjAXmKPh0et8958yS7joORDbid9dhFB0VUAhZc=";
"egui_skia_renderer-0.2.0" = "sha256-1l8iluTHDYZGRkKWnurRMj4iHljogPWs26pzkUtIGwY=";
"spade-0.10.0" = "sha256-nl9MsrV68mE7hVEBFF/WdasUXCJoUazCFg4xG+2MOEY=";
};
};
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "swim";
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitLab {
owner = "spade-lang";
repo = "swim";
rev = "v${version}";
hash = "sha256-1F9C7robIe/8pWh9Dl/CdyvKEZhrFkLrp5/8QC9Z0X4=";
hash = "sha256-GJQzz9o0QKbnE8l1MEjdW36S/rJo2GoaK02Qnl9dtEA=";
};
cargoHash = "sha256-kY3eFnei70jfco+7TK9WS/YvbR/hf4JtrUbaRg7KN+8=";
cargoHash = "sha256-OQpKy/TVsJV/AjqvvdqTnAnAc1+YhN83N1EyNfgF4qg=";
preConfigure = ''
# de-vendor spade git submodule
+5 -5
View File
@@ -11,7 +11,7 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "tideways-cli";
version = "1.2.2";
version = "1.2.4";
nativeBuildInputs = [ installShellFiles ];
@@ -38,19 +38,19 @@ stdenvNoCC.mkDerivation (finalAttrs: {
sources = {
"x86_64-linux" = fetchurl {
url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_amd64-${finalAttrs.version}.tar.gz";
hash = "sha256-g06PE464P/A0PDGG7xMa644ztcIRMAU/ueee2IOhiHc=";
hash = "sha256-PoZHmr4kq6A6aTVlo9kbjnRSkLBJ9q/GneHGWoEvraQ=";
};
"aarch64-linux" = fetchurl {
url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_arm64-${finalAttrs.version}.tar.gz";
hash = "sha256-nbC9vMXA5vHKxEpINDQJTUqh7YOe0T0x5MbbQg03gk4=";
hash = "sha256-8r3s9izpi8fR+lSDQ6ZAxGWK2XQxrtp7WgRykRC+pD4=";
};
"x86_64-darwin" = fetchurl {
url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_amd64-${finalAttrs.version}.tar.gz";
hash = "sha256-RfCTl61r/zfWy/3W+zmrSaAjIWe52POfZnzsmm5loD4=";
hash = "sha256-D40PF6zgf79NO1K35koZ2gpUeJllF9CpW9DoCQ1uJIU=";
};
"aarch64-darwin" = fetchurl {
url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_arm64-${finalAttrs.version}.tar.gz";
hash = "sha256-4N4hUvbf8b9BnKUY4YTsB76Z35DmSTyWv6BC+bqJNCI=";
hash = "sha256-QGkRu0IRUpydLIy0DgtRhLiH0mLZ0UTRCJo1WZeICQQ=";
};
};
+2
View File
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
preConfigure = ''
sed -i -e "s,\\\/usr,"$(echo $out|sed -e "s,\\/,\\\\\\\/,g")",g" tsocks
substituteInPlace configure \
--replace-fail "main(){return(0);}" "int main(){return(0);}"
substituteInPlace tsocks --replace /usr $out
'';
+25 -23
View File
@@ -12,6 +12,12 @@
let
system = stdenv.hostPlatform.system;
registry = fetchFromGitHub {
owner = "bazelbuild";
repo = "bazel-central-registry";
rev = "6ca6e91cb9fa2d224f61b8a4a2a7fd6b1211e388";
hash = "sha256-LRD8sGbISp2LXjpg4cpbUHG2a1JbKLA7z3vSvqqXMGo=";
};
in
buildBazelPackage rec {
pname = "verible";
@@ -19,8 +25,8 @@ buildBazelPackage rec {
# These environment variables are read in bazel/build-version.py to create
# a build string shown in the tools --version output.
# If env variables not set, it would attempt to extract it from .git/.
GIT_DATE = "2024-10-16";
GIT_VERSION = "v0.0-3836-g86ee9bab";
GIT_DATE = "2025-01-02";
GIT_VERSION = "v0.0-3894-g0a842c85";
# Derive nix package version from GIT_VERSION: "v1.2-345-abcde" -> "1.2.345"
version = builtins.concatStringsSep "." (
@@ -31,16 +37,23 @@ buildBazelPackage rec {
owner = "chipsalliance";
repo = "verible";
rev = "${GIT_VERSION}";
hash = "sha256-hV02x0b/taBqa6kyy3gvm3lomJrXBeelAbxrkC0s6EU=";
hash = "sha256-FWeEIWvrjE8ESGFUWDPtd9gLkhMDtgkw6WbXViDxQQA=";
};
bazel = bazel_6;
bazelFlags = [
"--//bazel:use_local_flex_bison"
"--registry"
"file://${registry}"
];
fetchAttrs = {
hash = "sha256-bKASgc5KftCWtMvJkGA4nweBAtgdnyC9uXIJxPjKYS0=";
hash =
{
aarch64-linux = "sha256-HPpRxYhS6CIhinhHNvnPij4+cJxqf073nGpNG1ItPmo=";
x86_64-linux = "sha256-gM4hsuHMF4V1PgykjQ0yO652luoRJvNdB2xF6P8uxRc=";
}
.${system} or (throw "No hash for system: ${system}");
};
nativeBuildInputs = [
@@ -51,15 +64,16 @@ buildBazelPackage rec {
];
postPatch = ''
patchShebangs\
patchShebangs \
.github/bin/simple-install.sh \
bazel/build-version.py \
bazel/sh_test_with_runfiles_lib.sh \
common/lsp/dummy-ls_test.sh \
common/tools/patch_tool_test.sh \
common/tools/verible-transform-interactive.sh \
common/tools/verible-transform-interactive-test.sh \
verible/common/lsp/dummy-ls_test.sh \
verible/common/tools/patch_tool_test.sh \
verible/common/tools/verible-transform-interactive.sh \
verible/common/tools/verible-transform-interactive-test.sh \
kythe-browse.sh \
verilog/tools
verible/verilog/tools
'';
removeRulesCC = false;
@@ -73,19 +87,7 @@ buildBazelPackage rec {
buildAttrs = {
installPhase = ''
mkdir -p "$out/bin"
install bazel-bin/common/tools/verible-patch-tool "$out/bin"
V_TOOLS_DIR=bazel-bin/verilog/tools
install $V_TOOLS_DIR/diff/verible-verilog-diff "$out/bin"
install $V_TOOLS_DIR/formatter/verible-verilog-format "$out/bin"
install $V_TOOLS_DIR/kythe/verible-verilog-kythe-extractor "$out/bin"
install $V_TOOLS_DIR/lint/verible-verilog-lint "$out/bin"
install $V_TOOLS_DIR/ls/verible-verilog-ls "$out/bin"
install $V_TOOLS_DIR/obfuscator/verible-verilog-obfuscate "$out/bin"
install $V_TOOLS_DIR/preprocessor/verible-verilog-preprocessor "$out/bin"
install $V_TOOLS_DIR/project/verible-verilog-project "$out/bin"
install $V_TOOLS_DIR/syntax/verible-verilog-syntax "$out/bin"
.github/bin/simple-install.sh "$out/bin"
'';
};
+9
View File
@@ -0,0 +1,9 @@
# Tasks
## example
Tests if xc works
```sh
touch ./test
```
+22 -7
View File
@@ -2,17 +2,19 @@
lib,
buildGoModule,
fetchFromGitHub,
gitUpdater,
versionCheckHook,
}:
buildGoModule rec {
pname = "xc";
version = "0.8.0";
version = "0.8.5";
src = fetchFromGitHub {
owner = "joerdav";
repo = pname;
rev = "v${version}";
sha256 = "sha256-vTyCS85xbJnAgbasWD6LFxij9EezzlJ1pyvCJptqmOU=";
tag = "v${version}";
sha256 = "sha256-eaFHK7VsfLSgSJehv4urxq8qMPT+zzs2tRypz4q+MLc=";
};
vendorHash = "sha256-EbIuktQ2rExa2DawyCamTrKRC1yXXMleRB8/pcKFY5c=";
@@ -23,13 +25,26 @@ buildGoModule rec {
"-X=main.version=${version}"
];
meta = with lib; {
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
postInstallCheck = ''
cp ${./example.md} example.md
$out/bin/xc -file ./example.md example
if ! [[ -f test ]] then
echo "example.md didn't do anything" >&2
return 1
fi
'';
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
meta = {
description = "Markdown defined task runner";
mainProgram = "xc";
homepage = "https://xcfile.dev/";
changelog = "https://github.com/joerdav/xc/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [
changelog = "https://github.com/joerdav/xc/releases/tag/${src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
figsoda
joerdav
];
+4
View File
@@ -24,6 +24,10 @@ stdenv.mkDerivation rec {
wxGTK32
];
configureFlags = [
"--with-wx-config=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}"
];
meta = with lib; {
description = "Portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods";
license = licenses.lgpl21;
@@ -48,13 +48,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-system-settings-unwrapped";
version = "1.2.0";
version = "1.3.0";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-system-settings";
rev = finalAttrs.version;
hash = "sha256-dWaXPr9Z5jz5SbwLSd3jVqjK0E5BdcKVeF15p8j47uM=";
hash = "sha256-8X5a2zJ0y8bSSnbqDvRoYm/2VPAWcfZZuiH+5p8eXi4=";
};
outputs = [
@@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-settings-components";
version = "1.1.1";
version = "1.1.2";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-settings-components";
rev = finalAttrs.version;
hash = "sha256-2Wyh+2AW6EeKRv26D4l+GIoH5sWC9SmOODNHOveFZPg=";
hash = "sha256-H7G3dzzitdyahB/MwgtfRBpo+qMOhmQSzN4EGYculks=";
};
postPatch =
@@ -45,13 +45,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-ui-toolkit";
version = "1.3.5100";
version = "1.3.5110";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-ui-toolkit";
rev = finalAttrs.version;
hash = "sha256-r+wUCl+ywFcgFYo7BjBoXiulQptd1Zd3LJchXiMtx4I=";
hash = "sha256-j2Fowwj+ArdfJacqBSWksPk+wXRoTpL/Jrgme2tUSC8=";
};
outputs = [
@@ -1414,16 +1414,6 @@ self: super: builtins.intersectAttrs super {
'';
hydraPlatforms = pkgs.lib.platforms.all;
broken = false;
patches = old.patches or [ ] ++ [
(pkgs.fetchpatch {
# related: https://github.com/haskell/cabal/issues/10504
name = "suppress-error-about-missing-local-index.patch";
url = "https://github.com/haskell/cabal/commit/d58a75ef4adab36688878420cc9e2c25bca41ec4.patch";
hash = "sha256-IZ+agNNN9AcIJBBsT30LAkAXCAoYKF+kIhccGPFdm+8=";
stripLen = 1;
includes = [ "src/Distribution/Client/IndexUtils.hs" ];
})
];
}) super.cabal-install;
tailwind = addBuildDepend
+216 -168
View File
@@ -2,208 +2,256 @@
lib,
stdenv,
fetchurl,
makeFontsConf,
cacert,
cairo,
coreutils,
fontconfig,
freefont_ttf,
glib,
gmp,
gtk3,
glibcLocales,
libedit,
libffi,
libiconv,
libGL,
libGLU,
libjpeg,
libiconvReal,
libz,
lz4,
ncurses,
libpng,
libtool,
mpfr,
openssl,
isMinimal ? false,
cairo,
fontconfig,
glib,
glibcLocales,
gtk3,
libGL,
libiodbc,
libjpeg,
libpng,
makeFontsConf,
pango,
poppler,
readline,
sqlite,
disableDocs ? false,
CoreFoundation,
gsettings-desktop-schemas,
unixODBC,
wrapGAppsHook3,
disableDocs ? false,
callPackage,
writers,
}:
let
fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; };
libPath = lib.makeLibraryPath (
[
cairo
fontconfig
glib
gmp
gtk3
gsettings-desktop-schemas
libedit
libjpeg
libpng
mpfr
ncurses
openssl
pango
poppler
readline
sqlite
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
libGL
libGLU
makeLibPaths = lib.concatMapStringsSep " " (
lib.flip lib.pipe [
lib.getLib
(x: ''"${x}/lib"'')
]
);
manifest = lib.importJSON ./manifest.json;
inherit (stdenv.hostPlatform) isDarwin isStatic;
runtimeDeps = [ openssl ];
mainDistDeps = [
(if isDarwin then libiodbc else unixODBC)
cairo
fontconfig
glib
gtk3
libGL
libjpeg
libpng
pango
sqlite
];
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "racket";
version = "8.14"; # always change at once with ./minimal.nix
inherit (manifest) version;
src =
(lib.makeOverridable (
{ name, hash }:
fetchurl {
url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
inherit hash;
}
))
{
name = "${pname}-${version}";
hash = "sha256-qrjMDbM27S04KAPHCK1VqV/FKkQ2yRL2FvfEnUhFriw=";
};
let
info = manifest.${if isMinimal then "minimal" else "full"};
in
fetchurl {
url = "https://mirror.racket-lang.org/installers/${manifest.version}/${info.filename}";
inherit (info) sha256;
};
FONTCONFIG_FILE = fontsConf;
LD_LIBRARY_PATH = libPath;
NIX_LDFLAGS = lib.concatStringsSep " " [
(lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isDarwin) "-lgcc_s")
];
nativeBuildInputs = [
cacert
nativeBuildInputs = lib.optionals (!isMinimal) [
wrapGAppsHook3
];
buildInputs =
[
fontconfig
libffi
libtool
sqlite
gsettings-desktop-schemas
gtk3
ncurses
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
libiconv
CoreFoundation
];
buildInputs = [
libiconvReal
libz
lz4
ncurses
];
patches = [
# Hardcode variant detection because we wrap the Racket binary making it
# fail to detect its variant at runtime.
# See: https://github.com/NixOS/nixpkgs/issues/114993#issuecomment-812951247
./force-cs-variant.patch
# The entry point binary $out/bin/racket is codesigned at least once. The
# following error is triggered as a result.
# (error 'add-ad-hoc-signature "file already has a signature")
# We always remove the existing signature then call add-ad-hoc-signature to
# circumvent this error.
./force-remove-codesign-then-add.patch
patches = lib.optionals isDarwin [
/*
The entry point binary $out/bin/racket is codesigned at least once. The
following error is triggered as a result.
(error 'add-ad-hoc-signature "file already has a signature")
We always remove the existing signature then call add-ad-hoc-signature to
circumvent this error.
*/
./patches/force-remove-codesign-then-add.patch
];
preConfigure =
''
unset AR
for f in src/lt/configure src/cs/c/configure src/bc/src/string.c; do
substituteInPlace "$f" \
--replace /usr/bin/uname ${coreutils}/bin/uname \
--replace /bin/cp ${coreutils}/bin/cp \
--replace /bin/ln ${coreutils}/bin/ln \
--replace /bin/rm ${coreutils}/bin/rm \
--replace /bin/true ${coreutils}/bin/true
done
# The configure script forces using `libtool -o` as AR on Darwin. But, the
# `-o` option is only available from Apple libtool. GNU ar works here.
/*
The configure script forces using `libtool -o` as AR on Darwin. But, the
`-o` option is only available from Apple libtool. GNU ar works here.
*/
lib.optionalString isDarwin ''
substituteInPlace src/ChezScheme/zlib/configure \
--replace 'ARFLAGS="-o"' 'AR=ar; ARFLAGS="rc"'
--replace-fail 'ARFLAGS="-o"' 'AR=ar; ARFLAGS="rc"'
''
+ ''
mkdir src/build
cd src/build
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${libPath})
gappsWrapperArgs+=("--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive")
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
gappsWrapperArgs+=("--prefix" "DYLD_LIBRARY_PATH" ":" ${libPath})
'';
preBuild = lib.optionalString stdenv.hostPlatform.isDarwin ''
# Cannot set DYLD_LIBRARY_PATH as an attr of this drv, becasue dynamic
# linker environment variables like this are purged.
# See: https://apple.stackexchange.com/a/212954/167199
# Make builders feed it to dlopen(...). Do not expose all of $libPath to
# DYLD_LIBRARY_PATH as the order of looking up symbols like
# `__cg_jpeg_resync_to_restart` will be messed up. Our libJPEG.dyllib
# expects it from our libTIFF.dylib, but instead it could not be found from
# the system `libTIFF.dylib`. DYLD_FALLBACK_LIBRARY_PATH has its own problem
# , too.
export DYLD_FALLBACK_LIBRARY_PATH="${libPath}"
'';
shared = if stdenv.hostPlatform.isDarwin then "dylib" else "shared";
configureFlags =
[
"--enable-${shared}"
"--enable-lt=${libtool}/bin/libtool"
]
++ lib.optionals disableDocs [ "--disable-docs" ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
"--disable-strip"
"--enable-xonx"
];
configureScript = "../configure";
enableParallelBuilding = false;
configureFlags =
[
"--enable-check"
"--enable-csonly"
"--enable-liblz4"
"--enable-libz"
]
++ lib.optional disableDocs "--disable-docs"
++ lib.optionals (!isStatic) [
# instead of `--disable-static` that `stdenv` assumes
"--disable-libs"
# "not currently supported" in `configure --help-cs` but still emphasized in README
"--enable-shared"
]
++ lib.optionals isDarwin [
"--disable-strip"
# "use Unix style (e.g., use Gtk) for Mac OS", which eliminates many problems
"--enable-xonx"
];
dontStrip = stdenv.hostPlatform.isDarwin;
preBuild =
let
libPaths = makeLibPaths mainDistDeps;
libPathsVar = if isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else "LD_LIBRARY_PATH";
in
lib.optionalString (!isMinimal) (
/*
Makes FFIs available for setting up `main-distribution` and its
dependencies, which is integrated into the build process of Racket
*/
''
for lib_path in ${libPaths}; do
addToSearchPath ${libPathsVar} $lib_path
done
''
# Fixes Fontconfig errors
+ ''
export FONTCONFIG_FILE=${makeFontsConf { fontDirectories = [ ]; }}
export XDG_CACHE_HOME=$(mktemp -d)
''
);
meta = with lib; {
description = "Programmable programming language";
longDescription = ''
Racket is a full-spectrum programming language. It goes beyond
Lisp and Scheme with dialects that support objects, types,
laziness, and more. Racket enables programmers to link
components written in different dialects, and it empowers
programmers to create new, project-specific dialects. Racket's
libraries support applications from web servers and databases to
GUIs and charts.
dontStrip = isDarwin;
preFixup = lib.optionalString (!isMinimal && !isDarwin) ''
gappsWrapperArgs+=("--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive")
'';
postFixup =
let
libPaths = makeLibPaths (runtimeDeps ++ lib.optionals (!isMinimal) mainDistDeps);
in
''
$out/bin/racket -f - <<EOF
(require setup/dirs)
(define config-path (build-path (find-config-dir) "config.rktd"))
(define prev-config (with-input-from-file config-path read))
(define prev-lib-search-dirs (hash-ref prev-config 'lib-search-dirs '(#f)))
(define lib-search-dirs (append '(${libPaths}) prev-lib-search-dirs))
(define config (hash-set prev-config 'lib-search-dirs lib-search-dirs))
(with-output-to-file config-path (thunk (pretty-write config))
#:exists 'replace)
EOF
'';
passthru = {
# Functionalities #
updateScript = {
command = ./update.py;
attrPath = "racket";
supportedFeatures = [ "commit" ];
};
writeScript =
nameOrPath:
{
libraries ? [ ],
...
}@config:
assert lib.assertMsg (libraries == [ ]) "library integration for Racket has not been implemented";
writers.makeScriptWriter (
builtins.removeAttrs config [ "libraries" ]
// {
interpreter = "${lib.getExe finalAttrs.finalPackage}";
}
) nameOrPath;
writeScriptBin = name: finalAttrs.passthru.writeScript "/bin/${name}";
# Tests #
tests = builtins.mapAttrs (name: path: callPackage path { racket = finalAttrs.finalPackage; }) (
{
## Basic ##
write-greeting = ./tests/write-greeting.nix;
get-version-and-variant = ./tests/get-version-and-variant.nix;
load-openssl = ./tests/load-openssl.nix;
## Nixpkgs supports ##
nix-write-script = ./tests/nix-write-script.nix;
}
// lib.optionalAttrs (!isMinimal) {
## `main-distribution` ##
draw-crossing = ./tests/draw-crossing.nix;
}
);
};
meta = {
description =
"Programmable programming language" + lib.optionalString isMinimal " (minimal distribution)";
longDescription =
''
Racket is a full-spectrum programming language. It goes beyond
Lisp and Scheme with dialects that support objects, types,
laziness, and more. Racket enables programmers to link
components written in different dialects, and it empowers
programmers to create new, project-specific dialects. Racket's
libraries support applications from web servers and databases to
GUIs and charts.
''
+ lib.optionalString isMinimal ''
This minimal distribution includes just enough of Racket that you can
use `raco pkg` to install more.
'';
homepage = "https://racket-lang.org/";
changelog = "https://github.com/racket/racket/releases/tag/v${version}";
license = with licenses; [
asl20 # or
changelog = "https://github.com/racket/racket/releases/tag/v${finalAttrs.version}";
/*
> Racket is distributed under the MIT license and the Apache version 2.0
> license, at your option.
> The Racket runtime system embeds Chez Scheme, which is distributed
> under the Apache version 2.0 license.
*/
license = with lib.licenses; [
asl20
mit
];
maintainers = [ ];
platforms = [
"x86_64-darwin"
"x86_64-linux"
"aarch64-linux"
"aarch64-darwin"
];
maintainers = with lib.maintainers; [ rc-zb ];
mainProgram = "racket";
platforms = lib.platforms.${if isMinimal then "all" else "unix"};
badPlatforms = lib.platforms.darwin;
};
}
})
@@ -1,18 +0,0 @@
Hardcode Racket variant to CS
Hardcode variant detection because nixpkgs wraps the Racket binary making it
fail to detect its variant at runtime.
https://github.com/NixOS/nixpkgs/issues/114993#issuecomment-812951247
--- old/collects/setup/variant.rkt
+++ new/collects/setup/variant.rkt
@@ -7,7 +7,8 @@
(provide variant-suffix
script-variant?)
-(define plain-variant
+(define plain-variant 'cs)
+#;(define plain-variant
(delay/sync
(cond
[(cross-installation?)
@@ -0,0 +1,11 @@
{
"version": "8.15",
"full": {
"filename": "racket-8.15-src.tgz",
"sha256": "602b848459daf1b2222a46a9094e85ae2d28e480067219957fa46af8400e1233"
},
"minimal": {
"filename": "racket-minimal-8.15-src.tgz",
"sha256": "1ac132c56bc52312049fa4f0849237f66713e8e0a7ab6c4780504633ee8f1dc3"
}
}
@@ -1,25 +0,0 @@
{ racket }:
racket.overrideAttrs (oldAttrs: rec {
pname = "racket-minimal";
version = oldAttrs.version;
src = oldAttrs.src.override {
name = "${pname}-${version}";
hash = "sha256-/BhnyIw4QQ2aMKW8FDJlsalSW3pTLqP74CXJ15td5so=";
};
meta = oldAttrs.meta // {
description = "Racket without bundled packages, such as Dr. Racket";
longDescription = ''
The essential package racket-libs is included,
as well as libraries that live in collections. In particular, raco
and the pkg library are still bundled.
'';
platforms = [
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
};
})
@@ -0,0 +1,18 @@
{ runCommandLocal, racket }:
runCommandLocal "racket-test-draw-crossing"
{
nativeBuildInputs = [ racket ];
}
''
racket -f - <<EOF
(require racket/draw)
(define target (make-bitmap 64 64))
(define dc (new bitmap-dc% [bitmap target]))
(send dc draw-line 0 0 64 64)
(send dc draw-line 0 64 64 0)
(send target save-file (getenv "out") 'png)
EOF
''
@@ -0,0 +1,27 @@
{ runCommandLocal, racket }:
runCommandLocal "racket-test-get-version-and-variant"
{
nativeBuildInputs = [ racket ];
}
''
expectation="${racket.version}"
output="$(racket -e '(display (version))')"
if test "$output" != "$expectation"; then
echo "output mismatch: expected ''${expectation}, but got ''${output}"
exit 1
fi
expectation="cs"
output="$(racket -e '(require launcher/launcher) (display (current-launcher-variant))')"
if test "$output" != "$expectation"; then
echo "output mismatch: expected ''${expectation}, but got ''${output}"
exit 1
fi
touch $out
''
@@ -0,0 +1,15 @@
{ runCommandLocal, racket }:
runCommandLocal "racket-test-load-openssl"
{
nativeBuildInputs = [ racket ];
}
''
racket -f - <<EOF
(require openssl)
(unless ssl-available?
(raise ssl-load-fail-reason))
EOF
touch $out
''
@@ -0,0 +1,26 @@
{ runCommandLocal, racket }:
let
script = racket.writeScript "racket-test-nix-write-script-the-script" { } ''
#lang racket/base
(display "success")
(newline)
'';
in
runCommandLocal "racket-test-nix-write-script"
{
nativeBuildInputs = [ racket ];
}
''
expectation="success"
output="$(${script})"
if test "$output" != "$expectation"; then
echo "output mismatch: expected ''${expectation}, but got ''${output}"
exit 1
fi
touch $out
''
@@ -0,0 +1,23 @@
{ runCommandLocal, racket }:
runCommandLocal "racket-test-write-greeting"
{
nativeBuildInputs = [ racket ];
}
''
expectation="Hello, world!"
racket -f - <<EOF
(with-output-to-file (getenv "out")
(lambda ()
(display "Hello, world!")
(newline)))
EOF
output="$(cat $out)"
if test "$output" != "$expectation"; then
echo "output mismatch: expected ''${expectation}, but got ''${output}"
exit 1
fi
''
+73
View File
@@ -0,0 +1,73 @@
#! /usr/bin/env nix-shell
#! nix-shell -i python3 --packages 'python3.withPackages (ps: with ps; [ requests beautifulsoup4 ])'
import os
import re
import json
import requests
from bs4 import BeautifulSoup
SITE = "https://download.racket-lang.org"
MANIFEST_FILENAME = "manifest.json"
def find_info(table, group_name, subgroup_name):
group = table.find(
string=re.compile("^{}\\s*".format(group_name))
).find_parent("tr", class_="group")
subgroup = group.find_next(
string=re.compile("^{}\\s*".format(subgroup_name))
).find_parent(class_="subgroup")
link = subgroup.find_next(
"a",
class_="installer",
string="Source"
)
filename = link["href"].split("/")[1]
sha256 = link.find_next(class_="checksum").string
return {
"filename": filename,
"sha256": sha256,
}
os.chdir(os.path.dirname(os.path.abspath(__file__)))
prev_version = os.environ["UPDATE_NIX_OLD_VERSION"]
homepage = BeautifulSoup(requests.get(SITE).text, "html.parser")
version = homepage.find(
"h3",
string=re.compile("^Version \\d+\\.\\d+")
).string.split()[1]
if version == prev_version:
raise Exception("no newer version available")
down_page_path = homepage.find(
"a",
string="More Installers and Checksums"
)["href"]
down_page = BeautifulSoup(requests.get(SITE + "/" + down_page_path).text, "html.parser")
down_table = down_page.find(class_="download-table")
full = find_info(down_table, "Racket", "Unix")
minimal = find_info(down_table, "Minimal Racket", "All Platforms")
with open(MANIFEST_FILENAME, "w", encoding="utf-8") as f:
json.dump({
"version": version,
"full": full,
"minimal": minimal,
}, f, indent=2, ensure_ascii=False)
f.write("\n")
print(json.dumps(
[
{
"attrPath": os.environ["UPDATE_NIX_ATTR_PATH"],
"oldVersion": prev_version,
"newVersion": version,
"files": [ os.path.abspath(MANIFEST_FILENAME) ],
},
],
indent=2, ensure_ascii=False
))
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "simpleitk";
version = "2.4.0";
version = "2.4.1";
src = fetchFromGitHub {
owner = "SimpleITK";
repo = "SimpleITK";
tag = "v${finalAttrs.version}";
hash = "sha256-/FV5NAM9DJ54Vg6/5yn9DCybry+a8lS3fQ3HWLOeOTA=";
hash = "sha256-aVYsb7i/DNnJ8327eO2MZ5LWz8moqE7rf2DIp4M3Q+M=";
};
nativeBuildInputs = [
@@ -28,7 +28,7 @@
buildPythonPackage rec {
pname = "aiogram";
version = "3.16.0";
version = "3.17.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
owner = "aiogram";
repo = "aiogram";
tag = "v${version}";
hash = "sha256-0kvGEispsDpeTM1NXYb9HylskDONHP48NBn+JyBhSJ4=";
hash = "sha256-47PWd1geTALgO7MDglHqaoMmZ+u1BnKSlj6Jxj7fkBQ=";
};
build-system = [ hatchling ];
@@ -20,8 +20,9 @@
buildPythonPackage rec {
pname = "amaranth";
format = "pyproject";
version = "0.5.4";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
@@ -33,12 +34,11 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail \
"pdm-backend~=2.3.0" \
"pdm-backend>=2.3.0"
--replace-fail "pdm-backend~=2.3.0" "pdm-backend>=2.3.0"
'';
nativeBuildInputs = [ git ];
build-system = [ pdm-backend ];
dependencies =
@@ -59,14 +59,28 @@ buildPythonPackage rec {
pythonImportsCheck = [ "amaranth" ];
disabledTests = [
"verilog"
"test_reversible"
"test_distance"
];
disabledTestPaths = [
# Subprocesses
"tests/test_examples.py"
# Verification failures
"tests/test_lib_fifo.py"
];
meta = with lib; {
description = "Modern hardware definition language and toolchain based on Python";
mainProgram = "amaranth-rpc";
homepage = "https://amaranth-lang.org/docs/amaranth";
changelog = "https://github.com/amaranth-lang/amaranth/blob/v${version}/docs/changes.rst";
license = licenses.bsd2;
maintainers = with maintainers; [
thoughtpolice
pbsds
];
mainProgram = "amaranth-rpc";
};
}
@@ -31,16 +31,6 @@ buildPythonPackage rec {
})
];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk.frameworks;
[
Accelerate
AudioToolbox
CoreVideo
CoreGraphics
]
);
build-system = [ setuptools ];
dependencies = [ numpy ];
@@ -49,10 +39,16 @@ buildPythonPackage rec {
pythonImportsCheck = [ "aubio" ];
disabledTests = [
# https://github.com/aubio/aubio/issues/413
"test_assign_cvec_phas_slice"
];
meta = with lib; {
description = "Library for audio and music analysis";
homepage = "https://aubio.org";
license = licenses.gpl3;
changelog = "https://github.com/aubio/aubio/blob/${version}/ChangeLog";
license = licenses.gpl3Plus;
maintainers = [ ];
};
}
@@ -25,7 +25,7 @@
buildPythonPackage rec {
pname = "awswrangler";
version = "3.10.1";
version = "3.11.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -34,7 +34,7 @@ buildPythonPackage rec {
owner = "aws";
repo = "aws-sdk-pandas";
tag = version;
hash = "sha256-JR1gO24biFluwqZAIQMFGjjbn9VBxTlAS8i76N82onc=";
hash = "sha256-dIdNrfhBrfrzXmspw25yd/y6MbXRrLfDveCQk+AERV0=";
};
pythonRelaxDeps = [ "packaging" ];
@@ -1,38 +1,46 @@
{
lib,
buildPythonPackage,
fetchPypi,
azure-common,
azure-mgmt-core,
msrestazure,
buildPythonPackage,
fetchPypi,
isodate,
pythonOlder,
setuptools,
typing-extensions,
}:
buildPythonPackage rec {
pname = "azure-mgmt-cognitiveservices";
version = "13.5.0";
format = "setuptools";
version = "13.6.0";
pyproject = true;
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
extension = "zip";
hash = "sha256-RK8LGbH4J+nN6gnGBUweZgkqUcMrwe9aVtvZtAvFeBU=";
pname = "azure_mgmt_cognitiveservices";
inherit version;
hash = "sha256-YS5W956CT4HVkM/wwJJTNYraBl1aYWnBOQX8NQZNm0A=";
};
propagatedBuildInputs = [
msrestazure
build-system = [ setuptools ];
dependencies = [
azure-common
azure-mgmt-core
isodate
typing-extensions
];
# Module has no tests
doCheck = false;
pythonImportsCheck = [ "azure.mgmt.cognitiveservices" ];
meta = with lib; {
description = "This is the Microsoft Azure Cognitive Services Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/cognitiveservices/azure-mgmt-cognitiveservices";
changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-cognitiveservices_${version}/sdk/cognitiveservices/azure-mgmt-cognitiveservices/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ maxwilson ];
};
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "busylight-for-humans";
version = "0.33.0";
version = "0.33.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "JnyJny";
repo = "busylight";
tag = version;
hash = "sha256-gwhN8aFwxRdA6fPuCDVdBJ8yl8Zq6DAfSRW88Yk7IUk=";
hash = "sha256-66XJumC++/Wa6hY/A3m6IR2ALCH4vLSut9ERW8msLY4=";
};
build-system = [ poetry-core ];
@@ -3,6 +3,7 @@
buildPythonPackage,
fetchFromGitHub,
setuptools,
pythonAtLeast,
construct,
typing-extensions,
arrow,
@@ -46,11 +47,17 @@ buildPythonPackage rec {
ruamel-yaml
];
disabledTests = [
# tests fail with construct>=2.10.70
"test_bitsinteger"
"test_bytesinteger"
];
disabledTests =
[
# tests fail with construct>=2.10.70
"test_bitsinteger"
"test_bytesinteger"
]
++ lib.optionals (pythonAtLeast "3.13") [
# https://github.com/timrid/construct-typing/issues/31
"test_tenum_docstring"
"test_tenum_flags_docstring"
];
meta = {
changelog = "https://github.com/timrid/construct-typing/releases/tag/v${version}";
@@ -8,6 +8,7 @@
poetry-core,
pytest,
pytest-asyncio,
pytest-codspeed,
pytest-cov-stub,
python,
pythonOlder,
@@ -16,16 +17,16 @@
buildPythonPackage rec {
pname = "dbus-fast";
version = "2.24.3";
version = "2.28.0";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "Bluetooth-Devices";
repo = "dbus-fast";
tag = "v${version}";
hash = "sha256-RRVQCah44YTgRoGKtTDFU3dsaFbiUnKze3tZoCLM4uk=";
hash = "sha256-qASafZv4PvTQnb0hc3pBPUQgZ4vEjz77KcDeVbc04Tc=";
};
# The project can build both an optimized cython version and an unoptimized
@@ -44,6 +45,7 @@ buildPythonPackage rec {
dbus
pytest
pytest-asyncio
pytest-codspeed
pytest-cov-stub
];
@@ -68,7 +70,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Faster version of dbus-next";
homepage = "https://github.com/bluetooth-devices/dbus-fast";
changelog = "https://github.com/Bluetooth-Devices/dbus-fast/blob/${src.rev}/CHANGELOG.md";
changelog = "https://github.com/Bluetooth-Devices/dbus-fast/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
@@ -8,16 +8,16 @@
buildPythonPackage rec {
pname = "elementpath";
version = "4.5.0";
version = "4.6.0";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "sissaschool";
repo = "elementpath";
tag = "v${version}";
hash = "sha256-zyJ+UtPTGEziIlucIXN1dIzfN5sfLkeOia7tiqOGFjk=";
hash = "sha256-lFUrY3LOSc2OROkzotGSW9N3h9dJA4EnCvLNU41BPA0=";
};
build-system = [ setuptools ];
@@ -3,41 +3,69 @@
buildPythonPackage,
fetchFromGitHub,
h5py,
hatch-vcs,
hatchling,
igraph,
numpy,
six,
wasserstein,
pot,
pytestCheckHook,
pythonOlder,
scikit-learn,
tensorflow,
tf-keras,
wasserstein,
}:
buildPythonPackage rec {
pname = "energyflow";
version = "1.3.3";
version = "1.4.0";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "pkomiske";
repo = "EnergyFlow";
tag = "v${version}";
hash = "sha256-Ioyk0IpyxcDdL2+3zkUa6yydavyphoh4do7GCz5nG60=";
hash = "sha256-4RzhpeOOty8IaVGByHD+PyeaeWgR7ZF98mSCJYoM9wY=";
};
postPatch = ''
substituteInPlace setup.cfg \
--replace "setup_requires=" "" \
--replace "pytest-runner" ""
'';
build-system = [
hatch-vcs
hatchling
];
propagatedBuildInputs = [
dependencies = [
h5py
numpy
six
wasserstein
];
nativeCheckInputs = [ pytestCheckHook ];
pytestFlagsArray = [ "energyflow/tests" ];
disabledTestPaths = [
"energyflow/tests/test_archs.py" # requires tensorflow
"energyflow/tests/test_emd.py" # requires "ot"
optional-dependencies = {
all = [
igraph
scikit-learn
tensorflow
];
archs = [
scikit-learn
tensorflow
];
generation = [ igraph ];
};
nativeCheckInputs = [
pot
pytestCheckHook
tf-keras
] ++ lib.flatten (builtins.attrValues optional-dependencies);
disabledTests = [
# Issues with array
"test_emd_equivalence"
"test_gdim"
"test_n_jobs"
"test_periodic_phi"
];
pythonImportsCheck = [ "energyflow" ];
@@ -45,6 +73,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python package for the EnergyFlow suite of tools";
homepage = "https://energyflow.network/";
changelog = "https://github.com/thaler-lab/EnergyFlow/releases/tag/v${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ veprbl ];
};
@@ -2,11 +2,11 @@
lib,
aiohttp,
buildPythonPackage,
defusedxml,
fetchFromGitHub,
geopy,
imageio,
lxml,
numpy,
pandas,
pillow,
pytestCheckHook,
@@ -18,26 +18,26 @@
buildPythonPackage rec {
pname = "env-canada";
version = "0.7.2";
version = "0.8.0";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "michaeldavie";
repo = "env_canada";
tag = "v${version}";
hash = "sha256-3SVpzWii9/ViJ7mbrqzKmN5FkOOYTeYdhJll6q/IseU=";
hash = "sha256-4PztYdQmMH2n3dlV8arJ2UFGp08nkIK80L460UdNhV8=";
};
build-system = [ setuptools ];
dependencies = [
aiohttp
defusedxml
geopy
imageio
lxml
numpy
pandas
pillow
python-dateutil
@@ -57,6 +57,7 @@ buildPythonPackage rec {
"test_get_loop"
"test_get_ec_sites"
"test_ecradar"
"test_historical_number_values"
];
pythonImportsCheck = [ "env_canada" ];
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "environs";
version = "14.0.0";
version = "14.1.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "sloria";
repo = "environs";
tag = version;
hash = "sha256-sqEe0DoJHUtHFin04+lNQKuXjvSmDmfwjQIvU6a4sDo=";
hash = "sha256-OmZn6ngujcPuws+idRtzwIt+9XLfRge7IFby+yCiQNM=";
};
nativeBuildInputs = [ flit-core ];
@@ -1,5 +1,6 @@
{
lib,
stdenv,
buildPythonPackage,
fetchFromGitHub,
@@ -47,6 +48,11 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
# SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated!
"test_filter"
];
pythonImportsCheck = [ "equinox" ];
meta = {
@@ -1,5 +1,6 @@
{
lib,
stdenv,
buildPythonPackage,
fetchFromGitHub,
@@ -106,14 +107,20 @@ buildPythonPackage rec {
"tests/tensorboard_test.py"
];
disabledTests = [
# ValueError: Checkpoint path should be absolute
"test_overwrite_checkpoints0"
# Fixed in more recent versions of jax: https://github.com/google/flax/issues/4211
# TODO: Re-enable when jax>0.4.28 will be available in nixpkgs
"test_vmap_and_cond_passthrough" # ValueError: vmap has mapped output but out_axes is None
"test_vmap_and_cond_passthrough_error" # AssertionError: "at vmap.*'broadcast'.*got axis spec ...
];
disabledTests =
[
# ValueError: Checkpoint path should be absolute
"test_overwrite_checkpoints0"
# Fixed in more recent versions of jax: https://github.com/google/flax/issues/4211
# TODO: Re-enable when jax>0.4.28 will be available in nixpkgs
"test_vmap_and_cond_passthrough" # ValueError: vmap has mapped output but out_axes is None
"test_vmap_and_cond_passthrough_error" # AssertionError: "at vmap.*'broadcast'.*got axis spec ...
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated!
"test_ref_changed"
"test_structure_changed"
];
passthru = {
updateScript = writeScript "update.sh" ''
@@ -5,23 +5,28 @@
fetchPypi,
pillow,
poetry-core,
pythonOlder,
requests,
rich,
}:
buildPythonPackage rec {
pname = "getjump";
version = "2.6.1";
version = "2.7.1";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
hash = "sha256-WuAsTfOe38i90jWqOpIBYbizmb9gLtXD+ttZ1WAFDes=";
hash = "sha256-tIM7gsgh8DDPphGsrGeV6Y3RmAjdxw9MgxDIt+EQwF0=";
};
nativeBuildInputs = [ poetry-core ];
pythonRelaxDeps = [ "pillow" ];
propagatedBuildInputs = [
build-system = [ poetry-core ];
dependencies = [
beautifulsoup4
pillow
requests
@@ -25,6 +25,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "poetry_core>=1,<2" "poetry-core" \
--replace-fail ', "setuptools>=59,<70"' ""
'';
@@ -35,6 +35,7 @@ buildPythonPackage rec {
#
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "poetry_core>=1,<2" "poetry-core" \
--replace ', "setuptools>=59,<70"' ""
'';
@@ -2,7 +2,6 @@
lib,
buildPythonPackage,
fetchFromGitHub,
fetchpatch2,
# build-system
setuptools,
@@ -17,31 +16,23 @@
buildPythonPackage rec {
pname = "ml-dtypes";
version = "0.5.0";
version = "0.5.2";
pyproject = true;
src = fetchFromGitHub {
owner = "jax-ml";
repo = "ml_dtypes";
tag = "v${version}";
hash = "sha256-+6job9fEHVguh9JBE/NUv+QezwQohuKPO8DlhbaawZ4=";
hash = "sha256-XRvqyWyi5smaLh5ese5QY2aIOkVliXGc7ngwT5CRsmc=";
# Since this upstream patch (https://github.com/jax-ml/ml_dtypes/commit/1bfd097e794413b0d465fa34f2eff0f3828ff521),
# the attempts to use the nixpkgs packaged eigen dependency have failed.
# Hence, we rely on the bundled eigen library.
fetchSubmodules = true;
};
patches = [
(fetchpatch2 {
name = "numpy2-compat.patch";
url = "https://github.com/jax-ml/ml_dtypes/commit/204df1147fd568f65890d958b6cdfa4dc55a226c.patch";
hash = "sha256-IPHE6bQTbM0Ky5X6FDwwD/1eXL+kcA/D8pDGihAiJrQ=";
})
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "setuptools~=73.0.1" "setuptools"
--replace-fail "setuptools~=75.7.0" "setuptools"
'';
build-system = [ setuptools ];
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
importlib-metadata,
numpy,
pybind11,
@@ -13,21 +14,30 @@
buildPythonPackage rec {
pname = "pyfma";
version = "0.1.6";
format = "pyproject";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "nschloe";
repo = pname;
repo = "pyfma";
rev = version;
sha256 = "12i68jj9n1qj9phjnj6f0kmfhlsd3fqjlk9p6d4gs008azw5m8yn";
hash = "sha256-1qNa+FcIAP1IMzdNKrEbTVPo6gTOSCvhTRIHm6REJoo=";
};
nativeBuildInputs = [ setuptools ];
patches = [
# Replace deprecated np.find_common_type calls with np.promote_types, https://github.com/nschloe/pyfma/pull/17
(fetchpatch {
url = "https://github.com/nschloe/pyfma/commit/e12d69d97a97657ab4fec3e8f2b2859f4360bc03.patch";
hash = "sha256-BsQe4hpo+Cripa0FRGFnRBs1oQ1GZA1+ZYzycy5M4Ek=";
})
];
build-system = [ setuptools ];
buildInputs = [ pybind11 ];
propagatedBuildInputs = [ numpy ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
dependencies = [ numpy ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
nativeCheckInputs = [ pytestCheckHook ];
@@ -36,6 +46,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Fused multiply-add for Python";
homepage = "https://github.com/nschloe/pyfma";
changelog = "https://github.com/nschloe/pyfma/releases/tag/${version}";
license = licenses.mit;
maintainers = [ ];
};
@@ -12,19 +12,24 @@
buildPythonPackage rec {
pname = "pylibjpeg-libjpeg";
version = "2.2.0";
version = "2.3.0";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "pydicom";
repo = pname;
tag = "v${version}";
hash = "sha256-g4dGIGHo0J+F0KTVA6yjgfwiYVn6iU69jgHhvEQGwOc=";
hash = "sha256-xqSA1cutTsH9k4l9CW96n/CURzkAyDi3PZylZeedVjA=";
fetchSubmodules = true;
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail 'poetry-core >=1.8,<2' 'poetry-core'
'';
build-system = [
cython
poetry-core
@@ -2,28 +2,25 @@
lib,
buildPythonPackage,
fetchFromGitHub,
importlib-metadata,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "pyroute2";
version = "0.7.12";
version = "0.8.1";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "svinota";
repo = "pyroute2";
tag = version;
hash = "sha256-zB792ZwDWd74YBYvQ5au0t2RWTIAqrWvNtQ/e+ZEk50=";
hash = "sha256-eItzD9ub8COaOkNLEKLtf8uJil4W4rqjzVa95LJahHw=";
};
nativeBuildInputs = [ setuptools ];
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
build-system = [ setuptools ];
# Requires root privileges, https://github.com/svinota/pyroute2/issues/778
doCheck = false;
@@ -2,21 +2,19 @@
lib,
buildPythonPackage,
fetchFromGitHub,
pytestCheckHook,
pytest-asyncio,
nix-update-script,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
setuptools,
wheel,
}:
buildPythonPackage rec {
pname = "result";
version = "0.17.0";
pyproject = true;
build-system = [
setuptools
wheel
];
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "rustedpy";
@@ -25,27 +23,20 @@ buildPythonPackage rec {
hash = "sha256-o+7qKxGQCeMUnsmEReggvf+XwQWFHRCYArYk3DxCa50=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace '"--flake8",' "" \
--replace '"--tb=short",' "" \
--replace '"--cov=result",' "" \
--replace '"--cov=tests",' "" \
--replace '"--cov-report=term",' "" \
--replace '"--cov-report=xml",' ""
'';
build-system = [ setuptools ];
nativeCheckInputs = [
pytestCheckHook
pytest-asyncio
pytest-cov-stub
pytestCheckHook
];
passthru.updateScript = nix-update-script { };
pythonImportsCheck = [ "result" ];
meta = with lib; {
description = "A simple Result type for Python 3 inspired by Rust, fully type annotated";
description = "A Rust-like result type for Python";
homepage = "https://github.com/rustedpy/result";
changelog = "https://github.com/rustedpy/result/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with lib.maintainers; [ emattiza ];
};
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "scikit-hep-testdata";
version = "0.5.0";
version = "0.5.2";
pyproject = true;
src = fetchFromGitHub {
owner = "scikit-hep";
repo = "scikit-hep-testdata";
tag = "v${version}";
hash = "sha256-FIv3yC5Q3H1RXl0n32YH1UqaZiMuWHNcMPTSKLN+IkA=";
hash = "sha256-yG9ZeBKB0NcTZ8zU0iJTSwDvaafD+2FzkDk2dVYSJO8=";
};
build-system = [ setuptools-scm ];
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "teslemetry-stream";
version = "0.4.2";
version = "0.6.3";
pyproject = true;
src = fetchFromGitHub {
owner = "Teslemetry";
repo = "python-teslemetry-stream";
rev = "v${version}";
hash = "sha256-Ny68yiM0LS2U7zy6K2R35ZLm+Jo4s+HIFJjuqgL49E0=";
hash = "sha256-hKGYZYRfI4FikTPsf7Wy0gOA+dCiMdlpWtEb/Gn1y7s=";
};
build-system = [ setuptools ];
@@ -1,14 +1,15 @@
{
lib,
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
aiohttp,
yarl,
aresponses,
buildPythonPackage,
fetchFromGitHub,
poetry-core,
pytest-asyncio,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
yarl,
}:
buildPythonPackage rec {
@@ -26,8 +27,8 @@ buildPythonPackage rec {
};
postPatch = ''
# Upstream is creating GitHub releases without version
substituteInPlace pyproject.toml \
--replace "--cov" "" \
--replace '"0.0.0"' '"${version}"'
'';
@@ -41,6 +42,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
aresponses
pytest-asyncio
pytest-cov-stub
pytestCheckHook
];
@@ -3,6 +3,7 @@
buildPythonPackage,
fetchFromGitHub,
paho-mqtt_2,
pytest-cov-stub,
pytestCheckHook,
python-dateutil,
pythonOlder,
@@ -30,8 +31,7 @@ buildPythonPackage rec {
substituteInPlace requirements.txt \
--replace-fail "weconnect[Images]~=" "weconnect>="
substituteInPlace pytest.ini \
--replace-fail "--cov=weconnect_mqtt --cov-config=.coveragerc --cov-report html" "" \
--replace-fail "pytest-cov" ""
--replace-fail "required_plugins = pytest-cov" ""
'';
pythonRelaxDeps = [ "python-dateutil" ];
@@ -44,7 +44,10 @@ buildPythonPackage rec {
weconnect
] ++ weconnect.optional-dependencies.Images;
nativeCheckInputs = [ pytestCheckHook ];
nativeCheckInputs = [
pytest-cov-stub
pytestCheckHook
];
pythonImportsCheck = [ "weconnect_mqtt" ];
@@ -52,7 +55,7 @@ buildPythonPackage rec {
description = "Python client that publishes data from Volkswagen WeConnect";
homepage = "https://github.com/tillsteinbach/WeConnect-mqtt";
changelog = "https://github.com/tillsteinbach/WeConnect-mqtt/releases/tag/v${version}";
license = with lib.licenses; [ mit ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "weconnect-mqtt";
};
@@ -5,6 +5,7 @@
fetchFromGitHub,
oauthlib,
pillow,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
requests,
@@ -32,13 +33,12 @@ buildPythonPackage rec {
--replace-fail "setup_requires=SETUP_REQUIRED" "setup_requires=[]" \
--replace-fail "tests_require=TEST_REQUIRED" "tests_require=[]"
substituteInPlace pytest.ini \
--replace-fail "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \
--replace-fail "required_plugins = pytest-cov" ""
'';
nativeBuildInputs = [ setuptools ];
build-system = [ setuptools ];
propagatedBuildInputs = [
dependencies = [
oauthlib
requests
];
@@ -50,7 +50,10 @@ buildPythonPackage rec {
];
};
nativeCheckInputs = [ pytestCheckHook ];
nativeCheckInputs = [
pytest-cov-stub
pytestCheckHook
];
pythonImportsCheck = [ "weconnect" ];
@@ -58,7 +61,7 @@ buildPythonPackage rec {
description = "Python client for the Volkswagen WeConnect Services";
homepage = "https://github.com/tillsteinbach/WeConnect-python";
changelog = "https://github.com/tillsteinbach/WeConnect-python/releases/tag/v${version}";
license = with licenses; [ mit ];
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}
@@ -1,21 +1,22 @@
{
lib,
arrow,
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
poetry-core,
arrow,
requests-oauthlib,
typing-extensions,
pydantic,
responses,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
requests-oauthlib,
responses,
typing-extensions,
}:
buildPythonPackage rec {
pname = "withings-api";
version = "2.4.0";
format = "pyproject";
pyproject = true;
disabled = pythonOlder "3.6";
@@ -28,13 +29,12 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'requests-oauth = ">=0.4.1"' ''' \
--replace 'addopts = "--capture no --cov ./withings_api --cov-report html:build/coverage_report --cov-report term --cov-report xml:build/coverage.xml"' '''
--replace-fail 'requests-oauth = ">=0.4.1"' '''
'';
nativeBuildInputs = [ poetry-core ];
build-system = [ poetry-core ];
propagatedBuildInputs = [
dependencies = [
arrow
requests-oauthlib
typing-extensions
@@ -42,13 +42,17 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
pytest-cov-stub
pytestCheckHook
responses
];
pythonImportsCheck = [ "withings_api" ];
meta = with lib; {
description = "Library for the Withings Health API";
homepage = "https://github.com/vangorra/python_withings_api";
changelog = "https://github.com/vangorra/python_withings_api/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ kittywitch ];
broken = versionAtLeast pydantic.version "2";
@@ -7,6 +7,7 @@
ifaddr,
poetry-core,
pytest-asyncio,
pytest-codspeed,
pytest-cov-stub,
pytest-timeout,
pythonOlder,
@@ -16,16 +17,16 @@
buildPythonPackage rec {
pname = "zeroconf";
version = "0.136.2";
version = "0.139.0";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "jstasiak";
repo = "python-zeroconf";
tag = version;
hash = "sha256-gSoxrG+5LCI0DCEGqrQvzFfnKhlJV5kyqLH6IrN7Zjs=";
hash = "sha256-qhfr4MIBSOyXCQ+RP43016gedXo8bCgxz1tt5oSHAgo=";
};
build-system = [
@@ -38,6 +39,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytest-asyncio
pytest-codspeed
pytest-cov-stub
pytest-timeout
pytestCheckHook
@@ -11,7 +11,7 @@
let
pname = "surrealdb-migrations";
version = "2.0.0";
version = "2.1.0";
in
rustPlatform.buildRustPackage rec {
inherit pname version;
@@ -20,10 +20,10 @@ rustPlatform.buildRustPackage rec {
owner = "Odonno";
repo = pname;
rev = "v${version}";
hash = "sha256-MrIawJr8EydfYFVzxODUZ7jDj0B0M1FAuX4Arktbf4Y=";
hash = "sha256-zTOAwSjsgu3axq+VSnXAIGKRDeeRBaQtoNoVU2eKAIk=";
};
cargoHash = "sha256-ELYBEQrh80LdNYNZwcGVh9GE+dSfjF+RuO8fd0PabIw=";
cargoHash = "sha256-ZvWq3DKNAUz/6v0RjUXbEeO6+H84bbDLOVV05vD96Yk=";
buildInputs = [ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
@@ -1,18 +1,21 @@
# Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as:
# $ ./refresh-tarballs.bash --targets=armv5tel-unknown-linux-gnueabi
#
# Metadata:
# - nixpkgs revision: 029dea9aaacf920ce8f7d89e4cf09da31a38d8e1
# - hydra build: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv5tel-unknown-linux-gnueabi.build/latest
# - resolved hydra build: https://hydra.nixos.org/build/281086357
# - instantiated derivation: /nix/store/j44ipis8k634n1a6j9j1blff88w13ix9-stdenv-bootstrap-tools-armv5tel-unknown-linux-gnueabi.drv
# - output directory: /nix/store/7xapg8fj3p2fpmnppsd28a66q62vzdg1-stdenv-bootstrap-tools-armv5tel-unknown-linux-gnueabi
# - build time: Tue, 03 Dec 2024 13:59:40 +0000
{
# Note: do not use Hydra as a source URL. Ask a member of the
# infrastructure team to mirror the job.
bootstrapTools = import <nix/fetchurl.nix> {
url = "http://tarballs.nixos.org/stdenv/armv5tel-unknown-linux-gnueabi/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1/bootstrap-tools.tar.xz";
hash = "sha256-+7cdKUThhOb4pVFBjPWFpBbTfn64A/ezkZnP6hEhMRM=";
};
busybox = import <nix/fetchurl.nix> {
# from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv5tel.dist/latest
# from build: https://hydra.nixos.org/build/114203025
url = "http://tarballs.nixos.org/stdenv-linux/armv5tel/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/busybox";
# note: the following hash is different than the above hash, due to executable = true
sha256 = "0qxp2fsvs4phbc17g9npj9bsm20ylr8myi5pivcrmxm5qqflgi8d";
url = "http://tarballs.nixos.org/stdenv/armv5tel-unknown-linux-gnueabi/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1/busybox";
hash = "sha256-vZ3oSKUjGVcx2TJsrKmTX4d+3S4/flD780vFVaaHDGI=";
executable = true;
};
bootstrapTools = import <nix/fetchurl.nix> {
# from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv5tel.dist/latest
# from build: https://hydra.nixos.org/build/114203025
url = "http://tarballs.nixos.org/stdenv-linux/armv5tel/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/bootstrap-tools.tar.xz";
sha256 = "28327343db5ecc7f7811449ec69280d5867fa5d1d377cab0426beb9d4e059ed6";
};
}
@@ -1,18 +1,21 @@
# Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as:
# $ ./refresh-tarballs.bash --targets=armv6l-unknown-linux-gnueabihf
#
# Metadata:
# - nixpkgs revision: 029dea9aaacf920ce8f7d89e4cf09da31a38d8e1
# - hydra build: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv6l-unknown-linux-gnueabihf.build/latest
# - resolved hydra build: https://hydra.nixos.org/build/281086894
# - instantiated derivation: /nix/store/gq29b3av5mf7x9zlbvaf1qrvlnb1ps4l-stdenv-bootstrap-tools-armv6l-unknown-linux-gnueabihf.drv
# - output directory: /nix/store/cwfvh58lcbyk26d34j1w26d3ladgcgn8-stdenv-bootstrap-tools-armv6l-unknown-linux-gnueabihf
# - build time: Tue, 03 Dec 2024 13:59:47 +0000
{
# Note: do not use Hydra as a source URL. Ask a member of the
# infrastructure team to mirror the job.
bootstrapTools = import <nix/fetchurl.nix> {
url = "http://tarballs.nixos.org/stdenv/armv6l-unknown-linux-gnueabihf/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1/bootstrap-tools.tar.xz";
hash = "sha256-IOZRTJRvoP0bIz5GI6GqGAYb/FdME+xVVyFTvgtmLuw=";
};
busybox = import <nix/fetchurl.nix> {
# from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv6l.dist/latest
# from build: https://hydra.nixos.org/build/114202834
url = "http://tarballs.nixos.org/stdenv-linux/armv6l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/busybox";
# note: the following hash is different than the above hash, due to executable = true
sha256 = "1q02537cq56wlaxbz3s3kj5vmh6jbm27jhvga6b4m4jycz5sxxp6";
url = "http://tarballs.nixos.org/stdenv/armv6l-unknown-linux-gnueabihf/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1/busybox";
hash = "sha256-kdlAOhgypLa+ZesRT1ZVDoDQdNefV1Rx5Yf7H254o80=";
executable = true;
};
bootstrapTools = import <nix/fetchurl.nix> {
# from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv6l.dist/latest
# from build: https://hydra.nixos.org/build/114202834
url = "http://tarballs.nixos.org/stdenv-linux/armv6l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/bootstrap-tools.tar.xz";
sha256 = "0810fe74f8cd09831f177d075bd451a66b71278d3cc8db55b07c5e38ef3fbf3f";
};
}
+3 -1
View File
@@ -36,7 +36,9 @@ stdenv.mkDerivation rec {
# Disable stack-related gnulib tests on x86_64-darwin because they have problems running under
# Rosetta 2: test-c-stack hangs, test-sigsegv-catch-stackoverflow fails.
postPatch =
if (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) then
if
((stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) || (stdenv.hostPlatform.isAarch32))
then
''
sed -i -E 's:test-c-stack2?\.sh::g' gnulib-tests/Makefile.in
sed -i -E 's:test-sigsegv-catch-stackoverflow[12]::g' gnulib-tests/Makefile.in
+2 -1
View File
@@ -32,7 +32,8 @@ stdenv.mkDerivation {
# cygwin: FAIL: multibyte-white-space
# freebsd: FAIL mb-non-UTF8-performance
# x86_64-darwin: fails 'stack-overflow' tests on Rosetta 2 emulator
doCheck = !stdenv.hostPlatform.isCygwin && !stdenv.hostPlatform.isFreeBSD && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) && !stdenv.buildPlatform.isRiscV64;
# aarch32: fails 'stack-overflow' when run on qemu under x86_64
doCheck = !stdenv.hostPlatform.isCygwin && !stdenv.hostPlatform.isFreeBSD && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) && !stdenv.buildPlatform.isRiscV64 && !stdenv.hostPlatform.isAarch32;
# On macOS, force use of mkdir -p, since Grep's fallback
# (./install-sh) is broken.
+3 -13
View File
@@ -1584,10 +1584,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
amber-secret = callPackage ../tools/security/amber {
inherit (darwin.apple_sdk.frameworks) Security;
};
inherit (callPackages ../development/tools/ammonite {})
ammonite_2_12
ammonite_2_13
@@ -1960,8 +1956,6 @@ with pkgs;
babelfish = callPackage ../shells/fish/babelfish.nix { };
badchars = python3Packages.callPackage ../tools/security/badchars { };
bat-extras = recurseIntoAttrs (callPackages ../tools/misc/bat-extras { });
beauty-line-icon-theme = callPackage ../data/icons/beauty-line-icon-theme {
@@ -7361,10 +7355,8 @@ with pkgs;
wireplumber = callPackage ../development/libraries/pipewire/wireplumber.nix { };
racket = callPackage ../development/interpreters/racket {
inherit (darwin.apple_sdk.frameworks) CoreFoundation;
};
racket-minimal = callPackage ../development/interpreters/racket/minimal.nix { };
racket = callPackage ../development/interpreters/racket { };
racket-minimal = racket.override { isMinimal = true; };
rakudo = callPackage ../development/interpreters/rakudo { };
moarvm = darwin.apple_sdk_11_0.callPackage ../development/interpreters/rakudo/moarvm.nix {
@@ -9387,9 +9379,7 @@ with pkgs;
isort = with python3Packages; toPythonApplication isort;
ispc = callPackage ../development/compilers/ispc {
llvmPackages = llvmPackages_17;
};
ispc = callPackage ../development/compilers/ispc { };
isso = callPackage ../servers/isso {
nodejs = nodejs_20;