mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge 7e18ec5706 into haskell-updates
This commit is contained in:
nixpkgs-ci[bot]
GitHub
commit
015d2be85f
98 changed files with 837 additions and 725 deletions
33
.github/workflows/periodic-merge-24h.yml
vendored
33
.github/workflows/periodic-merge-24h.yml
vendored
|
|
@ -22,7 +22,7 @@ defaults:
|
|||
|
||||
jobs:
|
||||
periodic-merge:
|
||||
if: github.repository_owner == 'NixOS'
|
||||
if: github.repository_owner == 'NixOS' || github.event_name == 'workflow_dispatch'
|
||||
strategy:
|
||||
# don't fail fast, so that all pairs are tried
|
||||
fail-fast: false
|
||||
|
|
@ -49,3 +49,34 @@ jobs:
|
|||
name: ${{ matrix.pairs.name || format('{0} → {1}', matrix.pairs.from, matrix.pairs.into) }}
|
||||
secrets:
|
||||
NIXPKGS_CI_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
|
||||
|
||||
# Resets the target branch of the current haskell-updates PR.
|
||||
# This makes GitHub hide all the commits that are already part of staging and gives us a much clearer PR view.
|
||||
haskell-updates:
|
||||
needs: periodic-merge
|
||||
runs-on: ubuntu-slim
|
||||
permissions:
|
||||
pull-requests: write
|
||||
steps:
|
||||
- name: Find PR and update target branch
|
||||
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
|
||||
with:
|
||||
script: |
|
||||
// There will at most be a single haskell-updates PR anyway, so no need to paginate.
|
||||
await Promise.all(
|
||||
(
|
||||
await github.rest.pulls.list({
|
||||
...context.repo,
|
||||
state: 'open',
|
||||
head: `${context.repo.owner}:haskell-updates`,
|
||||
})
|
||||
).data.map((pr) =>
|
||||
github.rest.pulls.update({
|
||||
...context.repo,
|
||||
pull_number: pr.number,
|
||||
// Just updating to the same branch to trigger a UI update.
|
||||
// This is staging most of the time, but could be staging-next in rare cases.
|
||||
base: pr.base.ref,
|
||||
}),
|
||||
),
|
||||
)
|
||||
|
|
|
|||
2
.github/workflows/periodic-merge-6h.yml
vendored
2
.github/workflows/periodic-merge-6h.yml
vendored
|
|
@ -22,7 +22,7 @@ defaults:
|
|||
|
||||
jobs:
|
||||
periodic-merge:
|
||||
if: github.repository_owner == 'NixOS'
|
||||
if: github.repository_owner == 'NixOS' || github.event_name == 'workflow_dispatch'
|
||||
strategy:
|
||||
# don't fail fast, so that all pairs are tried
|
||||
fail-fast: false
|
||||
|
|
|
|||
|
|
@ -5058,12 +5058,6 @@
|
|||
github = "cigrainger";
|
||||
githubId = 3984794;
|
||||
};
|
||||
ciil = {
|
||||
email = "simon@lackerbauer.com";
|
||||
github = "ciil";
|
||||
githubId = 3956062;
|
||||
name = "Simon Lackerbauer";
|
||||
};
|
||||
cilki = {
|
||||
github = "cilki";
|
||||
githubId = 10459406;
|
||||
|
|
@ -7360,12 +7354,6 @@
|
|||
github = "DSeeLP";
|
||||
githubId = 46624152;
|
||||
};
|
||||
dsferruzza = {
|
||||
email = "david.sferruzza@gmail.com";
|
||||
github = "dsferruzza";
|
||||
githubId = 1931963;
|
||||
name = "David Sferruzza";
|
||||
};
|
||||
dsluijk = {
|
||||
name = "Dany Sluijk";
|
||||
email = "nix@dany.dev";
|
||||
|
|
@ -10141,6 +10129,12 @@
|
|||
githubId = 6893840;
|
||||
name = "Yacine Hmito";
|
||||
};
|
||||
gquetel = {
|
||||
email = "gregor.quetel@telecom-paris.fr";
|
||||
github = "gquetel";
|
||||
githubId = 48437427;
|
||||
name = "Grégor Quetel";
|
||||
};
|
||||
gracicot = {
|
||||
email = "dev@gracicot.com";
|
||||
matrix = "@gracicot-59e8f173d73408ce4f7ac803:gitter.im";
|
||||
|
|
|
|||
|
|
@ -26,9 +26,9 @@ let
|
|||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.4.5/android-studio-panda4-rc1-linux.tar.gz";
|
||||
};
|
||||
latestVersion = {
|
||||
version = "2026.1.1.5"; # "Android Studio Quail 1 | 2026.1.1 Canary 5"
|
||||
sha256Hash = "sha256-k4rM0MyTh0wnpsK8m6Hs1nSdwYpqUiQ+z7oiO6hn9YQ=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.5/android-studio-quail1-canary5-linux.tar.gz";
|
||||
version = "2026.1.2.2"; # "Android Studio Quail 2 | 2026.1.2 Canary 2"
|
||||
sha256Hash = "sha256-+FmW72k48GF71yzCdpIAl//qi6w26Qg8gZUW5/Nuh58=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.2.2/android-studio-quail2-canary2-linux.tar.gz";
|
||||
};
|
||||
in
|
||||
{
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@ let
|
|||
|
||||
pname = "ghostel";
|
||||
|
||||
version = "0-unstable-2026-05-06";
|
||||
version = "0-unstable-2026-05-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dakra";
|
||||
repo = "ghostel";
|
||||
rev = "5bce751687f3b33978a4244a1611648bbedb7124";
|
||||
hash = "sha256-MAV3iQeriZhE9SGwVEnKs2rwebbEnPP1LiHuCAjlGE8=";
|
||||
rev = "cd32af7bd6b9c827701a62ed8f0c3bc705800f13";
|
||||
hash = "sha256-5XmHI+lkzLFW8VNVC3eyc+msi6y+Qh6q6WsBZpHNEf4=";
|
||||
};
|
||||
|
||||
module = stdenv.mkDerivation (finalAttrs: {
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
|||
mktplcRef = {
|
||||
name = "claude-dev";
|
||||
publisher = "saoudrizwan";
|
||||
version = "3.83.0";
|
||||
hash = "sha256-d9b8mXi/PI87T9J67yzI2yID7hhd6OPdM2+Na3I5Wg8=";
|
||||
version = "3.84.0";
|
||||
hash = "sha256-j+EnHm4ucqzMgB0u5J4ki1x3YhMPWFj3/p/C95sbQH0=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
mkLibretroCore {
|
||||
core = "mame2003";
|
||||
version = "0-unstable-2026-04-02";
|
||||
version = "0-unstable-2026-05-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "mame2003-libretro";
|
||||
rev = "c651c573655218428d7c524f611f7d62d13861a1";
|
||||
hash = "sha256-7tAmLBClwM6gMILiWN3cIl452EX0JVFtTSEdxPoRs/4=";
|
||||
rev = "099c2ef21c67c463a97b9ab19403e58b31c69740";
|
||||
hash = "sha256-D3/d/TzTjK0t4bh6Il9CMfHTHdYgMsQNE52PxjrXeyE=";
|
||||
};
|
||||
|
||||
# Fix build with GCC 14
|
||||
|
|
|
|||
|
|
@ -1,84 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
libspnav,
|
||||
jq,
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
self = {
|
||||
|
||||
octoprint = stdenv.mkDerivation {
|
||||
pname = "Cura-OctoPrintPlugin";
|
||||
version = "3.5.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fieldOfView";
|
||||
repo = "Cura-OctoPrintPlugin";
|
||||
rev = "7bd73946fbf22d18337dc900a81a011ece26bee0";
|
||||
sha256 = "057b2f5f49p96lkh2wsr9w6yh2003x4a85irqsgbzp6igmk8imdn";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
netifaces
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/cura/plugins/OctoPrintPlugin
|
||||
cp -rv . $out/lib/cura/plugins/OctoPrintPlugin/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Enables printing directly to OctoPrint and monitoring the process";
|
||||
homepage = "https://github.com/fieldOfView/Cura-OctoPrintPlugin";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
maintainers = [ ];
|
||||
};
|
||||
};
|
||||
|
||||
rawmouse = stdenv.mkDerivation rec {
|
||||
pname = "RawMouse";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smartavionics";
|
||||
repo = "RawMouse";
|
||||
rev = version;
|
||||
sha256 = "0hvi7qwd4xfnqnhbj9dgfjmvv9df7s42asf3fdfxv43n6nx74scw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ jq ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
hidapi
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
jq 'del(.devices) | .libspnav="${libspnav}/lib/libspnav.so"' \
|
||||
<RawMouse/config.json >RawMouse/config.json.new
|
||||
mv RawMouse/config.json.new RawMouse/config.json
|
||||
|
||||
# remove prebuilt binaries
|
||||
rm -r RawMouse/hidapi
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/cura/plugins/RawMouse
|
||||
cp -rv . $out/lib/cura/plugins/RawMouse/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Cura plugin for HID mice such as 3Dconnexion spacemouse";
|
||||
homepage = "https://github.com/smartavionics/RawMouse";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
maintainers = [ ];
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
in
|
||||
self
|
||||
|
|
@ -1,49 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
libarcus,
|
||||
stb,
|
||||
protobuf,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "curaengine";
|
||||
version = "4.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ultimaker";
|
||||
repo = "CuraEngine";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-dx0Q6cuA66lG4nwR7quW5Tvs9sdxjdV4gtpxXirI4nY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
libarcus
|
||||
stb
|
||||
protobuf
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DCURA_ENGINE_VERSION=${finalAttrs.version}" ];
|
||||
|
||||
# TODO already fixed in master, remove in next release
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Ultimaker/CuraEngine/commit/de60e86a6ea11cb7d121471b5dd192e5deac0f3d.patch";
|
||||
hash = "sha256-/gT9yErIDDYAXvZ6vX5TGlwljy31K563+sqkm1UGljQ=";
|
||||
includes = [ "src/utils/math.h" ];
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Powerful, fast and robust engine for processing 3D models into 3D printing instruction";
|
||||
homepage = "https://github.com/Ultimaker/CuraEngine";
|
||||
license = lib.licenses.agpl3Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ ];
|
||||
mainProgram = "CuraEngine";
|
||||
};
|
||||
})
|
||||
|
|
@ -110,13 +110,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"bpg_proxmox": {
|
||||
"hash": "sha256-RgyPVv3CWHgArDjmcz46j578hgleHFQ81MJ5OUWXnBk=",
|
||||
"hash": "sha256-eOllsoXIHOym4pn2pBh5Air5eDvgvppVcnw+FfxRet4=",
|
||||
"homepage": "https://registry.terraform.io/providers/bpg/proxmox",
|
||||
"owner": "bpg",
|
||||
"repo": "terraform-provider-proxmox",
|
||||
"rev": "v0.106.0",
|
||||
"rev": "v0.107.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-AxXZRn2D6iEIG6p00KGQi1kMkt2F/ZyeBsXHR345wag="
|
||||
"vendorHash": "sha256-IbxQVfNvMiXGMkrNQoSBQW3VemK9NW8zs8o1epTZydE="
|
||||
},
|
||||
"brightbox_brightbox": {
|
||||
"hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",
|
||||
|
|
@ -1184,13 +1184,13 @@
|
|||
"vendorHash": "sha256-w/AmSHydCeyp/EURgPY2c/E2LjqAXXCORI53X1hEdxY="
|
||||
},
|
||||
"scaleway_scaleway": {
|
||||
"hash": "sha256-daBVjUAmFbi5MlrroyVggXOr3i6dIfG8gT9+P8+GsIg=",
|
||||
"hash": "sha256-79oqPfnfX1jFDM9hSXqGF1r3B6S0JEj2+6whxLEmq+Q=",
|
||||
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
|
||||
"owner": "scaleway",
|
||||
"repo": "terraform-provider-scaleway",
|
||||
"rev": "v2.74.0",
|
||||
"rev": "v2.75.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-MlhvbUewtVvfqM0aNM9VWmha30hoXLvCG9E3o8dsH4s="
|
||||
"vendorHash": "sha256-GwOKy2H06s+byyb0k4lta30lfAVmLSbEcyyQm0giw1E="
|
||||
},
|
||||
"scottwinkler_shell": {
|
||||
"hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=",
|
||||
|
|
|
|||
|
|
@ -54,10 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
'';
|
||||
homepage = "https://abella-prover.org";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [
|
||||
bcdarwin
|
||||
ciil
|
||||
];
|
||||
maintainers = [ lib.maintainers.bcdarwin ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -25,14 +25,14 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "abiword";
|
||||
version = "3.0.7";
|
||||
version = "3.0.8";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "AbiWord";
|
||||
tag = "release-${finalAttrs.version}";
|
||||
hash = "sha256-dYbJ726Zuxs7+VTTCWHYQLsVZ/86hRUBQRac6toO4UI=";
|
||||
hash = "sha256-TjOHixfCXDQlUUbD1L5wcGe4Nl0+1UqZw4EF+1/eZ4w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
libfido2,
|
||||
|
|
@ -26,6 +27,24 @@ buildGoModule (finalAttrs: {
|
|||
|
||||
buildInputs = [ libfido2 ];
|
||||
|
||||
postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
chmod -R +w vendor/github.com/keys-pub/go-libfido2
|
||||
substituteInPlace vendor/github.com/keys-pub/go-libfido2/fido2_static_arm64.go \
|
||||
--replace-fail \
|
||||
'/opt/homebrew/opt/libfido2/lib/libfido2.a /opt/homebrew/opt/openssl@3/lib/libcrypto.a ''${SRCDIR}/darwin/arm64/lib/libcbor.a' \
|
||||
'-lfido2' \
|
||||
--replace-fail \
|
||||
'-I/opt/homebrew/opt/libfido2/include -I/opt/homebrew/opt/openssl@3/include' \
|
||||
'-I${libfido2.dev}/include'
|
||||
substituteInPlace vendor/github.com/keys-pub/go-libfido2/fido2_static_amd64.go \
|
||||
--replace-fail \
|
||||
'/usr/local/lib/libfido2.a /usr/local/opt/openssl@3/lib/libcrypto.a ''${SRCDIR}/darwin/amd64/lib/libcbor.a' \
|
||||
'-lfido2' \
|
||||
--replace-fail \
|
||||
'-I/usr/local/opt/libfido2/include -I/usr/local/opt/openssl@3/include' \
|
||||
'-I${libfido2.dev}/include'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Age plugin to encrypt files with FIDO2 tokens in a way compatible to typage";
|
||||
homepage = "https://github.com/FiloSottile/typage/";
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitea,
|
||||
cctools,
|
||||
yarn-berry_3,
|
||||
nodejs,
|
||||
python311,
|
||||
|
|
@ -42,7 +43,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
python311
|
||||
libsass
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
xcbuild
|
||||
cctools.libtool
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
|
|
|||
|
|
@ -32,11 +32,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "alsa-utils";
|
||||
version = "1.2.14";
|
||||
version = "1.2.15.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://alsa/utils/alsa-utils-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-B5THTTP+2UPnxQYJwTCJ5AkxK2xAPWromE/EKcCWB0E=";
|
||||
hash = "sha256-eqqvv7AZQhE+wMMeUfcFkQ6BB5IFCIyi+PE3o4aeGjo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
let
|
||||
nodejs = nodejs_24;
|
||||
|
||||
version = "2025.12.4";
|
||||
version = "2025.12.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goauthentik";
|
||||
repo = "authentik";
|
||||
tag = "version/${version}";
|
||||
hash = "sha256-alTyrMBbjZbw4jhEna8saabf93sqSrZCu+Z5xH3pZ7M=";
|
||||
hash = "sha256-LPGAhbtmuztDQ4CVhUXb+vBU5HjvNZ7JicI5r3lr1QQ=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
@ -52,7 +52,7 @@ let
|
|||
src = fetchFromGitHub {
|
||||
owner = "goauthentik";
|
||||
repo = "client-go";
|
||||
tag = "v3.${version}";
|
||||
tag = "v3.2025.12.4";
|
||||
hash = "sha256-+/CfOE2HkBU+ZddvdXGenB/z8xNFk8cujpZpMXyh3cY=";
|
||||
};
|
||||
|
||||
|
|
@ -137,8 +137,8 @@ let
|
|||
|
||||
outputHash =
|
||||
{
|
||||
"aarch64-linux" = "sha256-GL5FPIBnoEXYtw8DPJpRPe3tT3qioN4AdoeOmCoiYsM=";
|
||||
"x86_64-linux" = "sha256-AnceTipq6uUvTbOAZanVshAbAJ9LS1kwImbttTOcWxc=";
|
||||
"aarch64-linux" = "sha256-smm9x29z7gOI7Wq0NvP45KHtBbT6p1lH6IjEf9LRuGs=";
|
||||
"x86_64-linux" = "sha256-K86wnn50svP+QG3i0mggH8RQgfoIqEmyQTouz35xzw8=";
|
||||
}
|
||||
.${stdenvNoCC.hostPlatform.system} or (throw "authentik-website-deps: unsupported host platform");
|
||||
|
||||
|
|
@ -208,8 +208,8 @@ let
|
|||
|
||||
outputHash =
|
||||
{
|
||||
"aarch64-linux" = "sha256-eZZ5Ynj81KwFsU5emPtYZ2CxO8MFvWbJnCHs+L88KQQ=";
|
||||
"x86_64-linux" = "sha256-yUAyyO1NFav1EptrRYGSzC8dxCxYVj0FmzHk8IckFZM=";
|
||||
"aarch64-linux" = "sha256-J9wGQe7iMfKznNk3woqi0VNVNA/dE6TGi2f44DOlG1c=";
|
||||
"x86_64-linux" = "sha256-9Q590Rw0mk3q5osxOKGWU7+XtKwkTyA+CLC2LxAA/3g=";
|
||||
}
|
||||
.${stdenvNoCC.hostPlatform.system} or (throw "authentik-webui-deps: unsupported host platform");
|
||||
outputHashMode = "recursive";
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "boring";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alebeck";
|
||||
repo = "boring";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9ei2Kl2590DY0S9jrc+MxsL5srxmwx8wD6uFlVQ6o4o=";
|
||||
hash = "sha256-cyRy7lF2wGupzDnW4zPKEuM0X0aaHrWbF/3p13xb2DA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,93 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
python3,
|
||||
libsForQt5,
|
||||
curaengine,
|
||||
plugins ? [ ],
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cura";
|
||||
version = "4.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ultimaker";
|
||||
repo = "Cura";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-R88SdAxx3tkQCDInrFTKad1tPSDTSYaVAPUVmdk94Xk=";
|
||||
};
|
||||
|
||||
materials = fetchFromGitHub {
|
||||
owner = "Ultimaker";
|
||||
repo = "fdm_materials";
|
||||
rev = "4.13.2";
|
||||
sha256 = "sha256-7y4OcbeQHv+loJ4cMgPU0e818Zsv90EwARdztNWS8zM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtquickcontrols2
|
||||
libsForQt5.qtgraphicaleffects
|
||||
];
|
||||
propagatedBuildInputs =
|
||||
with python3.pkgs;
|
||||
[
|
||||
libsavitar
|
||||
numpy-stl
|
||||
pyserial
|
||||
requests
|
||||
uranium
|
||||
zeroconf
|
||||
pynest2d
|
||||
sentry-sdk
|
||||
trimesh
|
||||
keyring
|
||||
]
|
||||
++ plugins;
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
python3.pkgs.wrapPython
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DURANIUM_DIR=${python3.pkgs.uranium.src}"
|
||||
"-DCURA_VERSION=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
makeWrapperArgs = [
|
||||
# hacky workaround for https://github.com/NixOS/nixpkgs/issues/59901
|
||||
"--set OMP_NUM_THREADS 1"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
|
||||
sed -i 's, executable_name = .*, executable_name = "${curaengine}/bin/CuraEngine",' plugins/CuraEngineBackend/CuraEngineBackend.py
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/cura/resources/materials
|
||||
cp ${finalAttrs.materials}/*.fdm_material $out/share/cura/resources/materials/
|
||||
mkdir -p $out/lib/cura/plugins
|
||||
for plugin in ${toString plugins}; do
|
||||
ln -s $plugin/lib/cura/plugins/* $out/lib/cura/plugins
|
||||
done
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonPrograms
|
||||
wrapQtApp $out/bin/cura
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "3D printer / slicing GUI built on top of the Uranium framework";
|
||||
mainProgram = "cura";
|
||||
homepage = "https://github.com/Ultimaker/Cura";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
|
@ -31,5 +31,6 @@ buildDubPackage (finalAttrs: {
|
|||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.ryand56 ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "ddhx";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "dotenvx";
|
||||
version = "1.66.0";
|
||||
version = "1.68.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dotenvx";
|
||||
repo = "dotenvx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dW/7dD24zCyGwKf6QDtT6WRglHJwJwI+peiPdmdxoOQ=";
|
||||
hash = "sha256-w2AljviPNkXC+f4x3QEuR9FSkg0Dy+zYqVPrSWjbrDU=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-jDqlcRMU2nzL4l1N/cFhYFpXOur9+RH4JFb7Sgdd7wU=";
|
||||
npmDepsHash = "sha256-l9nRDYg7mrgF2GAYbQgoes0VzpTGAn9TMHrmWjvZnMY=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -33,14 +33,14 @@ let
|
|||
in
|
||||
python.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "esphome";
|
||||
version = "2026.5.0";
|
||||
version = "2026.5.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esphome";
|
||||
repo = "esphome";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-oWlzpBzDOSrXv+gOnFSL7TQqDZJc3oN2RoAW2ywFCGo=";
|
||||
hash = "sha256-faW44FhAymqGQG4khAUEcv6QoAn49KPSghi3YcXttNk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "field-monitor";
|
||||
version = "50.0";
|
||||
version = "50.1";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
|
@ -42,12 +42,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "theCapypara";
|
||||
repo = "field-monitor";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IVHzMUjjVZHDTI6Jjq7i8wrENPerKzEiDT15otPFx9A=";
|
||||
hash = "sha256-waMa70oLKvIoljvE+MjWWKVL1Cd0xnasVeB17tfMQW8=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-c4ANjQ1OoDMMifAUpU8iNE9lSBamAR+XbEmYrYphixU=";
|
||||
hash = "sha256-fsrczFhoIilxgZRH2PVXC67YdkMsIjA6zTfix57TTzo=";
|
||||
};
|
||||
|
||||
mesonBuildType = "release";
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
mainProgram = "gnushogi";
|
||||
homepage = "https://www.gnu.org/software/gnushogi/";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ lib.maintainers.ciil ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -51,6 +51,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
|||
mainProgram = "gshogi";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.ciil ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -12,17 +12,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "icm";
|
||||
version = "0.10.49";
|
||||
version = "0.10.50";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rtk-ai";
|
||||
repo = "icm";
|
||||
tag = "icm-v${finalAttrs.version}";
|
||||
hash = "sha256-GB2SH/Y2l4AkxoFqJfWcsGmWK4uOayCs1FSxBuXShwc=";
|
||||
hash = "sha256-zaKpKMVH2vzUk0ryWupE4ByqqcmAdJwAe5ybb2TNlvM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-U0mHWzRI6BDVC4LRpwWz/QbCeT0fEPxKoY5+1DrI048=";
|
||||
cargoHash = "sha256-5NcmFaRqDla2ei694fJiqNr5n4V3A/ai3/9fzBHNa3s=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "inputplumber";
|
||||
version = "0.77.1";
|
||||
version = "0.77.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ShadowBlip";
|
||||
repo = "InputPlumber";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-S3fyhgCNJFx9w64E/BfNh8i4nIBEFwoVLTcTFb8Escw=";
|
||||
hash = "sha256-QxGDmuRTZLHBqZ+S73CtNKdLg/XumutGSpTSz4sGFYQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-mnWjVM5nWkYMeRRKLsak0SZUUsVg9odjy7KFa/sldC8=";
|
||||
cargoHash = "sha256-EtCK/zYRW2LdZhPSrO6ydBXBQwIrkqaJmH+3XfwERTw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "jellyfin-web";
|
||||
version = "10.11.8";
|
||||
version = "10.11.10";
|
||||
|
||||
src =
|
||||
assert finalAttrs.version == jellyfin.version;
|
||||
|
|
@ -21,7 +21,7 @@ buildNpmPackage (finalAttrs: {
|
|||
owner = "jellyfin";
|
||||
repo = "jellyfin-web";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Nrh4BNlhJyzj9cXQ6Yr7349r5H+4r9W3aldcg9+J6dU=";
|
||||
hash = "sha256-fSpzF6Arx0JfL9fuQHjzf3m82XZR2BZkV0lA37L4DN4=";
|
||||
};
|
||||
|
||||
nodejs = nodejs_22;
|
||||
|
|
@ -31,7 +31,7 @@ buildNpmPackage (finalAttrs: {
|
|||
--replace-fail "git describe --always --dirty" "echo ${finalAttrs.src.rev}"
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-oxytp6n/4X1bhpfFqpqMAji86sbjV669F324zY3hoK4=";
|
||||
npmDepsHash = "sha256-DCFgivbZrDufRaB+4PeFxO6ISbEM9lXhXmlzc/5GbVU=";
|
||||
|
||||
preBuild = ''
|
||||
# using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "jellyfin";
|
||||
version = "10.11.8"; # ensure that jellyfin-web has matching version
|
||||
version = "10.11.10"; # ensure that jellyfin-web has matching version
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wBf561mZvC65Hu4MHHSu8YeILQDp/WN9vGA+JxGXwE8=";
|
||||
hash = "sha256-bad532F8Ln5Y3TV4x5c7mgsiI+ZJGTZoahuSZhefMvQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sqlite ];
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "kimai";
|
||||
version = "2.56.0";
|
||||
version = "2.57.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimai";
|
||||
repo = "kimai";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-rax67E/Zr50ejSAjA4Aa1NDsAbJYuAAE4k8hji5UhOg=";
|
||||
hash = "sha256-WbZivDI5xU/pM52yFvG6vMK3LaCjbLoJGNFP3Exb8qc=";
|
||||
};
|
||||
|
||||
php = php.buildEnv {
|
||||
|
|
@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: {
|
|||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XHicbYXOfCPFIMKrhyBpchd89anj6kG1/7prpER7aCo=";
|
||||
vendorHash = "sha256-6WthU0w8V69sDlBjtz2MIavkmyYXWQ+5NflZLGQCLJs=";
|
||||
|
||||
composerNoPlugins = false;
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "4.6.3";
|
||||
version = "4.7.0";
|
||||
pname = "kirimoto";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/GridSpace/grid-apps/releases/download/${version}/KiriMoto-linux-x86_64.AppImage";
|
||||
hash = "sha256-YCfDCR92xtwL3634iIMYf6IjkeqoWrF7/YNCwKSjnfs==";
|
||||
hash = "sha256-bLeGDZzAzBVC4tTwcC8uDngqOEeJ/vyTJGre+EovOgs=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
|
|
|||
|
|
@ -48,9 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
description = "Breakout clone from the LGames series";
|
||||
license = with lib.licenses; [ gpl2Plus ];
|
||||
mainProgram = "lbreakout2";
|
||||
maintainers = with lib.maintainers; [
|
||||
ciil
|
||||
];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
hydraPlatforms = lib.platforms.linux; # build hangs on both Darwin platforms, needs investigation
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "lint-staged";
|
||||
version = "17.0.4";
|
||||
version = "17.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okonet";
|
||||
repo = "lint-staged";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-E0qShnB3zVz7oL+qPzPzLhEJ9PQDlMc4+L4vpD2enI8=";
|
||||
hash = "sha256-W9OW4ylRhgeUq7AlJlSkfN0IKv8Us6IEhmfE08UXzH8=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-KYltk2z/1nTnaLroTErIu6eTyofvWp/wC1awEf0Ryg0=";
|
||||
npmDepsHash = "sha256-ifz75kaLfDq42cdnN7eel/HtG6Fmr+1BFbD0b1vcjCA=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@
|
|||
rocmPackages ? { },
|
||||
rocmGpuTargets ? rocmPackages.clr.localGpuTargets or rocmPackages.clr.gpuTargets,
|
||||
|
||||
cpuArchDynamicDispatch ? true,
|
||||
|
||||
openclSupport ? false,
|
||||
clblast,
|
||||
|
||||
|
|
@ -141,8 +143,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
|||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
# -march=native is non-deterministic; override with platform-specific flags if needed
|
||||
(cmakeBool "GGML_NATIVE" false)
|
||||
(cmakeBool "GGML_NATIVE" false) # -march=native would make builds non-deterministic
|
||||
(cmakeBool "LLAMA_BUILD_EXAMPLES" false)
|
||||
(cmakeBool "LLAMA_BUILD_SERVER" true)
|
||||
(cmakeBool "LLAMA_BUILD_TESTS" (finalAttrs.finalPackage.doCheck or false))
|
||||
|
|
@ -157,6 +158,18 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
|||
(cmakeBool "GGML_VULKAN" vulkanSupport)
|
||||
(cmakeFeature "LLAMA_BUILD_NUMBER" finalAttrs.version)
|
||||
]
|
||||
++ optionals cpuArchDynamicDispatch [
|
||||
# Build all CPU backend variants for runtime dynamic dispatch.
|
||||
# This avoids illegal instructions on older CPUs and gives optimal performance
|
||||
# on newer ones without needing separate builds.
|
||||
# Enabling AVX2 can make CPU inference 13x faster compared to NixOS's x86_64 defaults.
|
||||
# Note it is not a bug that the CPU variant .so files are placed in `bin/`
|
||||
# (as opposed to `lib/`) alongside the executables by upstream's `CMakeLists.txt` design:
|
||||
# * https://github.com/ggml-org/llama.cpp/blob/b46812de78f8fbcb6cf0154947e8633ebc78d9ac/ggml/src/CMakeLists.txt#L249-L252
|
||||
# * https://github.com/ggml-org/llama.cpp/blob/b46812de78f8fbcb6cf0154947e8633ebc78d9ac/ggml/src/ggml-backend-reg.cpp#L480-L486
|
||||
(cmakeBool "GGML_CPU_ALL_VARIANTS" true)
|
||||
(cmakeBool "GGML_BACKEND_DL" true)
|
||||
]
|
||||
++ optionals cudaSupport [
|
||||
(cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
|
||||
]
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
let
|
||||
pname = "lmstudio";
|
||||
|
||||
version_aarch64-linux = "0.4.13-1";
|
||||
hash_aarch64-linux = "sha256-3Z+wt8H8QdFiz190Pa+33fkKHf1Df7nzWoUNYz2TrYw=";
|
||||
version_aarch64-darwin = "0.4.13-1";
|
||||
hash_aarch64-darwin = "sha256-cj1KqM55iyJzg7O6SuQmUn2RHUZpE9fzljft8tYWHUE=";
|
||||
version_x86_64-linux = "0.4.13-1";
|
||||
hash_x86_64-linux = "sha256-IHhqAsYVi1XCaryxrEyhakDyye2vehbsJ77eF68KaIg=";
|
||||
version_aarch64-linux = "0.4.14-4";
|
||||
hash_aarch64-linux = "sha256-mlPeSTPUVJ8C7zheuX7ZJnDFQtg9oTg/LBqXJrbPfMs=";
|
||||
version_aarch64-darwin = "0.4.14-4";
|
||||
hash_aarch64-darwin = "sha256-9Kcj+IA5DhJuxSetKCHCPJ5GECCpnjnZlYPXD9jafy0=";
|
||||
version_x86_64-linux = "0.4.14-4";
|
||||
hash_x86_64-linux = "sha256-oDPL/m1Ghutxmi3iumsy2/Hs6Bp8UDWsJeup1Vlu/i8=";
|
||||
|
||||
meta = {
|
||||
description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
autoreconfHook,
|
||||
boost,
|
||||
}:
|
||||
|
||||
|
|
@ -14,6 +15,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
sha256 = "0jggmlaywjfbdljzv5hyiz49plnxh0har2bnc9dq4xmj1pmjgs49";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./remove-boost-system.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
buildInputs = [ boost ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
13
pkgs/by-name/mi/mini-httpd/remove-boost-system.patch
Normal file
13
pkgs/by-name/mi/mini-httpd/remove-boost-system.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/configure.ac b/configure.ac
|
||||
index fd06d1a..337178c 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -14,8 +14,6 @@ AC_PROG_RANLIB
|
||||
AC_LANG([C++])
|
||||
AC_CHECK_HEADER(boost/spirit.hpp, :,
|
||||
AC_MSG_ERROR([Cannot find the Boost library headers! See the README for details.]))
|
||||
-AC_CHECK_LIB([boost_system], [main], [LIBS="-lboost_system"],
|
||||
- [AC_MSG_ERROR([cannot link required boost.system library])])
|
||||
gl_INIT
|
||||
AC_SYS_LARGEFILE
|
||||
|
||||
|
|
@ -1,37 +1,10 @@
|
|||
{ python3Packages, writers }:
|
||||
{ python3Packages }:
|
||||
|
||||
let
|
||||
py = python3Packages;
|
||||
|
||||
gunicornScript = writers.writePython3 "gunicornMlflow" { } ''
|
||||
import re
|
||||
import sys
|
||||
from gunicorn.app.wsgiapp import run
|
||||
if __name__ == '__main__':
|
||||
sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', ''', sys.argv[0])
|
||||
sys.exit(run())
|
||||
'';
|
||||
in
|
||||
py.toPythonApplication (
|
||||
py.mlflow.overridePythonAttrs (old: {
|
||||
|
||||
propagatedBuildInputs = old.dependencies ++ [
|
||||
py.boto3
|
||||
py.mysqlclient
|
||||
python3Packages.toPythonApplication (
|
||||
python3Packages.mlflow.overridePythonAttrs (old: {
|
||||
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [
|
||||
python3Packages.boto3
|
||||
python3Packages.mysqlclient
|
||||
];
|
||||
|
||||
postPatch = (old.postPatch or "") + ''
|
||||
cat mlflow/utils/process.py
|
||||
|
||||
substituteInPlace mlflow/utils/process.py --replace-fail \
|
||||
"process = subprocess.Popen(" \
|
||||
"cmd[0]='${gunicornScript}'; process = subprocess.Popen("
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
gpath=$out/bin/gunicornMlflow
|
||||
cp ${gunicornScript} $gpath
|
||||
chmod 555 $gpath
|
||||
'';
|
||||
})
|
||||
)
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
}:
|
||||
let
|
||||
pname = "models-dev";
|
||||
version = "0-unstable-2026-05-19";
|
||||
version = "0-unstable-2026-05-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "anomalyco";
|
||||
repo = "models.dev";
|
||||
rev = "db0a7cf6113f380b15e8ab21944e5de18bb30feb";
|
||||
hash = "sha256-kFskkQ5YrK7ler8s+vC5ONEjmNmOpiIKAZqoiCk97Qk=";
|
||||
rev = "d497a446eb9335623904006cbe5f4ac7308a7a80";
|
||||
hash = "sha256-gS90dc6NGNJnuvQ7CAcM5DhGWqjrp0Ox59tHzQPj9R0=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
m4,
|
||||
which,
|
||||
yasm,
|
||||
texinfo,
|
||||
autoreconfHook,
|
||||
fetchpatch,
|
||||
buildPackages,
|
||||
|
|
@ -14,18 +15,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
pname = "mpir";
|
||||
version = "3.0.0";
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
m4
|
||||
which
|
||||
yasm
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mpir.org/mpir-${finalAttrs.version}.tar.bz2";
|
||||
sha256 = "1fvmhrqdjs925hzr2i8bszm50h00gwsh17p2kn2pi51zrxck9xjj";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wbhart";
|
||||
repo = "mpir";
|
||||
tag = "mpir-${finalAttrs.version}";
|
||||
hash = "sha256-Q5P3N2w6NX+s5Fu3obTDOg+tEAWnAMDgbRlzFTpolmg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -47,6 +41,16 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
})
|
||||
];
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
m4
|
||||
which
|
||||
yasm
|
||||
texinfo
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
configureFlags = [ "--enable-cxx" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-fat" ];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -32,16 +32,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ncspot";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrkfdn";
|
||||
repo = "ncspot";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-U2uadZzC38pZf4For6Nyo91IXr9XqNSU6B+gpuTZJQo=";
|
||||
hash = "sha256-QQeiVmMRF5ql2GVR5nopKtBrTAP8K1Rjs/B89+Azg5s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ny1vGZSUHxjUZb/nxu2SXP1gimPlPBUejAjiqPpe+CM=";
|
||||
cargoHash = "sha256-u6T5zaeN+rmTH5eM7Inpw/EZh48RauhhVhnAmUMYFIc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule {
|
||||
pname = "pkgsite";
|
||||
version = "0-unstable-2026-05-14";
|
||||
version = "0-unstable-2026-05-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "pkgsite";
|
||||
rev = "a5fcada8aa006fec3698037f4702e66122994e6c";
|
||||
hash = "sha256-kY3uXHsXDYRml4mZAZaFK95BDju92cmMZ4XoSNoNquo=";
|
||||
rev = "866fa310855a76cf898838dac1cc56850e15cca6";
|
||||
hash = "sha256-zhBJ7sYXyzK9Rs2qA9CziIG50cCZ88a/msKzqIQIlJM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-A5gfYxgbq+5WG4W642fhRHw78oWGOrI+OyJ66W/gl00=";
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "protols";
|
||||
version = "0.13.4";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coder3101";
|
||||
repo = "protols";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-OREJDG0RycYhULTbqx2dXaXlIYexebUFdCiJbBN3cXE=";
|
||||
hash = "sha256-VB7Zs1Zo+hn+M4vhBmOZNod3Q9dbwcMNwRvTIIP+Gk4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uero/p1ATagY6k8t6QCdfPRLeZreVrvshe3dE/M9dkg=";
|
||||
cargoHash = "sha256-qfNWZmJYVKDKZ8/JIXtSWYnq4pZXmU7rXQDV117j/a0=";
|
||||
|
||||
env.FALLBACK_INCLUDE_PATH = "${protobuf}/include";
|
||||
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "proxelar";
|
||||
version = "0.4.4";
|
||||
version = "0.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emanuele-em";
|
||||
repo = "proxelar";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dUz20mk9ghUyCRuxkEpjjibhDMk7kAezZxGPadQhhM0=";
|
||||
hash = "sha256-/uRvk0bUkDtxpNEKLOgh8J1V2+xaTxAHZdrXTnLApFM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Jc6NExi2BUs1Hoia4MyDouj/LUO9tCRN0Pu2/32uG7c=";
|
||||
cargoHash = "sha256-j94fVzAJa/4B4et98LowZmbKwAy9eZ/qhfKjZ9p/9NI=";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@
|
|||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qownnotes";
|
||||
appname = "QOwnNotes";
|
||||
version = "26.5.12";
|
||||
version = "26.5.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-xb7bRcqxO51u3ZDxIlPaK7rUxsl2W5+81u8OLPFSgPs=";
|
||||
hash = "sha256-Hx/OMImjjMdQLl5bhp3tQ+tDQjbEkptQjHavj7An4c0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -370,10 +370,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
description = "Set of integrated tools for the R language";
|
||||
homepage = "https://www.rstudio.com/";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
ciil
|
||||
tomasajt
|
||||
];
|
||||
maintainers = [ lib.maintainers.tomasajt ];
|
||||
mainProgram = "rstudio" + lib.optionalString server "-server";
|
||||
# rstudio-server on darwin is only partially supported by upstream
|
||||
platforms = lib.platforms.linux ++ lib.optionals (!server) lib.platforms.darwin;
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "seconlay";
|
||||
version = "0-unstable-2026-04-30";
|
||||
version = "0-unstable-2026-05-21";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
group = "alasca.cloud";
|
||||
owner = "scl";
|
||||
repo = "scl-management";
|
||||
rev = "a2020efbbc950d037e17a3ae8d628e3205a80447";
|
||||
hash = "sha256-/m2HUdyT/euFVvWPZAHjPGsBH9XeUMuNGlfJFfH/A8Y=";
|
||||
rev = "3ebeeda26e919750790c24899320ac1f6ba82904";
|
||||
hash = "sha256-+erlSKH8FBG2Ncpn6D61itTiB2IhbMefgO7EZ7NgZa8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-pb9xqdgWrf8Lc10jSkkDb/1n0e15fMQ3AcKNPw6/vi8=";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "spire";
|
||||
version = "1.14.6";
|
||||
version = "1.15.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
|
@ -21,12 +21,12 @@ buildGoModule (finalAttrs: {
|
|||
owner = "spiffe";
|
||||
repo = "spire";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-3NboIbLRxs4yPjQUKdK7B+Rhl08SxEDPuj5N8lWd1gA=";
|
||||
sha256 = "sha256-mOYPVvumMIXgfJGQeStU62DlBOIwI0Sav5cQonU28r0=";
|
||||
};
|
||||
|
||||
# Needed for github.co/google/go-tpm-tools/simulator which contains non-go files that `go mod vendor` strips
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-Ajoxxpf6oWW6jioMTgeyaIszVhp4j7E2+msE0nhfKpk=";
|
||||
vendorHash = "sha256-F9M7Tvo/yF1QVnjB7Gp3mbZc7159Dx7wgttjstkA/1w=";
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
|
|
|
|||
|
|
@ -27,14 +27,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
pname = "syncthingtray";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Martchus";
|
||||
repo = "syncthingtray";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-trmNK6lyKL6zNcL/FKELkLOJK9vVpFcS3uGMeMrlpPI=";
|
||||
hash = "sha256-JaekoeY9owh9GNR2f26Po5BoNu+sTvLPfvn/O0VBEdM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tmux-sessionizer";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jrmoulton";
|
||||
repo = "tmux-sessionizer";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-6eMKwp5639DIyhM6OD+db7jr4uF34JSt0Xg+lpyIPSI=";
|
||||
hash = "sha256-tJ8aKajSWc62BZ8hb3u+OQtlu04z8Ala5nAK5H4Byp4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gIsqHbCmfYs1c3LPNbE4zLVjzU3GJ4MeHMt0DC5sS3c=";
|
||||
cargoHash = "sha256-AJqlzLr6MDFfPssSFMxslxFFuPVxoQGcuG7sZeu+8pg=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
|
|
|||
|
|
@ -9,19 +9,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tombi";
|
||||
version = "0.10.4";
|
||||
version = "0.11.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tombi-toml";
|
||||
repo = "tombi";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Hs274ROPzyhVyvcvA7pDZ6+EELj4uUZylz94BoZNe6M=";
|
||||
hash = "sha256-m9ppr3P4HIzIzNYbLukbcCoYwRdcTWIpMmcmteIfo84=";
|
||||
};
|
||||
|
||||
# Tests relies on the presence of network
|
||||
doCheck = false;
|
||||
cargoBuildFlags = [ "--package tombi-cli" ];
|
||||
cargoHash = "sha256-i7OeWuGLrDFjBhFjuygIZ35LbzENM39+cCwHJ98ECyQ=";
|
||||
cargoHash = "sha256-f67OkZEB98KCtvkjszrcPLoC2QWl/5rd/qvb8jmonxc=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Cargo.toml \
|
||||
|
|
|
|||
|
|
@ -46,13 +46,13 @@ let
|
|||
in
|
||||
chosenStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tpm2-pkcs11";
|
||||
version = "1.9.2";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpm2-software";
|
||||
repo = "tpm2-pkcs11";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-o0a5MiFqLH7SuHG/BEtPVGOaDoV+kCu2l1MCHt5rWFc=";
|
||||
hash = "sha256-89lChdkheSEC0JKMKNXN11BqjeJgt1Hdk+QxjLPY72M=";
|
||||
};
|
||||
|
||||
# Disable Java‐based tests because of missing dependencies
|
||||
|
|
|
|||
|
|
@ -74,10 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
asl20 # and
|
||||
unfree # TrueCrypt License version 3.0
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
dsferruzza
|
||||
ryand56
|
||||
];
|
||||
maintainers = [ lib.maintainers.ryand56 ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "versatiles";
|
||||
version = "4.1.0";
|
||||
version = "4.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "versatiles-org";
|
||||
repo = "versatiles-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-U83jh74h1GKb6JKO62mDfDa8monknUqQ33oXlC6E6Q0=";
|
||||
hash = "sha256-kWUosTubAD/qk6xEGKUiLrw4mrAaOwwuQ3r+UeLsEJU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-yD4oBrk8GaI9E7Lq1Z45yqFTpRnLgNXq6CyzzV7Z/0Q=";
|
||||
cargoHash = "sha256-rTVk8c00b94x6wEIDLvwadCQ/DXSFOPWcKYFSI9YI64=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -0,0 +1,68 @@
|
|||
From 27023ebb5e5b0fef98682c179889c3a9a799d2ae Mon Sep 17 00:00:00 2001
|
||||
From: eljamm <fedi.jamoussi@protonmail.ch>
|
||||
Date: Tue, 12 May 2026 18:02:52 +0200
|
||||
Subject: [PATCH] Use order-only prerequisite for making sure dirs exist
|
||||
|
||||
instead of using `.pre-build` with `-include`, which could cause a
|
||||
failure if targets start executing before it finishes.
|
||||
---
|
||||
Makefile | 23 ++++++++++++-----------
|
||||
1 file changed, 12 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 4436f14..8e66c66 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -47,20 +47,21 @@ test: all $(BIN_DIR)/test_libbdsg
|
||||
docs:
|
||||
cd $(DOC_DIR) && $(MAKE) html
|
||||
|
||||
-.pre-build:
|
||||
- @if [ ! -d $(LIB_DIR) ]; then mkdir -p $(LIB_DIR); fi
|
||||
- @if [ ! -d $(OBJ_DIR) ]; then mkdir -p $(OBJ_DIR); fi
|
||||
- @if [ ! -d $(BIN_DIR) ]; then mkdir -p $(BIN_DIR); fi
|
||||
-
|
||||
-# run .pre-build before we make anything at all.
|
||||
--include .pre-build
|
||||
-
|
||||
# Make sure to pull in dependency files
|
||||
include $(wildcard $(OBJ_DIR)/*.d)
|
||||
|
||||
# Use a fake rule to build .d files, so we don't complain if they don't exist.
|
||||
$(OBJ_DIR)/%.d: ;
|
||||
|
||||
+$(OBJ_DIR):
|
||||
+ mkdir -p $(OBJ_DIR)
|
||||
+
|
||||
+$(LIB_DIR):
|
||||
+ mkdir -p $(LIB_DIR)
|
||||
+
|
||||
+$(BIN_DIR):
|
||||
+ mkdir -p $(BIN_DIR)
|
||||
+
|
||||
# Don't delete them.
|
||||
.PRECIOUS: $(OBJ_DIR)/%.d
|
||||
|
||||
@@ -69,16 +70,16 @@ $(OBJ_DIR)/%.d: ;
|
||||
# Make sure to touch the .o file after the compiler finishes so it is always newer than the .d file
|
||||
# Use static pattern rules so the dependency files will not be ignored if the output exists
|
||||
# See <https://stackoverflow.com/a/34983297>
|
||||
-$(OBJS): $(OBJ_DIR)/%.o : $(SRC_DIR)/%.cpp $(OBJ_DIR)/%.d
|
||||
+$(OBJS): $(OBJ_DIR)/%.o : $(SRC_DIR)/%.cpp $(OBJ_DIR)/%.d | $(OBJ_DIR)
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
|
||||
@touch $@
|
||||
|
||||
|
||||
-$(LIB_DIR)/libbdsg.a: $(OBJS)
|
||||
+$(LIB_DIR)/libbdsg.a: $(OBJS) | $(LIB_DIR)
|
||||
rm -f $@
|
||||
ar rs $@ $(OBJS)
|
||||
|
||||
-$(BIN_DIR)/test_libbdsg: $(LIB_DIR)/libbdsg.a $(SRC_DIR)/test_libbdsg.cpp
|
||||
+$(BIN_DIR)/test_libbdsg: $(LIB_DIR)/libbdsg.a $(SRC_DIR)/test_libbdsg.cpp | $(BIN_DIR)
|
||||
mkdir -p $(BIN_DIR)
|
||||
$(CXX) $(LDFLAGS) $(CPPFLAGS) $(CXXFLAGS) -L $(LIB_DIR) $(SRC_DIR)/test_libbdsg.cpp -o $(BIN_DIR)/test_libbdsg $(LIB_FLAGS)
|
||||
chmod +x $(BIN_DIR)/test_libbdsg
|
||||
--
|
||||
2.51.2
|
||||
|
||||
208
pkgs/by-name/vg/vg/package.nix
Normal file
208
pkgs/by-name/vg/vg/package.nix
Normal file
|
|
@ -0,0 +1,208 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
runCommand,
|
||||
|
||||
# build-time
|
||||
autoconf,
|
||||
automake,
|
||||
bison,
|
||||
cmake,
|
||||
flex,
|
||||
gettext,
|
||||
hostname,
|
||||
libtool,
|
||||
perl,
|
||||
pkg-config,
|
||||
python3,
|
||||
util-linux,
|
||||
which,
|
||||
whoami,
|
||||
|
||||
# run-time
|
||||
boost,
|
||||
bzip2,
|
||||
cairo,
|
||||
curl,
|
||||
expat,
|
||||
jansson,
|
||||
libxdmcp,
|
||||
ncurses,
|
||||
openssl,
|
||||
protobuf,
|
||||
xz,
|
||||
zlib,
|
||||
zstd,
|
||||
|
||||
# test
|
||||
graphviz,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vg";
|
||||
version = "1.74.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vgteam";
|
||||
repo = "vg";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CY4nUtVetdmoex/sRnoncEbvuQloV0WMZXtQpPksO1s=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace \
|
||||
Makefile \
|
||||
--replace-fail "/bin/bash" "${stdenv.shell}" \
|
||||
--replace-fail "\$(shell arch)" "${stdenv.hostPlatform.uname.processor}" \
|
||||
--replace-fail "vg_git_version.hpp]" "vg_git_version.hpp ]"
|
||||
|
||||
substituteInPlace \
|
||||
deps/libbdsg/bdsg/deps/pybind11/tests/CMakeLists.txt \
|
||||
deps/vcflib/CMakeLists.txt \
|
||||
--replace-fail \
|
||||
"find_package(pybind11 " \
|
||||
"set(PYBIND11_FINDPYTHON ON)
|
||||
find_package(pybind11 "
|
||||
|
||||
patchShebangs ./
|
||||
patchShebangs deps/
|
||||
|
||||
patch -p1 -d deps/libbdsg -i ${./0001-Use-order-only-prerequisite-for-making-sure-dirs-exi.patch}
|
||||
|
||||
pushd deps/htslib
|
||||
PACKAGE_VERSION=$(./version.sh)
|
||||
echo '#define HTSCODECS_VERSION_TEXT "$PACKAGE_VERSION"' > ./htscodecs/htscodecs/version.h
|
||||
popd
|
||||
'';
|
||||
|
||||
dontUseCmake = true; # cmake needed for deps, but not main package
|
||||
dontConfigure = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
bison
|
||||
cmake
|
||||
finalAttrs.passthru.customPython
|
||||
flex
|
||||
gettext
|
||||
hostname
|
||||
libtool
|
||||
perl
|
||||
pkg-config
|
||||
which
|
||||
whoami
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
util-linux # rev, and possibly others
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
bzip2
|
||||
cairo
|
||||
curl
|
||||
expat
|
||||
jansson
|
||||
ncurses
|
||||
openssl
|
||||
protobuf
|
||||
xz
|
||||
zlib
|
||||
zstd
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libxdmcp
|
||||
];
|
||||
|
||||
passthru.customPython = python3.withPackages (
|
||||
ps: with ps; [
|
||||
pybind11
|
||||
]
|
||||
);
|
||||
|
||||
# needed, else build fails
|
||||
env.VG_GIT_VERSION = finalAttrs.src.tag;
|
||||
|
||||
# deps/elfutils
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
"-Wno-error=stringop-overflow"
|
||||
"-Wno-error=unterminated-string-initialization"
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
# don't build statically
|
||||
"START_STATIC="
|
||||
"END_STATIC="
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
# Install directories may not exist when parallel builds complete their
|
||||
# output steps, so we create them here to prevent build failures.
|
||||
mkdir -p lib include obj/{pic/algorithms,algorithms,config,io,subcommand,unittest/support}
|
||||
'';
|
||||
|
||||
# no install target
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,lib}
|
||||
|
||||
cp bin/* $out/bin/
|
||||
cp -R lib/lib{handlegraph,vgio,hts,deflate}.so* $out/lib/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
fixupPhase = ''
|
||||
runHook preFixup
|
||||
|
||||
for bin in $out/bin/* ; do
|
||||
patchelf --allowed-rpath-prefixes /nix/store --shrink-rpath $bin
|
||||
patchelf --set-rpath "$out/lib:$(patchelf --print-rpath $bin)" $bin
|
||||
done
|
||||
|
||||
# remove debugging symbols that make the binary bloated in size
|
||||
strip -d $out/bin/vg
|
||||
|
||||
runHook postFixup
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests = runCommand "test-vg-basic" { } ''
|
||||
HOME=$(mktemp -d) # fontconfig cache
|
||||
|
||||
cp -R ${finalAttrs.src}/test .
|
||||
|
||||
# build graph
|
||||
${finalAttrs.finalPackage}/bin/vg construct \
|
||||
-r test/tiny/tiny.fa \
|
||||
-v test/tiny/tiny.vcf.gz \
|
||||
>x.vg
|
||||
|
||||
# convert graph to image
|
||||
${finalAttrs.finalPackage}/bin/vg view -d x.vg >x.dot
|
||||
${graphviz}/bin/dot -Tpng x.dot -o $out
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Tools for working with genome variation graphs";
|
||||
homepage = "https://github.com/vgteam/vg";
|
||||
changelog = "https://github.com/vgteam/vg/releases/tag/${finalAttrs.src.tag}";
|
||||
mainProgram = "vg";
|
||||
license = lib.licenses.mit;
|
||||
# TODO: build on darwin
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ eljamm ];
|
||||
teams = with lib.teams; [ ngi ];
|
||||
};
|
||||
})
|
||||
|
|
@ -97,6 +97,11 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
|||
httpx
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# test expects an exact response, but OpenAPI is returning something a tiny bit different
|
||||
"test_OpenAPIの形が変わっていないことを確認"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
resources = fetchFromGitHub {
|
||||
name = "voicevox-resource-${finalAttrs.version}"; # this contains ${version} to invalidate the hash upon updating the package
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "vuetorrent";
|
||||
version = "2.33.0";
|
||||
version = "2.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VueTorrent";
|
||||
repo = "VueTorrent";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-7jr7spoJBt4YqOgTmIC2bNjygrSlUgF1AuDPzCe+YuU=";
|
||||
hash = "sha256-Zz7ZFtxT26/4HCkM/HHVyLXxbmDvhTRFaJpiXA08JPY=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-l8b/WazCUKWwxlv+b8OnLLYslhGezdoWIGsRExIsZyU=";
|
||||
npmDepsHash = "sha256-PxTe/anj3VgdEaSdv37XuBYD8N3gs9wc+idCboX8Bic=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
libjpeg,
|
||||
libtool,
|
||||
libxkbcommon,
|
||||
nss,
|
||||
nspr,
|
||||
udev,
|
||||
gtk3,
|
||||
|
|
@ -168,9 +167,9 @@ else
|
|||
tar -xf data.tar.xz
|
||||
|
||||
# Remove unneeded files
|
||||
rm -rf usr/share/{fonts,locale}
|
||||
rm -rf usr/share/{fonts,locale,templates}
|
||||
rm -f usr/bin/misc
|
||||
rm -rf opt/kingsoft/wps-office/{desktops,INSTALL}
|
||||
rm -rf opt/kingsoft/wps-office/{desktops,INSTALL,templates}
|
||||
rm -f opt/kingsoft/wps-office/office6/lib{peony-wpsprint-menu-plugin,bz2,jpeg,stdc++,gcc_s,odbc*,dbus-1}.so*
|
||||
'';
|
||||
|
||||
|
|
@ -189,7 +188,7 @@ else
|
|||
|
||||
for i in $out/share/applications/*; do
|
||||
substituteInPlace $i \
|
||||
--replace-fail /usr/bin $out/bin
|
||||
--replace-fail /usr/bin/ ""
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
|
|
|
|||
|
|
@ -10,18 +10,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zerofs";
|
||||
version = "1.1.7";
|
||||
version = "1.1.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Barre";
|
||||
repo = "ZeroFS";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DNdSrDlknZhUG7yQ5ckBcCJFktguDG1qfOtRz3MMmG4=";
|
||||
hash = "sha256-1nCtfFxIH0DJCNSTcUlxkxqyLONualGMKfcVZP5b24Q=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/zerofs";
|
||||
|
||||
cargoHash = "sha256-rS40vg3x+tWhlPv3KfK0mpoUeYa5O9QpTxuZm2IYZ3k=";
|
||||
cargoHash = "sha256-vbiRllYMRVufwNPA987keP0MJK+DRms6TnSA8UAn+Bw=";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qtutilities";
|
||||
version = "6.21.1";
|
||||
version = "6.21.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Martchus";
|
||||
repo = "qtutilities";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-kZ9Iql4QRxxm/NUPKFMMqYlAMV3zsHWzyaSH7k//Bnw=";
|
||||
hash = "sha256-pPCXhk6ujIu+TmxeLP8FPkHopjhy0dVUj/kR9yXxmrc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@ in
|
|||
};
|
||||
|
||||
wlroots_0_20 = generic {
|
||||
version = "0.20.0";
|
||||
hash = "sha256-hVJlJiJK6+9RkgkmQzUzb8ypVMqsNhbQG6KfeCvxtb0=";
|
||||
version = "0.20.1";
|
||||
hash = "sha256-uuc1dn13FXvFSBvE3+QOi35rLJZmWIUst64oaXGdPFk=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,21 +4,24 @@
|
|||
async-timeout,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "adax";
|
||||
version = "0.4.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pyadax";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-wmcZtiML02i1XfqpFzni2WDrxutTvP5laVvTAGtNg0Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
];
|
||||
|
|
@ -31,8 +34,8 @@ buildPythonPackage rec {
|
|||
meta = {
|
||||
description = "Python module to communicate with Adax";
|
||||
homepage = "https://github.com/Danielhiversen/pyAdax";
|
||||
changelog = "https://github.com/Danielhiversen/pyAdax/releases/tag/${version}";
|
||||
changelog = "https://github.com/Danielhiversen/pyAdax/releases/tag/${finalAttrs.version}";
|
||||
license = with lib.licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "agent-client-protocol";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: {
|
|||
owner = "agentclientprotocol";
|
||||
repo = "python-sdk";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-JndUYT3oimoDs6WDA4ixhNCZnswUAZA4nab5DT1xpbQ=";
|
||||
hash = "sha256-iVmNzAx/YlvFXXVPjS1SmjDqGAr9aRDdSW93Nw2ayAY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
lib,
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
unittestCheckHook,
|
||||
cargo,
|
||||
rustc,
|
||||
|
|
@ -36,6 +37,9 @@ buildPythonPackage rec {
|
|||
|
||||
unittestFlagsArray = [ "tests/" ]; # Not sure why it isn't autodiscovered
|
||||
|
||||
# pyo3-asyncio 0.20 segfaults on the python 3.14 interpreter state.
|
||||
doCheck = pythonOlder "3.14";
|
||||
|
||||
pythonImportsCheck = [ "aiotarfile" ];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -3,35 +3,33 @@
|
|||
aiohttp,
|
||||
beautifulsoup4,
|
||||
buildPythonPackage,
|
||||
colorlog,
|
||||
cryptography,
|
||||
fetchFromGitHub,
|
||||
orjson,
|
||||
poetry-core,
|
||||
pycryptodome,
|
||||
pytest-cov-stub,
|
||||
pytestCheckHook,
|
||||
segno,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "aiovodafone";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chemelli74";
|
||||
repo = "aiovodafone";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CZz/rRRgZwP7gowYORkt8j99mU0CMgOX+M1JExvFNDI=";
|
||||
hash = "sha256-KKd8dOabm/6YksBG6+51zYUsgiA4wFW6dGe2tiX3fQA=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
beautifulsoup4
|
||||
colorlog
|
||||
cryptography
|
||||
orjson
|
||||
pycryptodome
|
||||
|
|
|
|||
|
|
@ -18,14 +18,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "beaupy";
|
||||
version = "3.11.0";
|
||||
version = "3.12.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "petereon";
|
||||
repo = "beaupy";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EQekSvjhL2qVQTjbdv4OqYMRUXrS9VzAIWiDjGdy3Rc=";
|
||||
hash = "sha256-9iJZFOtQ6UTc8i4cN4soEG0SLcljenAQwq0wfK6r/Rw=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -49,6 +49,8 @@ buildPythonPackage rec {
|
|||
cmake
|
||||
gfortran
|
||||
];
|
||||
|
||||
env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-z,noexecstack";
|
||||
};
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
"-Wno-error=incompatible-pointer-types"
|
||||
|
|
|
|||
|
|
@ -7,16 +7,18 @@
|
|||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "braintree";
|
||||
version = "4.41.0";
|
||||
version = "4.43.0";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "braintree";
|
||||
repo = "braintree_python";
|
||||
rev = version;
|
||||
hash = "sha256-5rTYRzlx/XueL6vF0/kM73bgN/QjvM55ZSLIWNI8YiQ=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-4qLi6MplXaIT8+Us3Yb9fTph74XntagBNzyS//4K5Fk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
@ -27,9 +29,8 @@ buildPythonPackage rec {
|
|||
|
||||
pythonImportsCheck = [ "braintree" ];
|
||||
|
||||
# Most integration tests require a running Braintree gateway.
|
||||
enabledTestPaths = [
|
||||
"tests/"
|
||||
"tests/fixtures"
|
||||
"tests/unit"
|
||||
"tests/integration/test_credentials_parser.py"
|
||||
];
|
||||
|
|
@ -40,4 +41,4 @@ buildPythonPackage rec {
|
|||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "disposable-email-domains";
|
||||
version = "0.0.181";
|
||||
version = "0.0.188";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: {
|
|||
src = fetchPypi {
|
||||
pname = "disposable_email_domains";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-BtW0MXgFTphae3O5XPDnix8RTKDx/tvzpTN4znZjFSI=";
|
||||
hash = "sha256-CRSFrSo7wSUIBY3l/n5Uf3wM0AwbrxRiELepz0NWOXQ=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -5,20 +5,30 @@
|
|||
rustPlatform,
|
||||
pytestCheckHook,
|
||||
arro3-core,
|
||||
pyarrow,
|
||||
pyproj,
|
||||
obstore,
|
||||
|
||||
# tests
|
||||
arro3-compute,
|
||||
arro3-io,
|
||||
geoarrow-types,
|
||||
geodatasets,
|
||||
geopandas,
|
||||
numpy,
|
||||
pandas,
|
||||
geoarrow-types,
|
||||
pyarrow,
|
||||
pyogrio,
|
||||
pyproj,
|
||||
pytest-asyncio,
|
||||
shapely,
|
||||
}:
|
||||
let
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "geoarrow";
|
||||
repo = "geoarrow-rs";
|
||||
tag = "py-v${version}";
|
||||
hash = "sha256-3/HOQsgQVpEd9iAVvIHvpb0slg55/V6X6KLLvhDUVz4=";
|
||||
hash = "sha256-qQGGG8aGwFR7ApLaQAE0iQSElpSBeRTtbq4+1xbTC/o=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
|
|
@ -100,6 +110,7 @@ let
|
|||
pythonImportsCheck = [ "geoarrow.rust.io" ];
|
||||
dependencies = [
|
||||
arro3-core
|
||||
obstore
|
||||
pyproj
|
||||
];
|
||||
};
|
||||
|
|
@ -113,16 +124,40 @@ let
|
|||
dontInstall = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
geoarrow-types
|
||||
pandas
|
||||
pyarrow
|
||||
numpy
|
||||
arro3-compute
|
||||
arro3-io
|
||||
geoarrow-rust-core
|
||||
geoarrow-rust-io
|
||||
geoarrow-types
|
||||
geodatasets
|
||||
geopandas
|
||||
numpy
|
||||
obstore
|
||||
pandas
|
||||
pyarrow
|
||||
pyogrio
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
shapely
|
||||
];
|
||||
|
||||
pytestFlags = [ "python" ];
|
||||
# use the latest test folder (skips the tests_old folder)
|
||||
pytestFlags = [ "python/tests" ];
|
||||
|
||||
disabledTests = [
|
||||
# require internet access to download datasets
|
||||
"test_parse_nybb"
|
||||
"test_parse_nybb_chunked"
|
||||
"test_getitem"
|
||||
"test_geo_interface_polygon"
|
||||
"test_parquet_file"
|
||||
];
|
||||
|
||||
# fix the directory name, as it is named as source for nix build
|
||||
postPatch = ''
|
||||
substituteInPlace python/tests/utils.py \
|
||||
--replace-fail 'while current_dir.stem != "geoarrow-rs":' 'while current_dir.stem != "source":'
|
||||
'';
|
||||
};
|
||||
in
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,23 +1,27 @@
|
|||
{
|
||||
lib,
|
||||
nix-update-script,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
buildPythonApplication,
|
||||
setuptools,
|
||||
pytestCheckHook,
|
||||
click,
|
||||
fonttools,
|
||||
uharfbuzz,
|
||||
pyyaml,
|
||||
colorlog,
|
||||
packaging,
|
||||
}:
|
||||
buildPythonApplication rec {
|
||||
pname = "hyperglot";
|
||||
version = "0.7.3";
|
||||
version = "0.8.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Pd9Yxmv9a1T2xV03q2U1m1laHE3WifHwmnGBfTTCSxM=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rosettatype";
|
||||
repo = "hyperglot";
|
||||
tag = version;
|
||||
hash = "sha256-fiiDYggMBwd7nTHeQLWnSc3BNDyU+JUgAIk8pHLntUY=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
|
|
@ -26,10 +30,12 @@ buildPythonApplication rec {
|
|||
uharfbuzz
|
||||
pyyaml
|
||||
colorlog
|
||||
packaging
|
||||
];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
pythonImportsCheck = [ "hyperglot" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
|
@ -38,7 +44,7 @@ buildPythonApplication rec {
|
|||
description = "Database and tools for detecting language support in fonts";
|
||||
homepage = "https://hyperglot.rosettatype.com";
|
||||
changelog = "https://github.com/rosettatype/hyperglot/blob/${version}/CHANGELOG.md";
|
||||
license = lib.licenses.gpl3Only;
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ imatpot ];
|
||||
mainProgram = "hyperglot";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -24,6 +24,11 @@ buildPythonPackage (finalAttrs: {
|
|||
hash = "sha256-jdv9GfcSBM7Ount8cnJLFbP6h7q16B5Fp1vvc2oaPHY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/jaraco/irc/pull/236
|
||||
./python-3.14-event-loop.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
--- a/irc/tests/test_client_aio.py
|
||||
+++ b/irc/tests/test_client_aio.py
|
||||
@@ -1,6 +1,4 @@
|
||||
import asyncio
|
||||
-import contextlib
|
||||
-import warnings
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
from irc import client_aio
|
||||
@@ -13,21 +11,14 @@ async def mock_create_connection(*args, **kwargs):
|
||||
return mock_create_connection
|
||||
|
||||
|
||||
-@contextlib.contextmanager
|
||||
-def suppress_issue_197():
|
||||
- with warnings.catch_warnings():
|
||||
- warnings.filterwarnings('ignore', 'There is no current event loop')
|
||||
- yield
|
||||
-
|
||||
-
|
||||
def test_privmsg_sends_msg():
|
||||
# create dummy transport, protocol
|
||||
mock_transport = MagicMock()
|
||||
mock_protocol = MagicMock()
|
||||
|
||||
# connect to dummy server
|
||||
- with suppress_issue_197():
|
||||
- loop = asyncio.get_event_loop()
|
||||
+ loop = asyncio.new_event_loop()
|
||||
+ asyncio.set_event_loop(loop)
|
||||
loop.create_connection = make_mocked_create_connection(
|
||||
mock_transport, mock_protocol
|
||||
)
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
python,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
sip4,
|
||||
protobuf,
|
||||
distutils,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libarcus";
|
||||
version = "4.12.0";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ultimaker";
|
||||
repo = "libArcus";
|
||||
rev = version;
|
||||
hash = "sha256-X33ptwYj9YkVWqUDPP+Ic+hoIb+rwsLdQXvHLA9z+3w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build against protobuf 3.18+
|
||||
# https://github.com/Ultimaker/libArcus/issues/121
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/coryan/vcpkg/f69b85aa403b04e7d442c90db3418d484e44024f/ports/arcus/0001-fix-protobuf-deprecated.patch";
|
||||
sha256 = "0bqj7pxzpwsamknd6gadj419x6mwx8wnlfzg4zqn6cax3cmasjb2";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
sip4
|
||||
distutils
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
sip4
|
||||
];
|
||||
|
||||
buildInputs = [ protobuf ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Communication library between internal components for Ultimaker software";
|
||||
homepage = "https://github.com/Ultimaker/libArcus";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
mlflow,
|
||||
|
||||
# build-system
|
||||
|
|
@ -30,10 +32,17 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "mlflow-skinny";
|
||||
inherit (mlflow) version src;
|
||||
inherit (mlflow) version;
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mlflow";
|
||||
repo = "mlflow";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-OxhM+KCem0sb9cwtyzrUD/MGfoiiCfgU47qipYRDaFk=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/libs/skinny";
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
@ -69,5 +78,6 @@ buildPythonPackage (finalAttrs: {
|
|||
meta = mlflow.meta // {
|
||||
description = "Lightweight version of MLflow that is designed to minimize package size";
|
||||
homepage = "https://github.com/mlflow/mlflow/tree/master/libs/skinny";
|
||||
sourceProvenance = with lib.sourceTypes; [ fromSource ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
mlflow,
|
||||
|
||||
# build-system
|
||||
|
|
@ -15,9 +16,6 @@
|
|||
packaging,
|
||||
protobuf,
|
||||
pydantic,
|
||||
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
}:
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "mlflow-tracing";
|
||||
|
|
@ -25,13 +23,16 @@ buildPythonPackage (finalAttrs: {
|
|||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
inherit (mlflow) src;
|
||||
src = fetchFromGitHub {
|
||||
owner = "mlflow";
|
||||
repo = "mlflow";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-OxhM+KCem0sb9cwtyzrUD/MGfoiiCfgU47qipYRDaFk=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/libs/tracing";
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
cachetools
|
||||
|
|
@ -53,6 +54,9 @@ buildPythonPackage (finalAttrs: {
|
|||
description = "Open-Source SDK for observability and monitoring GenAI applications";
|
||||
homepage = "https://github.com/mlflow/mlflow/tree/master/libs/tracing";
|
||||
inherit (mlflow.meta) license;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
maintainers = with lib.maintainers; [
|
||||
GaetanLepage
|
||||
gquetel
|
||||
];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,10 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
fetchPypi,
|
||||
|
||||
# dependencies
|
||||
aiohttp,
|
||||
|
|
@ -31,26 +28,32 @@
|
|||
buildPythonPackage (finalAttrs: {
|
||||
pname = "mlflow";
|
||||
version = "3.12.0";
|
||||
pyproject = true;
|
||||
format = "wheel";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mlflow";
|
||||
repo = "mlflow";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OxhM+KCem0sb9cwtyzrUD/MGfoiiCfgU47qipYRDaFk=";
|
||||
# We build from the PyPI wheel rather than fetchFromGitHub, because the mlflow-server
|
||||
# JS UI is absent from GitHub but provided in the wheel.
|
||||
src = fetchPypi {
|
||||
pname = "mlflow";
|
||||
inherit (finalAttrs) version;
|
||||
format = "wheel";
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
hash = "sha256-4cKO1MSFV8xSx2bxfxylgmdT3fJB1D8w+ZxF9+prPOA=";
|
||||
};
|
||||
|
||||
# ppyproject.release.toml is the one shipped in the Pypi package, so we use it too.
|
||||
postPatch = ''
|
||||
mv pyproject.release.toml pyproject.toml
|
||||
# Nix-wrapped python populates sys.path via NIX_PYTHONPATH/site hooks,
|
||||
# but PYTHONPATH stays unset in os.environ. mlflow spawns the server
|
||||
# in a subprocess with a curated env, so without this patch the child
|
||||
# interpreter cannot import uvicorn / mlflow itself.
|
||||
postInstall = ''
|
||||
patch -p1 -d "$out/lib/python"*/site-packages < ${./subprocess-pythonpath.patch}
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"cryptography"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
alembic
|
||||
|
|
@ -85,10 +88,15 @@ buildPythonPackage (finalAttrs: {
|
|||
description = "Open source platform for the machine learning lifecycle";
|
||||
mainProgram = "mlflow";
|
||||
homepage = "https://github.com/mlflow/mlflow";
|
||||
changelog = "https://github.com/mlflow/mlflow/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
changelog = "https://github.com/mlflow/mlflow/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
# Build from wheel which contains pure Python and pre-built JS bundle.
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
binaryBytecode
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
GaetanLepage
|
||||
gquetel
|
||||
];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
--- a/mlflow/server/__init__.py
|
||||
+++ b/mlflow/server/__init__.py
|
||||
@@ -471,6 +471,11 @@
|
||||
else tempfile.mkdtemp()
|
||||
)
|
||||
+ # In Nix-packaged environments sys.path is populated by wrappers but
|
||||
+ # PYTHONPATH is never set in os.environ, so subprocesses (uvicorn,
|
||||
+ # gunicorn) cannot find packages. Propagate it when not already set.
|
||||
+ if "PYTHONPATH" not in os.environ:
|
||||
+ env_map.setdefault("PYTHONPATH", os.pathsep.join(p for p in sys.path if p))
|
||||
|
||||
server_proc = _exec_cmd(
|
||||
full_command,
|
||||
extra_env=env_map,
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
fetchpatch2,
|
||||
setuptools,
|
||||
pylint,
|
||||
pytest,
|
||||
|
|
@ -19,6 +20,17 @@ buildPythonPackage rec {
|
|||
hash = "sha256-iHZLjh1c+hiAkkjgzML8BQNfCMNfCwIi3c/qHDxOVT4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Use pathlib.Path in plugin hooks for pytest 8.1+ compatibility.
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/carsongee/pytest-pylint/commit/62457e8013df106116fb2a62c7c44870103ff393.patch?full_index=1";
|
||||
hash = "sha256-EnlHEe5uZkvrWO8B33xkQ3LCQ7Bj5/oLES//NP8vkwE=";
|
||||
})
|
||||
# Handle test output difference in pytest 9.
|
||||
# https://github.com/carsongee/pytest-pylint/pull/196
|
||||
./pytest-9.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail "pytest-runner" ""
|
||||
|
|
|
|||
13
pkgs/development/python-modules/pytest-pylint/pytest-9.patch
Normal file
13
pkgs/development/python-modules/pytest-pylint/pytest-9.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/pytest_pylint/tests/test_pytest_pylint.py b/pytest_pylint/tests/test_pytest_pylint.py
|
||||
index 4c87ac336690defb2f2d472b389945c91fae5d31..f6478c018f5974acb2fdd95f1d461ca71e1302ba 100644
|
||||
--- a/pytest_pylint/tests/test_pytest_pylint.py
|
||||
+++ b/pytest_pylint/tests/test_pytest_pylint.py
|
||||
@@ -38,7 +38,7 @@ def test_nodeid_no_dupepath(testdir):
|
||||
testdir.makepyfile(app="import sys")
|
||||
result = testdir.runpytest("--pylint", "--verbose")
|
||||
assert re.search(
|
||||
- r"^FAILED\s+app\.py::PYLINT$", result.stdout.str(), flags=re.MULTILINE
|
||||
+ r"^FAILED\s+app\.py::PYLINT( |$)", result.stdout.str(), flags=re.MULTILINE
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -8,16 +8,16 @@
|
|||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pytest-resource-path";
|
||||
version = "1.4.1";
|
||||
version = "1.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yukihiko-shinoda";
|
||||
repo = "pytest-resource-path";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-f0jN6V6tQRbr/DHOKKTrFCb1EBUUxZAQRckMy2iiVqI=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Y/mB5Gmkt3Rt8rRBOFZrWIREnpEiSxf/MChqymXDNws=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
@ -36,4 +36,4 @@ buildPythonPackage rec {
|
|||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
}:
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "qtile-extras";
|
||||
version = "0.35.0";
|
||||
version = "0.36.0";
|
||||
# nixpkgs-update: no auto update
|
||||
# should be updated alongside with `qtile`
|
||||
pyproject = true;
|
||||
|
|
@ -32,7 +32,7 @@ buildPythonPackage (finalAttrs: {
|
|||
owner = "elParaguayo";
|
||||
repo = "qtile-extras";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xZ1pxe1EUnnjqz+46R4R9DWKi7M2j1pgvY4uy1dBak8=";
|
||||
hash = "sha256-H2A5Y+ukTkUqjQB5eQVuOMYpf7T8RgQlNlQ25wlWwr8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
|
|
@ -72,8 +72,6 @@ buildPythonPackage (finalAttrs: {
|
|||
# AttributeError: 'NoneType' object has no attribute 'theta'
|
||||
"test_image_size_horizontal"
|
||||
"test_image_size_vertical"
|
||||
# flaky, timing sensitive
|
||||
"test_visualiser"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
|
@ -84,6 +82,11 @@ buildPythonPackage (finalAttrs: {
|
|||
"test/widget/test_strava.py"
|
||||
];
|
||||
|
||||
pytestFlags = [
|
||||
"--reruns 3"
|
||||
"--reruns-delay 5"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
export GDK_PIXBUF_MODULE_FILE=${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
psutil,
|
||||
pulsectl-asyncio,
|
||||
pygobject3,
|
||||
pytz,
|
||||
pyxdg,
|
||||
xcffib,
|
||||
extraPackages ? [ ],
|
||||
|
|
@ -52,6 +51,7 @@
|
|||
pytestCheckHook,
|
||||
pytest-asyncio,
|
||||
pytest-httpbin,
|
||||
pytest-rerunfailures,
|
||||
pytest-xdist,
|
||||
writableTmpDirAsHomeHook,
|
||||
anyio,
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "qtile";
|
||||
version = "0.35.0";
|
||||
version = "0.36.0";
|
||||
# nixpkgs-update: no auto update
|
||||
# should be updated alongside with `qtile-extras`
|
||||
|
||||
|
|
@ -80,14 +80,9 @@ buildPythonPackage (finalAttrs: {
|
|||
owner = "qtile";
|
||||
repo = "qtile";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5XHzlS/Knw/VmVtnM7wToJ/F12GAa2lwdWuXBJHXnZM=";
|
||||
hash = "sha256-yFh9h3djV52zdZjPYwOWaMzN9ZNhFdZYyxFJreoJBCk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/qtile/qtile/pull/5889
|
||||
./fix-test-net.patch
|
||||
];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
|
|
@ -108,6 +103,7 @@ buildPythonPackage (finalAttrs: {
|
|||
|
||||
pypaBuildFlags = [
|
||||
"--config-setting=backend=wayland"
|
||||
"--config-setting=FONTCONFIG=${lib.getLib fontconfig}/lib/libfontconfig.so"
|
||||
"--config-setting=GOBJECT=${lib.getLib glib}/lib/libgobject-2.0.so"
|
||||
"--config-setting=PANGO=${lib.getLib pango}/lib/libpango-1.0.so"
|
||||
"--config-setting=PANGOCAIRO=${lib.getLib pango}/lib/libpangocairo-1.0.so"
|
||||
|
|
@ -125,7 +121,6 @@ buildPythonPackage (finalAttrs: {
|
|||
psutil
|
||||
pulsectl-asyncio
|
||||
pygobject3
|
||||
pytz
|
||||
pyxdg
|
||||
xcffib
|
||||
];
|
||||
|
|
@ -154,10 +149,10 @@ buildPythonPackage (finalAttrs: {
|
|||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
pytest-httpbin
|
||||
pytest-rerunfailures
|
||||
pytest-xdist
|
||||
writableTmpDirAsHomeHook
|
||||
anyio
|
||||
fontconfig
|
||||
gdk-pixbuf
|
||||
gobject-introspection
|
||||
isort
|
||||
|
|
@ -167,15 +162,16 @@ buildPythonPackage (finalAttrs: {
|
|||
xvfb
|
||||
];
|
||||
|
||||
pytestFlags = [
|
||||
"--reruns 3"
|
||||
"--reruns-delay 5"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export PATH=$PATH:$out/bin
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# ModuleNotFoundError: No module named 'libqtile'
|
||||
# known issue upstream: https://github.com/qtile/qtile/issues/5883
|
||||
"test_identify_output"
|
||||
|
||||
# caused by dbus-fast trying to read '/var/lib/dbus/machine-id'
|
||||
"test_defaults"
|
||||
"test_device_actions"
|
||||
|
|
@ -196,12 +192,6 @@ buildPythonPackage (finalAttrs: {
|
|||
|
||||
# Probably won't work in the Nix sandbox due to `xcffib.ConnectionException`
|
||||
"test_urgent_hook_fire"
|
||||
|
||||
# flaky: race between force_update() executor task and widget.info() read
|
||||
"test_threadpolltext_force_update"
|
||||
|
||||
# flaky: race between repl server bind and client connect
|
||||
"test_repl_server_executes_code"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
|
@ -218,6 +208,7 @@ buildPythonPackage (finalAttrs: {
|
|||
homepage = "http://www.qtile.org/";
|
||||
license = lib.licenses.mit;
|
||||
description = "Small, flexible, scriptable tiling window manager written in Python";
|
||||
changelog = "https://github.com/qtile/qtile/blob/v${finalAttrs.version}/CHANGELOG";
|
||||
mainProgram = "qtile";
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
|
|
|
|||
|
|
@ -1,63 +0,0 @@
|
|||
From 71c70072524ee2fb2f4683861236894e51c50d6e Mon Sep 17 00:00:00 2001
|
||||
From: elParaguayo <elparaguayocode@gmail.com>
|
||||
Date: Tue, 24 Mar 2026 20:38:18 +0000
|
||||
Subject: [PATCH] Fix test_net.py
|
||||
|
||||
The test uses a fake psutil module to get net statistics. However,
|
||||
values are increased between tests and so will fail if tests are run in
|
||||
a different order. We fix this by resetting stats between tests.
|
||||
---
|
||||
test/widgets/test_net.py | 12 +++++++-----
|
||||
1 file changed, 7 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/test/widgets/test_net.py b/test/widgets/test_net.py
|
||||
index dcb0966c50..ea6a849a3a 100644
|
||||
--- a/test/widgets/test_net.py
|
||||
+++ b/test/widgets/test_net.py
|
||||
@@ -34,6 +34,8 @@ def __init__(self, up, down):
|
||||
@pytest.fixture
|
||||
def patch_net(fake_qtile, monkeypatch, fake_window):
|
||||
def build_widget(**kwargs):
|
||||
+ MockPsutil.up = 0
|
||||
+ MockPsutil.down = 0
|
||||
monkeypatch.setitem(sys.modules, "psutil", MockPsutil("psutil"))
|
||||
from libqtile.widget import net
|
||||
|
||||
@@ -62,15 +64,15 @@ def test_net_defaults(patch_net):
|
||||
def test_net_single_interface(patch_net):
|
||||
"""Display single named interface"""
|
||||
net2 = patch_net(interface="wlp58s0")
|
||||
- assert net2.poll() == "wlp58s0: U 40.0kB 160.0kB D 1.2MB 4.8MB T 1.24MB 4.96MB"
|
||||
+ assert net2.poll() == "wlp58s0: U 40.0kB 80.0kB D 1.2MB 2.4MB T 1.24MB 2.48MB"
|
||||
|
||||
|
||||
def test_net_list_interface(patch_net):
|
||||
"""Display multiple named interfaces"""
|
||||
net2 = patch_net(interface=["wlp58s0", "lo"])
|
||||
assert net2.poll() == (
|
||||
- "wlp58s0: U 40.0kB 240.0kB D 1.2MB 7.2MB T 1.24MB 7.44MB lo: U 40.0kB "
|
||||
- "240.0kB D 1.2MB 7.2MB T 1.24MB 7.44MB"
|
||||
+ "wlp58s0: U 40.0kB 80.0kB D 1.2MB 2.4MB T 1.24MB 2.48MB "
|
||||
+ "lo: U 40.0kB 80.0kB D 1.2MB 2.4MB T 1.24MB 2.48MB"
|
||||
)
|
||||
|
||||
|
||||
@@ -83,7 +85,7 @@ def test_net_invalid_interface(patch_net):
|
||||
def test_net_use_bits(patch_net):
|
||||
"""Display all interfaces in bits rather than bytes"""
|
||||
net4 = patch_net(use_bits=True)
|
||||
- assert net4.poll() == "all: U 320.0kb 2.56Mb D 9.6Mb 76.8Mb T 9.92Mb 79.36Mb"
|
||||
+ assert net4.poll() == "all: U 320.0kb 640.0kb D 9.6Mb 19.2Mb T 9.92Mb 19.84Mb"
|
||||
|
||||
|
||||
def test_net_convert_zero_b(patch_net):
|
||||
@@ -95,7 +97,7 @@ def test_net_convert_zero_b(patch_net):
|
||||
def test_net_use_prefix(patch_net):
|
||||
"""Tests `prefix` configurable option"""
|
||||
net6 = patch_net(prefix="M")
|
||||
- assert net6.poll() == "all: U 0.04MB 440.0kB D 1.2MB 13.2MB T 1.24MB 13.64MB"
|
||||
+ assert net6.poll() == "all: U 0.04MB 80.0kB D 1.2MB 2.4MB T 1.24MB 2.48MB"
|
||||
|
||||
|
||||
def test_net_missing_interface(patch_net):
|
||||
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sev-snp-measure";
|
||||
version = "0.0.12";
|
||||
version = "0.0.13";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "virtee";
|
||||
repo = "sev-snp-measure";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-UcXU6rNjcRN1T+iWUNrqeJCkSa02WU1/pBwLqHVPRyw=";
|
||||
hash = "sha256-euAmKIdLJiA+iRlsPJCxPuquE9eznwd937LVWO4DKpc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "twilio";
|
||||
version = "9.10.5";
|
||||
version = "9.10.9";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twilio";
|
||||
repo = "twilio-python";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-WLgx8kAHfLf7BHhu4A7b4gI3pB7WODb/CPV1qw7oNXM=";
|
||||
hash = "sha256-CQWP8QujDvV5+Z5JDUcWhQ4mJZqaXnxpScS9sBxIX4Q=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -1,61 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
python,
|
||||
cmake,
|
||||
pyqt5,
|
||||
numpy,
|
||||
scipy,
|
||||
shapely,
|
||||
libarcus,
|
||||
cryptography,
|
||||
doxygen,
|
||||
gettext,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "4.12.0";
|
||||
pname = "uranium";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ultimaker";
|
||||
repo = "Uranium";
|
||||
rev = version;
|
||||
hash = "sha256-SE9xqrloPXIRTJiiqUdRKFmb4c0OjmJK5CMn6VXMFmk=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
python
|
||||
gettext
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
pyqt5
|
||||
numpy
|
||||
scipy
|
||||
shapely
|
||||
libarcus
|
||||
cryptography
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
doxygen
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
|
||||
sed -i \
|
||||
-e "s,Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)).*,Resources.addSearchPath(\"$out/share/uranium/resources\")," \
|
||||
-e "s,self._plugin_registry.addPluginLocation(os.path.join(os.path.abspath(os.path.dirname(__file__)).*,self._plugin_registry.addPluginLocation(\"$out/lib/uranium/plugins\")," \
|
||||
UM/Application.py
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Python framework for building Desktop applications";
|
||||
homepage = "https://github.com/Ultimaker/Uranium";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,28 +1,28 @@
|
|||
{
|
||||
"game": {
|
||||
"latest": {
|
||||
"linux": "53.11",
|
||||
"linux": "53.14",
|
||||
"darwin": "0.47.05"
|
||||
},
|
||||
"versions": {
|
||||
"53.11": {
|
||||
"53.14": {
|
||||
"df": {
|
||||
"version": "53.11",
|
||||
"version": "53.14",
|
||||
"urls": {
|
||||
"linux": {
|
||||
"url": "https://www.bay12games.com/dwarves/df_53_11_linux.tar.bz2",
|
||||
"outputHash": "sha256-Ss1SHsLr3V9aMWptIpd6PTO9ZmqPZiR8P97vNRBuLZs="
|
||||
"url": "https://www.bay12games.com/dwarves/df_53_14_linux.tar.bz2",
|
||||
"outputHash": "sha256-ZU/va7bblzh5UuPuuctjUHzEmcFLtzjXp9R86UV+G9k="
|
||||
}
|
||||
}
|
||||
},
|
||||
"hack": {
|
||||
"version": "53.11-r1",
|
||||
"version": "53.14-r2",
|
||||
"git": {
|
||||
"url": "https://github.com/DFHack/dfhack.git",
|
||||
"revision": "53.11-r1",
|
||||
"outputHash": "sha256-w2yfR9kOw13Ag3wxEHMXI9tVZMUwfgUWmrSVD1ViU4U="
|
||||
"revision": "53.14-r2",
|
||||
"outputHash": "sha256-UOmp84VoY/pam99T2ktAYH3N3cFMSIb9v8KOTZCof8U="
|
||||
},
|
||||
"xmlRev": "d79288374802cc63b1507900030b32231ffd244b"
|
||||
"xmlRev": "01aae95cacd98850e4f477c45a4b75f800bacecc"
|
||||
}
|
||||
},
|
||||
"52.05": {
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ stdenv.mkDerivation {
|
|||
echo "It doesn't support DF $dfVersion out of the box, so we're doing it the hard way."
|
||||
export HOME="$(mktemp -dt dfhack.XXXXXX)"
|
||||
export XDG_DATA_HOME="$HOME/.local/share"
|
||||
expect ${dfHackExpectScript}
|
||||
expect ${dfHackExpectScript} | tr -d '\r'
|
||||
local ini="$XDG_DATA_HOME/df_linux/therapist.ini"
|
||||
if [ -f "$ini" ]; then
|
||||
if grep -q "$patched_md5" "$ini"; then
|
||||
|
|
|
|||
|
|
@ -281,18 +281,18 @@ lib.throwIf (enableTWBT' && !enableDFHack) "dwarf-fortress: TWBT requires DFHack
|
|||
export HOME="$(mktemp -dt dwarf-fortress.XXXXXX)"
|
||||
''
|
||||
+ lib.optionalString enableDFHack ''
|
||||
expect ${dfHackExpectScript}
|
||||
expect ${dfHackExpectScript} | tr -d '\r'
|
||||
df_home="$(find ~ -name "df_*" | head -n1)"
|
||||
test -f "$df_home/dfhack"
|
||||
''
|
||||
+ lib.optionalString isAtLeast50 ''
|
||||
expect ${vanillaExpectScript true}
|
||||
expect ${vanillaExpectScript true} | tr -d '\r'
|
||||
df_home="$(find ~ -name "df_*" | head -n1)"
|
||||
test ! -f "$df_home/dfhack"
|
||||
test -f "$df_home/libfmod_plugin.so"
|
||||
''
|
||||
+ ''
|
||||
expect ${vanillaExpectScript false}
|
||||
expect ${vanillaExpectScript false} | tr -d '\r'
|
||||
df_home="$(find ~ -name "df_*" | head -n1)"
|
||||
test ! -f "$df_home/dfhack"
|
||||
test ! -f "$df_home/libfmod_plugin.so"
|
||||
|
|
|
|||
|
|
@ -37,11 +37,19 @@ dfhack_files=(
|
|||
libdfhooks.so
|
||||
dfhack-config/default
|
||||
dfhack-config/init
|
||||
dfhooks_*.ini
|
||||
hack/*
|
||||
stonesense/*
|
||||
*.init *.init-example
|
||||
)
|
||||
|
||||
# May be stale top-level libdfhooks_*.so symlinks in $NIXPKGS_DF_HOME, fix them
|
||||
shopt -s nullglob
|
||||
for stale in "$NIXPKGS_DF_HOME"/libdfhooks_*.so; do
|
||||
dfhack_files+=( "${stale##*/}" )
|
||||
done
|
||||
shopt -u nullglob
|
||||
|
||||
if [ "${NIXPKGS_DF_EXE##*/}" == dfhack ]; then
|
||||
for i in "${dfhack_files[@]}"; do
|
||||
if [ -e "$i" ]; then
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
dtc,
|
||||
gcc,
|
||||
openssl,
|
||||
pkgsCross,
|
||||
buildPackages,
|
||||
|
|
@ -61,6 +63,10 @@ let
|
|||
nativeBuildInputs = [
|
||||
pkgsCross.arm-embedded.stdenv.cc # For Cortex-M0 firmware in RK3399
|
||||
openssl # For fiptool
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
dtc
|
||||
gcc
|
||||
];
|
||||
|
||||
# Make the new toolchain guessing (from 2.14+) happy
|
||||
|
|
|
|||
|
|
@ -770,6 +770,42 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
search-panes = mkTmuxPlugin {
|
||||
pluginName = "search-panes";
|
||||
version = "0-unstable-2025-07-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "multi-io";
|
||||
repo = "tmux-search-panes";
|
||||
rev = "3996b5c56c6be69d3a85ef26065b1877d9ac71c6";
|
||||
hash = "sha256-Z9Gu4v2LAyG6UxXVLTvQUz1wU4PaJlBQXjLiSzfSP7s=";
|
||||
};
|
||||
rtpFilePath = "tmux-search-panes.tmux";
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
postInstall = ''
|
||||
for f in search-panes.sh _fzf-and-switch.sh _render-preview.sh; do
|
||||
chmod +x $target/bin/$f
|
||||
wrapProgram $target/bin/$f \
|
||||
--prefix PATH : ${
|
||||
with pkgs;
|
||||
lib.makeBinPath [
|
||||
coreutils
|
||||
fzf
|
||||
gnugrep
|
||||
gnused
|
||||
tmux
|
||||
]
|
||||
}
|
||||
done
|
||||
'';
|
||||
meta = {
|
||||
homepage = "https://github.com/multi-io/tmux-search-panes";
|
||||
description = "Tmux plugin that allows you to perform a fulltext search";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.DieracDelta ];
|
||||
};
|
||||
};
|
||||
|
||||
sensible = mkTmuxPlugin {
|
||||
pluginName = "sensible";
|
||||
version = "unstable-2022-08-14";
|
||||
|
|
|
|||
|
|
@ -584,6 +584,9 @@ mapAliases {
|
|||
cudaPackages_12_4 = throw "CUDA 12.4 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
|
||||
cudaPackages_12_5 = throw "CUDA 12.5 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
|
||||
cups-kyodialog3 = throw "'cups-kyodialog3' has been renamed to/replaced by 'cups-kyodialog'"; # Converted to throw 2025-10-27
|
||||
cura = throw "'cura' has been removed, as it was unmaintained in nixpkgs"; # Added 2026-05-22
|
||||
curaengine = throw "'curaengine' has been removed, as it was unmaintained in nixpkgs"; # Added 2026-05-22
|
||||
curaPlugins = throw "'curaPlugins' has been removed, as it was unmaintained in nixpkgs"; # Added 2026-05-22
|
||||
curl-impersonate-chrome = warnAlias "curl-impersonate-chrome has been renamed to curl-impersonate" curl-impersonate; # Added 2025-11-02
|
||||
curl-impersonate-ff = throw "curl-impersonate-ff has been removed because it is unmaintained upstream and has vulnerable dependencies. Use curl-impersonate instead."; # Added 2025-11-02
|
||||
curlHTTP3 = warnAlias "'curlHTTP3' has been removed, as 'curl' now has HTTP/3 support enabled by default" curl; # Added 2025-08-22
|
||||
|
|
|
|||
|
|
@ -10000,13 +10000,6 @@ with pkgs;
|
|||
|
||||
curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { };
|
||||
|
||||
curaengine = callPackage ../applications/misc/curaengine {
|
||||
inherit (python3.pkgs) libarcus;
|
||||
protobuf = protobuf_21;
|
||||
};
|
||||
|
||||
curaPlugins = recurseIntoAttrs (callPackage ../applications/misc/cura/plugins.nix { });
|
||||
|
||||
super-slicer-beta = super-slicer.beta;
|
||||
|
||||
super-slicer-latest = super-slicer.latest;
|
||||
|
|
|
|||
|
|
@ -30635,6 +30635,13 @@ with self;
|
|||
url = "https://github.com/hoytech/Session-Token/commit/cd64e7b69986054bb715755290811308159b7959.patch";
|
||||
hash = "sha256-nMQmdvVQW8cQYO0+bLJcdVfSOLVIsongk+71fQ7fQdU=";
|
||||
})
|
||||
(fetchDebianPatch {
|
||||
version = "1.503";
|
||||
pname = "libsession-token-perl";
|
||||
debianRevision = "3";
|
||||
patch = "fix-gcc15-build.patch";
|
||||
hash = "sha256-b6Yr5w++3lQcaI8JilthLykq4D4nEczz0h+r6LJ8hGI=";
|
||||
})
|
||||
];
|
||||
meta = {
|
||||
description = "Secure, efficient, simple random session token generation";
|
||||
|
|
|
|||
|
|
@ -304,6 +304,7 @@ mapAliases {
|
|||
lcov_cobertura = throw "'lcov_cobertura' has been renamed to/replaced by 'lcov-cobertura'"; # Converted to throw 2025-10-29
|
||||
ldap = throw "'ldap' has been renamed to/replaced by 'python-ldap'"; # Converted to throw 2025-10-29
|
||||
ledger_agent = throw "'ledger_agent' has been renamed to/replaced by 'ledger-agent'"; # Converted to throw 2025-10-29
|
||||
libarcus = throw "'libarcus' has been removed, as it was unmaintained in nixpkgs"; # Added 2026-05-22
|
||||
libgpiod = gpiod; # added 2026-03-30
|
||||
libpyfoscam = throw "libpyfoscam was removed because Home Assistant switched to libpyfoscamcgi"; # added 2025-07-03
|
||||
line_profiler = throw "'line_profiler' has been renamed to/replaced by 'line-profiler'"; # Converted to throw 2025-10-29
|
||||
|
|
@ -619,6 +620,7 @@ mapAliases {
|
|||
unifi = throw "'unifi' has been removed as upstream was archived in 2017"; # Added 2025-08-25
|
||||
unittest-data-provider = throw "'unittest-data-provider' has been removed as it was unused, unmaintained, and upstream suggests 'pytest parameterize' instead."; # Added 2026-05-22
|
||||
update_checker = throw "'update_checker' has been renamed to/replaced by 'update-checker'"; # Converted to throw 2025-10-29
|
||||
uranium = throw "'uranium' has been removed, as it was unmaintained in nixpkgs"; # Added 2026-05-22
|
||||
vcver = throw "vcver has been removed, since it was an unused leaf package"; # added 2025-08-25
|
||||
vega_datasets = throw "'vega_datasets' has been renamed to/replaced by 'vega-datasets'"; # Converted to throw 2025-10-29
|
||||
ViennaRNA = throw "'ViennaRNA' has been renamed to/replaced by 'viennarna'"; # Converted to throw 2025-10-29
|
||||
|
|
|
|||
|
|
@ -8785,8 +8785,6 @@ self: super: with self; {
|
|||
inherit (pkgs) libarchive;
|
||||
};
|
||||
|
||||
libarcus = callPackage ../development/python-modules/libarcus { protobuf = pkgs.protobuf_21; };
|
||||
|
||||
libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns; };
|
||||
|
||||
libbs = callPackage ../development/python-modules/libbs { };
|
||||
|
|
@ -20912,8 +20910,6 @@ self: super: with self; {
|
|||
|
||||
uqbar = callPackage ../development/python-modules/uqbar { };
|
||||
|
||||
uranium = callPackage ../development/python-modules/uranium { };
|
||||
|
||||
uri-template = callPackage ../development/python-modules/uri-template { };
|
||||
|
||||
uritemplate = callPackage ../development/python-modules/uritemplate { };
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue