Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
b08c99d57a
|
|
@ -21075,6 +21075,12 @@
|
|||
githubId = 357664;
|
||||
name = "Viktor Petersson";
|
||||
};
|
||||
vpochapuis = {
|
||||
email = "vincent.professional@chapuis.ovh";
|
||||
github = "vpochapuis";
|
||||
githubId = 75721408;
|
||||
name = "Vincent Chapuis";
|
||||
};
|
||||
vq = {
|
||||
email = "vq@erq.se";
|
||||
github = "vq";
|
||||
|
|
|
|||
|
|
@ -3275,8 +3275,8 @@ let
|
|||
publisher = "myriad-dreamin";
|
||||
# Please update the corresponding binary (tinymist) when updating
|
||||
# this extension.
|
||||
version = "0.11.1";
|
||||
hash = "sha256-jyZBnT8UW94TVnZKZna1cJa/UIj+DwYwlAbU4pnaf04=";
|
||||
version = "0.11.3";
|
||||
hash = "sha256-b5aD4gz4j+QAEPmYaNnaputbYTPoFxVFih76HmznUP8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ jq moreutils ];
|
||||
|
|
|
|||
|
|
@ -13,16 +13,16 @@ let
|
|||
common = { stname, target, postInstall ? "" }:
|
||||
buildGoModule rec {
|
||||
pname = stname;
|
||||
version = "1.27.4";
|
||||
version = "1.27.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "syncthing";
|
||||
repo = "syncthing";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TXkZJAN72Qa3Mo2TYvCHNOl3BWfRxu78XXHW48Jjj0M=";
|
||||
hash = "sha256-Fcsa6xE0i1iXFZ76L57OKKxDJ9stw6WnJL3PQOTr/QQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ALdmETpEmvA3bTfBRK6LaO7bnlH03fljX1P7rqzskG4=";
|
||||
vendorHash = "sha256-CSI2Mnu3Da99cNE2s6HadTyxFVIbhXLOy3aykij1GLo=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isDarwin [
|
||||
# Recent versions of macOS seem to require binaries to be signed when
|
||||
|
|
|
|||
|
|
@ -0,0 +1,35 @@
|
|||
{ lib
|
||||
, python3
|
||||
, fetchFromGitLab
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "annextimelog";
|
||||
version = "0.13.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "nobodyinperson";
|
||||
repo = "annextimelog";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VgeILw8WfqVrmsU/kBw+jHTOt2a6sVT7YgP2pKRp2AY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
wheel
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
rich
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "️Git Annex-backed Time Tracking";
|
||||
homepage = "https://gitlab.com/nobodyinperson/annextimelog";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ matthiasbeyer ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-autoinherit";
|
||||
version = "0.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mainmatter";
|
||||
repo = "cargo-autoinherit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BuZDCd4SwSYg5eKV61L3RpPVmq5NZDAOc9zOz5QiSNI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9hhrVkC1xB2E/vatkiM4PIJyXq+0GDoqlgXZXc8WehU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automatically DRY up your Rust dependencies";
|
||||
homepage = "https://github.com/mainmatter/cargo-autoinherit";
|
||||
license = with licenses; [ asl20 /* OR */ mit ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ matthiasbeyer ];
|
||||
mainProgram = "cargo-autoinherit";
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -18,10 +18,9 @@ symlinkJoin {
|
|||
];
|
||||
|
||||
postBuild = ''
|
||||
rm -rf $out/bin/*
|
||||
makeWrapper ${etlegacy-unwrapped}/bin/etl.* $out/bin/etl \
|
||||
makeWrapper $out/bin/etl.* $out/bin/etl \
|
||||
--add-flags "+set fs_basepath ${placeholder "out"}/lib/etlegacy"
|
||||
makeWrapper ${etlegacy-unwrapped}/bin/etlded.* $out/bin/etlded \
|
||||
makeWrapper $out/bin/etlded.* $out/bin/etlded \
|
||||
--add-flags "+set fs_basepath ${placeholder "out"}/lib/etlegacy"
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ldproxy";
|
||||
version = "0.31.4";
|
||||
|
||||
# The source of this tools actually comes from the set of tools located in the `esp-rs:embuild` repository
|
||||
# cf: https://github.com/esp-rs/embuild
|
||||
src = fetchFromGitHub {
|
||||
owner = "esp-rs";
|
||||
repo = "embuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YH2CPb3uBlPncd+KkP25xhCVvDB7HDxJuSqWOJ1LT3k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-HobX/aBn10KPpUKRSLt2IvfFVW7YpOu5tX4zNSCz6tw=";
|
||||
|
||||
# However we are only interested in building the specific crate located at `/ldproxy`
|
||||
# cf: https://github.com/esp-rs/embuild/tree/v0.31.4/ldproxy
|
||||
buildAndTestSubdir = "ldproxy";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Linker Proxy: a simple tool to forward linker arguments to the actual linker executable";
|
||||
homepage = "https://github.com/esp-rs/embuild";
|
||||
changelog = "https://github.com/esp-rs/embuild/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ mit /* or */ asl20 ];
|
||||
maintainers = with maintainers; [ vpochapuis ];
|
||||
};
|
||||
}
|
||||
|
|
@ -54,8 +54,11 @@
|
|||
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; })
|
||||
(fetchNuGet { pname = "MimeKit"; version = "1.22.0"; sha256 = "0zs9a4gjcs3q402dvvgfv58304sx533nrrhiafgqc04aazpqypr4"; })
|
||||
(fetchNuGet { pname = "NAPS2.Pdfium.Binaries"; version = "1.0.1"; sha256 = "0zn0y05l3975akm2kxifg90d5mqsjphviqdvi6hhpm8llxiip01g"; })
|
||||
(fetchNuGet { pname = "NAPS2.Tesseract.Binaries"; version = "1.1.0"; sha256 = "02hlmv9yyx1nca2ccbcac7swjqf7g9708qbjdzcmmwkvyrbwbgrc"; })
|
||||
(fetchNuGet { pname = "NAPS2.Mdns"; version = "1.0.1"; sha256 = "0xi46brppcjm8mrabnffahkmkcakhw94cnq1w2yk8y2hyq9qb4ms"; })
|
||||
(fetchNuGet { pname = "NAPS2.NTwain"; version = "1.0.0"; sha256 = "088dw31h7rlgr0s05snm382wz65wi46yaizjnjpd0wzw2mb58yld"; })
|
||||
(fetchNuGet { pname = "NAPS2.Pdfium.Binaries"; version = "1.1.0"; sha256 = "0rnqkk6y047p6a6li2dr2cygkhjn3d2a13yn3rck5gf854k3q3ws"; })
|
||||
(fetchNuGet { pname = "NAPS2.PdfSharp"; version = "1.0.1"; sha256 = "0x51whjhlqd5r0f1s5hjx41zzwwcwcdl19q6iz6k7fwx81746w0w"; })
|
||||
(fetchNuGet { pname = "NAPS2.Tesseract.Binaries"; version = "1.2.0"; sha256 = "0m1aksfjg4vfl2llvhd2in0a5i4wa72nmfw2h78y4wwxmjplbfz2"; })
|
||||
(fetchNuGet { pname = "NAPS2.Wia"; version = "2.0.3"; sha256 = "0xszkccb8fy2x60nkblpda78wx2d86fn8y49j94qmvz4rp2nw98i"; })
|
||||
(fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; })
|
||||
(fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; })
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildDotnetModule
|
||||
, dotnetCorePackages
|
||||
, fetchFromGitHub
|
||||
|
|
@ -11,13 +12,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "naps2";
|
||||
version = "7.3.0";
|
||||
version = "7.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cyanfish";
|
||||
repo = "naps2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aR4IDPfcbWWyM+1MhSWIsNUNLi43MvbWBykoEkVbe+4=";
|
||||
hash = "sha256-zU6VjHNtuX8JHC03CmaDnTAAei+mEhA/oMs9p42EgtA=";
|
||||
};
|
||||
|
||||
projectFile = "NAPS2.App.Gtk/NAPS2.App.Gtk.csproj";
|
||||
|
|
@ -48,11 +49,13 @@ buildDotnetModule rec {
|
|||
|
||||
meta = {
|
||||
description = "Scan documents to PDF and more, as simply as possible.";
|
||||
homepage = "www.naps2.com";
|
||||
homepage = "https://www.naps2.com";
|
||||
changelog = "https://github.com/cyanfish/naps2/blob/master/CHANGELOG.md";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ eliandoran ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "naps2";
|
||||
broken = stdenv.isAarch64; # Google.Protobuf.Tools dependency fails to build.
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -13,19 +13,21 @@ rustPlatform.buildRustPackage rec {
|
|||
pname = "tinymist";
|
||||
# Please update the corresponding vscode extension when updating
|
||||
# this derivation.
|
||||
version = "0.11.1";
|
||||
version = "0.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Myriad-Dreamin";
|
||||
repo = "tinymist";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fkUL6+lNPtNONf01vxeRSj8b6bz0pW+mNFIQrV0twKM=";
|
||||
hash = "sha256-0wVCOFWA6PX1UHe3rGWbCW4zSJHvGrW9OiFcH2wvayA=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"typst-0.11.0" = "sha256-UzZ0tbC6Dhn178GQDyLl70WTp3h5WdaBCsEKgLisZ2M=";
|
||||
"typst-syntax-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg=";
|
||||
"typstfmt_lib-0.2.7" = "sha256-LBYsTCjZ+U+lgd7Z3H1sBcWwseoHsuepPd66bWgfvhI=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -44,11 +46,16 @@ rustPlatform.buildRustPackage rec {
|
|||
darwin.apple_sdk_11_0.frameworks.SystemConfiguration
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
"--skip=e2e"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/Myriad-Dreamin/tinymist/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Tinymist is an integrated language service for Typst";
|
||||
homepage = "https://github.com/Myriad-Dreamin/tinymist";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ lampros ];
|
||||
mainProgram = "tinymist";
|
||||
maintainers = with maintainers; [ lampros ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "workout-tracker";
|
||||
version = "0.10.5";
|
||||
version = "0.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jovandeginste";
|
||||
repo = "workout-tracker";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ekGaNHysY0lXbB5w6AycnLR9/4dqUp0busCcPPvzSVI=";
|
||||
hash = "sha256-u2ezn+5PsA4z1w4OQuvfG0QeBzUGzx/11wtmoGVa3WY=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mlton";
|
||||
version = "20210107";
|
||||
version = "20210117";
|
||||
|
||||
src =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
|
|
@ -12,11 +12,11 @@ rec {
|
|||
sha256 = "00rdd2di5x1dzac64il9z05m3fdzicjd3226wwjyynv631jj3q2a";
|
||||
};
|
||||
|
||||
mlton20210107Binary = callPackage ./20210107-binary.nix { };
|
||||
mlton20210117Binary = callPackage ./20210117-binary.nix { };
|
||||
|
||||
mlton20210107 = callPackage ./from-git-source.nix {
|
||||
mlton20210117 = callPackage ./from-git-source.nix {
|
||||
mltonBootstrap = mlton20180207Binary;
|
||||
version = "20210107";
|
||||
version = "20210117";
|
||||
rev = "on-20210117-release";
|
||||
sha256 = "sha256-rqL8lnzVVR+5Hc7sWXK8dCXN92dU76qSoii3/4StODM=";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -807,7 +807,7 @@ rec {
|
|||
meta = with lib; {
|
||||
description = "Hunspell dictionary for Dutch (Netherlands) from OpenTaal";
|
||||
homepage = "https://www.opentaal.org/";
|
||||
license = with licenses; [ bsd3 ]; # and/or cc-by-nc-30
|
||||
license = with licenses; [ bsd3 /* or */ cc-by-30 ];
|
||||
maintainers = with maintainers; [ artturin ];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,10 +15,12 @@
|
|||
, font-v
|
||||
, freetype-py
|
||||
, gflanguages
|
||||
, gfsubsets
|
||||
, git
|
||||
, glyphsets
|
||||
, lxml
|
||||
, installShellFiles
|
||||
, jinja2
|
||||
, munkres
|
||||
, opentypespec
|
||||
, ots-python
|
||||
|
|
@ -32,6 +34,7 @@
|
|||
, requests
|
||||
, requests-mock
|
||||
, rich
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, shaperglot
|
||||
, stringbrewer
|
||||
|
|
@ -45,23 +48,15 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "fontbakery";
|
||||
version = "0.11.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-61EXlf+d5kJeUF41OEnGNLaOcSvFWUDFgarVvHQZYmw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Mock HTTP requests in tests (note we still have to skip some below)
|
||||
# https://github.com/googlefonts/fontbakery/pull/4124
|
||||
(fetchpatch {
|
||||
url = "https://github.com/fonttools/fontbakery/pull/4124.patch";
|
||||
hash = "sha256-NXuC2+TtxpHYMdd0t+cF0FJ3lrh4exP5yxspEasKKd0=";
|
||||
})
|
||||
];
|
||||
pyproject = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
axisregistry
|
||||
babelfont
|
||||
beautifulsoup4
|
||||
|
|
@ -74,8 +69,10 @@ buildPythonPackage rec {
|
|||
font-v
|
||||
freetype-py
|
||||
gflanguages
|
||||
gfsubsets
|
||||
glyphsets
|
||||
lxml
|
||||
jinja2
|
||||
munkres
|
||||
ots-python
|
||||
opentypespec
|
||||
|
|
@ -93,10 +90,13 @@ buildPythonPackage rec {
|
|||
vharfbuzz
|
||||
ufo2ft
|
||||
];
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
pythonRelaxDepsHook
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
@ -125,7 +125,14 @@ buildPythonPackage rec {
|
|||
'';
|
||||
disabledTests = [
|
||||
# These require network access:
|
||||
"test_check_description_broken_links"
|
||||
"test_check_description_family_update"
|
||||
"test_check_metadata_designer_profiles"
|
||||
"test_check_metadata_has_tags"
|
||||
"test_check_metadata_includes_production_subsets"
|
||||
"test_check_vertical_metrics"
|
||||
"test_check_vertical_metrics_regressions"
|
||||
"test_check_cjk_vertical_metrics"
|
||||
"test_check_cjk_vertical_metrics_regressions"
|
||||
"test_check_fontbakery_version_live_apis"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, uharfbuzz
|
||||
, youseedee
|
||||
|
|
@ -12,16 +13,17 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gflanguages";
|
||||
version = "5.0.4";
|
||||
format = "setuptools";
|
||||
version = "0.5.17";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-AGXpg9EhwdhrcbdcHqz2v9TLaWH1F5gr0QhSuEN2GDA=";
|
||||
hash = "sha256-dScgRQ6usjSqV0FqDyP+KGvHL06wlTFVcO+MmZ2NMAs=";
|
||||
};
|
||||
|
||||
pyproject = true;
|
||||
|
||||
# Relax the dependency on protobuf 3. Other packages in the Google Fonts
|
||||
# ecosystem have begun upgrading from protobuf 3 to protobuf 4,
|
||||
# so we need to use protobuf 4 here as well to avoid a conflict
|
||||
|
|
@ -30,11 +32,12 @@ buildPythonPackage rec {
|
|||
"protobuf"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
protobuf
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,47 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fonttools
|
||||
, importlib-resources
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, youseedee
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gfsubsets";
|
||||
version = "2024.2.5";
|
||||
gitTag = "v2024.02.05";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-g9QxLa3B1MMTs+jmj4CyJySZRU0zoFNYdbOZwHjKPaQ=";
|
||||
};
|
||||
|
||||
pyproject = true;
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
fonttools
|
||||
importlib-resources
|
||||
youseedee
|
||||
];
|
||||
|
||||
# Package has no unit tests.
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [
|
||||
"gfsubsets"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Codepoint definitions for the Google Fonts subsetter";
|
||||
homepage = "https://github.com/googlefonts/nam-files";
|
||||
changelog = "https://github.com/googlefonts/nam-files/releases/tag/${gitTag}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ danc86 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
From de2e02a41b11a708d58dfd1e24d335b8882dd7bd Mon Sep 17 00:00:00 2001
|
||||
From: Dan Callaghan <djc@djc.id.au>
|
||||
Date: Sun, 23 Apr 2023 12:15:47 +1000
|
||||
Subject: [PATCH] relax setuptools-scm dep
|
||||
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 2c122a7..42f9b61 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -55,7 +55,7 @@
|
||||
'Programming Language :: Python :: 3'
|
||||
],
|
||||
python_requires=">=3.7",
|
||||
- setup_requires=['setuptools_scm>=4,<6.1'],
|
||||
+ setup_requires=['setuptools_scm'],
|
||||
install_requires=[
|
||||
'setuptools',
|
||||
'FontTools[ufo]',
|
||||
--
|
||||
2.38.4
|
||||
|
||||
|
|
@ -3,8 +3,10 @@
|
|||
, fetchPypi
|
||||
, defcon
|
||||
, fonttools
|
||||
, gflanguages
|
||||
, glyphslib
|
||||
, pytestCheckHook
|
||||
, requests
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, unicodedata2
|
||||
|
|
@ -13,29 +15,23 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "glyphsets";
|
||||
version = "0.6.14";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-lMRgchadgKyfFLw6ZF1sJAKBAK75zmw77L34MW9p7TI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Upstream has a needlessly strict version range for setuptools_scm, our
|
||||
# setuptools-scm is newer. We can't use pythonRelaxDepsHook for this
|
||||
# because it's in setup_requires which means we'll fail the requirement
|
||||
# before pythonRelaxDepsHook can run.
|
||||
./0001-relax-setuptools-scm-dep.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
defcon
|
||||
fonttools
|
||||
gflanguages
|
||||
glyphslib
|
||||
requests
|
||||
setuptools
|
||||
unicodedata2
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
|
|
@ -46,6 +42,10 @@ buildPythonPackage rec {
|
|||
preCheck = ''
|
||||
export PATH="$out/bin:$PATH"
|
||||
'';
|
||||
disabledTests = [
|
||||
# This "test" just tries to connect to PyPI and look for newer releases. Not needed.
|
||||
"test_dependencies"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Google Fonts glyph set metadata";
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "litellm";
|
||||
version = "1.34.20";
|
||||
version = "1.34.29";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -42,7 +42,7 @@ buildPythonPackage rec {
|
|||
owner = "BerriAI";
|
||||
repo = "litellm";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-9MZOqNhrBFtflznqroRUc/B7dUgy9t5HdUW/LGYQOYw=";
|
||||
hash = "sha256-pY9O+zQZulI53DHbSpkjfNp09JMA4gUt6MjTg0x1ScE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "paste";
|
||||
version = "3.8.0";
|
||||
version = "3.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "cdent";
|
||||
repo = "paste";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-T9VG91Y8hap1nt3FkuCGsv8nglWNlRajvsvljXexH3Y=";
|
||||
hash = "sha256-HdeShtslnvjmuiUb0W3ASnSWcZnyDJcthsIOjYmuD8I=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pre-commit-hooks";
|
||||
version = "4.5.0";
|
||||
version = "4.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "pre-commit";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-EiPGdrpD4e9izRNJCjHRp+gR+ClzFtLjs6P57WXDs7I=";
|
||||
hash = "sha256-p/pPpuuNjVxHSPyi4RL2DJlj9weSq8QinugQ4zmv9Ck=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,9 +3,11 @@
|
|||
, fetchFromGitHub
|
||||
, gflanguages
|
||||
, num2words
|
||||
, poetry-core
|
||||
, protobuf
|
||||
, pytestCheckHook
|
||||
, pyyaml
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, strictyaml
|
||||
, termcolor
|
||||
, ufo2ft
|
||||
|
|
@ -27,18 +29,20 @@ buildPythonPackage rec {
|
|||
|
||||
pyproject = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
gflanguages
|
||||
num2words
|
||||
protobuf
|
||||
pyyaml
|
||||
strictyaml
|
||||
termcolor
|
||||
ufo2ft
|
||||
vharfbuzz
|
||||
youseedee
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -33,14 +33,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "streamlit";
|
||||
version = "1.32.2";
|
||||
version = "1.33.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Eli5y8P/lXv30Jsb/IXO3DCPEGWzB0hUUpWpr41Vd6s=";
|
||||
hash = "sha256-qNqP9G9blIxW0tx6ynphz42ZX08hdEz4IliudeYwBLo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "unicurses";
|
||||
version = "2.1.3";
|
||||
version = "3.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "Uni-Curses";
|
||||
hash = "sha256-uzSiF0jAZzI0iZngM/GuJ60o+UbLQ5XQzycTPito34w=";
|
||||
hash = "sha256-ZJUKWxu2cQlFGN1RNtyDacwSOtBiUKzk9SIDD0IQiuU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ x256 ];
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "xknxproject";
|
||||
version = "3.7.0";
|
||||
version = "3.7.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "XKNX";
|
||||
repo = "xknxproject";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-tw/hHiiW4ZGlrbQmuIihJmhyIL++Rjpg6q8AdKNsn14=";
|
||||
hash = "sha256-/Zg4MYOvbsbJ0zyKuq+gX0PNbm8TyyBMziIaGCq6Lt8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
let
|
||||
pname = "cargo-llvm-cov";
|
||||
version = "0.6.7";
|
||||
version = "0.6.9";
|
||||
|
||||
owner = "taiki-e";
|
||||
homepage = "https://github.com/${owner}/${pname}";
|
||||
|
|
@ -37,7 +37,7 @@ let
|
|||
cargoLock = fetchurl {
|
||||
name = "Cargo.lock";
|
||||
url = "https://crates.io/api/v1/crates/${pname}/${version}/download";
|
||||
sha256 = "sha256-2DjHXZ80sqr5uNqTwoECdzU1dxtu3hw9wJLA1XZq02Y=";
|
||||
sha256 = "sha256-r4C7z2/z4OVEf+IhFe061E7FzSx0VzADmg56Lb+DO/g=";
|
||||
downloadToTemp = true;
|
||||
postFetch = ''
|
||||
tar xzf $downloadedFile ${pname}-${version}/Cargo.lock
|
||||
|
|
@ -55,7 +55,7 @@ rustPlatform.buildRustPackage {
|
|||
inherit owner;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wvyiIJd448EjqtBjrzS8XcWJerRSBctggwTZA0ku7pU=";
|
||||
sha256 = "sha256-mNpZj8c+IHcW0StFzRPt7wcysADh01eLFcIK6fX/2KQ=";
|
||||
leaveDotGit = true;
|
||||
};
|
||||
|
||||
|
|
@ -64,7 +64,7 @@ rustPlatform.buildRustPackage {
|
|||
cp ${cargoLock} source/Cargo.lock
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-TMBKsZsIPw42ZHVcUnwsTzJseD+6Z3o+ZlB2FzbjnBY=";
|
||||
cargoSha256 = "sha256-pfNb5P3IG1fQdhiQE3FGW8s4Rt2YyLxTejuzs3nqZUU=";
|
||||
|
||||
# `cargo-llvm-cov` reads these environment variables to find these binaries,
|
||||
# which are needed to run the tests
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-llvm-lines";
|
||||
version = "0.4.36";
|
||||
version = "0.4.37";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtolnay";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-kj5dsZWf1dp6NG9AIj5GdRoXIb6J3bSXnJNNEVAKnaM=";
|
||||
hash = "sha256-9l6WkPVcc1BTRjmHa3+2Y1buLdHC5VIvpGys0fDwldY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-iZtT1ywFIgPhBnW4losd1J+WHUtzgW47657vGi6mI7I=";
|
||||
cargoHash = "sha256-MbjV3O9yDC8GHWdhWh4/sO+QfAd3kw3K5wLkZ8OlXIU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Count the number of lines of LLVM IR across all instantiations of a generic function";
|
||||
|
|
|
|||
|
|
@ -1,27 +1,24 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, perl
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
perl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cpuid";
|
||||
version = "20230614";
|
||||
version = "20240324";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz";
|
||||
sha256 = "sha256-scgwRe/CYHYwd1HgZi1YAnf1+b+JzwJyMaeBIAPDpOg=";
|
||||
sha256 = "sha256-3fvFudgBUbsEl16d7BMFEDQZeY0i7/LiRJCD3AhiGEw=";
|
||||
};
|
||||
|
||||
# For pod2man during the build process.
|
||||
nativeBuildInputs = [
|
||||
perl
|
||||
];
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
# As runtime dependency for cpuinfo2cpuid.
|
||||
buildInputs = [
|
||||
perl
|
||||
];
|
||||
buildInputs = [ perl ];
|
||||
|
||||
# The Makefile hardcodes $(BUILDROOT)/usr as installation
|
||||
# destination. Just nuke all mentions of /usr to get the right
|
||||
|
|
@ -50,6 +47,9 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://etallen.com/cpuid.html";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ blitz ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
platforms = [
|
||||
"i686-linux"
|
||||
"x86_64-linux"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -390,22 +390,24 @@ let
|
|||
# reason is one of "unfree", "blocklisted", "broken", "insecure", ...
|
||||
# !!! reason strings are hardcoded into OfBorg, make sure to keep them in sync
|
||||
# Along with a boolean flag for each reason
|
||||
checkValidity = attrs:
|
||||
checkValidity =
|
||||
let
|
||||
validYes = {
|
||||
valid = "yes";
|
||||
handled = true;
|
||||
};
|
||||
in
|
||||
attrs:
|
||||
# Check meta attribute types first, to make sure it is always called even when there are other issues
|
||||
# Note that this is not a full type check and functions below still need to by careful about their inputs!
|
||||
let res = checkMeta (attrs.meta or {}); in if res != [] then
|
||||
{ valid = "no"; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${concatMapStrings (x: "\n - " + x) res}\n";
|
||||
unfree = false; nonSource = false; broken = false; unsupported = false; insecure = false;
|
||||
}
|
||||
else {
|
||||
unfree = hasUnfreeLicense attrs;
|
||||
nonSource = hasNonSourceProvenance attrs;
|
||||
broken = isMarkedBroken attrs;
|
||||
unsupported = hasUnsupportedPlatform attrs;
|
||||
insecure = isMarkedInsecure attrs;
|
||||
} // (
|
||||
let
|
||||
res = checkMeta (attrs.meta or {});
|
||||
in
|
||||
if res != [] then
|
||||
{ valid = "no"; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${concatMapStrings (x: "\n - " + x) res}\n"; }
|
||||
|
||||
# --- Put checks that cannot be ignored here ---
|
||||
if checkOutputsToInstall attrs then
|
||||
else if checkOutputsToInstall attrs then
|
||||
{ valid = "no"; reason = "broken-outputs"; errormsg = "has invalid meta.outputsToInstall"; }
|
||||
|
||||
# --- Put checks that can be ignored here ---
|
||||
|
|
@ -438,7 +440,7 @@ let
|
|||
else if hasNoMaintainers attrs then
|
||||
{ valid = "warn"; reason = "maintainerless"; errormsg = "has no maintainers"; }
|
||||
# -----
|
||||
else { valid = "yes"; });
|
||||
else validYes;
|
||||
|
||||
|
||||
# The meta attribute is passed in the resulting attribute set,
|
||||
|
|
@ -485,7 +487,10 @@ let
|
|||
position = pos.file + ":" + toString pos.line;
|
||||
} // {
|
||||
# Expose the result of the checks for everyone to see.
|
||||
inherit (validity) unfree broken unsupported insecure;
|
||||
unfree = hasUnfreeLicense attrs;
|
||||
broken = isMarkedBroken attrs;
|
||||
unsupported = hasUnsupportedPlatform attrs;
|
||||
insecure = isMarkedInsecure attrs;
|
||||
|
||||
available = validity.valid != "no"
|
||||
&& (if config.checkMetaRecursively or false
|
||||
|
|
@ -496,7 +501,7 @@ let
|
|||
assertValidity = { meta, attrs }: let
|
||||
validity = checkValidity attrs;
|
||||
inherit (validity) valid;
|
||||
in validity // {
|
||||
in if validity ? handled then validity else validity // {
|
||||
# Throw an error if trying to evaluate a non-valid derivation
|
||||
# or, alternatively, just output a warning message.
|
||||
handled =
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "dl-librescore";
|
||||
version = "0.35.1";
|
||||
version = "0.35.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LibreScore";
|
||||
repo = "dl-librescore";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-W/55Bbq5yiocNLOU1+j1TwkGawyF8sObtMmPW3ph35A=";
|
||||
hash = "sha256-g/dOQj2S9iUmN3Ohj7RPBpSk/4N9a39qY+/UIbsKDf4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-Boa/WnptJYJNRdcLgua5GmLT2H9tBpZR+vvAFZC1s4k=";
|
||||
|
|
|
|||
|
|
@ -24,16 +24,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "fzf";
|
||||
version = "0.47.0";
|
||||
version = "0.49.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "junegunn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-rIRn8g4j/drWEHnvZnJW2sSLq5mrw8Q2pn3LN2sEXDY=";
|
||||
hash = "sha256-XecMHKi5JMWx3RHQRk2FqS3SjyR6KzWjfyQ5JCI45xM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BOPACUQKcllmA2eWQs+sOfofAQLle2Byb/rZgOhmkVY=";
|
||||
vendorHash = "sha256-ZEwB2GKohmOx8xosj14VII6sQ4a82s7+h9r620MKEeU=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "plantuml";
|
||||
version = "1.2024.3";
|
||||
version = "1.2024.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/plantuml/plantuml/releases/download/v${finalAttrs.version}/plantuml-pdf-${finalAttrs.version}.jar";
|
||||
hash = "sha256-zgpqXawlIdNgSxiOjtk7XLOnrVVD09T5qE9K8LD4TtY=";
|
||||
hash = "sha256-8Xs7fyYr4CvXNO+g2g+7LLObUUVKxmt/27/wHdCwSIE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stress-ng";
|
||||
version = "0.17.06";
|
||||
version = "0.17.07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ColinIanKing";
|
||||
repo = pname;
|
||||
rev = "V${version}";
|
||||
hash = "sha256-69Ckl3n09J25Y0hzkH/RV9hJNlSfYfoxTdWiD5gBlQQ=";
|
||||
hash = "sha256-eXDCzyZ/YeumHjuLpr6stkWkApwfi8ExDx3uZTVa/cs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -781,6 +781,7 @@ mapAliases ({
|
|||
minetestserver_5 = minetestserver; # Added 2023-12-11
|
||||
minizip2 = pkgs.minizip-ng; # Added 2022-12-28
|
||||
mirage-im = throw "'mirage-im' has been removed, as it was broken and unmaintained"; # Added 2023-11-26
|
||||
mlton20210107 = throw "'mlton20210107' has been renamed to 'mlton20210117', correcting the version number"; # Added 2024-03-31
|
||||
mod_dnssd = apacheHttpdPackages.mod_dnssd; # Added 2014-11-07
|
||||
mod_fastcgi = apacheHttpdPackages.mod_fastcgi; # Added 2014-11-07
|
||||
mod_python = apacheHttpdPackages.mod_python; # Added 2014-11-07
|
||||
|
|
|
|||
|
|
@ -16558,10 +16558,10 @@ with pkgs;
|
|||
mlton20130715
|
||||
mlton20180207Binary
|
||||
mlton20180207
|
||||
mlton20210107
|
||||
mlton20210117
|
||||
mltonHEAD;
|
||||
|
||||
mlton = mlton20210107;
|
||||
mlton = mlton20210117;
|
||||
|
||||
mono = mono6;
|
||||
|
||||
|
|
|
|||
|
|
@ -4725,6 +4725,8 @@ self: super: with self; {
|
|||
|
||||
gflanguages = callPackage ../development/python-modules/gflanguages { };
|
||||
|
||||
gfsubsets = callPackage ../development/python-modules/gfsubsets { };
|
||||
|
||||
ghapi = callPackage ../development/python-modules/ghapi { };
|
||||
|
||||
ghdiff = callPackage ../development/python-modules/ghdiff { };
|
||||
|
|
|
|||
Loading…
Reference in New Issue