Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -7933,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,
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -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; {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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": {
|
||||
|
||||
@@ -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 [
|
||||
|
||||
@@ -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}" ];
|
||||
|
||||
|
||||
@@ -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";
|
||||
};
|
||||
})
|
||||
@@ -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";
|
||||
|
||||
@@ -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";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
Generated
+16
-16
@@ -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",
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
Generated
+2242
-1855
File diff suppressed because it is too large
Load Diff
@@ -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=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -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
@@ -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 = [
|
||||
|
||||
@@ -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 = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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 ];
|
||||
};
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
|
||||
@@ -7355,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 {
|
||||
|
||||
Reference in New Issue
Block a user