Merge master into staging-nixos

This commit is contained in:
nixpkgs-ci[bot]
2026-02-15 18:08:58 +00:00
committed by GitHub
430 changed files with 789 additions and 3225 deletions
+5 -6
View File
@@ -50,7 +50,6 @@ sets are
* `pkgs.python27Packages`
* `pkgs.python3Packages`
* `pkgs.python310Packages`
* `pkgs.python311Packages`
* `pkgs.python312Packages`
* `pkgs.python313Packages`
@@ -897,7 +896,7 @@ on NixOS.
# ...
environment.systemPackages = with pkgs; [
(python310.withPackages (
(python314.withPackages (
ps: with ps; [
numpy
toolz
@@ -1683,7 +1682,7 @@ with import <nixpkgs> { };
});
};
in
pkgs.python310.override { inherit packageOverrides; };
pkgs.python313.override { inherit packageOverrides; };
in
python.withPackages (ps: [ ps.pandas ])
@@ -1707,7 +1706,7 @@ with import <nixpkgs> { };
let
packageOverrides = self: super: { scipy = super.scipy_0_17; };
in
(pkgs.python310.override { inherit packageOverrides; }).withPackages (ps: [ ps.blaze ])
(pkgs.python313.override { inherit packageOverrides; }).withPackages (ps: [ ps.blaze ])
).env
```
@@ -1723,13 +1722,13 @@ let
newpkgs = import pkgs.path {
overlays = [
(self: super: {
python310 =
python313 =
let
packageOverrides = python-self: python-super: {
numpy = python-super.numpy_1_18;
};
in
super.python310.override { inherit packageOverrides; };
super.python313.override { inherit packageOverrides; };
})
];
};
+14
View File
@@ -0,0 +1,14 @@
# Friction {#friction-graphics}
[Friction](https://friction.graphics/) is an open-source vector motion graphics application for creating animations for web and video platforms.
## Wayland support {#friction-graphics-wayland}
Upstream explicitly forces X11 (XCB) on Linux due to incomplete Wayland support (fullscreen does not work, some mouse interactions are broken).
This means the application runs under XWayland by default and does not respect compositor-level HiDPI scaling.
To enable native Wayland support, removing the forced X11 override:
```nix
friction-graphics.override { enableWayland = true; }
```
+1
View File
@@ -10,6 +10,7 @@ eclipse.section.md
elm.section.md
emacs.section.md
firefox.section.md
friction-graphics.section.md
fish.section.md
fuse.section.md
geant4.section.md
+6
View File
@@ -119,6 +119,12 @@
"ex-testEqualArrayOrMap-test-function-add-cowbell": [
"index.html#ex-testEqualArrayOrMap-test-function-add-cowbell"
],
"friction-graphics": [
"index.html#friction-graphics"
],
"friction-graphics-wayland": [
"index.html#friction-graphics-wayland"
],
"ghc-deprecation-policy": [
"index.html#ghc-deprecation-policy"
],
+2
View File
@@ -183,6 +183,8 @@
- `openrgb` was updated to 1.0rc2, which now uses Plugin API version 4.
Some existing OpenRGB plugins may be incompatible or require updates.
- the `neovim` wrapper sets provider-related configuration in its generated config rather than as wrapper arguments. It should not affect configuration unless you set `wrapRc` to false.
- We now use the upstream wrapper script for Gradle, supporting both the `JAVA_HOME` and `GRADLE_OPTS` environment variables.
## Nixpkgs Library {#sec-nixpkgs-release-26.05-lib}
+13 -6
View File
@@ -13986,6 +13986,13 @@
github = "kkoniuszy";
githubId = 120419423;
};
Kladki = {
name = "Matthias Ahouansou";
email = "matthias@ahouansou.cz";
github = "Kladki";
githubId = 158313939;
matrix = "@matthias:ahouansou.cz";
};
klchen0112 = {
name = "klchen0112";
email = "klchen0112@gmail.com";
@@ -17273,12 +17280,6 @@
githubId = 4366292;
name = "Michal Rus";
};
michelk = {
email = "michel@kuhlmanns.info";
github = "michelk";
githubId = 1404919;
name = "Michel Kuhlmann";
};
michojel = {
email = "mic.liamg@gmail.com";
github = "michojel";
@@ -25009,6 +25010,12 @@
githubId = 55726;
name = "Stanislav Ochotnický";
};
socksy = {
email = "ben.j.lovell@gmail.com";
github = "socksy";
githubId = 511549;
name = "Ben Lovell";
};
sodagunz = {
name = "sodagunz";
github = "sodagunz";
@@ -876,13 +876,19 @@ in
secret_key = mkOption {
description = ''
Secret key used for signing. Please note that the contents of this option
Secret key used for signing data source settings like secrets and passwords.
Set this to a unique, random string in production, generated for example by running `openssl rand -hex 32`.
If you change this later you will need to update data source settings to re-encode them.
<https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#secret_key>
Please note that the contents of this option
will end up in a world-readable Nix store. Use the file provider
pointing at a reasonably secured file in the local filesystem
to work around that. Look at the documentation for details:
<https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#file-provider>
'';
default = "SW2YcwTIb9zpOOhoPsMm";
type = types.str;
};
@@ -12,7 +12,7 @@ in
enable = lib.mkEnableOption "pass secret service";
package = lib.mkPackageOption pkgs "pass-secret-service" {
example = "pass-secret-service.override { python3 = pkgs.python310 }";
example = "pass-secret-service.override { python3 = pkgs.python315 }";
};
};
+1
View File
@@ -18,6 +18,7 @@ import ../make-test-python.nix (
security = {
admin_user = "testadmin";
admin_password = "snakeoilpwd";
secret_key = "11111111111111111111";
};
};
};
@@ -19,6 +19,7 @@ import ../../make-test-python.nix (
security = {
admin_user = "testadmin";
admin_password = "$__file{${pkgs.writeText "pwd" "snakeoilpwd"}}";
secret_key = "11111111111111111111";
};
};
};
+23 -25
View File
@@ -104,13 +104,16 @@ let
packpathDirs.myNeovimPackages = vimPackageInfo.vimPackage;
finalPackdir = neovimUtils.packDir packpathDirs;
rcContent = ''
${luaRcContent}
''
+ lib.optionalString (neovimRcContent' != "") ''
vim.cmd.source "${writeText "init.vim" neovimRcContent'}"
''
+ lib.optionalString autoconfigure (lib.concatStringsSep "\n" vimPackageInfo.pluginAdvisedLua);
rcContent = lib.concatStringsSep "\n" (
[
providerLuaRc
]
++ lib.optional (luaRcContent != "") luaRcContent
++ lib.optional (neovimRcContent' != "") ''
vim.cmd.source "${writeText "init.vim" neovimRcContent'}"
''
++ lib.optionals autoconfigure vimPackageInfo.pluginAdvisedLua
);
python3Env =
lib.warnIf (attrs ? python3Env)
@@ -125,12 +128,7 @@ let
wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs;
generatedWrapperArgs = [
# vim accepts a limited number of commands so we join all the provider ones
"--add-flags"
''--cmd "lua ${providerLuaRc}"''
]
++
generatedWrapperArgs =
lib.optionals
(
finalAttrs.packpathDirs.myNeovimPackages.start != [ ]
@@ -142,17 +140,17 @@ let
"--add-flags"
''--cmd "set rtp^=${finalPackdir}"''
]
++ lib.optionals finalAttrs.withRuby [
"--set"
"GEM_HOME"
"${rubyEnv}/${rubyEnv.ruby.gemPath}"
]
++ lib.optionals (finalAttrs.runtimeDeps != [ ]) [
"--suffix"
"PATH"
":"
(lib.makeBinPath finalAttrs.runtimeDeps)
];
++ lib.optionals finalAttrs.withRuby [
"--set"
"GEM_HOME"
"${rubyEnv}/${rubyEnv.ruby.gemPath}"
]
++ lib.optionals (finalAttrs.runtimeDeps != [ ]) [
"--suffix"
"PATH"
":"
(lib.makeBinPath finalAttrs.runtimeDeps)
];
providerLuaRc = neovimUtils.generateProviderRc {
inherit (finalAttrs)
@@ -181,7 +179,7 @@ let
++ lib.optionals finalAttrs.wrapRc [
"--set-default"
"VIMINIT"
"lua dofile('${writeText "init.lua" rcContent}')"
"lua dofile('${writeText "init.lua" finalAttrs.luaRcContent}')"
]
++ finalAttrs.generatedWrapperArgs;
@@ -27,12 +27,12 @@ let
hash =
{
x86_64-linux = "sha256-lBCwKNJv9iNQyuEvg+Ht4haFZG/lozm2KgCguKYIwYI=";
x86_64-darwin = "sha256-29oFrRfdxcMkzppYkQDkKP0DmnzjwbSciKvGwDhf8q0=";
aarch64-linux = "sha256-53t+UvvECTANRzHnyMbmff7aS5cocpRC8QaSkLRQcLw=";
aarch64-darwin = "sha256-fIp2NH2AtpQ3KXFXvDFIw4Jx2QlXnwHE4WskJ0bLwNE=";
armv7l-linux = "sha256-+y4b1/2C2YTmF2kc16xvzM8MzU64OxMK9xEORwkfBWw=";
loongarch64-linux = "sha256-VKzGJytrcMjXihWIM/qjLeZzXHb/xxHnftnXQn8erfA=";
x86_64-linux = "sha256-vijpAKlBP0dS40YlKMRCPZsgu7T+FiPgLJAgpE39BHA=";
x86_64-darwin = "sha256-EQDLzLJwVQFWe+aez3PLS2uJXgYyocjH28R7v/n86sY=";
aarch64-linux = "sha256-Or1SLzmaqCwde71e9AfQkQDUV4tAA8cYFBk5iqi562M=";
aarch64-darwin = "sha256-j8gbLW+czhFkaPOmcJBTaeWm7cxAYtvebGihQ9tWVC8=";
armv7l-linux = "sha256-7L9Pu+roEietJlwNoh7uEIkr2q5Mi8Y1uorv3TkvE3M=";
loongarch64-linux = "sha256-/KEKLDaRPX2ZM3qn3T2nqV16aG5wtuzpDWs2EdLtzZU=";
}
.${system} or throwSystem;
@@ -43,7 +43,7 @@ buildVscode rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.108.20787";
version = "1.109.31074";
pname = "vscodium";
executableName = "codium";
@@ -8,30 +8,26 @@
let
version = "3.2.2";
dependencies =
with python3.pkgs;
[
pyembroidery
inkex
wxpython
networkx
platformdirs
shapely
lxml
appdirs
numpy
jinja2
requests
colormath2
flask
fonttools
trimesh
scipy
diskcache
flask-cors
]
# Inkstitch uses the builtin tomllib instead when Python >=3.11
++ lib.optional (pythonOlder "3.11") tomli;
dependencies = with python3.pkgs; [
pyembroidery
inkex
wxpython
networkx
platformdirs
shapely
lxml
appdirs
numpy
jinja2
requests
colormath2
flask
fonttools
trimesh
scipy
diskcache
flask-cors
];
pyEnv = python3.withPackages (_: dependencies);
in
python3.pkgs.buildPythonApplication {
@@ -175,8 +175,7 @@ stdenv.mkDerivation rec {
homepage = "http://caffe.berkeleyvision.org/";
maintainers = [ ];
broken =
(pythonSupport && (python.isPy310))
|| !(leveldbSupport -> (leveldb != null && snappy != null))
!(leveldbSupport -> (leveldb != null && snappy != null))
|| !(pythonSupport -> (python != null && numpy != null));
license = lib.licenses.bsd2;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
@@ -52,7 +52,7 @@
obs-markdown = callPackage ./obs-markdown.nix { };
obs-media-controls = qt6Packages.callPackage ./obs-media-controls.nix { };
obs-media-controls = qt6Packages.callPackage ./obs-media-controls { };
obs-move-transition = callPackage ./obs-move-transition.nix { };
@@ -18,6 +18,12 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-CElK9e+wpnMiup6DwdQpQfVMm6atXvz+JYHsGnv3lFo=";
};
patches = [
# Fix cmake build with qt 6.10
# Submitted upstream: https://github.com/exeldro/obs-media-controls/pull/28
./fix-cmake.patch
];
nativeBuildInputs = [ cmake ];
buildInputs = [
obs-studio
@@ -0,0 +1,25 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95172a0..3be0ec3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ else()
target_link_libraries(${PROJECT_NAME} PRIVATE OBS::frontend-api)
endif()
-find_package(Qt6 COMPONENTS Widgets Core)
+find_package(Qt6 REQUIRED COMPONENTS Widgets Core)
if(BUILD_OUT_OF_TREE)
if(OS_LINUX OR OS_FREEBSD OR OS_OPENBSD)
find_package(Qt6 REQUIRED Gui)
@@ -33,8 +33,9 @@ if(BUILD_OUT_OF_TREE)
endif()
target_link_libraries(${PROJECT_NAME} PRIVATE Qt::Core Qt::Widgets)
-if((OS_LINUX OR OS_FREEBSD OR OS_OPENBSD) AND Qt_VERSION VERSION_LESS "6.9.0")
- target_link_libraries(${PROJECT_NAME} PRIVATE Qt::GuiPrivate)
+if((OS_LINUX OR OS_FREEBSD OR OS_OPENBSD) AND Qt6_VERSION VERSION_LESS "6.9.0")
+ find_package(Qt6 REQUIRED COMPONENTS GuiPrivate)
+ target_link_libraries(${PROJECT_NAME} PRIVATE Qt::GuiPrivate)
endif()
target_compile_options(
+10 -10
View File
@@ -1,28 +1,28 @@
{
"stable": {
"linux": {
"version": "8.12.0",
"version": "8.12.2",
"sources": {
"x86_64": {
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.12.0.x64.tar.gz",
"hash": "sha256-EiSrZHWXvBLhS+Gx519AvUmRH582P4/cF0huj+RHcMI="
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.12.2.x64.tar.gz",
"hash": "sha256-vJ+GwQjlDCn6723q1+/xFUFkN9XjI9/0eCftmYQgS1s="
},
"aarch64": {
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.12.0.arm64.tar.gz",
"hash": "sha256-/ykSp+//5SvLFH0BsjPNwAEapoBUTqxfaRKJw4R7eis="
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.12.2.arm64.tar.gz",
"hash": "sha256-V639cHbGZD/Fvaqa4c5jpei3jF9kNPST8LeYogS4fr8="
}
}
},
"darwin": {
"version": "8.12.0",
"version": "8.12.2",
"sources": {
"x86_64": {
"url": "https://downloads.1password.com/mac/1Password-8.12.0-x86_64.zip",
"hash": "sha256-JcSNA9oEeEJk9bHxTwF08/KrJNu+UOSC5r0VJGmds+Y="
"url": "https://downloads.1password.com/mac/1Password-8.12.2-x86_64.zip",
"hash": "sha256-IYxOVYoeKBsuDo5pS/LcjFNZsdyUL7Jb1QORj2BEB3Y="
},
"aarch64": {
"url": "https://downloads.1password.com/mac/1Password-8.12.0-aarch64.zip",
"hash": "sha256-fpu+CZ3iLXcGevWHLh/HVa2uoS/a1w/m0s4+awBzNI0="
"url": "https://downloads.1password.com/mac/1Password-8.12.2-aarch64.zip",
"hash": "sha256-Z4h2E8dCNA1O+SZGtguueZ36mHbJ11yxMSYiNTpM25U="
}
}
}
-2
View File
@@ -10,8 +10,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
version = "9.0.1";
pyproject = true;
disabled = python3.pythonOlder "3.11";
src = fetchFromGitHub {
owner = "languitar";
repo = "autosuspend";
+18
View File
@@ -61,6 +61,15 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://github.com/debian-calibre/calibre/raw/refs/tags/debian/${finalAttrs.version}+${debian-source}/debian/patches/hardening/0007-Hardening-Qt-code.patch";
hash = "sha256-lKp/omNicSBiQUIK+6OOc8ysM6LImn5GxWhpXr4iX+U=";
})
# Fix CVE-2026-25635
# http://tracker.security.nixos.org/issues/NIXPKGS-2026-0156
# https://github.com/NixOS/nixpkgs/issues/488046
# Fixed upstream in 9.2.0.
(fetchpatch {
name = "CVE-2026-25635.patch";
url = "https://github.com/kovidgoyal/calibre/commit/9739232fcb029ac15dfe52ccd4fdb4a07ebb6ce9.patch";
hash = "sha256-fzotxhfMF/DCMvpIfMSOGY8iVOybsYymRQvhXf7jQyc=";
})
# Fix CVE-2026-25636
# http://tracker.security.nixos.org/issues/NIXPKGS-2026-0160
# https://github.com/NixOS/nixpkgs/issues/488052
@@ -77,6 +86,15 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://github.com/kovidgoyal/calibre/commit/9484ea82c6ab226c18e6ca5aa000fa16de598726.patch";
hash = "sha256-hpWFSQXyOAVRqou0v+5oT5zIrBbyP2Uv2z1Vg811ZG0=";
})
# Fix CVE-2026-25731
# http://tracker.security.nixos.org/issues/NIXPKGS-2026-0155
# https://github.com/NixOS/nixpkgs/issues/488045
# Fixed upstream in 9.2.0.
(fetchpatch {
name = "CVE-2026-25731.patch";
url = "https://github.com/kovidgoyal/calibre/commit/f0649b27512e987b95fcab2e1e0a3bcdafc23379.patch";
hash = "sha256-G9H6hEN5cyFIqDmJZv+bgt+6ZF6/K2t9npYjksjcxTo=";
})
]
++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
+37 -7
View File
@@ -3,21 +3,41 @@
buildGoModule,
fetchFromGitHub,
}:
let
cel-spec = buildGoModule (finalAttrs: {
pname = "cel-spec";
version = "0.25.1";
src = fetchFromGitHub {
owner = "google";
repo = "cel-spec";
tag = "v${finalAttrs.version}";
hash = "sha256-D9NHnQerquU2nDhDIheHmzV2FUwKi+MfTO+sehMXudg=";
};
vendorHash = "sha256-7Ngemih4jRO6VHSH2QxU/p1Q/E/ukUZ5wuUbZzRj6kA=";
installPhase = ''
runHook preInstall
cp -r . $out
runHook postInstall
'';
});
in
buildGoModule (finalAttrs: {
pname = "cel-go";
version = "0.21.0";
version = "0.27.0";
src = fetchFromGitHub {
owner = "google";
repo = "cel-go";
rev = "v${finalAttrs.version}";
hash = "sha256-t451e3Pkkt4pmBvS0DBSHOVg7P8ipJd28XyiQ6P/QIQ=";
tag = "v${finalAttrs.version}";
hash = "sha256-gry3Kwx9SKFxLrUCVpg4hxv5J1R6HzHWW9W0OG7dpKA=";
};
modRoot = "repl";
vendorHash = "sha256-t/GEbpnqpLQ79ETqS9TAgy+2z9FoifAmkHbfKUxDBZA=";
vendorHash = "sha256-J0O3yGBYsX+9Eel0O5crUJxk0DNLxob/Tsue57O9Toc=";
subPackages = [
"main"
@@ -28,16 +48,26 @@ buildGoModule (finalAttrs: {
"-w"
];
postPatch = ''
substituteInPlace repl/go.mod \
--replace-fail "../../cel-spec" "./cel-spec"
'';
preBuild = ''
mkdir cel-spec
cp -r ${cel-spec}/* cel-spec
'';
postInstall = ''
mv $out/bin/{main,cel-go}
'';
meta = {
changelog = "https://github.com/google/cel-go/releases/tag/${finalAttrs.src.tag}";
description = "Fast, portable, non-Turing complete expression evaluation with gradual typing";
mainProgram = "cel-go";
homepage = "https://github.com/google/cel-go";
changelog = "https://github.com/google/cel-go/releases/tag/${finalAttrs.src.rev}";
license = lib.licenses.asl20;
maintainers = [ ];
mainProgram = "cel-go";
maintainers = with lib.maintainers; [ hythera ];
};
})
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule (finalAttrs: {
pname = "cheat";
version = "4.4.2";
version = "4.5.0";
src = fetchFromGitHub {
owner = "cheat";
repo = "cheat";
tag = finalAttrs.version;
sha256 = "sha256-GUU6VWfTmNS6ny12HnMr3uQmS7HI86Oupcmqx0MVAvE=";
sha256 = "sha256-RDfOdyQL9QICXZmgYCmz532iTuPdCW8GixajvEXmaUQ=";
};
subPackages = [ "cmd/cheat" ];
+1 -1
View File
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
mainProgram = "cmark";
homepage = "https://github.com/commonmark/cmark";
changelog = "https://github.com/commonmark/cmark/raw/${finalAttrs.version}/changelog.txt";
maintainers = [ lib.maintainers.michelk ];
maintainers = [ ];
platforms = lib.platforms.all;
license = lib.licenses.bsd2;
};
+11 -24
View File
@@ -6,45 +6,32 @@
python3Packages.buildPythonApplication rec {
pname = "codecov-cli";
version = "10.4.0";
version = "11.2.6";
pyproject = true;
src =
(fetchFromGitHub {
owner = "codecov";
repo = "codecov-cli";
tag = "v${version}";
hash = "sha256-R1GFQ81N/e2OX01oSs8Xs+PM0JKVZofiUPADVdxCzWk=";
fetchSubmodules = true;
}).overrideAttrs
(_: {
env = {
GIT_CONFIG_COUNT = 1;
GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf";
GIT_CONFIG_VALUE_0 = "git@github.com:";
};
});
src = fetchFromGitHub {
owner = "getsentry";
repo = "prevent-cli";
tag = "v${version}";
hash = "sha256-8KBemqwMqiio4pnftsBgnFj69Bgb5jQr5YlMegujPZY=";
};
sourceRoot = "${src.name}/${pname}";
build-system = with python3Packages; [ setuptools ];
pythonRelaxDeps = [
"httpx"
"click"
"responses"
"test-results-parser"
"tree-sitter"
];
dependencies = with python3Packages; [
click
httpx
ijson
pyyaml
regex
responses
test-results-parser
tree-sitter
sentry-sdk
wrapt
test-results-parser
];
meta = {
+6 -9
View File
@@ -28,15 +28,12 @@ python3Packages.buildPythonApplication (finalAttrs: {
pytest7CheckHook
];
dependencies =
with python3Packages;
[
click
cookiecutter
gitpython
typer
]
++ lib.optional (pythonOlder "3.11") python3Packages.toml;
dependencies = with python3Packages; [
click
cookiecutter
gitpython
typer
];
pythonImportsCheck = "cruft";
+9 -9
View File
@@ -9,26 +9,26 @@ let
inherit (stdenv) hostPlatform;
sources = {
x86_64-linux = fetchurl {
url = "https://downloads.cursor.com/lab/2026.01.28-fd13201/linux/x64/agent-cli-package.tar.gz";
hash = "sha256-Nj6q11iaa++b5stsEu1eBRAYUFRPft84XcHuTCZL5D0=";
url = "https://downloads.cursor.com/lab/2026.02.13-41ac335/linux/x64/agent-cli-package.tar.gz";
hash = "sha256-mJPEmBNbmsTfgt0b7abrSHJLI52WfLny5Es4uGyDwew=";
};
aarch64-linux = fetchurl {
url = "https://downloads.cursor.com/lab/2026.01.28-fd13201/linux/arm64/agent-cli-package.tar.gz";
hash = "sha256-6oajVZw599vzy2c1olEzoIlqbmfZRK1atb85fiR72y0=";
url = "https://downloads.cursor.com/lab/2026.02.13-41ac335/linux/arm64/agent-cli-package.tar.gz";
hash = "sha256-ncXdGxOYlwud4Z3w5DMOmXUZ2hEcI/q4stm0yACuvy4=";
};
x86_64-darwin = fetchurl {
url = "https://downloads.cursor.com/lab/2026.01.28-fd13201/darwin/x64/agent-cli-package.tar.gz";
hash = "sha256-G23LC7Sl1GjfaECndSuyCxHK4drkJKG3B1U2k5SAHJA=";
url = "https://downloads.cursor.com/lab/2026.02.13-41ac335/darwin/x64/agent-cli-package.tar.gz";
hash = "sha256-KcmGT6WCEc97qKqtZknFsUo9RX2SOuyjv6Jyfnrv3Os=";
};
aarch64-darwin = fetchurl {
url = "https://downloads.cursor.com/lab/2026.01.28-fd13201/darwin/arm64/agent-cli-package.tar.gz";
hash = "sha256-R5kEfd84IaUXuN+PIzpGD1NGPzD6xxM9NAXAAt6d0N8=";
url = "https://downloads.cursor.com/lab/2026.02.13-41ac335/darwin/arm64/agent-cli-package.tar.gz";
hash = "sha256-ib0ZsXVc2YqAkPuMie4kwWIFrmNcD+1vX3tcvyA/PJw=";
};
};
in
stdenv.mkDerivation {
pname = "cursor-cli";
version = "0-unstable-2026-01-28";
version = "0-unstable-2026-02-13";
src = sources.${hostPlatform.system};
-28
View File
@@ -1,28 +0,0 @@
{
lib,
rustPlatform,
fetchFromGitHub,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "doctave";
version = "0.4.2";
src = fetchFromGitHub {
owner = "doctave";
repo = "doctave";
rev = finalAttrs.version;
hash = "sha256-8mGSFQozyLoGua9mwyqfDcYNMtbeWp9Phb0vaje+AJ0=";
};
cargoHash = "sha256-3gyYls1+5eVM3eLlFNmULvIbc5VgoWpfnpO4nmoDMAI=";
meta = {
description = "Batteries-included developer documentation site generator";
homepage = "https://github.com/doctave/doctave";
changelog = "https://github.com/doctave/doctave/blob/${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = [ ];
mainProgram = "doctave";
};
})
-70
View File
@@ -1,70 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
cargo,
glib,
meson,
ninja,
pkg-config,
rustPlatform,
rustc,
wrapGAppsHook4,
gdk-pixbuf,
gtk4,
libadwaita,
libsecret,
openssl,
sqlite,
gettext,
}:
stdenv.mkDerivation rec {
pname = "done";
version = "0.2.2";
src = fetchFromGitHub {
owner = "done-devs";
repo = "done";
rev = "v${version}";
hash = "sha256-SbeP7PnJd7jjdXa9uDIAlMAJLOrYHqNP5p9gQclb6RU=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-yEpaQa9hKOq0k9MurihbFM4tDB//TPCJdOgKA9tyqVc=";
};
nativeBuildInputs = [
cargo
glib
meson
ninja
pkg-config
rustPlatform.cargoSetupHook
rustc
wrapGAppsHook4
];
buildInputs = [
gdk-pixbuf
gtk4
libadwaita
libsecret
openssl
sqlite
];
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
GETTEXT_DIR = gettext;
};
meta = {
description = "Ultimate task management solution for seamless organization and efficiency";
homepage = "https://done.edfloreshz.dev/";
changelog = "https://github.com/done-devs/done/blob/${src.rev}/CHANGES.md";
license = lib.licenses.mpl20;
mainProgram = "done";
maintainers = [ ];
};
}
+56
View File
@@ -0,0 +1,56 @@
{
stdenv,
lib,
fetchFromGitHub,
cmake,
kdePackages,
nix-update-script,
gettext,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "emoji-runner";
version = "3.0.5";
src = fetchFromGitHub {
owner = "alex1701c";
repo = "EmojiRunner";
tag = finalAttrs.version;
hash = "sha256-Rt7Z0uEbzqRKxV1EpDr//RYaVr3D+Nj+7JS3EAO+hsM=";
};
dontWrapQtApps = true;
buildInputs = with kdePackages; [
ki18n
kservice
krunner
ktextwidgets
kcmutils
kconfigwidgets
];
nativeBuildInputs = [
cmake
gettext
kdePackages.extra-cmake-modules
];
strictDeps = true;
cmakeFlags = [
"-DBUILD_TESTING=OFF"
"-DBUILD_WITH_QT6=ON"
"-DQT_MAJOR_VERSION=6"
];
passthru.updateScript = nix-update-script { };
meta = {
changelog = "https://github.com/alex1701c/EmojiRunner/releases/tag/${finalAttrs.version}";
description = "Search for emojis in Krunner and copy/paste them";
homepage = "https://github.com/alex1701c/EmojiRunner";
license = lib.licenses.lgpl3Only;
maintainers = with lib.maintainers; [ Kladki ];
inherit (kdePackages.krunner.meta) platforms;
};
})
-63
View File
@@ -1,63 +0,0 @@
{
lib,
rustPlatform,
fetchFromGitHub,
stdenv,
pkg-config,
expat,
fontconfig,
freetype,
libGL,
libxrandr,
libxi,
libxcursor,
libx11,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "epick";
version = "0.9.0";
src = fetchFromGitHub {
owner = "vv9k";
repo = "epick";
# Upstream has rewritten tags on multiple occasions.
rev = "14ee92e049780406fffdc1e4a83bf1433775663f";
sha256 = "sha256-gjqAQrGJ9KFdzn2a3fOgu0VJ9zrX5stsbzriOGJaD/4=";
};
cargoHash = "sha256-r/0aNzU8jm2AqiZWq4plxXY/H7qKVC8nEI9BwOUKCdA=";
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
pkg-config
];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
expat
fontconfig
freetype
libx11
libxcursor
libxi
libxrandr
];
postInstall = ''
install -Dm444 assets/epick.desktop -t $out/share/applications
install -Dm444 assets/icon.svg $out/share/icons/hicolor/scalable/apps/epick.svg
install -Dm444 assets/icon.png $out/share/icons/hicolor/48x48/apps/epick.png
'';
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
patchelf $out/bin/epick --add-rpath ${lib.makeLibraryPath [ libGL ]}
'';
meta = {
description = "Simple color picker that lets the user create harmonic palettes with ease";
homepage = "https://github.com/vv9k/epick";
changelog = "https://github.com/vv9k/epick/blob/${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.gpl3Only;
maintainers = [ ];
mainProgram = "epick";
};
})
@@ -1,27 +0,0 @@
{
lib,
rustPlatform,
fetchFromGitHub,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "esbuild-config";
version = "1.0.1";
src = fetchFromGitHub {
owner = "bpierre";
repo = "esbuild-config";
rev = "v${finalAttrs.version}";
hash = "sha256-u3LgecKfgPSN5xMyqBjeAn4/XswM3iEGbZ+JGrVF1Co=";
};
cargoHash = "sha256-OQ7zlcWVu3sS/u0B+Ew6VUS4zxntKU2LF63ZcPRUKW0=";
meta = {
description = "Config files for esbuild";
homepage = "https://github.com/bpierre/esbuild-config";
license = lib.licenses.mit;
maintainers = [ ];
mainProgram = "esbuild-config";
};
})
+5 -5
View File
@@ -11,11 +11,11 @@
}:
let
version = "3.6.7";
etcdSrcHash = "sha256-i8VZlK76OQQeojKHo9sdkyNR0Hdiofx0TLUDWKiXOTU=";
etcdCtlVendorHash = "sha256-jN+oNoIxNYM2Wm3s+/zDyacyXxVWaHl9t7sot8PL9xk=";
etcdUtlVendorHash = "sha256-A2rYstzlBlS3ta5yJVP/RTjgBz+9Y0I79ITr77GrqOo=";
etcdServerVendorHash = "sha256-hUFUcoXaOKTkoJ7YUwljpg7EZRhXi5tXcE2bteVRBE0=";
version = "3.6.8";
etcdSrcHash = "sha256-dNoQ+KKHZoi9GAqjyKPOpEJUwN6FID1tKfMiMknG7Dc=";
etcdCtlVendorHash = "sha256-lxFvpEGsp/HS0p54JrjBps7C/c7QR2QFQXU81sO9cPU=";
etcdUtlVendorHash = "sha256-6vzClDji9O2SGnKL3lsv3AUbCt/BicsDy1sPeuPdGXk=";
etcdServerVendorHash = "sha256-4vz63r05uZOzFQYA9jz9HLsQEDFL30cOETmV/AZanmY=";
src = applyPatches {
src = fetchFromGitHub {
-43
View File
@@ -1,43 +0,0 @@
{
stdenv,
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
libgit2,
openssl,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "eureka-ideas";
version = "2.0.0";
src = fetchFromGitHub {
owner = "simeg";
repo = "eureka";
rev = "v${finalAttrs.version}";
sha256 = "sha256-NJ1O8+NBG0y39bMOZeah2jSZlvnPrtpCtXrgAYmVrAc=";
};
cargoHash = "sha256-nTYMKJ5OCApqooIF1dsDLriPfYjkZkTdtzpkJya/5ag=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libgit2
openssl
];
useNextest = true;
meta = {
description = "CLI tool to input and store your ideas without leaving the terminal";
homepage = "https://github.com/simeg/eureka";
changelog = "https://github.com/simeg/eureka/blob/v${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = [ ];
mainProgram = "eureka";
# The last successful Darwin Hydra build was in 2024
broken = stdenv.hostPlatform.isDarwin;
};
})
+6 -6
View File
@@ -6,18 +6,18 @@
buildGoModule (finalAttrs: {
pname = "expr";
version = "1.17.7";
version = "1.17.8";
src = fetchFromGitHub {
owner = "expr-lang";
repo = "expr";
rev = "v${finalAttrs.version}";
hash = "sha256-OKKbEgJgQWL5jP+E8ZuxdVjZ89QjLy6AAPRepe4jWsk=";
tag = "v${finalAttrs.version}";
hash = "sha256-MJM7ezZtSdDaUewNGACOKvWc+ZOPVScTuW+d6n1K5jo=";
};
sourceRoot = "${finalAttrs.src.name}/repl";
vendorHash = "sha256-NIcHf9P2/1Me+LuWA3BEjA2mOgdSzXFQJPrhAT7uPoo=";
vendorHash = "sha256-GH7rn0q/YuGBx0rrfHa2EMCsynQ3Pgtz1yDsD/NIKsU=";
ldflags = [
"-s"
@@ -31,9 +31,9 @@ buildGoModule (finalAttrs: {
meta = {
description = "Expression language and expression evaluation for Go";
homepage = "https://github.com/expr-lang/expr";
changelog = "https://github.com/expr-lang/expr/releases/tag/${finalAttrs.src.rev}";
changelog = "https://github.com/expr-lang/expr/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = [ ];
maintainers = with lib.maintainers; [ hythera ];
mainProgram = "expr";
};
})
@@ -1,889 +0,0 @@
From ffb3ab5b45301a7848ccd53ab077e37d0e8382c3 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sat, 28 Sep 2024 10:09:27 +0800
Subject: [PATCH] update Cargo.lock
---
Cargo.lock | 465 +++++++++++++++++++++++++++++------------------------
1 file changed, 254 insertions(+), 211 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 6829f6f..8ae6c05 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,6 +2,15 @@
# It is not intended for manual editing.
version = 3
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
[[package]]
name = "atty"
version = "0.2.14"
@@ -15,48 +24,42 @@ dependencies = [
[[package]]
name = "autocfg"
-version = "1.0.1"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "bitflags"
-version = "1.2.1"
+version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
-name = "bstr"
-version = "0.2.16"
+name = "bumpalo"
+version = "3.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279"
-dependencies = [
- "lazy_static",
- "memchr",
- "regex-automata",
- "serde",
-]
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
[[package]]
-name = "bumpalo"
-version = "3.7.0"
+name = "byteorder"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "cast"
-version = "0.2.7"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a"
-dependencies = [
- "rustc_version",
-]
+checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
[[package]]
name = "cc"
-version = "1.0.69"
+version = "1.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
+checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0"
+dependencies = [
+ "shlex",
+]
[[package]]
name = "cfg-if"
@@ -66,9 +69,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "clap"
-version = "2.33.3"
+version = "2.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
dependencies = [
"bitflags",
"textwrap",
@@ -77,16 +80,16 @@ dependencies = [
[[package]]
name = "criterion"
-version = "0.3.4"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23"
+checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f"
dependencies = [
"atty",
"cast",
"clap",
"criterion-plot",
"csv",
- "itertools 0.10.1",
+ "itertools",
"lazy_static",
"num-traits",
"oorandom",
@@ -103,65 +106,45 @@ dependencies = [
[[package]]
name = "criterion-plot"
-version = "0.4.3"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d"
+checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876"
dependencies = [
"cast",
- "itertools 0.9.0",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
+ "itertools",
]
[[package]]
name = "crossbeam-deque"
-version = "0.8.0"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
dependencies = [
- "cfg-if",
"crossbeam-epoch",
"crossbeam-utils",
]
[[package]]
name = "crossbeam-epoch"
-version = "0.9.5"
+version = "0.9.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
dependencies = [
- "cfg-if",
"crossbeam-utils",
- "lazy_static",
- "memoffset",
- "scopeguard",
]
[[package]]
name = "crossbeam-utils"
-version = "0.8.5"
+version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
-dependencies = [
- "cfg-if",
- "lazy_static",
-]
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
[[package]]
name = "csv"
-version = "1.1.6"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
+checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
dependencies = [
- "bstr",
"csv-core",
"itoa",
"ryu",
@@ -170,9 +153,9 @@ dependencies = [
[[package]]
name = "csv-core"
-version = "0.1.10"
+version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
+checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
dependencies = [
"memchr",
]
@@ -192,9 +175,9 @@ dependencies = [
[[package]]
name = "either"
-version = "1.6.1"
+version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
[[package]]
name = "fcp"
@@ -208,9 +191,9 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.3"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
dependencies = [
"cfg-if",
"libc",
@@ -219,9 +202,9 @@ dependencies = [
[[package]]
name = "half"
-version = "1.7.1"
+version = "1.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3"
+checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
[[package]]
name = "hermit-abi"
@@ -234,78 +217,66 @@ dependencies = [
[[package]]
name = "itertools"
-version = "0.9.0"
+version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
dependencies = [
"either",
]
[[package]]
name = "itoa"
-version = "0.4.7"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
[[package]]
name = "js-sys"
-version = "0.3.51"
+version = "0.3.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
dependencies = [
"wasm-bindgen",
]
[[package]]
name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "libc"
-version = "0.2.98"
+version = "0.2.159"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
[[package]]
name = "log"
-version = "0.4.14"
+version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
-dependencies = [
- "cfg-if",
-]
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
[[package]]
name = "memchr"
-version = "2.4.0"
+version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "memoffset"
-version = "0.6.4"
+version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
dependencies = [
"autocfg",
]
[[package]]
name = "nix"
-version = "0.22.0"
+version = "0.22.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1e25ee6b412c2a1e3fcb6a4499a5c1bfe7f43e014bdce9a6b6666e5aa2d187"
+checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf"
dependencies = [
"bitflags",
"cc",
@@ -316,34 +287,30 @@ dependencies = [
[[package]]
name = "num-traits"
-version = "0.2.14"
+version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
dependencies = [
"autocfg",
]
[[package]]
-name = "num_cpus"
-version = "1.13.0"
+name = "once_cell"
+version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
-dependencies = [
- "hermit-abi",
- "libc",
-]
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
[[package]]
name = "oorandom"
-version = "11.1.3"
+version = "11.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
+checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
[[package]]
name = "plotters"
-version = "0.3.1"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a"
+checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
dependencies = [
"num-traits",
"plotters-backend",
@@ -354,53 +321,55 @@ dependencies = [
[[package]]
name = "plotters-backend"
-version = "0.3.2"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c"
+checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
[[package]]
name = "plotters-svg"
-version = "0.3.1"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9"
+checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
dependencies = [
"plotters-backend",
]
[[package]]
name = "ppv-lite86"
-version = "0.2.10"
+version = "0.2.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
[[package]]
name = "proc-macro2"
-version = "1.0.27"
+version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
dependencies = [
- "unicode-xid",
+ "unicode-ident",
]
[[package]]
name = "quote"
-version = "1.0.9"
+version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2",
]
[[package]]
name = "rand"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
dependencies = [
"libc",
"rand_chacha",
"rand_core",
- "rand_hc",
]
[[package]]
@@ -415,22 +384,13 @@ dependencies = [
[[package]]
name = "rand_core"
-version = "0.6.3"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
"getrandom",
]
-[[package]]
-name = "rand_hc"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
-dependencies = [
- "rand_core",
-]
-
[[package]]
name = "rand_pcg"
version = "0.3.1"
@@ -442,64 +402,58 @@ dependencies = [
[[package]]
name = "rayon"
-version = "1.5.1"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
dependencies = [
- "autocfg",
- "crossbeam-deque",
"either",
"rayon-core",
]
[[package]]
name = "rayon-core"
-version = "1.9.1"
+version = "1.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
dependencies = [
- "crossbeam-channel",
"crossbeam-deque",
"crossbeam-utils",
- "lazy_static",
- "num_cpus",
]
[[package]]
name = "regex"
-version = "1.5.4"
+version = "1.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
"regex-syntax",
]
[[package]]
name = "regex-automata"
-version = "0.1.10"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
[[package]]
name = "regex-syntax"
-version = "0.6.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
-
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver",
-]
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
[[package]]
name = "ryu"
-version = "1.0.5"
+version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
[[package]]
name = "same-file"
@@ -510,32 +464,20 @@ dependencies = [
"winapi-util",
]
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "semver"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f3aac57ee7f3272d8395c6e4f502f434f0e289fcd62876f70daa008c20dcabe"
-
[[package]]
name = "serde"
-version = "1.0.126"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_cbor"
-version = "0.11.1"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622"
+checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
dependencies = [
"half",
"serde",
@@ -543,9 +485,9 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.126"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
dependencies = [
"proc-macro2",
"quote",
@@ -554,24 +496,31 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.64"
+version = "1.0.128"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
dependencies = [
"itoa",
+ "memchr",
"ryu",
"serde",
]
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
[[package]]
name = "syn"
-version = "1.0.73"
+version = "2.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
dependencies = [
"proc-macro2",
"quote",
- "unicode-xid",
+ "unicode-ident",
]
[[package]]
@@ -594,53 +543,53 @@ dependencies = [
]
[[package]]
-name = "unicode-width"
-version = "0.1.8"
+name = "unicode-ident"
+version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
[[package]]
-name = "unicode-xid"
-version = "0.2.2"
+name = "unicode-width"
+version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
[[package]]
name = "walkdir"
-version = "2.3.2"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
dependencies = [
"same-file",
- "winapi",
"winapi-util",
]
[[package]]
name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
+version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.74"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
dependencies = [
"cfg-if",
+ "once_cell",
"wasm-bindgen-macro",
]
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.74"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
dependencies = [
"bumpalo",
- "lazy_static",
"log",
+ "once_cell",
"proc-macro2",
"quote",
"syn",
@@ -649,9 +598,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.74"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -659,9 +608,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.74"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
dependencies = [
"proc-macro2",
"quote",
@@ -672,15 +621,15 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.74"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
[[package]]
name = "web-sys"
-version = "0.3.51"
+version = "0.3.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -704,11 +653,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-util"
-version = "0.1.5"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
dependencies = [
- "winapi",
+ "windows-sys",
]
[[package]]
@@ -716,3 +665,97 @@ name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
--
2.46.0
@@ -1,13 +0,0 @@
diff --git a/src/filesystem.rs b/src/filesystem.rs
index 28c2a01..cfc8fcb 100644
--- a/src/filesystem.rs
+++ b/src/filesystem.rs
@@ -44,7 +44,7 @@ wrap2!(copy, fs, u64);
macro_rules! make_error_message {
($path:ident) => {
- |err| Error::new(format!("{}: {}", $path.display(), err));
+ |err| Error::new(format!("{}: {}", $path.display(), err))
};
}
-57
View File
@@ -1,57 +0,0 @@
{
expect,
fetchFromGitHub,
lib,
rustPlatform,
stdenv,
fetchpatch,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "fcp";
version = "0.2.1";
src = fetchFromGitHub {
owner = "svetlitski";
repo = "fcp";
tag = "v${finalAttrs.version}";
sha256 = "0f242n8w88rikg1srimdifadhggrb2r1z0g65id60ahb4bjm8a0x";
};
patches = [
./0002-trailing-semicolon-in-macro.patch
];
cargoPatches = [
(fetchpatch {
url = "https://github.com/Svetlitski/fcp/commit/1988f88be54a507b804b037cb3887fecf11bb571.patch";
hash = "sha256-fafpy1tviT1rV+jv1Yxg6xEsFZ9qXWQi5LykagDA5xI=";
})
(fetchpatch {
url = "https://github.com/Svetlitski/fcp/commit/89bcfc9aa1055dcf541da7a6477ffd3107023f48.patch";
hash = "sha256-NJ9MMeWf6Ywu+p5uDSWWpAcb01PoMbuSAZ3Qxl9jEaY=";
})
./0001-update-Cargo.lock.patch
];
cargoHash = "sha256-WcbrHAgFTP5OtLI+T0d0BoIxG0MBJzPgjjgCWL2nPus=";
nativeBuildInputs = [ expect ];
# character_device fails with "File name too long" on darwin
doCheck = !stdenv.hostPlatform.isDarwin;
postPatch = ''
patchShebangs tests/*.exp
'';
meta = {
description = "Significantly faster alternative to the classic Unix cp(1) command";
homepage = "https://github.com/svetlitski/fcp";
changelog = "https://github.com/svetlitski/fcp/releases/tag/v${finalAttrs.version}";
license = lib.licenses.bsd3;
platforms = lib.platforms.unix;
maintainers = [ ];
mainProgram = "fcp";
};
})
+3 -3
View File
@@ -23,19 +23,19 @@
stdenv.mkDerivation (finalAttrs: {
pname = "flare";
version = "0.18.1";
version = "0.18.3";
src = fetchFromGitLab {
domain = "gitlab.com";
owner = "schmiddi-on-mobile";
repo = "flare";
tag = finalAttrs.version;
hash = "sha256-BJAmIdkJhyfZRQLUZp34c5reuBleXWpmFJhNMFYTEXw=";
hash = "sha256-+25nDG/xw82Iv6gGYWmGHUBf4CbTLBTzrOqKdrCFIMQ=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-MD7YPO3q2WlFgAacvPHtj6UTnFogbC6T62mNic5955w=";
hash = "sha256-nY+rxWzZJoQRB+Pn4yjof+fCcI2GU2+QFCN73kgRLZ0=";
};
nativeBuildInputs = [
-59
View File
@@ -1,59 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
cargo,
pkg-config,
rustPlatform,
rustc,
wrapGAppsHook3,
gdk-pixbuf,
gtk3,
libsoup_3,
webkitgtk_4_1,
}:
stdenv.mkDerivation rec {
pname = "fontfinder";
version = "2.1.0";
src = fetchFromGitHub {
owner = "mmstick";
repo = "fontfinder";
rev = version;
hash = "sha256-C4KqEdqToVnPXFPWvNkl/md9L2W4NxRd5jvZ4E7CtfA=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-g6PRGHrkHA0JTekKaQs+8mtyOCj99m0zPbgP8AnP7GU=";
};
nativeBuildInputs = [
cargo
pkg-config
rustPlatform.cargoSetupHook
rustc
wrapGAppsHook3
];
buildInputs = [
gdk-pixbuf
gtk3
libsoup_3
webkitgtk_4_1
];
makeFlags = [
"prefix=$(out)"
];
meta = {
description = "GTK application for browsing and installing fonts from Google's font archive";
homepage = "https://github.com/mmstick/fontfinder";
changelog = "https://github.com/mmstick/fontfinder/releases/tag/${src.rev}";
license = lib.licenses.mit;
maintainers = [ ];
mainProgram = "fontfinder-gtk";
};
}
@@ -0,0 +1,102 @@
{
lib,
clangStdenv,
cmake,
expat,
fetchFromGitHub,
ffmpeg_4,
fontconfig,
freetype,
glib,
harfbuzzFull,
libGL,
libGLU,
libjpeg_turbo,
libpng,
libsForQt5,
libunwind,
libwebp,
ninja,
pcre2,
pkg-config,
python3,
libx11,
zlib,
enableWayland ? false,
}:
clangStdenv.mkDerivation rec {
pname = "friction";
version = "1.0.0-rc.3";
src = fetchFromGitHub {
owner = "friction2d";
repo = "friction";
rev = "v${version}";
hash = "sha256-JUDqjUhtYiDll7bTNmYCItT8eQHS5pV38OwqiTXKowM=";
fetchSubmodules = true;
};
nativeBuildInputs = [
cmake
ninja
pkg-config
python3
libsForQt5.wrapQtAppsHook
];
buildInputs = [
expat
ffmpeg_4
fontconfig
freetype
glib
harfbuzzFull
libGL
libGLU
libjpeg_turbo
libpng
libsForQt5.qscintilla
libsForQt5.qtbase
libsForQt5.qtdeclarative
libsForQt5.qtmultimedia
libsForQt5.qtwayland
libunwind
libwebp
pcre2
zlib
]
++ lib.optionals (!clangStdenv.hostPlatform.isDarwin) [
libx11
];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DQSCINTILLA_INCLUDE_DIRS=${libsForQt5.qscintilla}/include"
"-DQSCINTILLA_LIBRARIES_DIRS=${libsForQt5.qscintilla}/lib/"
"-DQSCINTILLA_LIBRARIES=${
if clangStdenv.hostPlatform.isDarwin then "libqscintilla2.dylib" else "libqscintilla2.so"
}"
"-DCMAKE_INSTALL_RPATH=${lib.makeLibraryPath buildInputs}"
]
++ lib.optionals clangStdenv.hostPlatform.isDarwin [
"-DCMAKE_OSX_DEPLOYMENT_TARGET=12.7"
"-DMAC_DEPLOY=ON"
];
postPatch = ''
grep -rl 'hb' src/skia | xargs sed -Ei 's/(["<])(hb.*\.h)/\1harfbuzz\/\2/'
''
+ lib.optionalString enableWayland ''
sed -i '/qputenv("QT_QPA_PLATFORM", "xcb")/d' src/core/appsupport.cpp
'';
meta = {
description = "Vector motion graphics program";
longDescription = "Friction is a powerful and versatile motion graphics application that allows you to create stunning vector and raster animations for web and video platforms with ease.";
homepage = "https://friction.graphics/";
license = lib.licenses.gpl3;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ socksy ];
mainProgram = "friction";
};
}
+3 -3
View File
@@ -16,16 +16,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "furtherance";
version = "26.1.1";
version = "26.7.0";
src = fetchFromGitHub {
owner = "unobserved-io";
repo = "Furtherance";
rev = finalAttrs.version;
hash = "sha256-VG1Ghhi74tkPU9bgauV98Gp5kVoZJ1cJUqWLWnrUAOU=";
hash = "sha256-UMkFEbLdwZsSJviO29FNmLYLL5/HofhriMptpjSAYuY=";
};
cargoHash = "sha256-6S0L8FHI5eCTzhxlew35pK7TewMplKKJDaqJdtoYRnM=";
cargoHash = "sha256-fdslQutVEGq1EG+Q8QAYKf9XfoostvHKWZrr4YwEowQ=";
nativeBuildInputs = [
pkg-config
+6 -11
View File
@@ -35,17 +35,12 @@ python3Packages.buildPythonPackage (finalAttrs: {
--replace-fail "hatch-vcs==0.4.0" "hatch-vcs>=0.4.0"
'';
dependencies =
with python3Packages;
(
[
colorlog
jinja2
lxml
pygments
]
++ lib.optionals (pythonOlder "3.11") [ tomli ]
);
dependencies = with python3Packages; [
colorlog
jinja2
lxml
pygments
];
pythonImportsCheck = [
"gcovr"
+2 -2
View File
@@ -8,10 +8,10 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "halo";
version = "2.22.13";
version = "2.22.14";
src = fetchurl {
url = "https://github.com/halo-dev/halo/releases/download/v${finalAttrs.version}/halo-${finalAttrs.version}.jar";
hash = "sha256-SYpO+A7si9k/zTyNXpZpxuHbbOv3JofBQv0fISfDRaQ=";
hash = "sha256-8AAiR8EVG/3mHpRr85O6zRcrxu5/P+VK2+QaV9ARAJ8=";
};
nativeBuildInputs = [
+4 -4
View File
@@ -11,15 +11,15 @@
}:
let
pname = "josm";
version = "19439";
version = "19481";
srcs = {
jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
hash = "sha256-EuboKKNpApYlh9b78oB5AbtOM38oMe3NEa4fovA78Uk=";
hash = "sha256-Hl3ZJ4VWU7xthes4dxS1TFPMFWGQfC/kN7BGE10RuF4=";
};
macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip";
hash = "sha256-b38Xd0qx0ceNtJ5UIWDJkGOvaHSB/46onPbd6LJ6siY=";
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java24.zip";
hash = "sha256-FGnhyXYN3AyVDjL7aZBgHZ0eb61g2jUJjT5DQ3FUkb0=";
};
pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
+29 -29
View File
@@ -167,16 +167,16 @@
},
{
"name": "illuminate/collections",
"version": "v12.50.0",
"version": "v12.51.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/collections.git",
"reference": "b4bbe2a929aaacf0ade3bec535f1f8fac6e6ed38"
"reference": "1fd7db2203ce5a935fffd2ad40955248fb9f581c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/collections/zipball/b4bbe2a929aaacf0ade3bec535f1f8fac6e6ed38",
"reference": "b4bbe2a929aaacf0ade3bec535f1f8fac6e6ed38",
"url": "https://api.github.com/repos/illuminate/collections/zipball/1fd7db2203ce5a935fffd2ad40955248fb9f581c",
"reference": "1fd7db2203ce5a935fffd2ad40955248fb9f581c",
"shasum": ""
},
"require": {
@@ -223,11 +223,11 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2026-02-01T16:38:26+00:00"
"time": "2026-02-09T13:43:38+00:00"
},
{
"name": "illuminate/conditionable",
"version": "v12.50.0",
"version": "v12.51.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/conditionable.git",
@@ -273,7 +273,7 @@
},
{
"name": "illuminate/contracts",
"version": "v12.50.0",
"version": "v12.51.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/contracts.git",
@@ -321,16 +321,16 @@
},
{
"name": "illuminate/filesystem",
"version": "v12.50.0",
"version": "v12.51.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/filesystem.git",
"reference": "8cad07cf6004a7cd0a876c6ad2136a1511c2bb58"
"reference": "62c225e046a4c469779c0855dce7abd8c0b1fa1e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/filesystem/zipball/8cad07cf6004a7cd0a876c6ad2136a1511c2bb58",
"reference": "8cad07cf6004a7cd0a876c6ad2136a1511c2bb58",
"url": "https://api.github.com/repos/illuminate/filesystem/zipball/62c225e046a4c469779c0855dce7abd8c0b1fa1e",
"reference": "62c225e046a4c469779c0855dce7abd8c0b1fa1e",
"shasum": ""
},
"require": {
@@ -384,11 +384,11 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2026-01-19T15:15:34+00:00"
"time": "2026-02-09T20:42:48+00:00"
},
{
"name": "illuminate/macroable",
"version": "v12.50.0",
"version": "v12.51.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/macroable.git",
@@ -434,7 +434,7 @@
},
{
"name": "illuminate/reflection",
"version": "v12.50.0",
"version": "v12.51.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/reflection.git",
@@ -485,16 +485,16 @@
},
{
"name": "illuminate/support",
"version": "v12.50.0",
"version": "v12.51.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/support.git",
"reference": "411a11401406e7d542aa67a4b400feed6bedef0c"
"reference": "fcc84cf4fba138f1835d6a5978ac4434f11a55aa"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/support/zipball/411a11401406e7d542aa67a4b400feed6bedef0c",
"reference": "411a11401406e7d542aa67a4b400feed6bedef0c",
"url": "https://api.github.com/repos/illuminate/support/zipball/fcc84cf4fba138f1835d6a5978ac4434f11a55aa",
"reference": "fcc84cf4fba138f1835d6a5978ac4434f11a55aa",
"shasum": ""
},
"require": {
@@ -561,20 +561,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2026-02-04T15:14:59+00:00"
"time": "2026-02-10T16:02:09+00:00"
},
{
"name": "laravel/prompts",
"version": "v0.3.12",
"version": "v0.3.13",
"source": {
"type": "git",
"url": "https://github.com/laravel/prompts.git",
"reference": "4861ded9003b7f8a158176a0b7666f74ee761be8"
"reference": "ed8c466571b37e977532fb2fd3c272c784d7050d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/prompts/zipball/4861ded9003b7f8a158176a0b7666f74ee761be8",
"reference": "4861ded9003b7f8a158176a0b7666f74ee761be8",
"url": "https://api.github.com/repos/laravel/prompts/zipball/ed8c466571b37e977532fb2fd3c272c784d7050d",
"reference": "ed8c466571b37e977532fb2fd3c272c784d7050d",
"shasum": ""
},
"require": {
@@ -618,9 +618,9 @@
"description": "Add beautiful and user-friendly forms to your command-line applications.",
"support": {
"issues": "https://github.com/laravel/prompts/issues",
"source": "https://github.com/laravel/prompts/tree/v0.3.12"
"source": "https://github.com/laravel/prompts/tree/v0.3.13"
},
"time": "2026-02-03T06:57:26+00:00"
"time": "2026-02-06T12:17:10+00:00"
},
{
"name": "nesbot/carbon",
@@ -2495,11 +2495,11 @@
},
{
"name": "phpstan/phpstan",
"version": "2.1.38",
"version": "2.1.39",
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/dfaf1f530e1663aa167bc3e52197adb221582629",
"reference": "dfaf1f530e1663aa167bc3e52197adb221582629",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/c6f73a2af4cbcd99c931d0fb8f08548cc0fa8224",
"reference": "c6f73a2af4cbcd99c931d0fb8f08548cc0fa8224",
"shasum": ""
},
"require": {
@@ -2544,7 +2544,7 @@
"type": "github"
}
],
"time": "2026-01-30T17:12:46+00:00"
"time": "2026-02-11T14:48:56+00:00"
},
{
"name": "phpunit/php-code-coverage",
+3 -3
View File
@@ -7,19 +7,19 @@
}:
php.buildComposerProject2 (finalAttrs: {
pname = "laravel";
version = "5.24.4";
version = "5.24.5";
src = fetchFromGitHub {
owner = "laravel";
repo = "installer";
tag = "v${finalAttrs.version}";
hash = "sha256-tPbw0OV8ffWEaXVzoZ4ZffoulAO4IUhUElxAKoYNlnw=";
hash = "sha256-wFyXg92bW7hZBKubj4Gf6nXnFpEpD3aUXv7mF7XbYQw=";
};
nativeBuildInputs = [ makeWrapper ];
composerLock = ./composer.lock;
vendorHash = "sha256-wj3mCF/cSgPTJ/riYQ+k7vooP7Im+ibjSqYthUjPuEs=";
vendorHash = "sha256-hEr7VX4ZwuS7HUSNOvWCy+FOufTE1fMpJih37ZReoro=";
# Adding npm (nodejs) and php composer to path
postInstall = ''
+1 -1
View File
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://laszip.org";
changelog = "https://github.com/LASzip/LASzip/releases/tag/${finalAttrs.src.rev}";
license = lib.licenses.lgpl2;
maintainers = [ lib.maintainers.michelk ];
maintainers = [ ];
platforms = lib.platforms.unix;
};
})
+1 -1
View File
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Turn quickly bulky LAS files into compact LAZ files without information loss";
homepage = "https://laszip.org";
license = lib.licenses.lgpl2;
maintainers = with lib.maintainers; [ michelk ];
maintainers = [ ];
platforms = lib.platforms.unix;
};
})
+2
View File
@@ -36,6 +36,8 @@ mkDerivation rec {
swig
];
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
preConfigure = lib.optionalString (pyProject != "") ''
cd ${pyProject}
'';
+1 -1
View File
@@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://liblas.org";
license = lib.licenses.bsd3;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ michelk ];
maintainers = [ ];
teams = with lib.teams; [ geospatial ];
};
})
+3 -2
View File
@@ -10,17 +10,18 @@
stdenv.mkDerivation rec {
pname = "libp11";
version = "0.4.13";
version = "0.4.17";
src = fetchFromGitHub {
owner = "OpenSC";
repo = "libp11";
rev = "${pname}-${version}";
sha256 = "sha256-xH5Ic8HpWB5O2MWXf2A9FUiV10VZajDdPqEVF0Hs6u0=";
sha256 = "sha256-ST1st+bktGu4G7m8BXuUk+WsTDBj7BcfNFGiiZt1obU=";
};
configureFlags = [
"--with-enginesdir=${placeholder "out"}/lib/engines"
"--with-modulesdir=${placeholder "out"}/lib/ossl-module"
];
nativeBuildInputs = [
@@ -52,7 +52,7 @@ let
]
++ args.nativeBuildInputs or [ ];
JAVA_HOME = mvnJdk;
env.JAVA_HOME = mvnJdk;
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
@@ -131,7 +131,7 @@ stdenv.mkDerivation (
maven
];
JAVA_HOME = mvnJdk;
env.JAVA_HOME = mvnJdk;
buildPhase = ''
runHook preBuild
@@ -10,13 +10,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "nix-index";
version = "0.1.9";
version = "0.1.9-unstable-2026-02-05";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nix-index";
rev = "v${finalAttrs.version}";
hash = "sha256-kOVmgST/D3zNOcGVu1ReuPuVrUx41iRK4rs59lqYX74=";
rev = "8c84f67a33c4c26ec12f166cb5f63a77fafebe21";
hash = "sha256-8ZMKtBbsBPbccEWH1XHCYsxXX4hckHXwQNr5OzGrU0Q=";
};
cargoHash = "sha256-0yrTPrxN/4TOALqpQ5GW7LXKisc8msx3DvEpg8uO+IQ=";
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "numbat";
version = "1.20.0";
version = "1.23.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "numbat";
tag = "v${finalAttrs.version}";
hash = "sha256-Wh7HmE9UPu7+/aguaqON2/pmEHulYw69O0YjoKeDuRg=";
hash = "sha256-xezYRtIzP3MHme/7DwaM0hMgGTcio6iABuNREOOh6HU=";
};
cargoHash = "sha256-F8fjrkQVWmDKGXNYG1e1Fvu9z1EgHC/2zuqN3O/2exE=";
cargoHash = "sha256-oNGq00Znh5WLc+y2NEWZL7Bl17gIaSY7PXYLel9Ucjg=";
env.NUMBAT_SYSTEM_MODULE_PATH = "${placeholder "out"}/share/numbat/modules";
+2 -2
View File
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "nvme-cli";
version = "2.15";
version = "2.16";
src = fetchFromGitHub {
owner = "linux-nvme";
repo = "nvme-cli";
rev = "v${finalAttrs.version}";
hash = "sha256-zXzNjEpxioqYoSHDzimCnP/tKbi0H+GTH4xZ0g1+XnU=";
hash = "sha256-gW95iJF9RnPC1mcoLjS3r+4tZhX+TP4BSOMU0uB256A=";
};
mesonFlags = [
+2 -2
View File
@@ -35,13 +35,13 @@ let
in
maven.buildMavenPackage rec {
pname = "nzbhydra2";
version = "8.4.1";
version = "8.5.1";
src = fetchFromGitHub {
owner = "theotherp";
repo = "nzbhydra2";
tag = "v${version}";
hash = "sha256-Ov8knlZdUQITECqNf8dhiPAVgtyQa1QkFNQntjBUUt0=";
hash = "sha256-idLki0UB8uqtRUvxzwvJuJJyG3+EUUJ5D4Ui41YbMPw=";
};
mvnHash = "sha256-dodZT40zNqfaPd8VxfNYY10VrFNlL4xESDdTrgcFaaY=";
+14 -4
View File
@@ -18,17 +18,18 @@
wineWow64Packages,
onnxruntime,
nix-update-script,
v4l-utils,
withWine ? stdenv.targetPlatform.isx86_64,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "opentrack";
version = "2026.1.0-unstable-2026-01-03";
version = "2026.1.0-unstable-2026-01-24";
src = fetchFromGitHub {
owner = "opentrack";
repo = "opentrack";
rev = "0779d3ce9da19d46919e909d0a1a252d67122db9";
hash = "sha256-n7XCNNXgfwU4q27Q7ss9tgc2Z/tmzcRxUP4chwpPN38=";
rev = "2d3ab7a61d2514ce51c9656908d33465a788763e";
hash = "sha256-+Xb3zlybQrrc1AiTdYXxDhuFNN7g7u7ryM7da2EJpaY=";
};
aruco = callPackage ./aruco.nix { };
@@ -40,6 +41,13 @@ stdenv.mkDerivation (finalAttrs: {
meta.license = lib.licenses.free;
};
fusion = fetchFromGitHub {
owner = "xioTechnologies";
repo = "Fusion";
tag = "v1.2.11";
hash = "sha256-9bqqP+6kfdRWIRnnP+R0lXSQs6OmZoNlbCjqiJeJjpk=";
};
patches = [
# calls `app.setDesktopFileName("opentrack");` - distros that don't wrap the binary apparently don't need this.
./desktop-filename.patch
@@ -69,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
];
cmakeFlags = [
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_AHRSFUSION" "${finalAttrs.fusion}")
(lib.cmakeFeature "OPENTRACK_COMMIT" "opentrack-${finalAttrs.version}")
(lib.cmakeBool "SDK_WINE" withWine)
(lib.cmakeFeature "SDK_ARUCO_LIBPATH" "${finalAttrs.aruco}/lib/libaruco.a")
@@ -82,7 +91,8 @@ stdenv.mkDerivation (finalAttrs: {
# manually wrap just the main binary
dontWrapQtApps = true;
preFixup = ''
wrapQtApp $out/bin/opentrack
wrapQtApp $out/bin/opentrack \
--prefix PATH : ${lib.makeBinPath [ v4l-utils ]}
'';
desktopItems = [
+2 -2
View File
@@ -28,12 +28,12 @@
stdenv.mkDerivation (finalAttrs: {
pname = "orthanc";
version = "1.12.9";
version = "1.12.10";
src = fetchhg {
url = "https://orthanc.uclouvain.be/hg/orthanc/";
rev = "Orthanc-${finalAttrs.version}";
hash = "sha256-IBULO03og+aXmpYAXZdsesTFkc7HkeXol+A7yzDzcfQ=";
hash = "sha256-+y+99NKyAWoQmvgCfubNuGiJ68uUwUvE2O64gZ/3uNA=";
};
outputs = [
-2
View File
@@ -9,8 +9,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
version = "0.1.12";
pyproject = true;
disabled = python3Packages.pythonOlder "3.11";
src = fetchFromGitHub {
owner = "ratoaq2";
repo = "pgsrip";
-5
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
findpython,
installShellFiles,
@@ -26,7 +25,6 @@
trove-classifiers,
virtualenv,
xattr,
tomli,
deepdiff,
pytestCheckHook,
httpretty,
@@ -85,9 +83,6 @@ buildPythonPackage rec {
++ lib.optionals (stdenv.hostPlatform.isDarwin) [
xattr
]
++ lib.optionals (pythonOlder "3.11") [
tomli
]
++ cachecontrol.optional-dependencies.filecache
++ pbs-installer.optional-dependencies.download
++ pbs-installer.optional-dependencies.install;
+1 -2
View File
@@ -94,8 +94,7 @@ python3Packages.buildPythonApplication rec {
semver
]
++ sqlalchemy.optional-dependencies.asyncio
++ httpx.optional-dependencies.http2
++ python-socks.optional-dependencies.asyncio;
++ httpx.optional-dependencies.http2;
optional-dependencies = with python3Packages; {
aws = [
-3
View File
@@ -46,9 +46,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
python-box
tomli-w
]
++ lib.optionals (pythonOlder "3.11") [
tomli
]
++ lib.optional withInotify inotify;
nativeCheckInputs = with python3.pkgs; [
+2 -2
View File
@@ -6,10 +6,10 @@
}:
let
pname = "remnote";
version = "1.22.77";
version = "1.23.3";
src = fetchurl {
url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
hash = "sha256-L8HXfKfmyYg8NkTryNhWfAyVgX3NH83A9EOsBmrck/M=";
hash = "sha256-NYbYlxSp8gAHz8pbX025uTAio33Nf6xyjIsR/EaRGSY=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in
@@ -7,16 +7,16 @@
php.buildComposerProject2 (finalAttrs: {
pname = "roave-backward-compatibility-check";
version = "8.17.0";
version = "8.19.0";
src = fetchFromGitHub {
owner = "Roave";
repo = "BackwardCompatibilityCheck";
tag = finalAttrs.version;
hash = "sha256-+LoAR7pViUnzIICRUUWa7Z5DvSBXo+lr4bjFrTSwq0g=";
hash = "sha256-lqOxEhZlx9rFLvWbjoRXd2dqYtaYqarXx5woQZXntAI=";
};
vendorHash = "sha256-q3n3VIxGlIz+xI5h/JNq40CvXFbShXeVoQ5VoIjk21I=";
vendorHash = "sha256-xsa87iBiUa0jFV0+Myee3Ddo1ICLh3C89Unj9QN0OF4=";
nativeInstallCheckInputs = [
versionCheckHook
-1
View File
@@ -110,7 +110,6 @@ stdenv.mkDerivation (finalAttrs: {
changelog = "https://sourceforge.net/p/saga-gis/wiki/Changelog%20${finalAttrs.version}/";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [
michelk
mpickering
];
teams = [ lib.teams.geospatial ];
+8 -13
View File
@@ -29,19 +29,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
build-system = with python3.pkgs; [ setuptools ];
dependencies =
with python3.pkgs;
[
attrs
click
click-log
jinja2
markdown-it-py
requests
]
++ lib.optionals (python3.pythonOlder "3.11") [
tomli
];
dependencies = with python3.pkgs; [
attrs
click
click-log
jinja2
markdown-it-py
requests
];
nativeCheckInputs = with python3.pkgs; [
pytestCheckHook
-2
View File
@@ -11,8 +11,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
version = "0.11.4";
pyproject = true;
disabled = python3.pythonOlder "3.11";
src = fetchPypi {
inherit (finalAttrs) pname version;
hash = "sha256-LfJVYdViI88L/DtfUD1znBHUiLQb7MKhyJ2jhFCW4+Y=";
+16 -19
View File
@@ -24,25 +24,22 @@ python3Packages.buildPythonApplication (finalAttrs: {
hatchling
];
dependencies =
with python3Packages;
[
click
mysql-connector
pytimeparse2
pymysql
pymysqlsa
simplejson
sqlalchemy
sqlalchemy-utils
tqdm
tabulate
unidecode
packaging
mysql80
python-dateutil
]
++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
dependencies = with python3Packages; [
click
mysql-connector
pytimeparse2
pymysql
pymysqlsa
simplejson
sqlalchemy
sqlalchemy-utils
tqdm
tabulate
unidecode
packaging
mysql80
python-dateutil
];
pythonRelaxDeps = [
"mysql-connector-python"
+3 -3
View File
@@ -16,16 +16,16 @@
buildNpmPackage rec {
pname = "teams-for-linux";
version = "2.7.4";
version = "2.7.5";
src = fetchFromGitHub {
owner = "IsmaelMartinez";
repo = "teams-for-linux";
tag = "v${version}";
hash = "sha256-Wld0Unf2Rk/6/UXocxHn7vdkFgaNtiBybe4snJF7W2E=";
hash = "sha256-TOoaH5F1Ji5UvonqFu/26OMckZ+l71UF0lQf7jEoStg=";
};
npmDepsHash = "sha256-wSK20nCrAp184iPxlfxUvub8vynPKEQxNLkkN8FuWwA=";
npmDepsHash = "sha256-apw2Dg7MmcC+eOrYS+FpHuNIBH564BAUWefNBs/frU0=";
nativeBuildInputs = [
makeWrapper
+2 -2
View File
@@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [
];
stdenv.mkDerivation (finalAttrs: {
pname = "trealla";
version = "2.89.13";
version = "2.90.7";
src = fetchFromGitHub {
owner = "trealla-prolog";
repo = "trealla";
rev = "v${finalAttrs.version}";
hash = "sha256-XtZfLjyN3Ve8PiKTzePE7zwyI/wKV2GUMLOn6zQDdyk=";
hash = "sha256-0ud5GHkldJ7/86bmeXV1SdShXKLjUIu7oOxZBbB+068=";
};
postPatch = ''
+3 -3
View File
@@ -1,7 +1,7 @@
rec {
version = "0.18.0";
version = "0.18.1";
tag = version;
hash = "sha256-049fEvLiRK2QfX6W0zCuL2QNACkBn0HmuGYjUGAWR1M=";
cargoHash = "sha256-rGWMhghlYaUupn2vqDxBEezgENH4GCXlf2RU3iRrmxo=";
hash = "sha256-HB6YjWi4DEbLTwMhqtcF0IufK8YEmE4w/7n/nsL8VEw=";
cargoHash = "sha256-B2eDBf5ycFpXBk9XIzkltdr6eDs/CHHufHtjoOAvg2E=";
updateScript = ./update-stable.sh;
}
+3 -3
View File
@@ -1,7 +1,7 @@
rec {
version = "0.18.0";
version = "0.18.1";
tag = version;
hash = "sha256-049fEvLiRK2QfX6W0zCuL2QNACkBn0HmuGYjUGAWR1M=";
cargoHash = "sha256-rGWMhghlYaUupn2vqDxBEezgENH4GCXlf2RU3iRrmxo=";
hash = "sha256-HB6YjWi4DEbLTwMhqtcF0IufK8YEmE4w/7n/nsL8VEw=";
cargoHash = "sha256-B2eDBf5ycFpXBk9XIzkltdr6eDs/CHHufHtjoOAvg2E=";
updateScript = ./update-unstable.sh;
}
+5 -5
View File
@@ -2,7 +2,7 @@
lib,
fetchFromGitHub,
symlinkJoin,
buildGoModule,
buildGo126Module,
makeWrapper,
nix-update-script,
v2ray-geoip,
@@ -13,18 +13,18 @@
],
}:
buildGoModule (finalAttrs: {
buildGo126Module (finalAttrs: {
pname = "xray";
version = "26.1.13";
version = "26.2.6";
src = fetchFromGitHub {
owner = "XTLS";
repo = "Xray-core";
rev = "v${finalAttrs.version}";
hash = "sha256-Sb9Q+HUDdvyDIMpKaNWvc4BipAxmITeGkOl09dPLs9k=";
hash = "sha256-WTCehvvk/f2/IemzGDq3Y0dM/n0iKAH8CeVyoTimFqQ=";
};
vendorHash = "sha256-mWZwzuEYbmNcrpRGvvZVJ7be7nRQLo7m2MM1OM3Lqzs=";
vendorHash = "sha256-JOstg2Q7UTFn904MMjqk+BCRd7opfNDj+WI0sCSHbDA=";
nativeBuildInputs = [ makeWrapper ];
+2 -2
View File
@@ -36,13 +36,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "zipline";
version = "4.4.1";
version = "4.4.2";
src = fetchFromGitHub {
owner = "diced";
repo = "zipline";
tag = "v${finalAttrs.version}";
hash = "sha256-9+r3padIhpmLNfiL68eut7e+VemhsqhvRcJhyOdA7+k=";
hash = "sha256-RFajEXewnOCkp4xz/fhugVEt+BPNrrQY4Oeqt6Gg6p0=";
leaveDotGit = true;
postFetch = ''
git -C $out rev-parse --short HEAD > $out/.git_head
+1 -1
View File
@@ -26,7 +26,7 @@ let
"19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
"20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw=";
"21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0=";
"22.1.0-rc2".officialRelease.sha256 = "sha256-j0KSuTANrwLh/siEcztSqCYQQDYHmdBCgVCsPsDCQ+I=";
"22.1.0-rc3".officialRelease.sha256 = "sha256-vGG7lDdDFW427lS384Bl7Pt9QFgK1XVxLmtm878xmxU=";
"23.0.0-git".gitRelease = {
rev = "dc152f0d2d085dcfb7542d0e71e19ebfa1aa3794";
rev-version = "23.0.0-unstable-2026-02-01";
@@ -1,52 +0,0 @@
From 084c6dd6352077e64f10cf7aa168f95d800f3819 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 9 Nov 2020 10:24:35 -0800
Subject: [PATCH] CPython: Don't use ldconfig
---
Lib/ctypes/util.py | 77 ++--------------------------------------------
1 file changed, 2 insertions(+), 75 deletions(-)
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index 0c2510e..7fb98af 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -268,34 +222,7 @@ elif os.name == "posix":
else:
def _findSoname_ldconfig(name):
- import struct
- if struct.calcsize('l') == 4:
- machine = os.uname().machine + '-32'
- else:
- machine = os.uname().machine + '-64'
- mach_map = {
- 'x86_64-64': 'libc6,x86-64',
- 'ppc64-64': 'libc6,64bit',
- 'sparc64-64': 'libc6,64bit',
- 's390x-64': 'libc6,64bit',
- 'ia64-64': 'libc6,IA-64',
- }
- abi_type = mach_map.get(machine, 'libc6')
-
- # XXX assuming GLIBC's ldconfig (with option -p)
- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s'
- regex = os.fsencode(regex % (re.escape(name), abi_type))
- try:
- with subprocess.Popen(['/sbin/ldconfig', '-p'],
- stdin=subprocess.DEVNULL,
- stderr=subprocess.DEVNULL,
- stdout=subprocess.PIPE,
- env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
- res = re.search(regex, p.stdout.read())
- if res:
- return os.fsdecode(res.group(1))
- except OSError:
- pass
+ return None
def _findLib_ld(name):
# See issue #9998 for why this is needed
--
2.28.0
@@ -1,248 +0,0 @@
--- a/Lib/_osx_support.py
+++ b/Lib/_osx_support.py
@@ -14,13 +14,13 @@ __all__ = [
# configuration variables that may contain universal build flags,
# like "-arch" or "-isdkroot", that may need customization for
# the user environment
-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
- 'PY_CORE_CFLAGS', 'PY_CORE_LDFLAGS')
+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
+ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
+ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
+ 'PY_CPPFLAGS', 'PY_CORE_LDFLAGS', 'PY_CORE_CFLAGS')
# configuration variables that may contain compiler calls
-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
# prefix added to original configuration variable names
_INITPRE = '_OSX_SUPPORT_INITIAL_'
--- a/Lib/distutils/cygwinccompiler.py
+++ b/Lib/distutils/cygwinccompiler.py
@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler):
# dllwrap 2.10.90 is buggy
if self.ld_version >= "2.10.90":
self.linker_dll = "gcc"
+ self.linker_dll_cxx = "g++"
else:
self.linker_dll = "dllwrap"
+ self.linker_dll_cxx = "dllwrap"
# ld_version >= "2.13" support -shared so use it instead of
# -mdll -static
@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler):
self.set_executables(compiler='gcc -mcygwin -O -Wall',
compiler_so='gcc -mcygwin -mdll -O -Wall',
compiler_cxx='g++ -mcygwin -O -Wall',
+ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
linker_exe='gcc -mcygwin',
linker_so=('%s -mcygwin %s' %
- (self.linker_dll, shared_option)))
+ (self.linker_dll, shared_option)),
+ linker_exe_cxx='g++ -mcygwin',
+ linker_so_cxx=('%s -mcygwin %s' %
+ (self.linker_dll_cxx, shared_option)))
# cygwin and mingw32 need different sets of libraries
if self.gcc_version == "2.91.57":
@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler):
raise CompileError(msg)
else: # for other files use the C-compiler
try:
- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
- extra_postargs)
+ if self.detect_language(src) == 'c++':
+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
+ extra_postargs)
+ else:
+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+ extra_postargs)
except DistutilsExecError as msg:
raise CompileError(msg)
@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
self.set_executables(compiler='gcc -O -Wall',
compiler_so='gcc -mdll -O -Wall',
compiler_cxx='g++ -O -Wall',
+ compiler_so_cxx='g++ -mdll -O -Wall',
linker_exe='gcc',
linker_so='%s %s %s'
% (self.linker_dll, shared_option,
+ entry_point),
+ linker_exe_cxx='g++',
+ linker_so_cxx='%s %s %s'
+ % (self.linker_dll_cxx, shared_option,
entry_point))
# Maybe we should also append -mthreads, but then the finished
# dlls need another dll (mingwm10.dll see Mingw32 docs)
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -170,9 +170,11 @@ def customize_compiler(compiler):
_osx_support.customize_compiler(_config_vars)
_config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- (cc, cxx, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
- get_config_vars('CC', 'CXX', 'CFLAGS',
- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
+ (cc, cxx, cflags, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
+ get_config_vars('CC', 'CXX', 'CFLAGS', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
+ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
+
+ cxxflags = cflags
if 'CC' in os.environ:
newcc = os.environ['CC']
@@ -187,19 +189,27 @@ def customize_compiler(compiler):
cxx = os.environ['CXX']
if 'LDSHARED' in os.environ:
ldshared = os.environ['LDSHARED']
+ if 'LDCXXSHARED' in os.environ:
+ ldcxxshared = os.environ['LDCXXSHARED']
if 'CPP' in os.environ:
cpp = os.environ['CPP']
else:
cpp = cc + " -E" # not always
if 'LDFLAGS' in os.environ:
ldshared = ldshared + ' ' + os.environ['LDFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
if 'CFLAGS' in os.environ:
- cflags = cflags + ' ' + os.environ['CFLAGS']
+ cflags = os.environ['CFLAGS']
ldshared = ldshared + ' ' + os.environ['CFLAGS']
+ if 'CXXFLAGS' in os.environ:
+ cxxflags = os.environ['CXXFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
if 'CPPFLAGS' in os.environ:
cpp = cpp + ' ' + os.environ['CPPFLAGS']
cflags = cflags + ' ' + os.environ['CPPFLAGS']
+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
if 'AR' in os.environ:
ar = os.environ['AR']
if 'ARFLAGS' in os.environ:
@@ -208,13 +218,17 @@ def customize_compiler(compiler):
archiver = ar + ' ' + ar_flags
cc_cmd = cc + ' ' + cflags
+ cxx_cmd = cxx + ' ' + cxxflags
compiler.set_executables(
preprocessor=cpp,
compiler=cc_cmd,
compiler_so=cc_cmd + ' ' + ccshared,
- compiler_cxx=cxx,
+ compiler_cxx=cxx_cmd,
+ compiler_so_cxx=cxx_cmd + ' ' + ccshared,
linker_so=ldshared,
linker_exe=cc,
+ linker_so_cxx=ldcxxshared,
+ linker_exe_cxx=cxx,
archiver=archiver)
compiler.shared_lib_extension = shlib_suffix
--- a/Lib/distutils/unixccompiler.py
+++ b/Lib/distutils/unixccompiler.py
@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
# are pretty generic; they will probably have to be set by an outsider
# (eg. using information discovered by the sysconfig about building
# Python extensions).
- executables = {'preprocessor' : None,
- 'compiler' : ["cc"],
- 'compiler_so' : ["cc"],
- 'compiler_cxx' : ["cc"],
- 'linker_so' : ["cc", "-shared"],
- 'linker_exe' : ["cc"],
- 'archiver' : ["ar", "-cr"],
- 'ranlib' : None,
+ executables = {'preprocessor' : None,
+ 'compiler' : ["cc"],
+ 'compiler_so' : ["cc"],
+ 'compiler_cxx' : ["c++"],
+ 'compiler_so_cxx' : ["c++"],
+ 'linker_so' : ["cc", "-shared"],
+ 'linker_exe' : ["cc"],
+ 'linker_so_cxx' : ["c++", "-shared"],
+ 'linker_exe_cxx' : ["c++"],
+ 'archiver' : ["ar", "-cr"],
+ 'ranlib' : None,
}
if sys.platform[:6] == "darwin":
@@ -110,12 +113,19 @@ class UnixCCompiler(CCompiler):
def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
compiler_so = self.compiler_so
+ compiler_so_cxx = self.compiler_so_cxx
if sys.platform == 'darwin':
compiler_so = _osx_support.compiler_fixup(compiler_so,
cc_args + extra_postargs)
+ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
+ cc_args + extra_postargs)
try:
- self.spawn(compiler_so + cc_args + [src, '-o', obj] +
- extra_postargs)
+ if self.detect_language(src) == 'c++':
+ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
+ extra_postargs)
+ else:
+ self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+ extra_postargs)
except DistutilsExecError as msg:
raise CompileError(msg)
@@ -173,30 +183,16 @@ class UnixCCompiler(CCompiler):
ld_args.extend(extra_postargs)
self.mkpath(os.path.dirname(output_filename))
try:
- if target_desc == CCompiler.EXECUTABLE:
- linker = self.linker_exe[:]
+ if target_lang == "c++":
+ if target_desc == CCompiler.EXECUTABLE:
+ linker = self.linker_exe_cxx[:]
+ else:
+ linker = self.linker_so_cxx[:]
else:
- linker = self.linker_so[:]
- if target_lang == "c++" and self.compiler_cxx:
- # skip over environment variable settings if /usr/bin/env
- # is used to set up the linker's environment.
- # This is needed on OSX. Note: this assumes that the
- # normal and C++ compiler have the same environment
- # settings.
- i = 0
- if os.path.basename(linker[0]) == "env":
- i = 1
- while '=' in linker[i]:
- i += 1
-
- if os.path.basename(linker[i]) == 'ld_so_aix':
- # AIX platforms prefix the compiler with the ld_so_aix
- # script, so we need to adjust our linker index
- offset = 1
+ if target_desc == CCompiler.EXECUTABLE:
+ linker = self.linker_exe[:]
else:
- offset = 0
-
- linker[i+offset] = self.compiler_cxx[i]
+ linker = self.linker_so[:]
if sys.platform == 'darwin':
linker = _osx_support.compiler_fixup(linker, ld_args)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -584,10 +584,10 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
*\ -s*|s*) quiet="-q";; \
*) quiet="";; \
esac; \
- echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
+ echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' CFLAGS='$(PY_CFLAGS)' \
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \
- $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
+ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' CFLAGS='$(PY_CFLAGS)' \
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
@@ -1,106 +0,0 @@
From 66f492d2eda94bd64db833839a325caf6ba0fed5 Mon Sep 17 00:00:00 2001
From: Greg Roodt <greg@canva.com>
Date: Wed, 9 Dec 2020 17:59:24 +1100
Subject: [PATCH] Don't use ldconfig
---
Lib/ctypes/util.py | 77 ++--------------------------------------------
1 file changed, 2 insertions(+), 75 deletions(-)
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index 0c2510e161..7fb98af308 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -100,53 +100,7 @@ elif os.name == "posix":
return thefile.read(4) == elf_header
def _findLib_gcc(name):
- # Run GCC's linker with the -t (aka --trace) option and examine the
- # library name it prints out. The GCC command will fail because we
- # haven't supplied a proper program with main(), but that does not
- # matter.
- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name))
-
- c_compiler = shutil.which('gcc')
- if not c_compiler:
- c_compiler = shutil.which('cc')
- if not c_compiler:
- # No C compiler available, give up
- return None
-
- temp = tempfile.NamedTemporaryFile()
- try:
- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name]
-
- env = dict(os.environ)
- env['LC_ALL'] = 'C'
- env['LANG'] = 'C'
- try:
- proc = subprocess.Popen(args,
- stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT,
- env=env)
- except OSError: # E.g. bad executable
- return None
- with proc:
- trace = proc.stdout.read()
- finally:
- try:
- temp.close()
- except FileNotFoundError:
- # Raised if the file was already removed, which is the normal
- # behaviour of GCC if linking fails
- pass
- res = re.findall(expr, trace)
- if not res:
- return None
-
- for file in res:
- # Check if the given file is an elf file: gcc can report
- # some files that are linker scripts and not actual
- # shared objects. See bpo-41976 for more details
- if not _is_elf(file):
- continue
- return os.fsdecode(file)
+ return None
if sys.platform == "sunos5":
@@ -268,34 +222,7 @@ elif os.name == "posix":
else:
def _findSoname_ldconfig(name):
- import struct
- if struct.calcsize('l') == 4:
- machine = os.uname().machine + '-32'
- else:
- machine = os.uname().machine + '-64'
- mach_map = {
- 'x86_64-64': 'libc6,x86-64',
- 'ppc64-64': 'libc6,64bit',
- 'sparc64-64': 'libc6,64bit',
- 's390x-64': 'libc6,64bit',
- 'ia64-64': 'libc6,IA-64',
- }
- abi_type = mach_map.get(machine, 'libc6')
-
- # XXX assuming GLIBC's ldconfig (with option -p)
- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s'
- regex = os.fsencode(regex % (re.escape(name), abi_type))
- try:
- with subprocess.Popen(['/sbin/ldconfig', '-p'],
- stdin=subprocess.DEVNULL,
- stderr=subprocess.DEVNULL,
- stdout=subprocess.PIPE,
- env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
- res = re.search(regex, p.stdout.read())
- if res:
- return os.fsdecode(res.group(1))
- except OSError:
- pass
+ return None
def _findLib_ld(name):
# See issue #9998 for why this is needed
--
2.24.3 (Apple Git-128)
@@ -1,15 +0,0 @@
diff --git a/setup.py b/setup.py
index 04eb6b2..2e1160d 100644
--- a/setup.py
+++ b/setup.py
@@ -1981,8 +1981,8 @@ class PyBuildExt(build_ext):
# Rather than complicate the code below, detecting and building
# AquaTk is a separate method. Only one Tkinter will be built on
# Darwin - either AquaTk, if it is found, or X11 based Tk.
- if (MACOS and self.detect_tkinter_darwin()):
- return True
+ # if (MACOS and self.detect_tkinter_darwin()):
+ # return True
# Assume we haven't found any of the libraries or include files
# The versions with dots are used on Unix, and the versions without
@@ -1,51 +0,0 @@
From 66f492d2eda94bd64db833839a325caf6ba0fed5 Mon Sep 17 00:00:00 2001
From: Greg Roodt <greg@canva.com>
Date: Wed, 9 Dec 2020 17:59:24 +1100
Subject: [PATCH] Don't use ldconfig
---
Lib/ctypes/util.py | 77 ++--------------------------------------------
1 file changed, 2 insertions(+), 75 deletions(-)
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index 0c2510e161..7fb98af308 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -268,34 +222,7 @@ elif os.name == "posix":
else:
def _findSoname_ldconfig(name):
- import struct
- if struct.calcsize('l') == 4:
- machine = os.uname().machine + '-32'
- else:
- machine = os.uname().machine + '-64'
- mach_map = {
- 'x86_64-64': 'libc6,x86-64',
- 'ppc64-64': 'libc6,64bit',
- 'sparc64-64': 'libc6,64bit',
- 's390x-64': 'libc6,64bit',
- 'ia64-64': 'libc6,IA-64',
- }
- abi_type = mach_map.get(machine, 'libc6')
-
- # XXX assuming GLIBC's ldconfig (with option -p)
- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s'
- regex = os.fsencode(regex % (re.escape(name), abi_type))
- try:
- with subprocess.Popen(['/sbin/ldconfig', '-p'],
- stdin=subprocess.DEVNULL,
- stderr=subprocess.DEVNULL,
- stdout=subprocess.PIPE,
- env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
- res = re.search(regex, p.stdout.read())
- if res:
- return os.fsdecode(res.group(1))
- except OSError:
- pass
+ return None
def _findLib_ld(name):
# See issue #9998 for why this is needed
--
2.24.3 (Apple Git-128)
@@ -368,19 +368,13 @@ stdenv.mkDerivation (finalAttrs: {
# Make the mimetypes module refer to the right file
./mimetypes.patch
]
++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.hostPlatform.isDarwin) [
# Stop checking for TCL/TK in global macOS locations
./3.9/darwin-tcl-tk.patch
]
++ optionals (hasDistutilsCxxPatch && pythonOlder "3.12") [
# Fix for http://bugs.python.org/issue1222585
# Upstream distutils is calling C compiler to compile C++ code, which
# only works for GCC and Apple Clang. This makes distutils to call C++
# compiler when needed.
(
if pythonAtLeast "3.7" && pythonOlder "3.11" then
./3.7/python-3.x-distutils-C++.patch
else if pythonAtLeast "3.11" then
if pythonAtLeast "3.11" then
./3.11/python-3.x-distutils-C++.patch
else
fetchpatch {
@@ -800,11 +794,6 @@ stdenv.mkDerivation (finalAttrs: {
inherit src;
name = "python${pythonVersion}-${version}-doc";
postPatch = lib.optionalString (pythonAtLeast "3.9" && pythonOlder "3.11") ''
substituteInPlace Doc/tools/extensions/pyspecific.py \
--replace-fail "from sphinx.util import status_iterator" "from sphinx.util.display import status_iterator"
'';
dontConfigure = true;
dontBuild = true;
@@ -42,18 +42,6 @@
inherit passthruFun;
};
python310 = callPackage ./cpython {
self = __splicedPackages.python310;
sourceVersion = {
major = "3";
minor = "10";
patch = "19";
suffix = "";
};
hash = "sha256-yPSlllciAdgd19+R9w4XfhmnDx1ImWi1S1+78pqXwHY=";
inherit passthruFun;
};
python311 = callPackage ./cpython {
self = __splicedPackages.python311;
sourceVersion = {
@@ -82,17 +82,12 @@ let
"installer"
];
isBootstrapPackage' = flip elem (
[
"build"
"packaging"
"pyproject-hooks"
"wheel"
]
++ optionals (python.pythonOlder "3.11") [
"tomli"
]
);
isBootstrapPackage' = flip elem [
"build"
"packaging"
"pyproject-hooks"
"wheel"
];
isSetuptoolsDependency' = flip elem [
"setuptools"
@@ -110,10 +110,6 @@ let
in
rec {
isPy27 = pythonVersion == "2.7";
isPy37 = pythonVersion == "3.7";
isPy38 = pythonVersion == "3.8";
isPy39 = pythonVersion == "3.9";
isPy310 = pythonVersion == "3.10";
isPy311 = pythonVersion == "3.11";
isPy312 = pythonVersion == "3.12";
isPy313 = pythonVersion == "3.13";
@@ -353,13 +353,6 @@ stdenv.mkDerivation rec {
"test_inspect"
"test_pydoc"
"test_warnings"
]
++ lib.optionals isPy310 [
"test_contextlib_async"
"test_future"
"test_lzma"
"test_module"
"test_typing"
];
in
''
@@ -168,10 +168,6 @@ in
inherit lib pkgs stdenv;
inherit (python.passthru)
isPy27
isPy37
isPy38
isPy39
isPy310
isPy311
isPy312
isPy313
+11 -9
View File
@@ -129,9 +129,6 @@ let
inherit hash;
};
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
NROFF = if docSupport then "${groff}/bin/nroff" else null;
outputs = [ "out" ] ++ lib.optional docSupport "devdoc";
strictDeps = true;
@@ -174,12 +171,17 @@ let
];
propagatedBuildInputs = op jemallocSupport jemalloc;
env = lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && yjitSupport) {
# The ruby build system will use a bare `rust` command by default for its rust.
# We can use the Nixpkgs rust wrapper to work around the fact that our Rust builds
# for cross-compilation output for the build target by default.
NIX_RUSTFLAGS = "--target ${stdenv.hostPlatform.rust.rustcTargetSpec}";
};
env =
lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && yjitSupport) {
# The ruby build system will use a bare `rust` command by default for its rust.
# We can use the Nixpkgs rust wrapper to work around the fact that our Rust builds
# for cross-compilation output for the build target by default.
NIX_RUSTFLAGS = "--target ${stdenv.hostPlatform.rust.rustcTargetSpec}";
}
// lib.optionalAttrs docSupport {
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
NROFF = "${groff}/bin/nroff";
};
enableParallelBuilding = true;
# /build/ruby-2.7.7/lib/fileutils.rb:882:in `chmod':
@@ -31,7 +31,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "cheusov";
repo = "lua-alt-getopt";
rev = "0.8.0";
tag = "0.8.0";
hash = "sha256-OxtMNB8++cVQ/gQjntLUt3WYopGhYb1VbIUAZEzJB88=";
};
@@ -224,7 +224,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "lunarmodules";
repo = "busted";
rev = "v2.3.0";
tag = "v2.3.0";
hash = "sha256-ZSfnbsDiaIo/abVpwb/LV5Ktp5wFSZQNO0OdbnjqVSs=";
};
@@ -265,7 +265,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "hishamhm";
repo = "busted-htest";
rev = "1.0.0";
tag = "1.0.0";
hash = "sha256-tGAQUSeDt+OV/TBAJo/JFdyeBRRZaIQEJG+SKcCaQhs=";
};
@@ -297,7 +297,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "sile-typesetter";
repo = "cassowary.lua";
rev = "v2.3.2";
tag = "v2.3.2";
hash = "sha256-wIVuf1L3g2BCM+zW4Nt1IyU6xaP4yYuzxHjVDxsgdNM=";
};
@@ -332,7 +332,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "alerque";
repo = "cldr-lua";
rev = "v0.3.0";
tag = "v0.3.0";
hash = "sha256-5LY0YxHACtreP38biDZD97bkPuuT7an/Z1VBXEJYjkI=";
};
@@ -429,7 +429,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "mascarenhas";
repo = "cosmo";
rev = "v16.06.04";
tag = "v16.06.04";
hash = "sha256-mJE5GkDnfZ3qAQyyyKj+aXOtlITeYs8lerGJSTzU/Tk=";
};
@@ -460,7 +460,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "keplerproject";
repo = "coxpcall";
rev = "v1_17_0";
tag = "v1_17_0";
hash = "sha256-EW8pGI9jiGutNVNmyiCP5sIVYZe2rJQc03OrKXIOeMw=";
};
@@ -523,7 +523,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "teal-language";
repo = "cyan";
rev = "v0.4.1";
tag = "v0.4.1";
hash = "sha256-jvBmOC1SMnuwgwtK6sPCDma+S5RyhItc6YjzMPULzSw=";
};
@@ -560,7 +560,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "hishamhm";
repo = "datafile";
rev = "v0.11";
tag = "v0.11";
hash = "sha256-aHdxFJ2IB9v9UMK7vqk7tUA0rLmfvRd0nzhc9JO8AlQ=";
};
@@ -594,7 +594,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "astoff";
repo = "digestif";
rev = "v0.6";
tag = "v0.6";
hash = "sha256-sGwKt9suRVNrbRJlhNMHzc5r4sK/fvUc7smxmxmrn8Y=";
};
@@ -660,7 +660,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "bakpakin";
repo = "Fennel";
rev = "1.6.1";
tag = "1.6.1";
hash = "sha256-MLXLkRKlxqvEOogM5I4uHxnlRLjK8Pbeq9b1+kAgqFg=";
};
@@ -754,7 +754,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "alerque";
repo = "fluent-lua";
rev = "v0.2.0";
tag = "v0.2.0";
hash = "sha256-uDJWhQ/fDD9ZbYOgPk1FDlU3A3DAZw3Ujx92BglFWoo=";
};
@@ -814,15 +814,15 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "fzf-lua";
version = "0.0.2459-1";
version = "0.0.2475-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/fzf-lua-0.0.2459-1.rockspec";
sha256 = "0qz1r8vm7szd7z6gicxiblc40y8pw9w91g5qnvax4qmzhyyw4zcq";
url = "mirror://luarocks/fzf-lua-0.0.2475-1.rockspec";
sha256 = "0lpmyffc5g7sl1smb59pqmd8zrkcp367mgsiarscqbqc6yilrvky";
}).outPath;
src = fetchzip {
url = "https://github.com/ibhagwan/fzf-lua/archive/36d60dd59cd9bc0442352119fc0e45e1c9011e03.zip";
sha256 = "0lr4rk0fqdw12vhnmrjy197ai2d5ld16rwpcwxw4ay1dnaaq2f3x";
url = "https://github.com/ibhagwan/fzf-lua/archive/739330f48ca64b4283f5228e9dc9c0c8f9a37110.zip";
sha256 = "1pwzaak9q7cacw2qvcs80qxqfpxc60jvspw4ykmws6sh3rbi5c36";
};
disabled = luaOlder "5.1";
@@ -937,15 +937,15 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "haskell-tools.nvim";
version = "7.0.0-1";
version = "7.0.1-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/haskell-tools.nvim-7.0.0-1.rockspec";
sha256 = "03zrib07g6fxzf9gj52f8v5bvllqv7zsvn7z473grwsq6w26dpdy";
url = "mirror://luarocks/haskell-tools.nvim-7.0.1-1.rockspec";
sha256 = "0iy3c8zdj5m0mcj11vw91458dgh4g7y7yz3pc312gbbjq89pi07h";
}).outPath;
src = fetchzip {
url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v7.0.0.zip";
sha256 = "1jxbdqh4sgh00lx7abrb7rww62x1dafzxncsr0pjlmly53vwrw5r";
url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v7.0.1.zip";
sha256 = "0ibd2cdmfagmdi0v0m0l4yssnx9pfvw0cgs0gz0zlb403jsgm394";
};
disabled = luaOlder "5.1";
@@ -1057,7 +1057,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "kmarius";
repo = "jsregexp";
rev = "v0.0.7";
tag = "v0.0.7";
hash = "sha256-aXRGmo6w7jgKlR2BwKhbFGHC0mOTwHfYsh+lvqNuFtQ=";
};
@@ -1123,7 +1123,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "lunarmodules";
repo = "ldoc";
rev = "v1.5.0";
tag = "v1.5.0";
hash = "sha256-Me2LT+UzO8G2vHqG7DjjoCRAtLmhiJHlSEYQGkprxTw=";
};
@@ -1158,7 +1158,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "pavouk";
repo = "lgi";
rev = "0.9.2";
tag = "0.9.2";
hash = "sha256-UpamUbvqzF0JKV3J0wIiJlV6iedwe823vD0EIm3zKw8=";
};
@@ -1250,7 +1250,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "jeffzi";
repo = "llscheck";
rev = "v0.8.0";
tag = "v0.8.0";
hash = "sha256-edUS6EQLiU4Slob2PagmPE5h7Co+XNRYb3fNeC4COsI=";
};
@@ -1345,7 +1345,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "leafo";
repo = "loadkit";
rev = "v1.1.0";
tag = "v1.1.0";
hash = "sha256-fw+aoP9+yDpme4qXupE07cV1QGZjb2aU7IOHapG+ihU=";
};
@@ -1466,7 +1466,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "rrthomas";
repo = "lrexlib";
rev = "rel-2-9-2";
tag = "rel-2-9-2";
hash = "sha256-DzNDve+xeKb+kAcW+o7GK/RsoDhaDAVAWAhgjISCyZc=";
};
@@ -1498,7 +1498,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "rrthomas";
repo = "lrexlib";
rev = "rel-2-9-2";
tag = "rel-2-9-2";
hash = "sha256-DzNDve+xeKb+kAcW+o7GK/RsoDhaDAVAWAhgjISCyZc=";
};
@@ -1531,7 +1531,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "rrthomas";
repo = "lrexlib";
rev = "rel-2-9-2";
tag = "rel-2-9-2";
hash = "sha256-DzNDve+xeKb+kAcW+o7GK/RsoDhaDAVAWAhgjISCyZc=";
};
@@ -1563,7 +1563,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "rrthomas";
repo = "lrexlib";
rev = "rel-2-9-2";
tag = "rel-2-9-2";
hash = "sha256-DzNDve+xeKb+kAcW+o7GK/RsoDhaDAVAWAhgjISCyZc=";
};
@@ -1626,7 +1626,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "openresty";
repo = "lua-cjson";
rev = "2.1.0.10";
tag = "2.1.0.10";
hash = "sha256-/SeQro0FaJn91bAGjsVIin+mJF89VUm/G0KyJkV9Qps=";
};
@@ -1658,7 +1658,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "antirez";
repo = "lua-cmsgpack";
rev = "0.4.0";
tag = "0.4.0";
hash = "sha256-oGKX5G3uNGCJOaZpjLmIJYuq5HtdLd9xM/TlmxODCkg=";
};
@@ -1721,7 +1721,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "hamishforbes";
repo = "lua-ffi-zlib";
rev = "v0.6";
tag = "v0.6";
hash = "sha256-l3zN6amZ6uUbOl7vt5XF+Uyz0nbDrYgcaQCWRFSN22Q=";
};
@@ -1785,7 +1785,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "Alloyed";
repo = "lua-lsp";
rev = "v0.1.0";
tag = "v0.1.0";
hash = "sha256-Fy9d6ZS0R48dUpKpgJ9jRujQna5wsE3+StJ8GQyWY54=";
};
@@ -1851,7 +1851,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "starwing";
repo = "lua-protobuf";
rev = "0.5.3";
tag = "0.5.3";
hash = "sha256-9vAv/Rhf9xrQnbd0nkaxGrcTRKkUSlpYRAJe2zpdIiY=";
};
@@ -1884,7 +1884,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "ledgetech";
repo = "lua-resty-http";
rev = "v0.17.2";
tag = "v0.17.2";
hash = "sha256-Ph3PpzQYKYMvPvjYwx4TeZ9RYoryMsO6mLpkAq/qlHY=";
};
@@ -1917,7 +1917,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "cdbattags";
repo = "lua-resty-jwt";
rev = "v0.2.3";
tag = "v0.2.3";
hash = "sha256-m8UbvKk2DR8yCYX9Uv5HjXcZDVyVeRlUKp7UiaN/SkA=";
};
@@ -1953,7 +1953,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "zmartzone";
repo = "lua-resty-openidc";
rev = "v1.8.0";
tag = "v1.8.0";
hash = "sha256-LSkNWebMF1L1a66QszugAxcHsW5o9uxQZHWituFFgJs=";
};
@@ -1989,7 +1989,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "fffonion";
repo = "lua-resty-openssl";
rev = "1.7.1";
tag = "1.7.1";
hash = "sha256-Zj4neqIptfg8Qckj6BOoHpnVlxCNmJuIgg1kcuqt6pw=";
};
@@ -2021,7 +2021,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "bungle";
repo = "lua-resty-session";
rev = "v4.1.5";
tag = "v4.1.5";
hash = "sha256-qwXNEWU0i3PUJK5cUChkcH43HnBCz4EEVPDQQ10Je+Q=";
};
@@ -2139,7 +2139,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "jonstoler";
repo = "lua-toml";
rev = "v2.0.1";
tag = "v2.0.1";
hash = "sha256-6wCo06Ulmx6HVN2bTrklPqgGiEhDZ1fUfusdS/SDdFI=";
};
@@ -2202,7 +2202,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "brimworks";
repo = "lua-yajl";
rev = "v2.1";
tag = "v2.1";
hash = "sha256-zHBNedJkGEm47HpbeJvcm6JNUUfA1OunLHPJulR8rF8=";
};
@@ -2235,7 +2235,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "brimworks";
repo = "lua-zlib";
rev = "v1.4";
tag = "v1.4";
hash = "sha256-z25OtHroEVUFraeFwajbmIiyD3hlZ12FnWs5uUBLm2Y=";
};
@@ -2268,7 +2268,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "lunarmodules";
repo = "lua_cliargs";
rev = "v3.0.2";
tag = "v3.0.2";
hash = "sha256-wL3qBQ8Lu3q8DK2Kaeo1dgzIHd8evaxFYJg47CcQiSg=";
};
@@ -2330,7 +2330,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "lunarmodules";
repo = "luacheck";
rev = "v1.2.0";
tag = "v1.2.0";
hash = "sha256-6aDXZRLq2c36dbasyVzcecQKoMvY81RIGYasdF211UY=";
};
@@ -2358,17 +2358,17 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "luacov";
version = "0.16.0-1";
version = "0.17.0-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/luacov-0.16.0-1.rockspec";
sha256 = "1yn056pd2x142lc1s2admnhjnv5hpqwlq6d5sr2ckj5g83x55dvx";
url = "mirror://luarocks/luacov-0.17.0-1.rockspec";
sha256 = "042jp0nfy3hcnbywlfp4jkrm9xpxrkggs57q616p4win9ibxcqjy";
}).outPath;
src = fetchFromGitHub {
owner = "lunarmodules";
repo = "luacov";
rev = "v0.16.0";
hash = "sha256-GoJqiFyXH4chQ/k/qBPttnh/V4vUSfR2Lg8rt3CPKoY=";
tag = "v0.17.0";
hash = "sha256-UI+6+0g3ldbKUsXCAgYll8v25gwEUn5A102Pn/H0c60=";
};
disabled = luaOlder "5.1";
@@ -2401,7 +2401,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "mwild1";
repo = "luadbi";
rev = "v0.7.4";
tag = "v0.7.4";
hash = "sha256-N4I8zVTodS01QUIncwAts/vxh2aFY2nYCnVmpN+2HwM=";
};
@@ -2435,7 +2435,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "mwild1";
repo = "luadbi";
rev = "v0.7.4";
tag = "v0.7.4";
hash = "sha256-N4I8zVTodS01QUIncwAts/vxh2aFY2nYCnVmpN+2HwM=";
};
@@ -2470,7 +2470,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "mwild1";
repo = "luadbi";
rev = "v0.7.4";
tag = "v0.7.4";
hash = "sha256-N4I8zVTodS01QUIncwAts/vxh2aFY2nYCnVmpN+2HwM=";
};
@@ -2505,7 +2505,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "mwild1";
repo = "luadbi";
rev = "v0.7.4";
tag = "v0.7.4";
hash = "sha256-N4I8zVTodS01QUIncwAts/vxh2aFY2nYCnVmpN+2HwM=";
};
@@ -2540,7 +2540,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "siffiejoe";
repo = "lua-luaepnf";
rev = "v0.3";
tag = "v0.3";
hash = "sha256-iZksr6Ljy94D0VO4xSRO9s/VgcURvCfDMX9DOt2IetM=";
};
@@ -2602,7 +2602,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "lunarmodules";
repo = "luaexpat";
rev = "1.4.1";
tag = "1.4.1";
hash = "sha256-SnI+a7555R/EFFdnrvJohP6uzwQiMNQPqgp0jxAI178=";
};
@@ -2670,7 +2670,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "keplerproject";
repo = "luafilesystem";
rev = "v1_8_0";
tag = "v1_8_0";
hash = "sha256-pEA+Z1pkykWLTT6NHQ5lo8roOh2P0fiHtnK+byTkF5o=";
};
@@ -2703,7 +2703,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "lualdap";
repo = "lualdap";
rev = "v1.4.0";
tag = "v1.4.0";
hash = "sha256-u91T7RlRa87CbYXZLhrzcpVvZWsCnQObmbS86kfsAHc=";
};
@@ -2768,7 +2768,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "lunarmodules";
repo = "lualogging";
rev = "v1.8.2";
tag = "v1.8.2";
hash = "sha256-RIblf2C9H6Iajzc9aqnvrK4xq8FAHq9InTO6m3aM5dc=";
};
@@ -2862,7 +2862,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "dpapavas";
repo = "luaprompt";
rev = "v0.9";
tag = "v0.9";
hash = "sha256-S6bzlIY1KlMK3wy01wGuRujGFgPxcNWmCaISQ87EBGs=";
};
@@ -2924,7 +2924,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "luarocks";
repo = "luarocks";
rev = "v3.13.0";
tag = "v3.13.0";
hash = "sha256-ETVoDpeFSsW7ld2z31Vog3RKsMquoxd7c8m9y7Fb1wk=";
};
@@ -2957,7 +2957,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "mlua-rs";
repo = "luarocks-build-rust-mlua";
rev = "0.2.7";
tag = "0.2.7";
hash = "sha256-Zf/Ey5utsgzXqR8zlDse7KsyWA0RGx3hyvnJ36qhKG8=";
};
@@ -3055,7 +3055,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "brunoos";
repo = "luasec";
rev = "v1.3.2";
tag = "v1.3.2";
hash = "sha256-o3uiZQnn/ID1qAgpZAqA4R3fWWk+Ajcgx++iNu1yLWc=";
};
@@ -3121,7 +3121,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "lunarmodules";
repo = "luasocket";
rev = "v3.1.0";
tag = "v3.1.0";
hash = "sha256-sKSzCrQpS+9reN9IZ4wkh4dB50wiIfA87xN4u1lyHo4=";
};
@@ -3144,17 +3144,17 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "luasql-sqlite3";
version = "2.7.0-1";
version = "2.8.0-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/luasql-sqlite3-2.7.0-1.rockspec";
sha256 = "0fsx3r1hfdkvy07ki7rmmn23w0578mss8rfzz5fi668f0f35lywg";
url = "mirror://luarocks/luasql-sqlite3-2.8.0-1.rockspec";
sha256 = "1zqcs211idnji4fzyh5g6yn4ca13z690fx0i84gmbibvi5w9rqnl";
}).outPath;
src = fetchFromGitHub {
owner = "lunarmodules";
repo = "luasql";
rev = "2.7.0";
hash = "sha256-vtL/ynlnZYNP3CQSxMR7o3xWx10rDHI9fIQazrtNfQE=";
tag = "2.8.0";
hash = "sha256-7FQa62eGe+bGkDF9+yte0JMcONPjoy5Zn5nohJG1KLA=";
};
disabled = luaOlder "5.1";
@@ -3186,7 +3186,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "lunarmodules";
repo = "luassert";
rev = "v1.9.0";
tag = "v1.9.0";
hash = "sha256-jjdB95Vr5iVsh5T7E84WwZMW6/5H2k2R/ny2VBs2l3I=";
};
@@ -3219,7 +3219,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "lunarmodules";
repo = "luasystem";
rev = "v0.6.3";
tag = "v0.6.3";
hash = "sha256-8d2835/EcyDJX9yTn6MTfaZryjY1wkSP+IIIKGPDXMk=";
};
@@ -3251,7 +3251,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "f4z3r";
repo = "luatext";
rev = "v1.2.1";
tag = "v1.2.1";
hash = "sha256-StxCmjSSy3ok0hNkKTQyq4yS1LfX980R5pULCUjLPek=";
};
@@ -3376,7 +3376,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "mpeterv";
repo = "luazip";
rev = "1.2.7";
tag = "1.2.7";
hash = "sha256-pAuXdvF2hM3ApvOg5nn9EHTGlajujHMtHEoN3Sj+mMo=";
};
@@ -3409,7 +3409,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "svermeulen";
repo = "lusc_luv";
rev = "main";
tag = "main";
hash = "sha256-xT3so0QHtzzLRNRb7yqfaRMwkl2bt1MP1xh8BkHKqqo=";
};
@@ -3664,7 +3664,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "leafo";
repo = "magick";
rev = "v1.6.0";
tag = "v1.6.0";
hash = "sha256-gda+vLrWyMQ553jVCIRl1qYTS/rXsGhxrBsrJyI8EN4=";
};
@@ -3698,7 +3698,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "mpeterv";
repo = "markdown";
rev = "0.33";
tag = "0.33";
hash = "sha256-PgRGiSwDODSyNSgeN7kNOCZwjLbGf1Qts/jrfLGYKwU=";
};
@@ -3788,7 +3788,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "lunarmodules";
repo = "lua-mimetypes";
rev = "v1.1.0";
tag = "v1.1.0";
hash = "sha256-9uuhMerMqE/AtFFGNIWxGBN0BQ+FE+NgZa3g041lesE=";
};
@@ -4051,7 +4051,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "MunifTanjim";
repo = "nui.nvim";
rev = "0.4.0";
tag = "0.4.0";
hash = "sha256-SJc9nfV6cnBKYwRWsv0iHy+RbET8frNV85reICf+pt8=";
};
@@ -4302,7 +4302,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "lunarmodules";
repo = "penlight";
rev = "1.15.0";
tag = "1.15.0";
hash = "sha256-yEkzr4v8avygFxp+NUvffg2fRxQJWTpRdIvluh/QBpY=";
};
@@ -4393,7 +4393,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "xpol";
repo = "lua-rapidjson";
rev = "v0.7.2";
tag = "v0.7.2";
hash = "sha256-WdfGIgbwlMMItsasN+ZITd/iqSeHC0EVeYoUcolb1MU=";
};
@@ -4685,7 +4685,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "lunarmodules";
repo = "say";
rev = "v1.4.1";
tag = "v1.4.1";
hash = "sha256-IjNkK1leVtYgbEjUqguVMjbdW+0BHAOCE0pazrVuF50=";
};
@@ -4718,7 +4718,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "pkulchenko";
repo = "serpent";
rev = "0.30";
tag = "0.30";
hash = "sha256-aCP/Lk11wdnqXzntgNlyZz1LkLgZApcvDiA//LLzAGE=";
};
@@ -4756,7 +4756,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "f4z3r";
repo = "sofa";
rev = "v0.8.0";
tag = "v0.8.0";
hash = "sha256-MWGp0kbLaXQV3ElSgPTFoVuWk4+ujktG0xh20kQPex4=";
};
@@ -4795,7 +4795,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "tami5";
repo = "sqlite.lua";
rev = "v1.2.2";
tag = "v1.2.2";
hash = "sha256-NUjZkFawhUD0oI3pDh/XmVwtcYyPqa+TtVbl3k13cTI=";
};
@@ -5035,7 +5035,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "gptlang";
repo = "lua-tiktoken";
rev = "v0.2.5";
tag = "v0.2.5";
hash = "sha256-V3dpFS590QkJQRIAeEgxakvoOGrilolWHutKn9zlOsg=";
};
@@ -5071,7 +5071,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "teal-language";
repo = "tl";
rev = "v0.24.8";
tag = "v0.24.8";
hash = "sha256-bjk/e+FuW0pSaVkRXIiYWhaNGU08Mgyvb7U7lc+8k2w=";
};
@@ -5099,22 +5099,22 @@ final: prev: {
}:
buildLuarocksPackage {
pname = "toml-edit";
version = "0.6.1-1";
version = "0.7.0-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/toml-edit-0.6.1-1.rockspec";
sha256 = "0crvmigffka3n7583r1a7fgcjfq5b0819a7d155q50m52b7afc4z";
url = "mirror://luarocks/toml-edit-0.7.0-1.rockspec";
sha256 = "174kjw3j6p1q5wxd34929wlm4hsv5s7ma44nccy3l0b52g453afg";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neorocks/toml-edit.lua/archive/v0.6.1.zip";
sha256 = "03gxfj2km4j08cx8yv70wvzwynnlwai6cdprrxnbf76mwy877hpg";
url = "https://github.com/lumen-oss/toml-edit.lua/archive/v0.7.0.zip";
sha256 = "03wg6mwmj802a5iv4fklz0zwd9slpw9hjzwj5068gf2lihkkwjzh";
};
disabled = luaOlder "5.1";
nativeBuildInputs = [ luarocks-build-rust-mlua ];
meta = {
homepage = "https://github.com/nvim-neorocks/toml-edit.lua";
homepage = "https://github.com/lumen-oss/toml-edit.lua";
description = "TOML Parser + Formatting and Comment-Preserving Editor";
maintainers = with lib.maintainers; [ mrcjkb ];
license.fullName = "MIT";
@@ -5233,7 +5233,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "ToxicFrog";
repo = "vstruct";
rev = "v2.1.1";
tag = "v2.1.1";
hash = "sha256-p9yRJ3Kr6WQ4vBSTOVLoX6peNCJW6b6kgXCySg7aiWo=";
};
@@ -5265,7 +5265,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "notomo";
repo = "vusted";
rev = "v2.5.3";
tag = "v2.5.3";
hash = "sha256-b07aSgDgSNpALs5en8ZXLEd/ThLEWX/dTME8Rg1K15I=";
};
@@ -5300,7 +5300,7 @@ final: prev: {
src = fetchFromGitHub {
owner = "manoelcampos";
repo = "xml2lua";
rev = "v1.6-2";
tag = "v1.6-2";
hash = "sha256-4il5mmRLtuyCJ2Nm1tKv2hXk7rmiq7Fppx9LMbjkne0=";
};
+1 -3
View File
@@ -1080,10 +1080,9 @@ in
});
toml-edit = prev.toml-edit.overrideAttrs (old: {
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (old) src;
hash = "sha256-ow0zefFFrU91Q2PJww2jtd6nqUjwXUtfQzjkzl/AXuo=";
hash = "sha256-8lYvdraKEd1nf8dkZuSDQRVJvX56gHCcTZVtyoy/0IM=";
};
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin (
@@ -1095,7 +1094,6 @@ in
rustPlatform.cargoSetupHook
lua.pkgs.luarocks-build-rust-mlua
];
});
tree-sitter-http = prev.tree-sitter-http.overrideAttrs (old: {
@@ -4,7 +4,6 @@
buildPythonPackage,
fetchFromGitHub,
geopy,
pythonOlder,
setuptools,
}:
@@ -13,8 +12,6 @@ buildPythonPackage rec {
version = "0.6.4";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "Noltari";
repo = "AEMET-OpenData";
@@ -13,7 +13,6 @@
pyicu,
pytestCheckHook,
python-slugify,
pythonOlder,
pytimeparse,
setuptools,
}:
@@ -2,7 +2,6 @@
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
pyvex,
setuptools,
typing-extensions,
@@ -13,8 +12,6 @@ buildPythonPackage rec {
version = "9.2.154";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "angr";
repo = "ailment";
@@ -3,7 +3,6 @@
aiohttp,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
setuptools,
}:
@@ -12,8 +11,6 @@ buildPythonPackage rec {
version = "0.7.2";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "Noltari";
repo = "aioairzone-cloud";
@@ -11,7 +11,6 @@
pytestCheckHook,
python-engineio,
python-socketio,
pythonOlder,
websockets,
yarl,
}:
@@ -21,8 +20,6 @@ buildPythonPackage rec {
version = "2025.02.0";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "bachya";
repo = "aioambient";
@@ -45,8 +45,7 @@ buildPythonPackage (finalAttrs: {
httpx-socks
python-socks
rencode
]
++ python-socks.optional-dependencies.asyncio;
];
nativeCheckInputs = [
proxy-py
@@ -6,7 +6,6 @@
pytest-asyncio,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
setuptools,
}:
@@ -1,7 +1,6 @@
{
lib,
aiodns,
async-timeout,
buildPythonPackage,
cached-ipaddress,
fetchFromGitHub,
@@ -12,7 +11,6 @@
pytest-asyncio,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
}:
buildPythonPackage rec {
@@ -35,9 +33,6 @@ buildPythonPackage rec {
ifaddr
netifaces
pyroute2
]
++ lib.optionals (pythonOlder "3.11") [
async-timeout
];
nativeCheckInputs = [
@@ -10,7 +10,6 @@
pytest-asyncio,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
syrupy,
}:
@@ -19,8 +18,6 @@ buildPythonPackage rec {
version = "1.1.1";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "jpbede";
repo = "aioelectricitymaps";
@@ -10,7 +10,6 @@
pytest-aiohttp,
pytest-asyncio,
pytestCheckHook,
pythonOlder,
voluptuous,
typing-extensions,
yarl,
@@ -21,8 +20,6 @@ buildPythonPackage (finalAttrs: {
version = "2026.01.1";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "bachya";
repo = "aioguardian";
@@ -23,8 +23,7 @@ buildPythonPackage rec {
dependencies = [
aiohttp
python-socks
]
++ python-socks.optional-dependencies.asyncio;
];
# Checks needs internet access
doCheck = false;

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